From 47b36d3ff0dbb99fd3fc98f6e981a38084dd4d2c Mon Sep 17 00:00:00 2001
From: Martin Arista <arista.martin@gmail.com>
Date: Sun, 11 Feb 2018 22:21:02 -0800
Subject: [PATCH 001/267] Update DevLoadingView to Support iPhone X

Summary:
The current implementation of DevLoadingView for iPhone currently gives a static height of `22` and does not take into account iPhoneX screen dimensions.

Devices: All iPhone devices currently available with Xcode v9.2
SDK: 8.1, 9, 10, 11

Validate resize only occurs on iPhone X devices and others remain consistent.

Before:
![feb-10-2018 12-30-20](https://user-images.githubusercontent.com/1743953/36065313-7b41f2ea-0e5e-11e8-87f2-928e26536077.gif)

After:
![feb-10-2018 12-28-15](https://user-images.githubusercontent.com/1743953/36065317-848e4f7e-0e5e-11e8-8aab-70cb5db32f31.gif)

[GENERAL][ENHANCEMENT][{React}] - Improvements to DevLoadingView for iPhone X
Closes https://github.com/facebook/react-native/pull/17936

Differential Revision: D6962962

Pulled By: shergin

fbshipit-source-id: e11d9386544fe19a9195e22a03e12f64e934cad7
---
 React/DevSupport/RCTDevLoadingView.m | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/React/DevSupport/RCTDevLoadingView.m b/React/DevSupport/RCTDevLoadingView.m
index 9872b1a35b7f1b..0b921374d80fa8 100644
--- a/React/DevSupport/RCTDevLoadingView.m
+++ b/React/DevSupport/RCTDevLoadingView.m
@@ -73,8 +73,15 @@ - (void)setBridge:(RCTBridge *)bridge
   dispatch_async(dispatch_get_main_queue(), ^{
     self->_showDate = [NSDate date];
     if (!self->_window && !RCTRunningInTestEnvironment()) {
-      CGFloat screenWidth = [UIScreen mainScreen].bounds.size.width;
-      self->_window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenWidth, 22)];
+      CGSize screenSize = [UIScreen mainScreen].bounds.size;
+      if (screenSize.height == 812 /* iPhone X */) {
+        self->_window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, 60)];
+        self->_label = [[UILabel alloc] initWithFrame:CGRectMake(0, 30, self->_window.bounds.size.width, 30)];
+      } else {
+        self->_window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, 22)];
+        self->_label = [[UILabel alloc] initWithFrame:self->_window.bounds];
+      }
+      [self->_window addSubview:self->_label];
 #if TARGET_OS_TV
       self->_window.windowLevel = UIWindowLevelNormal + 1;
 #else
@@ -83,11 +90,8 @@ - (void)setBridge:(RCTBridge *)bridge
       // set a root VC so rotation is supported
       self->_window.rootViewController = [UIViewController new];
 
-      self->_label = [[UILabel alloc] initWithFrame:self->_window.bounds];
       self->_label.font = [UIFont systemFontOfSize:12.0];
       self->_label.textAlignment = NSTextAlignmentCenter;
-
-      [self->_window addSubview:self->_label];
     }
 
     self->_label.text = message;

From f91f7d91a1e937785438d568ff629d00307ca75a Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Mon, 12 Feb 2018 00:04:16 -0800
Subject: [PATCH 002/267] Reimagining of RCTShadowView layout API

Summary:
This is reimagining of interoperability layer between Yoga and ShadowViews (at least in Yoga -> RN part).
Goals:
 * Make it clear and easy.
 * Make clear separation between "what layout what", now parent always layout children, noone layout itself.
 * Make possible to interleave Yoga layout with custom imperative layout (may be used in SafeAreaView, Text, Modal, InputAccessoryView and so on).

Reviewed By: mmmulani

Differential Revision: D6863654

fbshipit-source-id: 5a6a933874f121d46f744aab99a31ae42ddd4a1b
---
 Libraries/Text/Text/RCTTextShadowView.m       |  58 ++----
 .../TextInput/RCTBaseTextInputShadowView.m    |   7 +-
 RNTester/RNTester.xcodeproj/project.pbxproj   |  11 +-
 .../RNTesterUnitTests/RCTShadowViewTests.m    |   4 +-
 React/Base/Surface/RCTSurfaceRootShadowView.h |   6 +-
 React/Base/Surface/RCTSurfaceRootShadowView.m |  33 +--
 React/Modules/RCTUIManager.m                  |  27 ++-
 React/React.xcodeproj/project.pbxproj         |  16 ++
 React/Views/RCTLayout.h                       |  77 +++++++
 React/Views/RCTLayout.m                       | 145 +++++++++++++
 React/Views/RCTRootShadowView.h               |   6 +-
 React/Views/RCTRootShadowView.m               |  23 ++-
 React/Views/RCTShadowView+Layout.h            |  14 --
 React/Views/RCTShadowView+Layout.m            |  64 +-----
 React/Views/RCTShadowView.h                   |  53 ++---
 React/Views/RCTShadowView.m                   | 191 +++++++++++-------
 .../ScrollView/RCTScrollContentShadowView.m   |  43 +---
 17 files changed, 469 insertions(+), 309 deletions(-)
 create mode 100644 React/Views/RCTLayout.h
 create mode 100644 React/Views/RCTLayout.m

diff --git a/Libraries/Text/Text/RCTTextShadowView.m b/Libraries/Text/Text/RCTTextShadowView.m
index a4490388ea4a9c..4a2eac095e73d9 100644
--- a/Libraries/Text/Text/RCTTextShadowView.m
+++ b/Libraries/Text/Text/RCTTextShadowView.m
@@ -235,40 +235,24 @@ - (NSTextStorage *)textStorageAndLayoutManagerThatFitsSize:(CGSize)size
   return textStorage;
 }
 
-- (void)applyLayoutNode:(YGNodeRef)node
-      viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-       absolutePosition:(CGPoint)absolutePosition
+- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics
+            layoutContext:(RCTLayoutContext)layoutContext
 {
-  if (YGNodeGetHasNewLayout(self.yogaNode)) {
-    // If the view got new layout, we have to redraw it because `contentFrame`
-    // and sizes of embedded views may change.
+  // If the view got new `contentFrame`, we have to redraw it because
+  // and sizes of embedded views may change.
+  if (!CGRectEqualToRect(self.layoutMetrics.contentFrame, layoutMetrics.contentFrame)) {
     _needsUpdateView = YES;
   }
 
-  [super applyLayoutNode:node
-       viewsWithNewFrame:viewsWithNewFrame
-        absolutePosition:absolutePosition];
-}
-
-- (void)applyLayoutWithFrame:(CGRect)frame
-             layoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection
-      viewsWithUpdatedLayout:(NSMutableSet<RCTShadowView *> *)viewsWithUpdatedLayout
-            absolutePosition:(CGPoint)absolutePosition
-{
-  if (self.textAttributes.layoutDirection != layoutDirection) {
-    self.textAttributes.layoutDirection = layoutDirection;
+  if (self.textAttributes.layoutDirection != layoutMetrics.layoutDirection) {
+    self.textAttributes.layoutDirection = layoutMetrics.layoutDirection;
     [self invalidateCache];
   }
 
-  [super applyLayoutWithFrame:frame
-              layoutDirection:layoutDirection
-       viewsWithUpdatedLayout:viewsWithUpdatedLayout
-             absolutePosition:absolutePosition];
+  [super layoutWithMetrics:layoutMetrics layoutContext:layoutContext];
 }
 
-- (void)applyLayoutToChildren:(YGNodeRef)node
-            viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-             absolutePosition:(CGPoint)absolutePosition
+- (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
 {
   NSTextStorage *textStorage =
     [self textStorageAndLayoutManagerThatFitsSize:self.availableSize
@@ -280,9 +264,9 @@ - (void)applyLayoutToChildren:(YGNodeRef)node
                                                      actualGlyphRange:NULL];
 
   [textStorage enumerateAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
-                                        inRange:characterRange
-                                        options:0
-                                     usingBlock:
+                          inRange:characterRange
+                          options:0
+                       usingBlock:
     ^(RCTShadowView *shadowView, NSRange range, BOOL *stop) {
       if (!shadowView) {
         return;
@@ -306,18 +290,14 @@ - (void)applyLayoutToChildren:(YGNodeRef)node
         RCTRoundPixelValue(attachmentSize.height)
       }};
 
-      UIUserInterfaceLayoutDirection layoutDirection = self.textAttributes.layoutDirection;
-
-      YGNodeCalculateLayout(
-        shadowView.yogaNode,
-        frame.size.width,
-        frame.size.height,
-        layoutDirection == UIUserInterfaceLayoutDirectionLeftToRight ? YGDirectionLTR : YGDirectionRTL);
+      RCTLayoutContext localLayoutContext = layoutContext;
+      localLayoutContext.absolutePosition.x += frame.origin.x;
+      localLayoutContext.absolutePosition.y += frame.origin.y;
 
-      [shadowView applyLayoutWithFrame:frame
-                       layoutDirection:layoutDirection
-                viewsWithUpdatedLayout:viewsWithNewFrame
-                      absolutePosition:absolutePosition];
+      [shadowView layoutWithMinimumSize:frame.size
+                            maximumSize:frame.size
+                        layoutDirection:self.layoutMetrics.layoutDirection
+                          layoutContext:localLayoutContext];
     }
   ];
 }
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
index e145d4a3b0c870..faaaf775f06742 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
@@ -47,6 +47,11 @@ - (BOOL)isYogaLeafNode
   return YES;
 }
 
+- (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
+{
+  // Do nothing.
+}
+
 - (void)setLocalData:(NSObject *)localData
 {
   NSAttributedString *attributedText = (NSAttributedString *)localData;
@@ -73,7 +78,7 @@ - (void)invalidateContentSize
     return;
   }
 
-  CGSize maximumSize = self.frame.size;
+  CGSize maximumSize = self.layoutMetrics.frame.size;
 
   if (_maximumNumberOfLines == 1) {
     maximumSize.width = CGFLOAT_MAX;
diff --git a/RNTester/RNTester.xcodeproj/project.pbxproj b/RNTester/RNTester.xcodeproj/project.pbxproj
index 84c137c7e40cf9..d8a883ae56370e 100644
--- a/RNTester/RNTester.xcodeproj/project.pbxproj
+++ b/RNTester/RNTester.xcodeproj/project.pbxproj
@@ -889,13 +889,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		19BA89021F8439A700741C5A /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		272E6B3A1BEA846C001FCF37 /* NativeExampleViews */ = {
 			isa = PBXGroup;
 			children = (
@@ -1157,6 +1150,9 @@
 					004D289D1AAF61C70097A701 = {
 						CreatedOnToolsVersion = 6.1.1;
 					};
+					13B07F861A680F5B00A75B9A = {
+						DevelopmentTeam = V9WTTPBFK9;
+					};
 					143BC5941B21E3E100462512 = {
 						CreatedOnToolsVersion = 6.3.2;
 						TestTargetID = 13B07F861A680F5B00A75B9A;
@@ -1854,6 +1850,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = V9WTTPBFK9;
 				INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
diff --git a/RNTester/RNTesterUnitTests/RCTShadowViewTests.m b/RNTester/RNTesterUnitTests/RCTShadowViewTests.m
index c00922e41808f5..34543cf19b42be 100644
--- a/RNTester/RNTesterUnitTests/RCTShadowViewTests.m
+++ b/RNTester/RNTesterUnitTests/RCTShadowViewTests.m
@@ -88,7 +88,7 @@ - (void)testApplyingLayoutRecursivelyToShadowView
   [self.parentView insertReactSubview:mainView atIndex:1];
   [self.parentView insertReactSubview:footerView atIndex:2];
 
-  [self.parentView collectViewsWithUpdatedFrames];
+  [self.parentView layoutWithAffectedShadowViews:[NSHashTable weakObjectsHashTable]];
 
   XCTAssertTrue(CGRectEqualToRect([self.parentView measureLayoutRelativeToAncestor:self.parentView], CGRectMake(0, 0, 440, 440)));
   XCTAssertTrue(UIEdgeInsetsEqualToEdgeInsets([self.parentView paddingAsInsets], UIEdgeInsetsMake(10, 10, 10, 10)));
@@ -180,7 +180,7 @@ - (void)_withShadowViewWithStyle:(void(^)(YGNodeRef node))configBlock
   RCTShadowView *view = [self _shadowViewWithConfig:configBlock];
   [self.parentView insertReactSubview:view atIndex:0];
   view.intrinsicContentSize = contentSize;
-  [self.parentView collectViewsWithUpdatedFrames];
+  [self.parentView layoutWithAffectedShadowViews:[NSHashTable weakObjectsHashTable]];
   CGRect actualRect = [view measureLayoutRelativeToAncestor:self.parentView];
   XCTAssertTrue(CGRectEqualToRect(expectedRect, actualRect),
                 @"Expected layout to be %@, got %@",
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.h b/React/Base/Surface/RCTSurfaceRootShadowView.h
index 86b12c393f0c46..e3ff17506c814a 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.h
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.h
@@ -29,10 +29,6 @@
  */
 @property (nonatomic, assign) YGDirection baseDirection;
 
-/**
- * Calculate all views whose frame needs updating after layout has been calculated.
- * Returns a set contains the shadowviews that need updating.
- */
-- (NSSet<RCTShadowView *> *)collectViewsWithUpdatedFrames;
+- (void)layoutWithAffectedShadowViews:(NSHashTable<RCTShadowView *> *)affectedShadowViews;
 
 @end
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.m b/React/Base/Surface/RCTSurfaceRootShadowView.m
index 37a4c206ef57b3..fb4d28deb983ae 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.m
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.m
@@ -43,37 +43,26 @@ - (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)atIndex
   }
 }
 
-- (void)calculateLayoutWithMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
+- (void)layoutWithAffectedShadowViews:(NSHashTable<RCTShadowView *> *)affectedShadowViews
 {
-  YGNodeRef yogaNode = self.yogaNode;
+  NSHashTable<NSString *> *other = [NSHashTable new];
 
-  YGNodeStyleSetMinWidth(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.width));
-  YGNodeStyleSetMinHeight(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.height));
+  RCTLayoutContext layoutContext = {};
+  layoutContext.absolutePosition = CGPointZero;
+  layoutContext.affectedShadowViews = affectedShadowViews;
+  layoutContext.other = other;
 
-  YGNodeCalculateLayout(
-    self.yogaNode,
-    RCTYogaFloatFromCoreGraphicsFloat(maximumSize.width),
-    RCTYogaFloatFromCoreGraphicsFloat(maximumSize.height),
-    _baseDirection
-  );
-}
-
-- (NSSet<RCTShadowView *> *)collectViewsWithUpdatedFrames
-{
-  [self calculateLayoutWithMinimumSize:_minimumSize
-                           maximumSize:_maximumSize];
+  [self layoutWithMinimumSize:_minimumSize
+                  maximumSize:_maximumSize
+              layoutDirection:RCTUIKitLayoutDirectionFromYogaLayoutDirection(_baseDirection)
+                layoutContext:layoutContext];
 
-  NSMutableSet<RCTShadowView *> *viewsWithNewFrame = [NSMutableSet set];
-  [self applyLayoutNode:self.yogaNode viewsWithNewFrame:viewsWithNewFrame absolutePosition:CGPointZero];
-
-  self.intrinsicSize = self.frame.size;
+  self.intrinsicSize = self.layoutMetrics.frame.size;
 
   if (_isRendered && !_isLaidOut) {
     [_delegate rootShadowViewDidStartLayingOut:self];
     _isLaidOut = YES;
   }
-
-  return viewsWithNewFrame;
 }
 
 - (void)setMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index 17127c7264576f..ded51a99378786 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -479,14 +479,10 @@ - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *
 {
   RCTAssertUIManagerQueue();
 
-  // This is nuanced. In the JS thread, we create a new update buffer
-  // `frameTags`/`frames` that is created/mutated in the JS thread. We access
-  // these structures in the UI-thread block. `NSMutableArray` is not thread
-  // safe so we rely on the fact that we never mutate it after it's passed to
-  // the main thread.
-  NSSet<RCTShadowView *> *viewsWithNewFrames = [rootShadowView collectViewsWithUpdatedFrames];
-
-  if (!viewsWithNewFrames.count) {
+  NSHashTable<RCTShadowView *> *affectedShadowViews = [NSHashTable weakObjectsHashTable];
+  [rootShadowView layoutWithAffectedShadowViews:affectedShadowViews];
+
+  if (!affectedShadowViews.count) {
     // no frame change results in no UI update block
     return nil;
   }
@@ -499,24 +495,25 @@ - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *
   } RCTFrameData;
 
   // Construct arrays then hand off to main thread
-  NSUInteger count = viewsWithNewFrames.count;
+  NSUInteger count = affectedShadowViews.count;
   NSMutableArray *reactTags = [[NSMutableArray alloc] initWithCapacity:count];
   NSMutableData *framesData = [[NSMutableData alloc] initWithLength:sizeof(RCTFrameData) * count];
   {
     NSUInteger index = 0;
     RCTFrameData *frameDataArray = (RCTFrameData *)framesData.mutableBytes;
-    for (RCTShadowView *shadowView in viewsWithNewFrames) {
+    for (RCTShadowView *shadowView in affectedShadowViews) {
       reactTags[index] = shadowView.reactTag;
+      RCTLayoutMetrics layoutMetrics = shadowView.layoutMetrics;
       frameDataArray[index++] = (RCTFrameData){
-        shadowView.frame,
-        shadowView.layoutDirection,
+        layoutMetrics.frame,
+        layoutMetrics.layoutDirection,
         shadowView.isNewView,
         shadowView.superview.isNewView,
       };
     }
   }
 
-  for (RCTShadowView *shadowView in viewsWithNewFrames) {
+  for (RCTShadowView *shadowView in affectedShadowViews) {
 
     // We have to do this after we build the parentsAreNew array.
     shadowView.newView = NO;
@@ -524,7 +521,7 @@ - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *
     NSNumber *reactTag = shadowView.reactTag;
 
     if (shadowView.onLayout) {
-      CGRect frame = shadowView.frame;
+      CGRect frame = shadowView.layoutMetrics.frame;
       shadowView.onLayout(@{
         @"layout": @{
           @"x": @(frame.origin.x),
@@ -539,7 +536,7 @@ - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *
         RCTIsReactRootView(reactTag) &&
         [shadowView isKindOfClass:[RCTRootShadowView class]]
     ) {
-      CGSize contentSize = shadowView.frame.size;
+      CGSize contentSize = shadowView.layoutMetrics.frame.size;
 
       RCTExecuteOnMainQueue(^{
         UIView *view = self->_viewRegistry[reactTag];
diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index 06ba51997b59bd..4d9c41ed13d0a8 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -978,6 +978,12 @@
 		590D7BFE1EBD458B00D8A370 /* RCTShadowView+Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 590D7BFB1EBD458B00D8A370 /* RCTShadowView+Layout.h */; };
 		590D7BFF1EBD458B00D8A370 /* RCTShadowView+Layout.m in Sources */ = {isa = PBXBuildFile; fileRef = 590D7BFC1EBD458B00D8A370 /* RCTShadowView+Layout.m */; };
 		590D7C001EBD458B00D8A370 /* RCTShadowView+Layout.m in Sources */ = {isa = PBXBuildFile; fileRef = 590D7BFC1EBD458B00D8A370 /* RCTShadowView+Layout.m */; };
+		591F78DA202ADB22004A668C /* RCTLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 591F78D8202ADB21004A668C /* RCTLayout.m */; };
+		591F78DB202ADB22004A668C /* RCTLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 591F78D8202ADB21004A668C /* RCTLayout.m */; };
+		591F78DC202ADB22004A668C /* RCTLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 591F78D9202ADB22004A668C /* RCTLayout.h */; };
+		591F78DD202ADB22004A668C /* RCTLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 591F78D9202ADB22004A668C /* RCTLayout.h */; };
+		591F78DE202ADB8F004A668C /* RCTLayout.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 591F78D9202ADB22004A668C /* RCTLayout.h */; };
+		591F78DF202ADB97004A668C /* RCTLayout.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 591F78D9202ADB22004A668C /* RCTLayout.h */; };
 		5925356A20084D0600DD584B /* RCTSurfaceSizeMeasureMode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5925356920084D0600DD584B /* RCTSurfaceSizeMeasureMode.mm */; };
 		5925356B20084D0600DD584B /* RCTSurfaceSizeMeasureMode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5925356920084D0600DD584B /* RCTSurfaceSizeMeasureMode.mm */; };
 		59283CA01FD67321000EAAB9 /* RCTSurfaceStage.m in Sources */ = {isa = PBXBuildFile; fileRef = 59283C9F1FD67320000EAAB9 /* RCTSurfaceStage.m */; };
@@ -1347,6 +1353,7 @@
 			dstPath = include/React;
 			dstSubfolderSpec = 16;
 			files = (
+				591F78DF202ADB97004A668C /* RCTLayout.h in Copy Headers */,
 				59EDBCC31FDF4E55003573DE /* RCTScrollableProtocol.h in Copy Headers */,
 				59EDBCC41FDF4E55003573DE /* (null) in Copy Headers */,
 				59EDBCC51FDF4E55003573DE /* RCTScrollContentView.h in Copy Headers */,
@@ -1574,6 +1581,7 @@
 			dstPath = include/React;
 			dstSubfolderSpec = 16;
 			files = (
+				591F78DE202ADB8F004A668C /* RCTLayout.h in Copy Headers */,
 				59EDBCBD1FDF4E43003573DE /* RCTScrollableProtocol.h in Copy Headers */,
 				59EDBCBE1FDF4E43003573DE /* (null) in Copy Headers */,
 				59EDBCBF1FDF4E43003573DE /* RCTScrollContentView.h in Copy Headers */,
@@ -2156,6 +2164,8 @@
 		58C571C01AA56C1900CDF9C8 /* RCTDatePickerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDatePickerManager.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		590D7BFB1EBD458B00D8A370 /* RCTShadowView+Layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTShadowView+Layout.h"; sourceTree = "<group>"; };
 		590D7BFC1EBD458B00D8A370 /* RCTShadowView+Layout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTShadowView+Layout.m"; sourceTree = "<group>"; };
+		591F78D8202ADB21004A668C /* RCTLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTLayout.m; sourceTree = "<group>"; };
+		591F78D9202ADB22004A668C /* RCTLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTLayout.h; sourceTree = "<group>"; };
 		5925356920084D0600DD584B /* RCTSurfaceSizeMeasureMode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTSurfaceSizeMeasureMode.mm; sourceTree = "<group>"; };
 		59283C9F1FD67320000EAAB9 /* RCTSurfaceStage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSurfaceStage.m; sourceTree = "<group>"; };
 		594F0A2F1FD23228007FBE96 /* RCTSurfaceHostingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSurfaceHostingView.h; sourceTree = "<group>"; };
@@ -2536,6 +2546,8 @@
 				58C571BF1AA56C1900CDF9C8 /* RCTDatePickerManager.m */,
 				3D37B5801D522B190042D5B5 /* RCTFont.h */,
 				3D37B5811D522B190042D5B5 /* RCTFont.mm */,
+				591F78D9202ADB22004A668C /* RCTLayout.h */,
+				591F78D8202ADB21004A668C /* RCTLayout.m */,
 				66CD94AD1F1045E700CB3C7C /* RCTMaskedView.h */,
 				66CD94AE1F1045E700CB3C7C /* RCTMaskedView.m */,
 				66CD94AF1F1045E700CB3C7C /* RCTMaskedViewManager.h */,
@@ -3151,6 +3163,7 @@
 				3D302F4A1DF828F800D6DDAE /* RCTRootViewInternal.h in Headers */,
 				59EDBCB21FDF4E0C003573DE /* (null) in Headers */,
 				3D302F4B1DF828F800D6DDAE /* RCTTouchEvent.h in Headers */,
+				591F78DD202ADB22004A668C /* RCTLayout.h in Headers */,
 				59D031F21F8353D3008361F0 /* RCTSafeAreaView.h in Headers */,
 				3D302F4C1DF828F800D6DDAE /* RCTTouchHandler.h in Headers */,
 				3D302F4D1DF828F800D6DDAE /* RCTURLRequestDelegate.h in Headers */,
@@ -3511,6 +3524,7 @@
 				C60128AB1F3D1258009DF9FF /* RCTCxxConvert.h in Headers */,
 				59EDBCAD1FDF4E0C003573DE /* RCTScrollContentView.h in Headers */,
 				59EDBCA71FDF4E0C003573DE /* RCTScrollableProtocol.h in Headers */,
+				591F78DC202ADB22004A668C /* RCTLayout.h in Headers */,
 				3D80DA631DF820620028D040 /* RCTBorderDrawing.h in Headers */,
 				3D80DA641DF820620028D040 /* RCTBorderStyle.h in Headers */,
 				3D80DA651DF820620028D040 /* RCTComponent.h in Headers */,
@@ -4184,6 +4198,7 @@
 				59D031F41F8353D3008361F0 /* RCTSafeAreaView.m in Sources */,
 				2D3B5E941D9B087900451313 /* RCTBundleURLProvider.m in Sources */,
 				2D3B5EB81D9B091B00451313 /* RCTSourceCode.m in Sources */,
+				591F78DB202ADB22004A668C /* RCTLayout.m in Sources */,
 				2D3B5EB51D9B091100451313 /* RCTDevMenu.m in Sources */,
 				59EDBCAC1FDF4E0C003573DE /* (null) in Sources */,
 				2D3B5EBD1D9B092A00451313 /* RCTTiming.m in Sources */,
@@ -4452,6 +4467,7 @@
 				1372B70A1AB030C200659ED6 /* RCTAppState.m in Sources */,
 				59A7B9FE1E577DBF0068EDBF /* RCTRootContentView.m in Sources */,
 				13E067591A70F44B002CDEE1 /* UIView+React.m in Sources */,
+				591F78DA202ADB22004A668C /* RCTLayout.m in Sources */,
 				FEFAAC9E1FDB89B50057BBE0 /* RCTRedBoxExtraDataViewController.m in Sources */,
 				14F484561AABFCE100FDF6B9 /* RCTSliderManager.m in Sources */,
 				CF2731C11E7B8DE40044CA4F /* RCTDeviceInfo.m in Sources */,
diff --git a/React/Views/RCTLayout.h b/React/Views/RCTLayout.h
new file mode 100644
index 00000000000000..79af03ecd715c3
--- /dev/null
+++ b/React/Views/RCTLayout.h
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTDefines.h>
+#import <yoga/Yoga.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class RCTShadowView;
+
+typedef NS_ENUM(NSInteger, RCTDisplayType) {
+  RCTDisplayTypeNone,
+  RCTDisplayTypeFlex,
+  RCTDisplayTypeInline,
+};
+
+struct RCTLayoutMetrics {
+  CGRect frame;
+  CGRect contentFrame;
+  UIEdgeInsets borderWidth;
+  RCTDisplayType displayType;
+  UIUserInterfaceLayoutDirection layoutDirection;
+};
+typedef struct CG_BOXABLE RCTLayoutMetrics RCTLayoutMetrics;
+
+struct RCTLayoutContext {
+  CGPoint absolutePosition;
+  __unsafe_unretained NSHashTable<RCTShadowView *> *_Nonnull affectedShadowViews;
+  __unsafe_unretained NSHashTable<NSString *> *_Nonnull other;
+};
+typedef struct CG_BOXABLE RCTLayoutContext RCTLayoutContext;
+
+static inline BOOL RCTLayoutMetricsEqualToLayoutMetrics(RCTLayoutMetrics a, RCTLayoutMetrics b)
+{
+  return
+    CGRectEqualToRect(a.frame, b.frame) &&
+    CGRectEqualToRect(a.contentFrame, b.contentFrame) &&
+    UIEdgeInsetsEqualToEdgeInsets(a.borderWidth, b.borderWidth) &&
+    a.displayType == b.displayType &&
+    a.layoutDirection == b.layoutDirection;
+}
+
+RCT_EXTERN RCTLayoutMetrics RCTLayoutMetricsFromYogaNode(YGNodeRef yogaNode);
+
+/**
+ * Converts float values between Yoga and CoreGraphics representations,
+ * especially in terms of edge cases.
+ */
+RCT_EXTERN float RCTYogaFloatFromCoreGraphicsFloat(CGFloat value);
+RCT_EXTERN CGFloat RCTCoreGraphicsFloatFromYogaFloat(float value);
+
+/**
+ * Converts compound `YGValue` to simple `CGFloat` value.
+ */
+RCT_EXTERN CGFloat RCTCoreGraphicsFloatFromYogaValue(YGValue value, CGFloat baseFloatValue);
+
+/**
+ * Converts `YGDirection` to `UIUserInterfaceLayoutDirection` and vise versa.
+ */
+RCT_EXTERN YGDirection RCTYogaLayoutDirectionFromUIKitLayoutDirection(UIUserInterfaceLayoutDirection direction);
+RCT_EXTERN UIUserInterfaceLayoutDirection RCTUIKitLayoutDirectionFromYogaLayoutDirection(YGDirection direction);
+
+/**
+ * Converts `YGDisplay` to `RCTDisplayType` and vise versa.
+ */
+RCT_EXTERN YGDisplay RCTYogaDisplayTypeFromReactDisplayType(RCTDisplayType displayType);
+RCT_EXTERN RCTDisplayType RCTReactDisplayTypeFromYogaDisplayType(YGDisplay displayType);
+
+NS_ASSUME_NONNULL_END
diff --git a/React/Views/RCTLayout.m b/React/Views/RCTLayout.m
new file mode 100644
index 00000000000000..60727621d97a6c
--- /dev/null
+++ b/React/Views/RCTLayout.m
@@ -0,0 +1,145 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <yoga/Yoga.h>
+
+#import "RCTAssert.h"
+#import "RCTShadowView+Layout.h"
+
+RCTLayoutMetrics RCTLayoutMetricsFromYogaNode(YGNodeRef yogaNode)
+{
+  RCTLayoutMetrics layoutMetrics;
+
+  CGRect frame = (CGRect){
+    (CGPoint){
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetLeft(yogaNode)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetTop(yogaNode))
+    },
+    (CGSize){
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetWidth(yogaNode)),
+      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetHeight(yogaNode))
+    }
+  };
+
+  UIEdgeInsets padding = (UIEdgeInsets){
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeTop)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeLeft)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeBottom)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeRight))
+  };
+
+  UIEdgeInsets borderWidth = (UIEdgeInsets){
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeTop)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeLeft)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeBottom)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeRight))
+  };
+
+  UIEdgeInsets compoundInsets = (UIEdgeInsets){
+    borderWidth.top + padding.top,
+    borderWidth.left + padding.left,
+    borderWidth.bottom + padding.bottom,
+    borderWidth.right + padding.right
+  };
+
+  CGRect bounds = (CGRect){CGPointZero, frame.size};
+  CGRect contentFrame = UIEdgeInsetsInsetRect(bounds, compoundInsets);
+
+  layoutMetrics.frame = frame;
+  layoutMetrics.borderWidth = borderWidth;
+  layoutMetrics.contentFrame = contentFrame;
+  layoutMetrics.displayType = RCTReactDisplayTypeFromYogaDisplayType(YGNodeStyleGetDisplay(yogaNode));
+  layoutMetrics.layoutDirection = RCTUIKitLayoutDirectionFromYogaLayoutDirection(YGNodeLayoutGetDirection(yogaNode));
+
+  return layoutMetrics;
+}
+
+
+/**
+ * Yoga and CoreGraphics have different opinions about how "infinity" value
+ * should be represented.
+ * Yoga uses `NAN` which requires additional effort to compare all those values,
+ * whereas GoreGraphics uses `GFLOAT_MAX` which can be easyly compared with
+ * standard `==` operator.
+ */
+
+float RCTYogaFloatFromCoreGraphicsFloat(CGFloat value)
+{
+  if (value == CGFLOAT_MAX || isnan(value) || isinf(value)) {
+    return YGUndefined;
+  }
+
+  return value;
+}
+
+CGFloat RCTCoreGraphicsFloatFromYogaFloat(float value)
+{
+  if (value == YGUndefined || isnan(value) || isinf(value)) {
+    return CGFLOAT_MAX;
+  }
+
+  return value;
+}
+
+CGFloat RCTCoreGraphicsFloatFromYogaValue(YGValue value, CGFloat baseFloatValue)
+{
+  switch (value.unit) {
+    case YGUnitPoint:
+      return RCTCoreGraphicsFloatFromYogaFloat(value.value);
+    case YGUnitPercent:
+      return RCTCoreGraphicsFloatFromYogaFloat(value.value) * baseFloatValue;
+    case YGUnitAuto:
+    case YGUnitUndefined:
+      return baseFloatValue;
+  }
+}
+
+YGDirection RCTYogaLayoutDirectionFromUIKitLayoutDirection(UIUserInterfaceLayoutDirection direction)
+{
+  switch (direction) {
+    case UIUserInterfaceLayoutDirectionRightToLeft:
+      return YGDirectionRTL;
+    case UIUserInterfaceLayoutDirectionLeftToRight:
+      return YGDirectionLTR;
+  }
+}
+
+UIUserInterfaceLayoutDirection RCTUIKitLayoutDirectionFromYogaLayoutDirection(YGDirection direction)
+{
+  switch (direction) {
+    case YGDirectionInherit:
+    case YGDirectionLTR:
+      return UIUserInterfaceLayoutDirectionLeftToRight;
+    case YGDirectionRTL:
+      return UIUserInterfaceLayoutDirectionRightToLeft;
+  }
+}
+
+YGDisplay RCTYogaDisplayTypeFromReactDisplayType(RCTDisplayType displayType)
+{
+  switch (displayType) {
+    case RCTDisplayTypeNone:
+      return YGDisplayNone;
+    case RCTDisplayTypeFlex:
+      return YGDisplayFlex;
+    case RCTDisplayTypeInline:
+      RCTAssert(NO, @"RCTDisplayTypeInline cannot be converted to YGDisplay value.");
+      return YGDisplayNone;
+  }
+}
+
+RCTDisplayType RCTReactDisplayTypeFromYogaDisplayType(YGDisplay displayType)
+{
+  switch (displayType) {
+    case YGDisplayFlex:
+      return RCTDisplayTypeFlex;
+    case YGDisplayNone:
+      return RCTDisplayTypeNone;
+  }
+}
diff --git a/React/Views/RCTRootShadowView.h b/React/Views/RCTRootShadowView.h
index 95b96edf11f82b..8f1d0108c2a1aa 100644
--- a/React/Views/RCTRootShadowView.h
+++ b/React/Views/RCTRootShadowView.h
@@ -25,10 +25,6 @@
  */
 @property (nonatomic, assign) YGDirection baseDirection;
 
-/**
- * Calculate all views whose frame needs updating after layout has been calculated.
- * Returns a set contains the shadowviews that need updating.
- */
-- (NSSet<RCTShadowView *> *)collectViewsWithUpdatedFrames;
+- (void)layoutWithAffectedShadowViews:(NSHashTable<RCTShadowView *> *)affectedShadowViews;
 
 @end
diff --git a/React/Views/RCTRootShadowView.m b/React/Views/RCTRootShadowView.m
index 15b5b6f7cb52fa..87dad3d8edf394 100644
--- a/React/Views/RCTRootShadowView.m
+++ b/React/Views/RCTRootShadowView.m
@@ -10,30 +10,33 @@
 #import "RCTRootShadowView.h"
 
 #import "RCTI18nUtil.h"
+#import "RCTShadowView+Layout.h"
 
 @implementation RCTRootShadowView
 
 - (instancetype)init
 {
-  self = [super init];
-  if (self) {
+  if (self = [super init]) {
     _baseDirection = [[RCTI18nUtil sharedInstance] isRTL] ? YGDirectionRTL : YGDirectionLTR;
     _availableSize = CGSizeMake(INFINITY, INFINITY);
   }
+
   return self;
 }
 
-- (NSSet<RCTShadowView *> *)collectViewsWithUpdatedFrames
+- (void)layoutWithAffectedShadowViews:(NSHashTable<RCTShadowView *> *)affectedShadowViews
 {
-  // Treating `INFINITY` as `YGUndefined` (which equals `NAN`).
-  float availableWidth = _availableSize.width == INFINITY ? YGUndefined : _availableSize.width;
-  float availableHeight = _availableSize.height == INFINITY ? YGUndefined : _availableSize.height;
+  NSHashTable<NSString *> *other = [NSHashTable new];
 
-  YGNodeCalculateLayout(self.yogaNode, availableWidth, availableHeight, _baseDirection);
+  RCTLayoutContext layoutContext = {};
+  layoutContext.absolutePosition = CGPointZero;
+  layoutContext.affectedShadowViews = affectedShadowViews;
+  layoutContext.other = other;
 
-  NSMutableSet<RCTShadowView *> *viewsWithNewFrame = [NSMutableSet set];
-  [self applyLayoutNode:self.yogaNode viewsWithNewFrame:viewsWithNewFrame absolutePosition:CGPointZero];
-  return viewsWithNewFrame;
+  [self layoutWithMinimumSize:CGSizeZero
+                  maximumSize:_availableSize
+              layoutDirection:RCTUIKitLayoutDirectionFromYogaLayoutDirection(_baseDirection)
+                layoutContext:layoutContext];
 }
 
 @end
diff --git a/React/Views/RCTShadowView+Layout.h b/React/Views/RCTShadowView+Layout.h
index 8e4966663c1d40..8c6d3fe160489f 100644
--- a/React/Views/RCTShadowView+Layout.h
+++ b/React/Views/RCTShadowView+Layout.h
@@ -11,13 +11,6 @@
 
 #import <React/RCTShadowView.h>
 
-/**
- * Converts float values between Yoga and CoreGraphics representations,
- * especially in terms of edge cases.
- */
-RCT_EXTERN float RCTYogaFloatFromCoreGraphicsFloat(CGFloat value);
-RCT_EXTERN CGFloat RCTCoreGraphicsFloatFromYogaFloat(float value);
-
 @interface RCTShadowView (Layout)
 
 #pragma mark - Computed Layout-Inferred Metrics
@@ -28,13 +21,6 @@ RCT_EXTERN CGFloat RCTCoreGraphicsFloatFromYogaFloat(float value);
 @property (nonatomic, readonly) CGSize availableSize;
 @property (nonatomic, readonly) CGRect contentFrame;
 
-#pragma mark - Measuring
-
-/**
- * Measures shadow view without side-effects.
- */
-- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize;
-
 #pragma mark - Dirty Propagation Control
 
 /**
diff --git a/React/Views/RCTShadowView+Layout.m b/React/Views/RCTShadowView+Layout.m
index 9726ead4163fb7..4071c8f037086e 100644
--- a/React/Views/RCTShadowView+Layout.m
+++ b/React/Views/RCTShadowView+Layout.m
@@ -11,31 +11,7 @@
 
 #import <yoga/Yoga.h>
 
-/**
- * Yoga and CoreGraphics have different opinions about how "infinity" value
- * should be represented.
- * Yoga uses `NAN` which requires additional effort to compare all those values,
- * whereas GoreGraphics uses `GFLOAT_MAX` which can be easyly compared with
- * standard `==` operator.
- */
-
-float RCTYogaFloatFromCoreGraphicsFloat(CGFloat value)
-{
-  if (value == CGFLOAT_MAX || isnan(value) || isinf(value)) {
-    return YGUndefined;
-  }
-
-  return value;
-}
-
-CGFloat RCTCoreGraphicsFloatFromYogaFloat(float value)
-{
-  if (value == YGUndefined || isnan(value) || isinf(value)) {
-    return CGFLOAT_MAX;
-  }
-
-  return value;
-}
+#import "RCTAssert.h"
 
 @implementation RCTShadowView (Layout)
 
@@ -78,46 +54,12 @@ - (UIEdgeInsets)compoundInsets
 
 - (CGSize)availableSize
 {
-  return UIEdgeInsetsInsetRect((CGRect){CGPointZero, self.frame.size}, self.compoundInsets).size;
+  return self.layoutMetrics.contentFrame.size;
 }
 
 - (CGRect)contentFrame
 {
-  CGRect bounds = (CGRect){CGPointZero, self.frame.size};
-  return UIEdgeInsetsInsetRect(bounds, self.compoundInsets);
-}
-
-#pragma mark - Measuring
-
-- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
-{
-  YGNodeRef clonnedYogaNode = YGNodeClone(self.yogaNode);
-  YGNodeRef constraintYogaNode = YGNodeNewWithConfig([[self class] yogaConfig]);
-
-  YGNodeInsertChild(constraintYogaNode, clonnedYogaNode, 0);
-
-  YGNodeStyleSetMinWidth(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.width));
-  YGNodeStyleSetMinHeight(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.height));
-  YGNodeStyleSetMaxWidth(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(maximumSize.width));
-  YGNodeStyleSetMaxHeight(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(maximumSize.height));
-
-  YGNodeCalculateLayout(
-    constraintYogaNode,
-    YGUndefined,
-    YGUndefined,
-    self.layoutDirection
-  );
-
-  CGSize measuredSize = (CGSize){
-    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetWidth(constraintYogaNode)),
-    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetHeight(constraintYogaNode)),
-  };
-
-  YGNodeRemoveChild(constraintYogaNode, clonnedYogaNode);
-  YGNodeFree(constraintYogaNode);
-  YGNodeFree(clonnedYogaNode);
-
-  return measuredSize;
+  return self.layoutMetrics.contentFrame;
 }
 
 #pragma mark - Dirty Propagation Control
diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h
index 70d73aad6a63b2..826386f82782d5 100644
--- a/React/Views/RCTShadowView.h
+++ b/React/Views/RCTShadowView.h
@@ -10,6 +10,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTComponent.h>
+#import <React/RCTLayout.h>
 #import <React/RCTRootView.h>
 #import <yoga/Yoga.h>
 
@@ -51,6 +52,11 @@ typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, UIView *> *viewRegistry
 @property (nonatomic, copy) NSString *viewName;
 @property (nonatomic, copy) RCTDirectEventBlock onLayout;
 
+/**
+ * Computed layout of the view.
+ */
+@property (nonatomic, assign) RCTLayoutMetrics layoutMetrics;
+
 /**
  * In some cases we need a way to specify some environmental data to shadow view
  * to improve layout (or do something similar), so `localData` serves these needs.
@@ -70,12 +76,6 @@ typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, UIView *> *viewRegistry
  */
 @property (nonatomic, assign, getter=isNewView) BOOL newView;
 
-/**
- * Computed layout direction of the view.
- */
-
-@property (nonatomic, assign, readonly) UIUserInterfaceLayoutDirection layoutDirection;
-
 /**
  * Position and dimensions.
  * Defaults to { 0, 0, NAN, NAN }.
@@ -167,38 +167,39 @@ typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, UIView *> *viewRegistry
  */
 @property (nonatomic, assign) YGOverflow overflow;
 
-/**
- * Computed position of the view.
- */
-@property (nonatomic, assign, readonly) CGRect frame;
-
 /**
  * Represents the natural size of the view, which is used when explicit size is not set or is ambiguous.
  * Defaults to `{UIViewNoIntrinsicMetric, UIViewNoIntrinsicMetric}`.
  */
 @property (nonatomic, assign) CGSize intrinsicContentSize;
 
+#pragma mark - Layout
+
+/**
+ * Initiates layout starts from the view.
+ */
+- (void)layoutWithMinimumSize:(CGSize)minimumSize
+                  maximumSize:(CGSize)maximumSize
+              layoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection
+                layoutContext:(RCTLayoutContext)layoutContext;
+
 /**
- * Apply the CSS layout.
- * This method also calls `applyLayoutToChildren:` internally. The functionality
- * is split into two methods so subclasses can override `applyLayoutToChildren:`
- * while using default implementation of `applyLayoutNode:`.
+ * Applies computed layout metrics to the view.
  */
-- (void)applyLayoutNode:(YGNodeRef)node
-      viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-       absolutePosition:(CGPoint)absolutePosition NS_REQUIRES_SUPER;
+- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics
+            layoutContext:(RCTLayoutContext)layoutContext;
 
-- (void)applyLayoutWithFrame:(CGRect)frame
-             layoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection
-      viewsWithUpdatedLayout:(NSMutableSet<RCTShadowView *> *)viewsWithUpdatedLayout
-            absolutePosition:(CGPoint)absolutePosition;
+/**
+ * Calculates (if needed) and applies layout to subviews.
+ */
+- (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext;
 
 /**
- * Enumerate the child nodes and tell them to apply layout.
+ * Measures shadow view without side-effects.
+ * Default implementation uses Yoga for measuring.
  */
-- (void)applyLayoutToChildren:(YGNodeRef)node
-            viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-             absolutePosition:(CGPoint)absolutePosition;
+- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize
+                      maximumSize:(CGSize)maximumSize;
 
 /**
  * Returns whether or not this view can have any subviews.
diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m
index 28298edff88439..4c2e24b8403fe3 100644
--- a/React/Views/RCTShadowView.m
+++ b/React/Views/RCTShadowView.m
@@ -12,6 +12,7 @@
 #import "RCTConvert.h"
 #import "RCTI18nUtil.h"
 #import "RCTLog.h"
+#import "RCTShadowView+Layout.h"
 #import "RCTUtils.h"
 #import "UIView+Private.h"
 #import "UIView+React.h"
@@ -153,82 +154,21 @@ static void RCTProcessMetaPropsBorder(const YGValue metaProps[META_PROP_COUNT],
   YGNodeStyleSetBorder(node, YGEdgeAll, metaProps[META_PROP_ALL].value);
 }
 
-- (void)applyLayoutNode:(YGNodeRef)node
-      viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-       absolutePosition:(CGPoint)absolutePosition
-{
-  if (!YGNodeGetHasNewLayout(node)) {
-    return;
-  }
-
-  RCTAssert(!YGNodeIsDirty(node), @"Attempt to get layout metrics from dirtied Yoga node.");
-
-  YGNodeSetHasNewLayout(node, false);
-
-  if (YGNodeStyleGetDisplay(node) == YGDisplayNone) {
-    // If the node is hidden (has `display: none;`), its (and its descendants)
-    // layout metrics are invalid and/or dirtied, so we have to stop here.
-    return;
-  }
-
-  CGRect frame = CGRectMake(YGNodeLayoutGetLeft(node), YGNodeLayoutGetTop(node), YGNodeLayoutGetWidth(node), YGNodeLayoutGetHeight(node));
-
-  // Even if `YGNodeLayoutGetDirection` can return `YGDirectionInherit` here, it actually means
-  // that Yoga will use LTR layout for the view (even if layout process is not finished yet).
-  UIUserInterfaceLayoutDirection layoutDirection = YGNodeLayoutGetDirection(_yogaNode) == YGDirectionRTL ? UIUserInterfaceLayoutDirectionRightToLeft : UIUserInterfaceLayoutDirectionLeftToRight;
-
-  [self applyLayoutWithFrame:frame
-             layoutDirection:layoutDirection
-      viewsWithUpdatedLayout:viewsWithNewFrame
-            absolutePosition:absolutePosition];
-}
-
-- (void)applyLayoutWithFrame:(CGRect)frame
-             layoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection
-      viewsWithUpdatedLayout:(NSMutableSet<RCTShadowView *> *)viewsWithUpdatedLayout
-            absolutePosition:(CGPoint)absolutePosition
-{
-  if (!CGRectEqualToRect(_frame, frame) || _layoutDirection != layoutDirection) {
-    _frame = frame;
-    _layoutDirection = layoutDirection;
-    [viewsWithUpdatedLayout addObject:self];
-  }
-
-  absolutePosition.x += frame.origin.x;
-  absolutePosition.y += frame.origin.y;
-
-  [self applyLayoutToChildren:_yogaNode
-            viewsWithNewFrame:viewsWithUpdatedLayout
-             absolutePosition:absolutePosition];
-}
-
-- (void)applyLayoutToChildren:(YGNodeRef)node
-            viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-             absolutePosition:(CGPoint)absolutePosition
-{
-  for (unsigned int i = 0; i < YGNodeGetChildCount(node); ++i) {
-    RCTShadowView *child = (RCTShadowView *)_reactSubviews[i];
-    [child applyLayoutNode:YGNodeGetChild(node, i)
-         viewsWithNewFrame:viewsWithNewFrame
-          absolutePosition:absolutePosition];
-  }
-}
-
 - (CGRect)measureLayoutRelativeToAncestor:(RCTShadowView *)ancestor
 {
   CGPoint offset = CGPointZero;
   NSInteger depth = 30; // max depth to search
   RCTShadowView *shadowView = self;
   while (depth && shadowView && shadowView != ancestor) {
-    offset.x += shadowView.frame.origin.x;
-    offset.y += shadowView.frame.origin.y;
+    offset.x += shadowView.layoutMetrics.frame.origin.x;
+    offset.y += shadowView.layoutMetrics.frame.origin.y;
     shadowView = shadowView->_superview;
     depth--;
   }
   if (ancestor != shadowView) {
     return CGRectNull;
   }
-  return (CGRect){offset, self.frame.size};
+  return (CGRect){offset, self.layoutMetrics.frame.size};
 }
 
 - (BOOL)viewIsDescendantOf:(RCTShadowView *)ancestor
@@ -244,9 +184,7 @@ - (BOOL)viewIsDescendantOf:(RCTShadowView *)ancestor
 
 - (instancetype)init
 {
-  if ((self = [super init])) {
-    _frame = CGRectMake(0, 0, YGUndefined, YGUndefined);
-
+  if (self = [super init]) {
     for (unsigned int ii = 0; ii < META_PROP_COUNT; ii++) {
       _paddingMetaProps[ii] = YGValueUndefined;
       _marginMetaProps[ii] = YGValueUndefined;
@@ -316,12 +254,125 @@ - (RCTShadowView *)reactSuperview
   return _superview;
 }
 
+#pragma mark - Layout
+
+- (void)layoutWithMinimumSize:(CGSize)minimumSize
+                  maximumSize:(CGSize)maximumSize
+              layoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection
+                layoutContext:(RCTLayoutContext)layoutContext
+{
+  YGNodeRef yogaNode = _yogaNode;
+
+  CGSize oldMinimumSize = (CGSize){
+    RCTCoreGraphicsFloatFromYogaValue(YGNodeStyleGetMinWidth(yogaNode), 0.0),
+    RCTCoreGraphicsFloatFromYogaValue(YGNodeStyleGetMinHeight(yogaNode), 0.0)
+  };
+
+  if (!CGSizeEqualToSize(oldMinimumSize, minimumSize)) {
+    YGNodeStyleSetMinWidth(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.width));
+    YGNodeStyleSetMinHeight(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.height));
+  }
+
+  YGNodeCalculateLayout(
+    yogaNode,
+    RCTYogaFloatFromCoreGraphicsFloat(maximumSize.width),
+    RCTYogaFloatFromCoreGraphicsFloat(maximumSize.height),
+    RCTYogaLayoutDirectionFromUIKitLayoutDirection(layoutDirection)
+  );
+
+  RCTAssert(!YGNodeIsDirty(yogaNode), @"Attempt to get layout metrics from dirtied Yoga node.");
+
+  if (!YGNodeGetHasNewLayout(yogaNode)) {
+    return;
+  }
+
+  RCTLayoutMetrics layoutMetrics = RCTLayoutMetricsFromYogaNode(yogaNode);
+
+  layoutContext.absolutePosition.x += layoutMetrics.frame.origin.x;
+  layoutContext.absolutePosition.y += layoutMetrics.frame.origin.y;
+
+  [self layoutWithMetrics:layoutMetrics
+            layoutContext:layoutContext];
+
+  [self layoutSubviewsWithContext:layoutContext];
+}
+
+- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics
+            layoutContext:(RCTLayoutContext)layoutContext
+{
+  if (!RCTLayoutMetricsEqualToLayoutMetrics(self.layoutMetrics, layoutMetrics)) {
+    self.layoutMetrics = layoutMetrics;
+    [layoutContext.affectedShadowViews addObject:self];
+  }
+}
+
+- (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
+{
+  RCTLayoutMetrics layoutMetrics = self.layoutMetrics;
+
+  if (layoutMetrics.displayType == RCTDisplayTypeNone) {
+    return;
+  }
+
+  for (RCTShadowView *childShadowView in _reactSubviews) {
+    YGNodeRef childYogaNode = childShadowView.yogaNode;
+
+    RCTAssert(!YGNodeIsDirty(childYogaNode), @"Attempt to get layout metrics from dirtied Yoga node.");
+
+    if (!YGNodeGetHasNewLayout(childYogaNode)) {
+      continue;
+    }
+
+    RCTLayoutMetrics childLayoutMetrics = RCTLayoutMetricsFromYogaNode(childYogaNode);
+
+    layoutContext.absolutePosition.x += childLayoutMetrics.frame.origin.x;
+    layoutContext.absolutePosition.y += childLayoutMetrics.frame.origin.y;
+
+    [childShadowView layoutWithMetrics:childLayoutMetrics
+                         layoutContext:layoutContext];
+
+    // Recursive call.
+    [childShadowView layoutSubviewsWithContext:layoutContext];
+  }
+}
+
+- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
+{
+  YGNodeRef clonnedYogaNode = YGNodeClone(self.yogaNode);
+  YGNodeRef constraintYogaNode = YGNodeNewWithConfig([[self class] yogaConfig]);
+
+  YGNodeInsertChild(constraintYogaNode, clonnedYogaNode, 0);
+
+  YGNodeStyleSetMinWidth(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.width));
+  YGNodeStyleSetMinHeight(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.height));
+  YGNodeStyleSetMaxWidth(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(maximumSize.width));
+  YGNodeStyleSetMaxHeight(constraintYogaNode, RCTYogaFloatFromCoreGraphicsFloat(maximumSize.height));
+
+  YGNodeCalculateLayout(
+    constraintYogaNode,
+    YGUndefined,
+    YGUndefined,
+    self.layoutMetrics.layoutDirection
+  );
+
+  CGSize measuredSize = (CGSize){
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetWidth(constraintYogaNode)),
+    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetHeight(constraintYogaNode)),
+  };
+
+  YGNodeRemoveChild(constraintYogaNode, clonnedYogaNode);
+  YGNodeFree(constraintYogaNode);
+  YGNodeFree(clonnedYogaNode);
+
+  return measuredSize;
+}
+
 - (NSNumber *)reactTagAtPoint:(CGPoint)point
 {
   for (RCTShadowView *shadowView in _reactSubviews) {
-    if (CGRectContainsPoint(shadowView.frame, point)) {
+    if (CGRectContainsPoint(shadowView.layoutMetrics.frame, point)) {
       CGPoint relativePoint = point;
-      CGPoint origin = shadowView.frame.origin;
+      CGPoint origin = shadowView.layoutMetrics.frame.origin;
       relativePoint.x -= origin.x;
       relativePoint.y -= origin.y;
       return [shadowView reactTagAtPoint:relativePoint];
@@ -333,7 +384,7 @@ - (NSNumber *)reactTagAtPoint:(CGPoint)point
 - (NSString *)description
 {
   NSString *description = super.description;
-  description = [[description substringToIndex:description.length - 1] stringByAppendingFormat:@"; viewName: %@; reactTag: %@; frame: %@>", self.viewName, self.reactTag, NSStringFromCGRect(self.frame)];
+  description = [[description substringToIndex:description.length - 1] stringByAppendingFormat:@"; viewName: %@; reactTag: %@; frame: %@>", self.viewName, self.reactTag, NSStringFromCGRect(self.layoutMetrics.frame)];
   return description;
 }
 
diff --git a/React/Views/ScrollView/RCTScrollContentShadowView.m b/React/Views/ScrollView/RCTScrollContentShadowView.m
index 700ab181322d40..d53a658edb0b97 100644
--- a/React/Views/ScrollView/RCTScrollContentShadowView.m
+++ b/React/Views/ScrollView/RCTScrollContentShadowView.m
@@ -13,43 +13,22 @@
 
 #import "RCTUtils.h"
 
-@interface RCTShadowView () {
-  // This will be removed after t15757916, which will remove
-  // side-effects from `setFrame:` method.
-  @public CGRect _frame;
-}
-@end
-
 @implementation RCTScrollContentShadowView
 
-- (void)applyLayoutNode:(YGNodeRef)node
-      viewsWithNewFrame:(NSMutableSet<RCTShadowView *> *)viewsWithNewFrame
-       absolutePosition:(CGPoint)absolutePosition
+- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics
+            layoutContext:(RCTLayoutContext)layoutContext
 {
-  // Call super method if LTR layout is enforced.
-  if (YGNodeLayoutGetDirection(self.yogaNode) != YGDirectionRTL) {
-    [super applyLayoutNode:node
-         viewsWithNewFrame:viewsWithNewFrame
-          absolutePosition:absolutePosition];
-    return;
+  if (layoutMetrics.layoutDirection == UIUserInterfaceLayoutDirectionRightToLeft) {
+    // Motivation:
+    // Yoga place `contentView` on the right side of `scrollView` when RTL layout is enfoced.
+    // That breaks everything; it is completely pointless to (re)position `contentView`
+    // because it is `contentView`'s job. So, we work around it here.
+
+    layoutContext.absolutePosition.x += layoutMetrics.frame.size.width;
+    layoutMetrics.frame.origin.x = 0;
   }
 
-  // Motivation:
-  // Yoga place `contentView` on the right side of `scrollView` when RTL layout is enfoced.
-  // That breaks everything; it is completely pointless to (re)position `contentView`
-  // because it is `contentView`'s job. So, we work around it here.
-
-  // Step 1. Compensate `absolutePosition` change.
-  CGFloat xCompensation = YGNodeLayoutGetRight(node) - YGNodeLayoutGetLeft(node);
-  absolutePosition.x += xCompensation;
-
-  // Step 2. Call super method.
-  [super applyLayoutNode:node
-       viewsWithNewFrame:viewsWithNewFrame
-        absolutePosition:absolutePosition];
-
-  // Step 3. Reset the position.
-  _frame.origin.x = RCTRoundPixelValue(YGNodeLayoutGetRight(node));
+  [super layoutWithMetrics:layoutMetrics layoutContext:layoutContext];
 }
 
 @end

From f7729a5933fe34c0ca3b3ea5a3407ff1701c7d10 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Mon, 12 Feb 2018 12:24:37 -0800
Subject: [PATCH 003/267] Broken publish step on CI

Summary:
Every `job` is run in a separate container and so, `checkout` step is required for the Git host to be added to `~/.ssh/known_hosts`. Without this step, it will timeout after 10 minutes waiting for you to add (yes) or reject (no) from known hosts (we get this prompt when we checkout from a host for the very first time).
Closes https://github.com/facebook/react-native/pull/17956

Differential Revision: D6968130

Pulled By: hramos

fbshipit-source-id: 6d62166fd375f8f408cf5f18b188f841d035d97f
---
 .circleci/config.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f169608b7f8aa..99fac87a3977c0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -383,9 +383,9 @@ jobs:
   publish_npm_package:
     <<: *android_defaults
     steps:
-      - attach_workspace:
-          at: ~/react-native
-
+      # Checkout code so that we can work with `git` in publish.js
+      - checkout
+      
       # Configure Android SDK and related dependencies
       - run: *configure-android-path
       - run: *install-android-build-dependencies
@@ -597,16 +597,12 @@ workflows:
 
   # Only runs on NN-stable branches
   deploy:
-    jobs:
-      # Checkout repo and run Yarn
-      - checkout_code:
-          filters: *filter-only-stable
-          
+    jobs:          
       # If we are on a stable branch, wait for approval to deploy to npm
       - approve_publish_npm_package:
           filters: *filter-only-stable
           type: approval
+
       - publish_npm_package:
           requires:
-            - checkout_code
             - approve_publish_npm_package

From bedaaa1419aa31fabf6dbf7a7f5ad294af1f4b5e Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Mon, 12 Feb 2018 13:57:50 -0800
Subject: [PATCH 004/267] React sync for revisions 467b103...a634e53

Reviewed By: flarnie

Differential Revision: D6965585

fbshipit-source-id: 48c20d0010f4daf83272a36b3bdaca94493ab8fa
---
 Libraries/Renderer/REVISION                   |  2 +-
 Libraries/Renderer/ReactFabric-dev.js         | 21 ++++++++++++-------
 Libraries/Renderer/ReactNativeRenderer-dev.js | 21 ++++++++++++-------
 package.json                                  |  4 ++--
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/Libraries/Renderer/REVISION b/Libraries/Renderer/REVISION
index 981ea0ea492919..fe141ab8098dae 100644
--- a/Libraries/Renderer/REVISION
+++ b/Libraries/Renderer/REVISION
@@ -1 +1 @@
-467b1034ce8af6807e11deb9dfeca4d4e922ed82
\ No newline at end of file
+a634e53d2ff376366aa87815ad4de064494cd05e
\ No newline at end of file
diff --git a/Libraries/Renderer/ReactFabric-dev.js b/Libraries/Renderer/ReactFabric-dev.js
index 475dd17d22ae91..f3ef96ccd7f284 100644
--- a/Libraries/Renderer/ReactFabric-dev.js
+++ b/Libraries/Renderer/ReactFabric-dev.js
@@ -3881,6 +3881,8 @@ var NativeMethodsMixin = {
       !NativeMethodsMixin_DEV.UNSAFE_componentWillReceiveProps,
     "Do not override existing functions."
   );
+  // TODO (bvaughn) Remove cWM and cWRP in a future version of React Native,
+  // Once these lifecycles have been remove from the reconciler.
   NativeMethodsMixin_DEV.componentWillMount = function() {
     throwOnStylesProp(this, this.props);
   };
@@ -3893,6 +3895,12 @@ var NativeMethodsMixin = {
   NativeMethodsMixin_DEV.UNSAFE_componentWillReceiveProps = function(newProps) {
     throwOnStylesProp(this, newProps);
   };
+
+  // React may warn about cWM/cWRP/cWU methods being deprecated.
+  // Add a flag to suppress these warnings for this special case.
+  // TODO (bvaughn) Remove this flag once the above methods have been removed.
+  NativeMethodsMixin_DEV.componentWillMount.__suppressDeprecationWarning = true;
+  NativeMethodsMixin_DEV.componentWillReceiveProps.__suppressDeprecationWarning = true;
 }
 
 function _classCallCheck$1(instance, Constructor) {
@@ -6008,19 +6016,16 @@ var ReactStrictModeWarnings = {
     }
 
     // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
     if (
       typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
+      instance.componentWillMount.__suppressDeprecationWarning !== true
     ) {
-      return;
-    }
-
-    if (typeof instance.componentWillMount === "function") {
       pendingComponentWillMountWarnings.push(fiber);
     }
-    if (typeof instance.componentWillReceiveProps === "function") {
+    if (
+      typeof instance.componentWillReceiveProps === "function" &&
+      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
+    ) {
       pendingComponentWillReceivePropsWarnings.push(fiber);
     }
     if (typeof instance.componentWillUpdate === "function") {
diff --git a/Libraries/Renderer/ReactNativeRenderer-dev.js b/Libraries/Renderer/ReactNativeRenderer-dev.js
index 15ee4136d11ae6..e562e89af0489d 100644
--- a/Libraries/Renderer/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/ReactNativeRenderer-dev.js
@@ -3881,6 +3881,8 @@ var NativeMethodsMixin = {
       !NativeMethodsMixin_DEV.UNSAFE_componentWillReceiveProps,
     "Do not override existing functions."
   );
+  // TODO (bvaughn) Remove cWM and cWRP in a future version of React Native,
+  // Once these lifecycles have been remove from the reconciler.
   NativeMethodsMixin_DEV.componentWillMount = function() {
     throwOnStylesProp(this, this.props);
   };
@@ -3893,6 +3895,12 @@ var NativeMethodsMixin = {
   NativeMethodsMixin_DEV.UNSAFE_componentWillReceiveProps = function(newProps) {
     throwOnStylesProp(this, newProps);
   };
+
+  // React may warn about cWM/cWRP/cWU methods being deprecated.
+  // Add a flag to suppress these warnings for this special case.
+  // TODO (bvaughn) Remove this flag once the above methods have been removed.
+  NativeMethodsMixin_DEV.componentWillMount.__suppressDeprecationWarning = true;
+  NativeMethodsMixin_DEV.componentWillReceiveProps.__suppressDeprecationWarning = true;
 }
 
 function _classCallCheck$1(instance, Constructor) {
@@ -5919,19 +5927,16 @@ var ReactStrictModeWarnings = {
     }
 
     // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
     if (
       typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
+      instance.componentWillMount.__suppressDeprecationWarning !== true
     ) {
-      return;
-    }
-
-    if (typeof instance.componentWillMount === "function") {
       pendingComponentWillMountWarnings.push(fiber);
     }
-    if (typeof instance.componentWillReceiveProps === "function") {
+    if (
+      typeof instance.componentWillReceiveProps === "function" &&
+      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
+    ) {
       pendingComponentWillReceivePropsWarnings.push(fiber);
     }
     if (typeof instance.componentWillUpdate === "function") {
diff --git a/package.json b/package.json
index 92be465f9c5c5c..22ecc1725b9951 100644
--- a/package.json
+++ b/package.json
@@ -219,8 +219,8 @@
     "jest": "22.2.1",
     "jest-junit": "3.5.0",
     "prettier": "1.9.1",
-    "react": "^16.3.0-alpha.0",
-    "react-test-renderer": "^16.3.0-alpha.0",
+    "react": "^16.3.0-alpha.1",
+    "react-test-renderer": "^16.3.0-alpha.1",
     "shelljs": "^0.7.8",
     "sinon": "^2.2.0"
   }

From 427e464bb95e4e0ecc7455e71b5d477014618200 Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Mon, 12 Feb 2018 16:29:16 -0800
Subject: [PATCH 005/267] Fix localization crash in DevSettingsActivity

Differential Revision: D6970534

fbshipit-source-id: da1df549b6157e5ec684cf4eed5f411740a73ed0
---
 .../java/com/facebook/react/devsupport/DevSettingsActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java
index 3b39ea13acbaa8..13a6efdb41cbb4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java
@@ -24,7 +24,7 @@ public class DevSettingsActivity extends PreferenceActivity {
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    setTitle(R.string.catalyst_settings_title);
+    setTitle(getApplication().getResources().getString(R.string.catalyst_settings_title));
     addPreferencesFromResource(R.xml.preferences);
   }
 }

From 54870e0c6ca8611fed775e5ba12a0d6d9b1cdbd7 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Mon, 12 Feb 2018 18:43:17 -0800
Subject: [PATCH 006/267] Add UTFSequence module for common unicode usage

Summary:
A collection of Unicode sequences for various characters and emoji.

  - More explicit than using the sequences directly in code.
  - Source code should be limitted to ASCII.
  - Less chance of typos.

Reviewed By: TheSavior

Differential Revision: D6969065

fbshipit-source-id: c11ec96b74f5dfa7c624a3c53f3c29f6284a82b3
---
 Libraries/UTFSequence.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 Libraries/UTFSequence.js

diff --git a/Libraries/UTFSequence.js b/Libraries/UTFSequence.js
new file mode 100644
index 00000000000000..262dd4e9bbf68d
--- /dev/null
+++ b/Libraries/UTFSequence.js
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2016-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule UTFSequence
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+/**
+ * A collection of Unicode sequences for various characters and emoji.
+ *
+ *  - More explicit than using the sequences directly in code.
+ *  - Source code should be limitted to ASCII.
+ *  - Less chance of typos.
+ */
+const UTFSequence = {
+  MIDDOT: '\u00B7', // normal middle dot: &middot;
+  MIDDOT_SP: '\u00A0\u00B7\u00A0', // &nbsp;&middot;&nbsp;
+  MIDDOT_KATAKANA: '\u30FB', // katakana middle dot
+  MDASH: '\u2014', // em dash: &mdash;
+  MDASH_SP: '\u00A0\u2014\u00A0', // &nbsp;&mdash;&nbsp;
+  NDASH: '\u2013', // en dash: &ndash;
+  NDASH_SP: '\u00A0\u2013\u00A0', // &nbsp;&ndash;&nbsp;
+  NBSP: '\u00A0', // non-breaking space: &nbsp;
+  PIZZA: '\uD83C\uDF55',
+};
+
+module.exports = UTFSequence;

From 4d0ee37293b5e21fc3c7a8c6edd72c9ff899df7d Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Mon, 12 Feb 2018 18:43:21 -0800
Subject: [PATCH 007/267] Add FDSStoryHeader

Reviewed By: TheSavior

Differential Revision: D6945233

fbshipit-source-id: 9630a72e4a7c88ca282392c374ca88326f282713
---
 Libraries/Image/AssetSourceResolver.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Libraries/Image/AssetSourceResolver.js b/Libraries/Image/AssetSourceResolver.js
index db7f642b862d0b..f8166c07d41ac8 100644
--- a/Libraries/Image/AssetSourceResolver.js
+++ b/Libraries/Image/AssetSourceResolver.js
@@ -12,13 +12,13 @@
  */
 'use strict';
 
-export type ResolvedAssetSource = {
-  __packager_asset: boolean,
-  width: ?number,
-  height: ?number,
-  uri: string,
-  scale: number,
-};
+export type ResolvedAssetSource = {|
+  +__packager_asset: boolean,
+  +width: ?number,
+  +height: ?number,
+  +uri: string,
+  +scale: number,
+|};
 
 import type {PackagerAsset} from 'AssetRegistry';
 

From 6893a26bfb06a2d8ad9d23a572f4d9143305d905 Mon Sep 17 00:00:00 2001
From: Peter van der Zee <kuvos@fb.com>
Date: Tue, 13 Feb 2018 01:22:04 -0800
Subject: [PATCH 008/267] Fix duplicate var name declaration

Reviewed By: rafeca

Differential Revision: D6965150

fbshipit-source-id: 332c8202f350e2014fedb9790f3d895222fb4f8d
---
 Libraries/Alert/AlertIOS.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Libraries/Alert/AlertIOS.js b/Libraries/Alert/AlertIOS.js
index b42b57c29ae481..8f4170a5a616fb 100644
--- a/Libraries/Alert/AlertIOS.js
+++ b/Libraries/Alert/AlertIOS.js
@@ -122,11 +122,10 @@ class AlertIOS {
         'keyboardType) and the old syntax will be removed in a future version.');
 
       var callback = type;
-      var defaultValue = message;
       RCTAlertManager.alertWithArgs({
         title: title || '',
         type: 'plain-text',
-        defaultValue,
+        defaultValue: message,
       }, (id, value) => {
         callback(value);
       });

From 1673c570f984d86e88a3b6b44eb78f4848eb0515 Mon Sep 17 00:00:00 2001
From: Eric Rozell <erozell@outlook.com>
Date: Tue, 13 Feb 2018 04:57:18 -0800
Subject: [PATCH 009/267] Uses a single code path to link and unlink all
 platforms

Summary:
This commit removes special cases for linking iOS and Android platforms.

A previous commit opened up link and other commands for other platforms to provide their own behaviors. It left special cases in tact for iOS and Android. This PR removes the special case.

- Added jest tests related to the link command.
- Ran the `link` and `unlink` commands for iOS and Android and confirmed no changes.

https://github.com/facebook/react-native/pull/17745

<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->

[CLI][FEATURE][local-cli/link/link.js] - Removes special cases for linking in iOS and Android.
Closes https://github.com/facebook/react-native/pull/17961

Differential Revision: D6975951

Pulled By: hramos

fbshipit-source-id: 8dd5da35619e2124ce4b3b18db8b694757792363
---
 local-cli/core/android/index.js               |  2 +
 local-cli/core/ios/index.js                   |  2 +
 local-cli/link/__tests__/link.spec.js         | 10 ++-
 local-cli/link/android/copyAssets.js          |  4 +-
 local-cli/link/android/index.js               |  9 ++
 local-cli/link/android/unlinkAssets.js        |  4 +-
 local-cli/link/ios/common/isInstalled.js      |  6 ++
 .../link/ios/common/registerNativeModule.js   | 16 ++++
 .../link/ios/common/unregisterNativeModule.js | 22 +++++
 local-cli/link/ios/index.js                   |  9 ++
 local-cli/link/link.js                        | 76 +---------------
 local-cli/link/pods/registerNativeModule.js   |  4 +-
 local-cli/link/unlink.js                      | 87 ++++---------------
 13 files changed, 97 insertions(+), 154 deletions(-)
 create mode 100644 local-cli/link/android/index.js
 create mode 100644 local-cli/link/ios/common/isInstalled.js
 create mode 100644 local-cli/link/ios/common/registerNativeModule.js
 create mode 100644 local-cli/link/ios/common/unregisterNativeModule.js
 create mode 100644 local-cli/link/ios/index.js

diff --git a/local-cli/core/android/index.js b/local-cli/core/android/index.js
index cc229d298f4fd9..68d2a073c52e13 100644
--- a/local-cli/core/android/index.js
+++ b/local-cli/core/android/index.js
@@ -126,3 +126,5 @@ exports.dependencyConfig = function dependencyConfigAndroid(folder, userConfig)
 
   return { sourceDir, folder, manifest, packageImportPath, packageInstance };
 };
+
+exports.linkConfig = require('../../link/android');
diff --git a/local-cli/core/ios/index.js b/local-cli/core/ios/index.js
index 6bca5946352085..0d69ac9f11129f 100644
--- a/local-cli/core/ios/index.js
+++ b/local-cli/core/ios/index.js
@@ -57,3 +57,5 @@ exports.projectConfig = function projectConfigIOS(folder, userConfig) {
 };
 
 exports.dependencyConfig = exports.projectConfig;
+
+exports.linkConfig = require('../../link/ios');
diff --git a/local-cli/link/__tests__/link.spec.js b/local-cli/link/__tests__/link.spec.js
index b3470563d7ce40..f15fc3fee43a58 100644
--- a/local-cli/link/__tests__/link.spec.js
+++ b/local-cli/link/__tests__/link.spec.js
@@ -81,8 +81,10 @@ describe('link', () => {
   it('should register native module when android/ios projects are present', (done) => {
     const registerNativeModule = sinon.stub();
     const dependencyConfig = {android: {}, ios: {}, assets: [], commands: {}};
+    const androidLinkConfig = require('../android');
+    const iosLinkConfig = require('../ios');
     const config = {
-      getPlatformConfig: () => ({ios: {}, android: {}}),
+      getPlatformConfig: () => ({ios: { linkConfig: iosLinkConfig }, android: { linkConfig: androidLinkConfig }}),
       getProjectConfig: () => ({android: {}, ios: {}, assets: []}),
       getDependencyConfig: sinon.stub().returns(dependencyConfig),
     };
@@ -223,8 +225,9 @@ describe('link', () => {
       sinon.stub().returns(false)
     );
 
+    const linkConfig = require('../ios');
     const config = {
-      getPlatformConfig: () => ({ ios: {}}),
+      getPlatformConfig: () => ({ ios: { linkConfig: linkConfig }}),
       getProjectConfig: () => ({ ios: {}, assets: [] }),
       getDependencyConfig: sinon.stub().returns({
         ios: {}, assets: [], commands: { prelink, postlink },
@@ -251,8 +254,9 @@ describe('link', () => {
       copyAssets
     );
 
+    const linkConfig = require('../ios');
     const config = {
-      getPlatformConfig: () => ({ ios: {} }),
+      getPlatformConfig: () => ({ ios: { linkConfig: linkConfig } }),
       getProjectConfig: () => ({ ios: {}, assets: projectAssets }),
       getDependencyConfig: sinon.stub().returns(dependencyConfig),
     };
diff --git a/local-cli/link/android/copyAssets.js b/local-cli/link/android/copyAssets.js
index 0f41a301c63b9a..6b3702fa7afeec 100644
--- a/local-cli/link/android/copyAssets.js
+++ b/local-cli/link/android/copyAssets.js
@@ -17,10 +17,10 @@ const groupFilesByType = require('../groupFilesByType');
  * For now, the only types of files that are handled are:
  * - Fonts (otf, ttf) - copied to targetPath/fonts under original name
  */
-module.exports = function copyAssetsAndroid(files, targetPath) {
+module.exports = function copyAssetsAndroid(files, project) {
   const assets = groupFilesByType(files);
 
   (assets.font || []).forEach(asset =>
-    fs.copySync(asset, path.join(targetPath, 'fonts', path.basename(asset)))
+    fs.copySync(asset, path.join(project.assetsPath, 'fonts', path.basename(asset)))
   );
 };
diff --git a/local-cli/link/android/index.js b/local-cli/link/android/index.js
new file mode 100644
index 00000000000000..986ec59450b8dd
--- /dev/null
+++ b/local-cli/link/android/index.js
@@ -0,0 +1,9 @@
+module.exports = function() {
+  return {
+    isInstalled: require('./isInstalled'),
+    register: require('./registerNativeModule'),
+    unregister: require('./unregisterNativeModule'),
+    copyAssets: require('./copyAssets'),
+    unlinkAssets: require('./unlinkAssets')
+  };
+};
diff --git a/local-cli/link/android/unlinkAssets.js b/local-cli/link/android/unlinkAssets.js
index 6c8b02191ecd9e..dbaae6f7bcc9ba 100644
--- a/local-cli/link/android/unlinkAssets.js
+++ b/local-cli/link/android/unlinkAssets.js
@@ -17,11 +17,11 @@ const groupFilesByType = require('../groupFilesByType');
  * For now, the only types of files that are handled are:
  * - Fonts (otf, ttf) - copied to targetPath/fonts under original name
  */
-module.exports = function unlinkAssetsAndroid(files, targetPath) {
+module.exports = function unlinkAssetsAndroid(files, project) {
   const assets = groupFilesByType(files);
 
   (assets.font || []).forEach((file) => {
-    const filePath = path.join(targetPath, 'fonts', path.basename(file));
+    const filePath = path.join(project.assetsPath, 'fonts', path.basename(file));
     if (fs.existsSync(filePath)) {
       fs.unlinkSync(filePath);
     }
diff --git a/local-cli/link/ios/common/isInstalled.js b/local-cli/link/ios/common/isInstalled.js
new file mode 100644
index 00000000000000..a7a5f2d07d192e
--- /dev/null
+++ b/local-cli/link/ios/common/isInstalled.js
@@ -0,0 +1,6 @@
+const isInstalledIOS = require('../isInstalled');
+const isInstalledPods = require('../../pods/isInstalled');
+
+module.exports = function isInstalled(config, name) {
+  return isInstalledIOS(config, name) || isInstalledPods(config, name);
+};
diff --git a/local-cli/link/ios/common/registerNativeModule.js b/local-cli/link/ios/common/registerNativeModule.js
new file mode 100644
index 00000000000000..38ce59606982ca
--- /dev/null
+++ b/local-cli/link/ios/common/registerNativeModule.js
@@ -0,0 +1,16 @@
+const registerDependencyIOS = require('../registerNativeModule');
+const registerDependencyPods = require('../../pods/registerNativeModule');
+
+module.exports = function registerNativeModule(
+  name,
+  dependencyConfig,
+  params,
+  projectConfig
+) {
+  if (projectConfig.podfile && dependencyConfig.podspec) {
+    registerDependencyPods(name, dependencyConfig, projectConfig);
+  }
+  else {
+    registerDependencyIOS(dependencyConfig, projectConfig);
+  }
+};
diff --git a/local-cli/link/ios/common/unregisterNativeModule.js b/local-cli/link/ios/common/unregisterNativeModule.js
new file mode 100644
index 00000000000000..b42882623fbe34
--- /dev/null
+++ b/local-cli/link/ios/common/unregisterNativeModule.js
@@ -0,0 +1,22 @@
+const compact = require('lodash').compact;
+const isInstalledIOS = require('../isInstalled');
+const isInstalledPods = require('../../pods/isInstalled');
+const unregisterDependencyIOS = require('../registerNativeModule');
+const unregisterDependencyPods = require('../../pods/registerNativeModule');
+
+module.exports = function unregisterNativeModule(
+  name,
+  dependencyConfig,
+  projectConfig,
+  otherDependencies
+) {
+  const isIosInstalled = isInstalledIOS(projectConfig, dependencyConfig);
+  const isPodInstalled = isInstalledPods(projectConfig, dependencyConfig);
+  if (isIosInstalled) {
+    const iOSDependencies = compact(otherDependencies.map(d => d.config.ios));
+    unregisterDependencyIOS(dependencyConfig, projectConfig, iOSDependencies);
+  }
+  else if (isPodInstalled) {
+    unregisterDependencyPods(dependencyConfig, projectConfig);
+  }
+};
diff --git a/local-cli/link/ios/index.js b/local-cli/link/ios/index.js
new file mode 100644
index 00000000000000..9653b3be80a1d1
--- /dev/null
+++ b/local-cli/link/ios/index.js
@@ -0,0 +1,9 @@
+module.exports = function() {
+  return {
+    isInstalled: require('./common/isInstalled'),
+    register: require('./common/registerNativeModule'),
+    unregister: require('./common/unregisterNativeModule'),
+    copyAssets: require('./copyAssets'),
+    unlinkAssets: require('./unlinkAssets')
+  };
+};
diff --git a/local-cli/link/link.js b/local-cli/link/link.js
index ac0aba2a679ebd..8711f278bd08cc 100644
--- a/local-cli/link/link.js
+++ b/local-cli/link/link.js
@@ -26,14 +26,6 @@ const chalk = require('chalk');
  * run Flow. */
 const isEmpty = require('lodash').isEmpty;
 const promiseWaterfall = require('./promiseWaterfall');
-const registerDependencyAndroid = require('./android/registerNativeModule');
-const registerDependencyIOS = require('./ios/registerNativeModule');
-const registerDependencyPods = require('./pods/registerNativeModule');
-const isInstalledAndroid = require('./android/isInstalled');
-const isInstalledIOS = require('./ios/isInstalled');
-const isInstalledPods = require('./pods/isInstalled');
-const copyAssetsAndroid = require('./android/copyAssets');
-const copyAssetsIOS = require('./ios/copyAssets');
 const getProjectDependencies = require('./getProjectDependencies');
 const getDependencyConfig = require('./getDependencyConfig');
 const pollParams = require('./pollParams');
@@ -47,37 +39,8 @@ log.heading = 'rnpm-link';
 
 const dedupeAssets = (assets) => uniqBy(assets, asset => path.basename(asset));
 
-
-const linkDependencyAndroid = (androidProject, dependency) => {
-  if (!androidProject || !dependency.config.android) {
-    return null;
-  }
-
-  const isInstalled = isInstalledAndroid(androidProject, dependency.name);
-
-  if (isInstalled) {
-    log.info(chalk.grey(`Android module ${dependency.name} is already linked`));
-    return null;
-  }
-
-  return pollParams(dependency.config.params).then(params => {
-    log.info(`Linking ${dependency.name} android dependency`);
-
-    registerDependencyAndroid(
-      dependency.name,
-      dependency.config.android,
-      params,
-      androidProject
-    );
-
-    log.info(`Android module ${dependency.name} has been successfully linked`);
-  });
-};
-
-const linkDependencyPlatforms = (platforms, project, dependency) => {
-  const ignorePlatforms = ['android', 'ios'];
+const linkDependency = (platforms, project, dependency) => {
   Object.keys(platforms || {})
-    .filter(platform => ignorePlatforms.indexOf(platform) < 0)
     .forEach(platform => {
       if (!project[platform] || !dependency.config[platform]) {
         return null;
@@ -110,45 +73,12 @@ const linkDependencyPlatforms = (platforms, project, dependency) => {
     });
 };
 
-const linkDependencyIOS = (iOSProject, dependency) => {
-  if (!iOSProject || !dependency.config.ios) {
-    return;
-  }
-
-  const isInstalled = isInstalledIOS(iOSProject, dependency.config.ios) || isInstalledPods(iOSProject, dependency.config.ios);
-  if (isInstalled) {
-    log.info(chalk.grey(`iOS module ${dependency.name} is already linked`));
-    return;
-  }
-
-  log.info(`Linking ${dependency.name} ios dependency`);
-  if (iOSProject.podfile && dependency.config.ios.podspec) {
-    registerDependencyPods(dependency, iOSProject);
-  }
-  else {
-    registerDependencyIOS(dependency.config.ios, iOSProject);
-  }
-  log.info(`iOS module ${dependency.name} has been successfully linked`);
-};
-
 const linkAssets = (platforms, project, assets) => {
   if (isEmpty(assets)) {
     return;
   }
 
-  if (project.ios) {
-    log.info('Linking assets to ios project');
-    copyAssetsIOS(assets, project.ios);
-  }
-
-  if (project.android) {
-    log.info('Linking assets to android project');
-    copyAssetsAndroid(assets, project.android.assetsPath);
-  }
-
-  const ignorePlatforms = ['android', 'ios'];
   Object.keys(platforms || {})
-    .filter(platform => ignorePlatforms.indexOf(platform) < 0)
     .forEach(platform => {
       const linkConfig = platforms[platform] && platforms[platform].linkConfig && platforms[platform].linkConfig();
       if (!linkConfig || !linkConfig.copyAssets) {
@@ -212,9 +142,7 @@ function link(args: Array<string>, config: RNConfig) {
 
   const tasks = flatten(dependencies.map(dependency => [
     () => promisify(dependency.config.commands.prelink || commandStub),
-    () => linkDependencyAndroid(project.android, dependency),
-    () => linkDependencyIOS(project.ios, dependency),
-    () => linkDependencyPlatforms(platforms, project, dependency),
+    () => linkDependency(platforms, project, dependency),
     () => promisify(dependency.config.commands.postlink || commandStub),
   ]));
 
diff --git a/local-cli/link/pods/registerNativeModule.js b/local-cli/link/pods/registerNativeModule.js
index 1032f244861228..37041cf78322c8 100644
--- a/local-cli/link/pods/registerNativeModule.js
+++ b/local-cli/link/pods/registerNativeModule.js
@@ -16,10 +16,10 @@ const findMarkedLinesInPodfile = require('./findMarkedLinesInPodfile');
 const addPodEntry = require('./addPodEntry');
 const savePodFile = require('./savePodFile');
 
-module.exports = function registerNativeModulePods(dependency, iOSProject) {
+module.exports = function registerNativeModulePods(name, dependencyConfig, iOSProject) {
   const podLines = readPodfile(iOSProject.podfile);
   const linesToAddEntry = getLinesToAddEntry(podLines, iOSProject);
-  addPodEntry(podLines, linesToAddEntry, dependency.config.ios.podspec, dependency.name);
+  addPodEntry(podLines, linesToAddEntry, dependencyConfig.podspec, name);
   savePodFile(iOSProject.podfile, podLines);
 };
 
diff --git a/local-cli/link/unlink.js b/local-cli/link/unlink.js
index 5c54526dfcc589..ed3772c4b45c39 100644
--- a/local-cli/link/unlink.js
+++ b/local-cli/link/unlink.js
@@ -10,16 +10,7 @@
 const log = require('npmlog');
 
 const getProjectDependencies = require('./getProjectDependencies');
-const unregisterDependencyAndroid = require('./android/unregisterNativeModule');
-const unregisterDependencyIOS = require('./ios/unregisterNativeModule');
-const unregisterDependencyPods = require('./pods/unregisterNativeModule');
-const isInstalledAndroid = require('./android/isInstalled');
-const isInstalledIOS = require('./ios/isInstalled');
-const isInstalledPods = require('./pods/isInstalled');
-const unlinkAssetsAndroid = require('./android/unlinkAssets');
-const unlinkAssetsIOS = require('./ios/unlinkAssets');
 const getDependencyConfig = require('./getDependencyConfig');
-const compact = require('lodash').compact;
 const difference = require('lodash').difference;
 const filter = require('lodash').filter;
 const flatten = require('lodash').flatten;
@@ -30,38 +21,17 @@ const promisify = require('./promisify');
 
 log.heading = 'rnpm-link';
 
-const unlinkDependencyAndroid = (androidProject, dependency, packageName) => {
-  if (!androidProject || !dependency.android) {
-    return;
-  }
-
-  const isInstalled = isInstalledAndroid(androidProject, packageName);
-
-  if (!isInstalled) {
-    log.info(`Android module ${packageName} is not installed`);
-    return;
-  }
-
-  log.info(`Unlinking ${packageName} android dependency`);
-
-  unregisterDependencyAndroid(packageName, dependency.android, androidProject);
+const unlinkDependency = (platforms, project, dependency, packageName, otherDependencies) => {
 
-  log.info(`Android module ${packageName} has been successfully unlinked`);
-};
-
-const unlinkDependencyPlatforms = (platforms, project, dependency, packageName) => {
-
-  const ignorePlatforms = ['android', 'ios'];
   Object.keys(platforms || {})
-    .filter(platform => ignorePlatforms.indexOf(platform) < 0)
     .forEach(platform => {
       if (!project[platform] || !dependency[platform]) {
-        return null;
+        return;
       }
 
       const linkConfig = platforms[platform] && platforms[platform].linkConfig && platforms[platform].linkConfig();
       if (!linkConfig || !linkConfig.isInstalled || !linkConfig.unregister) {
-        return null;
+        return;
       }
 
       const isInstalled = linkConfig.isInstalled(project[platform], dependency[platform]);
@@ -76,37 +46,14 @@ const unlinkDependencyPlatforms = (platforms, project, dependency, packageName)
       linkConfig.unregister(
         packageName,
         dependency[platform],
-        project[platform]
+        project[platform],
+        otherDependencies
       );
 
       log.info(`Platform '${platform}' module ${dependency.name} has been successfully unlinked`);
     });
 };
 
-const unlinkDependencyIOS = (iOSProject, dependency, packageName, iOSDependencies) => {
-  if (!iOSProject || !dependency.ios) {
-    return;
-  }
-
-  const isIosInstalled = isInstalledIOS(iOSProject, dependency.ios);
-  const isPodInstalled = isInstalledPods(iOSProject, dependency.ios);
-  if (!isIosInstalled && !isPodInstalled) {
-    log.info(`iOS module ${packageName} is not installed`);
-    return;
-  }
-
-  log.info(`Unlinking ${packageName} ios dependency`);
-
-  if (isIosInstalled) {
-    unregisterDependencyIOS(dependency.ios, iOSProject, iOSDependencies);
-  }
-  else if (isPodInstalled) {
-    unregisterDependencyPods(dependency.ios, iOSProject);
-  }
-
-  log.info(`iOS module ${packageName} has been successfully unlinked`);
-};
-
 /**
  * Updates project and unlink specific dependency
  *
@@ -143,13 +90,10 @@ function unlink(args, config) {
 
   const allDependencies = getDependencyConfig(config, getProjectDependencies());
   const otherDependencies = filter(allDependencies, d => d.name !== packageName);
-  const iOSDependencies = compact(otherDependencies.map(d => d.config.ios));
 
   const tasks = [
     () => promisify(dependency.commands.preunlink || commandStub),
-    () => unlinkDependencyAndroid(project.android, dependency, packageName),
-    () => unlinkDependencyIOS(project.ios, dependency, packageName, iOSDependencies),
-    () => unlinkDependencyPlatforms(platforms, project, dependency, packageName),
+    () => unlinkDependency(platforms, project, dependency, packageName, otherDependencies),
     () => promisify(dependency.commands.postunlink || commandStub)
   ];
 
@@ -166,15 +110,16 @@ function unlink(args, config) {
         return Promise.resolve();
       }
 
-      if (project.ios) {
-        log.info('Unlinking assets from ios project');
-        unlinkAssetsIOS(assets, project.ios);
-      }
-
-      if (project.android) {
-        log.info('Unlinking assets from android project');
-        unlinkAssetsAndroid(assets, project.android.assetsPath);
-      }
+      Object.keys(platforms || {})
+        .forEach(platform => {
+          const linkConfig = platforms[platform] && platforms[platform].linkConfig && platforms[platform].linkConfig();
+          if (!linkConfig || !linkConfig.unlinkAssets) {
+            return;
+          }
+    
+          log.info(`Unlinking assets from ${platform} project`);
+          linkConfig.unlinkAssets(assets, project[platform]);
+        });
 
       log.info(
         `${packageName} assets has been successfully unlinked from your project`

From b1d8af48ae251f57bdcd55f89d8fc62aa9eca872 Mon Sep 17 00:00:00 2001
From: Rafael Oleza <rafeca@fb.com>
Date: Tue, 13 Feb 2018 07:04:00 -0800
Subject: [PATCH 010/267] Bump metro@0.26.0

Reviewed By: cpojer

Differential Revision: D6976161

fbshipit-source-id: 0cf20f4b2372997a8aac41cc07a9bdd641a93ad4
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 22ecc1725b9951..fd029432790838 100644
--- a/package.json
+++ b/package.json
@@ -175,8 +175,8 @@
     "graceful-fs": "^4.1.3",
     "inquirer": "^3.0.6",
     "lodash": "^4.17.5",
-    "metro": "^0.25.1",
-    "metro-core": "^0.25.1",
+    "metro": "^0.26.0",
+    "metro-core": "^0.26.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",

From ad2d9e7fab4ea4c51c8c35f7bafe2dada4c29643 Mon Sep 17 00:00:00 2001
From: Paco Estevez Garcia <festevezga@fb.com>
Date: Tue, 13 Feb 2018 08:06:43 -0800
Subject: [PATCH 011/267] Forward VM version to inspector

Reviewed By: bnham

Differential Revision: D6938018

fbshipit-source-id: c79853ddf835acab86a16ebd539874d29d3aa60a
---
 React/Inspector/RCTInspector.h                        |  1 +
 React/Inspector/RCTInspector.mm                       |  9 +++++++--
 React/Inspector/RCTInspectorPackagerConnection.m      |  1 +
 .../java/com/facebook/react/bridge/Inspector.java     |  8 +++++++-
 .../react/devsupport/InspectorPackagerConnection.java |  1 +
 ReactAndroid/src/main/jni/react/jni/JInspector.cpp    |  8 ++++----
 ReactAndroid/src/main/jni/react/jni/JInspector.h      |  2 +-
 ReactCommon/jsinspector/InspectorInterfaces.cpp       | 11 ++++++-----
 ReactCommon/jsinspector/InspectorInterfaces.h         |  3 ++-
 9 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/React/Inspector/RCTInspector.h b/React/Inspector/RCTInspector.h
index 1fcba088e4502a..41bd146e003192 100644
--- a/React/Inspector/RCTInspector.h
+++ b/React/Inspector/RCTInspector.h
@@ -15,6 +15,7 @@
 @interface RCTInspectorPage : NSObject
 @property (nonatomic, readonly) NSInteger id;
 @property (nonatomic, readonly) NSString *title;
+@property (nonatomic, readonly) NSString *vm;
 @end
 
 @interface RCTInspector : NSObject
diff --git a/React/Inspector/RCTInspector.mm b/React/Inspector/RCTInspector.mm
index 1cc3d1d3a5b9b9..0bb83db45675ab 100644
--- a/React/Inspector/RCTInspector.mm
+++ b/React/Inspector/RCTInspector.mm
@@ -38,9 +38,11 @@ virtual void onDisconnect() override {
 @interface RCTInspectorPage () {
   NSInteger _id;
   NSString *_title;
+  NSString *_vm;
 }
 - (instancetype)initWithId:(NSInteger)id
-                     title:(NSString *)title;
+                     title:(NSString *)title
+                     vm:(NSString *)vm;
 @end
 
 @interface RCTInspectorLocalConnection () {
@@ -64,7 +66,8 @@ @implementation RCTInspector
   NSMutableArray<RCTInspectorPage *> *array = [NSMutableArray arrayWithCapacity:pages.size()];
   for (size_t i = 0; i < pages.size(); i++) {
     RCTInspectorPage *pageWrapper = [[RCTInspectorPage alloc] initWithId:pages[i].id
-                                                                   title:@(pages[i].title.c_str())];
+                                                                   title:@(pages[i].title.c_str())
+                                                                   vm:@(pages[i].vm.c_str())];
     [array addObject:pageWrapper];
 
   }
@@ -86,10 +89,12 @@ @implementation RCTInspectorPage
 
 - (instancetype)initWithId:(NSInteger)id
                      title:(NSString *)title
+                        vm:(NSString *)vm
 {
   if (self = [super init]) {
     _id = id;
     _title = title;
+    _vm = vm;
   }
   return self;
 }
diff --git a/React/Inspector/RCTInspectorPackagerConnection.m b/React/Inspector/RCTInspectorPackagerConnection.m
index cf1cd2abf557a3..1b2663403ce2e3 100644
--- a/React/Inspector/RCTInspectorPackagerConnection.m
+++ b/React/Inspector/RCTInspectorPackagerConnection.m
@@ -155,6 +155,7 @@ - (NSArray *)pages
       @"id": [@(page.id) stringValue],
       @"title": page.title,
       @"app": [[NSBundle mainBundle] bundleIdentifier],
+      @"vm": page.vm,
       @"isLastBundleDownloadSuccess": bundleStatus == nil
         ? [NSNull null]
         : @(bundleStatus.isLastBundleDownloadSuccess),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java
index 372b9ad90d820a..9aebad6c7182ec 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java
@@ -51,6 +51,7 @@ private Inspector(HybridData hybridData) {
   public static class Page {
     private final int mId;
     private final String mTitle;
+    private final String mVM;
 
     public int getId() {
       return mId;
@@ -60,6 +61,10 @@ public String getTitle() {
       return mTitle;
     }
 
+    public String getVM() {
+      return mVM;
+    }
+
     @Override
     public String toString() {
       return "Page{" +
@@ -69,9 +74,10 @@ public String toString() {
     }
 
     @DoNotStrip
-    private Page(int id, String title) {
+    private Page(int id, String title, String vm) {
       mId = id;
       mTitle = title;
+      mVM = vm;
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
index 1176d38caf3ec5..8df47d9d3a076d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
@@ -154,6 +154,7 @@ private JSONArray getPages() throws JSONException {
       jsonPage.put("id", String.valueOf(page.getId()));
       jsonPage.put("title", page.getTitle());
       jsonPage.put("app", mPackageName);
+      jsonPage.put("vm", page.getVM());
       jsonPage.put("isLastBundleDownloadSuccess", bundleStatus.isLastDownloadSucess);
       jsonPage.put("bundleUpdateTimestamp", bundleStatus.updateTimestamp);
       array.put(jsonPage);
diff --git a/ReactAndroid/src/main/jni/react/jni/JInspector.cpp b/ReactAndroid/src/main/jni/react/jni/JInspector.cpp
index 8e64ce1ad20ffd..47000279487ed7 100644
--- a/ReactAndroid/src/main/jni/react/jni/JInspector.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JInspector.cpp
@@ -28,9 +28,9 @@ class RemoteConnection : public IRemoteConnection {
 
 }
 
-jni::local_ref<JPage::javaobject> JPage::create(int id, const std::string& title) {
-  static auto constructor = javaClassStatic()->getConstructor<JPage::javaobject(jint, jni::local_ref<jni::JString>)>();
-  return javaClassStatic()->newObject(constructor, id, jni::make_jstring(title));
+jni::local_ref<JPage::javaobject> JPage::create(int id, const std::string& title, const std::string& vm) {
+  static auto constructor = javaClassStatic()->getConstructor<JPage::javaobject(jint, jni::local_ref<jni::JString>, jni::local_ref<jni::JString>)>();
+  return javaClassStatic()->newObject(constructor, id, jni::make_jstring(title), jni::make_jstring(vm));
 }
 
 void JRemoteConnection::onMessage(const std::string& message) const {
@@ -70,7 +70,7 @@ jni::local_ref<jni::JArrayClass<JPage::javaobject>> JInspector::getPages() {
   std::vector<InspectorPage> pages = inspector_->getPages();
   auto array = jni::JArrayClass<JPage::javaobject>::newArray(pages.size());
   for (size_t i = 0; i < pages.size(); i++) {
-    (*array)[i] = JPage::create(pages[i].id, pages[i].title);
+    (*array)[i] = JPage::create(pages[i].id, pages[i].title, pages[i].vm);
   }
   return array;
 }
diff --git a/ReactAndroid/src/main/jni/react/jni/JInspector.h b/ReactAndroid/src/main/jni/react/jni/JInspector.h
index c170fe59dd2e11..9e089687eb87e4 100644
--- a/ReactAndroid/src/main/jni/react/jni/JInspector.h
+++ b/ReactAndroid/src/main/jni/react/jni/JInspector.h
@@ -16,7 +16,7 @@ class JPage : public jni::JavaClass<JPage> {
 public:
   static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/Inspector$Page;";
 
-  static jni::local_ref<JPage::javaobject> create(int id, const std::string& title);
+  static jni::local_ref<JPage::javaobject> create(int id, const std::string& title, const std::string& vm);
 };
 
 class JRemoteConnection : public jni::JavaClass<JRemoteConnection> {
diff --git a/ReactCommon/jsinspector/InspectorInterfaces.cpp b/ReactCommon/jsinspector/InspectorInterfaces.cpp
index f1fa2ed57a684e..bb20b8ad6b9472 100644
--- a/ReactCommon/jsinspector/InspectorInterfaces.cpp
+++ b/ReactCommon/jsinspector/InspectorInterfaces.cpp
@@ -11,6 +11,7 @@
 
 #include <mutex>
 #include <unordered_map>
+#include <tuple>
 
 namespace facebook {
 namespace react {
@@ -27,7 +28,7 @@ namespace {
 
 class InspectorImpl : public IInspector {
  public:
-  int addPage(const std::string& title, ConnectFunc connectFunc) override;
+  int addPage(const std::string& title, const std::string& vm, ConnectFunc connectFunc) override;
   void removePage(int pageId) override;
 
   std::vector<InspectorPage> getPages() const override;
@@ -38,15 +39,15 @@ class InspectorImpl : public IInspector {
  private:
   mutable std::mutex mutex_;
   int nextPageId_{1};
-  std::unordered_map<int, std::string> titles_;
+  std::unordered_map<int, std::tuple<std::string, std::string>> titles_;
   std::unordered_map<int, ConnectFunc> connectFuncs_;
 };
 
-int InspectorImpl::addPage(const std::string& title, ConnectFunc connectFunc) {
+int InspectorImpl::addPage(const std::string& title, const std::string& vm, ConnectFunc connectFunc) {
   std::lock_guard<std::mutex> lock(mutex_);
 
   int pageId = nextPageId_++;
-  titles_[pageId] = title;
+  titles_[pageId] = std::make_tuple(title, vm);
   connectFuncs_[pageId] = std::move(connectFunc);
 
   return pageId;
@@ -64,7 +65,7 @@ std::vector<InspectorPage> InspectorImpl::getPages() const {
 
   std::vector<InspectorPage> inspectorPages;
   for (auto& it : titles_) {
-    inspectorPages.push_back(InspectorPage{it.first, it.second});
+    inspectorPages.push_back(InspectorPage{it.first, std::get<0>(it.second), std::get<1>(it.second)});
   }
 
   return inspectorPages;
diff --git a/ReactCommon/jsinspector/InspectorInterfaces.h b/ReactCommon/jsinspector/InspectorInterfaces.h
index 0222501f3a043c..d62eab40117a36 100644
--- a/ReactCommon/jsinspector/InspectorInterfaces.h
+++ b/ReactCommon/jsinspector/InspectorInterfaces.h
@@ -25,6 +25,7 @@ class IDestructible {
 struct InspectorPage {
   const int id;
   const std::string title;
+  const std::string vm;
 };
 
 /// IRemoteConnection allows the VM to send debugger messages to the client.
@@ -52,7 +53,7 @@ class IInspector : public IDestructible {
   virtual ~IInspector() = 0;
 
   /// addPage is called by the VM to add a page to the list of debuggable pages.
-  virtual int addPage(const std::string& title, ConnectFunc connectFunc) = 0;
+  virtual int addPage(const std::string& title, const std::string& vm, ConnectFunc connectFunc) = 0;
 
   /// removePage is called by the VM to remove a page from the list of
   /// debuggable pages.

From cc6d0937c37d2dc7e97a903f5fbf4fa40404e767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Tue, 13 Feb 2018 08:08:18 -0800
Subject: [PATCH 012/267] Add disabled tests to CircleCI config

Summary:
These tests have not run for one reason or another since the migration from Travis. They are not passing, and are commented out to avoid flagging new PRs as breaking. These tests need to be fixed and re-enabled ASAP.
Closes https://github.com/facebook/react-native/pull/17959

Differential Revision: D6976781

Pulled By: hramos

fbshipit-source-id: 712a09877d0597c12cafa741779b471680b7d2db
---
 .circleci/config.yml | 87 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 72 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 99fac87a3977c0..dc428d3a0b75af 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -205,13 +205,21 @@ aliases:
     command: | 
       mkdir -p ~/react-native/reports/junit/
 
-  - &run-objc_ios-tests
-    name: Objective-C iOS Test Suite
+  - &build-objc-ios-test-app
+    name: Build Objective-C iOS Test App
     command: ./scripts/objc-test-ios.sh
+  
+  - &run-objc-ios-tests
+    name: Objective-C iOS Test Suite
+    command: ./scripts/objc-test-ios.sh test
+
+  - &build-objc-tvos-test-app
+    name: Build Objective-C tvOS Test App
+    command: ./scripts/objc-test-tvos.sh
 
   - &run-objc-tvos-tests
     name: Objective-C tvOS Test Suite
-    command: ./scripts/objc-test-tvos.sh
+    command: ./scripts/objc-test-tvos.sh test
 
   - &run-objc-ios-e2e-tests
     name: Objective-C iOS End-to-End Test Suite
@@ -245,7 +253,7 @@ android_defaults: &android_defaults
 macos_defaults: &macos_defaults
   <<: *defaults
   macos:
-    xcode: "9.0"
+    xcode: "9.2.0"
 
 version: 2
 jobs:
@@ -317,29 +325,53 @@ jobs:
       - store_artifacts:
           path: ~/react-native/reports/junit
 
+  # Builds iOS test app
+  build_objc_ios_test_app:
+    <<: *macos_defaults
+    dependencies:
+      pre:
+        - xcrun instruments -w "iPhone 5s (11.1)" || true
+    steps:
+      - attach_workspace:
+          at: ~/react-native
+
+      - run: *build-objc-ios-test-app
+
   # Runs unit tests on iOS devices
   test_objc_ios:
     <<: *macos_defaults
     dependencies:
       pre:
-        - xcrun instruments -w "iPhone 5s (10.3.1)" || true
+        - xcrun instruments -w "iPhone 5s (11.1)" || true
     steps:
       - attach_workspace:
           at: ~/react-native
 
-      - run: *run-objc_ios-tests
+      - run: *run-objc-ios-tests
 
       - store_test_results:
           path: ~/react-native/reports/junit
       - store_artifacts:
           path: ~/react-native/reports/junit
 
+  # Builds tvOS test app
+  build_objc_tvos_test_app:
+    <<: *macos_defaults
+    dependencies:
+      pre:
+        - xcrun instruments -w "Apple TV 1080p (11.1)" || true
+    steps:
+      - attach_workspace:
+          at: ~/react-native
+
+      - run: *build-objc-tvos-test-app
+
   # Runs unit tests on tvOS devices
   test_objc_tvos:
     <<: *macos_defaults
     dependencies:
       pre:
-        - xcrun instruments -w "Apple TV 1080p (10.0)" || true
+        - xcrun instruments -w "Apple TV 1080p (11.1)" || true
     steps:
       - attach_workspace:
           at: ~/react-native
@@ -356,7 +388,7 @@ jobs:
     <<: *macos_defaults
     dependencies:
       pre:
-        - xcrun instruments -w "iPhone 5s (10.3.1)" || true
+        - xcrun instruments -w "iPhone 5s (11.1)" || true
     steps:
       - attach_workspace:
           at: ~/react-native
@@ -370,9 +402,7 @@ jobs:
 
   # Checks podspec
   test_podspec:
-    <<: *defaults
-    macos:
-      xcode: "9.0"
+    <<: *macos_defaults
     steps:
       - attach_workspace:
           at: ~/react-native
@@ -537,7 +567,7 @@ jobs:
 workflows:
   version: 2
 
-  test:
+  tests:
     jobs:
 
       # Checkout repo and run Yarn
@@ -566,12 +596,12 @@ workflows:
           requires:
             - checkout_code
 
-      # Test iOS & tvOS
-      - test_objc_ios:
+      # Build iOS & tvOS test apps
+      - build_objc_ios_test_app:
           filters: *filter-ignore-gh-pages
           requires:
             - checkout_code
-      - test_objc_tvos:
+      - build_objc_tvos_test_app:
           filters: *filter-ignore-gh-pages
           requires:
             - checkout_code
@@ -606,3 +636,30 @@ workflows:
       - publish_npm_package:
           requires:
             - approve_publish_npm_package
+
+  # These tests are flaky or are yet to be fixed. They are placed on their own 
+  # workflow to avoid marking benign PRs as broken.
+  # To run them, uncomment the entire block and open a PR (do not merge). 
+  # Once a test is fixed, move the test definition to the 'tests' workflow.
+  # disabled_tests:
+  #   jobs:
+  #     # Checkout repo and run Yarn (pre-req, should succeed)
+  #     - checkout_code:
+  #         filters: *filter-ignore-gh-pages
+
+  #     # The following were DISABLED because they have not run since 
+  #     # the migration from Travis, and they have broken since then,
+  #     # Test iOS & tvOS
+  #     - test_objc_ios:
+  #         filters: *filter-ignore-gh-pages
+  #         requires:
+  #           - checkout_code
+  #     - test_objc_tvos:
+  #         filters: *filter-ignore-gh-pages
+  #         requires:
+  #           - checkout_code
+  #     # CocoaPods
+  #     - test_podspec:
+  #         filters: *filter-ignore-gh-pages
+  #         requires:
+  #           - checkout_code

From e53a8f7097965f38d87eade1407661bc63adc68e Mon Sep 17 00:00:00 2001
From: Yao Bin Then <alvinthen890703@gmail.com>
Date: Tue, 13 Feb 2018 08:51:12 -0800
Subject: [PATCH 013/267] =?UTF-8?q?=E2=9C=A8=20Colorize=20filenames=20with?=
 =?UTF-8?q?=20conflicts=20when=20upgrading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Visually show files merged with conflicts when running `react-native-git-upgrade`.

<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

After running `react-native-git-upgrade`, files with conflicts are not immediately recognised visually. With this patch, files with conflicts are highlighted in red.

![image](https://user-images.githubusercontent.com/771989/36086385-fc183baa-1006-11e8-8862-0867b82b7ec1.png)

<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
[CLI] [ENHANCEMENT] [react-native-git-upgrade/cliEntry.js] - Print files with conflicts in red.
Closes https://github.com/facebook/react-native/pull/17947

Differential Revision: D6977042

Pulled By: hramos

fbshipit-source-id: 3c67561ea3acbee227a7a0cf42857af4fb75c75c
---
 react-native-git-upgrade/cliEntry.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/react-native-git-upgrade/cliEntry.js b/react-native-git-upgrade/cliEntry.js
index 1bb36cc63d5224..757852e61bbc67 100644
--- a/react-native-git-upgrade/cliEntry.js
+++ b/react-native-git-upgrade/cliEntry.js
@@ -33,9 +33,10 @@ log.heading = 'git-upgrade';
 /**
  * Promisify the callback-based shelljs function exec
  * @param logOutput If true, log the stdout of the command.
+ * @param logger Custom logger to modify the output, invoked with the data and the stream.
  * @returns {Promise}
  */
-function exec(command, logOutput) {
+function exec(command, logOutput, logger = null) {
   return new Promise((resolve, reject) => {
     let stderr, stdout = '';
     const child = shell.exec(command, {async: true, silent: true});
@@ -43,13 +44,21 @@ function exec(command, logOutput) {
     child.stdout.on('data', data => {
       stdout += data;
       if (logOutput) {
-        process.stdout.write(data);
+        if (logger) {
+          logger(data, process.stdout);
+        } else {
+          process.stdout.write(data);
+        }
       }
     });
 
     child.stderr.on('data', data => {
       stderr += data;
-      process.stderr.write(data);
+      if (logger) {
+        logger(data, process.stderr);
+      } else {
+        process.stderr.write(data);
+      }
     });
 
     child.on('exit', (code, signal) => {
@@ -359,7 +368,13 @@ async function run(requestedVersion, cliArgs) {
 
     try {
       log.info('Apply the patch');
-      await exec(`git apply --3way ${patchPath}`, true);
+      await exec(`git apply --3way ${patchPath}`, true, (data, stream) => {
+        if (data.indexOf('conflicts') >= 0 || data.startsWith('U ')) {
+          stream.write(`\x1b[31m${data}\x1b[0m`);
+        } else {
+          stream.write(data);
+        }
+      });
     } catch (err) {
       log.warn(
         'The upgrade process succeeded but there might be conflicts to be resolved. ' +

From 03e6d3efb43a9d5dc9a98b253f3210932503f2d6 Mon Sep 17 00:00:00 2001
From: Evan J Brunner <ej3@appitto.me>
Date: Tue, 13 Feb 2018 10:41:29 -0800
Subject: [PATCH 014/267] RNTester http_server send cookie fix

Summary:
Signed-off-by: Evan J Brunner <ej3@appitto.me>

<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

Motivation can be found in #17899

This `RNTester/js/http_test_server.js` is part of a internal websocket test suite / devtool.

Can be tested with `curl -D - localhost:5556` observing that the `Set-Cookie: wstest=OK; Path=\` header is present, and the service throws no exceptions.. etc

[INTERNAL][MINOR][./RNTester/js/http_test_server.js] - fixed set cookie with connect framework
<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
Closes https://github.com/facebook/react-native/pull/17900

Differential Revision: D6977087

Pulled By: hramos

fbshipit-source-id: af6205343fccf69c57e0c26a85a5b04d61288a23
---
 RNTester/js/http_test_server.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/RNTester/js/http_test_server.js b/RNTester/js/http_test_server.js
index 7af1f052eb6c5d..c2222121770132 100755
--- a/RNTester/js/http_test_server.js
+++ b/RNTester/js/http_test_server.js
@@ -30,11 +30,7 @@ const app = connect();
 
 app.use(function(req, res) {
   console.log('received request');
-  const cookieOptions = {
-    //httpOnly: true, // the cookie is not accessible by the user (javascript,...)
-    secure: false, // allow HTTP
-  };
-  res.cookie('wstest', 'OK', cookieOptions);
+  res.setHeader('Set-Cookie', ['wstest=OK; Path=/']);
   res.end('Cookie has been set!\n');
 });
 

From 331cc791ec676a5575faf4515b2b5e29e1a7bf4e Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Tue, 13 Feb 2018 13:27:23 -0800
Subject: [PATCH 015/267] Extend Navigation to support "is_fabric" param from
 native

Reviewed By: fkgozali

Differential Revision: D6955828

fbshipit-source-id: 1a77b652a7e372acf961a0b0772ae93a999b90b1
---
 ReactAndroid/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index e15aff52a8f99e..fdea9de2db7eb1 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -297,7 +297,7 @@ dependencies {
     testCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}"
     testCompile "org.easytesting:fest-assert-core:${FEST_ASSERT_CORE_VERSION}"
     testCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
-
+    
     androidTestCompile fileTree(dir: 'src/main/third-party/java/buck-android-support/', include: ['*.jar'])
     androidTestCompile 'com.android.support.test:runner:0.3'
     androidTestCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}"

From 74e54cbcc408a8bbdd70f47cc8728d30cdc0d299 Mon Sep 17 00:00:00 2001
From: Stein Strindhaug <stein@zeppelin.no>
Date: Tue, 13 Feb 2018 13:31:50 -0800
Subject: [PATCH 016/267] Fix: incorrect line-height calculation

Summary:
There seems to be a rounding error in the android code for line height, so that for some fonts and at some combinations of line height and font size the actual height of the elements seems to be slightly too short.

I've identified one issue that I mentioned here https://github.com/facebook/react-native/issues/10712#issuecomment-359382137 that could at least explain some of the problem. That when the line-height minus the original sum of the absolute value of top  and bottom from the metrics, happens to be an odd number, the division by two causes a rounding error of 1, so that the actual line height is 1pt less than it should.

The fix uses floating point division instead of integer division, and rounds (arbitrarily) the negative values up and the positive values down so that the total is still the correct for odd numbers.

It turns out that only ascent and descent is used to give the actual line-height between lines in the same text-element. The top and bottom values are only used for padding the top and bottom of the text. So when the line-height is greater than the font size and the extra padding this PR sets the ascent and descent to the same value as the top and bottom respectively.

I've renamed the shouldIncreaseAllMetricsProportionally test to evenLineHeightShouldIncreaseAllMetricsProportionally and added an extra assertion to check that bottom-top still equals the line height.

Added another test oddLineHeightShouldAlsoWork that is similar but uses an odd number for the line height to test that it still works with odd numbers. This test only uses the sum of the values so that it's indifferent to what value the implementation chooses to round up or down.

Improvement on https://github.com/facebook/react-native/pull/16448

Fix line-height calculation on Android.

| Before        | After           |
| ------------- |-------------|
| ![without fix](https://user-images.githubusercontent.com/2144849/36150230-4404a0cc-10c3-11e8-8880-4ab84339c741.png)      | ![actual fix](https://user-images.githubusercontent.com/2144849/36156620-eb496d0e-10d7-11e8-8bd1-1cb536a38fbf.png) |

(All three columns have font size 16 and lineHeight: 32. The first one is has fixed height 9*32, the second is 9 Text elements, the last is one text element with lots of text limited to 9 lines, so they should be the same height. )
Closes https://github.com/facebook/react-native/pull/17952

Differential Revision: D6980333

Pulled By: hramos

fbshipit-source-id: 0a501358cfbf7f139fca46056d0d972b1daf6ae3
---
 .../views/text/CustomLineHeightSpan.java      | 10 ++++----
 .../views/text/CustomLineHeightSpanTest.java  | 23 ++++++++++++++++---
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java
index 18645e56df5736..abba786b1bd44d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java
@@ -55,10 +55,12 @@ public void chooseHeight(
       // Show proportionally additional ascent / top & descent / bottom
       final int additional = mHeight - (-fm.top + fm.bottom);
 
-      fm.top -= additional / 2;
-      fm.ascent -= additional / 2;
-      fm.descent += additional / 2;
-      fm.bottom += additional / 2;
+      // Round up for the negative values and down for the positive values  (arbritary choice)
+      // So that bottom - top equals additional even if it's an odd number.
+      fm.top -= Math.ceil(additional / 2.0f);
+      fm.bottom += Math.floor(additional / 2.0f);
+      fm.ascent = fm.top;
+      fm.descent = fm.bottom;
     }
   }
 }
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.java
index 5d3919105ae232..eadb7d3544bcb5 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/text/CustomLineHeightSpanTest.java
@@ -13,7 +13,7 @@
 public class CustomLineHeightSpanTest {
 
   @Test
-  public void shouldIncreaseAllMetricsProportionally() {
+  public void evenLineHeightShouldIncreaseAllMetricsProportionally() {
     CustomLineHeightSpan customLineHeightSpan = new CustomLineHeightSpan(22);
     Paint.FontMetricsInt fm = new Paint.FontMetricsInt();
     fm.top = -10;
@@ -21,10 +21,27 @@ public void shouldIncreaseAllMetricsProportionally() {
     fm.descent = 5;
     fm.bottom = 10;
     customLineHeightSpan.chooseHeight("Hi", 0, 2, 0, 0, fm);
+    // Since line height is even it should be equally added to top and bottom.
     assertThat(fm.top).isEqualTo(-11);
-    assertThat(fm.ascent).isEqualTo(-6);
-    assertThat(fm.descent).isEqualTo(6);
+    assertThat(fm.ascent).isEqualTo(-11);
+    assertThat(fm.descent).isEqualTo(11);
     assertThat(fm.bottom).isEqualTo(11);
+    assertThat(fm.bottom - fm.top).isEqualTo(22);
+  }
+
+  @Test
+  public void oddLineHeightShouldAlsoWork() {
+    CustomLineHeightSpan customLineHeightSpan = new CustomLineHeightSpan(23);
+    Paint.FontMetricsInt fm = new Paint.FontMetricsInt();
+    fm.top = -10;
+    fm.ascent = -5;
+    fm.descent = 5;
+    fm.bottom = 10;
+    customLineHeightSpan.chooseHeight("Hi", 0, 2, 0, 0, fm);
+    // Only test that the sum is correct so the implementation
+    // is free to add the odd value either on top or bottom.
+    assertThat(fm.descent - fm.ascent).isEqualTo(23);
+    assertThat(fm.bottom - fm.top).isEqualTo(23);
   }
 
   @Test

From d220118dbd7a936942f0cd3db69bf03f39333d6c Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Tue, 13 Feb 2018 14:04:49 -0800
Subject: [PATCH 017/267] Freeze UTFSequence

Summary:
Don't want anyone accidentally mutating it.

Also make deepFreezeAndThrowOnMutationInDev easier to use with nice flow typing.

Reviewed By: yungsters

Differential Revision: D6974089

fbshipit-source-id: 0f90e7939cb726893fa353a4f2a6bbba701205bc
---
 Libraries/UTFSequence.js                                 | 6 ++++--
 Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Libraries/UTFSequence.js b/Libraries/UTFSequence.js
index 262dd4e9bbf68d..9286eed202eefe 100644
--- a/Libraries/UTFSequence.js
+++ b/Libraries/UTFSequence.js
@@ -13,6 +13,8 @@
 
 'use strict';
 
+const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev');
+
 /**
  * A collection of Unicode sequences for various characters and emoji.
  *
@@ -20,7 +22,7 @@
  *  - Source code should be limitted to ASCII.
  *  - Less chance of typos.
  */
-const UTFSequence = {
+const UTFSequence = deepFreezeAndThrowOnMutationInDev({
   MIDDOT: '\u00B7', // normal middle dot: &middot;
   MIDDOT_SP: '\u00A0\u00B7\u00A0', // &nbsp;&middot;&nbsp;
   MIDDOT_KATAKANA: '\u30FB', // katakana middle dot
@@ -30,6 +32,6 @@ const UTFSequence = {
   NDASH_SP: '\u00A0\u2013\u00A0', // &nbsp;&ndash;&nbsp;
   NBSP: '\u00A0', // non-breaking space: &nbsp;
   PIZZA: '\uD83C\uDF55',
-};
+});
 
 module.exports = UTFSequence;
diff --git a/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js b/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
index 9ab2cc4b16a000..4e651b110e14a7 100644
--- a/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
+++ b/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
@@ -29,13 +29,13 @@
  * Freezing the object and adding the throw mechanism is expensive and will
  * only be used in DEV.
  */
-function deepFreezeAndThrowOnMutationInDev(object: Object) {
+function deepFreezeAndThrowOnMutationInDev<T: Object>(object: T): T {
   if (__DEV__) {
     if (typeof object !== 'object' ||
         object === null ||
         Object.isFrozen(object) ||
         Object.isSealed(object)) {
-      return;
+      return object;
     }
 
     var keys = Object.keys(object);
@@ -58,6 +58,7 @@ function deepFreezeAndThrowOnMutationInDev(object: Object) {
       }
     }
   }
+  return object;
 }
 
 function throwOnImmutableMutation(key, value) {

From d06e143420462344ea6fc21c0446db972f747404 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Tue, 13 Feb 2018 20:20:39 -0800
Subject: [PATCH 018/267] Bundle download progress on Android

Summary:
Android equivalent of #15066

Tested that download progress shows up properly when reloading the app.

[ANDROID] [FEATURE] [DevSupport] - Show bundle download progress on Android
Closes https://github.com/facebook/react-native/pull/17809

Differential Revision: D6982823

Pulled By: hramos

fbshipit-source-id: da01e42b8ebb1c603f4407f6bafd68e0b6b3ecba
---
 .../react/devsupport/BundleDownloader.java    | 17 +++--
 .../devsupport/MultipartStreamReader.java     | 62 ++++++++++++++++---
 .../devsupport/MultipartStreamReaderTest.java | 41 ++++++------
 3 files changed, 88 insertions(+), 32 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
index 6cf6cb14eba3bc..a5501081ac90f8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
@@ -146,13 +146,13 @@ public void onResponse(Call call, final Response response) throws IOException {
         if (match.find()) {
           String boundary = match.group(1);
           MultipartStreamReader bodyReader = new MultipartStreamReader(response.body().source(), boundary);
-          boolean completed = bodyReader.readAllParts(new MultipartStreamReader.ChunkCallback() {
+          boolean completed = bodyReader.readAllParts(new MultipartStreamReader.ChunkListener() {
             @Override
-            public void execute(Map<String, String> headers, Buffer body, boolean finished) throws IOException {
+            public void onChunkComplete(Map<String, String> headers, Buffer body, boolean isLastChunk) throws IOException {
               // This will get executed for every chunk of the multipart response. The last chunk
-              // (finished = true) will be the JS bundle, the other ones will be progress events
+              // (isLastChunk = true) will be the JS bundle, the other ones will be progress events
               // encoded as JSON.
-              if (finished) {
+              if (isLastChunk) {
                 // The http status code for each separate chunk is in the X-Http-Status header.
                 int status = response.code();
                 if (headers.containsKey("X-Http-Status")) {
@@ -184,6 +184,15 @@ public void execute(Map<String, String> headers, Buffer body, boolean finished)
                 }
               }
             }
+            @Override
+            public void onChunkProgress(Map<String, String> headers, long loaded, long total) throws IOException {
+              if ("application/javascript".equals(headers.get("Content-Type"))) {
+                callback.onProgress(
+                  "Downloading JavaScript bundle",
+                  (int) (loaded / 1024),
+                  (int) (total / 1024));
+              }
+            }
           });
           if (!completed) {
             callback.onFailure(new DebugServerException(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
index efffbae8cccabe..7a661eb031ecee 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
@@ -26,9 +26,18 @@ public class MultipartStreamReader {
 
   private final BufferedSource mSource;
   private final String mBoundary;
-
-  public interface ChunkCallback {
-    void execute(Map<String, String> headers, Buffer body, boolean done) throws IOException;
+  private long mLastProgressEvent;
+
+  public interface ChunkListener {
+    /**
+     * Invoked when a chunk of a multipart response is fully downloaded.
+     */
+    void onChunkComplete(Map<String, String> headers, Buffer body, boolean isLastChunk) throws IOException;
+
+    /**
+     * Invoked as bytes of the current chunk are read.
+     */
+    void onChunkProgress(Map<String, String> headers, long loaded, long total) throws IOException;
   }
 
   public MultipartStreamReader(BufferedSource source, String boundary) {
@@ -55,34 +64,50 @@ private Map<String, String> parseHeaders(Buffer data) {
     return headers;
   }
 
-  private void emitChunk(Buffer chunk, boolean done, ChunkCallback callback) throws IOException {
+  private void emitChunk(Buffer chunk, boolean done, ChunkListener listener) throws IOException {
     ByteString marker = ByteString.encodeUtf8(CRLF + CRLF);
     long indexOfMarker = chunk.indexOf(marker);
     if (indexOfMarker == -1) {
-      callback.execute(null, chunk, done);
+      listener.onChunkComplete(null, chunk, done);
     } else {
       Buffer headers = new Buffer();
       Buffer body = new Buffer();
       chunk.read(headers, indexOfMarker);
       chunk.skip(marker.size());
       chunk.readAll(body);
-      callback.execute(parseHeaders(headers), body, done);
+      listener.onChunkComplete(parseHeaders(headers), body, done);
+    }
+  }
+
+  private void emitProgress(Map<String, String> headers, long contentLength, boolean isFinal, ChunkListener listener) throws IOException {
+    if (headers == null || listener == null) {
+      return;
+    }
+
+    long currentTime = System.currentTimeMillis();
+    if (currentTime - mLastProgressEvent > 16 || isFinal) {
+      mLastProgressEvent = currentTime;
+      long headersContentLength = headers.get("Content-Length") != null ? Long.parseLong(headers.get("Content-Length")) : 0;
+      listener.onChunkProgress(headers, contentLength, headersContentLength);
     }
   }
 
   /**
-   * Reads all parts of the multipart response and execute the callback for each chunk received.
-   * @param callback Callback executed when a chunk is received
+   * Reads all parts of the multipart response and execute the listener for each chunk received.
+   * @param listener Listener invoked when chunks are received.
    * @return If the read was successful
    */
-  public boolean readAllParts(ChunkCallback callback) throws IOException {
+  public boolean readAllParts(ChunkListener listener) throws IOException {
     ByteString delimiter = ByteString.encodeUtf8(CRLF + "--" + mBoundary + CRLF);
     ByteString closeDelimiter = ByteString.encodeUtf8(CRLF + "--" + mBoundary + "--" + CRLF);
+    ByteString headersDelimiter = ByteString.encodeUtf8(CRLF + CRLF);
 
     int bufferLen = 4 * 1024;
     long chunkStart = 0;
     long bytesSeen = 0;
     Buffer content = new Buffer();
+    Map<String, String> currentHeaders = null;
+    long currentHeadersLength = 0;
 
     while (true) {
       boolean isCloseDelimiter = false;
@@ -98,6 +123,20 @@ public boolean readAllParts(ChunkCallback callback) throws IOException {
 
       if (indexOfDelimiter == -1) {
         bytesSeen = content.size();
+
+        if (currentHeaders == null) {
+          long indexOfHeaders = content.indexOf(headersDelimiter, searchStart);
+          if (indexOfHeaders >= 0) {
+            mSource.read(content, indexOfHeaders);
+            Buffer headers = new Buffer();
+            content.copyTo(headers, searchStart, indexOfHeaders - searchStart);
+            currentHeadersLength = headers.size() + headersDelimiter.size();
+            currentHeaders = parseHeaders(headers);
+          }
+        } else {
+          emitProgress(currentHeaders, content.size() - currentHeadersLength, false, listener);
+        }
+
         long bytesRead = mSource.read(content, bufferLen);
         if (bytesRead <= 0) {
           return false;
@@ -113,7 +152,10 @@ public boolean readAllParts(ChunkCallback callback) throws IOException {
         Buffer chunk = new Buffer();
         content.skip(chunkStart);
         content.read(chunk, length);
-        emitChunk(chunk, isCloseDelimiter, callback);
+        emitProgress(currentHeaders, chunk.size() - currentHeadersLength, true, listener);
+        emitChunk(chunk, isCloseDelimiter, listener);
+        currentHeaders = null;
+        currentHeadersLength = 0;
       } else {
         content.skip(chunkEnd);
       }
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java b/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java
index 08089511f7bfe1..e304694319b899 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java
@@ -24,14 +24,19 @@
 @RunWith(RobolectricTestRunner.class)
 public class MultipartStreamReaderTest {
 
-  class CallCountTrackingChunkCallback implements MultipartStreamReader.ChunkCallback {
+  class CallCountTrackingChunkCallback implements MultipartStreamReader.ChunkListener {
     private int mCount = 0;
 
     @Override
-    public void execute(Map<String, String> headers, Buffer body, boolean done) throws IOException {
+    public void onChunkComplete(Map<String, String> headers, Buffer body, boolean done) throws IOException {
       mCount++;
     }
 
+    @Override
+    public void onChunkProgress(Map<String, String> headers, long loaded, long total) throws IOException {
+
+    }
+
     public int getCallCount() {
       return mCount;
     }
@@ -41,12 +46,12 @@ public int getCallCount() {
   public void testSimpleCase() throws IOException {
     ByteString response = ByteString.encodeUtf8(
       "preable, should be ignored\r\n" +
-      "--sample_boundary\r\n" +
-      "Content-Type: application/json; charset=utf-8\r\n" +
-      "Content-Length: 2\r\n\r\n" +
-      "{}\r\n" +
-      "--sample_boundary--\r\n" +
-      "epilogue, should be ignored");
+        "--sample_boundary\r\n" +
+        "Content-Type: application/json; charset=utf-8\r\n" +
+        "Content-Length: 2\r\n\r\n" +
+        "{}\r\n" +
+        "--sample_boundary--\r\n" +
+        "epilogue, should be ignored");
 
     Buffer source = new Buffer();
     source.write(response);
@@ -55,8 +60,8 @@ public void testSimpleCase() throws IOException {
 
     CallCountTrackingChunkCallback callback = new CallCountTrackingChunkCallback() {
       @Override
-      public void execute(Map<String, String> headers, Buffer body, boolean done) throws IOException {
-        super.execute(headers, body, done);
+      public void onChunkComplete(Map<String, String> headers, Buffer body, boolean done) throws IOException {
+        super.onChunkComplete(headers, body, done);
 
         assertThat(done).isTrue();
         assertThat(headers.get("Content-Type")).isEqualTo("application/json; charset=utf-8");
@@ -89,8 +94,8 @@ public void testMultipleParts() throws IOException {
 
     CallCountTrackingChunkCallback callback = new CallCountTrackingChunkCallback() {
       @Override
-      public void execute(Map<String, String> headers, Buffer body, boolean done) throws IOException {
-        super.execute(headers, body, done);
+      public void onChunkComplete(Map<String, String> headers, Buffer body, boolean done) throws IOException {
+        super.onChunkComplete(headers, body, done);
 
         assertThat(done).isEqualTo(getCallCount() == 3);
         assertThat(body.readUtf8()).isEqualTo(String.valueOf(getCallCount()));
@@ -122,12 +127,12 @@ public void testNoDelimiter() throws IOException {
   public void testNoCloseDelimiter() throws IOException {
     ByteString response = ByteString.encodeUtf8(
       "preable, should be ignored\r\n" +
-      "--sample_boundary\r\n" +
-      "Content-Type: application/json; charset=utf-8\r\n" +
-      "Content-Length: 2\r\n\r\n" +
-      "{}\r\n" +
-      "--sample_boundary\r\n" +
-      "incomplete message...");
+        "--sample_boundary\r\n" +
+        "Content-Type: application/json; charset=utf-8\r\n" +
+        "Content-Length: 2\r\n\r\n" +
+        "{}\r\n" +
+        "--sample_boundary\r\n" +
+        "incomplete message...");
 
     Buffer source = new Buffer();
     source.write(response);

From 4761d5a83e707e0ed651f02a9e02fc5d66b1869a Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Tue, 13 Feb 2018 22:16:39 -0800
Subject: [PATCH 019/267] add BULLET and BULLET_SP

Reviewed By: TheSavior

Differential Revision: D6983446

fbshipit-source-id: c8ce4b1c7836654910db84c9cd4b6d0bcec8ae27
---
 Libraries/UTFSequence.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Libraries/UTFSequence.js b/Libraries/UTFSequence.js
index 9286eed202eefe..cf5ad295af328f 100644
--- a/Libraries/UTFSequence.js
+++ b/Libraries/UTFSequence.js
@@ -23,6 +23,8 @@ const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationI
  *  - Less chance of typos.
  */
 const UTFSequence = deepFreezeAndThrowOnMutationInDev({
+  BULLET: '\u2022', // bullet: &#8226;
+  BULLET_SP: '\u00A0\u2022\u00A0', // &nbsp;&#8226;&nbsp;
   MIDDOT: '\u00B7', // normal middle dot: &middot;
   MIDDOT_SP: '\u00A0\u00B7\u00A0', // &nbsp;&middot;&nbsp;
   MIDDOT_KATAKANA: '\u30FB', // katakana middle dot

From e165d0dcf0942918163589c6cf9da57f2299f850 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Tue, 13 Feb 2018 22:26:37 -0800
Subject: [PATCH 020/267] allow installing extra JS binding via the bridge

Reviewed By: mdvacca

Differential Revision: D6957397

fbshipit-source-id: 172905861fbb1c9ed45149e33b406c28ad616cd7
---
 React/CxxBridge/RCTCxxBridge.mm        | 12 ++++++++++++
 React/CxxBridge/RCTCxxBridgeDelegate.h |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 1fbb2fd43032d7..4b2a89175100a1 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -515,6 +515,8 @@ - (void)_initializeBridge:(std::shared_ptr<JSExecutorFactory>)executorFactory
         std::make_unique<JSBigStdString>("true"));
     }
 #endif
+
+    [self installExtraJSBinding];
   }
 
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
@@ -609,6 +611,16 @@ - (void)registerExtraModules
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
 }
 
+- (void)installExtraJSBinding
+{
+  if ([self.delegate conformsToProtocol:@protocol(RCTCxxBridgeDelegate)]) {
+    id<RCTCxxBridgeDelegate> cxxDelegate = (id<RCTCxxBridgeDelegate>) self.delegate;
+    if ([cxxDelegate respondsToSelector:@selector(installExtraJSBinding:)]) {
+      [cxxDelegate installExtraJSBinding:self.jsContextRef];
+    }
+  }
+}
+
 - (void)_initModules:(NSArray<id<RCTBridgeModule>> *)modules
    withDispatchGroup:(dispatch_group_t)dispatchGroup
     lazilyDiscovered:(BOOL)lazilyDiscovered
diff --git a/React/CxxBridge/RCTCxxBridgeDelegate.h b/React/CxxBridge/RCTCxxBridgeDelegate.h
index ad7fc3d45b2a75..55bff5adadc15c 100644
--- a/React/CxxBridge/RCTCxxBridgeDelegate.h
+++ b/React/CxxBridge/RCTCxxBridgeDelegate.h
@@ -10,6 +10,7 @@
 #include <memory>
 
 #import <React/RCTBridgeDelegate.h>
+#import <jschelpers/JavaScriptCore.h>
 
 namespace facebook {
 namespace react {
@@ -32,4 +33,11 @@ class JSExecutorFactory;
  */
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge;
 
+@optional
+
+/**
+ * Experimental: Perform installation of extra JS binding on the given JS context, as appropriate.
+ */
+- (void)installExtraJSBinding:(JSGlobalContextRef)jsContextRef;
+
 @end

From 1aeb9250bd817579ba8edc3bf2bb1217e22b24b9 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Tue, 13 Feb 2018 22:26:39 -0800
Subject: [PATCH 021/267] Add JS binding for FabricUIManager - iOS

Reviewed By: sebmarkbage

Differential Revision: D6934518

fbshipit-source-id: 1f626f79a74fb199925644e8b16238aa17d40e1f
---
 React/Fabric/RCTFabricUIManager.h  | 31 +++++++++++++++--
 React/Fabric/RCTFabricUIManager.mm | 56 +++++++++++++++++-------------
 2 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/React/Fabric/RCTFabricUIManager.h b/React/Fabric/RCTFabricUIManager.h
index 2228d102990059..a1e5b5ed762b74 100644
--- a/React/Fabric/RCTFabricUIManager.h
+++ b/React/Fabric/RCTFabricUIManager.h
@@ -10,8 +10,35 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTBridge.h>
-#import <React/RCTBridgeModule.h>
+#import <React/RCTInvalidating.h>
+#import <React/RCTShadowView.h>
 
-@interface RCTFabricUIManager : NSObject<RCTBridgeModule>
+@class RCTShadowView;
+
+/**
+ * The RCTFabricUIManager is the module responsible for updating the view hierarchy.
+ */
+@interface RCTFabricUIManager : NSObject <RCTInvalidating>
+
+- (RCTShadowView *)createNode:(nonnull NSNumber *)reactTag
+                      viewName:(NSString *)viewName
+                      rootTag:(nonnull NSNumber *)rootTag
+                        props:(NSDictionary *)props
+                instanceHandle:(void *)instanceHandle;
+
+- (RCTShadowView *)cloneNode:(RCTShadowView *)node;
+- (RCTShadowView *)cloneNodeWithNewChildren:(RCTShadowView *)node;
+- (RCTShadowView *)cloneNodeWithNewProps:(RCTShadowView *)node
+                                newProps:(NSDictionary *)props;
+- (RCTShadowView *)cloneNodeWithNewChildrenAndProps:(RCTShadowView *)node
+                                            newProps:(NSDictionary *)props;
+- (void)appendChild:(RCTShadowView *)parentNode
+          childNode:(RCTShadowView *)childNode;
+
+- (NSMutableArray<RCTShadowView *> *)createChildSet:(nonnull NSNumber *)rootTag;
+- (void)appendChildToSet:(NSMutableArray<RCTShadowView *> *)childSet
+               childNode:(RCTShadowView *)childNode;
+- (void)completeRoot:(nonnull NSNumber *)rootTag
+            childSet:(NSArray<RCTShadowView *> *)childSet;
 
 @end
diff --git a/React/Fabric/RCTFabricUIManager.mm b/React/Fabric/RCTFabricUIManager.mm
index e140aa60c3301d..d8a754b061d084 100644
--- a/React/Fabric/RCTFabricUIManager.mm
+++ b/React/Fabric/RCTFabricUIManager.mm
@@ -12,55 +12,63 @@
 // This file contains experimental placeholders, nothing is finalized.
 @implementation RCTFabricUIManager
 
-@synthesize bridge = _bridge;
-
-RCT_EXPORT_MODULE()
-
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, createNode:(int)reactTag
-                                                  viewName:(NSString *)viewName
-                                                   rootTag:(int)rootTag
-                                                     props:(NSDictionary *)props
-                                            instanceHandle:(int)instanceHandleID)
+- (void)dealloc
 {
-  return @0;
 }
 
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, cloneNode:(int)nodeID)
+- (void)invalidate
 {
-  return @0;
 }
 
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, cloneNodeWithNewChildren:(int)nodeID)
+- (RCTShadowView *)createNode:(nonnull NSNumber *)reactTag
+                      viewName:(NSString *)viewName
+                      rootTag:(nonnull NSNumber *)rootTag
+                        props:(NSDictionary *)props
+                instanceHandle:(void *)instanceHandle
 {
-  return @0;
+  return nil;
 }
 
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, cloneNodeWithNewProps:(int)nodeID newProps:(NSDictionary *)newProps)
+- (RCTShadowView *)cloneNode:(RCTShadowView *)node
 {
-  return @0;
+  return nil;
 }
-
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, cloneNodeWithNewChildrenAndProps:(int)nodeID newProps:(NSDictionary *)newProps)
+- (RCTShadowView *)cloneNodeWithNewChildren:(RCTShadowView *)node
 {
-  return @0;
+  return nil;
 }
 
-RCT_EXPORT_METHOD(appendChild:(int)parentNodeID child:(int)childNodeID)
+- (RCTShadowView *)cloneNodeWithNewProps:(RCTShadowView *)node
+                                newProps:(NSDictionary *)props
+{
+  return nil;
+}
+- (RCTShadowView *)cloneNodeWithNewChildrenAndProps:(RCTShadowView *)node
+                                            newProps:(NSDictionary *)props
+{
+  return nil;
+}
+- (void)appendChild:(RCTShadowView *)parentNode
+          childNode:(RCTShadowView *)childNode
 {
 
 }
 
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, createChildSet)
+- (NSMutableArray<RCTShadowView *> *)createChildSet:(nonnull NSNumber *)rootTag
 {
-  return @0;
+  return [NSMutableArray array];
 }
 
-RCT_EXPORT_METHOD(appendChildToSet:(int)childSetID child:(int)childNodeID)
+- (void)appendChildToSet:(NSMutableArray<RCTShadowView *> *)childSet
+               childNode:(RCTShadowView *)childNode
 {
+  [childSet addObject:childNode];
 }
 
-RCT_EXPORT_METHOD(completeRoot:(int)rootTag childSet:(int)childSetID)
+- (void)completeRoot:(nonnull NSNumber *)rootTag
+            childSet:(NSArray<RCTShadowView *> *)childSet
 {
+
 }
 
 @end

From 5f48bd84aa7c9c36d3b3c403fd55441eed952572 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Tue, 13 Feb 2018 22:26:43 -0800
Subject: [PATCH 022/267] iOS: allow getting an instance of a js-bound module
 via the bridge

Reviewed By: sebmarkbage

Differential Revision: D6982785

fbshipit-source-id: 7bbcc5416e1d1a3a577328349a7c18af5c0f8577
---
 React/Base/RCTBridge.h                 |  5 +++++
 React/Base/RCTBridge.m                 |  5 +++++
 React/CxxBridge/RCTCxxBridge.mm        | 12 ++++++++++++
 React/CxxBridge/RCTCxxBridgeDelegate.h |  5 +++++
 React/Fabric/RCTFabricUIManager.h      |  6 ++++++
 React/Fabric/RCTFabricUIManager.mm     |  9 +++++++++
 6 files changed, 42 insertions(+)

diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
index 4944ce711c246b..0ddce95bec1e4a 100644
--- a/React/Base/RCTBridge.h
+++ b/React/Base/RCTBridge.h
@@ -168,6 +168,11 @@ RCT_EXTERN NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
  */
 - (BOOL)moduleIsInitialized:(Class)moduleClass;
 
+/**
+ * Retrieve an extra module that gets bound to the JS context, if any.
+ */
+- (id)jsBoundExtraModuleForClass:(Class)moduleClass;
+
 /**
  * All registered bridge module classes.
  */
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index 0b02e2380365ee..da8e40b6c4314e 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -251,6 +251,11 @@ - (BOOL)moduleIsInitialized:(Class)moduleClass
   return [self.batchedBridge moduleIsInitialized:moduleClass];
 }
 
+- (id)jsBoundExtraModuleForClass:(Class)moduleClass
+{
+  return [self.batchedBridge jsBoundExtraModuleForClass:moduleClass];
+}
+
 - (void)reload
 {
   #if RCT_ENABLE_INSPECTOR
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 4b2a89175100a1..4c958b83b54f2f 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -454,6 +454,18 @@ - (BOOL)moduleIsInitialized:(Class)moduleClass
   return _moduleDataByName[RCTBridgeModuleNameForClass(moduleClass)].hasInstance;
 }
 
+- (id)jsBoundExtraModuleForClass:(Class)moduleClass
+{
+  if ([self.delegate conformsToProtocol:@protocol(RCTCxxBridgeDelegate)]) {
+    id<RCTCxxBridgeDelegate> cxxDelegate = (id<RCTCxxBridgeDelegate>) self.delegate;
+    if ([cxxDelegate respondsToSelector:@selector(jsBoundExtraModuleForClass:)]) {
+      return [cxxDelegate jsBoundExtraModuleForClass:moduleClass];
+    }
+  }
+
+  return nil;
+}
+
 - (std::shared_ptr<ModuleRegistry>)_buildModuleRegistry
 {
   if (!self.valid) {
diff --git a/React/CxxBridge/RCTCxxBridgeDelegate.h b/React/CxxBridge/RCTCxxBridgeDelegate.h
index 55bff5adadc15c..9c24ee21611fe9 100644
--- a/React/CxxBridge/RCTCxxBridgeDelegate.h
+++ b/React/CxxBridge/RCTCxxBridgeDelegate.h
@@ -40,4 +40,9 @@ class JSExecutorFactory;
  */
 - (void)installExtraJSBinding:(JSGlobalContextRef)jsContextRef;
 
+/**
+ * Experimental: Get the instance of the extra module/class which gets bound via `installExtraJSBinding:`
+ */
+- (id)jsBoundExtraModuleForClass:(Class)moduleClass;
+
 @end
diff --git a/React/Fabric/RCTFabricUIManager.h b/React/Fabric/RCTFabricUIManager.h
index a1e5b5ed762b74..4a22c96144bb23 100644
--- a/React/Fabric/RCTFabricUIManager.h
+++ b/React/Fabric/RCTFabricUIManager.h
@@ -42,3 +42,9 @@
             childSet:(NSArray<RCTShadowView *> *)childSet;
 
 @end
+
+@interface RCTBridge (RCTFabricUIManager)
+
+@property (nonatomic, readonly) RCTFabricUIManager *fabricUIManager;
+
+@end
diff --git a/React/Fabric/RCTFabricUIManager.mm b/React/Fabric/RCTFabricUIManager.mm
index d8a754b061d084..2aca771d324739 100644
--- a/React/Fabric/RCTFabricUIManager.mm
+++ b/React/Fabric/RCTFabricUIManager.mm
@@ -72,3 +72,12 @@ - (void)completeRoot:(nonnull NSNumber *)rootTag
 }
 
 @end
+
+@implementation RCTBridge (RCTFabricUIManager)
+
+- (RCTFabricUIManager *)fabricUIManager
+{
+  return [self jsBoundExtraModuleForClass:[RCTFabricUIManager class]];
+}
+
+@end

From 7d20de412b37a35951e615d98509573dc1a24bcb Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Tue, 13 Feb 2018 23:25:04 -0800
Subject: [PATCH 023/267] Fixed a bug with positioning of nested views inside
 <Text>

Summary:
Fixing of recent regression in layout system.
Conseptually, a superview should define frames of child views.

Reviewed By: mmmulani

Differential Revision: D6980128

fbshipit-source-id: e267e966fd46af28db1d3d40939110040b74e33f
---
 Libraries/Text/Text/RCTTextShadowView.m | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Libraries/Text/Text/RCTTextShadowView.m b/Libraries/Text/Text/RCTTextShadowView.m
index 4a2eac095e73d9..2a00e97ba2eb7c 100644
--- a/Libraries/Text/Text/RCTTextShadowView.m
+++ b/Libraries/Text/Text/RCTTextShadowView.m
@@ -298,6 +298,11 @@ - (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
                             maximumSize:frame.size
                         layoutDirection:self.layoutMetrics.layoutDirection
                           layoutContext:localLayoutContext];
+
+      // Reinforcing a proper frame origin for the Shadow View.
+      RCTLayoutMetrics localLayoutMetrics = shadowView.layoutMetrics;
+      localLayoutMetrics.frame.origin = frame.origin;
+      [shadowView layoutWithMetrics:localLayoutMetrics layoutContext:localLayoutContext];
     }
   ];
 }

From 10b642a7af097bd508dab7b5d4723ccb4339d35f Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Wed, 14 Feb 2018 07:51:52 -0800
Subject: [PATCH 024/267] Verify that the component passed to
 createAnimatedComponent is not functional

Summary:
Stateless functional components don't support refs and we need that for the component to work, it used to crash with this error message: `undefined is not an object (evaluating 'this._component.getScrollableNode')`. This makes it clear what the issue is.

Fixes some of the errors in #10635, not sure if it fixes all the cases described in the issue though.

**Test plan**
Tested that passing a component with createClass or extends Component works but passing a function causes an error.

[GENERAL] [ENHANCEMENT] [Animated] - Verify that the component passed to createAnimatedComponent is not functional
Closes https://github.com/facebook/react-native/pull/15019

Differential Revision: D6988096

Pulled By: sahrens

fbshipit-source-id: ec0ffa763245e786f44b4a1d56c0738876c25782
---
 Libraries/Animated/src/__tests__/AnimatedNative-test.js | 9 ++++++---
 Libraries/Animated/src/createAnimatedComponent.js       | 9 +++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Libraries/Animated/src/__tests__/AnimatedNative-test.js b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
index d3f59368ea6098..62c40c8388d79b 100644
--- a/Libraries/Animated/src/__tests__/AnimatedNative-test.js
+++ b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
@@ -10,11 +10,14 @@
  */
 'use strict';
 
+const ClassComponentMock = class {};
+ClassComponentMock.prototype.isReactComponent = true;
+
 jest
   .clearAllMocks()
-  .setMock('Text', {})
-  .setMock('View', {})
-  .setMock('Image', {})
+  .setMock('Text', ClassComponentMock)
+  .setMock('View', ClassComponentMock)
+  .setMock('Image', ClassComponentMock)
   .setMock('React', {Component: class {}})
   .setMock('NativeModules', {
     NativeAnimatedModule: {},
diff --git a/Libraries/Animated/src/createAnimatedComponent.js b/Libraries/Animated/src/createAnimatedComponent.js
index fd363ff0ca7495..42110be681988c 100644
--- a/Libraries/Animated/src/createAnimatedComponent.js
+++ b/Libraries/Animated/src/createAnimatedComponent.js
@@ -17,7 +17,16 @@ const AnimatedProps = require('./nodes/AnimatedProps');
 const React = require('React');
 const ViewStylePropTypes = require('ViewStylePropTypes');
 
+const invariant = require('fbjs/lib/invariant');
+
 function createAnimatedComponent(Component: any): any {
+  invariant(
+    typeof Component === 'string' ||
+      (Component.prototype && Component.prototype.isReactComponent),
+    '`createAnimatedComponent` does not support stateless functional components; ' +
+      'use a class component instead.',
+  );
+
   class AnimatedComponent extends React.Component<Object> {
     _component: any;
     _invokeAnimatedPropsCallbackOnMount: boolean = false;

From f8fee0a631d77313d7cb5e65a3dd04a5a8ba3d03 Mon Sep 17 00:00:00 2001
From: Johan Ruokangas <johan@latehours.net>
Date: Wed, 14 Feb 2018 08:02:13 -0800
Subject: [PATCH 025/267] Pass port when running on device (fix #17973)

Summary:
<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

Building for iOS device `react-native run-ios --device [id]` fails since port is not passed. This is a blocker for us and prevents us from updating to latest React Native stable.

I've tested this in our app and also in fresh app using RN master and verified that it works.

None.

[CLI] [BUGFIX] [local-cli/runIOS/runIOS.js] - Pass metro port when running on device
<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
Closes https://github.com/facebook/react-native/pull/17983

Differential Revision: D6988299

Pulled By: hramos

fbshipit-source-id: 5169706600f87f13b9c9c105eb7d6db7a40194f1
---
 local-cli/runIOS/runIOS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js
index 37e649ba91d167..cb459a81c2d15e 100644
--- a/local-cli/runIOS/runIOS.js
+++ b/local-cli/runIOS/runIOS.js
@@ -68,7 +68,7 @@ function runIOS(argv, config, args) {
   if (args.device) {
     const selectedDevice = matchingDevice(devices, args.device);
     if (selectedDevice) {
-      return runOnDevice(selectedDevice, scheme, xcodeProject, args.configuration, args.packager, args.verbose);
+      return runOnDevice(selectedDevice, scheme, xcodeProject, args.configuration, args.packager, args.verbose, args.port);
     } else {
       if (devices && devices.length > 0) {
         console.log('Could not find device with the name: "' + args.device + '".');

From 96ec2dcb71ecc2bf1ed8c28b29743879c7132a11 Mon Sep 17 00:00:00 2001
From: Rafael Oleza <rafeca@fb.com>
Date: Wed, 14 Feb 2018 08:42:28 -0800
Subject: [PATCH 026/267] Fix enableBabelRCLookup option in new CLI + global
 cache script

Reviewed By: BYK

Differential Revision: D6977885

fbshipit-source-id: 50245e046c7639f9fb4022a9cc5974d50831524c
---
 local-cli/bundle/buildBundle.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js
index afbab9ec8a3ede..39945d455643b3 100644
--- a/local-cli/bundle/buildBundle.js
+++ b/local-cli/bundle/buildBundle.js
@@ -96,6 +96,7 @@ async function buildBundle(
     assetRegistryPath: ASSET_REGISTRY_PATH,
     blacklistRE: config.getBlacklistRE(),
     dynamicDepsInPackages: config.dynamicDepsInPackages,
+    enableBabelRCLookup: config.getEnableBabelRCLookup(),
     extraNodeModules: config.extraNodeModules,
     getModulesRunBeforeMainModule: config.getModulesRunBeforeMainModule,
     getPolyfills: config.getPolyfills,

From 828cd78866f69f8dc0e969ce19f6e615a640ee26 Mon Sep 17 00:00:00 2001
From: Rafael Oleza <rafeca@fb.com>
Date: Wed, 14 Feb 2018 08:42:30 -0800
Subject: [PATCH 027/267] Pass cacheVersion param via the new API

Reviewed By: BYK

Differential Revision: D6980337

fbshipit-source-id: 72c01136b6720390ffec8593f0375c8756dc1d4a
---
 local-cli/bundle/buildBundle.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js
index 39945d455643b3..6265de5c21c930 100644
--- a/local-cli/bundle/buildBundle.js
+++ b/local-cli/bundle/buildBundle.js
@@ -95,6 +95,7 @@ async function buildBundle(
     assetExts: defaultAssetExts.concat(assetExts),
     assetRegistryPath: ASSET_REGISTRY_PATH,
     blacklistRE: config.getBlacklistRE(),
+    cacheVersion: config.cacheVersion,
     dynamicDepsInPackages: config.dynamicDepsInPackages,
     enableBabelRCLookup: config.getEnableBabelRCLookup(),
     extraNodeModules: config.extraNodeModules,

From c281f7a3aec9e0426d11a3a1af5fefdac9b34be1 Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Wed, 14 Feb 2018 09:22:20 -0800
Subject: [PATCH 028/267] Support resumes without overriding the back handler

Differential Revision: D6982515

fbshipit-source-id: 5483f6c677c6653e51f6311386f31f5be6ed0e00
---
 .../java/com/facebook/react/ReactInstanceManager.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index d1ef9b3da49053..f1b8584c01a67d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -545,6 +545,16 @@ public void onHostResume(Activity activity, DefaultHardwareBackBtnHandler defaul
     UiThreadUtil.assertOnUiThread();
 
     mDefaultBackButtonImpl = defaultBackButtonImpl;
+    onHostResume(activity);
+  }
+
+  /**
+   * Use this method when the activity resumes.
+   */
+  @ThreadConfined(UI)
+  public void onHostResume(Activity activity) {
+    UiThreadUtil.assertOnUiThread();
+
     mCurrentActivity = activity;
 
     if (mUseDeveloperSupport) {

From ecc08adf4988eae2089658b7c3252643fb0e588b Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Wed, 14 Feb 2018 09:31:10 -0800
Subject: [PATCH 029/267] Expose methods of persistent yoga for Java

Reviewed By: priteshrnandgaonkar

Differential Revision: D6918605

fbshipit-source-id: e424c78680c04e21154ebe21405671c4e90f6529
---
 .../java/com/facebook/yoga/YogaConfig.java    |  14 +++
 .../facebook/yoga/YogaNodeClonedFunction.java |  19 ++++
 .../jni/first-party/yogajni/jni/YGJNI.cpp     | 100 ++++++++++++++++--
 3 files changed, 122 insertions(+), 11 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeClonedFunction.java

diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
index dfb559f27edb81..5e82fe22cd7806 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
@@ -23,6 +23,7 @@ public class YogaConfig {
 
   long mNativePointer;
   private YogaLogger mLogger;
+  private YogaNodeClonedFunction mNodeClonedFunction;
 
   private native long jni_YGConfigNew();
   public YogaConfig() {
@@ -80,4 +81,17 @@ public void setLogger(YogaLogger logger) {
   public YogaLogger getLogger() {
     return mLogger;
   }
+
+  private native void jni_YGConfigSetHasNodeClonedFunc(long nativePointer, boolean hasClonedFunc);
+
+  public void setOnNodeCloned(YogaNodeClonedFunction nodeClonedFunction) {
+    mNodeClonedFunction = nodeClonedFunction;
+    jni_YGConfigSetHasNodeClonedFunc(mNativePointer, nodeClonedFunction != null);
+  }
+
+  @DoNotStrip
+  public final void onNodeCloned(
+      YogaNode oldNode, YogaNode newNode, YogaNode parent, int childIndex) {
+    mNodeClonedFunction.onNodeCloned(oldNode, newNode, parent, childIndex);
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeClonedFunction.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeClonedFunction.java
new file mode 100644
index 00000000000000..8c27d16bfe83ad
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeClonedFunction.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2017-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+package com.facebook.yoga;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+
+@DoNotStrip
+public interface YogaNodeClonedFunction {
+
+  @DoNotStrip
+  void onNodeCloned(YogaNode oldNode, YogaNode newNode, YogaNode parent, int childIndex);
+}
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
index a54c062fd1ad87..67042729b1f960 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
@@ -19,6 +19,22 @@ struct JYogaNode : public JavaClass<JYogaNode> {
   static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaNode;";
 };
 
+struct JYogaConfig : public JavaClass<JYogaConfig> {
+  static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaConfig;";
+};
+
+struct YGConfigContext {
+  global_ref<jobject>* logger;
+  global_ref<jobject>* config;
+  YGConfigContext() : logger(nullptr), config(nullptr) {}
+  ~YGConfigContext() {
+    delete config;
+    config = nullptr;
+    delete logger;
+    logger = nullptr;
+  }
+};
+
 static inline weak_ref<JYogaNode> *YGNodeJobject(YGNodeRef node) {
   return reinterpret_cast<weak_ref<JYogaNode>*>(node->getContext());
 }
@@ -118,11 +134,39 @@ static float YGJNIBaselineFunc(YGNodeRef node, float width, float height) {
   }
 }
 
-static YGSize YGJNIMeasureFunc(YGNodeRef node,
-                               float width,
-                               YGMeasureMode widthMode,
-                               float height,
-                               YGMeasureMode heightMode) {
+static void YGJNIOnNodeClonedFunc(
+    YGNodeRef oldNode,
+    YGNodeRef newNode,
+    YGNodeRef parent,
+    int childIndex) {
+  auto config = oldNode->getConfig();
+  if (!config) {
+    return;
+  }
+  static auto onNodeClonedFunc = findClassStatic("com/facebook/yoga/YogaConfig")
+                                     ->getMethod<void(
+                                         local_ref<JYogaNode>,
+                                         local_ref<JYogaNode>,
+                                         local_ref<JYogaNode>,
+                                         jint)>("onNodeCloned");
+
+  auto context = reinterpret_cast<YGConfigContext*>(YGConfigGetContext(config));
+  auto javaConfig = context->config;
+
+  onNodeClonedFunc(
+      javaConfig->get(),
+      YGNodeJobject(oldNode)->lockLocal(),
+      YGNodeJobject(newNode)->lockLocal(),
+      YGNodeJobject(parent)->lockLocal(),
+      childIndex);
+}
+
+static YGSize YGJNIMeasureFunc(
+    YGNodeRef node,
+    float width,
+    YGMeasureMode widthMode,
+    float height,
+    YGMeasureMode heightMode) {
   if (auto obj = YGNodeJobject(node)->lockLocal()) {
     static auto measureFunc = findClassStatic("com/facebook/yoga/YogaNode")
                                   ->getMethod<jlong(jfloat, jint, jfloat, jint)>("measure");
@@ -396,6 +440,10 @@ jlong jni_YGConfigNew(alias_ref<jobject>) {
 
 void jni_YGConfigFree(alias_ref<jobject>, jlong nativePointer) {
   const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
+  auto context = reinterpret_cast<YGConfigContext*>(YGConfigGetContext(config));
+  if (context) {
+    delete context;
+  }
   YGConfigFree(config);
 }
 
@@ -430,19 +478,48 @@ void jni_YGConfigSetUseLegacyStretchBehaviour(alias_ref<jobject>,
   YGConfigSetUseLegacyStretchBehaviour(config, useLegacyStretchBehaviour);
 }
 
-void jni_YGConfigSetLogger(alias_ref<jobject>, jlong nativePointer, alias_ref<jobject> logger) {
+void jni_YGConfigSetHasNodeClonedFunc(
+    alias_ref<jobject> thiz,
+    jlong nativePointer,
+    jboolean hasNodeClonedFunc) {
   const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
+  auto context = reinterpret_cast<YGConfigContext*>(YGConfigGetContext(config));
+  if (context && context->config) {
+    delete context->config;
+    context->config = nullptr;
+  }
 
-  auto context = YGConfigGetContext(config);
-  if (context) {
-    delete reinterpret_cast<global_ref<jobject> *>(context);
+  if (hasNodeClonedFunc) {
+    if (!context) {
+      context = new YGConfigContext();
+      YGConfigSetContext(config, context);
+    }
+    context->config = new global_ref<jobject>(make_global(thiz));
+    YGConfigSetNodeClonedFunc(config, YGJNIOnNodeClonedFunc);
+  } else {
+    YGConfigSetNodeClonedFunc(config, nullptr);
+  }
+}
+
+void jni_YGConfigSetLogger(
+    alias_ref<jobject>,
+    jlong nativePointer,
+    alias_ref<jobject> logger) {
+  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
+  auto context = reinterpret_cast<YGConfigContext*>(YGConfigGetContext(config));
+  if (context && context->logger) {
+    delete context->logger;
+    context->logger = nullptr;
   }
 
   if (logger) {
-    YGConfigSetContext(config, new global_ref<jobject>(make_global(logger)));
+    if (!context) {
+      context = new YGConfigContext();
+      YGConfigSetContext(config, context);
+    }
+    context->logger = new global_ref<jobject>(make_global(logger));
     YGConfigSetLogger(config, YGJNILogFunc);
   } else {
-    YGConfigSetContext(config, NULL);
     YGConfigSetLogger(config, NULL);
   }
 }
@@ -545,6 +622,7 @@ jint JNI_OnLoad(JavaVM *vm, void *) {
                         YGMakeNativeMethod(jni_YGConfigSetPointScaleFactor),
                         YGMakeNativeMethod(jni_YGConfigSetUseLegacyStretchBehaviour),
                         YGMakeNativeMethod(jni_YGConfigSetLogger),
+                        YGMakeNativeMethod(jni_YGConfigSetHasNodeClonedFunc),
                     });
   });
 }

From db391a500cc150a73e9f222ff764b318439cfe83 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Wed, 14 Feb 2018 11:26:39 -0800
Subject: [PATCH 030/267] Allow installing JS binding via the RN Android bridge

Reviewed By: fkgozali

Differential Revision: D6979072

fbshipit-source-id: 8b4ac3769496a6a6fe3dd9ee2aac64b66604c413
---
 .../facebook/react/ReactInstanceManager.java  | 47 ++++++++++---------
 .../react/ReactInstanceManagerBuilder.java    | 12 ++++-
 .../com/facebook/react/ReactNativeHost.java   |  6 +++
 .../facebook/react/bridge/BridgeListener.java | 14 ++++++
 .../react/bridge/CatalystInstanceImpl.java    | 21 +++++++--
 5 files changed, 74 insertions(+), 26 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeListener.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index f1b8584c01a67d..834fa4acb9b3f7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -45,13 +45,13 @@
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.infer.annotation.ThreadSafe;
+import com.facebook.react.bridge.BridgeListener;
 import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.CatalystInstanceImpl;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.JavaJSExecutor;
 import com.facebook.react.bridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
-import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.NativeModuleRegistry;
 import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
@@ -124,6 +124,7 @@ public interface ReactInstanceEventListener {
      */
     void onReactContextInitialized(ReactContext context);
   }
+
   private final List<ReactRootView> mAttachedRootViews = Collections.synchronizedList(
     new ArrayList<ReactRootView>());
 
@@ -156,6 +157,7 @@ public interface ReactInstanceEventListener {
   private final @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
   private final boolean mLazyNativeModulesEnabled;
   private final boolean mDelayViewManagerClassLoadsEnabled;
+  private final @Nullable BridgeListener mBridgeListener;
 
   private class ReactContextInitParams {
     private final JavaScriptExecutorFactory mJsExecutorFactory;
@@ -185,25 +187,26 @@ public static ReactInstanceManagerBuilder builder() {
   }
 
   /* package */ ReactInstanceManager(
-      Context applicationContext,
-      @Nullable Activity currentActivity,
-      @Nullable DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler,
-      JavaScriptExecutorFactory javaScriptExecutorFactory,
-      @Nullable JSBundleLoader bundleLoader,
-      @Nullable String jsMainModulePath,
-      List<ReactPackage> packages,
-      boolean useDeveloperSupport,
-      @Nullable NotThreadSafeBridgeIdleDebugListener bridgeIdleDebugListener,
-      LifecycleState initialLifecycleState,
-      UIImplementationProvider uiImplementationProvider,
-      NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler,
-      @Nullable RedBoxHandler redBoxHandler,
-      boolean lazyNativeModulesEnabled,
-      boolean lazyViewManagersEnabled,
-      boolean delayViewManagerClassLoadsEnabled,
-      @Nullable DevBundleDownloadListener devBundleDownloadListener,
-      int minNumShakes,
-      int minTimeLeftInFrameForNonBatchedOperationMs) {
+    Context applicationContext,
+    @Nullable Activity currentActivity,
+    @Nullable DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler,
+    JavaScriptExecutorFactory javaScriptExecutorFactory,
+    @Nullable JSBundleLoader bundleLoader,
+    @Nullable String jsMainModulePath,
+    List<ReactPackage> packages,
+    boolean useDeveloperSupport,
+    @Nullable NotThreadSafeBridgeIdleDebugListener bridgeIdleDebugListener,
+    LifecycleState initialLifecycleState,
+    UIImplementationProvider uiImplementationProvider,
+    NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler,
+    @Nullable RedBoxHandler redBoxHandler,
+    boolean lazyNativeModulesEnabled,
+    boolean lazyViewManagersEnabled,
+    boolean delayViewManagerClassLoadsEnabled,
+    @Nullable DevBundleDownloadListener devBundleDownloadListener,
+    int minNumShakes,
+    int minTimeLeftInFrameForNonBatchedOperationMs,
+    @Nullable BridgeListener bridgeListener) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.ctor()");
     initializeSoLoaderIfNecessary(applicationContext);
 
@@ -252,6 +255,7 @@ public void invokeDefaultOnBackPressed() {
       }
       mPackages.addAll(packages);
     }
+    mBridgeListener = bridgeListener;
 
     // Instantiate ReactChoreographer in UI thread.
     ReactChoreographer.initialize();
@@ -1100,7 +1104,8 @@ private ReactApplicationContext createReactContext(
       .setJSExecutor(jsExecutor)
       .setRegistry(nativeModuleRegistry)
       .setJSBundleLoader(jsBundleLoader)
-      .setNativeModuleCallExceptionHandler(exceptionHandler);
+      .setNativeModuleCallExceptionHandler(exceptionHandler)
+      .setBridgeListener(mBridgeListener);
 
     ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_START);
     // CREATE_CATALYST_INSTANCE_END is in JSCExecutor.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
index ab5315b06dfe47..5f9042093ab9ee 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
@@ -7,6 +7,8 @@
 import android.app.Activity;
 import android.app.Application;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.BridgeListener;
+import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.JSCJavaScriptExecutorFactory;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
@@ -48,6 +50,7 @@ public class ReactInstanceManagerBuilder {
   private @Nullable JavaScriptExecutorFactory mJavaScriptExecutorFactory;
   private int mMinNumShakes = 1;
   private int mMinTimeLeftInFrameForNonBatchedOperationMs = -1;
+  private @Nullable BridgeListener mBridgeListener;
 
   /* package protected */ ReactInstanceManagerBuilder() {
   }
@@ -62,6 +65,12 @@ public ReactInstanceManagerBuilder setUIImplementationProvider(
     return this;
   }
 
+  public ReactInstanceManagerBuilder setBridgeListener(
+    @Nullable BridgeListener listener) {
+    mBridgeListener = listener;
+    return this;
+  }
+
   /**
    * Factory for desired implementation of JavaScriptExecutor.
    */
@@ -280,6 +289,7 @@ public ReactInstanceManager build() {
         mDelayViewManagerClassLoadsEnabled,
         mDevBundleDownloadListener,
         mMinNumShakes,
-        mMinTimeLeftInFrameForNonBatchedOperationMs);
+        mMinTimeLeftInFrameForNonBatchedOperationMs,
+        mBridgeListener);
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
index 1c12e913e6c48e..734597e8394dae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
@@ -16,6 +16,7 @@
 import android.app.Application;
 
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.BridgeListener;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
@@ -76,6 +77,7 @@ protected ReactInstanceManager createReactInstanceManager() {
       .setRedBoxHandler(getRedBoxHandler())
       .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
       .setUIImplementationProvider(getUIImplementationProvider())
+      .setBridgeListener(getBridgeListener())
       .setInitialLifecycleState(LifecycleState.BEFORE_CREATE);
 
     for (ReactPackage reactPackage : getPackages()) {
@@ -122,6 +124,10 @@ protected UIImplementationProvider getUIImplementationProvider() {
     return new UIImplementationProvider();
   }
 
+  protected @Nullable BridgeListener getBridgeListener() {
+    return null;
+  }
+
   /**
    * Returns the name of the main module. Determines the URL used to fetch the JS bundle
    * from the packager server. It is only used when dev support is enabled.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeListener.java
new file mode 100644
index 00000000000000..d39c72b50e86db
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeListener.java
@@ -0,0 +1,14 @@
+package com.facebook.react.bridge;
+
+/**
+ * Interface to listen to bridge events.
+ */
+public interface BridgeListener {
+
+  /**
+   * Called right after the RN Bridge is initialized
+   * @param catalystInstance {@link CatalystInstance} bridge
+   */
+  void onBridgeStarted(CatalystInstance catalystInstance);
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
index 7afc565c2f9418..fe3cef73f85966 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -100,7 +100,8 @@ private CatalystInstanceImpl(
       final JavaScriptExecutor jsExecutor,
       final NativeModuleRegistry nativeModuleRegistry,
       final JSBundleLoader jsBundleLoader,
-      NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler) {
+      NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler,
+      final BridgeListener bridgeListener) {
     Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge.");
     mHybridData = initHybrid();
 
@@ -126,6 +127,9 @@ private CatalystInstanceImpl(
     Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
 
     mJavaScriptContextHolder = new JavaScriptContextHolder(getJavaScriptContext());
+    if (bridgeListener != null) {
+      bridgeListener.onBridgeStarted(this);
+    }
   }
 
   private static class BridgeCallback implements ReactCallback {
@@ -134,8 +138,8 @@ private static class BridgeCallback implements ReactCallback {
     // and determine there's an inaccessible cycle.
     private final WeakReference<CatalystInstanceImpl> mOuter;
 
-    public BridgeCallback(CatalystInstanceImpl outer) {
-      mOuter = new WeakReference<CatalystInstanceImpl>(outer);
+    BridgeCallback(CatalystInstanceImpl outer) {
+      mOuter = new WeakReference<>(outer);
     }
 
     @Override
@@ -553,6 +557,8 @@ public static class Builder {
     private @Nullable NativeModuleRegistry mRegistry;
     private @Nullable JavaScriptExecutor mJSExecutor;
     private @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
+    private @Nullable BridgeListener mBridgeListener;
+
 
     public Builder setReactQueueConfigurationSpec(
         ReactQueueConfigurationSpec ReactQueueConfigurationSpec) {
@@ -581,13 +587,20 @@ public Builder setNativeModuleCallExceptionHandler(
       return this;
     }
 
+    public Builder setBridgeListener(
+      BridgeListener listener) {
+      mBridgeListener = listener;
+      return this;
+    }
+
     public CatalystInstanceImpl build() {
       return new CatalystInstanceImpl(
           Assertions.assertNotNull(mReactQueueConfigurationSpec),
           Assertions.assertNotNull(mJSExecutor),
           Assertions.assertNotNull(mRegistry),
           Assertions.assertNotNull(mJSBundleLoader),
-          Assertions.assertNotNull(mNativeModuleCallExceptionHandler));
+          Assertions.assertNotNull(mNativeModuleCallExceptionHandler),
+          mBridgeListener);
     }
   }
 }

From 51def5ef7ff36e79b2c130331717c91fa416917b Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Wed, 14 Feb 2018 18:10:23 -0800
Subject: [PATCH 031/267] Make Java YogaNode cloneable

Reviewed By: priteshrnandgaonkar

Differential Revision: D6935971

fbshipit-source-id: a2008f1eb849b5074585b48699b7de56d5ac90d4
---
 .../main/java/com/facebook/yoga/YogaNode.java    | 16 ++++++++++++++--
 .../main/jni/first-party/yogajni/jni/YGJNI.cpp   | 11 +++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
index 093d209d34c6aa..1a280dd8d100d5 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
@@ -16,7 +16,7 @@
 import javax.annotation.Nullable;
 
 @DoNotStrip
-public class YogaNode {
+public class YogaNode implements Cloneable {
 
   static {
     SoLoader.loadLibrary("yoga");
@@ -31,7 +31,7 @@ public class YogaNode {
   private List<YogaNode> mChildren;
   private YogaMeasureFunction mMeasureFunction;
   private YogaBaselineFunction mBaselineFunction;
-  private final long mNativePointer;
+  private long mNativePointer;
   private Object mData;
 
   /* Those flags needs be in sync with YGJNI.cpp */
@@ -160,6 +160,18 @@ public void addChildAt(YogaNode child, int i) {
     jni_YGNodeInsertChild(mNativePointer, child.mNativePointer, i);
   }
 
+  private native long jni_YGNodeClone(long nativePointer, Object newNode);
+
+  @Override
+  public YogaNode clone() throws CloneNotSupportedException {
+    YogaNode clonedYogaNode = (YogaNode) super.clone();
+    long clonedNativePointer = jni_YGNodeClone(mNativePointer, clonedYogaNode);
+    clonedYogaNode.mNativePointer = clonedNativePointer;
+    clonedYogaNode.mChildren =
+        mChildren != null ? (List<YogaNode>) ((ArrayList) mChildren).clone() : null;
+    return clonedYogaNode;
+  }
+
   private native void jni_YGNodeRemoveChild(long nativePointer, long childPointer);
   public YogaNode removeChildAt(int i) {
 
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
index 67042729b1f960..b8cfe0a620cc74 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
@@ -250,6 +250,16 @@ jlong jni_YGNodeNewWithConfig(alias_ref<jobject> thiz, jlong configPointer) {
   return reinterpret_cast<jlong>(node);
 }
 
+jlong jni_YGNodeClone(
+    alias_ref<jobject> thiz,
+    jlong nativePointer,
+    alias_ref<jobject> clonedJavaObject) {
+  const YGNodeRef clonedYogaNode = YGNodeClone(_jlong2YGNodeRef(nativePointer));
+  clonedYogaNode->setContext(
+      new weak_ref<jobject>(make_weak(clonedJavaObject)));
+  return reinterpret_cast<jlong>(clonedYogaNode);
+}
+
 void jni_YGNodeFree(alias_ref<jobject> thiz, jlong nativePointer) {
   const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
   delete YGNodeJobject(node);
@@ -612,6 +622,7 @@ jint JNI_OnLoad(JavaVM *vm, void *) {
             YGMakeNativeMethod(jni_YGNodeStyleSetAspectRatio),
             YGMakeNativeMethod(jni_YGNodeGetInstanceCount),
             YGMakeNativeMethod(jni_YGNodePrint),
+            YGMakeNativeMethod(jni_YGNodeClone),
         });
     registerNatives("com/facebook/yoga/YogaConfig",
                     {

From 991b7aba57d46e18d94b65c595bf73649439afd9 Mon Sep 17 00:00:00 2001
From: Miguel Jimenez Esun <mjimenez@fb.com>
Date: Thu, 15 Feb 2018 03:30:12 -0800
Subject: [PATCH 032/267] Upgrade Jest to 22.3.0

Reviewed By: BYK

Differential Revision: D6978514

fbshipit-source-id: 3c6be52d38fedbe849dee6319bb2e4d7a97297c9
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index fd029432790838..631a0394dcdac7 100644
--- a/package.json
+++ b/package.json
@@ -216,8 +216,8 @@
     "eslint-plugin-prettier": "2.6.0",
     "eslint-plugin-react": "7.6.1",
     "flow-bin": "^0.65.0",
-    "jest": "22.2.1",
-    "jest-junit": "3.5.0",
+    "jest": "22.3.0",
+    "jest-junit": "3.6.0",
     "prettier": "1.9.1",
     "react": "^16.3.0-alpha.1",
     "react-test-renderer": "^16.3.0-alpha.1",

From f7f5dc66493ad25a85927a9503728b0491c8aab9 Mon Sep 17 00:00:00 2001
From: Alex Dvornikov <advornikov@fb.com>
Date: Thu, 15 Feb 2018 03:52:52 -0800
Subject: [PATCH 033/267] Extract polyfillGlobal from InitializeCore

Reviewed By: jeanlauliac

Differential Revision: D6987657

fbshipit-source-id: 8762732de671418520376a98bdd724bbb24e4e36
---
 Libraries/Core/InitializeCore.js         | 52 ++------------------
 Libraries/Utilities/PolyfillFunctions.js | 62 ++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 48 deletions(-)
 create mode 100644 Libraries/Utilities/PolyfillFunctions.js

diff --git a/Libraries/Core/InitializeCore.js b/Libraries/Core/InitializeCore.js
index f5f3d3cc4d8429..761846f862ad4a 100644
--- a/Libraries/Core/InitializeCore.js
+++ b/Libraries/Core/InitializeCore.js
@@ -27,6 +27,8 @@
  */
 'use strict';
 
+const {polyfillObjectProperty, polyfillGlobal} = require('PolyfillFunctions');
+
 if (global.GLOBAL === undefined) {
   global.GLOBAL = global;
 }
@@ -35,8 +37,6 @@ if (global.window === undefined) {
   global.window = global;
 }
 
-const defineLazyObjectProperty = require('defineLazyObjectProperty');
-
 // Set up collections
 const _shouldPolyfillCollection = require('_shouldPolyfillES6Collection');
 if (_shouldPolyfillCollection('Map')) {
@@ -46,50 +46,6 @@ if (_shouldPolyfillCollection('Set')) {
   polyfillGlobal('Set', () => require('Set'));
 }
 
-/**
- * Sets an object's property. If a property with the same name exists, this will
- * replace it but maintain its descriptor configuration. The property will be
- * replaced with a lazy getter.
- *
- * In DEV mode the original property value will be preserved as `original[PropertyName]`
- * so that, if necessary, it can be restored. For example, if you want to route
- * network requests through DevTools (to trace them):
- *
- *   global.XMLHttpRequest = global.originalXMLHttpRequest;
- *
- * @see https://github.com/facebook/react-native/issues/934
- */
-function defineLazyProperty<T>(
-  object: Object,
-  name: string,
-  getValue: () => T,
-): void {
-  const descriptor = Object.getOwnPropertyDescriptor(object, name);
-  if (__DEV__ && descriptor) {
-    const backupName = `original${name[0].toUpperCase()}${name.substr(1)}`;
-    Object.defineProperty(object, backupName, {
-      ...descriptor,
-      value: object[name],
-    });
-  }
-
-  const {enumerable, writable, configurable} = descriptor || {};
-  if (descriptor && !configurable) {
-    console.error('Failed to set polyfill. ' + name + ' is not configurable.');
-    return;
-  }
-
-  defineLazyObjectProperty(object, name, {
-    get: getValue,
-    enumerable: enumerable !== false,
-    writable: writable !== false,
-  });
-}
-
-function polyfillGlobal<T>(name: string, getValue: () => T): void {
-  defineLazyProperty(global, name, getValue);
-}
-
 // Set up process
 global.process = global.process || {};
 global.process.env = global.process.env || {};
@@ -191,8 +147,8 @@ if (navigator === undefined) {
 }
 
 // see https://github.com/facebook/react-native/issues/10881
-defineLazyProperty(navigator, 'product', () => 'ReactNative');
-defineLazyProperty(navigator, 'geolocation', () => require('Geolocation'));
+polyfillObjectProperty(navigator, 'product', () => 'ReactNative');
+polyfillObjectProperty(navigator, 'geolocation', () => require('Geolocation'));
 
 // Just to make sure the JS gets packaged up. Wait until the JS environment has
 // been initialized before requiring them.
diff --git a/Libraries/Utilities/PolyfillFunctions.js b/Libraries/Utilities/PolyfillFunctions.js
new file mode 100644
index 00000000000000..aa35c149915aa5
--- /dev/null
+++ b/Libraries/Utilities/PolyfillFunctions.js
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule PolyfillFunctions
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+const defineLazyObjectProperty = require('defineLazyObjectProperty');
+
+/**
+ * Sets an object's property. If a property with the same name exists, this will
+ * replace it but maintain its descriptor configuration. The property will be
+ * replaced with a lazy getter.
+ *
+ * In DEV mode the original property value will be preserved as `original[PropertyName]`
+ * so that, if necessary, it can be restored. For example, if you want to route
+ * network requests through DevTools (to trace them):
+ *
+ *   global.XMLHttpRequest = global.originalXMLHttpRequest;
+ *
+ * @see https://github.com/facebook/react-native/issues/934
+ */
+function polyfillObjectProperty<T>(
+  object: Object,
+  name: string,
+  getValue: () => T,
+): void {
+  const descriptor = Object.getOwnPropertyDescriptor(object, name);
+  if (__DEV__ && descriptor) {
+    const backupName = `original${name[0].toUpperCase()}${name.substr(1)}`;
+    Object.defineProperty(object, backupName, {
+      ...descriptor,
+      value: object[name],
+    });
+  }
+
+  const {enumerable, writable, configurable} = descriptor || {};
+  if (descriptor && !configurable) {
+    console.error('Failed to set polyfill. ' + name + ' is not configurable.');
+    return;
+  }
+
+  defineLazyObjectProperty(object, name, {
+    get: getValue,
+    enumerable: enumerable !== false,
+    writable: writable !== false,
+  });
+}
+
+function polyfillGlobal<T>(name: string, getValue: () => T): void {
+  polyfillObjectProperty(global, name, getValue);
+}
+
+module.exports = {polyfillObjectProperty, polyfillGlobal};

From f751c3460e5dc48c1f1a2d72a56173285899de21 Mon Sep 17 00:00:00 2001
From: Yuichi ONO <yuichi.ono@linecorp.com>
Date: Thu, 15 Feb 2018 07:16:59 -0800
Subject: [PATCH 034/267] Fix main size calculation from the aspect ratio

Summary:
When the following conditions are met, the main size become smaller by the margins in the main axis.
* The aspect ratio is defined
* The main size is not defined
* The cross size is defined
* The main margin is defined

This is because the main margin size is not included when calculating the main size from the aspect ratio.
Closes https://github.com/facebook/yoga/pull/715

Reviewed By: emilsjolander

Differential Revision: D6998988

Pulled By: priteshrnandgaonkar

fbshipit-source-id: f6f69c47ece17bd7c5e41517b96032bf0c149356
---
 ReactCommon/yoga/yoga/Yoga.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp
index 63b00c6cc8a586..8f1f5e04e84ecd 100644
--- a/ReactCommon/yoga/yoga/Yoga.cpp
+++ b/ReactCommon/yoga/yoga/Yoga.cpp
@@ -1102,10 +1102,11 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
 
     if (!YGFloatIsUndefined(child->getStyle().aspectRatio)) {
       if (!isMainAxisRow && childWidthMeasureMode == YGMeasureModeExactly) {
-        childHeight = (childWidth - marginRow) / child->getStyle().aspectRatio;
+        childHeight = marginColumn +
+            (childWidth - marginRow) / child->getStyle().aspectRatio;
         childHeightMeasureMode = YGMeasureModeExactly;
       } else if (isMainAxisRow && childHeightMeasureMode == YGMeasureModeExactly) {
-        childWidth =
+        childWidth = marginRow +
             (childHeight - marginColumn) * child->getStyle().aspectRatio;
         childWidthMeasureMode = YGMeasureModeExactly;
       }

From 59401f89c1e1b96ce74e58b8b19f333c87ca90b3 Mon Sep 17 00:00:00 2001
From: Andres Suarez <asuarez@fb.com>
Date: Thu, 15 Feb 2018 07:48:29 -0800
Subject: [PATCH 035/267] Fold .eslintrc's into the root eslintrc

Reviewed By: TheSavior

Differential Revision: D6997050

fbshipit-source-id: 81e45d24343cca8336adb0de43bd766899ff03b6
---
 .eslintrc           | 44 ++++++++++++++++++++++++++++++++++++++------
 Libraries/.eslintrc |  7 -------
 RNTester/.eslintrc  |  7 -------
 jest/.eslintrc      |  7 -------
 local-cli/.eslintrc | 14 --------------
 5 files changed, 38 insertions(+), 41 deletions(-)
 delete mode 100644 Libraries/.eslintrc
 delete mode 100644 RNTester/.eslintrc
 delete mode 100644 jest/.eslintrc
 delete mode 100644 local-cli/.eslintrc

diff --git a/.eslintrc b/.eslintrc
index 167d6a58776566..2c1f512a16ce28 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -169,10 +169,10 @@
 
   // ESLint Comments Plugin
   // The following rules are made available via `eslint-plugin-eslint-comments`
-    'eslint-comments/no-aggregating-enable': 1, // disallows eslint-enable comments for multiple eslint-disable comments
-    'eslint-comments/no-unlimited-disable': 1, // disallows eslint-disable comments without rule names
-    'eslint-comments/no-unused-disable': 1, // disallow disables that don't cover any errors
-    'eslint-comments/no-unused-enable': 1, // // disallow enables that don't enable anything or enable rules that weren't disabled
+    "eslint-comments/no-aggregating-enable": 1, // disallows eslint-enable comments for multiple eslint-disable comments
+    "eslint-comments/no-unlimited-disable": 1, // disallows eslint-disable comments without rule names
+    "eslint-comments/no-unused-disable": 1, // disallow disables that don't cover any errors
+    "eslint-comments/no-unused-enable": 1, // // disallow enables that don't enable anything or enable rules that weren't disabled
 
   // Flow Plugin
   // The following rules are made available via `eslint-plugin-flowtype`
@@ -201,7 +201,7 @@
     "new-parens": 1,                 // disallow the omission of parentheses when invoking a constructor with no arguments
     "no-nested-ternary": 0,          // disallow nested ternary expressions (off by default)
     "no-array-constructor": 1,       // disallow use of the Array constructor
-    'no-empty-character-class': 1,   // disallow the use of empty character classes in regular expressions
+    "no-empty-character-class": 1,   // disallow the use of empty character classes in regular expressions
     "no-lonely-if": 0,               // disallow if as the only statement in an else block (off by default)
     "no-new-object": 1,              // disallow use of the Object constructor
     "no-spaced-func": 1,             // disallow space between function identifier and application
@@ -258,5 +258,37 @@
     "jest/no-focused-tests": 1,
     "jest/no-identical-title": 1,
     "jest/valid-expect": 1,
-  }
+  },
+
+  "overrides": [
+    {
+      "files": [
+        "Libraries/**/*.js",
+        "RNTester/**/*.js",
+        "jest/**/*.js",
+      ],
+      "rules": {
+        // These folders currently run through babel and don't need to be
+        // compatible with node 4
+        "comma-dangle": 0,
+      },
+    },
+    {
+      "files": [
+        "local-cli/**/*.js",
+      ],
+      "rules": {
+        // This folder currently runs through babel and doesn't need to be
+        // compatible with node 4
+        "comma-dangle": 0,
+
+        "lint/extra-arrow-initializer": 0,
+        "no-alert": 0,
+        "no-console-disallow": 0,
+      },
+      "env": {
+        "node": true,
+      },
+    },
+  ],
 }
diff --git a/Libraries/.eslintrc b/Libraries/.eslintrc
deleted file mode 100644
index ddcf4e27251d8f..00000000000000
--- a/Libraries/.eslintrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "rules": {
-    // This folder currently runs through babel and doesn't need to be
-    // compatible with node 4
-    "comma-dangle": 0
-  }
-}
diff --git a/RNTester/.eslintrc b/RNTester/.eslintrc
deleted file mode 100644
index ddcf4e27251d8f..00000000000000
--- a/RNTester/.eslintrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "rules": {
-    // This folder currently runs through babel and doesn't need to be
-    // compatible with node 4
-    "comma-dangle": 0
-  }
-}
diff --git a/jest/.eslintrc b/jest/.eslintrc
deleted file mode 100644
index ddcf4e27251d8f..00000000000000
--- a/jest/.eslintrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "rules": {
-    // This folder currently runs through babel and doesn't need to be
-    // compatible with node 4
-    "comma-dangle": 0
-  }
-}
diff --git a/local-cli/.eslintrc b/local-cli/.eslintrc
deleted file mode 100644
index cb6a62b52255e1..00000000000000
--- a/local-cli/.eslintrc
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "rules": {
-    // This folder currently runs through babel and doesn't need to be
-    // compatible with node 4
-    "comma-dangle": 0,
-
-    "lint/extra-arrow-initializer": 0,
-    "no-alert": 0,
-    "no-console-disallow": 0
-  },
-  "env": {
-    "node": true
-  }
-}

From c82b9f72de8b63b5c7c2c2271c5e3c53072d3ce9 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Thu, 15 Feb 2018 12:04:46 -0800
Subject: [PATCH 036/267] Create JNI wrapper for Fabric

Reviewed By: fkgozali

Differential Revision: D6989838

fbshipit-source-id: f092901cacc0c3eb89b08c6ac0384c4d5f6e6cfe
---
 .../java/com/facebook/react/ReactInstanceManager.java  |  9 +++++++--
 .../src/main/java/com/facebook/react/fabric/BUCK       | 10 ----------
 .../java/com/facebook/react/fabric/FabricBinding.java  |  7 +++++++
 3 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 834fa4acb9b3f7..71844e945a89f2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -352,12 +352,17 @@ public void registerAdditionalPackages(List<ReactPackage> packages) {
 
     Assertions.assertNotNull(catalystInstance, "CatalystInstance null after hasStartedCreatingInitialContext true.");
 
-    final ReactApplicationContext reactContext = new ReactApplicationContext(mApplicationContext);
+    final ReactApplicationContext reactContext = getReactApplicationContext();
 
     NativeModuleRegistry nativeModuleRegistry = processPackages(reactContext, packages, true);
     catalystInstance.extendNativeModules(nativeModuleRegistry);
   }
 
+  @VisibleForTesting
+  public @Nullable ReactApplicationContext getReactApplicationContext() {
+    return new ReactApplicationContext(mApplicationContext);
+  }
+
   /**
    * Recreate the react application and context. This should be called if configuration has changed
    * or the developer has requested the app to be reloaded. It should only be called after an
@@ -1088,7 +1093,7 @@ private ReactApplicationContext createReactContext(
       JSBundleLoader jsBundleLoader) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.createReactContext()");
     ReactMarker.logMarker(CREATE_REACT_CONTEXT_START);
-    final ReactApplicationContext reactContext = new ReactApplicationContext(mApplicationContext);
+    final ReactApplicationContext reactContext = getReactApplicationContext();
 
     if (mUseDeveloperSupport) {
       reactContext.setNativeModuleCallExceptionHandler(mDevSupportManager);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
index bc7ab5bbebc50d..3ff8cc422dfa64 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
@@ -11,20 +11,10 @@ android_library(
         "PUBLIC",
     ],
     deps = [
-        react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
-        react_native_dep("libraries/fresco/fresco-react-native:fbcore"),
-        react_native_dep("libraries/fresco/fresco-react-native:fresco-drawee"),
-        react_native_dep("libraries/fresco/fresco-react-native:fresco-react-native"),
-        react_native_dep("libraries/fresco/fresco-react-native:imagepipeline"),
-        react_native_dep("libraries/textlayoutbuilder:textlayoutbuilder"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react:reactAndroid"),
         react_native_target("java/com/facebook/react/bridge:bridgeAndroid"),
-        react_native_target("java/com/facebook/react/common:commonAndroid"),
-        react_native_target("java/com/facebook/react/devsupport:devsupportAndroid"),
-        react_native_target("java/com/facebook/react/modules/core:coreAndroid"),
-        react_native_target("java/com/facebook/react/shell:shellAndroid"),
         react_native_target("java/com/facebook/react/uimanager:uimanagerAndroid"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotationsAndroid"),
         react_native_target("java/com/facebook/react/module/annotations:annotationsAndroid"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
new file mode 100644
index 00000000000000..a44cf8b1d951af
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
@@ -0,0 +1,7 @@
+package com.facebook.react.fabric;
+
+public interface FabricBinding {
+
+  void installFabric(Object jsContext, FabricUIManagerModule fabricModule);
+
+}

From ad4f54ff6c8826a9f570fc6a4cf93eac9a07c59a Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Thu, 15 Feb 2018 13:29:17 -0800
Subject: [PATCH 037/267] Extend installFabric method to access UIFabricModule
 from C++

Reviewed By: sebmarkbage

Differential Revision: D7001974

fbshipit-source-id: a49c6e634ac710805fb37a50a61c2cf2e248b8a7
---
 .../main/java/com/facebook/react/fabric/FabricBinding.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
index a44cf8b1d951af..2f09ef700bed77 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
@@ -1,7 +1,9 @@
 package com.facebook.react.fabric;
 
+import com.facebook.react.bridge.JavaScriptContextHolder;
+
 public interface FabricBinding {
 
-  void installFabric(Object jsContext, FabricUIManagerModule fabricModule);
+  void installFabric(JavaScriptContextHolder jsContext, FabricUIManagerModule fabricModule);
 
 }

From 7630a614e4bd56c1a3ac728e1dfafd114340f2b7 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 15 Feb 2018 17:40:10 -0800
Subject: [PATCH 038/267] Demo illustrated `base-line` metric exposure

Summary:
A demo illustrated `base-line` metric exposure to layout system was added to RNTester.
And currently it shows that we don't support it at all.

https://cl.ly/1F0B0D430U3e

Reviewed By: sahrens

Differential Revision: D6957056

fbshipit-source-id: 28776300fc8e11950ac5ba1a5416f68d31d4e9fb
---
 RNTester/js/TextExample.ios.js | 72 +++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/RNTester/js/TextExample.ios.js b/RNTester/js/TextExample.ios.js
index 5caf0089286623..5064a63dc8fc89 100644
--- a/RNTester/js/TextExample.ios.js
+++ b/RNTester/js/TextExample.ios.js
@@ -15,7 +15,7 @@ const Platform = require('Platform');
 var React = require('react');
 var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
-var {Image, Text, View, LayoutAnimation, Button} = ReactNative;
+var {Image, Text, TextInput, View, LayoutAnimation, Button} = ReactNative;
 
 type TextAlignExampleRTLState = {|
   isRTL: boolean,
@@ -224,6 +224,70 @@ var AdjustingFontSize = createReactClass({
   },
 });
 
+class TextBaseLineLayoutExample extends React.Component<*, *> {
+  render() {
+    var texts = [];
+    for (var i = 9; i >= 0; i--) {
+      texts.push(<Text key={i} style={{fontSize: 8 + i * 5, backgroundColor: '#eee'}}>{i}</Text>);
+    }
+
+    const marker = <View style={{width: 20, height: 20, backgroundColor: 'gray'}} />;
+    const subtitleStyle = {fontSize: 16, marginTop: 8, fontWeight: 'bold'};
+
+    return (
+      <View>
+        <Text style={subtitleStyle}>{'Nested <Text/>s:'}</Text>
+        <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
+          {marker}
+          <Text>
+            {texts}
+          </Text>
+          {marker}
+        </View>
+
+        <Text style={subtitleStyle}>{'Array of <Text/>s in <View>:'}</Text>
+        <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
+          {marker}
+          {texts}
+          {marker}
+        </View>
+
+        <Text style={subtitleStyle}>{'Interleaving <View> and <Text>:'}</Text>
+        <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
+          {marker}
+          <Text selectable={true}>
+            Some text.
+            <View style={{flexDirection: 'row', alignItems: 'baseline', backgroundColor: '#eee'}}>
+              {marker}
+              <Text>Text inside View.</Text>
+              {marker}
+            </View>
+          </Text>
+          {marker}
+        </View>
+
+        <Text style={subtitleStyle}>{'<TextInput/>:'}</Text>
+        <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
+          {marker}
+          <TextInput style={{margin: 0, padding: 0}}>
+            {texts}
+          </TextInput>
+          {marker}
+        </View>
+
+        <Text style={subtitleStyle}>{'<TextInput multiline/>:'}</Text>
+        <View style={{flexDirection: 'row', alignItems: 'baseline'}}>
+          {marker}
+          <TextInput multiline={true} style={{margin: 0, padding: 0}}>
+            {texts}
+          </TextInput>
+          {marker}
+        </View>
+      </View>
+    );
+  }
+}
+
 exports.title = '<Text>';
 exports.description = 'Base component for rendering styled text.';
 exports.displayName = 'TextExample';
@@ -780,4 +844,10 @@ exports.examples = [
       return <TextAlignRTLExample />;
     },
   },
+  {
+    title: 'Text `alignItems: \'baseline\'` style',
+    render: function() {
+      return <TextBaseLineLayoutExample />;
+    },
+  },
 ];

From 51b3529f6c2ca354800c0cf6ecb8eb3115eaa36e Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 15 Feb 2018 17:40:12 -0800
Subject: [PATCH 039/267] `base-line` metric exposure for <Text>

Summary:
Now <Text> exposes base-line metric to Yoga.

Before:
https://cl.ly/1F0B0D430U3e

After:
https://cl.ly/0G1Q29450O0y

Reviewed By: yungsters

Differential Revision: D6957055

fbshipit-source-id: 04c1df693915e294b54e3c33e0aea21611dcc232
---
 Libraries/Text/Text/RCTTextShadowView.m | 36 +++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/Libraries/Text/Text/RCTTextShadowView.m b/Libraries/Text/Text/RCTTextShadowView.m
index 2a00e97ba2eb7c..790916354067b0 100644
--- a/Libraries/Text/Text/RCTTextShadowView.m
+++ b/Libraries/Text/Text/RCTTextShadowView.m
@@ -31,6 +31,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _cachedTextStorages = [NSMapTable strongToStrongObjectsMapTable];
     _needsUpdateView = YES;
     YGNodeSetMeasureFunc(self.yogaNode, RCTTextShadowViewMeasure);
+    YGNodeSetBaselineFunc(self.yogaNode, RCTTextShadowViewBaseline);
   }
 
   return self;
@@ -307,6 +308,27 @@ - (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
   ];
 }
 
+- (CGFloat)lastBaselineForSize:(CGSize)size
+{
+  NSAttributedString *attributedText =
+    [self textStorageAndLayoutManagerThatFitsSize:size exclusiveOwnership:NO];
+
+  __block CGFloat maximumDescender = 0.0;
+
+  [attributedText enumerateAttribute:NSFontAttributeName
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:
+    ^(UIFont *font, NSRange range, __unused BOOL *stop) {
+      if (maximumDescender > font.descender) {
+        maximumDescender = font.descender;
+      }
+    }
+  ];
+
+  return size.height + maximumDescender;
+}
+
 static YGSize RCTTextShadowViewMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode)
 {
   CGSize maximumSize = (CGSize){
@@ -341,4 +363,18 @@ static YGSize RCTTextShadowViewMeasure(YGNodeRef node, float width, YGMeasureMod
   };
 }
 
+static float RCTTextShadowViewBaseline(YGNodeRef node, const float width, const float height)
+{
+  RCTTextShadowView *shadowTextView = (__bridge RCTTextShadowView *)YGNodeGetContext(node);
+
+  CGSize size = (CGSize){
+    RCTCoreGraphicsFloatFromYogaFloat(width),
+    RCTCoreGraphicsFloatFromYogaFloat(height)
+  };
+
+  CGFloat lastBaseline = [shadowTextView lastBaselineForSize:size];
+
+  return RCTYogaFloatFromCoreGraphicsFloat(lastBaseline);
+}
+
 @end

From 0dbe18375ebb712be8bebd3b6592170f90f8b7bc Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 15 Feb 2018 17:40:14 -0800
Subject: [PATCH 040/267] `base-line` metric exposure for <TextInput>

Summary:
Now <TextInput> (both bersions) exposes base-line metric to Yoga.
Before:
https://cl.ly/0G1Q29450O0y
After:
https://cl.ly/2X103V3O0322

Reviewed By: yungsters

Differential Revision: D6957054

fbshipit-source-id: d76d96f56720d710a4230c53beafdb0b2521e8a9
---
 .../TextInput/RCTBaseTextInputShadowView.m    | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
index faaaf775f06742..0d60c3c49d59b6 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
@@ -37,6 +37,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _needsUpdateView = YES;
 
     YGNodeSetMeasureFunc(self.yogaNode, RCTBaseTextInputShadowViewMeasure);
+    YGNodeSetBaselineFunc(self.yogaNode, RCTTextInputShadowViewBaseline);
   }
 
   return self;
@@ -167,7 +168,7 @@ - (void)uiManagerWillPerformMounting
 
 #pragma mark -
 
-- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
+- (NSAttributedString *)measurableAttributedText
 {
   // Only for the very first render when we don't have `_localAttributedText`,
   // we use value directly from the property and/or nested content.
@@ -187,6 +188,13 @@ - (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximu
     attributedText = [[NSAttributedString alloc] initWithString:text attributes:self.textAttributes.effectiveTextAttributes];
   }
 
+  return attributedText;
+}
+
+- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
+{
+  NSAttributedString *attributedText = [self measurableAttributedText];
+
   if (!_textStorage) {
     _textContainer = [NSTextContainer new];
     _textContainer.lineFragmentPadding = 0.0; // Note, the default value is 5.
@@ -209,6 +217,26 @@ - (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximu
   };
 }
 
+- (CGFloat)lastBaselineForSize:(CGSize)size
+{
+  NSAttributedString *attributedText = [self measurableAttributedText];
+
+  __block CGFloat maximumDescender = 0.0;
+
+  [attributedText enumerateAttribute:NSFontAttributeName
+                             inRange:NSMakeRange(0, attributedText.length)
+                             options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+                          usingBlock:
+    ^(UIFont *font, NSRange range, __unused BOOL *stop) {
+      if (maximumDescender > font.descender) {
+        maximumDescender = font.descender;
+      }
+    }
+  ];
+
+  return size.height + maximumDescender;
+}
+
 static YGSize RCTBaseTextInputShadowViewMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode)
 {
   RCTShadowView *shadowView = (__bridge RCTShadowView *)YGNodeGetContext(node);
@@ -253,4 +281,18 @@ static YGSize RCTBaseTextInputShadowViewMeasure(YGNodeRef node, float width, YGM
   };
 }
 
+static float RCTTextInputShadowViewBaseline(YGNodeRef node, const float width, const float height)
+{
+  RCTBaseTextInputShadowView *shadowTextView = (__bridge RCTBaseTextInputShadowView *)YGNodeGetContext(node);
+
+  CGSize size = (CGSize){
+    RCTCoreGraphicsFloatFromYogaFloat(width),
+    RCTCoreGraphicsFloatFromYogaFloat(height)
+  };
+
+  CGFloat lastBaseline = [shadowTextView lastBaselineForSize:size];
+
+  return RCTYogaFloatFromCoreGraphicsFloat(lastBaseline);
+}
+
 @end

From 574c70e771dfba4c663be083abe4d0cb1afc260f Mon Sep 17 00:00:00 2001
From: Taras Tsugrii <ttsugrii@fb.com>
Date: Thu, 15 Feb 2018 20:05:26 -0800
Subject: [PATCH 041/267] Use only native robolectric_test rules.

Reviewed By: adamjernst

Differential Revision: D6997829

fbshipit-source-id: 5f8d41a6126f02c9fb9d0fb90d89df28eeea9653
---
 ReactNative/DEFS.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactNative/DEFS.bzl b/ReactNative/DEFS.bzl
index a9f5b39813a2be..9cca53e663b890 100644
--- a/ReactNative/DEFS.bzl
+++ b/ReactNative/DEFS.bzl
@@ -150,7 +150,7 @@ def rn_robolectric_test(name, srcs, vm_args=None, *args, **kwargs):
     # RN tests use  Powermock, which means they get their own ClassLoaders.
     # Because the yoga native library (or any native library) can only be loaded into one
     # ClassLoader at a time, we need to run each in its own process, hence fork_mode = 'per_test'.
-    robolectric_test(
+    native.robolectric_test(
         name=name,
         use_cxx_libraries=True,
         cxx_library_whitelist=[

From b48f7e560545d53db7c906ced51a91c4cce6ee94 Mon Sep 17 00:00:00 2001
From: Krzysztof Magiera <krzys@swmansion.com>
Date: Fri, 16 Feb 2018 11:43:34 -0800
Subject: [PATCH 042/267] Support for animated tracking in native driver

Summary:
This PR adds support for Animated tracking to Animated Native Driver implementation on Android and iOS.

Animated tracking allows for animation to be started with a "dynamic" end value. Instead of passing a fixed number as end value we can pass a reference to another Animated.Value. Then when that value changes, the animation will be reconfigured to drive the animation to the new destination point. What is important is that animation will keep its state in the process of updating "toValue". That is if it is a spring animation and the end value changes while the previous animation still hasn't settled the new animation will start from the current position and will inherit current velocity. This makes end value transitions very smooth.

Animated tracking is available in JS implementation of Animated library but not in the native implementation. Therefore until now, it wasn't possible to utilize native driver when using animated tracking. Offloading animation from JS thread turns out to be crucial for gesture driven animations. This PR is a step forward towards feature parity between JS and native implementations of Animated.

Here is a link to example video that shows how tracking can be used to implement chat heads effect: https://twitter.com/kzzzf/status/958362032650244101

In addition this PR fixes an issue with frames animation driver on Android that because of rounding issues was taking one extra frame to start. Because of that change I had to update a number of Android unit tests that were relying on that behavior and running that one additional animation step prior to performing checks.

As a part of this PR I'm adding three unit tests for each of the platforms that verifies most important aspects of this implementation. Please refer to the code and look at the test cases top level comments to learn what they do.

I'm also adding a section to "Native Animated Example" screen in RNTester app that provides a test case for tracking. In the example we have blue square that fallows the red line drawn on screen. Line uses Animated.Value for it's position while square is connected via tracking spring animation to that value. So it is ought to follow the line. When user taps in the area surrounding the button new position for the red line is selected at random and the value updates. Then we can watch blue screen animate to that position.

You can also refer to this video that I use to demonstrate how tracking can be linked with native gesture events using react-native-gesture-handler lib: https://twitter.com/kzzzf/status/958362032650244101

[GENERAL][FEATURE][Native Animated] - Added support for animated tracking to native driver. Now you can use `useNativeDriver` flag with animations that track other Animated.Values
Closes https://github.com/facebook/react-native/pull/17896

Differential Revision: D6974170

Pulled By: hramos

fbshipit-source-id: 50e918b36ee10f80c1deb866c955661d4cc2619b
---
 .../Animated/src/nodes/AnimatedTracking.js    |  37 +++
 Libraries/Animated/src/nodes/AnimatedValue.js |   5 +-
 .../Drivers/RCTAnimationDriver.h              |   1 +
 .../Drivers/RCTDecayAnimation.m               |  23 +-
 .../Drivers/RCTFrameAnimation.m               |  29 +-
 .../Drivers/RCTSpringAnimation.m              |  44 +--
 .../NativeAnimation/Nodes/RCTAnimatedNode.h   |   3 +
 .../Nodes/RCTTrackingAnimatedNode.h           |  15 +
 .../Nodes/RCTTrackingAnimatedNode.m           |  54 ++++
 .../RCTAnimation.xcodeproj/project.pbxproj    |  12 +
 .../RCTNativeAnimatedNodesManager.m           |  14 +-
 .../RCTNativeAnimatedNodesManagerTests.m      | 223 ++++++++++++++
 RNTester/js/NativeAnimationsExample.js        |  75 +++++
 .../react/animated/AnimationDriver.java       |  13 +
 .../react/animated/DecayAnimation.java        |  18 +-
 .../animated/FrameBasedAnimationDriver.java   |  20 +-
 .../animated/NativeAnimatedNodesManager.java  |  39 ++-
 .../react/animated/SpringAnimation.java       |  16 +-
 .../react/animated/TrackingAnimatedNode.java  |  37 +++
 .../facebook/react/bridge/JavaOnlyArray.java  |  32 +-
 .../facebook/react/bridge/JavaOnlyMap.java    |  34 ++-
 .../NativeAnimatedNodeTraversalTest.java      | 276 ++++++++++++++----
 22 files changed, 899 insertions(+), 121 deletions(-)
 create mode 100644 Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
 create mode 100644 Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java

diff --git a/Libraries/Animated/src/nodes/AnimatedTracking.js b/Libraries/Animated/src/nodes/AnimatedTracking.js
index 1a54f78abb5a23..0ec517d12bd560 100644
--- a/Libraries/Animated/src/nodes/AnimatedTracking.js
+++ b/Libraries/Animated/src/nodes/AnimatedTracking.js
@@ -14,6 +14,10 @@
 
 const AnimatedValue = require('./AnimatedValue');
 const AnimatedNode = require('./AnimatedNode');
+const {
+  generateNewAnimationId,
+  shouldUseNativeDriver,
+} = require('../NativeAnimatedHelper');
 
 import type {EndCallback} from '../animations/Animation';
 
@@ -23,6 +27,7 @@ class AnimatedTracking extends AnimatedNode {
   _callback: ?EndCallback;
   _animationConfig: Object;
   _animationClass: any;
+  _useNativeDriver: boolean;
 
   constructor(
     value: AnimatedValue,
@@ -36,16 +41,32 @@ class AnimatedTracking extends AnimatedNode {
     this._parent = parent;
     this._animationClass = animationClass;
     this._animationConfig = animationConfig;
+    this._useNativeDriver = shouldUseNativeDriver(animationConfig);
     this._callback = callback;
     this.__attach();
   }
 
+  __makeNative() {
+    this.__isNative = true;
+    this._parent.__makeNative();
+    super.__makeNative();
+    this._value.__makeNative();
+  }
+
   __getValue(): Object {
     return this._parent.__getValue();
   }
 
   __attach(): void {
     this._parent.__addChild(this);
+    if (this._useNativeDriver) {
+      // when the tracking starts we need to convert this node to a "native node"
+      // so that the parent node will be made "native" too. This is necessary as
+      // if we don't do this `update` method will get called. At that point it
+      // may be too late as it would mean the JS driver has already started
+      // updating node values
+      this.__makeNative();
+    }
   }
 
   __detach(): void {
@@ -62,6 +83,22 @@ class AnimatedTracking extends AnimatedNode {
       this._callback,
     );
   }
+
+  __getNativeConfig(): any {
+    const animation = new this._animationClass({
+      ...this._animationConfig,
+      // remove toValue from the config as it's a ref to Animated.Value
+      toValue: undefined,
+    });
+    const animationConfig = animation.__getNativeAnimationConfig();
+    return {
+      type: 'tracking',
+      animationId: generateNewAnimationId(),
+      animationConfig,
+      toValue: this._parent.__getNativeTag(),
+      value: this._value.__getNativeTag(),
+    };
+  }
 }
 
 module.exports = AnimatedTracking;
diff --git a/Libraries/Animated/src/nodes/AnimatedValue.js b/Libraries/Animated/src/nodes/AnimatedValue.js
index 49f440471e1ba3..d5a5de9a9e48c7 100644
--- a/Libraries/Animated/src/nodes/AnimatedValue.js
+++ b/Libraries/Animated/src/nodes/AnimatedValue.js
@@ -20,6 +20,7 @@ const NativeAnimatedHelper = require('../NativeAnimatedHelper');
 
 import type Animation, {EndCallback} from '../animations/Animation';
 import type {InterpolationConfigType} from './AnimatedInterpolation';
+import type AnimatedTracking from './AnimatedTracking';
 
 const NativeAnimatedAPI = NativeAnimatedHelper.API;
 
@@ -76,7 +77,7 @@ class AnimatedValue extends AnimatedWithChildren {
   _startingValue: number;
   _offset: number;
   _animation: ?Animation;
-  _tracking: ?AnimatedNode;
+  _tracking: ?AnimatedTracking;
   _listeners: {[key: string]: ValueListenerCallback};
   __nativeAnimatedValueListener: ?any;
 
@@ -311,7 +312,7 @@ class AnimatedValue extends AnimatedWithChildren {
   /**
    * Typically only used internally.
    */
-  track(tracking: AnimatedNode): void {
+  track(tracking: AnimatedTracking): void {
     this.stopTracking();
     this._tracking = tracking;
   }
diff --git a/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h b/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
index b87fd68c41381b..3364f174ae3734 100644
--- a/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
+++ b/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
@@ -33,6 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)startAnimation;
 - (void)stepAnimationWithTime:(NSTimeInterval)currentTime;
 - (void)stopAnimation;
+- (void)resetAnimationConfig:(NSDictionary *)config;
 
 NS_ASSUME_NONNULL_END
 
diff --git a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
index cb471f95ed8443..027ca81524f25f 100644
--- a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
@@ -41,22 +41,27 @@ - (instancetype)initWithId:(NSNumber *)animationId
                   callBack:(nullable RCTResponseSenderBlock)callback;
 {
   if ((self = [super init])) {
-    NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
-
+    _callback = [callback copy];
     _animationId = animationId;
+    _valueNode = valueNode;
     _fromValue = 0;
     _lastValue = 0;
-    _valueNode = valueNode;
-    _callback = [callback copy];
-    _velocity = [RCTConvert CGFloat:config[@"velocity"]];
-    _deceleration = [RCTConvert CGFloat:config[@"deceleration"]];
-    _iterations = iterations.integerValue;
-    _currentLoop = 1;
-    _animationHasFinished = iterations.integerValue == 0;
+    _velocity = [RCTConvert CGFloat:config[@"velocity"]]; // initial velocity
+    [self resetAnimationConfig:config];
   }
   return self;
 }
 
+- (void)resetAnimationConfig:(NSDictionary *)config
+{
+  NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
+  _fromValue = _lastValue;
+  _deceleration = [RCTConvert CGFloat:config[@"deceleration"]];
+  _iterations = iterations.integerValue;
+  _currentLoop = 1;
+  _animationHasFinished = iterations.integerValue == 0;
+}
+
 RCT_NOT_IMPLEMENTED(- (instancetype)init)
 
 - (void)startAnimation
diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
index a46fea6bf26ec3..53846b2d0a2204 100644
--- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
@@ -31,6 +31,7 @@ @implementation RCTFrameAnimation
   NSArray<NSNumber *> *_frames;
   CGFloat _toValue;
   CGFloat _fromValue;
+  CGFloat _lastPosition;
   NSTimeInterval _animationStartTime;
   NSTimeInterval _animationCurrentTime;
   RCTResponseSenderBlock _callback;
@@ -44,23 +45,30 @@ - (instancetype)initWithId:(NSNumber *)animationId
                   callBack:(nullable RCTResponseSenderBlock)callback;
 {
   if ((self = [super init])) {
-    NSNumber *toValue = [RCTConvert NSNumber:config[@"toValue"]] ?: @1;
-    NSArray<NSNumber *> *frames = [RCTConvert NSNumberArray:config[@"frames"]];
-    NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
-
     _animationId = animationId;
-    _toValue = toValue.floatValue;
-    _fromValue = valueNode.value;
+    _lastPosition = _fromValue = valueNode.value;
     _valueNode = valueNode;
-    _frames = [frames copy];
     _callback = [callback copy];
-    _animationHasFinished = iterations.integerValue == 0;
-    _iterations = iterations.integerValue;
-    _currentLoop = 1;
+    [self resetAnimationConfig:config];
   }
   return self;
 }
 
+- (void)resetAnimationConfig:(NSDictionary *)config
+{
+  NSNumber *toValue = [RCTConvert NSNumber:config[@"toValue"]] ?: @1;
+  NSArray<NSNumber *> *frames = [RCTConvert NSNumberArray:config[@"frames"]];
+  NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
+
+  _fromValue = _lastPosition;
+  _toValue = toValue.floatValue;
+  _frames = [frames copy];
+  _animationStartTime = _animationCurrentTime = -1;
+  _animationHasFinished = iterations.integerValue == 0;
+  _iterations = iterations.integerValue;
+  _currentLoop = 1;
+}
+
 RCT_NOT_IMPLEMENTED(- (instancetype)init)
 
 - (void)startAnimation
@@ -144,6 +152,7 @@ - (void)updateOutputWithFrameOutput:(CGFloat)frameOutput
                                             EXTRAPOLATE_TYPE_EXTEND,
                                             EXTRAPOLATE_TYPE_EXTEND);
 
+  _lastPosition = outputValue;
   _valueNode.value = outputValue;
   [_valueNode setNeedsUpdate];
 }
diff --git a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
index e4811f601d2594..932433a16dae08 100644
--- a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
@@ -57,33 +57,37 @@ - (instancetype)initWithId:(NSNumber *)animationId
                   callBack:(nullable RCTResponseSenderBlock)callback
 {
   if ((self = [super init])) {
-    NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
-
     _animationId = animationId;
-    _toValue = [RCTConvert CGFloat:config[@"toValue"]];
-    _fromValue = valueNode.value;
-    _lastPosition = 0;
+    _lastPosition = valueNode.value;
     _valueNode = valueNode;
-    _overshootClamping = [RCTConvert BOOL:config[@"overshootClamping"]];
-    _restDisplacementThreshold = [RCTConvert CGFloat:config[@"restDisplacementThreshold"]];
-    _restSpeedThreshold = [RCTConvert CGFloat:config[@"restSpeedThreshold"]];
-    _stiffness = [RCTConvert CGFloat:config[@"stiffness"]];
-    _damping = [RCTConvert CGFloat:config[@"damping"]];
-    _mass = [RCTConvert CGFloat:config[@"mass"]];
-    _initialVelocity = [RCTConvert CGFloat:config[@"initialVelocity"]];
-    
+    _lastVelocity = [RCTConvert CGFloat:config[@"initialVelocity"]];
     _callback = [callback copy];
-
-    _lastPosition = _fromValue;
-    _lastVelocity = _initialVelocity;
-
-    _animationHasFinished = iterations.integerValue == 0;
-    _iterations = iterations.integerValue;
-    _currentLoop = 1;
+    [self resetAnimationConfig:config];
   }
   return self;
 }
 
+- (void)resetAnimationConfig:(NSDictionary *)config
+{
+  NSNumber *iterations = [RCTConvert NSNumber:config[@"iterations"]] ?: @1;
+  _toValue = [RCTConvert CGFloat:config[@"toValue"]];
+  _overshootClamping = [RCTConvert BOOL:config[@"overshootClamping"]];
+  _restDisplacementThreshold = [RCTConvert CGFloat:config[@"restDisplacementThreshold"]];
+  _restSpeedThreshold = [RCTConvert CGFloat:config[@"restSpeedThreshold"]];
+  _stiffness = [RCTConvert CGFloat:config[@"stiffness"]];
+  _damping = [RCTConvert CGFloat:config[@"damping"]];
+  _mass = [RCTConvert CGFloat:config[@"mass"]];
+  _initialVelocity = _lastVelocity;
+  _fromValue = _lastPosition;
+  _fromValue = _lastPosition;
+  _lastVelocity = _initialVelocity;
+  _animationHasFinished = iterations.integerValue == 0;
+  _iterations = iterations.integerValue;
+  _currentLoop = 1;
+  _animationStartTime = _animationCurrentTime = -1;
+  _animationHasBegun = YES;
+}
+
 RCT_NOT_IMPLEMENTED(- (instancetype)init)
 
 - (void)startAnimation
diff --git a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
index 198e02c9cfc90f..a8cad4e939c82e 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
@@ -9,12 +9,15 @@
 
 #import <Foundation/Foundation.h>
 
+@class RCTNativeAnimatedNodesManager;
+
 @interface RCTAnimatedNode : NSObject
 
 - (instancetype)initWithTag:(NSNumber *)tag
                      config:(NSDictionary<NSString *, id> *)config NS_DESIGNATED_INITIALIZER;
 
 @property (nonatomic, readonly) NSNumber *nodeTag;
+@property (nonatomic, weak) RCTNativeAnimatedNodesManager *manager;
 @property (nonatomic, copy, readonly) NSDictionary<NSString *, id> *config;
 
 @property (nonatomic, copy, readonly) NSMapTable<NSNumber *, RCTAnimatedNode *> *childNodes;
diff --git a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
new file mode 100644
index 00000000000000..8f3281789ddbb0
--- /dev/null
+++ b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "RCTAnimatedNode.h"
+
+
+@interface RCTTrackingAnimatedNode : RCTAnimatedNode
+
+@end
diff --git a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
new file mode 100644
index 00000000000000..e77b773e040a12
--- /dev/null
+++ b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "RCTTrackingAnimatedNode.h"
+#import "RCTValueAnimatedNode.h"
+#import "RCTNativeAnimatedNodesManager.h"
+
+@implementation RCTTrackingAnimatedNode {
+  NSNumber *_animationId;
+  NSNumber *_toValueNodeTag;
+  NSNumber *_valueNodeTag;
+  NSMutableDictionary *_animationConfig;
+}
+
+- (instancetype)initWithTag:(NSNumber *)tag
+                     config:(NSDictionary<NSString *, id> *)config
+{
+  if ((self = [super initWithTag:tag config:config])) {
+    _animationId = config[@"animationId"];
+    _toValueNodeTag = config[@"toValue"];
+    _valueNodeTag = config[@"value"];
+    _animationConfig = [NSMutableDictionary dictionaryWithDictionary:config[@"animationConfig"]];
+  }
+  return self;
+}
+
+- (void)onDetachedFromNode:(RCTAnimatedNode *)parent
+{
+  [self.manager stopAnimation:_animationId];
+  [super onDetachedFromNode:parent];
+}
+
+- (void)performUpdate
+{
+  [super performUpdate];
+
+  // change animation config's "toValue" to reflect updated value of the parent node
+  RCTValueAnimatedNode *node = (RCTValueAnimatedNode *)[self.parentNodes objectForKey:_toValueNodeTag];
+  _animationConfig[@"toValue"] = @(node.value);
+
+  [self.manager startAnimatingNode:_animationId
+                           nodeTag:_valueNodeTag
+                            config:_animationConfig
+                       endCallback:nil];
+}
+
+@end
+
diff --git a/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj b/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
index cddec7f5e67eeb..0ba2446271568a 100644
--- a/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
+++ b/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj
@@ -111,6 +111,10 @@
 		2D3B5EFE1D9B0B4800451313 /* RCTStyleAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E501E31D07A6C9005F35D8 /* RCTStyleAnimatedNode.m */; };
 		2D3B5EFF1D9B0B4800451313 /* RCTTransformAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E501E51D07A6C9005F35D8 /* RCTTransformAnimatedNode.m */; };
 		2D3B5F001D9B0B4800451313 /* RCTValueAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E501E71D07A6C9005F35D8 /* RCTValueAnimatedNode.m */; };
+		44DB7D942024F74200588FCD /* RCTTrackingAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DB7D932024F74200588FCD /* RCTTrackingAnimatedNode.h */; };
+		44DB7D952024F74200588FCD /* RCTTrackingAnimatedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 44DB7D932024F74200588FCD /* RCTTrackingAnimatedNode.h */; };
+		44DB7D972024F75100588FCD /* RCTTrackingAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 44DB7D962024F75100588FCD /* RCTTrackingAnimatedNode.m */; };
+		44DB7D982024F75100588FCD /* RCTTrackingAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 44DB7D962024F75100588FCD /* RCTTrackingAnimatedNode.m */; };
 		5C9894951D999639008027DB /* RCTDivisionAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C9894941D999639008027DB /* RCTDivisionAnimatedNode.m */; };
 		944244D01DB962DA0032A02B /* RCTFrameAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 94C1294D1D4069170025F25C /* RCTFrameAnimation.m */; };
 		944244D11DB962DC0032A02B /* RCTSpringAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 94C1294F1D4069170025F25C /* RCTSpringAnimation.m */; };
@@ -209,6 +213,8 @@
 		19F00F201DC8847500113FEE /* RCTEventAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTEventAnimation.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		19F00F211DC8847500113FEE /* RCTEventAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTEventAnimation.m; sourceTree = "<group>"; };
 		2D2A28201D9B03D100D4039D /* libRCTAnimation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTAnimation.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		44DB7D932024F74200588FCD /* RCTTrackingAnimatedNode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTTrackingAnimatedNode.h; sourceTree = "<group>"; };
+		44DB7D962024F75100588FCD /* RCTTrackingAnimatedNode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTTrackingAnimatedNode.m; sourceTree = "<group>"; };
 		5C9894931D999639008027DB /* RCTDivisionAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDivisionAnimatedNode.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		5C9894941D999639008027DB /* RCTDivisionAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDivisionAnimatedNode.m; sourceTree = "<group>"; };
 		94C1294A1D4069170025F25C /* RCTAnimationDriver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTAnimationDriver.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -256,6 +262,8 @@
 				13E501E51D07A6C9005F35D8 /* RCTTransformAnimatedNode.m */,
 				13E501E61D07A6C9005F35D8 /* RCTValueAnimatedNode.h */,
 				13E501E71D07A6C9005F35D8 /* RCTValueAnimatedNode.m */,
+				44DB7D932024F74200588FCD /* RCTTrackingAnimatedNode.h */,
+				44DB7D962024F75100588FCD /* RCTTrackingAnimatedNode.m */,
 			);
 			path = Nodes;
 			sourceTree = "<group>";
@@ -314,6 +322,7 @@
 				192F69891E823F4A008692C7 /* RCTDiffClampAnimatedNode.h in Headers */,
 				192F698A1E823F4A008692C7 /* RCTAdditionAnimatedNode.h in Headers */,
 				192F698B1E823F4A008692C7 /* RCTAnimatedNode.h in Headers */,
+				44DB7D952024F74200588FCD /* RCTTrackingAnimatedNode.h in Headers */,
 				192F698C1E823F4A008692C7 /* RCTInterpolationAnimatedNode.h in Headers */,
 				192F698D1E823F4A008692C7 /* RCTModuloAnimatedNode.h in Headers */,
 				192F698E1E823F4A008692C7 /* RCTMultiplicationAnimatedNode.h in Headers */,
@@ -340,6 +349,7 @@
 				1980B71D1E80D1C4004DC789 /* RCTDiffClampAnimatedNode.h in Headers */,
 				1980B71F1E80D1C4004DC789 /* RCTAdditionAnimatedNode.h in Headers */,
 				1980B7211E80D1C4004DC789 /* RCTAnimatedNode.h in Headers */,
+				44DB7D942024F74200588FCD /* RCTTrackingAnimatedNode.h in Headers */,
 				1980B7231E80D1C4004DC789 /* RCTInterpolationAnimatedNode.h in Headers */,
 				1980B7251E80D1C4004DC789 /* RCTModuloAnimatedNode.h in Headers */,
 				1980B7271E80D1C4004DC789 /* RCTMultiplicationAnimatedNode.h in Headers */,
@@ -441,6 +451,7 @@
 				2D3B5EFA1D9B0B4800451313 /* RCTInterpolationAnimatedNode.m in Sources */,
 				2D3B5EFF1D9B0B4800451313 /* RCTTransformAnimatedNode.m in Sources */,
 				2D3B5EFC1D9B0B4800451313 /* RCTMultiplicationAnimatedNode.m in Sources */,
+				44DB7D982024F75100588FCD /* RCTTrackingAnimatedNode.m in Sources */,
 				2D3B5EFD1D9B0B4800451313 /* RCTPropsAnimatedNode.m in Sources */,
 				944244D01DB962DA0032A02B /* RCTFrameAnimation.m in Sources */,
 				944244D11DB962DC0032A02B /* RCTSpringAnimation.m in Sources */,
@@ -466,6 +477,7 @@
 				13E501EC1D07A6C9005F35D8 /* RCTMultiplicationAnimatedNode.m in Sources */,
 				13E501ED1D07A6C9005F35D8 /* RCTPropsAnimatedNode.m in Sources */,
 				13E501E91D07A6C9005F35D8 /* RCTAnimatedNode.m in Sources */,
+				44DB7D972024F75100588FCD /* RCTTrackingAnimatedNode.m in Sources */,
 				13E501EB1D07A6C9005F35D8 /* RCTInterpolationAnimatedNode.m in Sources */,
 				13E501E81D07A6C9005F35D8 /* RCTAdditionAnimatedNode.m in Sources */,
 				5C9894951D999639008027DB /* RCTDivisionAnimatedNode.m in Sources */,
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
index f37046612cbe1d..ee82a8008c7cf6 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
@@ -27,6 +27,7 @@
 #import "RCTStyleAnimatedNode.h"
 #import "RCTTransformAnimatedNode.h"
 #import "RCTValueAnimatedNode.h"
+#import "RCTTrackingAnimatedNode.h"
 
 @implementation RCTNativeAnimatedNodesManager
 {
@@ -67,7 +68,8 @@ - (void)createAnimatedNode:(nonnull NSNumber *)tag
             @"division" : [RCTDivisionAnimatedNode class],
             @"multiplication" : [RCTMultiplicationAnimatedNode class],
             @"modulus" : [RCTModuloAnimatedNode class],
-            @"transform" : [RCTTransformAnimatedNode class]};
+            @"transform" : [RCTTransformAnimatedNode class],
+            @"tracking" : [RCTTrackingAnimatedNode class]};
   });
 
   NSString *nodeType = [RCTConvert NSString:config[@"type"]];
@@ -79,6 +81,7 @@ - (void)createAnimatedNode:(nonnull NSNumber *)tag
   }
 
   RCTAnimatedNode *node = [[nodeClass alloc] initWithTag:tag config:config];
+  node.manager = self;
   _animationNodes[tag] = node;
   [node setNeedsUpdate];
 }
@@ -222,6 +225,15 @@ - (void)startAnimatingNode:(nonnull NSNumber *)animationId
                     config:(NSDictionary<NSString *, id> *)config
                endCallback:(RCTResponseSenderBlock)callBack
 {
+  // check if the animation has already started
+  for (id<RCTAnimationDriver> driver in _activeAnimations) {
+    if ([driver.animationId isEqual:animationId]) {
+      // if the animation is running, we restart it with an updated configuration
+      [driver resetAnimationConfig:config];
+      return;
+    }
+  }
+
   RCTValueAnimatedNode *valueNode = (RCTValueAnimatedNode *)_animationNodes[nodeTag];
 
   NSString *type = config[@"type"];
diff --git a/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m b/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
index 70678ac2854269..358264899fb528 100644
--- a/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
+++ b/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
@@ -865,4 +865,227 @@ - (void)testNativeAnimatedEventDoNotUpdate
   [_uiManager verify];
 }
 
+/**
+ * Creates a following graph of nodes:
+ * Value(3, initialValue) ----> Style(4) ---> Props(5) ---> View(viewTag)
+ *
+ * Value(3) is set to track Value(1) via Tracking(2) node with the provided animation config
+ */
+- (void)createAnimatedGraphWithTrackingNode:(NSNumber *)viewTag
+                               initialValue:(CGFloat)initialValue
+                            animationConfig:(NSDictionary *)animationConfig
+{
+  [_nodesManager createAnimatedNode:@1
+                             config:@{@"type": @"value", @"value": @(initialValue), @"offset": @0}];
+  [_nodesManager createAnimatedNode:@3
+                             config:@{@"type": @"value", @"value": @(initialValue), @"offset": @0}];
+
+  [_nodesManager createAnimatedNode:@2
+                             config:@{@"type": @"tracking",
+                                      @"animationId": @70,
+                                      @"value": @3,
+                                      @"toValue": @1,
+                                      @"animationConfig": animationConfig}];
+  [_nodesManager createAnimatedNode:@4
+                             config:@{@"type": @"style", @"style": @{@"translateX": @3}}];
+  [_nodesManager createAnimatedNode:@5
+                             config:@{@"type": @"props", @"props": @{@"style": @4}}];
+
+  [_nodesManager connectAnimatedNodes:@1 childTag:@2];
+  [_nodesManager connectAnimatedNodes:@3 childTag:@4];
+  [_nodesManager connectAnimatedNodes:@4 childTag:@5];
+  [_nodesManager connectAnimatedNodeToView:@5 viewTag:viewTag viewName:@"UIView"];
+}
+
+/**
+ * In this test we verify that when value is being tracked we can update destination value in the
+ * middle of ongoing animation and the animation will update and animate to the new spot. This is
+ * tested using simple 5 frame backed timing animation.
+ */
+- (void)testTracking
+{
+  NSArray *frames = @[@0, @0.25, @0.5, @0.75, @1];
+  NSDictionary *animationConfig = @{@"type": @"frames", @"frames": frames};
+  [self createAnimatedGraphWithTrackingNode:@1000 initialValue:0 animationConfig:animationConfig];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  [[_uiManager expect] synchronouslyUpdateViewOnUIThread:@1000
+                                                viewName:@"UIView"
+                                                   props:RCTPropChecker(@"translateX", 0)];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  // update "toValue" to 100, we expect tracking animation to animate now from 0 to 100 in 5 steps
+  [_nodesManager setAnimatedNodeValue:@1 value:@100];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  for (NSNumber *frame in frames) {
+    NSNumber *expected = @([frame doubleValue] * 100);
+    [[_uiManager expect] synchronouslyUpdateViewOnUIThread:@1000
+                                                  viewName:@"UIView"
+                                                     props:RCTPropChecker(@"translateX", expected)];
+    [_nodesManager stepAnimations:_displayLink];
+    [_uiManager verify];
+  }
+
+  // update "toValue" to 0 but run only two frames from the animation,
+  // we expect tracking animation to animate now from 100 to 75
+  [_nodesManager setAnimatedNodeValue:@1 value:@0];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  for (int i = 0; i < 2; i++) {
+    NSNumber *expected = @(100. * (1. - [frames[i] doubleValue]));
+    [[_uiManager expect] synchronouslyUpdateViewOnUIThread:@1000
+                                                  viewName:@"UIView"
+                                                     props:RCTPropChecker(@"translateX", expected)];
+    [_nodesManager stepAnimations:_displayLink];
+    [_uiManager verify];
+  }
+
+  // at this point we expect tracking value to be at 75
+  // we update "toValue" again to 100 and expect the animation to restart from the current place
+  [_nodesManager setAnimatedNodeValue:@1 value:@100];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  for (NSNumber *frame in frames) {
+    NSNumber *expected = @(50. + 50. * [frame doubleValue]);
+    [[_uiManager expect] synchronouslyUpdateViewOnUIThread:@1000
+                                                  viewName:@"UIView"
+                                                     props:RCTPropChecker(@"translateX", expected)];
+    [_nodesManager stepAnimations:_displayLink];
+    [_uiManager verify];
+  }
+
+  [_nodesManager stepAnimations:_displayLink];
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+}
+
+/**
+ * In this test we verify that when tracking is set up for a given animated node and when the
+ * animation settles it will not be registered as an active animation and therefore will not
+ * consume resources on running the animation that has already completed. Then we verify that when
+ * the value updates the animation will resume as expected and the complete again when reaches the
+ * end.
+ */
+
+ - (void)testTrackingPausesWhenEndValueIsReached
+{
+  NSArray *frames = @[@0, @0.5, @1];
+  NSDictionary *animationConfig = @{@"type": @"frames", @"frames": frames};
+  [self createAnimatedGraphWithTrackingNode:@1000 initialValue:0 animationConfig:animationConfig];
+
+  [_nodesManager setAnimatedNodeValue:@1 value:@100];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  __block int callCount = 0;
+  [[[_uiManager stub] andDo:^(NSInvocation* __unused invocation) {
+    callCount++;
+  }] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+
+  for (NSUInteger i = 0; i < frames.count; i++) {
+    [_nodesManager stepAnimations:_displayLink];
+  }
+  [_nodesManager stepAnimations:_displayLink];
+  XCTAssertEqual(callCount, 4);
+
+  // the animation has completed, we expect no updates to be done
+  [[[_uiManager stub] andDo:^(NSInvocation* __unused invocation) {
+    XCTFail("Expected not to be called");
+  }] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+
+  // restore rejected method, we will use it later on
+  callCount = 0;
+  [[[_uiManager stub] andDo:^(NSInvocation* __unused invocation) {
+    callCount++;
+  }] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+
+  // we update end value and expect the animation to restart
+  [_nodesManager setAnimatedNodeValue:@1 value:@200];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  for (NSUInteger i = 0; i < frames.count; i++) {
+    [_nodesManager stepAnimations:_displayLink];
+  }
+  [_nodesManager stepAnimations:_displayLink];
+  XCTAssertEqual(callCount, 4);
+
+  // the animation has completed, we expect no updates to be done
+  [[_uiManager reject] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+  [_nodesManager stepAnimations:_displayLink];
+  [_uiManager verify];
+}
+
+/**
+ * In this test we verify that when tracking is configured to use spring animation and when the
+ * destination value updates the current speed of the animated value will be taken into account
+ * while updating the spring animation and it will smoothly transition to the new end value.
+ */
+- (void) testSpringTrackingRetainsSpeed
+{
+  // this spring config correspomds to tension 20 and friction 0.5 which makes the spring settle
+  // very slowly
+  NSDictionary *springConfig = @{@"type": @"spring",
+                                 @"restSpeedThreshold": @0.001,
+                                 @"mass": @1,
+                                 @"restDisplacementThreshold": @0.001,
+                                 @"initialVelocity": @0.5,
+                                 @"damping": @2.5,
+                                 @"stiffness": @157.8,
+                                 @"overshootClamping": @NO};
+  [self createAnimatedGraphWithTrackingNode:@1000 initialValue:0 animationConfig:springConfig];
+
+  __block CGFloat lastTranslateX = 0;
+  [[[_uiManager stub] andDo:^(NSInvocation *invocation) {
+    __unsafe_unretained NSDictionary *props = nil;
+    [invocation getArgument:&props atIndex:4];
+    lastTranslateX = [props[@"translateX"] doubleValue];
+  }] synchronouslyUpdateViewOnUIThread:OCMOCK_ANY viewName:OCMOCK_ANY props:OCMOCK_ANY];
+
+  // update "toValue" to 1, we expect tracking animation to animate now from 0 to 1
+  [_nodesManager setAnimatedNodeValue:@1 value:@1];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  // we run several steps of animation until the value starts bouncing, has negative speed and
+  // passes the final point (that is 1) while going backwards
+  BOOL isBoucingBack = NO;
+  CGFloat previousValue = 0;
+  for (int maxFrames = 500; maxFrames > 0; maxFrames--) {
+    [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+    if (previousValue >= 1. && lastTranslateX < 1.) {
+      isBoucingBack = YES;
+      break;
+    }
+    previousValue = lastTranslateX;
+  }
+  XCTAssert(isBoucingBack);
+
+  // we now update "toValue" to 1.5 but since the value have negative speed and has also pretty
+  // low friction we expect it to keep going in the opposite direction for a few more frames
+  [_nodesManager setAnimatedNodeValue:@1 value:@1.5];
+  [_nodesManager stepAnimations:_displayLink]; // kick off the tracking
+
+  int bounceBackInitialFrames = 0;
+  BOOL hasTurnedForward = NO;
+
+  // we run 8 seconds of animation
+  for (int i = 0; i < 8 * 60; i++) {
+    [_nodesManager stepAnimations:_displayLink];
+    if (!hasTurnedForward) {
+      if (lastTranslateX <= previousValue) {
+        bounceBackInitialFrames++;
+      } else {
+        hasTurnedForward = true;
+      }
+    }
+    previousValue = lastTranslateX;
+  }
+  XCTAssert(hasTurnedForward);
+  XCTAssertGreaterThan(bounceBackInitialFrames, 3);
+  XCTAssertEqual(lastTranslateX, 1.5);
+}
+
 @end
diff --git a/RNTester/js/NativeAnimationsExample.js b/RNTester/js/NativeAnimationsExample.js
index ed6f1acaf7045a..4aaf2063de57a0 100644
--- a/RNTester/js/NativeAnimationsExample.js
+++ b/RNTester/js/NativeAnimationsExample.js
@@ -255,6 +255,67 @@ class EventExample extends React.Component<{}, $FlowFixMeState> {
   }
 }
 
+class TrackingExample extends React.Component<$FlowFixMeProps, $FlowFixMeState> {
+  state = {
+    native: new Animated.Value(0),
+    toNative: new Animated.Value(0),
+    js: new Animated.Value(0),
+    toJS: new Animated.Value(0),
+  };
+
+  componentDidMount() {
+    // we configure spring to take a bit of time to settle so that the user
+    // have time to click many times and see "toValue" getting updated and
+    const longSettlingSpring = {
+      tension: 20,
+      friction: 0.5,
+    };
+    Animated.spring(this.state.native, {
+      ...longSettlingSpring,
+      toValue: this.state.toNative,
+      useNativeDriver: true,
+    }).start();
+    Animated.spring(this.state.js, {
+      ...longSettlingSpring,
+      toValue: this.state.toJS,
+      useNativeDriver: false,
+    }).start();
+  }
+
+  onPress = () => {
+    // select next value to be tracked by random
+    const nextValue = Math.random() * 200;
+    this.state.toNative.setValue(nextValue);
+    this.state.toJS.setValue(nextValue);
+  };
+
+  renderBlock = (anim, dest) => [
+    <Animated.View key="line" style={[styles.line, { transform: [{ translateX: dest }]}]}/>,
+    <Animated.View key="block" style={[styles.block, { transform: [{ translateX: anim }]}]}/>,
+  ]
+
+  render() {
+    return (
+      <TouchableWithoutFeedback onPress={this.onPress}>
+        <View>
+          <View>
+            <Text>Native:</Text>
+          </View>
+          <View style={styles.row}>
+            {this.renderBlock(this.state.native, this.state.toNative)}
+          </View>
+          <View>
+            <Text>JavaScript:</Text>
+          </View>
+          <View style={styles.row}>
+            {this.renderBlock(this.state.js, this.state.toJS)}
+          </View>
+        </View>
+      </TouchableWithoutFeedback>
+    );
+  }
+}
+
 const styles = StyleSheet.create({
   row: {
     padding: 10,
@@ -265,6 +326,14 @@ const styles = StyleSheet.create({
     height: 50,
     backgroundColor: 'blue',
   },
+  line: {
+    position: 'absolute',
+    left: 35,
+    top: 0,
+    bottom: 0,
+    width: 1,
+    backgroundColor: 'red',
+  },
 });
 
 exports.framework = 'React';
@@ -540,6 +609,12 @@ exports.examples = [
       return <EventExample />;
     },
   },
+  {
+    title: 'Animated Tracking - tap me many times',
+    render: function() {
+      return <TrackingExample />;
+    },
+  },
   {
     title: 'Internal Settings',
     render: function() {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java
index ad715d45c9bac1..b2ae607513a13f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java
@@ -10,6 +10,8 @@
 package com.facebook.react.animated;
 
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.JSApplicationCausedNativeException;
+import com.facebook.react.bridge.ReadableMap;
 
 /**
  * Base class for different types of animation drivers. Can be used to implement simple time-based
@@ -27,4 +29,15 @@
    * android choreographer callback.
    */
   public abstract void runAnimationStep(long frameTimeNanos);
+
+  /**
+   * This method will get called when some of the configuration gets updated while the animation is
+   * running. In that case animation should restart keeping its internal state to provide a smooth
+   * transision. E.g. in case of a spring animation we want to keep the current value and speed and
+   * start animating with the new properties (different destination or spring settings)
+   */
+  public void resetConfig(ReadableMap config) {
+    throw new JSApplicationCausedNativeException(
+            "Animation config for " + getClass().getSimpleName() + " cannot be reset");
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
index 41b6d24ff31239..fb7c00d018f33d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
@@ -18,20 +18,28 @@
 public class DecayAnimation extends AnimationDriver {
 
   private final double mVelocity;
-  private final double mDeceleration;
 
-  private long mStartFrameTimeMillis = -1;
-  private double mFromValue = 0d;
-  private double mLastValue = 0d;
+  private double mDeceleration;
+  private long mStartFrameTimeMillis;
+  private double mFromValue;
+  private double mLastValue;
   private int mIterations;
   private int mCurrentLoop;
 
   public DecayAnimation(ReadableMap config) {
-    mVelocity = config.getDouble("velocity");
+    mVelocity = config.getDouble("velocity"); // initial velocity
+    resetConfig(config);
+  }
+
+  @Override
+  public void resetConfig(ReadableMap config) {
     mDeceleration = config.getDouble("deceleration");
     mIterations = config.hasKey("iterations") ? config.getInt("iterations") : 1;
     mCurrentLoop = 1;
     mHasFinished = mIterations == 0;
+    mStartFrameTimeMillis = -1;
+    mFromValue = 0;
+    mLastValue = 0;
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
index 94b12178979326..3d37846fb0c6f0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
@@ -22,17 +22,24 @@ class FrameBasedAnimationDriver extends AnimationDriver {
   // 60FPS
   private static final double FRAME_TIME_MILLIS = 1000d / 60d;
 
-  private long mStartFrameTimeNanos = -1;
-  private final double[] mFrames;
-  private final double mToValue;
+  private long mStartFrameTimeNanos;
+  private double[] mFrames;
+  private double mToValue;
   private double mFromValue;
   private int mIterations;
   private int mCurrentLoop;
 
   FrameBasedAnimationDriver(ReadableMap config) {
+    resetConfig(config);
+  }
+
+  @Override
+  public void resetConfig(ReadableMap config) {
     ReadableArray frames = config.getArray("frames");
     int numberOfFrames = frames.size();
-    mFrames = new double[numberOfFrames];
+    if (mFrames == null || mFrames.length != numberOfFrames) {
+      mFrames = new double[numberOfFrames];
+    }
     for (int i = 0; i < numberOfFrames; i++) {
       mFrames[i] = frames.getDouble(i);
     }
@@ -40,6 +47,7 @@ class FrameBasedAnimationDriver extends AnimationDriver {
     mIterations = config.hasKey("iterations") ? config.getInt("iterations") : 1;
     mCurrentLoop = 1;
     mHasFinished = mIterations == 0;
+    mStartFrameTimeNanos = -1;
   }
 
   @Override
@@ -49,7 +57,7 @@ public void runAnimationStep(long frameTimeNanos) {
       mFromValue = mAnimatedValue.mValue;
     }
     long timeFromStartMillis = (frameTimeNanos - mStartFrameTimeNanos) / 1000000;
-    int frameIndex = (int) (timeFromStartMillis / FRAME_TIME_MILLIS);
+    int frameIndex = (int) Math.round(timeFromStartMillis / FRAME_TIME_MILLIS);
     if (frameIndex < 0) {
       throw new IllegalStateException("Calculated frame index should never be lower than 0");
     } else if (mHasFinished) {
@@ -60,7 +68,7 @@ public void runAnimationStep(long frameTimeNanos) {
     if (frameIndex >= mFrames.length - 1) {
       nextValue = mToValue;
       if (mIterations == -1 || mCurrentLoop < mIterations) { // looping animation, return to start
-        mStartFrameTimeNanos = frameTimeNanos;
+        mStartFrameTimeNanos = frameTimeNanos + ((long) FRAME_TIME_MILLIS) * 1000000L;
         mCurrentLoop++;
       } else { // animation has completed, no more frames left
         mHasFinished = true;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
index d65b20fc503794..d54d24bd668ea9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
@@ -105,6 +105,8 @@ public void createAnimatedNode(int tag, ReadableMap config) {
       node = new DiffClampAnimatedNode(config, this);
     } else if ("transform".equals(type)) {
       node = new TransformAnimatedNode(config, this);
+    } else if ("tracking".equals(type)) {
+      node = new TrackingAnimatedNode(config, this);
     } else {
       throw new JSApplicationIllegalArgumentException("Unsupported node type: " + type);
     }
@@ -189,6 +191,15 @@ public void startAnimatingNode(
       throw new JSApplicationIllegalArgumentException("Animated node should be of type " +
         ValueAnimatedNode.class.getName());
     }
+
+    final AnimationDriver existingDriver = mActiveAnimations.get(animationId);
+    if (existingDriver != null) {
+      // animation with the given ID is already running, we need to update its configuration instead
+      // of spawning a new one
+      existingDriver.resetConfig(animationConfig);
+      return;
+    }
+
     String type = animationConfig.getString("type");
     final AnimationDriver animation;
     if ("frames".equals(type)) {
@@ -214,10 +225,12 @@ private void stopAnimationsForNode(AnimatedNode animatedNode) {
     for (int i = 0; i < mActiveAnimations.size(); i++) {
       AnimationDriver animation = mActiveAnimations.valueAt(i);
       if (animatedNode.equals(animation.mAnimatedValue)) {
-        // Invoke animation end callback with {finished: false}
-        WritableMap endCallbackResponse = Arguments.createMap();
-        endCallbackResponse.putBoolean("finished", false);
-        animation.mEndCallback.invoke(endCallbackResponse);
+        if (animation.mEndCallback != null) {
+          // Invoke animation end callback with {finished: false}
+          WritableMap endCallbackResponse = Arguments.createMap();
+          endCallbackResponse.putBoolean("finished", false);
+          animation.mEndCallback.invoke(endCallbackResponse);
+        }
         mActiveAnimations.removeAt(i);
         i--;
       }
@@ -232,10 +245,12 @@ public void stopAnimation(int animationId) {
     for (int i = 0; i < mActiveAnimations.size(); i++) {
       AnimationDriver animation = mActiveAnimations.valueAt(i);
       if (animation.mId == animationId) {
-        // Invoke animation end callback with {finished: false}
-        WritableMap endCallbackResponse = Arguments.createMap();
-        endCallbackResponse.putBoolean("finished", false);
-        animation.mEndCallback.invoke(endCallbackResponse);
+        if (animation.mEndCallback != null) {
+          // Invoke animation end callback with {finished: false}
+          WritableMap endCallbackResponse = Arguments.createMap();
+          endCallbackResponse.putBoolean("finished", false);
+          animation.mEndCallback.invoke(endCallbackResponse);
+        }
         mActiveAnimations.removeAt(i);
         return;
       }
@@ -445,9 +460,11 @@ public void runUpdates(long frameTimeNanos) {
       for (int i = mActiveAnimations.size() - 1; i >= 0; i--) {
         AnimationDriver animation = mActiveAnimations.valueAt(i);
         if (animation.mHasFinished) {
-          WritableMap endCallbackResponse = Arguments.createMap();
-          endCallbackResponse.putBoolean("finished", true);
-          animation.mEndCallback.invoke(endCallbackResponse);
+          if (animation.mEndCallback != null) {
+            WritableMap endCallbackResponse = Arguments.createMap();
+            endCallbackResponse.putBoolean("finished", true);
+            animation.mEndCallback.invoke(endCallbackResponse);
+          }
           mActiveAnimations.removeAt(i);
         }
       }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.java
index 83ccc6f74a7184..3558756149b969 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/SpringAnimation.java
@@ -37,24 +37,32 @@ private static class PhysicsState {
   // thresholds for determining when the spring is at rest
   private double mRestSpeedThreshold;
   private double mDisplacementFromRestThreshold;
-  private double mTimeAccumulator = 0;
+  private double mTimeAccumulator;
   // for controlling loop
   private int mIterations;
-  private int mCurrentLoop = 0;
+  private int mCurrentLoop;
   private double mOriginalValue;
 
   SpringAnimation(ReadableMap config) {
+    mCurrentState.velocity = config.getDouble("initialVelocity");
+    resetConfig(config);
+  }
+
+  @Override
+  public void resetConfig(ReadableMap config) {
     mSpringStiffness = config.getDouble("stiffness");
     mSpringDamping = config.getDouble("damping");
     mSpringMass = config.getDouble("mass");
-    mInitialVelocity = config.getDouble("initialVelocity");
-    mCurrentState.velocity = mInitialVelocity;
+    mInitialVelocity = mCurrentState.velocity;
     mEndValue = config.getDouble("toValue");
     mRestSpeedThreshold = config.getDouble("restSpeedThreshold");
     mDisplacementFromRestThreshold = config.getDouble("restDisplacementThreshold");
     mOvershootClampingEnabled = config.getBoolean("overshootClamping");
     mIterations = config.hasKey("iterations") ? config.getInt("iterations") : 1;
     mHasFinished = mIterations == 0;
+    mCurrentLoop = 0;
+    mTimeAccumulator = 0;
+    mSpringStarted = false;
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java
new file mode 100644
index 00000000000000..db312d23558078
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+package com.facebook.react.animated;
+
+import com.facebook.react.bridge.JavaOnlyMap;
+import com.facebook.react.bridge.ReadableMap;
+
+/* package */ class TrackingAnimatedNode extends AnimatedNode {
+
+  private final NativeAnimatedNodesManager mNativeAnimatedNodesManager;
+  private final int mAnimationId;
+  private final int mToValueNode;
+  private final int mValueNode;
+  private final JavaOnlyMap mAnimationConfig;
+
+  TrackingAnimatedNode(ReadableMap config, NativeAnimatedNodesManager nativeAnimatedNodesManager) {
+    mNativeAnimatedNodesManager = nativeAnimatedNodesManager;
+    mAnimationId = config.getInt("animationId");
+    mToValueNode = config.getInt("toValue");
+    mValueNode = config.getInt("value");
+    mAnimationConfig = JavaOnlyMap.deepClone(config.getMap("animationConfig"));
+  }
+
+  @Override
+  public void update() {
+    AnimatedNode toValue = mNativeAnimatedNodesManager.getNodeById(mToValueNode);
+    mAnimationConfig.putDouble("toValue", ((ValueAnimatedNode) toValue).getValue());
+    mNativeAnimatedNodesManager.startAnimatingNode(mAnimationId, mValueNode, mAnimationConfig, null);
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java
index ab404d9b787f90..dd648f53d1c1b8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java
@@ -36,6 +36,34 @@ public static JavaOnlyArray of(Object... values) {
     return new JavaOnlyArray(values);
   }
 
+  public static JavaOnlyArray deepClone(ReadableArray ary) {
+    JavaOnlyArray res = new JavaOnlyArray();
+    for (int i = 0, size = ary.size(); i < size; i++) {
+      ReadableType type = ary.getType(i);
+      switch (type) {
+        case Null:
+          res.pushNull();
+          break;
+        case Boolean:
+          res.pushBoolean(ary.getBoolean(i));
+          break;
+        case Number:
+          res.pushDouble(ary.getDouble(i));
+          break;
+        case String:
+          res.pushString(ary.getString(i));
+          break;
+        case Map:
+          res.pushMap(JavaOnlyMap.deepClone(ary.getMap(i)));
+          break;
+        case Array:
+          res.pushArray(deepClone(ary.getArray(i)));
+          break;
+      }
+    }
+    return res;
+  }
+
   private JavaOnlyArray(Object... values) {
     mBackingList = Arrays.asList(values);
   }
@@ -60,12 +88,12 @@ public boolean isNull(int index) {
 
   @Override
   public double getDouble(int index) {
-    return (Double) mBackingList.get(index);
+    return ((Number) mBackingList.get(index)).doubleValue();
   }
 
   @Override
   public int getInt(int index) {
-    return (Integer) mBackingList.get(index);
+    return ((Number) mBackingList.get(index)).intValue();
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
index 136786c7b75666..3b9ccf6fdde9de 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
@@ -31,6 +31,36 @@ public static JavaOnlyMap of(Object... keysAndValues) {
     return new JavaOnlyMap(keysAndValues);
   }
 
+  public static JavaOnlyMap deepClone(ReadableMap map) {
+    JavaOnlyMap res = new JavaOnlyMap();
+    ReadableMapKeySetIterator iter = map.keySetIterator();
+    while (iter.hasNextKey()) {
+      String propKey = iter.nextKey();
+      ReadableType type = map.getType(propKey);
+      switch (type) {
+        case Null:
+          res.putNull(propKey);
+          break;
+        case Boolean:
+          res.putBoolean(propKey, map.getBoolean(propKey));
+          break;
+        case Number:
+          res.putDouble(propKey, map.getDouble(propKey));
+          break;
+        case String:
+          res.putString(propKey, map.getString(propKey));
+          break;
+        case Map:
+          res.putMap(propKey, deepClone(map.getMap(propKey)));
+          break;
+        case Array:
+          res.putArray(propKey, JavaOnlyArray.deepClone(map.getArray(propKey)));
+          break;
+      }
+    }
+    return res;
+  }
+
   /**
    * @param keysAndValues keys and values, interleaved
    */
@@ -65,12 +95,12 @@ public boolean getBoolean(String name) {
 
   @Override
   public double getDouble(String name) {
-    return (Double) mBackingMap.get(name);
+    return ((Number) mBackingMap.get(name)).doubleValue();
   }
 
   @Override
   public int getInt(String name) {
-    return (Integer) mBackingMap.get(name);
+    return ((Number) mBackingMap.get(name)).intValue();
   }
 
   @Override
diff --git a/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java b/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
index 6f244c70be4baf..e1d1958613e6ee 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
@@ -171,11 +171,6 @@ public void testFramesAnimation() {
     ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
         ArgumentCaptor.forClass(ReactStylesDiffMap.class);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(0);
-
     for (int i = 0; i < frames.size(); i++) {
       reset(mUIImplementationMock);
       mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
@@ -205,11 +200,6 @@ public void testFramesAnimationLoopsFiveTimes() {
     ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
         ArgumentCaptor.forClass(ReactStylesDiffMap.class);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(0);
-
     for (int iteration = 0; iteration < 5; iteration++) {
       for (int i = 0; i < frames.size(); i++) {
         reset(mUIImplementationMock);
@@ -270,9 +260,6 @@ public void testNodeValueListenerIfListening() {
       JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1d),
       animationCallback);
 
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(valueListener).onValueUpdate(eq(0d));
-
     for (int i = 0; i < frames.size(); i++) {
       reset(valueListener);
       mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
@@ -600,7 +587,6 @@ public void testAnimationCallbackFinish() {
 
     reset(animationCallback);
     mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
     verifyNoMoreInteractions(animationCallback);
 
     reset(animationCallback);
@@ -629,10 +615,10 @@ private void createAnimatedGraphWithAdditionNode(
       double secondValue) {
     mNativeAnimatedNodesManager.createAnimatedNode(
       1,
-      JavaOnlyMap.of("type", "value", "value", 100d, "offset", 0d));
+      JavaOnlyMap.of("type", "value", "value", firstValue, "offset", 0d));
     mNativeAnimatedNodesManager.createAnimatedNode(
       2,
-      JavaOnlyMap.of("type", "value", "value", 1000d, "offset", 0d));
+      JavaOnlyMap.of("type", "value", "value", secondValue, "offset", 0d));
 
     mNativeAnimatedNodesManager.createAnimatedNode(
       3,
@@ -648,7 +634,7 @@ private void createAnimatedGraphWithAdditionNode(
     mNativeAnimatedNodesManager.connectAnimatedNodes(2, 3);
     mNativeAnimatedNodesManager.connectAnimatedNodes(3, 4);
     mNativeAnimatedNodesManager.connectAnimatedNodes(4, 5);
-    mNativeAnimatedNodesManager.connectAnimatedNodeToView(5, 50);
+    mNativeAnimatedNodesManager.connectAnimatedNodeToView(5, viewTag);
   }
 
   @Test
@@ -677,12 +663,6 @@ public void testAdditionNode() {
     verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
     assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(1100d);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock)
-      .synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(1100d);
-
     reset(mUIImplementationMock);
     mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
     verify(mUIImplementationMock)
@@ -722,12 +702,6 @@ public void testViewReceiveUpdatesIfOneOfAnimationHasntStarted() {
     verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
     assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(1100d);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock)
-      .synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(1100d);
-
     reset(mUIImplementationMock);
     mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
     verify(mUIImplementationMock)
@@ -777,11 +751,6 @@ public void testViewReceiveUpdatesWhenOneOfAnimationHasFinished() {
     verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
     assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(1100d);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(1100d);
-
     for (int i = 1; i < secondFrames.size(); i++) {
       reset(mUIImplementationMock);
       mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
@@ -843,11 +812,6 @@ public void testMultiplicationNode() {
     verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
     assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(5d);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(5d);
-
     reset(mUIImplementationMock);
     mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
     verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
@@ -949,11 +913,6 @@ public void testInterpolationNode() {
     ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
       ArgumentCaptor.forClass(ReactStylesDiffMap.class);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(50), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(0d);
-
     for (int i = 0; i < frames.size(); i++) {
       reset(mUIImplementationMock);
       mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
@@ -1088,11 +1047,6 @@ public void testRestoreDefaultProps() {
     ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
       ArgumentCaptor.forClass(ReactStylesDiffMap.class);
 
-    reset(mUIImplementationMock);
-    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
-    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(viewTag), stylesCaptor.capture());
-    assertThat(stylesCaptor.getValue().getDouble("opacity", Double.NaN)).isEqualTo(1);
-
     for (int i = 0; i < frames.size(); i++) {
       reset(mUIImplementationMock);
       mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
@@ -1106,4 +1060,228 @@ public void testRestoreDefaultProps() {
     verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(viewTag), stylesCaptor.capture());
     assertThat(stylesCaptor.getValue().isNull("opacity"));
   }
+
+
+  /**
+   * Creates a following graph of nodes:
+   * Value(3, initialValue) ----> Style(4) ---> Props(5) ---> View(viewTag)
+   *
+   * Value(3) is set to track Value(1) via Tracking(2) node with the provided animation config
+   */
+  private void createAnimatedGraphWithTrackingNode(
+          int viewTag,
+          double initialValue,
+          JavaOnlyMap animationConfig) {
+    mNativeAnimatedNodesManager.createAnimatedNode(
+            1,
+            JavaOnlyMap.of("type", "value", "value", initialValue, "offset", 0d));
+    mNativeAnimatedNodesManager.createAnimatedNode(
+            3,
+            JavaOnlyMap.of("type", "value", "value", initialValue, "offset", 0d));
+
+    mNativeAnimatedNodesManager.createAnimatedNode(
+            2,
+            JavaOnlyMap.of("type", "tracking", "animationId", 70, "value", 3, "toValue", 1, "animationConfig", animationConfig));
+
+    mNativeAnimatedNodesManager.createAnimatedNode(
+            4,
+            JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("translateX", 3)));
+    mNativeAnimatedNodesManager.createAnimatedNode(
+            5,
+            JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 4)));
+    mNativeAnimatedNodesManager.connectAnimatedNodes(1, 2);
+    mNativeAnimatedNodesManager.connectAnimatedNodes(3, 4);
+    mNativeAnimatedNodesManager.connectAnimatedNodes(4, 5);
+    mNativeAnimatedNodesManager.connectAnimatedNodeToView(5, viewTag);
+  }
+
+  /**
+   * In this test we verify that when value is being tracked we can update destination value in the
+   * middle of ongoing animation and the animation will update and animate to the new spot. This is
+   * tested using simple 5 frame backed timing animation.
+   */
+  @Test
+  public void testTracking() {
+    JavaOnlyArray frames = JavaOnlyArray.of(0d, 0.25d, 0.5d, 0.75d, 1d);
+    JavaOnlyMap animationConfig = JavaOnlyMap.of("type", "frames", "frames", frames);
+
+    createAnimatedGraphWithTrackingNode(1000, 0d, animationConfig);
+
+    ArgumentCaptor<ReactStylesDiffMap> stylesCaptor =
+            ArgumentCaptor.forClass(ReactStylesDiffMap.class);
+
+    reset(mUIImplementationMock);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    verify(mUIImplementationMock).synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+    assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN)).isEqualTo(0d);
+
+    // update "toValue" to 100, we expect tracking animation to animate now from 0 to 100 in 5 steps
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 100d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime()); // kick off the animation
+
+    for (int i = 0; i < frames.size(); i++) {
+      reset(mUIImplementationMock);
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+      verify(mUIImplementationMock)
+              .synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+      assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN))
+              .isEqualTo(frames.getDouble(i) * 100d);
+    }
+
+    // update "toValue" to 0 but run only two frames from the animation,
+    // we expect tracking animation to animate now from 100 to 75
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 0d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime()); // kick off the animation
+
+    for (int i = 0; i < 2; i++) {
+      reset(mUIImplementationMock);
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+      verify(mUIImplementationMock)
+              .synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+      assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN))
+              .isEqualTo(100d * (1d - frames.getDouble(i)));
+    }
+
+    // at this point we expect tracking value to be at 75
+    assertThat(((ValueAnimatedNode) mNativeAnimatedNodesManager.getNodeById(3)).getValue())
+            .isEqualTo(75d);
+
+    // we update "toValue" again to 100 and expect the animation to restart from the current place
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 100d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime()); // kick off the animation
+
+    for (int i = 0; i < frames.size(); i++) {
+      reset(mUIImplementationMock);
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+      verify(mUIImplementationMock)
+              .synchronouslyUpdateViewOnUIThread(eq(1000), stylesCaptor.capture());
+      assertThat(stylesCaptor.getValue().getDouble("translateX", Double.NaN))
+              .isEqualTo(50d + 50d * frames.getDouble(i));
+    }
+  }
+
+  /**
+   * In this test we verify that when tracking is set up for a given animated node and when the
+   * animation settles it will not be registered as an active animation and therefore will not
+   * consume resources on running the animation that has already completed. Then we verify that when
+   * the value updates the animation will resume as expected and the complete again when reaches the
+   * end.
+   */
+  @Test
+  public void testTrackingPausesWhenEndValueIsReached() {
+    JavaOnlyArray frames = JavaOnlyArray.of(0d, 0.5d, 1d);
+    JavaOnlyMap animationConfig = JavaOnlyMap.of("type", "frames", "frames", frames);
+
+    createAnimatedGraphWithTrackingNode(1000, 0d, animationConfig);
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 100d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime()); // make sure animation starts
+
+    reset(mUIImplementationMock);
+    for (int i = 0; i < frames.size(); i++) {
+      assertThat(mNativeAnimatedNodesManager.hasActiveAnimations()).isTrue();
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    }
+    verify(mUIImplementationMock, times(frames.size()))
+            .synchronouslyUpdateViewOnUIThread(eq(1000), any(ReactStylesDiffMap.class));
+
+    // the animation has completed, we expect no updates to be done
+    reset(mUIImplementationMock);
+    assertThat(mNativeAnimatedNodesManager.hasActiveAnimations()).isFalse();
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    verifyNoMoreInteractions(mUIImplementationMock);
+
+
+    // we update end value and expect the animation to restart
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 200d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime()); // make sure animation starts
+
+    reset(mUIImplementationMock);
+    for (int i = 0; i < frames.size(); i++) {
+      assertThat(mNativeAnimatedNodesManager.hasActiveAnimations()).isTrue();
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    }
+    verify(mUIImplementationMock, times(frames.size()))
+            .synchronouslyUpdateViewOnUIThread(eq(1000), any(ReactStylesDiffMap.class));
+
+    // the animation has completed, we expect no updates to be done
+    reset(mUIImplementationMock);
+    assertThat(mNativeAnimatedNodesManager.hasActiveAnimations()).isFalse();
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    verifyNoMoreInteractions(mUIImplementationMock);
+  }
+
+  /**
+   * In this test we verify that when tracking is configured to use spring animation and when the
+   * destination value updates the current speed of the animated value will be taken into account
+   * while updating the spring animation and it will smoothly transition to the new end value.
+   */
+  @Test
+  public void testSpringTrackingRetainsSpeed() {
+    // this spring config correspomds to tension 20 and friction 0.5 which makes the spring settle
+    // very slowly
+    JavaOnlyMap springConfig = JavaOnlyMap.of(
+            "type",
+            "spring",
+            "restSpeedThreshold",
+            0.001,
+            "mass",
+            1d,
+            "restDisplacementThreshold",
+            0.001,
+            "initialVelocity",
+            0.5d,
+            "damping",
+            2.5,
+            "stiffness",
+            157.8,
+            "overshootClamping",
+            false);
+
+    createAnimatedGraphWithTrackingNode(1000, 0d, springConfig);
+
+    // update "toValue" to 1, we expect tracking animation to animate now from 0 to 1
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 1d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+
+    // we run several steps of animation until the value starts bouncing, has negative speed and
+    // passes the final point (that is 1) while going backwards
+    boolean isBoucingBack = false;
+    double previousValue = ((ValueAnimatedNode) mNativeAnimatedNodesManager.getNodeById(3)).getValue();
+    for (int maxFrames = 500; maxFrames > 0; maxFrames--) {
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+      double currentValue = ((ValueAnimatedNode) mNativeAnimatedNodesManager.getNodeById(3)).getValue();
+      if (previousValue >= 1d && currentValue < 1d) {
+        isBoucingBack = true;
+        break;
+      }
+      previousValue = currentValue;
+    }
+    assertThat(isBoucingBack).isTrue();
+
+    // we now update "toValue" to 1.5 but since the value have negative speed and has also pretty
+    // low friction we expect it to keep going in the opposite direction for a few more frames
+    mNativeAnimatedNodesManager.setAnimatedNodeValue(1, 1.5d);
+    mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+    int bounceBackInitialFrames = 0;
+    boolean hasTurnedForward = false;
+
+    // we run 8 seconds of animation
+    for (int i = 0; i < 8 * 60; i++) {
+      mNativeAnimatedNodesManager.runUpdates(nextFrameTime());
+      double currentValue = ((ValueAnimatedNode) mNativeAnimatedNodesManager.getNodeById(3)).getValue();
+      if (!hasTurnedForward) {
+        if (currentValue <= previousValue) {
+          bounceBackInitialFrames++;
+        } else {
+          hasTurnedForward = true;
+        }
+      }
+      previousValue = currentValue;
+    }
+    assertThat(hasTurnedForward).isEqualTo(true);
+    assertThat(bounceBackInitialFrames).isGreaterThan(3);
+
+    // we verify that the value settled at 2
+    assertThat(previousValue).isEqualTo(1.5d);
+  }
 }

From cff522d2831b9695d4077785a151e12c1a8a393f Mon Sep 17 00:00:00 2001
From: Mehdi Mulani <mehdi@fb.com>
Date: Fri, 16 Feb 2018 12:08:57 -0800
Subject: [PATCH 043/267] Dirty text shadow nodes on UIManager queue after
 multiplier changes

Summary: Letting them fire on whatever queue we get the notification from throws an assert.

Reviewed By: shergin

Differential Revision: D7002789

fbshipit-source-id: 669474af1a07f0df6784b69b54afe0152c1ba3c4
---
 Libraries/Text/Text/RCTTextViewManager.m           | 14 +++++++++-----
 .../Text/TextInput/RCTBaseTextInputViewManager.m   | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Libraries/Text/Text/RCTTextViewManager.m b/Libraries/Text/Text/RCTTextViewManager.m
index 58b559de18e512..f3d28ee7201dec 100644
--- a/Libraries/Text/Text/RCTTextViewManager.m
+++ b/Libraries/Text/Text/RCTTextViewManager.m
@@ -13,6 +13,7 @@
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTShadowView.h>
 #import <React/RCTUIManager.h>
+#import <React/RCTUIManagerUtils.h>
 #import <React/RCTUIManagerObserverCoordinator.h>
 
 #import "RCTTextShadowView.h"
@@ -83,12 +84,15 @@ - (void)handleDidUpdateMultiplierNotification
 {
   CGFloat fontSizeMultiplier = self.bridge.accessibilityManager.multiplier;
 
-  for (RCTTextShadowView *shadowView in _shadowViews) {
-    shadowView.textAttributes.fontSizeMultiplier = fontSizeMultiplier;
-    [shadowView dirtyLayout];
-  }
+  NSHashTable<RCTTextShadowView *> *shadowViews = _shadowViews;
+  RCTExecuteOnUIManagerQueue(^{
+    for (RCTTextShadowView *shadowView in shadowViews) {
+      shadowView.textAttributes.fontSizeMultiplier = fontSizeMultiplier;
+      [shadowView dirtyLayout];
+    }
 
-  [self.bridge.uiManager setNeedsLayout];
+    [self.bridge.uiManager setNeedsLayout];
+  });
 }
 
 @end
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
index 7e98eda2dee47e..1e192fe944aacd 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
@@ -16,6 +16,7 @@
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTShadowView.h>
 #import <React/RCTUIManager.h>
+#import <React/RCTUIManagerUtils.h>
 #import <React/RCTUIManagerObserverCoordinator.h>
 
 #import "RCTBaseTextInputShadowView.h"
@@ -109,12 +110,15 @@ - (void)handleDidUpdateMultiplierNotification
 {
   CGFloat fontSizeMultiplier = self.bridge.accessibilityManager.multiplier;
 
-  for (RCTBaseTextInputShadowView *shadowView in _shadowViews) {
-    shadowView.textAttributes.fontSizeMultiplier = fontSizeMultiplier;
-    [shadowView dirtyLayout];
-  }
+  NSHashTable<RCTBaseTextInputShadowView *> *shadowViews = _shadowViews;
+  RCTExecuteOnUIManagerQueue(^{
+    for (RCTBaseTextInputShadowView *shadowView in shadowViews) {
+      shadowView.textAttributes.fontSizeMultiplier = fontSizeMultiplier;
+      [shadowView dirtyLayout];
+    }
 
-  [self.bridge.uiManager setNeedsLayout];
+    [self.bridge.uiManager setNeedsLayout];
+  });
 }
 
 @end

From f96dfb946895c901c7823b06c26bfbbbd8b16862 Mon Sep 17 00:00:00 2001
From: Mehdi Mulani <mehdi@fb.com>
Date: Fri, 16 Feb 2018 12:08:59 -0800
Subject: [PATCH 044/267] Disable font scaling when an explicit font handler is
 set

Reviewed By: sahrens

Differential Revision: D7003464

fbshipit-source-id: f36ff344c50a9c63af6c852138041c1c918259c8
---
 Libraries/Text/RCTTextAttributes.m | 2 +-
 React/Views/RCTFont.h              | 1 +
 React/Views/RCTFont.mm             | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Libraries/Text/RCTTextAttributes.m b/Libraries/Text/RCTTextAttributes.m
index 26d63bdda8cd60..9b1ba122196cef 100644
--- a/Libraries/Text/RCTTextAttributes.m
+++ b/Libraries/Text/RCTTextAttributes.m
@@ -190,7 +190,7 @@ - (UIFont *)effectiveFont
 
 - (CGFloat)effectiveFontSizeMultiplier
 {
-  return _allowFontScaling && !isnan(_fontSizeMultiplier) ? _fontSizeMultiplier : 1.0;
+  return !RCTHasFontHandlerSet() && _allowFontScaling && !isnan(_fontSizeMultiplier) ? _fontSizeMultiplier : 1.0;
 }
 
 - (UIColor *)effectiveForegroundColor
diff --git a/React/Views/RCTFont.h b/React/Views/RCTFont.h
index ba34e8f3462b9c..711721d2a71cc5 100644
--- a/React/Views/RCTFont.h
+++ b/React/Views/RCTFont.h
@@ -20,6 +20,7 @@ typedef UIFont *(^RCTFontHandler)(CGFloat fontSize, NSString *fontWeightDescript
  * "semibold", "extrabold", "bold", "heavy", or "black".
  */
 RCT_EXTERN void RCTSetDefaultFontHandler(RCTFontHandler handler);
+RCT_EXTERN BOOL RCTHasFontHandlerSet();
 
 @interface RCTFont : NSObject
 
diff --git a/React/Views/RCTFont.mm b/React/Views/RCTFont.mm
index 37595dd3fbf42c..dc3877cb352cbc 100644
--- a/React/Views/RCTFont.mm
+++ b/React/Views/RCTFont.mm
@@ -103,6 +103,10 @@ void RCTSetDefaultFontHandler(RCTFontHandler handler) {
   defaultFontHandler = handler;
 }
 
+BOOL RCTHasFontHandlerSet() {
+  return defaultFontHandler != nil;
+}
+
 // We pass a string description of the font weight to the defaultFontHandler because UIFontWeight
 // is not defined pre-iOS 8.2.
 // Furthermore, UIFontWeight's are lossy floats, so we must use an inexact compare to figure out

From 1f7a48f2141acec236f4eea2168a42b55b663c02 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Fri, 16 Feb 2018 13:01:02 -0800
Subject: [PATCH 045/267] Extend the FabricUIManagerModule class to integrate
 with JSI/JSC in Android

Reviewed By: sebmarkbage

Differential Revision: D7005419

fbshipit-source-id: 6e65be5a922ddb29fde965f5df779cc92a996ecf
---
 .../react/fabric/FabricUIManagerModule.java   | 78 +++++++++----------
 1 file changed, 38 insertions(+), 40 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
index 548f31c7afda7c..0e52bcd36a701b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
@@ -3,36 +3,35 @@
 package com.facebook.react.fabric;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.ReactShadowNode;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
 
 /**
- * <p>Native module to allow JS to create and update native Views using Fabric API.</p>
- *
+ * This class is responsible to create, clone and update {@link ReactShadowNode} using the
+ * Fabric API.
  */
-@ReactModule(name = FabricUIManagerModule.NAME)
-public class FabricUIManagerModule extends ReactContextBaseJavaModule {
+public class FabricUIManagerModule {
 
-  static final String NAME = "FabricUIManager";
+  private final ReactApplicationContext mReactApplicationContext;
 
   public FabricUIManagerModule(ReactApplicationContext reactContext) {
-    super(reactContext);
+    mReactApplicationContext = reactContext;
   }
 
   /**
    * Creates a new {@link ReactShadowNode}
    */
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public int createNode(int reactTag,
+  @Nullable
+  public ReactShadowNode createNode(int reactTag,
       String viewName,
       int rootTag,
       ReadableMap props,
       int instanceHandle) {
     //TODO T25560658
-    return -1;
+    return null;
   }
 
   /**
@@ -40,10 +39,10 @@ public int createNode(int reactTag,
    * ReactShadowNode will contain a copy of all the internal data of the original node, including
    * its children set (note that the children nodes will not be cloned).
    */
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public int cloneNode(int node) {
+  @Nullable
+  public ReactShadowNode cloneNode(ReactShadowNode node) {
     //TODO T25560658
-    return -1;
+    return null;
   }
 
   /**
@@ -51,10 +50,10 @@ public int cloneNode(int node) {
    * ReactShadowNode will contain a copy of all the internal data of the original node, but
    * its children set will be empty.
    */
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public int cloneNodeWithNewChildren(int node) {
+  @Nullable
+  public ReactShadowNode cloneNodeWithNewChildren(ReactShadowNode node) {
     //TODO T25560658
-    return -1;
+    return null;
   }
 
   /**
@@ -62,10 +61,10 @@ public int cloneNodeWithNewChildren(int node) {
    * ReactShadowNode will contain a copy of all the internal data of the original node, but its
    * props will be overridden with the {@link ReadableMap} received by parameter.
    */
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public int cloneNodeWithNewProps(int node, ReadableMap newProps) {
+  @Nullable
+  public ReactShadowNode cloneNodeWithNewProps(ReactShadowNode node, ReadableMap newProps) {
     //TODO T25560658
-    return -1;
+    return null;
   }
 
   /**
@@ -74,41 +73,40 @@ public int cloneNodeWithNewProps(int node, ReadableMap newProps) {
    * props will be overridden with the {@link ReadableMap} received by parameter and its children
    * set will be empty.
    */
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public int cloneNodeWithNewChildrenAndProps(
-      int node,
+  @Nullable
+  public ReactShadowNode cloneNodeWithNewChildrenAndProps(
+      ReactShadowNode node,
       ReadableMap newProps) {
     //TODO T25560658
-    return -1;
+    return null;
   }
 
   /**
    * Appends the child {@link ReactShadowNode} to the children set of the parent
    * {@link ReactShadowNode}.
    */
-  @ReactMethod
-  public void appendChild(int parent, int child) {
+  @Nullable
+  public void appendChild(ReactShadowNode parent, ReactShadowNode child) {
     //TODO T25560658
   }
 
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public int createChildSet() {
-    //TODO T25560658
-    return -1;
+  /**
+   * @return an empty {@link List<ReactShadowNode>} that will be used to append the
+   * {@link ReactShadowNode} elements of the root. Typically this List will contain one element.
+   */
+  public List<ReactShadowNode> createChildSet() {
+    return new ArrayList<>(1);
   }
 
-  @ReactMethod
-  public void appendChildToSet(int childSet, int child) {
-    //TODO T25560658
+  /**
+   * Adds the {@link ReactShadowNode} to the {@link List<ReactShadowNode>} received by parameter.
+   */
+  public void appendChildToSet(List<ReactShadowNode> childList, ReactShadowNode child) {
+    childList.add(child);
   }
 
-  @ReactMethod
-  public void completeRoot(int rootTag, int childSet) {
+  public void completeRoot(int rootTag, List<ReactShadowNode> childList) {
     //TODO T25560658
   }
 
-  @Override
-  public String getName() {
-    return NAME;
-  }
 }

From 617362b6f7f7c17b0a4938ada7b4e4d841c6b434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Fri, 16 Feb 2018 13:35:43 -0800
Subject: [PATCH 046/267] Bump buck to v2018.02.16.01

Summary:
This should fix our current Android test failures.
Closes https://github.com/facebook/react-native/pull/18002

Differential Revision: D7014218

Pulled By: hramos

fbshipit-source-id: 2933baf9fd05f3ad33306c3ca7b62da8af568db0
---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dc428d3a0b75af..cc86a51c4688e8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,11 +42,11 @@ aliases:
 
   - &restore-cache-buck
     keys:
-      - v2-buck-{{ arch }}-v2017.11.16.01
+      - v2-buck-{{ arch }}-v2018.02.16.01
   - &save-cache-buck
     paths:
       - ~/buck
-    key: v2-buck-{{ arch }}-v2017.11.16.01
+    key: v2-buck-{{ arch }}-v2018.02.16.01
 
   - &restore-cache-watchman
     keys:
@@ -101,7 +101,7 @@ aliases:
   - &install-buck
     |
       if [[ ! -e ~/buck ]]; then
-        git clone https://github.com/facebook/buck.git ~/buck --branch v2017.11.16.01 --depth=1
+        git clone https://github.com/facebook/buck.git ~/buck --branch v2018.02.16.01 --depth=1
       fi
       cd ~/buck && ant
       buck --version

From 21231084dbccc8abe7823d4444a7e772c08e3e72 Mon Sep 17 00:00:00 2001
From: aneophyte <graphite.laser@gmail.com>
Date: Fri, 16 Feb 2018 13:51:23 -0800
Subject: [PATCH 047/267] Exclude jsbundle files from VCS

Summary:
jsbundle files can be generated, and are quite large and therefore, I think should be excluded from being committed to the repo.

[ GENERAL ][ MINOR ][local-cli/templates/_gitignore] - Included a new entry to ignore jsbundle files
Closes https://github.com/facebook/react-native/pull/17888

Differential Revision: D6977064

Pulled By: hramos

fbshipit-source-id: 9c7803004f3f4ec59cba3017213f68fba8225dbf
---
 local-cli/templates/HelloWorld/_gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/local-cli/templates/HelloWorld/_gitignore b/local-cli/templates/HelloWorld/_gitignore
index 0826423b786cca..5d647565fa9ef7 100644
--- a/local-cli/templates/HelloWorld/_gitignore
+++ b/local-cli/templates/HelloWorld/_gitignore
@@ -51,3 +51,6 @@ buck-out/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
+
+# Bundle artifact
+*.jsbundle

From 3a3d884df253dbc1c02ffef33e99c4a91ea8751b Mon Sep 17 00:00:00 2001
From: Douglas <dlowder@salesforce.com>
Date: Fri, 16 Feb 2018 14:28:16 -0800
Subject: [PATCH 048/267] tvOS: TV nav event emitter should check for bridge

Summary:
When running with the packager in the tvOS simulator, reloading from the packager hits an assert in `RCTEventEmitter`, causing a crash.  The solution is for `RCTTVNavigationEventEmitter` to check for the existence of the bridge before attempting to send an event.

Manual testing.

[IOS] [BUGFIX] [RCTTVNavigationEventEmitter.m] - Fix crash when reloading in tvOS
Closes https://github.com/facebook/react-native/pull/17797

Differential Revision: D7014975

Pulled By: hramos

fbshipit-source-id: 0bf766e87267ca8592ff0cc0b3cb4621a8e8f9b5
---
 React/Modules/RCTTVNavigationEventEmitter.m | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/React/Modules/RCTTVNavigationEventEmitter.m b/React/Modules/RCTTVNavigationEventEmitter.m
index 12d17758401104..bbc42e14f4c55c 100644
--- a/React/Modules/RCTTVNavigationEventEmitter.m
+++ b/React/Modules/RCTTVNavigationEventEmitter.m
@@ -46,7 +46,9 @@ - (void)dealloc
 
 - (void)handleTVNavigationEventNotification:(NSNotification *)notif
 {
-  [self sendEventWithName:TVNavigationEventName body:notif.object];
+  if (self.bridge) {
+    [self sendEventWithName:TVNavigationEventName body:notif.object];
+  }
 }
 
 @end

From 5447ca67076a110e2b0df03b014f53d1df4646ab Mon Sep 17 00:00:00 2001
From: Alexander Chernoshej <demoman361@gmail.com>
Date: Fri, 16 Feb 2018 14:29:42 -0800
Subject: [PATCH 049/267] Change irrelevant Products path in
 ./local-cli/runIOS/runIOS.js

Summary:
https://github.com/facebook/react-native/issues/7308
and many of the same

Seems like xcode cli tool isn't create ./build directory any more but place Products
right inside ./Build (may check while creating single view ios application
in XCode)

* edit hardcoded path to {appName}.app

<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

Command `$ react-native run-ios` is often lead to `Entry, ":CFBundleIdentifier", Does Not Exist`
I find out how to fix it in current version of RN and Xcode cli tools

Just try to do `$ react native init {appName}` and then `$ react native run-ios` if everything fine it means my approach is right :)

<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
Closes https://github.com/facebook/react-native/pull/17963

Differential Revision: D7014984

Pulled By: hramos

fbshipit-source-id: da62f130e6ebf7d3acd09d36525838d5c9684e75
---
 local-cli/runIOS/runIOS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js
index cb459a81c2d15e..d2ec2b82d63df1 100644
--- a/local-cli/runIOS/runIOS.js
+++ b/local-cli/runIOS/runIOS.js
@@ -26,7 +26,7 @@ const getBuildPath = function (configuration = 'Debug', appName, isDevice) {
     device = 'iphonesimulator';
   }
 
-  return `build/Build/Products/${configuration}-${device}/${appName}.app`;
+  return `Build/Products/${configuration}-${device}/${appName}.app`;
 };
 const xcprettyAvailable = function() {
   try {

From d16ff3bd8b92fa84a9007bf5ebedd8153e4c089d Mon Sep 17 00:00:00 2001
From: Kevin Cassidy Jr <kevincassidyjr@gmail.com>
Date: Fri, 16 Feb 2018 16:50:45 -0800
Subject: [PATCH 050/267] Better Android Gradle Plugin 3.x integration

Summary:
Better integration with the Android Gradle-based build process, especially the changes introduced by the [Android Gradle Plugin 3.x and AAPT2](https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html).

Fixes #16906, the `android.enableAapt2=false` workaround is no longer required.

Bases the task generation process on the actual application variants present in the project. The current manual process of iterating build types and product flavors could break down when more than one dimension type is present (see https://developer.android.com/studio/build/build-variants.html#flavor-dimensions).

This also exposes a very basic set of properties in the build tasks, so that other tasks can more reliably access them:

```groovy
android.applicationVariants.all { variant ->
    // This is the generated task itself:
    def reactBundleTask = variant.bundleJsAndAssets
    // These are the outputs by type:
    def resFileCollection = reactBundleTask.generatedResFolders
    def assetsFileCollection = reactBundleTask.generatedAssetsFolders
}
```

I've tested various combinations of product flavors and build types ([Build Variants](https://developer.android.com/studio/build/build-variants.html)) to make sure this is consistent. This is a port of what we're currently deploying to our CI process.

[ ANDROID ] [ BUGFIX ] [ react.gradle ] - Support Android Gradle Plugin 3.x and AAPT2
[ ANDROID ] [ FEATURE ] [ react.gradle ] - Expose the bundling task and its outputs via ext properties
Closes https://github.com/facebook/react-native/pull/17967

Differential Revision: D7017148

Pulled By: hramos

fbshipit-source-id: e52b3365e5807430b9caced51349abf72332a587
---
 react.gradle | 199 ++++++++++++++++++++++++++-------------------------
 1 file changed, 102 insertions(+), 97 deletions(-)

diff --git a/react.gradle b/react.gradle
index 64b2f02f8cbf26..685862193bb945 100644
--- a/react.gradle
+++ b/react.gradle
@@ -6,112 +6,117 @@ def cliPath = config.cliPath ?: "node_modules/react-native/local-cli/cli.js"
 def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
 def entryFile = config.entryFile ?: "index.android.js"
 def bundleCommand = config.bundleCommand ?: "bundle"
-
-// because elvis operator
-def elvisFile(thing) {
-    return thing ? file(thing) : null;
-}
-
-def reactRoot = elvisFile(config.root) ?: file("../../")
+def reactRoot = file(config.root ?: "../../")
 def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"]
 def bundleConfig = config.bundleConfig ? "${reactRoot}/${config.bundleConfig}" : null ;
 
-void runBefore(String dependentTaskName, Task task) {
-    Task dependentTask = tasks.findByPath(dependentTaskName);
-    if (dependentTask != null) {
-        dependentTask.dependsOn task
-    }
-}
 
 gradle.projectsEvaluated {
-    // Grab all build types and product flavors
-    def buildTypes = android.buildTypes.collect { type -> type.name }
-    def productFlavors = android.productFlavors.collect { flavor -> flavor.name }
-
-    // When no product flavors defined, use empty
-    if (!productFlavors) productFlavors.add('')
-
-    productFlavors.each { productFlavorName ->
-        buildTypes.each { buildTypeName ->
-            // Create variant and target names
-            def flavorNameCapitalized = "${productFlavorName.capitalize()}"
-            def buildNameCapitalized = "${buildTypeName.capitalize()}"
-            def targetName = "${flavorNameCapitalized}${buildNameCapitalized}"
-            def targetPath = productFlavorName ?
-                    "${productFlavorName}/${buildTypeName}" :
-                    "${buildTypeName}"
-
-            // React js bundle directories
-            def jsBundleDirConfigName = "jsBundleDir${targetName}"
-            def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
-                    file("$buildDir/intermediates/assets/${targetPath}")
-
-            def resourcesDirConfigName = "resourcesDir${targetName}"
-            def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
-                    file("$buildDir/intermediates/res/merged/${targetPath}")
-            def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
-
-            // Bundle task name for variant
-            def bundleJsAndAssetsTaskName = "bundle${targetName}JsAndAssets"
-
-            // Additional node and packager commandline arguments
-            def nodeExecutableAndArgs = config.nodeExecutableAndArgs ?: ["node"]
-            def extraPackagerArgs = config.extraPackagerArgs ?: []
-
-            def currentBundleTask = tasks.create(
-                    name: bundleJsAndAssetsTaskName,
-                    type: Exec) {
+    android.applicationVariants.all { def variant ->
+        // Create variant and target names
+        def targetName = variant.name.capitalize()
+        def targetPath = variant.dirName
+
+        // React js bundle directories
+        def jsBundleDir = file("$buildDir/generated/assets/react/${targetPath}")
+        def resourcesDir = file("$buildDir/generated/res/react/${targetPath}")
+
+        def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
+
+        // Additional node and packager commandline arguments
+        def nodeExecutableAndArgs = config.nodeExecutableAndArgs ?: ["node"]
+        def extraPackagerArgs = config.extraPackagerArgs ?: []
+
+        def currentBundleTask = tasks.create(
+            name: "bundle${targetName}JsAndAssets",
+            type: Exec) {
+            group = "react"
+            description = "bundle JS and assets for ${targetName}."
+
+            // Create dirs if they are not there (e.g. the "clean" task just ran)
+            doFirst {
+                jsBundleDir.deleteDir()
+                jsBundleDir.mkdirs()
+                resourcesDir.deleteDir()
+                resourcesDir.mkdirs()
+            }
+
+            // Set up inputs and outputs so gradle can cache the result
+            inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
+            outputs.dir jsBundleDir
+            outputs.dir resourcesDir
+
+            // Set up the call to the react-native cli
+            workingDir reactRoot
+
+            // Set up dev mode
+            def devEnabled = !(config."devDisabledIn${targetName}"
+                || targetName.toLowerCase().contains("release"))
+
+            def extraArgs = extraPackagerArgs;
+
+            if (bundleConfig) {
+                extraArgs = extraArgs.clone()
+                extraArgs.add("--config");
+                extraArgs.add(bundleConfig);
+            }
+
+            if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                commandLine("cmd", "/c", *nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
+                    "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
+            } else {
+                commandLine(*nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
+                    "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
+            }
+
+            enabled config."bundleIn${targetName}" ||
+                config."bundleIn${variant.buildType.name.capitalize()}" ?:
+                targetName.toLowerCase().contains("release")
+        }
+
+        // Expose a minimal interface on the application variant and the task itself:
+        variant.ext.bundleJsAndAssets = currentBundleTask
+        currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
+        currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
+
+        variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)
+        variant.mergeResources.dependsOn(currentBundleTask)
+
+        def resourcesDirConfigValue = config."resourcesDir${targetName}"
+        if (resourcesDirConfigValue) {
+            def currentCopyResTask = tasks.create(
+                name: "copy${targetName}BundledResources",
+                type: Copy) {
                 group = "react"
-                description = "bundle JS and assets for ${targetName}."
-
-                // Create dirs if they are not there (e.g. the "clean" task just ran)
-                doFirst {
-                    jsBundleDir.mkdirs()
-                    resourcesDir.mkdirs()
-                }
-
-                // Set up inputs and outputs so gradle can cache the result
-                inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
-                outputs.dir jsBundleDir
-                outputs.dir resourcesDir
-
-                // Set up the call to the react-native cli
-                workingDir reactRoot
-
-                // Set up dev mode
-                def devEnabled = !(config."devDisabledIn${targetName}"
-                    || targetName.toLowerCase().contains("release"))
-
-                def extraArgs = extraPackagerArgs;
-
-                if (bundleConfig) {
-                  extraArgs = extraArgs.clone()
-                  extraArgs.add("--config");
-                  extraArgs.add(bundleConfig);
-                }
-
-                if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                    commandLine("cmd", "/c", *nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
-                            "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
-                } else {
-                    commandLine(*nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
-                            "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
-                }
-
-                enabled config."bundleIn${targetName}" ||
-                    config."bundleIn${buildTypeName.capitalize()}" ?:
-                            targetName.toLowerCase().contains("release")
+                description = "copy bundled resources into custom location for ${targetName}."
+
+                from resourcesDir
+                into file(resourcesDirConfigValue)
+
+                dependsOn(currentBundleTask)
+
+                enabled currentBundleTask.enabled
             }
 
-            // Hook bundle${productFlavor}${buildType}JsAndAssets into the android build process
-            currentBundleTask.dependsOn("merge${targetName}Resources")
-            currentBundleTask.dependsOn("merge${targetName}Assets")
+            variant.packageApplication.dependsOn(currentCopyResTask)
+        }
+
+        def currentAssetsCopyTask = tasks.create(
+            name: "copy${targetName}BundledJs",
+            type: Copy) {
+            group = "react"
+            description = "copy bundled JS into ${targetName}."
 
-            runBefore("process${flavorNameCapitalized}Armeabi-v7a${buildNameCapitalized}Resources", currentBundleTask)
-            runBefore("process${flavorNameCapitalized}X86${buildNameCapitalized}Resources", currentBundleTask)
-            runBefore("processUniversal${targetName}Resources", currentBundleTask)
-            runBefore("process${targetName}Resources", currentBundleTask)
-            runBefore("dataBindingProcessLayouts${targetName}", currentBundleTask)
+            from jsBundleDir
+            into file(config."jsBundleDir${targetName}" ?:
+                "$buildDir/intermediates/assets/${targetPath}")
+
+            // mergeAssets must run first, as it clears the intermediates directory
+            dependsOn(variant.mergeAssets)
+
+            enabled currentBundleTask.enabled
         }
+
+        variant.packageApplication.dependsOn(currentAssetsCopyTask)
     }
 }

From 67c3ad4e6a1847cbac43115b01f72cc5c8932a61 Mon Sep 17 00:00:00 2001
From: Toby Cox <toby@tobycox.com>
Date: Fri, 16 Feb 2018 17:28:35 -0800
Subject: [PATCH 051/267] Fix pinch crash in touch-responsive views.

Summary:
Fork and rebase of gillessed's PR https://github.com/facebook/react-native/pull/13166 which has gotten stale.

From original PR:

Motivation (required)

Multiple react native developer (including myself) have run into a crash with the react-native-photo-view library (and possibly others). The common solution to this problem lies in the underlying java code, and thus requires a change in the react native source.

The stack trace I am getting is the same as listed here alwx/react-native-photo-view#15.

There was a PR to fix this (#12085) but it was closed. In response to the comments there, in my PR, I do log the exceptions. I don't think we can get any closer to the exception because in the next level of the stack trace, we are in the android sdk code.

Looking at some stack overflow pages and the android bug tracker, it seems that this is the common solution to this bug, and does not cause any impact any functionality.

https://code.google.com/p/android/issues/list?can=1&q=pointerindex+out+of+range&colspec=ID+Status+Priority+Owner+Summary+Stars+Reporter+Opened&cells=tiles

Test Plan (required)

I have manually tested this by compiling react native android from source and have confirmed the exception still gets hit and logged, but does not cause the app to terminate.
Closes https://github.com/facebook/react-native/pull/17167

Differential Revision: D7014296

Pulled By: hramos

fbshipit-source-id: 06b4a31062a591b726d2021e877d16f49881dcfd
---
 .../react/views/drawer/ReactDrawerLayout.java | 16 +++++++++++---
 .../scroll/ReactHorizontalScrollView.java     | 22 ++++++++++++++-----
 .../react/views/scroll/ReactScrollView.java   | 19 +++++++++++-----
 .../react/views/viewpager/ReactViewPager.java | 16 +++++++++++---
 4 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
index abdb4a04d4e1b6..cdb0265e26e49f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
@@ -11,10 +11,12 @@
 
 import android.support.v4.widget.DrawerLayout;
 import android.view.Gravity;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.events.NativeGestureUtil;
 
@@ -34,10 +36,18 @@ public ReactDrawerLayout(ReactContext reactContext) {
 
   @Override
   public boolean onInterceptTouchEvent(MotionEvent ev) {
-    if (super.onInterceptTouchEvent(ev)) {
-      NativeGestureUtil.notifyNativeGestureStarted(this, ev);
-      return true;
+    try {
+      if (super.onInterceptTouchEvent(ev)) {
+        NativeGestureUtil.notifyNativeGestureStarted(this, ev);
+        return true;
+      }
+    } catch (IllegalArgumentException e) {
+      // Log and ignore the error. This seems to be a bug in the android SDK and
+      // this is the commonly accepted workaround.
+      // https://tinyurl.com/mw6qkod (Stack Overflow)
+      Log.w(ReactConstants.TAG, "Error intercepting touch event.", e);
     }
+
     return false;
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
index 38371436b8834a..ebcd2d50110663 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
@@ -17,10 +17,13 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.support.v4.view.ViewCompat;
+import android.graphics.drawable.LayerDrawable;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.HorizontalScrollView;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.MeasureSpecAssertions;
 import com.facebook.react.uimanager.ReactClippingViewGroup;
 import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
@@ -140,12 +143,19 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
       return false;
     }
 
-    if (super.onInterceptTouchEvent(ev)) {
-      NativeGestureUtil.notifyNativeGestureStarted(this, ev);
-      ReactScrollViewHelper.emitScrollBeginDragEvent(this);
-      mDragging = true;
-      enableFpsListener();
-      return true;
+    try {
+      if (super.onInterceptTouchEvent(ev)) {
+        NativeGestureUtil.notifyNativeGestureStarted(this, ev);
+        ReactScrollViewHelper.emitScrollBeginDragEvent(this);
+        mDragging = true;
+        enableFpsListener();
+        return true;
+      }
+    } catch (IllegalArgumentException e) {
+      // Log and ignore the error. This seems to be a bug in the android SDK and
+      // this is the commonly accepted workaround.
+      // https://tinyurl.com/mw6qkod (Stack Overflow)
+      Log.w(ReactConstants.TAG, "Error intercepting touch event.", e);
     }
 
     return false;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
index a9c7960cf14ae5..509964ceb13064 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
@@ -190,12 +190,19 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
       return false;
     }
 
-    if (super.onInterceptTouchEvent(ev)) {
-      NativeGestureUtil.notifyNativeGestureStarted(this, ev);
-      ReactScrollViewHelper.emitScrollBeginDragEvent(this);
-      mDragging = true;
-      enableFpsListener();
-      return true;
+    try {
+      if (super.onInterceptTouchEvent(ev)) {
+        NativeGestureUtil.notifyNativeGestureStarted(this, ev);
+        ReactScrollViewHelper.emitScrollBeginDragEvent(this);
+        mDragging = true;
+        enableFpsListener();
+        return true;
+      }
+    } catch (IllegalArgumentException e) {
+      // Log and ignore the error. This seems to be a bug in the android SDK and
+      // this is the commonly accepted workaround.
+      // https://tinyurl.com/mw6qkod (Stack Overflow)
+      Log.w(ReactConstants.TAG, "Error intercepting touch event.", e);
     }
 
     return false;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
index 9a76bace545907..7d99e272a40153 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
@@ -11,10 +11,12 @@
 
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.NativeGestureUtil;
@@ -176,10 +178,18 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
       return false;
     }
 
-    if (super.onInterceptTouchEvent(ev)) {
-      NativeGestureUtil.notifyNativeGestureStarted(this, ev);
-      return true;
+    try {
+      if (super.onInterceptTouchEvent(ev)) {
+        NativeGestureUtil.notifyNativeGestureStarted(this, ev);
+        return true;
+      }
+    } catch (IllegalArgumentException e) {
+      // Log and ignore the error. This seems to be a bug in the android SDK and
+      // this is the commonly accepted workaround.
+      // https://tinyurl.com/mw6qkod (Stack Overflow)
+      Log.w(ReactConstants.TAG, "Error intercepting touch event.", e);
     }
+
     return false;
   }
 

From 1490ab12ef156bf3201882eeabfcac18a1210352 Mon Sep 17 00:00:00 2001
From: Sophie Alpert <sophiebits@fb.com>
Date: Fri, 16 Feb 2018 18:24:55 -0800
Subject: [PATCH 052/267] Update license headers for MIT license

Summary:
Includes React Native and its dependencies Fresco, Metro, and Yoga. Excludes samples/examples/docs.

find: ^(?:( *)|( *(?:[\*~#]|::))( )? *)?Copyright (?:\(c\) )?(\d{4})\b.+Facebook[\s\S]+?BSD[\s\S]+?(?:this source tree|the same directory)\.$
replace: $1$2$3Copyright (c) $4-present, Facebook, Inc.\n$2\n$1$2$3This source code is licensed under the MIT license found in the\n$1$2$3LICENSE file in the root directory of this source tree.

Reviewed By: TheSavior, yungsters

Differential Revision: D7007050

fbshipit-source-id: 37dd6bf0ffec0923bfc99c260bb330683f35553e
---
 CONTRIBUTING.md                                          | 6 ++----
 .../scripts/run-android-ci-instrumentation-tests.js      | 6 ++----
 IntegrationTests/AccessibilityManagerTest.js             | 6 ++----
 IntegrationTests/AppEventsTest.js                        | 6 ++----
 IntegrationTests/AsyncStorageTest.js                     | 6 ++----
 IntegrationTests/ImageCachePolicyTest.js                 | 6 ++----
 IntegrationTests/ImageSnapshotTest.js                    | 6 ++----
 IntegrationTests/IntegrationTestHarnessTest.js           | 6 ++----
 IntegrationTests/IntegrationTestsApp.js                  | 6 ++----
 IntegrationTests/LayoutEventsTest.js                     | 6 ++----
 IntegrationTests/LoggingTestModule.js                    | 6 ++----
 IntegrationTests/PromiseTest.js                          | 6 ++----
 IntegrationTests/PropertiesUpdateTest.js                 | 6 ++----
 IntegrationTests/RCTRootViewIntegrationTestApp.js        | 6 ++----
 IntegrationTests/ReactContentSizeUpdateTest.js           | 6 ++----
 IntegrationTests/SimpleSnapshotTest.js                   | 6 ++----
 IntegrationTests/SizeFlexibilityUpdateTest.js            | 6 ++----
 IntegrationTests/SyncMethodTest.js                       | 6 ++----
 IntegrationTests/TimersTest.js                           | 6 ++----
 IntegrationTests/WebSocketTest.js                        | 6 ++----
 IntegrationTests/WebViewTest.js                          | 6 ++----
 IntegrationTests/launchWebSocketServer.command           | 6 ++----
 IntegrationTests/websocket_integration_test_server.js    | 6 ++----
 Libraries/ART/ARTCGFloatArray.h                          | 6 ++----
 Libraries/ART/ARTContainer.h                             | 6 ++----
 Libraries/ART/ARTGroup.h                                 | 6 ++----
 Libraries/ART/ARTGroup.m                                 | 6 ++----
 Libraries/ART/ARTNode.h                                  | 6 ++----
 Libraries/ART/ARTNode.m                                  | 6 ++----
 Libraries/ART/ARTRenderable.h                            | 6 ++----
 Libraries/ART/ARTRenderable.m                            | 6 ++----
 Libraries/ART/ARTSerializablePath.js                     | 6 ++----
 Libraries/ART/ARTShape.h                                 | 6 ++----
 Libraries/ART/ARTShape.m                                 | 6 ++----
 Libraries/ART/ARTSurfaceView.h                           | 6 ++----
 Libraries/ART/ARTSurfaceView.m                           | 6 ++----
 Libraries/ART/ARTText.h                                  | 6 ++----
 Libraries/ART/ARTText.m                                  | 6 ++----
 Libraries/ART/ARTTextFrame.h                             | 6 ++----
 Libraries/ART/Brushes/ARTBrush.h                         | 6 ++----
 Libraries/ART/Brushes/ARTBrush.m                         | 6 ++----
 Libraries/ART/Brushes/ARTLinearGradient.h                | 6 ++----
 Libraries/ART/Brushes/ARTLinearGradient.m                | 6 ++----
 Libraries/ART/Brushes/ARTPattern.h                       | 6 ++----
 Libraries/ART/Brushes/ARTPattern.m                       | 6 ++----
 Libraries/ART/Brushes/ARTRadialGradient.h                | 6 ++----
 Libraries/ART/Brushes/ARTRadialGradient.m                | 6 ++----
 Libraries/ART/Brushes/ARTSolidColor.h                    | 6 ++----
 Libraries/ART/Brushes/ARTSolidColor.m                    | 6 ++----
 Libraries/ART/RCTConvert+ART.h                           | 6 ++----
 Libraries/ART/RCTConvert+ART.m                           | 6 ++----
 Libraries/ART/ReactNativeART.js                          | 6 ++----
 Libraries/ART/ViewManagers/ARTGroupManager.h             | 6 ++----
 Libraries/ART/ViewManagers/ARTGroupManager.m             | 6 ++----
 Libraries/ART/ViewManagers/ARTNodeManager.h              | 6 ++----
 Libraries/ART/ViewManagers/ARTNodeManager.m              | 6 ++----
 Libraries/ART/ViewManagers/ARTRenderableManager.h        | 6 ++----
 Libraries/ART/ViewManagers/ARTRenderableManager.m        | 6 ++----
 Libraries/ART/ViewManagers/ARTShapeManager.h             | 6 ++----
 Libraries/ART/ViewManagers/ARTShapeManager.m             | 6 ++----
 Libraries/ART/ViewManagers/ARTSurfaceViewManager.h       | 6 ++----
 Libraries/ART/ViewManagers/ARTSurfaceViewManager.m       | 6 ++----
 Libraries/ART/ViewManagers/ARTTextManager.h              | 6 ++----
 Libraries/ART/ViewManagers/ARTTextManager.m              | 6 ++----
 Libraries/ActionSheetIOS/ActionSheetIOS.js               | 6 ++----
 Libraries/ActionSheetIOS/RCTActionSheetManager.h         | 6 ++----
 Libraries/ActionSheetIOS/RCTActionSheetManager.m         | 6 ++----
 Libraries/Alert/Alert.js                                 | 6 ++----
 Libraries/Alert/AlertIOS.js                              | 6 ++----
 Libraries/Alert/RCTAlertManager.android.js               | 6 ++----
 Libraries/Alert/RCTAlertManager.ios.js                   | 6 ++----
 Libraries/Animated/release/gulpfile.js                   | 8 +++-----
 Libraries/Animated/src/Animated.js                       | 6 ++----
 Libraries/Animated/src/AnimatedEvent.js                  | 6 ++----
 Libraries/Animated/src/AnimatedImplementation.js         | 6 ++----
 Libraries/Animated/src/AnimatedWeb.js                    | 6 ++----
 Libraries/Animated/src/Easing.js                         | 6 ++----
 Libraries/Animated/src/NativeAnimatedHelper.js           | 6 ++----
 Libraries/Animated/src/SpringConfig.js                   | 6 ++----
 Libraries/Animated/src/__tests__/Animated-test.js        | 6 ++----
 Libraries/Animated/src/__tests__/AnimatedNative-test.js  | 6 ++----
 Libraries/Animated/src/__tests__/Easing-test.js          | 6 ++----
 Libraries/Animated/src/__tests__/Interpolation-test.js   | 6 ++----
 Libraries/Animated/src/animations/Animation.js           | 6 ++----
 Libraries/Animated/src/animations/DecayAnimation.js      | 6 ++----
 Libraries/Animated/src/animations/SpringAnimation.js     | 6 ++----
 Libraries/Animated/src/animations/TimingAnimation.js     | 6 ++----
 Libraries/Animated/src/createAnimatedComponent.js        | 6 ++----
 Libraries/Animated/src/nodes/AnimatedAddition.js         | 6 ++----
 Libraries/Animated/src/nodes/AnimatedDiffClamp.js        | 6 ++----
 Libraries/Animated/src/nodes/AnimatedDivision.js         | 6 ++----
 Libraries/Animated/src/nodes/AnimatedInterpolation.js    | 6 ++----
 Libraries/Animated/src/nodes/AnimatedModulo.js           | 6 ++----
 Libraries/Animated/src/nodes/AnimatedMultiplication.js   | 6 ++----
 Libraries/Animated/src/nodes/AnimatedNode.js             | 6 ++----
 Libraries/Animated/src/nodes/AnimatedProps.js            | 6 ++----
 Libraries/Animated/src/nodes/AnimatedStyle.js            | 6 ++----
 Libraries/Animated/src/nodes/AnimatedTracking.js         | 6 ++----
 Libraries/Animated/src/nodes/AnimatedTransform.js        | 6 ++----
 Libraries/Animated/src/nodes/AnimatedValue.js            | 6 ++----
 Libraries/Animated/src/nodes/AnimatedValueXY.js          | 6 ++----
 Libraries/Animated/src/nodes/AnimatedWithChildren.js     | 6 ++----
 Libraries/Animated/src/polyfills/InteractionManager.js   | 6 ++----
 Libraries/Animated/src/polyfills/Set.js                  | 6 ++----
 Libraries/Animated/src/polyfills/flattenStyle.js         | 6 ++----
 Libraries/AppState/AppState.js                           | 6 ++----
 Libraries/BatchedBridge/BatchedBridge.js                 | 6 ++----
 Libraries/BatchedBridge/MessageQueue.js                  | 6 ++----
 Libraries/BatchedBridge/NativeModules.js                 | 6 ++----
 .../BatchedBridge/__mocks__/MessageQueueTestConfig.js    | 6 ++----
 .../BatchedBridge/__mocks__/MessageQueueTestModule.js    | 6 ++----
 Libraries/BatchedBridge/__tests__/MessageQueue-test.js   | 6 ++----
 Libraries/BatchedBridge/__tests__/NativeModules-test.js  | 6 ++----
 Libraries/Blob/Blob.js                                   | 6 ++----
 Libraries/Blob/BlobManager.js                            | 6 ++----
 Libraries/Blob/BlobRegistry.js                           | 6 ++----
 Libraries/Blob/BlobTypes.js                              | 6 ++----
 Libraries/Blob/File.js                                   | 6 ++----
 Libraries/Blob/FileReader.js                             | 6 ++----
 Libraries/Blob/RCTBlobManager.h                          | 6 ++----
 Libraries/Blob/RCTBlobManager.mm                         | 6 ++----
 Libraries/Blob/RCTFileReaderModule.h                     | 6 ++----
 Libraries/Blob/RCTFileReaderModule.m                     | 6 ++----
 Libraries/Blob/URL.js                                    | 6 ++----
 Libraries/Blob/__mocks__/BlobModule.js                   | 6 ++----
 Libraries/Blob/__mocks__/FileReaderModule.js             | 6 ++----
 Libraries/Blob/__tests__/Blob-test.js                    | 6 ++----
 Libraries/Blob/__tests__/BlobManager-test.js             | 6 ++----
 Libraries/Blob/__tests__/File-test.js                    | 6 ++----
 Libraries/Blob/__tests__/FileReader-test.js              | 6 ++----
 Libraries/BugReporting/BugReporting.js                   | 6 ++----
 Libraries/BugReporting/dumpReactTree.js                  | 6 ++----
 Libraries/BugReporting/getReactData.js                   | 6 ++----
 Libraries/CameraRoll/CameraRoll.js                       | 6 ++----
 Libraries/CameraRoll/ImagePickerIOS.js                   | 6 ++----
 Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h    | 6 ++----
 Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m    | 6 ++----
 Libraries/CameraRoll/RCTCameraRollManager.h              | 6 ++----
 Libraries/CameraRoll/RCTCameraRollManager.m              | 6 ++----
 Libraries/CameraRoll/RCTImagePickerManager.h             | 8 +++-----
 Libraries/CameraRoll/RCTImagePickerManager.m             | 8 +++-----
 Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h        | 6 ++----
 Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m        | 6 ++----
 .../AccessibilityInfo/AccessibilityInfo.android.js       | 6 ++----
 .../AccessibilityInfo/AccessibilityInfo.ios.js           | 6 ++----
 .../Components/ActivityIndicator/ActivityIndicator.js    | 6 ++----
 Libraries/Components/AppleTV/TVEventHandler.android.js   | 6 ++----
 Libraries/Components/AppleTV/TVEventHandler.ios.js       | 6 ++----
 Libraries/Components/AppleTV/TVViewPropTypes.js          | 6 ++----
 Libraries/Components/Button.js                           | 6 ++----
 Libraries/Components/CheckBox/CheckBox.android.js        | 6 ++----
 Libraries/Components/CheckBox/CheckBox.ios.js            | 6 ++----
 Libraries/Components/Clipboard/Clipboard.js              | 6 ++----
 Libraries/Components/DatePicker/DatePickerIOS.android.js | 6 ++----
 Libraries/Components/DatePicker/DatePickerIOS.ios.js     | 6 ++----
 .../DatePickerAndroid/DatePickerAndroid.android.js       | 6 ++----
 .../DatePickerAndroid/DatePickerAndroid.ios.js           | 6 ++----
 .../DrawerAndroid/DrawerLayoutAndroid.android.js         | 6 ++----
 .../Components/DrawerAndroid/DrawerLayoutAndroid.ios.js  | 6 ++----
 Libraries/Components/Keyboard/Keyboard.js                | 6 ++----
 Libraries/Components/Keyboard/KeyboardAvoidingView.js    | 6 ++----
 Libraries/Components/LazyRenderer.js                     | 6 ++----
 Libraries/Components/MaskedView/MaskedViewIOS.android.js | 6 ++----
 Libraries/Components/MaskedView/MaskedViewIOS.ios.js     | 6 ++----
 Libraries/Components/Navigation/NavigatorIOS.android.js  | 6 ++----
 Libraries/Components/Navigation/NavigatorIOS.ios.js      | 6 ++----
 Libraries/Components/Picker/Picker.js                    | 6 ++----
 Libraries/Components/Picker/PickerAndroid.android.js     | 6 ++----
 Libraries/Components/Picker/PickerAndroid.ios.js         | 6 ++----
 Libraries/Components/Picker/PickerIOS.android.js         | 6 ++----
 Libraries/Components/Picker/PickerIOS.ios.js             | 6 ++----
 .../ProgressBarAndroid/ProgressBarAndroid.android.js     | 6 ++----
 .../ProgressBarAndroid/ProgressBarAndroid.ios.js         | 6 ++----
 .../ProgressViewIOS/ProgressViewIOS.android.js           | 6 ++----
 .../Components/ProgressViewIOS/ProgressViewIOS.ios.js    | 6 ++----
 Libraries/Components/RefreshControl/RefreshControl.js    | 6 ++----
 .../RefreshControl/__mocks__/RefreshControlMock.js       | 6 ++----
 .../Components/SafeAreaView/SafeAreaView.android.js      | 6 ++----
 Libraries/Components/SafeAreaView/SafeAreaView.ios.js    | 6 ++----
 Libraries/Components/ScrollResponder.js                  | 6 ++----
 Libraries/Components/ScrollView/ScrollView.js            | 6 ++----
 .../Components/ScrollView/ScrollViewStickyHeader.js      | 6 ++----
 .../Components/ScrollView/__mocks__/ScrollViewMock.js    | 6 ++----
 .../Components/ScrollView/processDecelerationRate.js     | 6 ++----
 .../SegmentedControlIOS/SegmentedControlIOS.android.js   | 6 ++----
 .../SegmentedControlIOS/SegmentedControlIOS.ios.js       | 6 ++----
 Libraries/Components/Slider/Slider.js                    | 6 ++----
 Libraries/Components/StaticContainer.react.js            | 6 ++----
 Libraries/Components/StaticRenderer.js                   | 6 ++----
 Libraries/Components/StatusBar/StatusBar.js              | 6 ++----
 Libraries/Components/StatusBar/StatusBarIOS.android.js   | 6 ++----
 Libraries/Components/StatusBar/StatusBarIOS.ios.js       | 6 ++----
 Libraries/Components/Subscribable.js                     | 6 ++----
 Libraries/Components/Switch/Switch.js                    | 6 ++----
 Libraries/Components/TabBarIOS/TabBarIOS.android.js      | 6 ++----
 Libraries/Components/TabBarIOS/TabBarIOS.ios.js          | 6 ++----
 Libraries/Components/TabBarIOS/TabBarItemIOS.android.js  | 6 ++----
 Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js      | 6 ++----
 Libraries/Components/TextInput/TextInput.js              | 6 ++----
 Libraries/Components/TextInput/TextInputState.js         | 6 ++----
 .../TimePickerAndroid/TimePickerAndroid.android.js       | 6 ++----
 .../TimePickerAndroid/TimePickerAndroid.ios.js           | 6 ++----
 .../Components/ToastAndroid/ToastAndroid.android.js      | 6 ++----
 Libraries/Components/ToastAndroid/ToastAndroid.ios.js    | 6 ++----
 .../Components/ToolbarAndroid/ToolbarAndroid.android.js  | 6 ++----
 .../Components/ToolbarAndroid/ToolbarAndroid.ios.js      | 6 ++----
 Libraries/Components/Touchable/BoundingDimensions.js     | 6 ++----
 Libraries/Components/Touchable/Position.js               | 6 ++----
 Libraries/Components/Touchable/Touchable.js              | 6 ++----
 Libraries/Components/Touchable/TouchableBounce.js        | 6 ++----
 Libraries/Components/Touchable/TouchableHighlight.js     | 6 ++----
 .../Touchable/TouchableNativeFeedback.android.js         | 6 ++----
 .../Components/Touchable/TouchableNativeFeedback.ios.js  | 6 ++----
 Libraries/Components/Touchable/TouchableOpacity.js       | 6 ++----
 .../Components/Touchable/TouchableWithoutFeedback.js     | 6 ++----
 .../Touchable/__mocks__/ensureComponentIsNative.js       | 6 ++----
 .../Touchable/__tests__/TouchableHighlight-test.js       | 6 ++----
 .../Components/Touchable/ensureComponentIsNative.js      | 6 ++----
 .../Components/Touchable/ensurePositiveDelayProps.js     | 6 ++----
 .../Components/UnimplementedViews/UnimplementedView.js   | 6 ++----
 .../Components/View/PlatformViewPropTypes.android.js     | 6 ++----
 Libraries/Components/View/PlatformViewPropTypes.ios.js   | 6 ++----
 Libraries/Components/View/ReactNativeStyleAttributes.js  | 6 ++----
 Libraries/Components/View/ReactNativeViewAttributes.js   | 6 ++----
 Libraries/Components/View/ShadowPropTypesIOS.js          | 6 ++----
 Libraries/Components/View/View.js                        | 6 ++----
 Libraries/Components/View/View.js.flow                   | 6 ++----
 Libraries/Components/View/ViewAccessibility.js           | 6 ++----
 Libraries/Components/View/ViewContext.js                 | 6 ++----
 Libraries/Components/View/ViewPropTypes.js               | 6 ++----
 Libraries/Components/View/ViewStylePropTypes.js          | 6 ++----
 .../Components/ViewPager/ViewPagerAndroid.android.js     | 6 ++----
 Libraries/Components/ViewPager/ViewPagerAndroid.ios.js   | 6 ++----
 Libraries/Components/WebView/WebView.android.js          | 6 ++----
 Libraries/Components/WebView/WebView.ios.js              | 6 ++----
 .../Core/Devtools/__tests__/parseErrorStack-test.js      | 6 ++----
 Libraries/Core/Devtools/getDevServer.js                  | 6 ++----
 Libraries/Core/Devtools/openFileInEditor.js              | 6 ++----
 Libraries/Core/Devtools/parseErrorStack.js               | 6 ++----
 Libraries/Core/Devtools/setupDevtools.js                 | 6 ++----
 Libraries/Core/Devtools/symbolicateStackTrace.js         | 6 ++----
 Libraries/Core/ExceptionsManager.js                      | 6 ++----
 Libraries/Core/InitializeCore.js                         | 6 ++----
 Libraries/Core/ReactNativeVersion.js                     | 6 ++----
 Libraries/Core/ReactNativeVersionCheck.js                | 6 ++----
 Libraries/Core/Timers/JSTimers.js                        | 6 ++----
 Libraries/Core/__mocks__/ErrorUtils.js                   | 6 ++----
 Libraries/Core/__tests__/ReactNativeVersionCheck-test.js | 6 ++----
 Libraries/EventEmitter/MissingNativeEventEmitterShim.js  | 6 ++----
 Libraries/EventEmitter/NativeEventEmitter.js             | 6 ++----
 Libraries/EventEmitter/RCTDeviceEventEmitter.js          | 6 ++----
 Libraries/EventEmitter/RCTEventEmitter.js                | 6 ++----
 Libraries/EventEmitter/RCTNativeAppEventEmitter.js       | 6 ++----
 Libraries/EventEmitter/__mocks__/NativeEventEmitter.js   | 6 ++----
 Libraries/Experimental/Incremental.js                    | 6 ++----
 Libraries/Experimental/IncrementalExample.js             | 6 ++----
 Libraries/Experimental/IncrementalGroup.js               | 6 ++----
 Libraries/Experimental/IncrementalPresenter.js           | 6 ++----
 Libraries/Experimental/SwipeableRow/SwipeableFlatList.js | 6 ++----
 Libraries/Experimental/SwipeableRow/SwipeableListView.js | 6 ++----
 .../SwipeableRow/SwipeableListViewDataSource.js          | 6 ++----
 .../SwipeableRow/SwipeableQuickActionButton.js           | 6 ++----
 .../Experimental/SwipeableRow/SwipeableQuickActions.js   | 6 ++----
 Libraries/Experimental/SwipeableRow/SwipeableRow.js      | 6 ++----
 Libraries/Experimental/WindowedListView.js               | 6 ++----
 Libraries/Geolocation/Geolocation.js                     | 6 ++----
 Libraries/Geolocation/RCTLocationObserver.h              | 6 ++----
 Libraries/Geolocation/RCTLocationObserver.m              | 6 ++----
 Libraries/Image/AssetRegistry.js                         | 6 ++----
 Libraries/Image/AssetSourceResolver.js                   | 6 ++----
 Libraries/Image/Image.android.js                         | 6 ++----
 Libraries/Image/Image.ios.js                             | 6 ++----
 Libraries/Image/ImageBackground.js                       | 6 ++----
 Libraries/Image/ImageEditor.js                           | 6 ++----
 Libraries/Image/ImageResizeMode.js                       | 6 ++----
 Libraries/Image/ImageSource.js                           | 6 ++----
 Libraries/Image/ImageSourcePropType.js                   | 6 ++----
 Libraries/Image/ImageStore.js                            | 6 ++----
 Libraries/Image/ImageStylePropTypes.js                   | 6 ++----
 Libraries/Image/RCTGIFImageDecoder.h                     | 6 ++----
 Libraries/Image/RCTGIFImageDecoder.m                     | 6 ++----
 Libraries/Image/RCTImageBlurUtils.h                      | 8 +++-----
 Libraries/Image/RCTImageBlurUtils.m                      | 6 ++----
 Libraries/Image/RCTImageCache.h                          | 6 ++----
 Libraries/Image/RCTImageCache.m                          | 6 ++----
 Libraries/Image/RCTImageEditingManager.h                 | 6 ++----
 Libraries/Image/RCTImageEditingManager.m                 | 6 ++----
 Libraries/Image/RCTImageLoader.h                         | 6 ++----
 Libraries/Image/RCTImageLoader.m                         | 6 ++----
 Libraries/Image/RCTImageShadowView.h                     | 6 ++----
 Libraries/Image/RCTImageShadowView.m                     | 6 ++----
 Libraries/Image/RCTImageStoreManager.m                   | 6 ++----
 Libraries/Image/RCTImageUtils.h                          | 8 +++-----
 Libraries/Image/RCTImageUtils.m                          | 6 ++----
 Libraries/Image/RCTImageView.h                           | 6 ++----
 Libraries/Image/RCTImageView.m                           | 6 ++----
 Libraries/Image/RCTImageViewManager.h                    | 6 ++----
 Libraries/Image/RCTImageViewManager.m                    | 6 ++----
 Libraries/Image/RCTLocalAssetImageLoader.h               | 6 ++----
 Libraries/Image/RCTLocalAssetImageLoader.m               | 6 ++----
 Libraries/Image/RCTResizeMode.h                          | 6 ++----
 Libraries/Image/RCTResizeMode.m                          | 6 ++----
 Libraries/Image/RelativeImageStub.js                     | 6 ++----
 Libraries/Image/__tests__/assetRelativePathInSnapshot.js | 6 ++----
 Libraries/Image/__tests__/resolveAssetSource-test.js     | 6 ++----
 Libraries/Image/nativeImageSource.js                     | 6 ++----
 Libraries/Image/resolveAssetSource.js                    | 6 ++----
 Libraries/Inspector/BorderBox.js                         | 6 ++----
 Libraries/Inspector/BoxInspector.js                      | 6 ++----
 Libraries/Inspector/ElementBox.js                        | 6 ++----
 Libraries/Inspector/ElementProperties.js                 | 6 ++----
 Libraries/Inspector/Inspector.js                         | 6 ++----
 Libraries/Inspector/InspectorOverlay.js                  | 6 ++----
 Libraries/Inspector/InspectorPanel.js                    | 6 ++----
 Libraries/Inspector/NetworkOverlay.js                    | 6 ++----
 Libraries/Inspector/PerformanceOverlay.js                | 6 ++----
 Libraries/Inspector/StyleInspector.js                    | 6 ++----
 Libraries/Inspector/resolveBoxStyle.js                   | 6 ++----
 Libraries/Interaction/Batchinator.js                     | 6 ++----
 Libraries/Interaction/BridgeSpyStallHandler.js           | 6 ++----
 Libraries/Interaction/FrameRateLogger.js                 | 6 ++----
 Libraries/Interaction/InteractionManager.js              | 6 ++----
 Libraries/Interaction/InteractionMixin.js                | 6 ++----
 Libraries/Interaction/InteractionStallDebugger.js        | 6 ++----
 Libraries/Interaction/JSEventLoopWatchdog.js             | 6 ++----
 Libraries/Interaction/PanResponder.js                    | 6 ++----
 Libraries/Interaction/ReactPerfStallHandler.js           | 6 ++----
 Libraries/Interaction/TaskQueue.js                       | 6 ++----
 Libraries/Interaction/__tests__/Batchinator-test.js      | 6 ++----
 .../Interaction/__tests__/InteractionManager-test.js     | 6 ++----
 Libraries/Interaction/__tests__/InteractionMixin-test.js | 6 ++----
 Libraries/Interaction/__tests__/TaskQueue-test.js        | 6 ++----
 Libraries/JSInspector/InspectorAgent.js                  | 6 ++----
 Libraries/JSInspector/JSInspector.js                     | 6 ++----
 Libraries/JSInspector/NetworkAgent.js                    | 6 ++----
 Libraries/LayoutAnimation/LayoutAnimation.js             | 6 ++----
 Libraries/Linking/Linking.js                             | 6 ++----
 Libraries/LinkingIOS/RCTLinkingManager.h                 | 6 ++----
 Libraries/LinkingIOS/RCTLinkingManager.m                 | 6 ++----
 Libraries/Lists/FillRateHelper.js                        | 6 ++----
 Libraries/Lists/FlatList.js                              | 6 ++----
 Libraries/Lists/ListView/ListView.js                     | 6 ++----
 Libraries/Lists/ListView/ListViewDataSource.js           | 6 ++----
 Libraries/Lists/ListView/__mocks__/ListViewMock.js       | 6 ++----
 Libraries/Lists/MetroListView.js                         | 6 ++----
 Libraries/Lists/SectionList.js                           | 6 ++----
 Libraries/Lists/ViewabilityHelper.js                     | 6 ++----
 Libraries/Lists/VirtualizeUtils.js                       | 6 ++----
 Libraries/Lists/VirtualizedList.js                       | 6 ++----
 Libraries/Lists/VirtualizedSectionList.js                | 6 ++----
 Libraries/Lists/__flowtests__/FlatList-flowtest.js       | 6 ++----
 Libraries/Lists/__flowtests__/SectionList-flowtest.js    | 6 ++----
 Libraries/Lists/__tests__/FillRateHelper-test.js         | 6 ++----
 Libraries/Lists/__tests__/FlatList-test.js               | 6 ++----
 Libraries/Lists/__tests__/SectionList-test.js            | 6 ++----
 Libraries/Lists/__tests__/ViewabilityHelper-test.js      | 6 ++----
 Libraries/Lists/__tests__/VirtualizeUtils-test.js        | 6 ++----
 Libraries/Lists/__tests__/VirtualizedList-test.js        | 6 ++----
 Libraries/Modal/Modal.js                                 | 6 ++----
 Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h   | 6 ++----
 Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h    | 6 ++----
 Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m    | 6 ++----
 Libraries/NativeAnimation/Drivers/RCTEventAnimation.h    | 6 ++----
 Libraries/NativeAnimation/Drivers/RCTEventAnimation.m    | 6 ++----
 Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h    | 6 ++----
 Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m    | 6 ++----
 Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h   | 6 ++----
 Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m   | 6 ++----
 .../NativeAnimation/Nodes/RCTAdditionAnimatedNode.h      | 6 ++----
 .../NativeAnimation/Nodes/RCTAdditionAnimatedNode.m      | 6 ++----
 Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h        | 6 ++----
 Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m        | 6 ++----
 .../NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h     | 6 ++----
 .../NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m     | 6 ++----
 .../NativeAnimation/Nodes/RCTDivisionAnimatedNode.h      | 6 ++----
 .../NativeAnimation/Nodes/RCTDivisionAnimatedNode.m      | 6 ++----
 .../NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h | 6 ++----
 .../NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m | 6 ++----
 Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h  | 6 ++----
 Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m  | 6 ++----
 .../Nodes/RCTMultiplicationAnimatedNode.h                | 6 ++----
 .../Nodes/RCTMultiplicationAnimatedNode.m                | 6 ++----
 Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h   | 6 ++----
 Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m   | 6 ++----
 Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h   | 6 ++----
 Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m   | 6 ++----
 .../NativeAnimation/Nodes/RCTTransformAnimatedNode.h     | 6 ++----
 .../NativeAnimation/Nodes/RCTTransformAnimatedNode.m     | 6 ++----
 Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h   | 6 ++----
 Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m   | 6 ++----
 Libraries/NativeAnimation/RCTAnimationUtils.h            | 6 ++----
 Libraries/NativeAnimation/RCTAnimationUtils.m            | 6 ++----
 Libraries/NativeAnimation/RCTNativeAnimatedModule.h      | 6 ++----
 Libraries/NativeAnimation/RCTNativeAnimatedModule.m      | 6 ++----
 .../NativeAnimation/RCTNativeAnimatedNodesManager.h      | 6 ++----
 .../NativeAnimation/RCTNativeAnimatedNodesManager.m      | 6 ++----
 Libraries/Network/FormData.js                            | 6 ++----
 Libraries/Network/NetInfo.js                             | 6 ++----
 Libraries/Network/RCTDataRequestHandler.h                | 6 ++----
 Libraries/Network/RCTDataRequestHandler.m                | 6 ++----
 Libraries/Network/RCTFileRequestHandler.h                | 6 ++----
 Libraries/Network/RCTFileRequestHandler.m                | 6 ++----
 Libraries/Network/RCTHTTPRequestHandler.h                | 6 ++----
 Libraries/Network/RCTHTTPRequestHandler.mm               | 6 ++----
 Libraries/Network/RCTNetInfo.h                           | 6 ++----
 Libraries/Network/RCTNetInfo.m                           | 6 ++----
 Libraries/Network/RCTNetworkTask.h                       | 6 ++----
 Libraries/Network/RCTNetworkTask.m                       | 6 ++----
 Libraries/Network/RCTNetworking.android.js               | 6 ++----
 Libraries/Network/RCTNetworking.h                        | 6 ++----
 Libraries/Network/RCTNetworking.ios.js                   | 6 ++----
 Libraries/Network/RCTNetworking.mm                       | 6 ++----
 Libraries/Network/XHRInterceptor.js                      | 6 ++----
 Libraries/Network/XMLHttpRequest.js                      | 6 ++----
 Libraries/Network/__tests__/FormData-test.js             | 6 ++----
 Libraries/Network/__tests__/XMLHttpRequest-test.js       | 6 ++----
 Libraries/Network/convertRequestBody.js                  | 6 ++----
 Libraries/Network/fetch.js                               | 6 ++----
 Libraries/Performance/QuickPerformanceLogger.js          | 6 ++----
 Libraries/Performance/SamplingProfiler.js                | 6 ++----
 Libraries/Performance/Systrace.js                        | 6 ++----
 Libraries/PermissionsAndroid/PermissionsAndroid.js       | 6 ++----
 Libraries/Promise.js                                     | 6 ++----
 Libraries/PushNotificationIOS/PushNotificationIOS.js     | 6 ++----
 .../PushNotificationIOS/RCTPushNotificationManager.h     | 6 ++----
 .../PushNotificationIOS/RCTPushNotificationManager.m     | 6 ++----
 .../RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h      | 8 +++-----
 .../RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m      | 8 +++-----
 .../FBSnapshotTestCase/FBSnapshotTestController.h        | 8 +++-----
 .../FBSnapshotTestCase/FBSnapshotTestController.m        | 8 +++-----
 Libraries/RCTTest/RCTSnapshotManager.h                   | 6 ++----
 Libraries/RCTTest/RCTSnapshotManager.m                   | 6 ++----
 Libraries/RCTTest/RCTTestModule.h                        | 6 ++----
 Libraries/RCTTest/RCTTestModule.m                        | 6 ++----
 Libraries/RCTTest/RCTTestRunner.h                        | 6 ++----
 Libraries/RCTTest/RCTTestRunner.m                        | 6 ++----
 Libraries/RCTTest/SnapshotViewIOS.android.js             | 6 ++----
 Libraries/RCTTest/SnapshotViewIOS.ios.js                 | 6 ++----
 Libraries/ReactNative/AppContainer.js                    | 6 ++----
 Libraries/ReactNative/AppRegistry.js                     | 6 ++----
 Libraries/ReactNative/FabricUIManager.js                 | 6 ++----
 Libraries/ReactNative/I18nManager.js                     | 6 ++----
 Libraries/ReactNative/UIManager.js                       | 6 ++----
 Libraries/ReactNative/UIManagerStatTracker.js            | 6 ++----
 Libraries/ReactNative/YellowBox.js                       | 6 ++----
 Libraries/ReactNative/queryLayoutByID.js                 | 6 ++----
 Libraries/ReactNative/renderApplication.js               | 6 ++----
 Libraries/ReactNative/renderFabricSurface.js             | 6 ++----
 Libraries/ReactNative/requireNativeComponent.js          | 6 ++----
 Libraries/ReactNative/verifyPropTypes.js                 | 6 ++----
 Libraries/Settings/RCTSettingsManager.h                  | 6 ++----
 Libraries/Settings/RCTSettingsManager.m                  | 6 ++----
 Libraries/Settings/Settings.android.js                   | 6 ++----
 Libraries/Settings/Settings.ios.js                       | 6 ++----
 Libraries/Share/Share.js                                 | 6 ++----
 Libraries/Storage/AsyncStorage.js                        | 6 ++----
 Libraries/StyleSheet/ColorPropType.js                    | 6 ++----
 Libraries/StyleSheet/EdgeInsetsPropType.js               | 6 ++----
 Libraries/StyleSheet/LayoutPropTypes.js                  | 6 ++----
 Libraries/StyleSheet/PointPropType.js                    | 6 ++----
 Libraries/StyleSheet/StyleSheet.js                       | 6 ++----
 Libraries/StyleSheet/StyleSheetPropType.js               | 6 ++----
 Libraries/StyleSheet/StyleSheetTypes.js                  | 6 ++----
 Libraries/StyleSheet/StyleSheetValidation.js             | 6 ++----
 Libraries/StyleSheet/TransformPropTypes.js               | 6 ++----
 Libraries/StyleSheet/__tests__/flattenStyle-test.js      | 6 ++----
 Libraries/StyleSheet/__tests__/normalizeColor-test.js    | 6 ++----
 Libraries/StyleSheet/__tests__/processColor-test.js      | 6 ++----
 Libraries/StyleSheet/__tests__/processTransform-test.js  | 6 ++----
 .../StyleSheet/__tests__/setNormalizedColorAlpha-test.js | 6 ++----
 Libraries/StyleSheet/flattenStyle.js                     | 6 ++----
 Libraries/StyleSheet/normalizeColor.js                   | 6 ++----
 Libraries/StyleSheet/processColor.js                     | 6 ++----
 Libraries/StyleSheet/processTransform.js                 | 6 ++----
 Libraries/StyleSheet/setNormalizedColorAlpha.js          | 6 ++----
 .../SurfaceBackedComponent/RCTSurfaceBackedComponent.h   | 6 ++----
 .../SurfaceBackedComponent/RCTSurfaceBackedComponent.mm  | 6 ++----
 .../RCTSurfaceBackedComponentState.h                     | 6 ++----
 .../RCTSurfaceBackedComponentState.mm                    | 6 ++----
 .../RCTSurfaceHostingComponent+Internal.h                | 6 ++----
 .../SurfaceHostingComponent/RCTSurfaceHostingComponent.h | 6 ++----
 .../RCTSurfaceHostingComponent.mm                        | 6 ++----
 .../RCTSurfaceHostingComponentController.h               | 6 ++----
 .../RCTSurfaceHostingComponentController.mm              | 6 ++----
 .../RCTSurfaceHostingComponentOptions.h                  | 6 ++----
 .../RCTSurfaceHostingComponentState.h                    | 6 ++----
 .../RCTSurfaceHostingComponentState.mm                   | 6 ++----
 Libraries/Text/BaseText/RCTBaseTextShadowView.h          | 6 ++----
 Libraries/Text/BaseText/RCTBaseTextShadowView.m          | 6 ++----
 Libraries/Text/BaseText/RCTBaseTextViewManager.h         | 6 ++----
 Libraries/Text/BaseText/RCTBaseTextViewManager.m         | 6 ++----
 Libraries/Text/RCTConvert+Text.h                         | 6 ++----
 Libraries/Text/RCTConvert+Text.m                         | 6 ++----
 Libraries/Text/RCTTextAttributes.h                       | 6 ++----
 Libraries/Text/RCTTextAttributes.m                       | 6 ++----
 Libraries/Text/RawText/RCTRawTextShadowView.h            | 6 ++----
 Libraries/Text/RawText/RCTRawTextShadowView.m            | 6 ++----
 Libraries/Text/RawText/RCTRawTextViewManager.h           | 6 ++----
 Libraries/Text/RawText/RCTRawTextViewManager.m           | 6 ++----
 Libraries/Text/Text.js                                   | 6 ++----
 Libraries/Text/Text/NSTextStorage+FontScaling.h          | 6 ++----
 Libraries/Text/Text/NSTextStorage+FontScaling.m          | 6 ++----
 Libraries/Text/Text/RCTTextShadowView.h                  | 6 ++----
 Libraries/Text/Text/RCTTextShadowView.m                  | 6 ++----
 Libraries/Text/Text/RCTTextView.h                        | 6 ++----
 Libraries/Text/Text/RCTTextView.m                        | 6 ++----
 Libraries/Text/Text/RCTTextViewManager.h                 | 6 ++----
 Libraries/Text/Text/RCTTextViewManager.m                 | 6 ++----
 .../Text/TextInput/Multiline/RCTMultilineTextInputView.h | 6 ++----
 .../Text/TextInput/Multiline/RCTMultilineTextInputView.m | 6 ++----
 .../Multiline/RCTMultilineTextInputViewManager.h         | 6 ++----
 .../Multiline/RCTMultilineTextInputViewManager.m         | 6 ++----
 Libraries/Text/TextInput/Multiline/RCTUITextView.h       | 6 ++----
 Libraries/Text/TextInput/Multiline/RCTUITextView.m       | 6 ++----
 Libraries/Text/TextInput/RCTBackedTextInputDelegate.h    | 6 ++----
 .../Text/TextInput/RCTBackedTextInputDelegateAdapter.h   | 6 ++----
 .../Text/TextInput/RCTBackedTextInputDelegateAdapter.m   | 6 ++----
 .../Text/TextInput/RCTBackedTextInputViewProtocol.h      | 6 ++----
 Libraries/Text/TextInput/RCTBaseTextInputShadowView.h    | 6 ++----
 Libraries/Text/TextInput/RCTBaseTextInputShadowView.m    | 6 ++----
 Libraries/Text/TextInput/RCTBaseTextInputView.h          | 6 ++----
 Libraries/Text/TextInput/RCTBaseTextInputView.m          | 6 ++----
 Libraries/Text/TextInput/RCTBaseTextInputViewManager.h   | 6 ++----
 Libraries/Text/TextInput/RCTBaseTextInputViewManager.m   | 6 ++----
 Libraries/Text/TextInput/RCTTextSelection.h              | 6 ++----
 Libraries/Text/TextInput/RCTTextSelection.m              | 6 ++----
 .../TextInput/Singleline/RCTSinglelineTextInputView.h    | 6 ++----
 .../TextInput/Singleline/RCTSinglelineTextInputView.m    | 6 ++----
 .../Singleline/RCTSinglelineTextInputViewManager.h       | 6 ++----
 .../Singleline/RCTSinglelineTextInputViewManager.m       | 6 ++----
 Libraries/Text/TextInput/Singleline/RCTUITextField.h     | 6 ++----
 Libraries/Text/TextInput/Singleline/RCTUITextField.m     | 6 ++----
 Libraries/Text/TextProps.js                              | 6 ++----
 Libraries/Text/TextStylePropTypes.js                     | 6 ++----
 Libraries/Text/TextUpdateTest.js                         | 6 ++----
 Libraries/Text/VirtualText/RCTVirtualTextShadowView.h    | 6 ++----
 Libraries/Text/VirtualText/RCTVirtualTextShadowView.m    | 6 ++----
 Libraries/Text/VirtualText/RCTVirtualTextViewManager.h   | 6 ++----
 Libraries/Text/VirtualText/RCTVirtualTextViewManager.m   | 6 ++----
 Libraries/Types/CoreEventTypes.js                        | 6 ++----
 Libraries/UTFSequence.js                                 | 6 ++----
 Libraries/Utilities/BackAndroid.js                       | 6 ++----
 Libraries/Utilities/BackHandler.android.js               | 6 ++----
 Libraries/Utilities/BackHandler.ios.js                   | 6 ++----
 Libraries/Utilities/DebugEnvironment.js                  | 6 ++----
 Libraries/Utilities/DeviceInfo.js                        | 6 ++----
 Libraries/Utilities/Dimensions.js                        | 6 ++----
 Libraries/Utilities/HMRClient.js                         | 6 ++----
 Libraries/Utilities/HMRLoadingView.android.js            | 6 ++----
 Libraries/Utilities/HMRLoadingView.ios.js                | 6 ++----
 Libraries/Utilities/HeapCapture.js                       | 6 ++----
 Libraries/Utilities/JSDevSupportModule.js                | 6 ++----
 Libraries/Utilities/MatrixMath.js                        | 6 ++----
 Libraries/Utilities/PerformanceLogger.js                 | 6 ++----
 Libraries/Utilities/PixelRatio.js                        | 6 ++----
 Libraries/Utilities/Platform.android.js                  | 6 ++----
 Libraries/Utilities/Platform.ios.js                      | 6 ++----
 Libraries/Utilities/PlatformOS.android.js                | 6 ++----
 Libraries/Utilities/PlatformOS.ios.js                    | 6 ++----
 Libraries/Utilities/PolyfillFunctions.js                 | 6 ++----
 Libraries/Utilities/RCTLog.js                            | 6 ++----
 Libraries/Utilities/SceneTracker.js                      | 6 ++----
 Libraries/Utilities/__mocks__/BackHandler.js             | 6 ++----
 Libraries/Utilities/__tests__/MatrixMath-test.js         | 6 ++----
 Libraries/Utilities/__tests__/Platform-test.js           | 6 ++----
 Libraries/Utilities/__tests__/SceneTracker-test.js       | 6 ++----
 .../Utilities/__tests__/buildStyleInterpolator-test.js   | 6 ++----
 .../__tests__/deepFreezeAndThrowOnMutationInDev-test.js  | 6 ++----
 Libraries/Utilities/__tests__/groupByEveryN-test.js      | 6 ++----
 Libraries/Utilities/__tests__/mapWithSeparator-test.js   | 6 ++----
 Libraries/Utilities/__tests__/truncate-test.js           | 6 ++----
 Libraries/Utilities/binaryToBase64.js                    | 6 ++----
 Libraries/Utilities/buildStyleInterpolator.js            | 6 ++----
 Libraries/Utilities/clamp.js                             | 6 ++----
 Libraries/Utilities/createStrictShapeTypeChecker.js      | 6 ++----
 Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js | 6 ++----
 Libraries/Utilities/defineLazyObjectProperty.js          | 6 ++----
 Libraries/Utilities/deprecatedPropType.js                | 6 ++----
 Libraries/Utilities/differ/__tests__/deepDiffer-test.js  | 6 ++----
 Libraries/Utilities/differ/deepDiffer.js                 | 6 ++----
 Libraries/Utilities/differ/insetsDiffer.js               | 6 ++----
 Libraries/Utilities/differ/matricesDiffer.js             | 6 ++----
 Libraries/Utilities/differ/pointsDiffer.js               | 6 ++----
 Libraries/Utilities/differ/sizesDiffer.js                | 6 ++----
 Libraries/Utilities/dismissKeyboard.js                   | 6 ++----
 Libraries/Utilities/groupByEveryN.js                     | 6 ++----
 Libraries/Utilities/infoLog.js                           | 6 ++----
 Libraries/Utilities/logError.js                          | 6 ++----
 Libraries/Utilities/mapWithSeparator.js                  | 6 ++----
 Libraries/Utilities/mergeFast.js                         | 6 ++----
 Libraries/Utilities/mergeIntoFast.js                     | 6 ++----
 Libraries/Utilities/stringifySafe.js                     | 6 ++----
 Libraries/Utilities/truncate.js                          | 6 ++----
 Libraries/Vibration/RCTVibration.h                       | 6 ++----
 Libraries/Vibration/RCTVibration.m                       | 6 ++----
 Libraries/Vibration/Vibration.js                         | 6 ++----
 Libraries/Vibration/VibrationIOS.android.js              | 6 ++----
 Libraries/Vibration/VibrationIOS.ios.js                  | 6 ++----
 Libraries/WebSocket/RCTReconnectingWebSocket.h           | 6 ++----
 Libraries/WebSocket/RCTReconnectingWebSocket.m           | 6 ++----
 Libraries/WebSocket/RCTWebSocketExecutor.h               | 6 ++----
 Libraries/WebSocket/RCTWebSocketExecutor.m               | 6 ++----
 Libraries/WebSocket/RCTWebSocketModule.h                 | 6 ++----
 Libraries/WebSocket/RCTWebSocketModule.m                 | 6 ++----
 Libraries/WebSocket/WebSocket.js                         | 6 ++----
 Libraries/WebSocket/WebSocketEvent.js                    | 6 ++----
 Libraries/WebSocket/WebSocketInterceptor.js              | 6 ++----
 Libraries/WebSocket/__tests__/WebSocket-test.js          | 6 ++----
 Libraries/polyfills/Array.es6.js                         | 6 ++----
 Libraries/polyfills/Array.prototype.es6.js               | 6 ++----
 Libraries/polyfills/Number.es6.js                        | 6 ++----
 Libraries/polyfills/Object.es6.js                        | 6 ++----
 Libraries/polyfills/Object.es7.js                        | 6 ++----
 Libraries/polyfills/String.prototype.es6.js              | 6 ++----
 Libraries/polyfills/__tests__/Object.es7-test.js         | 6 ++----
 Libraries/polyfills/babelHelpers.js                      | 6 ++----
 Libraries/polyfills/console.js                           | 6 ++----
 Libraries/polyfills/error-guard.js                       | 6 ++----
 Libraries/promiseRejectionIsError.js                     | 6 ++----
 Libraries/react-native/React.js                          | 6 ++----
 Libraries/react-native/react-native-implementation.js    | 6 ++----
 Libraries/react-native/react-native-interface.js         | 6 ++----
 Libraries/vendor/core/ErrorUtils.js                      | 6 ++----
 Libraries/vendor/core/Map.js                             | 6 ++----
 Libraries/vendor/core/Set.js                             | 6 ++----
 Libraries/vendor/core/_shouldPolyfillES6Collection.js    | 6 ++----
 Libraries/vendor/core/getObjectValues.js                 | 6 ++----
 Libraries/vendor/core/guid.js                            | 6 ++----
 Libraries/vendor/core/isEmpty.js                         | 6 ++----
 Libraries/vendor/core/mergeHelpers.js                    | 6 ++----
 Libraries/vendor/core/toIterator.js                      | 6 ++----
 .../vendor/document/selection/DocumentSelectionState.js  | 6 ++----
 Libraries/vendor/emitter/EmitterSubscription.js          | 6 ++----
 Libraries/vendor/emitter/EventEmitter.js                 | 6 ++----
 Libraries/vendor/emitter/EventEmitterWithHolding.js      | 6 ++----
 Libraries/vendor/emitter/EventHolder.js                  | 6 ++----
 Libraries/vendor/emitter/EventSubscription.js            | 6 ++----
 Libraries/vendor/emitter/EventSubscriptionVendor.js      | 6 ++----
 Libraries/vendor/emitter/EventValidator.js               | 6 ++----
 Libraries/vendor/emitter/mixInEventEmitter.js            | 6 ++----
 RNTester/RNTester/AppDelegate.h                          | 6 ++----
 RNTester/RNTester/AppDelegate.m                          | 6 ++----
 .../NativeExampleViews/FlexibleSizeExampleView.h         | 6 ++----
 .../NativeExampleViews/FlexibleSizeExampleView.m         | 6 ++----
 .../NativeExampleViews/UpdatePropertiesExampleView.h     | 6 ++----
 .../NativeExampleViews/UpdatePropertiesExampleView.m     | 6 ++----
 RNTester/RNTester/main.m                                 | 6 ++----
 RNTester/RNTesterIntegrationTests/RCTLoggingTests.m      | 6 ++----
 .../RCTRootViewIntegrationTests.m                        | 6 ++----
 .../RNTesterIntegrationTests/RCTUIManagerScenarioTests.m | 6 ++----
 .../RNTesterIntegrationTests/RNTesterIntegrationTests.m  | 6 ++----
 .../RNTesterIntegrationTests/RNTesterSnapshotTests.m     | 6 ++----
 RNTester/RNTesterIntegrationTests/RNTesterTestModule.m   | 6 ++----
 RNTester/RNTesterUnitTests/RCTAllocationTests.m          | 6 ++----
 RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m      | 6 ++----
 RNTester/RNTesterUnitTests/RCTBlobManagerTests.m         | 6 ++----
 RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m   | 6 ++----
 RNTester/RNTesterUnitTests/RCTComponentPropsTests.m      | 6 ++----
 RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m       | 6 ++----
 RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m     | 6 ++----
 RNTester/RNTesterUnitTests/RCTDevMenuTests.m             | 6 ++----
 RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m     | 6 ++----
 RNTester/RNTesterUnitTests/RCTFontTests.m                | 6 ++----
 RNTester/RNTesterUnitTests/RCTGzipTests.m                | 6 ++----
 RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h       | 6 ++----
 RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m       | 6 ++----
 RNTester/RNTesterUnitTests/RCTImageLoaderTests.m         | 6 ++----
 RNTester/RNTesterUnitTests/RCTImageUtilTests.m           | 6 ++----
 RNTester/RNTesterUnitTests/RCTJSONTests.m                | 6 ++----
 RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m      | 6 ++----
 .../RCTModuleInitNotificationRaceTests.m                 | 6 ++----
 RNTester/RNTesterUnitTests/RCTModuleInitTests.m          | 6 ++----
 RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm       | 6 ++----
 .../RNTesterUnitTests/RCTMultipartStreamReaderTests.m    | 6 ++----
 .../RCTNativeAnimatedNodesManagerTests.m                 | 6 ++----
 RNTester/RNTesterUnitTests/RCTShadowViewTests.m          | 6 ++----
 RNTester/RNTesterUnitTests/RCTUIManagerTests.m           | 6 ++----
 RNTester/RNTesterUnitTests/RCTURLUtilsTests.m            | 6 ++----
 RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m       | 6 ++----
 RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js    | 6 ++----
 .../java/com/facebook/react/uiapp/RNTesterActivity.java  | 6 ++----
 .../com/facebook/react/uiapp/RNTesterApplication.java    | 6 ++----
 RNTester/js/ARTExample.js                                | 6 ++----
 RNTester/js/AccessibilityAndroidExample.android.js       | 6 ++----
 RNTester/js/AccessibilityIOSExample.js                   | 6 ++----
 RNTester/js/ActionSheetIOSExample.js                     | 6 ++----
 RNTester/js/ActivityIndicatorExample.js                  | 6 ++----
 RNTester/js/AlertExample.js                              | 6 ++----
 RNTester/js/AlertIOSExample.js                           | 6 ++----
 RNTester/js/AnimatedExample.js                           | 6 ++----
 RNTester/js/AnimatedGratuitousApp/AnExApp.js             | 6 ++----
 RNTester/js/AnimatedGratuitousApp/AnExBobble.js          | 6 ++----
 RNTester/js/AnimatedGratuitousApp/AnExChained.js         | 6 ++----
 RNTester/js/AnimatedGratuitousApp/AnExScroll.js          | 6 ++----
 RNTester/js/AnimatedGratuitousApp/AnExSet.js             | 6 ++----
 RNTester/js/AnimatedGratuitousApp/AnExTilt.js            | 6 ++----
 RNTester/js/AppStateExample.js                           | 6 ++----
 RNTester/js/AssetScaledImageExample.js                   | 6 ++----
 RNTester/js/AsyncStorageExample.js                       | 6 ++----
 RNTester/js/BorderExample.js                             | 6 ++----
 RNTester/js/BoxShadowExample.js                          | 6 ++----
 RNTester/js/ButtonExample.js                             | 6 ++----
 RNTester/js/CameraRollExample.js                         | 6 ++----
 RNTester/js/CameraRollView.js                            | 6 ++----
 RNTester/js/CheckBoxExample.js                           | 6 ++----
 RNTester/js/ClipboardExample.js                          | 6 ++----
 RNTester/js/DatePickerAndroidExample.js                  | 6 ++----
 RNTester/js/DatePickerIOSExample.js                      | 6 ++----
 RNTester/js/DimensionsExample.js                         | 6 ++----
 RNTester/js/ExampleTypes.js                              | 6 ++----
 RNTester/js/FlatListExample.js                           | 6 ++----
 RNTester/js/GeolocationExample.js                        | 6 ++----
 RNTester/js/ImageCapInsetsExample.js                     | 6 ++----
 RNTester/js/ImageEditingExample.js                       | 6 ++----
 RNTester/js/ImageExample.js                              | 6 ++----
 RNTester/js/KeyboardAvoidingViewExample.js               | 6 ++----
 RNTester/js/LayoutAnimationExample.js                    | 6 ++----
 RNTester/js/LayoutEventsExample.js                       | 6 ++----
 RNTester/js/LayoutExample.js                             | 6 ++----
 RNTester/js/LinkingExample.js                            | 6 ++----
 RNTester/js/ListExampleShared.js                         | 6 ++----
 RNTester/js/ListViewExample.js                           | 6 ++----
 RNTester/js/ListViewGridLayoutExample.js                 | 6 ++----
 RNTester/js/ListViewPagingExample.js                     | 6 ++----
 RNTester/js/MaskedViewExample.js                         | 6 ++----
 RNTester/js/ModalExample.js                              | 6 ++----
 RNTester/js/MultiColumnExample.js                        | 6 ++----
 RNTester/js/NativeAnimationsExample.js                   | 6 ++----
 RNTester/js/NavigatorIOSBarStyleExample.js               | 6 ++----
 RNTester/js/NavigatorIOSColorsExample.js                 | 6 ++----
 RNTester/js/NavigatorIOSExample.js                       | 6 ++----
 RNTester/js/NetInfoExample.js                            | 6 ++----
 RNTester/js/OrientationChangeExample.js                  | 6 ++----
 RNTester/js/PanResponderExample.js                       | 6 ++----
 RNTester/js/PermissionsExampleAndroid.android.js         | 6 ++----
 RNTester/js/PickerExample.js                             | 6 ++----
 RNTester/js/PickerIOSExample.js                          | 6 ++----
 RNTester/js/PointerEventsExample.js                      | 6 ++----
 RNTester/js/ProgressBarAndroidExample.android.js         | 6 ++----
 RNTester/js/ProgressViewIOSExample.js                    | 6 ++----
 RNTester/js/PushNotificationIOSExample.js                | 6 ++----
 RNTester/js/RCTRootViewIOSExample.js                     | 6 ++----
 RNTester/js/RNTesterActions.js                           | 6 ++----
 RNTester/js/RNTesterApp.android.js                       | 6 ++----
 RNTester/js/RNTesterApp.ios.js                           | 6 ++----
 RNTester/js/RNTesterBlock.js                             | 6 ++----
 RNTester/js/RNTesterButton.js                            | 6 ++----
 RNTester/js/RNTesterExampleContainer.js                  | 6 ++----
 RNTester/js/RNTesterExampleList.js                       | 6 ++----
 RNTester/js/RNTesterList.android.js                      | 6 ++----
 RNTester/js/RNTesterList.ios.js                          | 6 ++----
 RNTester/js/RNTesterNavigationReducer.js                 | 6 ++----
 RNTester/js/RNTesterPage.js                              | 6 ++----
 RNTester/js/RNTesterSettingSwitchRow.js                  | 6 ++----
 RNTester/js/RNTesterStatePersister.js                    | 6 ++----
 RNTester/js/RNTesterTitle.js                             | 6 ++----
 RNTester/js/RTLExample.js                                | 6 ++----
 RNTester/js/RefreshControlExample.js                     | 6 ++----
 RNTester/js/RootViewSizeFlexibilityExampleApp.js         | 6 ++----
 RNTester/js/SafeAreaViewExample.js                       | 6 ++----
 RNTester/js/ScrollViewExample.js                         | 6 ++----
 RNTester/js/ScrollViewSimpleExample.js                   | 6 ++----
 RNTester/js/SectionListExample.js                        | 6 ++----
 RNTester/js/SegmentedControlIOSExample.js                | 6 ++----
 RNTester/js/SetPropertiesExampleApp.js                   | 6 ++----
 RNTester/js/ShareExample.js                              | 6 ++----
 RNTester/js/SliderExample.js                             | 6 ++----
 RNTester/js/SnapshotExample.js                           | 6 ++----
 RNTester/js/StatusBarExample.js                          | 6 ++----
 RNTester/js/SwipeableFlatListExample.js                  | 6 ++----
 RNTester/js/SwipeableListViewExample.js                  | 6 ++----
 RNTester/js/SwitchExample.js                             | 6 ++----
 RNTester/js/TVEventHandlerExample.js                     | 6 ++----
 RNTester/js/TabBarIOSBarStyleExample.js                  | 6 ++----
 RNTester/js/TabBarIOSExample.js                          | 6 ++----
 RNTester/js/TextExample.android.js                       | 6 ++----
 RNTester/js/TextExample.ios.js                           | 6 ++----
 RNTester/js/TextInputExample.android.js                  | 6 ++----
 RNTester/js/TextInputExample.ios.js                      | 6 ++----
 RNTester/js/TimePickerAndroidExample.js                  | 6 ++----
 RNTester/js/TimerExample.js                              | 6 ++----
 RNTester/js/ToastAndroidExample.android.js               | 6 ++----
 RNTester/js/ToolbarAndroidExample.android.js             | 6 ++----
 RNTester/js/TouchableExample.js                          | 6 ++----
 RNTester/js/TransformExample.js                          | 6 ++----
 RNTester/js/TransparentHitTestExample.js                 | 6 ++----
 RNTester/js/URIActionMap.js                              | 6 ++----
 RNTester/js/VibrationExample.js                          | 6 ++----
 RNTester/js/VibrationIOSExample.js                       | 6 ++----
 RNTester/js/ViewExample.js                               | 6 ++----
 RNTester/js/ViewPagerAndroidExample.android.js           | 6 ++----
 RNTester/js/WebSocketExample.js                          | 6 ++----
 RNTester/js/WebViewExample.js                            | 6 ++----
 RNTester/js/XHRExample.js                                | 6 ++----
 RNTester/js/XHRExampleBinaryUpload.js                    | 6 ++----
 RNTester/js/XHRExampleCookies.js                         | 6 ++----
 RNTester/js/XHRExampleDownload.js                        | 6 ++----
 RNTester/js/XHRExampleFetch.js                           | 6 ++----
 RNTester/js/XHRExampleFormData.js                        | 6 ++----
 RNTester/js/XHRExampleHeaders.js                         | 6 ++----
 RNTester/js/XHRExampleOnTimeOut.js                       | 6 ++----
 RNTester/js/createExamplePage.js                         | 6 ++----
 RNTester/js/http_test_server.js                          | 6 ++----
 RNTester/js/websocket_test_server.js                     | 6 ++----
 React/Base/RCTAssert.h                                   | 6 ++----
 React/Base/RCTAssert.m                                   | 6 ++----
 React/Base/RCTBridge+Private.h                           | 6 ++----
 React/Base/RCTBridge.h                                   | 6 ++----
 React/Base/RCTBridge.m                                   | 6 ++----
 React/Base/RCTBridgeDelegate.h                           | 6 ++----
 React/Base/RCTBridgeMethod.h                             | 6 ++----
 React/Base/RCTBridgeModule.h                             | 6 ++----
 React/Base/RCTBundleURLProvider.h                        | 6 ++----
 React/Base/RCTBundleURLProvider.m                        | 6 ++----
 React/Base/RCTConvert.h                                  | 6 ++----
 React/Base/RCTConvert.m                                  | 6 ++----
 React/Base/RCTCxxConvert.h                               | 6 ++----
 React/Base/RCTCxxConvert.m                               | 6 ++----
 React/Base/RCTDefines.h                                  | 6 ++----
 React/Base/RCTDisplayLink.h                              | 6 ++----
 React/Base/RCTDisplayLink.m                              | 6 ++----
 React/Base/RCTErrorCustomizer.h                          | 6 ++----
 React/Base/RCTErrorInfo.h                                | 6 ++----
 React/Base/RCTErrorInfo.m                                | 6 ++----
 React/Base/RCTEventDispatcher.h                          | 6 ++----
 React/Base/RCTEventDispatcher.m                          | 6 ++----
 React/Base/RCTFrameUpdate.h                              | 6 ++----
 React/Base/RCTFrameUpdate.m                              | 6 ++----
 React/Base/RCTImageSource.h                              | 6 ++----
 React/Base/RCTImageSource.m                              | 6 ++----
 React/Base/RCTInvalidating.h                             | 6 ++----
 React/Base/RCTJSCErrorHandling.h                         | 6 ++----
 React/Base/RCTJSCErrorHandling.mm                        | 6 ++----
 React/Base/RCTJSStackFrame.h                             | 6 ++----
 React/Base/RCTJSStackFrame.m                             | 6 ++----
 React/Base/RCTJavaScriptExecutor.h                       | 6 ++----
 React/Base/RCTJavaScriptLoader.h                         | 6 ++----
 React/Base/RCTJavaScriptLoader.mm                        | 6 ++----
 React/Base/RCTKeyCommands.h                              | 6 ++----
 React/Base/RCTKeyCommands.m                              | 6 ++----
 React/Base/RCTLog.h                                      | 6 ++----
 React/Base/RCTLog.mm                                     | 6 ++----
 React/Base/RCTManagedPointer.h                           | 6 ++----
 React/Base/RCTManagedPointer.mm                          | 6 ++----
 React/Base/RCTModuleData.h                               | 6 ++----
 React/Base/RCTModuleData.mm                              | 6 ++----
 React/Base/RCTModuleMethod.h                             | 6 ++----
 React/Base/RCTModuleMethod.mm                            | 6 ++----
 React/Base/RCTMultipartDataTask.h                        | 6 ++----
 React/Base/RCTMultipartDataTask.m                        | 6 ++----
 React/Base/RCTMultipartStreamReader.h                    | 6 ++----
 React/Base/RCTMultipartStreamReader.m                    | 6 ++----
 React/Base/RCTNullability.h                              | 6 ++----
 React/Base/RCTParserUtils.h                              | 6 ++----
 React/Base/RCTParserUtils.m                              | 6 ++----
 React/Base/RCTPerformanceLogger.h                        | 6 ++----
 React/Base/RCTPerformanceLogger.m                        | 6 ++----
 React/Base/RCTPlatform.h                                 | 6 ++----
 React/Base/RCTPlatform.m                                 | 6 ++----
 React/Base/RCTReloadCommand.h                            | 6 ++----
 React/Base/RCTReloadCommand.m                            | 6 ++----
 React/Base/RCTRootContentView.h                          | 6 ++----
 React/Base/RCTRootContentView.m                          | 6 ++----
 React/Base/RCTRootView.h                                 | 6 ++----
 React/Base/RCTRootView.m                                 | 6 ++----
 React/Base/RCTRootViewDelegate.h                         | 6 ++----
 React/Base/RCTRootViewInternal.h                         | 6 ++----
 React/Base/RCTTVRemoteHandler.h                          | 6 ++----
 React/Base/RCTTVRemoteHandler.m                          | 6 ++----
 React/Base/RCTTouchEvent.h                               | 6 ++----
 React/Base/RCTTouchEvent.m                               | 6 ++----
 React/Base/RCTTouchHandler.h                             | 6 ++----
 React/Base/RCTTouchHandler.m                             | 6 ++----
 React/Base/RCTURLRequestDelegate.h                       | 6 ++----
 React/Base/RCTURLRequestHandler.h                        | 6 ++----
 React/Base/RCTUtils.h                                    | 6 ++----
 React/Base/RCTUtils.m                                    | 6 ++----
 React/Base/RCTVersion.h                                  | 6 ++----
 React/Base/Surface/RCTSurface.h                          | 6 ++----
 React/Base/Surface/RCTSurface.mm                         | 6 ++----
 React/Base/Surface/RCTSurfaceDelegate.h                  | 6 ++----
 React/Base/Surface/RCTSurfaceRootShadowView.h            | 6 ++----
 React/Base/Surface/RCTSurfaceRootShadowView.m            | 6 ++----
 React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h    | 6 ++----
 React/Base/Surface/RCTSurfaceRootView.h                  | 6 ++----
 React/Base/Surface/RCTSurfaceRootView.mm                 | 6 ++----
 React/Base/Surface/RCTSurfaceStage.h                     | 6 ++----
 React/Base/Surface/RCTSurfaceStage.m                     | 6 ++----
 React/Base/Surface/RCTSurfaceView+Internal.h             | 6 ++----
 React/Base/Surface/RCTSurfaceView.h                      | 6 ++----
 React/Base/Surface/RCTSurfaceView.mm                     | 6 ++----
 .../Surface/SurfaceHostingView/RCTSurfaceHostingView.h   | 6 ++----
 .../Surface/SurfaceHostingView/RCTSurfaceHostingView.mm  | 6 ++----
 .../SurfaceHostingView/RCTSurfaceSizeMeasureMode.h       | 6 ++----
 .../SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm      | 6 ++----
 React/CxxBridge/NSDataBigString.h                        | 6 ++----
 React/CxxBridge/NSDataBigString.mm                       | 6 ++----
 React/CxxBridge/RCTCxxBridge.mm                          | 6 ++----
 React/CxxBridge/RCTCxxBridgeDelegate.h                   | 6 ++----
 React/CxxBridge/RCTJSCHelpers.h                          | 6 ++----
 React/CxxBridge/RCTJSCHelpers.mm                         | 6 ++----
 React/CxxBridge/RCTMessageThread.h                       | 6 ++----
 React/CxxBridge/RCTMessageThread.mm                      | 6 ++----
 React/CxxBridge/RCTObjcExecutor.h                        | 6 ++----
 React/CxxBridge/RCTObjcExecutor.mm                       | 6 ++----
 React/CxxModule/DispatchMessageQueueThread.h             | 6 ++----
 React/CxxModule/RCTCxxMethod.h                           | 6 ++----
 React/CxxModule/RCTCxxMethod.mm                          | 6 ++----
 React/CxxModule/RCTCxxModule.h                           | 6 ++----
 React/CxxModule/RCTCxxModule.mm                          | 6 ++----
 React/CxxModule/RCTCxxUtils.h                            | 6 ++----
 React/CxxModule/RCTCxxUtils.mm                           | 6 ++----
 React/CxxModule/RCTNativeModule.h                        | 6 ++----
 React/CxxModule/RCTNativeModule.mm                       | 6 ++----
 React/CxxUtils/RCTFollyConvert.h                         | 6 ++----
 React/CxxUtils/RCTFollyConvert.mm                        | 6 ++----
 React/DevSupport/RCTDevLoadingView.h                     | 6 ++----
 React/DevSupport/RCTDevLoadingView.m                     | 6 ++----
 React/DevSupport/RCTDevMenu.h                            | 6 ++----
 React/DevSupport/RCTDevMenu.m                            | 6 ++----
 React/DevSupport/RCTPackagerClient.h                     | 6 ++----
 React/DevSupport/RCTPackagerClient.m                     | 6 ++----
 React/DevSupport/RCTPackagerConnection.h                 | 6 ++----
 React/DevSupport/RCTPackagerConnection.mm                | 6 ++----
 React/Fabric/RCTFabricUIManager.h                        | 6 ++----
 React/Fabric/RCTFabricUIManager.mm                       | 6 ++----
 React/Modules/RCTAccessibilityManager.h                  | 6 ++----
 React/Modules/RCTAccessibilityManager.m                  | 6 ++----
 React/Modules/RCTAlertManager.h                          | 6 ++----
 React/Modules/RCTAlertManager.m                          | 6 ++----
 React/Modules/RCTAppState.h                              | 6 ++----
 React/Modules/RCTAppState.m                              | 6 ++----
 React/Modules/RCTAsyncLocalStorage.h                     | 6 ++----
 React/Modules/RCTAsyncLocalStorage.m                     | 6 ++----
 React/Modules/RCTClipboard.h                             | 6 ++----
 React/Modules/RCTClipboard.m                             | 6 ++----
 React/Modules/RCTDevSettings.h                           | 6 ++----
 React/Modules/RCTDevSettings.mm                          | 6 ++----
 React/Modules/RCTDeviceInfo.h                            | 6 ++----
 React/Modules/RCTDeviceInfo.m                            | 6 ++----
 React/Modules/RCTEventEmitter.h                          | 6 ++----
 React/Modules/RCTEventEmitter.m                          | 6 ++----
 React/Modules/RCTExceptionsManager.h                     | 6 ++----
 React/Modules/RCTExceptionsManager.m                     | 6 ++----
 React/Modules/RCTI18nManager.h                           | 6 ++----
 React/Modules/RCTI18nManager.m                           | 6 ++----
 React/Modules/RCTI18nUtil.h                              | 6 ++----
 React/Modules/RCTI18nUtil.m                              | 6 ++----
 React/Modules/RCTJSCSamplingProfiler.h                   | 6 ++----
 React/Modules/RCTJSCSamplingProfiler.m                   | 6 ++----
 React/Modules/RCTKeyboardObserver.h                      | 6 ++----
 React/Modules/RCTKeyboardObserver.m                      | 6 ++----
 React/Modules/RCTLayoutAnimation.h                       | 6 ++----
 React/Modules/RCTLayoutAnimation.m                       | 6 ++----
 React/Modules/RCTLayoutAnimationGroup.h                  | 6 ++----
 React/Modules/RCTLayoutAnimationGroup.m                  | 6 ++----
 React/Modules/RCTRedBox.h                                | 6 ++----
 React/Modules/RCTRedBox.m                                | 6 ++----
 React/Modules/RCTRedBoxExtraDataViewController.h         | 6 ++----
 React/Modules/RCTRedBoxExtraDataViewController.m         | 6 ++----
 React/Modules/RCTSourceCode.h                            | 6 ++----
 React/Modules/RCTSourceCode.m                            | 6 ++----
 React/Modules/RCTStatusBarManager.h                      | 6 ++----
 React/Modules/RCTStatusBarManager.m                      | 6 ++----
 React/Modules/RCTTVNavigationEventEmitter.h              | 6 ++----
 React/Modules/RCTTVNavigationEventEmitter.m              | 6 ++----
 React/Modules/RCTTiming.h                                | 6 ++----
 React/Modules/RCTTiming.m                                | 6 ++----
 React/Modules/RCTUIManager.h                             | 6 ++----
 React/Modules/RCTUIManager.m                             | 6 ++----
 React/Modules/RCTUIManagerObserverCoordinator.h          | 6 ++----
 React/Modules/RCTUIManagerObserverCoordinator.mm         | 6 ++----
 React/Modules/RCTUIManagerUtils.h                        | 6 ++----
 React/Modules/RCTUIManagerUtils.m                        | 6 ++----
 React/Profiler/RCTFPSGraph.h                             | 6 ++----
 React/Profiler/RCTFPSGraph.m                             | 6 ++----
 React/Profiler/RCTMacros.h                               | 6 ++----
 React/Profiler/RCTPerfMonitor.m                          | 6 ++----
 React/Profiler/RCTProfile.h                              | 6 ++----
 React/Profiler/RCTProfile.m                              | 6 ++----
 React/Profiler/RCTProfileTrampoline-arm.S                | 6 ++----
 React/Profiler/RCTProfileTrampoline-arm64.S              | 6 ++----
 React/Profiler/RCTProfileTrampoline-i386.S               | 6 ++----
 React/Profiler/RCTProfileTrampoline-x86_64.S             | 6 ++----
 React/UIUtils/RCTUIUtils.h                               | 6 ++----
 React/UIUtils/RCTUIUtils.m                               | 6 ++----
 React/Views/RCTActivityIndicatorView.h                   | 6 ++----
 React/Views/RCTActivityIndicatorView.m                   | 6 ++----
 React/Views/RCTActivityIndicatorViewManager.h            | 6 ++----
 React/Views/RCTActivityIndicatorViewManager.m            | 6 ++----
 React/Views/RCTAnimationType.h                           | 6 ++----
 React/Views/RCTAutoInsetsProtocol.h                      | 6 ++----
 React/Views/RCTBorderDrawing.h                           | 6 ++----
 React/Views/RCTBorderDrawing.m                           | 6 ++----
 React/Views/RCTBorderStyle.h                             | 6 ++----
 React/Views/RCTComponent.h                               | 6 ++----
 React/Views/RCTComponentData.h                           | 6 ++----
 React/Views/RCTComponentData.m                           | 6 ++----
 React/Views/RCTConvert+CoreLocation.h                    | 6 ++----
 React/Views/RCTConvert+CoreLocation.m                    | 6 ++----
 React/Views/RCTConvert+Transform.h                       | 6 ++----
 React/Views/RCTConvert+Transform.m                       | 6 ++----
 React/Views/RCTDatePicker.h                              | 6 ++----
 React/Views/RCTDatePicker.m                              | 6 ++----
 React/Views/RCTDatePickerManager.h                       | 6 ++----
 React/Views/RCTDatePickerManager.m                       | 6 ++----
 React/Views/RCTFont.h                                    | 6 ++----
 React/Views/RCTFont.mm                                   | 6 ++----
 React/Views/RCTLayout.h                                  | 6 ++----
 React/Views/RCTLayout.m                                  | 6 ++----
 React/Views/RCTMaskedView.h                              | 6 ++----
 React/Views/RCTMaskedView.m                              | 6 ++----
 React/Views/RCTMaskedViewManager.h                       | 6 ++----
 React/Views/RCTMaskedViewManager.m                       | 6 ++----
 React/Views/RCTModalHostView.h                           | 6 ++----
 React/Views/RCTModalHostView.m                           | 6 ++----
 React/Views/RCTModalHostViewController.h                 | 6 ++----
 React/Views/RCTModalHostViewController.m                 | 6 ++----
 React/Views/RCTModalHostViewManager.h                    | 6 ++----
 React/Views/RCTModalHostViewManager.m                    | 6 ++----
 React/Views/RCTModalManager.h                            | 6 ++----
 React/Views/RCTModalManager.m                            | 6 ++----
 React/Views/RCTNavItem.h                                 | 6 ++----
 React/Views/RCTNavItem.m                                 | 6 ++----
 React/Views/RCTNavItemManager.h                          | 6 ++----
 React/Views/RCTNavItemManager.m                          | 6 ++----
 React/Views/RCTNavigator.h                               | 6 ++----
 React/Views/RCTNavigator.m                               | 6 ++----
 React/Views/RCTNavigatorManager.h                        | 6 ++----
 React/Views/RCTNavigatorManager.m                        | 6 ++----
 React/Views/RCTPicker.h                                  | 6 ++----
 React/Views/RCTPicker.m                                  | 6 ++----
 React/Views/RCTPickerManager.h                           | 6 ++----
 React/Views/RCTPickerManager.m                           | 6 ++----
 React/Views/RCTPointerEvents.h                           | 6 ++----
 React/Views/RCTProgressViewManager.h                     | 6 ++----
 React/Views/RCTProgressViewManager.m                     | 6 ++----
 React/Views/RCTRefreshControl.h                          | 6 ++----
 React/Views/RCTRefreshControl.m                          | 6 ++----
 React/Views/RCTRefreshControlManager.h                   | 6 ++----
 React/Views/RCTRefreshControlManager.m                   | 6 ++----
 React/Views/RCTRootShadowView.h                          | 6 ++----
 React/Views/RCTRootShadowView.m                          | 6 ++----
 React/Views/RCTSegmentedControl.h                        | 6 ++----
 React/Views/RCTSegmentedControl.m                        | 6 ++----
 React/Views/RCTSegmentedControlManager.h                 | 6 ++----
 React/Views/RCTSegmentedControlManager.m                 | 6 ++----
 React/Views/RCTShadowView+Internal.h                     | 6 ++----
 React/Views/RCTShadowView+Internal.m                     | 6 ++----
 React/Views/RCTShadowView+Layout.h                       | 6 ++----
 React/Views/RCTShadowView+Layout.m                       | 6 ++----
 React/Views/RCTShadowView.h                              | 6 ++----
 React/Views/RCTShadowView.m                              | 6 ++----
 React/Views/RCTSlider.h                                  | 6 ++----
 React/Views/RCTSlider.m                                  | 6 ++----
 React/Views/RCTSliderManager.h                           | 6 ++----
 React/Views/RCTSliderManager.m                           | 6 ++----
 React/Views/RCTSwitch.h                                  | 6 ++----
 React/Views/RCTSwitch.m                                  | 6 ++----
 React/Views/RCTSwitchManager.h                           | 6 ++----
 React/Views/RCTSwitchManager.m                           | 6 ++----
 React/Views/RCTTVView.h                                  | 6 ++----
 React/Views/RCTTVView.m                                  | 6 ++----
 React/Views/RCTTabBar.h                                  | 6 ++----
 React/Views/RCTTabBar.m                                  | 6 ++----
 React/Views/RCTTabBarItem.h                              | 6 ++----
 React/Views/RCTTabBarItem.m                              | 6 ++----
 React/Views/RCTTabBarItemManager.h                       | 6 ++----
 React/Views/RCTTabBarItemManager.m                       | 6 ++----
 React/Views/RCTTabBarManager.h                           | 6 ++----
 React/Views/RCTTabBarManager.m                           | 6 ++----
 React/Views/RCTTextDecorationLineType.h                  | 6 ++----
 React/Views/RCTView.h                                    | 6 ++----
 React/Views/RCTView.m                                    | 6 ++----
 React/Views/RCTViewManager.h                             | 6 ++----
 React/Views/RCTViewManager.m                             | 6 ++----
 React/Views/RCTWebView.h                                 | 6 ++----
 React/Views/RCTWebView.m                                 | 6 ++----
 React/Views/RCTWebViewManager.h                          | 6 ++----
 React/Views/RCTWebViewManager.m                          | 6 ++----
 React/Views/RCTWrapperViewController.h                   | 6 ++----
 React/Views/RCTWrapperViewController.m                   | 6 ++----
 React/Views/SafeAreaView/RCTSafeAreaShadowView.h         | 6 ++----
 React/Views/SafeAreaView/RCTSafeAreaShadowView.m         | 6 ++----
 React/Views/SafeAreaView/RCTSafeAreaView.h               | 6 ++----
 React/Views/SafeAreaView/RCTSafeAreaView.m               | 6 ++----
 React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h      | 6 ++----
 React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m      | 6 ++----
 React/Views/SafeAreaView/RCTSafeAreaViewManager.h        | 6 ++----
 React/Views/SafeAreaView/RCTSafeAreaViewManager.m        | 6 ++----
 React/Views/ScrollView/RCTScrollContentShadowView.h      | 6 ++----
 React/Views/ScrollView/RCTScrollContentShadowView.m      | 6 ++----
 React/Views/ScrollView/RCTScrollContentView.h            | 6 ++----
 React/Views/ScrollView/RCTScrollContentView.m            | 6 ++----
 React/Views/ScrollView/RCTScrollContentViewManager.h     | 6 ++----
 React/Views/ScrollView/RCTScrollContentViewManager.m     | 6 ++----
 React/Views/ScrollView/RCTScrollView.h                   | 6 ++----
 React/Views/ScrollView/RCTScrollView.m                   | 6 ++----
 React/Views/ScrollView/RCTScrollViewManager.h            | 6 ++----
 React/Views/ScrollView/RCTScrollViewManager.m            | 6 ++----
 React/Views/ScrollView/RCTScrollableProtocol.h           | 6 ++----
 React/Views/UIView+Private.h                             | 6 ++----
 React/Views/UIView+React.h                               | 6 ++----
 React/Views/UIView+React.m                               | 6 ++----
 .../react/testing/AbstractScrollViewTestCase.java        | 7 +++----
 .../java/com/facebook/react/testing/AssertModule.java    | 7 +++----
 .../facebook/react/testing/FakeAsyncLocalStorage.java    | 7 +++----
 .../com/facebook/react/testing/FakeWebSocketModule.java  | 7 +++----
 .../react/testing/InstanceSpecForTestPackage.java        | 7 +++----
 .../com/facebook/react/testing/IntRecordingModule.java   | 7 +++----
 .../facebook/react/testing/JSIntegrationTestChecker.java | 7 +++----
 .../facebook/react/testing/MultipleFailureException.java | 7 +++----
 .../react/testing/ReactAppInstrumentationTestCase.java   | 7 +++----
 .../com/facebook/react/testing/ReactAppTestActivity.java | 7 +++----
 .../facebook/react/testing/ReactInstanceSpecForTest.java | 7 +++----
 .../facebook/react/testing/ReactIntegrationTestCase.java | 7 +++----
 .../facebook/react/testing/ReactSettingsForTests.java    | 7 +++----
 .../com/facebook/react/testing/ReactTestAppShell.java    | 7 +++----
 .../facebook/react/testing/ReactTestApplicationImpl.java | 7 +++----
 .../com/facebook/react/testing/ReactTestFactory.java     | 7 +++----
 .../java/com/facebook/react/testing/ReactTestHelper.java | 7 +++----
 .../facebook/react/testing/ScreenshotingFrameLayout.java | 7 +++----
 .../react/testing/SingleTouchGestureGenerator.java       | 7 +++----
 .../facebook/react/testing/StringRecordingModule.java    | 7 +++----
 .../facebook/react/testing/idledetection/IdleWaiter.java | 7 +++----
 .../testing/idledetection/ReactBridgeIdleSignaler.java   | 7 +++----
 .../testing/idledetection/ReactIdleDetectionUtil.java    | 7 +++----
 .../testing/network/NetworkRecordingModuleMock.java      | 7 +++----
 .../facebook/react/tests/CatalystMeasureLayoutTest.java  | 7 +++----
 .../react/tests/CatalystMultitouchHandlingTestCase.java  | 7 +++----
 .../tests/CatalystNativeJSToJavaParametersTestCase.java  | 7 +++----
 .../tests/CatalystNativeJavaToJSArgumentsTestCase.java   | 7 +++----
 .../CatalystNativeJavaToJSReturnValuesTestCase.java      | 7 +++----
 .../react/tests/CatalystSubviewsClippingTestCase.java    | 6 ++----
 .../react/tests/CatalystTouchBubblingTestCase.java       | 6 ++----
 .../facebook/react/tests/CatalystUIManagerTestCase.java  | 6 ++----
 .../facebook/react/tests/DatePickerDialogTestCase.java   | 7 +++----
 .../com/facebook/react/tests/InitialPropsTestCase.java   | 7 +++----
 .../java/com/facebook/react/tests/JSLocaleTest.java      | 7 +++----
 .../com/facebook/react/tests/JSResponderTestCase.java    | 7 +++----
 .../com/facebook/react/tests/LayoutEventsTestCase.java   | 7 +++----
 .../java/com/facebook/react/tests/NativeIdTestCase.java  | 7 +++----
 .../com/facebook/react/tests/ProgressBarTestCase.java    | 7 +++----
 .../react/tests/ReactHorizontalScrollViewTestCase.java   | 7 +++----
 .../com/facebook/react/tests/ReactPickerTestCase.java    | 7 +++----
 .../com/facebook/react/tests/ReactRootViewTestCase.java  | 7 +++----
 .../facebook/react/tests/ReactScrollViewTestCase.java    | 7 +++----
 .../react/tests/ReactSwipeRefreshLayoutTestCase.java     | 7 +++----
 .../java/com/facebook/react/tests/ShareTestCase.java     | 7 +++----
 .../java/com/facebook/react/tests/TestIdTestCase.java    | 7 +++----
 .../java/com/facebook/react/tests/TextInputTestCase.java | 7 +++----
 .../facebook/react/tests/TimePickerDialogTestCase.java   | 7 +++----
 .../com/facebook/react/tests/ViewRenderingTestCase.java  | 7 +++----
 ReactAndroid/src/androidTest/js/Asserts.js               | 6 ++----
 .../src/androidTest/js/CatalystRootViewTestModule.js     | 6 ++----
 .../src/androidTest/js/DatePickerDialogTestModule.js     | 6 ++----
 ReactAndroid/src/androidTest/js/InitialPropsTestApp.js   | 6 ++----
 ReactAndroid/src/androidTest/js/JSResponderTestApp.js    | 6 ++----
 ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js   | 6 ++----
 .../src/androidTest/js/MeasureLayoutTestModule.js        | 6 ++----
 .../androidTest/js/MultitouchHandlingTestAppModule.js    | 6 ++----
 ReactAndroid/src/androidTest/js/NativeIdTestModule.js    | 6 ++----
 .../src/androidTest/js/PickerAndroidTestModule.js        | 6 ++----
 ReactAndroid/src/androidTest/js/ProgressBarTestModule.js | 6 ++----
 ReactAndroid/src/androidTest/js/ScrollViewTestModule.js  | 6 ++----
 ReactAndroid/src/androidTest/js/ShareTestModule.js       | 6 ++----
 .../src/androidTest/js/SubviewsClippingTestModule.js     | 6 ++----
 .../src/androidTest/js/SwipeRefreshLayoutTestModule.js   | 6 ++----
 ReactAndroid/src/androidTest/js/TestBundle.js            | 6 ++----
 ReactAndroid/src/androidTest/js/TestIdTestModule.js      | 6 ++----
 ReactAndroid/src/androidTest/js/TestJSLocaleModule.js    | 6 ++----
 .../src/androidTest/js/TestJSToJavaParametersModule.js   | 6 ++----
 .../src/androidTest/js/TestJavaToJSArgumentsModule.js    | 6 ++----
 .../src/androidTest/js/TestJavaToJSReturnValuesModule.js | 6 ++----
 ReactAndroid/src/androidTest/js/TextInputTestModule.js   | 6 ++----
 .../src/androidTest/js/TimePickerDialogTestModule.js     | 6 ++----
 .../src/androidTest/js/TouchBubblingTestAppModule.js     | 6 ++----
 ReactAndroid/src/androidTest/js/UIManagerTestModule.js   | 6 ++----
 .../src/androidTest/js/ViewRenderingTestModule.js        | 6 ++----
 .../src/main/java/com/facebook/jni/IteratorHelper.java   | 6 ++----
 .../main/java/com/facebook/jni/MapIteratorHelper.java    | 6 ++----
 .../src/main/java/com/facebook/jni/NativeRunnable.java   | 6 ++----
 .../main/java/com/facebook/perftest/PerfTestConfig.java  | 6 ++----
 .../com/facebook/proguard/annotations/DoNotStrip.java    | 6 ++----
 .../proguard/annotations/KeepGettersAndSetters.java      | 6 ++----
 .../java/com/facebook/react/CompositeReactPackage.java   | 6 ++----
 .../main/java/com/facebook/react/CoreModulesPackage.java | 6 ++----
 .../main/java/com/facebook/react/DebugCorePackage.java   | 6 ++----
 .../java/com/facebook/react/HeadlessJsTaskService.java   | 6 ++----
 .../main/java/com/facebook/react/LazyReactPackage.java   | 6 ++----
 .../src/main/java/com/facebook/react/ReactActivity.java  | 6 ++----
 .../main/java/com/facebook/react/ReactApplication.java   | 6 ++----
 .../java/com/facebook/react/ReactFragmentActivity.java   | 6 ++----
 .../java/com/facebook/react/ReactInstanceManager.java    | 6 ++----
 .../java/com/facebook/react/ReactInstancePackage.java    | 6 ++----
 .../main/java/com/facebook/react/ReactNativeHost.java    | 6 ++----
 .../src/main/java/com/facebook/react/ReactPackage.java   | 6 ++----
 .../src/main/java/com/facebook/react/ReactRootView.java  | 6 ++----
 .../facebook/react/ViewManagerOnDemandReactPackage.java  | 6 ++----
 .../facebook/react/animated/AdditionAnimatedNode.java    | 6 ++----
 .../java/com/facebook/react/animated/AnimatedNode.java   | 6 ++----
 .../react/animated/AnimatedNodeValueListener.java        | 6 ++----
 .../com/facebook/react/animated/AnimationDriver.java     | 6 ++----
 .../java/com/facebook/react/animated/DecayAnimation.java | 6 ++----
 .../facebook/react/animated/DiffClampAnimatedNode.java   | 6 ++----
 .../facebook/react/animated/DivisionAnimatedNode.java    | 6 ++----
 .../facebook/react/animated/EventAnimationDriver.java    | 6 ++----
 .../react/animated/FrameBasedAnimationDriver.java        | 6 ++----
 .../react/animated/InterpolationAnimatedNode.java        | 7 +++----
 .../com/facebook/react/animated/ModulusAnimatedNode.java | 6 ++----
 .../react/animated/MultiplicationAnimatedNode.java       | 6 ++----
 .../facebook/react/animated/NativeAnimatedModule.java    | 6 ++----
 .../react/animated/NativeAnimatedNodesManager.java       | 6 ++----
 .../com/facebook/react/animated/PropsAnimatedNode.java   | 6 ++----
 .../com/facebook/react/animated/StyleAnimatedNode.java   | 6 ++----
 .../facebook/react/animated/TransformAnimatedNode.java   | 6 ++----
 .../com/facebook/react/animated/ValueAnimatedNode.java   | 6 ++----
 .../animation/AbstractFloatPairPropertyUpdater.java      | 6 ++----
 .../animation/AbstractSingleFloatProperyUpdater.java     | 6 ++----
 .../java/com/facebook/react/animation/Animation.java     | 6 ++----
 .../com/facebook/react/animation/AnimationListener.java  | 6 ++----
 .../react/animation/AnimationPropertyUpdater.java        | 6 ++----
 .../com/facebook/react/animation/AnimationRegistry.java  | 6 ++----
 .../com/facebook/react/animation/ImmediateAnimation.java | 6 ++----
 .../react/animation/NoopAnimationPropertyUpdater.java    | 6 ++----
 .../react/animation/OpacityAnimationPropertyUpdater.java | 6 ++----
 .../animation/PositionAnimationPairPropertyUpdater.java  | 6 ++----
 .../animation/RotationAnimationPropertyUpdater.java      | 6 ++----
 .../react/animation/ScaleXAnimationPropertyUpdater.java  | 6 ++----
 .../animation/ScaleXYAnimationPairPropertyUpdater.java   | 6 ++----
 .../react/animation/ScaleYAnimationPropertyUpdater.java  | 6 ++----
 .../main/java/com/facebook/react/bridge/Arguments.java   | 6 ++----
 .../com/facebook/react/bridge/AssertionException.java    | 6 ++----
 .../java/com/facebook/react/bridge/BaseJavaModule.java   | 6 ++----
 .../main/java/com/facebook/react/bridge/Callback.java    | 6 ++----
 .../java/com/facebook/react/bridge/CallbackImpl.java     | 6 ++----
 .../java/com/facebook/react/bridge/CatalystInstance.java | 6 ++----
 .../com/facebook/react/bridge/CatalystInstanceImpl.java  | 6 ++----
 .../com/facebook/react/bridge/ContextBaseJavaModule.java | 6 ++----
 .../bridge/DefaultNativeModuleCallExceptionHandler.java  | 6 ++----
 .../src/main/java/com/facebook/react/bridge/Dynamic.java | 6 ++----
 .../java/com/facebook/react/bridge/DynamicFromArray.java | 6 ++----
 .../java/com/facebook/react/bridge/DynamicFromMap.java   | 6 ++----
 .../facebook/react/bridge/FallbackJSBundleLoader.java    | 6 ++----
 .../java/com/facebook/react/bridge/GuardedAsyncTask.java | 6 ++----
 .../facebook/react/bridge/InvalidIteratorException.java  | 6 ++----
 .../react/bridge/JSApplicationCausedNativeException.java | 6 ++----
 .../bridge/JSApplicationIllegalArgumentException.java    | 6 ++----
 .../java/com/facebook/react/bridge/JSBundleLoader.java   | 6 ++----
 .../com/facebook/react/bridge/JSCJavaScriptExecutor.java | 6 ++----
 .../react/bridge/JSCJavaScriptExecutorFactory.java       | 6 ++----
 .../main/java/com/facebook/react/bridge/JSInstance.java  | 6 ++----
 .../java/com/facebook/react/bridge/JavaJSExecutor.java   | 6 ++----
 .../com/facebook/react/bridge/JavaMethodWrapper.java     | 6 ++----
 .../com/facebook/react/bridge/JavaModuleWrapper.java     | 6 ++----
 .../java/com/facebook/react/bridge/JavaOnlyArray.java    | 6 ++----
 .../main/java/com/facebook/react/bridge/JavaOnlyMap.java | 6 ++----
 .../com/facebook/react/bridge/JavaScriptExecutor.java    | 6 ++----
 .../facebook/react/bridge/JavaScriptExecutorFactory.java | 6 ++----
 .../java/com/facebook/react/bridge/JavaScriptModule.java | 6 ++----
 .../facebook/react/bridge/JavaScriptModuleRegistry.java  | 6 ++----
 .../main/java/com/facebook/react/bridge/JsonWriter.java  | 6 ++----
 .../java/com/facebook/react/bridge/JsonWriterHelper.java | 6 ++----
 .../facebook/react/bridge/LifecycleEventListener.java    | 6 ++----
 .../main/java/com/facebook/react/bridge/ModuleSpec.java  | 6 ++----
 .../react/bridge/NativeArgumentsParseException.java      | 6 ++----
 .../main/java/com/facebook/react/bridge/NativeArray.java | 6 ++----
 .../main/java/com/facebook/react/bridge/NativeMap.java   | 6 ++----
 .../java/com/facebook/react/bridge/NativeModule.java     | 6 ++----
 .../react/bridge/NativeModuleCallExceptionHandler.java   | 6 ++----
 .../com/facebook/react/bridge/NativeModuleRegistry.java  | 6 ++----
 .../com/facebook/react/bridge/NoSuchKeyException.java    | 6 ++----
 .../bridge/NotThreadSafeBridgeIdleDebugListener.java     | 6 ++----
 .../react/bridge/ObjectAlreadyConsumedException.java     | 6 ++----
 .../facebook/react/bridge/OnBatchCompleteListener.java   | 6 ++----
 .../com/facebook/react/bridge/PerformanceCounter.java    | 6 ++----
 .../src/main/java/com/facebook/react/bridge/Promise.java | 6 ++----
 .../main/java/com/facebook/react/bridge/PromiseImpl.java | 6 ++----
 .../facebook/react/bridge/ProxyJavaScriptExecutor.java   | 6 ++----
 .../facebook/react/bridge/ReactApplicationContext.java   | 6 ++----
 .../main/java/com/facebook/react/bridge/ReactBridge.java | 6 ++----
 .../java/com/facebook/react/bridge/ReactCallback.java    | 6 ++----
 .../java/com/facebook/react/bridge/ReactContext.java     | 6 ++----
 .../react/bridge/ReactContextBaseJavaModule.java         | 6 ++----
 .../main/java/com/facebook/react/bridge/ReactMethod.java | 6 ++----
 .../com/facebook/react/bridge/ReactModuleWithSpec.java   | 6 ++----
 .../java/com/facebook/react/bridge/ReadableArray.java    | 6 ++----
 .../main/java/com/facebook/react/bridge/ReadableMap.java | 6 ++----
 .../facebook/react/bridge/ReadableMapKeySetIterator.java | 6 ++----
 .../com/facebook/react/bridge/ReadableNativeArray.java   | 6 ++----
 .../com/facebook/react/bridge/ReadableNativeMap.java     | 6 ++----
 .../java/com/facebook/react/bridge/ReadableType.java     | 6 ++----
 .../java/com/facebook/react/bridge/SoftAssertions.java   | 6 ++----
 .../java/com/facebook/react/bridge/UiThreadUtil.java     | 6 ++----
 .../react/bridge/UnexpectedNativeTypeException.java      | 6 ++----
 .../java/com/facebook/react/bridge/WritableArray.java    | 6 ++----
 .../main/java/com/facebook/react/bridge/WritableMap.java | 6 ++----
 .../com/facebook/react/bridge/WritableNativeArray.java   | 6 ++----
 .../com/facebook/react/bridge/WritableNativeMap.java     | 6 ++----
 .../facebook/react/bridge/queue/MessageQueueThread.java  | 6 ++----
 .../react/bridge/queue/MessageQueueThreadHandler.java    | 6 ++----
 .../react/bridge/queue/MessageQueueThreadImpl.java       | 6 ++----
 .../react/bridge/queue/MessageQueueThreadSpec.java       | 6 ++----
 .../com/facebook/react/bridge/queue/NativeRunnable.java  | 6 ++----
 .../react/bridge/queue/NativeRunnableDeprecated.java     | 6 ++----
 .../react/bridge/queue/QueueThreadExceptionHandler.java  | 6 ++----
 .../react/bridge/queue/ReactQueueConfiguration.java      | 6 ++----
 .../react/bridge/queue/ReactQueueConfigurationImpl.java  | 6 ++----
 .../react/bridge/queue/ReactQueueConfigurationSpec.java  | 6 ++----
 .../com/facebook/react/common/DebugServerException.java  | 6 ++----
 .../com/facebook/react/common/JavascriptException.java   | 6 ++----
 .../java/com/facebook/react/common/LifecycleState.java   | 6 ++----
 .../main/java/com/facebook/react/common/LongArray.java   | 6 ++----
 .../main/java/com/facebook/react/common/MapBuilder.java  | 6 ++----
 .../java/com/facebook/react/common/ReactConstants.java   | 6 ++----
 .../java/com/facebook/react/common/ShakeDetector.java    | 6 ++----
 .../com/facebook/react/common/SingleThreadAsserter.java  | 6 ++----
 .../java/com/facebook/react/common/StandardCharsets.java | 6 ++----
 .../main/java/com/facebook/react/common/SystemClock.java | 6 ++----
 .../react/common/annotations/VisibleForTesting.java      | 6 ++----
 .../facebook/react/common/build/ReactBuildConfig.java    | 6 ++----
 .../react/common/futures/SimpleSettableFuture.java       | 6 ++----
 .../facebook/react/common/network/OkHttpCallUtil.java    | 8 +++-----
 .../com/facebook/react/devsupport/BundleDownloader.java  | 6 ++----
 .../react/devsupport/DebugOverlayController.java         | 6 ++----
 .../facebook/react/devsupport/DevInternalSettings.java   | 6 ++----
 .../react/devsupport/DevLoadingViewController.java       | 6 ++----
 .../com/facebook/react/devsupport/DevServerHelper.java   | 6 ++----
 .../facebook/react/devsupport/DevSettingsActivity.java   | 6 ++----
 .../react/devsupport/DevSupportManagerFactory.java       | 6 ++----
 .../facebook/react/devsupport/DevSupportManagerImpl.java | 6 ++----
 .../react/devsupport/DisabledDevSupportManager.java      | 6 ++----
 .../react/devsupport/DoubleTapReloadRecognizer.java      | 6 ++----
 .../main/java/com/facebook/react/devsupport/FpsView.java | 6 ++----
 .../java/com/facebook/react/devsupport/HMRClient.java    | 6 ++----
 .../com/facebook/react/devsupport/JSCHeapCapture.java    | 6 ++----
 .../facebook/react/devsupport/JSCSamplingProfiler.java   | 6 ++----
 .../react/devsupport/JSDebuggerWebSocketClient.java      | 6 ++----
 .../java/com/facebook/react/devsupport/JSException.java  | 6 ++----
 .../facebook/react/devsupport/MultipartStreamReader.java | 6 ++----
 .../react/devsupport/ReactInstanceManagerDevHelper.java  | 6 ++----
 .../java/com/facebook/react/devsupport/RedBoxDialog.java | 6 ++----
 .../com/facebook/react/devsupport/RedBoxHandler.java     | 6 ++----
 .../com/facebook/react/devsupport/StackTraceHelper.java  | 6 ++----
 .../react/devsupport/WebsocketJavaScriptExecutor.java    | 6 ++----
 .../devsupport/interfaces/DevBundleDownloadListener.java | 6 ++----
 .../react/devsupport/interfaces/DevOptionHandler.java    | 6 ++----
 .../react/devsupport/interfaces/DevSupportManager.java   | 6 ++----
 .../react/devsupport/interfaces/ErrorCustomizer.java     | 7 +++----
 .../devsupport/interfaces/PackagerStatusCallback.java    | 6 ++----
 .../facebook/react/devsupport/interfaces/StackFrame.java | 6 ++----
 .../java/com/facebook/react/flat/AbstractDrawBorder.java | 6 ++----
 .../com/facebook/react/flat/AbstractDrawCommand.java     | 6 ++----
 .../main/java/com/facebook/react/flat/AndroidView.java   | 6 ++----
 .../com/facebook/react/flat/AttachDetachListener.java    | 6 ++----
 .../com/facebook/react/flat/BitmapUpdateListener.java    | 6 ++----
 .../facebook/react/flat/ClippingDrawCommandManager.java  | 6 ++----
 .../com/facebook/react/flat/DrawBackgroundColor.java     | 6 ++----
 .../main/java/com/facebook/react/flat/DrawBorder.java    | 6 ++----
 .../main/java/com/facebook/react/flat/DrawCommand.java   | 6 ++----
 .../java/com/facebook/react/flat/DrawCommandManager.java | 6 ++----
 .../src/main/java/com/facebook/react/flat/DrawImage.java | 6 ++----
 .../com/facebook/react/flat/DrawImageWithDrawee.java     | 6 ++----
 .../java/com/facebook/react/flat/DrawTextLayout.java     | 6 ++----
 .../src/main/java/com/facebook/react/flat/DrawView.java  | 6 ++----
 .../com/facebook/react/flat/DraweeRequestHelper.java     | 6 ++----
 .../main/java/com/facebook/react/flat/ElementsList.java  | 6 ++----
 .../facebook/react/flat/FlatARTSurfaceViewManager.java   | 6 ++----
 .../react/flat/FlatARTSurfaceViewShadowNode.java         | 6 ++----
 .../com/facebook/react/flat/FlatMeasuredViewGroup.java   | 6 ++----
 .../react/flat/FlatNativeViewHierarchyManager.java       | 6 ++----
 .../facebook/react/flat/FlatReactModalShadowNode.java    | 6 ++----
 .../java/com/facebook/react/flat/FlatRootShadowNode.java | 6 ++----
 .../com/facebook/react/flat/FlatRootViewManager.java     | 6 ++----
 .../java/com/facebook/react/flat/FlatShadowNode.java     | 6 ++----
 .../java/com/facebook/react/flat/FlatTextShadowNode.java | 6 ++----
 .../com/facebook/react/flat/FlatUIImplementation.java    | 6 ++----
 .../facebook/react/flat/FlatUIViewOperationQueue.java    | 6 ++----
 .../main/java/com/facebook/react/flat/FlatViewGroup.java | 6 ++----
 .../java/com/facebook/react/flat/FlatViewManager.java    | 6 ++----
 .../java/com/facebook/react/flat/FontStylingSpan.java    | 6 ++----
 .../java/com/facebook/react/flat/HitSlopNodeRegion.java  | 6 ++----
 .../react/flat/HorizontalDrawCommandManager.java         | 6 ++----
 .../facebook/react/flat/InlineImageSpanWithPipeline.java | 6 ++----
 .../src/main/java/com/facebook/react/flat/MoveProxy.java | 6 ++----
 .../java/com/facebook/react/flat/NativeViewWrapper.java  | 6 ++----
 .../main/java/com/facebook/react/flat/NodeRegion.java    | 6 ++----
 .../com/facebook/react/flat/PipelineRequestHelper.java   | 6 ++----
 .../main/java/com/facebook/react/flat/RCTImageView.java  | 6 ++----
 .../com/facebook/react/flat/RCTImageViewManager.java     | 6 ++----
 .../com/facebook/react/flat/RCTModalHostManager.java     | 6 ++----
 .../main/java/com/facebook/react/flat/RCTRawText.java    | 6 ++----
 .../java/com/facebook/react/flat/RCTRawTextManager.java  | 6 ++----
 .../src/main/java/com/facebook/react/flat/RCTText.java   | 6 ++----
 .../java/com/facebook/react/flat/RCTTextInlineImage.java | 6 ++----
 .../facebook/react/flat/RCTTextInlineImageManager.java   | 6 ++----
 .../main/java/com/facebook/react/flat/RCTTextInput.java  | 6 ++----
 .../com/facebook/react/flat/RCTTextInputManager.java     | 6 ++----
 .../java/com/facebook/react/flat/RCTTextManager.java     | 6 ++----
 .../src/main/java/com/facebook/react/flat/RCTView.java   | 6 ++----
 .../java/com/facebook/react/flat/RCTViewManager.java     | 6 ++----
 .../com/facebook/react/flat/RCTViewPagerManager.java     | 6 ++----
 .../java/com/facebook/react/flat/RCTVirtualText.java     | 6 ++----
 .../com/facebook/react/flat/RCTVirtualTextManager.java   | 6 ++----
 .../java/com/facebook/react/flat/ShadowStyleSpan.java    | 6 ++----
 .../main/java/com/facebook/react/flat/StateBuilder.java  | 6 ++----
 .../java/com/facebook/react/flat/TextNodeRegion.java     | 6 ++----
 .../main/java/com/facebook/react/flat/TypefaceCache.java | 6 ++----
 .../facebook/react/flat/VerticalDrawCommandManager.java  | 6 ++----
 .../main/java/com/facebook/react/flat/ViewResolver.java  | 6 ++----
 .../java/com/facebook/react/flat/VirtualViewManager.java | 6 ++----
 .../react/jstasks/HeadlessJsTaskEventListener.java       | 6 ++----
 .../facebook/react/module/annotations/ReactModule.java   | 6 ++----
 .../facebook/react/modules/appregistry/AppRegistry.java  | 6 ++----
 .../facebook/react/modules/appstate/AppStateModule.java  | 6 ++----
 .../java/com/facebook/react/modules/blob/BlobModule.java | 7 +++----
 .../com/facebook/react/modules/blob/BlobProvider.java    | 7 +++----
 .../facebook/react/modules/blob/FileReaderModule.java    | 6 ++----
 .../facebook/react/modules/camera/CameraRollManager.java | 6 ++----
 .../react/modules/camera/ImageEditingManager.java        | 6 ++----
 .../facebook/react/modules/camera/ImageStoreManager.java | 6 ++----
 .../react/modules/clipboard/ClipboardModule.java         | 6 ++----
 .../facebook/react/modules/common/ModuleDataCleaner.java | 6 ++----
 .../facebook/react/modules/core/ChoreographerCompat.java | 8 +++-----
 .../modules/core/DefaultHardwareBackBtnHandler.java      | 6 ++----
 .../react/modules/core/DeviceEventManagerModule.java     | 6 ++----
 .../react/modules/core/ExceptionsManagerModule.java      | 6 ++----
 .../react/modules/core/HeadlessJsTaskSupportModule.java  | 6 ++----
 .../java/com/facebook/react/modules/core/JSTimers.java   | 6 ++----
 .../react/modules/core/PermissionAwareActivity.java      | 6 ++----
 .../facebook/react/modules/core/PermissionListener.java  | 6 ++----
 .../react/modules/core/RCTNativeAppEventEmitter.java     | 6 ++----
 .../facebook/react/modules/core/ReactChoreographer.java  | 6 ++----
 .../java/com/facebook/react/modules/core/Timing.java     | 6 ++----
 .../modules/datepicker/DatePickerDialogFragment.java     | 6 ++----
 .../react/modules/datepicker/DatePickerDialogModule.java | 6 ++----
 .../react/modules/datepicker/DatePickerMode.java         | 6 ++----
 .../modules/datepicker/DismissableDatePickerDialog.java  | 6 ++----
 .../datepicker/SupportDatePickerDialogFragment.java      | 6 ++----
 .../react/modules/debug/AnimationsDebugModule.java       | 6 ++----
 .../modules/debug/DidJSUpdateUiDuringFrameDetector.java  | 6 ++----
 .../react/modules/debug/FpsDebugFrameCallback.java       | 6 ++----
 .../facebook/react/modules/debug/SourceCodeModule.java   | 6 ++----
 .../modules/debug/interfaces/DeveloperSettings.java      | 6 ++----
 .../react/modules/deviceinfo/DeviceInfoModule.java       | 6 ++----
 .../com/facebook/react/modules/dialog/AlertFragment.java | 6 ++----
 .../com/facebook/react/modules/dialog/DialogModule.java  | 6 ++----
 .../react/modules/dialog/SupportAlertFragment.java       | 6 ++----
 .../com/facebook/react/modules/fresco/FrescoModule.java  | 6 ++----
 .../react/modules/fresco/ReactNetworkImageRequest.java   | 8 +++-----
 .../react/modules/fresco/ReactOkHttpNetworkFetcher.java  | 8 +++-----
 .../react/modules/i18nmanager/I18nManagerModule.java     | 6 ++----
 .../com/facebook/react/modules/i18nmanager/I18nUtil.java | 6 ++----
 .../facebook/react/modules/image/ImageLoaderModule.java  | 6 ++----
 .../com/facebook/react/modules/intent/IntentModule.java  | 6 ++----
 .../facebook/react/modules/location/LocationModule.java  | 6 ++----
 .../facebook/react/modules/location/PositionError.java   | 6 ++----
 .../facebook/react/modules/netinfo/NetInfoModule.java    | 6 ++----
 .../react/modules/network/NetworkInterceptorCreator.java | 6 ++----
 .../facebook/react/modules/network/NetworkingModule.java | 6 ++----
 .../react/modules/network/OkHttpClientFactory.java       | 6 ++----
 .../react/modules/network/OkHttpClientProvider.java      | 6 ++----
 .../facebook/react/modules/network/ProgressListener.java | 6 ++----
 .../react/modules/network/ProgressRequestBody.java       | 6 ++----
 .../react/modules/network/ProgressiveStringDecoder.java  | 6 ++----
 .../facebook/react/modules/network/RequestBodyUtil.java  | 6 ++----
 .../com/facebook/react/modules/network/ResponseUtil.java | 6 ++----
 .../facebook/react/modules/network/TLSSocketFactory.java | 6 ++----
 .../react/modules/permissions/PermissionsModule.java     | 6 ++----
 .../com/facebook/react/modules/share/ShareModule.java    | 6 ++----
 .../react/modules/statusbar/StatusBarModule.java         | 8 +++-----
 .../react/modules/storage/AsyncLocalStorageUtil.java     | 6 ++----
 .../react/modules/storage/AsyncStorageErrorUtil.java     | 6 ++----
 .../react/modules/storage/AsyncStorageModule.java        | 6 ++----
 .../react/modules/storage/ReactDatabaseSupplier.java     | 6 ++----
 .../react/modules/systeminfo/AndroidInfoModule.java      | 6 ++----
 .../react/modules/systeminfo/ReactNativeVersion.java     | 6 ++----
 .../modules/timepicker/DismissableTimePickerDialog.java  | 6 ++----
 .../timepicker/SupportTimePickerDialogFragment.java      | 6 ++----
 .../modules/timepicker/TimePickerDialogFragment.java     | 6 ++----
 .../react/modules/timepicker/TimePickerDialogModule.java | 6 ++----
 .../react/modules/timepicker/TimePickerMode.java         | 6 ++----
 .../com/facebook/react/modules/toast/ToastModule.java    | 6 ++----
 .../react/modules/vibration/VibrationModule.java         | 6 ++----
 .../react/modules/websocket/WebSocketModule.java         | 6 ++----
 .../facebook/react/packagerconnection/FileIoHandler.java | 6 ++----
 .../react/packagerconnection/JSPackagerClient.java       | 7 +++----
 .../packagerconnection/NotificationOnlyHandler.java      | 7 +++----
 .../packagerconnection/PackagerConnectionSettings.java   | 6 ++----
 .../react/packagerconnection/ReconnectingWebSocket.java  | 7 +++----
 .../react/packagerconnection/RequestHandler.java         | 7 +++----
 .../react/packagerconnection/RequestOnlyHandler.java     | 7 +++----
 .../com/facebook/react/packagerconnection/Responder.java | 7 +++----
 .../SamplingProfilerPackagerMethod.java                  | 6 ++----
 .../java/com/facebook/react/shell/MainPackageConfig.java | 6 ++----
 .../java/com/facebook/react/shell/MainReactPackage.java  | 6 ++----
 .../com/facebook/react/touch/JSResponderHandler.java     | 6 ++----
 .../react/touch/OnInterceptTouchEventListener.java       | 6 ++----
 .../java/com/facebook/react/touch/ReactHitSlopView.java  | 6 ++----
 .../facebook/react/touch/ReactInterceptingViewGroup.java | 6 ++----
 .../facebook/react/uimanager/AccessibilityHelper.java    | 6 ++----
 .../facebook/react/uimanager/DisplayMetricsHolder.java   | 6 ++----
 .../java/com/facebook/react/uimanager/FloatUtil.java     | 6 ++----
 .../facebook/react/uimanager/GuardedFrameCallback.java   | 6 ++----
 .../react/uimanager/IllegalViewOperationException.java   | 6 ++----
 .../com/facebook/react/uimanager/JSTouchDispatcher.java  | 6 ++----
 .../facebook/react/uimanager/MeasureSpecAssertions.java  | 6 ++----
 .../react/uimanager/NativeViewHierarchyManager.java      | 6 ++----
 .../react/uimanager/NativeViewHierarchyOptimizer.java    | 6 ++----
 .../react/uimanager/NoSuchNativeViewException.java       | 6 ++----
 .../java/com/facebook/react/uimanager/OnLayoutEvent.java | 6 ++----
 .../java/com/facebook/react/uimanager/PixelUtil.java     | 6 ++----
 .../java/com/facebook/react/uimanager/PointerEvents.java | 6 ++----
 .../facebook/react/uimanager/ReactClippingViewGroup.java | 6 ++----
 .../react/uimanager/ReactClippingViewGroupHelper.java    | 6 ++----
 .../com/facebook/react/uimanager/ReactCompoundView.java  | 6 ++----
 .../facebook/react/uimanager/ReactCompoundViewGroup.java | 6 ++----
 .../react/uimanager/ReactInvalidPropertyException.java   | 6 ++----
 .../facebook/react/uimanager/ReactPointerEventsView.java | 6 ++----
 .../com/facebook/react/uimanager/ReactShadowNode.java    | 7 +++----
 .../facebook/react/uimanager/ReactShadowNodeImpl.java    | 7 +++----
 .../com/facebook/react/uimanager/ReactStylesDiffMap.java | 6 ++----
 .../main/java/com/facebook/react/uimanager/RootView.java | 6 ++----
 .../com/facebook/react/uimanager/RootViewManager.java    | 6 ++----
 .../java/com/facebook/react/uimanager/RootViewUtil.java  | 6 ++----
 .../com/facebook/react/uimanager/ShadowNodeRegistry.java | 6 ++----
 .../com/facebook/react/uimanager/SimpleViewManager.java  | 6 ++----
 .../react/uimanager/SizeMonitoringFrameLayout.java       | 6 ++----
 .../main/java/com/facebook/react/uimanager/Spacing.java  | 6 ++----
 .../com/facebook/react/uimanager/ThemedReactContext.java | 6 ++----
 .../com/facebook/react/uimanager/TouchTargetHelper.java  | 6 ++----
 .../com/facebook/react/uimanager/UIImplementation.java   | 6 ++----
 .../react/uimanager/UIImplementationProvider.java        | 6 ++----
 .../com/facebook/react/uimanager/UIManagerModule.java    | 6 ++----
 .../react/uimanager/UIManagerModuleConstants.java        | 6 ++----
 .../react/uimanager/UIManagerModuleConstantsHelper.java  | 6 ++----
 .../react/uimanager/UIManagerModuleListener.java         | 6 ++----
 .../facebook/react/uimanager/UIViewOperationQueue.java   | 6 ++----
 .../java/com/facebook/react/uimanager/ViewAtIndex.java   | 6 ++----
 .../java/com/facebook/react/uimanager/ViewDefaults.java  | 6 ++----
 .../react/uimanager/ViewGroupDrawingOrderHelper.java     | 6 ++----
 .../com/facebook/react/uimanager/ViewGroupManager.java   | 6 ++----
 .../facebook/react/uimanager/ViewHierarchyDumper.java    | 6 ++----
 .../java/com/facebook/react/uimanager/ViewManager.java   | 6 ++----
 .../facebook/react/uimanager/ViewManagerRegistry.java    | 6 ++----
 .../java/com/facebook/react/uimanager/ViewProps.java     | 6 ++----
 .../NotThreadSafeViewHierarchyUpdateDebugListener.java   | 6 ++----
 .../java/com/facebook/react/uimanager/events/Event.java  | 6 ++----
 .../facebook/react/uimanager/events/EventDispatcher.java | 6 ++----
 .../react/uimanager/events/NativeGestureUtil.java        | 6 ++----
 .../facebook/react/uimanager/events/RCTEventEmitter.java | 6 ++----
 .../com/facebook/react/uimanager/events/TouchEvent.java  | 6 ++----
 .../uimanager/events/TouchEventCoalescingKeyHelper.java  | 6 ++----
 .../facebook/react/uimanager/events/TouchEventType.java  | 6 ++----
 .../facebook/react/uimanager/events/TouchesHelper.java   | 6 ++----
 .../main/java/com/facebook/react/util/JSStackTrace.java  | 6 ++----
 .../com/facebook/react/views/art/ARTGroupShadowNode.java | 6 ++----
 .../react/views/art/ARTRenderableViewManager.java        | 6 ++----
 .../com/facebook/react/views/art/ARTShapeShadowNode.java | 6 ++----
 .../com/facebook/react/views/art/ARTSurfaceView.java     | 6 ++----
 .../facebook/react/views/art/ARTSurfaceViewManager.java  | 6 ++----
 .../react/views/art/ARTSurfaceViewShadowNode.java        | 6 ++----
 .../com/facebook/react/views/art/ARTTextShadowNode.java  | 6 ++----
 .../com/facebook/react/views/art/ARTVirtualNode.java     | 6 ++----
 .../java/com/facebook/react/views/art/PropHelper.java    | 6 ++----
 .../com/facebook/react/views/checkbox/ReactCheckBox.java | 7 +++----
 .../react/views/checkbox/ReactCheckBoxEvent.java         | 7 +++----
 .../react/views/checkbox/ReactCheckBoxManager.java       | 7 +++----
 .../facebook/react/views/drawer/ReactDrawerLayout.java   | 6 ++----
 .../react/views/drawer/ReactDrawerLayoutManager.java     | 6 ++----
 .../react/views/drawer/events/DrawerClosedEvent.java     | 6 ++----
 .../react/views/drawer/events/DrawerOpenedEvent.java     | 6 ++----
 .../react/views/drawer/events/DrawerSlideEvent.java      | 6 ++----
 .../views/drawer/events/DrawerStateChangedEvent.java     | 6 ++----
 .../com/facebook/react/views/image/ImageLoadEvent.java   | 6 ++----
 .../facebook/react/views/image/ImageResizeMethod.java    | 6 ++----
 .../com/facebook/react/views/image/ImageResizeMode.java  | 6 ++----
 .../facebook/react/views/image/ReactImageManager.java    | 6 ++----
 .../com/facebook/react/views/image/ReactImageView.java   | 6 ++----
 .../facebook/react/views/imagehelper/ImageSource.java    | 6 ++----
 .../react/views/imagehelper/MultiSourceHelper.java       | 6 ++----
 .../views/imagehelper/ResourceDrawableIdHelper.java      | 6 ++----
 .../facebook/react/views/modal/ModalHostShadowNode.java  | 6 ++----
 .../react/views/modal/ReactModalHostManager.java         | 6 ++----
 .../facebook/react/views/modal/ReactModalHostView.java   | 6 ++----
 .../facebook/react/views/modal/RequestCloseEvent.java    | 6 ++----
 .../java/com/facebook/react/views/modal/ShowEvent.java   | 6 ++----
 .../react/views/picker/ReactDialogPickerManager.java     | 6 ++----
 .../react/views/picker/ReactDropdownPickerManager.java   | 6 ++----
 .../com/facebook/react/views/picker/ReactPicker.java     | 6 ++----
 .../facebook/react/views/picker/ReactPickerManager.java  | 6 ++----
 .../react/views/picker/events/PickerItemSelectEvent.java | 6 ++----
 .../react/views/progressbar/ProgressBarShadowNode.java   | 6 ++----
 .../views/progressbar/ReactProgressBarViewManager.java   | 6 ++----
 .../com/facebook/react/views/scroll/FpsListener.java     | 6 ++----
 .../react/views/scroll/OnScrollDispatchHelper.java       | 6 ++----
 .../react/views/scroll/ReactHorizontalScrollView.java    | 6 ++----
 .../views/scroll/ReactHorizontalScrollViewManager.java   | 6 ++----
 .../com/facebook/react/views/scroll/ReactScrollView.java | 6 ++----
 .../react/views/scroll/ReactScrollViewCommandHelper.java | 6 ++----
 .../react/views/scroll/ReactScrollViewHelper.java        | 6 ++----
 .../react/views/scroll/ReactScrollViewManager.java       | 6 ++----
 .../com/facebook/react/views/scroll/ScrollEvent.java     | 6 ++----
 .../com/facebook/react/views/scroll/ScrollEventType.java | 6 ++----
 .../com/facebook/react/views/scroll/VelocityHelper.java  | 6 ++----
 .../com/facebook/react/views/slider/ReactSlider.java     | 6 ++----
 .../facebook/react/views/slider/ReactSliderEvent.java    | 6 ++----
 .../facebook/react/views/slider/ReactSliderManager.java  | 6 ++----
 .../react/views/slider/ReactSlidingCompleteEvent.java    | 6 ++----
 .../views/swiperefresh/ReactSwipeRefreshLayout.java      | 6 ++----
 .../facebook/react/views/swiperefresh/RefreshEvent.java  | 6 ++----
 .../views/swiperefresh/SwipeRefreshLayoutManager.java    | 6 ++----
 .../com/facebook/react/views/switchview/ReactSwitch.java | 6 ++----
 .../react/views/switchview/ReactSwitchEvent.java         | 6 ++----
 .../react/views/switchview/ReactSwitchManager.java       | 6 ++----
 .../facebook/react/views/text/CustomLineHeightSpan.java  | 6 ++----
 .../com/facebook/react/views/text/CustomStyleSpan.java   | 6 ++----
 .../react/views/text/DefaultStyleValuesUtil.java         | 6 ++----
 .../react/views/text/ReactBaseTextShadowNode.java        | 7 +++----
 .../com/facebook/react/views/text/ReactFontManager.java  | 9 ++++-----
 .../facebook/react/views/text/ReactRawTextManager.java   | 6 ++----
 .../react/views/text/ReactRawTextShadowNode.java         | 7 +++----
 .../java/com/facebook/react/views/text/ReactTagSpan.java | 6 ++----
 .../react/views/text/ReactTextAnchorViewManager.java     | 6 ++----
 .../react/views/text/ReactTextInlineImageShadowNode.java | 6 ++----
 .../facebook/react/views/text/ReactTextShadowNode.java   | 6 ++----
 .../com/facebook/react/views/text/ReactTextUpdate.java   | 6 ++----
 .../com/facebook/react/views/text/ReactTextView.java     | 6 ++----
 .../facebook/react/views/text/ReactTextViewManager.java  | 6 ++----
 .../react/views/text/ReactVirtualTextViewManager.java    | 6 ++----
 .../com/facebook/react/views/text/ShadowStyleSpan.java   | 6 ++----
 .../facebook/react/views/text/TextInlineImageSpan.java   | 6 ++----
 .../FrescoBasedReactTextInlineImageShadowNode.java       | 6 ++----
 .../FrescoBasedReactTextInlineImageSpan.java             | 6 ++----
 .../FrescoBasedReactTextInlineImageViewManager.java      | 6 ++----
 .../react/views/textinput/ContentSizeWatcher.java        | 6 ++----
 .../views/textinput/ReactContentSizeChangedEvent.java    | 6 ++----
 .../facebook/react/views/textinput/ReactEditText.java    | 6 ++----
 .../textinput/ReactEditTextInputConnectionWrapper.java   | 6 ++----
 .../react/views/textinput/ReactTextChangedEvent.java     | 6 ++----
 .../react/views/textinput/ReactTextInputBlurEvent.java   | 6 ++----
 .../views/textinput/ReactTextInputEndEditingEvent.java   | 6 ++----
 .../react/views/textinput/ReactTextInputEvent.java       | 6 ++----
 .../react/views/textinput/ReactTextInputFocusEvent.java  | 6 ++----
 .../views/textinput/ReactTextInputKeyPressEvent.java     | 6 ++----
 .../react/views/textinput/ReactTextInputLocalData.java   | 6 ++----
 .../react/views/textinput/ReactTextInputManager.java     | 6 ++----
 .../views/textinput/ReactTextInputSelectionEvent.java    | 6 ++----
 .../react/views/textinput/ReactTextInputShadowNode.java  | 6 ++----
 .../textinput/ReactTextInputSubmitEditingEvent.java      | 6 ++----
 .../facebook/react/views/textinput/ScrollWatcher.java    | 6 ++----
 .../facebook/react/views/textinput/SelectionWatcher.java | 6 ++----
 .../react/views/toolbar/DrawableWithIntrinsicSize.java   | 6 ++----
 .../com/facebook/react/views/toolbar/ReactToolbar.java   | 6 ++----
 .../react/views/toolbar/ReactToolbarManager.java         | 6 ++----
 .../react/views/toolbar/events/ToolbarClickEvent.java    | 6 ++----
 .../java/com/facebook/react/views/view/ColorUtil.java    | 6 ++----
 .../facebook/react/views/view/ReactDrawableHelper.java   | 6 ++----
 .../react/views/view/ReactViewBackgroundDrawable.java    | 6 ++----
 .../com/facebook/react/views/view/ReactViewGroup.java    | 6 ++----
 .../com/facebook/react/views/view/ReactViewManager.java  | 6 ++----
 .../facebook/react/views/viewpager/PageScrollEvent.java  | 6 ++----
 .../views/viewpager/PageScrollStateChangedEvent.java     | 6 ++----
 .../react/views/viewpager/PageSelectedEvent.java         | 6 ++----
 .../facebook/react/views/viewpager/ReactViewPager.java   | 6 ++----
 .../react/views/viewpager/ReactViewPagerManager.java     | 6 ++----
 .../react/views/webview/ReactWebViewManager.java         | 6 ++----
 .../com/facebook/react/views/webview/WebViewConfig.java  | 6 ++----
 .../react/views/webview/events/TopLoadingErrorEvent.java | 6 ++----
 .../views/webview/events/TopLoadingFinishEvent.java      | 6 ++----
 .../react/views/webview/events/TopLoadingStartEvent.java | 6 ++----
 .../react/views/webview/events/TopMessageEvent.java      | 6 ++----
 .../src/main/java/com/facebook/systrace/Systrace.java    | 6 ++----
 .../main/java/com/facebook/systrace/SystraceMessage.java | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaAlign.java       | 6 ++----
 .../java/com/facebook/yoga/YogaBaselineFunction.java     | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaConfig.java      | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaConstants.java   | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaDimension.java   | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaDirection.java   | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaDisplay.java     | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaEdge.java        | 6 ++----
 .../java/com/facebook/yoga/YogaExperimentalFeature.java  | 6 ++----
 .../main/java/com/facebook/yoga/YogaFlexDirection.java   | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaJustify.java     | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaLogLevel.java    | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaLogger.java      | 6 ++----
 .../main/java/com/facebook/yoga/YogaMeasureFunction.java | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaMeasureMode.java | 6 ++----
 .../main/java/com/facebook/yoga/YogaMeasureOutput.java   | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaNode.java        | 6 ++----
 .../java/com/facebook/yoga/YogaNodeClonedFunction.java   | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaNodeType.java    | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaOverflow.java    | 6 ++----
 .../main/java/com/facebook/yoga/YogaPositionType.java    | 6 ++----
 .../main/java/com/facebook/yoga/YogaPrintOptions.java    | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaUnit.java        | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaValue.java       | 6 ++----
 .../src/main/java/com/facebook/yoga/YogaWrap.java        | 6 ++----
 ReactAndroid/src/main/jni/first-party/fb/assert.cpp      | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/ALog.h        | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/Countable.h   | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/Environment.h | 6 ++----
 .../main/jni/first-party/fb/include/fb/ProgramLocation.h | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/RefPtr.h      | 6 ++----
 .../jni/first-party/fb/include/fb/StaticInitialized.h    | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/ThreadLocal.h | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/assert.h      | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/fbjni.h       | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h | 6 ++----
 .../jni/first-party/fb/include/fb/fbjni/ByteBuffer.h     | 6 ++----
 .../main/jni/first-party/fb/include/fb/fbjni/Common.h    | 6 ++----
 .../main/jni/first-party/fb/include/fb/fbjni/Context.h   | 6 ++----
 .../first-party/fb/include/fb/fbjni/CoreClasses-inl.h    | 6 ++----
 .../jni/first-party/fb/include/fb/fbjni/CoreClasses.h    | 6 ++----
 .../jni/first-party/fb/include/fb/fbjni/Exceptions.h     | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/fbjni/File.h  | 6 ++----
 .../main/jni/first-party/fb/include/fb/fbjni/Hybrid.h    | 6 ++----
 .../jni/first-party/fb/include/fb/fbjni/Iterator-inl.h   | 6 ++----
 .../main/jni/first-party/fb/include/fb/fbjni/Iterator.h  | 6 ++----
 .../main/jni/first-party/fb/include/fb/fbjni/JThread.h   | 6 ++----
 .../jni/first-party/fb/include/fb/fbjni/Meta-forward.h   | 6 ++----
 .../main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h  | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/fbjni/Meta.h  | 6 ++----
 .../jni/first-party/fb/include/fb/fbjni/NativeRunnable.h | 6 ++----
 .../fb/include/fb/fbjni/ReferenceAllocators-inl.h        | 6 ++----
 .../fb/include/fb/fbjni/ReferenceAllocators.h            | 6 ++----
 .../first-party/fb/include/fb/fbjni/References-forward.h | 6 ++----
 .../jni/first-party/fb/include/fb/fbjni/References-inl.h | 6 ++----
 .../jni/first-party/fb/include/fb/fbjni/References.h     | 6 ++----
 .../first-party/fb/include/fb/fbjni/Registration-inl.h   | 6 ++----
 .../jni/first-party/fb/include/fb/fbjni/Registration.h   | 6 ++----
 .../jni/first-party/fb/include/fb/fbjni/TypeTraits.h     | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/noncopyable.h | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/nonmovable.h  | 6 ++----
 .../src/main/jni/first-party/fb/include/fb/visibility.h  | 6 ++----
 .../src/main/jni/first-party/fb/include/jni/Countable.h  | 6 ++----
 .../jni/first-party/fb/include/jni/GlobalReference.h     | 6 ++----
 .../jni/first-party/fb/include/jni/JniTerminateHandler.h | 6 ++----
 .../main/jni/first-party/fb/include/jni/LocalReference.h | 6 ++----
 .../main/jni/first-party/fb/include/jni/LocalString.h    | 6 ++----
 .../main/jni/first-party/fb/include/jni/Registration.h   | 6 ++----
 .../main/jni/first-party/fb/include/jni/WeakReference.h  | 6 ++----
 .../main/jni/first-party/fb/include/jni/jni_helpers.h    | 6 ++----
 .../src/main/jni/first-party/fb/jni/ByteBuffer.cpp       | 6 ++----
 .../src/main/jni/first-party/fb/jni/Countable.cpp        | 6 ++----
 .../src/main/jni/first-party/fb/jni/Environment.cpp      | 6 ++----
 .../src/main/jni/first-party/fb/jni/Exceptions.cpp       | 6 ++----
 ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp  | 6 ++----
 .../src/main/jni/first-party/fb/jni/LocalString.cpp      | 6 ++----
 ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp  | 6 ++----
 .../src/main/jni/first-party/fb/jni/References.cpp       | 6 ++----
 .../src/main/jni/first-party/fb/jni/WeakReference.cpp    | 6 ++----
 .../jni/first-party/fb/jni/android/ReferenceChecking.cpp | 6 ++----
 ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp   | 6 ++----
 .../main/jni/first-party/fb/jni/java/CppException.java   | 6 ++----
 .../first-party/fb/jni/java/CppSystemErrorException.java | 6 ++----
 .../jni/first-party/fb/jni/java/UnknownCppException.java | 6 ++----
 .../src/main/jni/first-party/fb/jni/jni_helpers.cpp      | 6 ++----
 ReactAndroid/src/main/jni/first-party/fb/log.cpp         | 6 ++----
 ReactAndroid/src/main/jni/first-party/fb/onload.cpp      | 6 ++----
 ReactAndroid/src/main/jni/first-party/jni-hack/BUCK      | 6 ++----
 ReactAndroid/src/main/jni/first-party/jni-hack/jni.h     | 6 ++----
 .../src/main/jni/first-party/yogajni/jni/YGJNI.cpp       | 6 ++----
 .../com/facebook/common/logging/FakeLoggingDelegate.java | 6 ++----
 .../com/facebook/react/CompositeReactPackageTest.java    | 6 ++----
 .../src/test/java/com/facebook/react/RootViewTest.java   | 6 ++----
 .../react/animated/NativeAnimatedNodeTraversalTest.java  | 6 ++----
 .../com/facebook/react/bridge/BaseJavaModuleTest.java    | 6 ++----
 .../react/bridge/FallbackJSBundleLoaderTest.java         | 6 ++----
 .../com/facebook/react/bridge/JavaOnlyArrayTest.java     | 6 ++----
 .../java/com/facebook/react/bridge/JsonWriterTest.java   | 6 ++----
 .../java/com/facebook/react/bridge/ModuleSpecTest.java   | 6 ++----
 .../java/com/facebook/react/bridge/ReactTestHelper.java  | 6 ++----
 .../react/devsupport/JSDebuggerWebSocketClientTest.java  | 6 ++----
 .../react/devsupport/MultipartStreamReaderTest.java      | 6 ++----
 .../facebook/react/devsupport/StackTraceHelperTest.java  | 6 ++----
 .../com/facebook/react/modules/blob/BlobModuleTest.java  | 6 ++----
 .../react/modules/camera/ImageStoreManagerTest.java      | 6 ++----
 .../react/modules/clipboard/ClipboardModuleTest.java     | 6 ++----
 .../facebook/react/modules/dialog/DialogModuleTest.java  | 6 ++----
 .../react/modules/network/NetworkingModuleTest.java      | 6 ++----
 .../modules/network/ProgressiveStringDecoderTest.java    | 6 ++----
 .../facebook/react/modules/share/ShareModuleTest.java    | 6 ++----
 .../react/modules/storage/AsyncStorageModuleTest.java    | 6 ++----
 .../facebook/react/modules/timing/TimingModuleTest.java  | 6 ++----
 .../react/packagerconnection/JSPackagerClientTest.java   | 6 ++----
 .../react/uimanager/LayoutPropertyApplicatorTest.java    | 6 ++----
 .../uimanager/ReactPropAnnotationSetterSpecTest.java     | 6 ++----
 .../react/uimanager/ReactPropAnnotationSetterTest.java   | 6 ++----
 .../facebook/react/uimanager/ReactPropConstantsTest.java | 6 ++----
 .../uimanager/ReactPropForShadowNodeSetterTest.java      | 6 ++----
 .../react/uimanager/ReactPropForShadowNodeSpecTest.java  | 6 ++----
 .../facebook/react/uimanager/SimpleViewPropertyTest.java | 6 ++----
 .../react/uimanager/UIManagerModuleConstantsTest.java    | 6 ++----
 .../facebook/react/uimanager/UIManagerModuleTest.java    | 6 ++----
 .../facebook/react/views/image/ImageResizeModeTest.java  | 6 ++----
 .../react/views/image/ReactImagePropertyTest.java        | 6 ++----
 .../react/views/slider/ReactSliderPropertyTest.java      | 6 ++----
 .../com/facebook/react/views/text/ReactTextTest.java     | 6 ++----
 .../views/textinput/ReactTextInputPropertyTest.java      | 6 ++----
 .../facebook/react/views/textinput/TextInputTest.java    | 6 ++----
 .../com/facebook/react/views/view/ColorUtilTest.java     | 6 ++----
 .../org/mockito/configuration/MockitoConfiguration.java  | 6 ++----
 ReactCommon/jschelpers/JSCWrapper.cpp                    | 6 ++----
 ReactCommon/jschelpers/JSCWrapper.h                      | 6 ++----
 ReactCommon/jschelpers/JavaScriptCore.h                  | 6 ++----
 ReactCommon/jschelpers/systemJSCWrapper.cpp              | 6 ++----
 ReactCommon/jsinspector/InspectorInterfaces.cpp          | 6 ++----
 ReactCommon/jsinspector/InspectorInterfaces.h            | 6 ++----
 ReactCommon/yoga/yoga/Utils.cpp                          | 6 ++----
 ReactCommon/yoga/yoga/Utils.h                            | 6 ++----
 ReactCommon/yoga/yoga/YGEnums.cpp                        | 6 ++----
 ReactCommon/yoga/yoga/YGEnums.h                          | 6 ++----
 ReactCommon/yoga/yoga/YGMacros.h                         | 6 ++----
 ReactCommon/yoga/yoga/YGNode.cpp                         | 6 ++----
 ReactCommon/yoga/yoga/YGNode.h                           | 6 ++----
 ReactCommon/yoga/yoga/YGNodePrint.cpp                    | 6 ++----
 ReactCommon/yoga/yoga/YGNodePrint.h                      | 6 ++----
 ReactCommon/yoga/yoga/Yoga-internal.h                    | 6 ++----
 ReactCommon/yoga/yoga/Yoga.cpp                           | 6 ++----
 ReactCommon/yoga/yoga/Yoga.h                             | 6 ++----
 babel-preset/configs/hmr.js                              | 6 ++----
 babel-preset/configs/main.js                             | 6 ++----
 babel-preset/index.js                                    | 6 ++----
 babel-preset/lib/resolvePlugins.js                       | 6 ++----
 babel-preset/plugins.js                                  | 6 ++----
 bots/code-analysis-bot.js                                | 6 ++----
 bots/dangerfile.js                                       | 6 ++----
 cli.js                                                   | 6 ++----
 flow-github/metro.js                                     | 6 ++----
 flow/Map.js                                              | 6 ++----
 flow/Position.js                                         | 6 ++----
 flow/Promise.js                                          | 6 ++----
 flow/Set.js                                              | 6 ++----
 flow/console.js                                          | 6 ++----
 flow/create-react-class.js                               | 6 ++----
 flow/fbjs.js                                             | 6 ++----
 flow/prop-types.js                                       | 6 ++----
 jest/assetFileTransformer.js                             | 6 ++----
 jest/mockComponent.js                                    | 6 ++----
 jest/preprocessor.js                                     | 6 ++----
 jest/setup.js                                            | 6 ++----
 lib/InitializeJavaScriptAppEngine.js                     | 6 ++----
 lib/RCTEventEmitter.js                                   | 6 ++----
 lib/TextInputState.js                                    | 6 ++----
 lib/UIManager.js                                         | 6 ++----
 lib/UIManagerStatTracker.js                              | 6 ++----
 lib/View.js                                              | 6 ++----
 lib/deepDiffer.js                                        | 6 ++----
 lib/deepFreezeAndThrowOnMutationInDev.js                 | 6 ++----
 lib/flattenStyle.js                                      | 6 ++----
 local-cli/__mocks__/beeper.js                            | 6 ++----
 local-cli/__mocks__/fs.js                                | 6 ++----
 local-cli/__tests__/fs-mock-test.js                      | 6 ++----
 local-cli/bundle/__mocks__/sign.js                       | 6 ++----
 .../bundle/__tests__/filterPlatformAssetScales-test.js   | 6 ++----
 .../bundle/__tests__/getAssetDestPathAndroid-test.js     | 6 ++----
 local-cli/bundle/__tests__/getAssetDestPathIOS-test.js   | 6 ++----
 local-cli/bundle/assetPathUtils.js                       | 6 ++----
 local-cli/bundle/buildBundle.js                          | 6 ++----
 local-cli/bundle/bundle.js                               | 6 ++----
 local-cli/bundle/bundleCommandLineArgs.js                | 6 ++----
 local-cli/bundle/filterPlatformAssetScales.js            | 6 ++----
 local-cli/bundle/getAssetDestPathAndroid.js              | 6 ++----
 local-cli/bundle/getAssetDestPathIOS.js                  | 6 ++----
 local-cli/bundle/saveAssets.js                           | 6 ++----
 local-cli/bundle/types.flow.js                           | 6 ++----
 local-cli/bundle/unbundle.js                             | 6 ++----
 local-cli/cli.js                                         | 6 ++----
 local-cli/cliEntry.js                                    | 6 ++----
 local-cli/commands.js                                    | 6 ++----
 local-cli/core/Constants.js                              | 6 ++----
 .../core/__tests__/android/findAndroidAppFolder.spec.js  | 6 ++----
 local-cli/core/__tests__/android/findManifest.spec.js    | 6 ++----
 .../core/__tests__/android/findPackageClassName.spec.js  | 6 ++----
 .../core/__tests__/android/getDependencyConfig.spec.js   | 6 ++----
 .../core/__tests__/android/getProjectConfig.spec.js      | 6 ++----
 local-cli/core/__tests__/android/readManifest.spec.js    | 6 ++----
 local-cli/core/__tests__/findAssets.spec.js              | 6 ++----
 local-cli/core/__tests__/findPlugins.spec.js             | 6 ++----
 local-cli/core/__tests__/ios/findPodfilePath.spec.js     | 6 ++----
 local-cli/core/__tests__/ios/findPodspecName.spec.js     | 6 ++----
 local-cli/core/__tests__/ios/findProject.spec.js         | 6 ++----
 local-cli/core/__tests__/ios/getProjectConfig.spec.js    | 6 ++----
 local-cli/core/__tests__/makeCommand.spec.js             | 6 ++----
 local-cli/core/android/findAndroidAppFolder.js           | 6 ++----
 local-cli/core/android/findManifest.js                   | 6 ++----
 local-cli/core/android/findPackageClassName.js           | 6 ++----
 local-cli/core/android/index.js                          | 6 ++----
 local-cli/core/android/readManifest.js                   | 6 ++----
 local-cli/core/findAssets.js                             | 6 ++----
 local-cli/core/findPlugins.js                            | 6 ++----
 local-cli/core/index.js                                  | 6 ++----
 local-cli/core/ios/findProject.js                        | 6 ++----
 local-cli/core/ios/index.js                              | 6 ++----
 local-cli/core/makeCommand.js                            | 6 ++----
 local-cli/core/wrapCommands.js                           | 6 ++----
 local-cli/dependencies/dependencies.js                   | 6 ++----
 local-cli/eject/eject.js                                 | 6 ++----
 local-cli/generator/copyProjectTemplateAndReplace.js     | 6 ++----
 local-cli/generator/printRunInstructions.js              | 6 ++----
 local-cli/generator/templates.js                         | 6 ++----
 local-cli/info/info.js                                   | 6 ++----
 local-cli/init/init.js                                   | 6 ++----
 local-cli/install/install.js                             | 6 ++----
 local-cli/install/uninstall.js                           | 6 ++----
 local-cli/library/library.js                             | 6 ++----
 local-cli/link/__tests__/android/applyPatch.spec.js      | 6 ++----
 local-cli/link/__tests__/android/isInstalled.spec.js     | 6 ++----
 local-cli/link/__tests__/android/makeBuildPatch.spec.js  | 6 ++----
 local-cli/link/__tests__/android/makeImportPatch.spec.js | 6 ++----
 .../link/__tests__/android/makePackagePatch.spec.js      | 6 ++----
 .../link/__tests__/android/makeSettingsPatch.spec.js     | 6 ++----
 .../link/__tests__/android/makeStringsPatch.spec.js      | 6 ++----
 local-cli/link/__tests__/getDependencyConfig.spec.js     | 6 ++----
 local-cli/link/__tests__/getProjectDependencies.spec.js  | 6 ++----
 local-cli/link/__tests__/groupFilesByType.spec.js        | 6 ++----
 local-cli/link/__tests__/ios/addFileToProject.spec.js    | 6 ++----
 .../link/__tests__/ios/addProjectToLibraries.spec.js     | 6 ++----
 local-cli/link/__tests__/ios/addSharedLibraries.spec.js  | 6 ++----
 local-cli/link/__tests__/ios/createGroup.spec.js         | 6 ++----
 local-cli/link/__tests__/ios/getBuildProperty.spec.js    | 6 ++----
 local-cli/link/__tests__/ios/getGroup.spec.js            | 6 ++----
 local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js | 6 ++----
 local-cli/link/__tests__/ios/getHeadersInFolder.spec.js  | 6 ++----
 local-cli/link/__tests__/ios/getPlist.spec.js            | 6 ++----
 local-cli/link/__tests__/ios/getPlistPath.spec.js        | 6 ++----
 local-cli/link/__tests__/ios/getProducts.spec.js         | 6 ++----
 local-cli/link/__tests__/ios/getTargets.spec.js          | 6 ++----
 local-cli/link/__tests__/ios/hasLibraryImported.spec.js  | 6 ++----
 local-cli/link/__tests__/ios/isInstalled.spec.js         | 6 ++----
 .../link/__tests__/ios/mapHeaderSearchPaths.spec.js      | 6 ++----
 .../link/__tests__/ios/removeProjectFromLibraries.js     | 6 ++----
 .../link/__tests__/ios/removeProjectFromProject.spec.js  | 6 ++----
 local-cli/link/__tests__/ios/removeSharedLibrary.spec.js | 6 ++----
 local-cli/link/__tests__/ios/writePlist.spec.js          | 6 ++----
 local-cli/link/__tests__/link.spec.js                    | 6 ++----
 local-cli/link/__tests__/pods/findLineToAddPod.spec.js   | 6 ++----
 .../link/__tests__/pods/findMarkedLinesInPodfile.spec.js | 6 ++----
 local-cli/link/__tests__/pods/findPodTargetLine.spec.js  | 6 ++----
 local-cli/link/__tests__/pods/isInstalled.spec.js        | 6 ++----
 local-cli/link/__tests__/pods/removePodEntry.spec.js     | 6 ++----
 local-cli/link/__tests__/promiseWaterfall.spec.js        | 6 ++----
 local-cli/link/android/copyAssets.js                     | 6 ++----
 local-cli/link/android/fs.js                             | 6 ++----
 local-cli/link/android/isInstalled.js                    | 6 ++----
 local-cli/link/android/patches/applyParams.js            | 6 ++----
 local-cli/link/android/patches/applyPatch.js             | 6 ++----
 local-cli/link/android/patches/makeBuildPatch.js         | 6 ++----
 local-cli/link/android/patches/makeImportPatch.js        | 6 ++----
 local-cli/link/android/patches/makePackagePatch.js       | 6 ++----
 local-cli/link/android/patches/makeSettingsPatch.js      | 6 ++----
 local-cli/link/android/patches/makeStringsPatch.js       | 6 ++----
 local-cli/link/android/patches/revokePatch.js            | 6 ++----
 local-cli/link/android/registerNativeModule.js           | 6 ++----
 local-cli/link/android/unlinkAssets.js                   | 6 ++----
 local-cli/link/android/unregisterNativeModule.js         | 6 ++----
 local-cli/link/commandStub.js                            | 6 ++----
 local-cli/link/getDependencyConfig.js                    | 6 ++----
 local-cli/link/getProjectDependencies.js                 | 6 ++----
 local-cli/link/groupFilesByType.js                       | 6 ++----
 local-cli/link/ios/addFileToProject.js                   | 6 ++----
 local-cli/link/ios/addProjectToLibraries.js              | 6 ++----
 local-cli/link/ios/addSharedLibraries.js                 | 6 ++----
 local-cli/link/ios/addToHeaderSearchPaths.js             | 6 ++----
 local-cli/link/ios/copyAssets.js                         | 6 ++----
 local-cli/link/ios/createGroup.js                        | 6 ++----
 local-cli/link/ios/createGroupWithMessage.js             | 6 ++----
 local-cli/link/ios/getBuildProperty.js                   | 6 ++----
 local-cli/link/ios/getGroup.js                           | 6 ++----
 local-cli/link/ios/getHeaderSearchPath.js                | 6 ++----
 local-cli/link/ios/getHeadersInFolder.js                 | 6 ++----
 local-cli/link/ios/getPlist.js                           | 6 ++----
 local-cli/link/ios/getPlistPath.js                       | 6 ++----
 local-cli/link/ios/getProducts.js                        | 6 ++----
 local-cli/link/ios/getTargets.js                         | 6 ++----
 local-cli/link/ios/hasLibraryImported.js                 | 6 ++----
 local-cli/link/ios/isInstalled.js                        | 6 ++----
 local-cli/link/ios/mapHeaderSearchPaths.js               | 6 ++----
 local-cli/link/ios/registerNativeModule.js               | 6 ++----
 local-cli/link/ios/removeFromHeaderSearchPaths.js        | 6 ++----
 .../link/ios/removeFromPbxItemContainerProxySection.js   | 6 ++----
 local-cli/link/ios/removeFromPbxReferenceProxySection.js | 6 ++----
 local-cli/link/ios/removeFromProjectReferences.js        | 6 ++----
 local-cli/link/ios/removeFromStaticLibraries.js          | 6 ++----
 local-cli/link/ios/removeProductGroup.js                 | 6 ++----
 local-cli/link/ios/removeProjectFromLibraries.js         | 6 ++----
 local-cli/link/ios/removeProjectFromProject.js           | 6 ++----
 local-cli/link/ios/removeSharedLibraries.js              | 6 ++----
 local-cli/link/ios/unlinkAssets.js                       | 6 ++----
 local-cli/link/ios/unregisterNativeModule.js             | 6 ++----
 local-cli/link/ios/writePlist.js                         | 6 ++----
 local-cli/link/link.js                                   | 6 ++----
 local-cli/link/pods/addPodEntry.js                       | 6 ++----
 local-cli/link/pods/findLineToAddPod.js                  | 6 ++----
 local-cli/link/pods/findMarkedLinesInPodfile.js          | 6 ++----
 local-cli/link/pods/findPodTargetLine.js                 | 6 ++----
 local-cli/link/pods/isInstalled.js                       | 6 ++----
 local-cli/link/pods/readPodfile.js                       | 6 ++----
 local-cli/link/pods/registerNativeModule.js              | 6 ++----
 local-cli/link/pods/removePodEntry.js                    | 6 ++----
 local-cli/link/pods/savePodFile.js                       | 6 ++----
 local-cli/link/pods/unregisterNativeModule.js            | 6 ++----
 local-cli/link/pollParams.js                             | 6 ++----
 local-cli/link/promiseWaterfall.js                       | 6 ++----
 local-cli/link/promisify.js                              | 6 ++----
 local-cli/link/unlink.js                                 | 6 ++----
 local-cli/logAndroid/logAndroid.js                       | 6 ++----
 local-cli/logIOS/logIOS.js                               | 6 ++----
 local-cli/runAndroid/adb.js                              | 6 ++----
 local-cli/runAndroid/runAndroid.js                       | 6 ++----
 local-cli/runIOS/__tests__/findMatchingSimulator-test.js | 6 ++----
 local-cli/runIOS/__tests__/findXcodeProject-test.js      | 6 ++----
 local-cli/runIOS/__tests__/parseIOSDevicesList-test.js   | 6 ++----
 local-cli/runIOS/findXcodeProject.js                     | 6 ++----
 local-cli/runIOS/parseIOSDevicesList.js                  | 6 ++----
 local-cli/runIOS/runIOS.js                               | 6 ++----
 local-cli/server/checkNodeVersion.js                     | 6 ++----
 local-cli/server/middleware/copyToClipBoardMiddleware.js | 6 ++----
 local-cli/server/middleware/getDevToolsMiddleware.js     | 6 ++----
 local-cli/server/middleware/indexPage.js                 | 6 ++----
 local-cli/server/middleware/loadRawBodyMiddleware.js     | 6 ++----
 .../middleware/openStackFrameInEditorMiddleware.js       | 6 ++----
 local-cli/server/middleware/statusPageMiddleware.js      | 6 ++----
 local-cli/server/middleware/systraceProfileMiddleware.js | 6 ++----
 local-cli/server/middleware/unless.js                    | 6 ++----
 local-cli/server/runServer.js                            | 6 ++----
 local-cli/server/server.js                               | 6 ++----
 local-cli/server/util/attachWebsocketServer.js           | 6 ++----
 local-cli/server/util/copyToClipBoard.js                 | 6 ++----
 local-cli/server/util/debugger-ui/DeltaPatcher.js        | 6 ++----
 local-cli/server/util/debugger-ui/debuggerWorker.js      | 6 ++----
 local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js   | 6 ++----
 local-cli/server/util/debugger-ui/index.html             | 8 +++-----
 local-cli/server/util/jsPackagerClient.js                | 6 ++----
 local-cli/server/util/launchChrome.js                    | 6 ++----
 local-cli/server/util/launchEditor.js                    | 6 ++----
 local-cli/server/util/messageSocket.js                   | 6 ++----
 local-cli/server/util/webSocketProxy.js                  | 6 ++----
 local-cli/setup_env.bat                                  | 6 ++----
 local-cli/setup_env.sh                                   | 6 ++----
 .../HelloNavigation/components/KeyboardSpacer.js         | 6 ++----
 .../templates/HelloWorld/ios/HelloWorld/AppDelegate.h    | 6 ++----
 .../templates/HelloWorld/ios/HelloWorld/AppDelegate.m    | 6 ++----
 local-cli/templates/HelloWorld/ios/HelloWorld/main.m     | 6 ++----
 .../HelloWorld/ios/HelloWorldTests/HelloWorldTests.m     | 6 ++----
 local-cli/upgrade/upgrade.js                             | 6 ++----
 local-cli/util/Config.js                                 | 6 ++----
 local-cli/util/PackageManager.js                         | 6 ++----
 local-cli/util/__mocks__/log.js                          | 6 ++----
 local-cli/util/__tests__/findSymlinkedModules-test.js    | 6 ++----
 local-cli/util/assertRequiredOptions.js                  | 6 ++----
 local-cli/util/copyAndReplace.js                         | 6 ++----
 local-cli/util/findReactNativeScripts.js                 | 6 ++----
 local-cli/util/findSymlinkedModules.js                   | 6 ++----
 local-cli/util/findSymlinksPaths.js                      | 6 ++----
 local-cli/util/isPackagerRunning.js                      | 6 ++----
 local-cli/util/isValidPackageName.js                     | 6 ++----
 local-cli/util/log.js                                    | 6 ++----
 local-cli/util/parseCommandLine.js                       | 6 ++----
 local-cli/util/walk.js                                   | 6 ++----
 local-cli/util/yarn.js                                   | 6 ++----
 local-cli/wrong-react-native.js                          | 6 ++----
 react-native-cli/index.js                                | 6 ++----
 react-native-git-upgrade/checks.js                       | 6 ++----
 react-native-git-upgrade/cli.js                          | 6 ++----
 react-native-git-upgrade/cliEntry.js                     | 6 ++----
 react-native-git-upgrade/index.js                        | 6 ++----
 react-native-git-upgrade/yarn.js                         | 6 ++----
 rn-cli.config.js                                         | 6 ++----
 rn-get-polyfills.js                                      | 6 ++----
 scripts/android-e2e-test.js                              | 6 ++----
 scripts/bump-oss-version.js                              | 6 ++----
 scripts/launchPackager.bat                               | 6 ++----
 scripts/launchPackager.command                           | 6 ++----
 scripts/packager.sh                                      | 6 ++----
 scripts/publish-npm.js                                   | 6 ++----
 scripts/react-native-xcode.sh                            | 6 ++----
 scripts/run-android-ci-instrumentation-tests.js          | 6 ++----
 scripts/run-ci-e2e-tests.js                              | 6 ++----
 scripts/try-n-times.js                                   | 6 ++----
 scripts/versiontemplates/RCTVersion.h.template           | 6 ++----
 .../versiontemplates/ReactNativeVersion.java.template    | 6 ++----
 scripts/versiontemplates/ReactNativeVersion.js.template  | 6 ++----
 setupBabel.js                                            | 6 ++----
 2086 files changed, 4252 insertions(+), 8360 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 34a94428f2542b..96152932684a48 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -141,11 +141,9 @@ Copy and paste this to the top of your new file(s):
 ```JS
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 ```
 
diff --git a/ContainerShip/scripts/run-android-ci-instrumentation-tests.js b/ContainerShip/scripts/run-android-ci-instrumentation-tests.js
index 34ee3336a168d2..706159c4902bc4 100644
--- a/ContainerShip/scripts/run-android-ci-instrumentation-tests.js
+++ b/ContainerShip/scripts/run-android-ci-instrumentation-tests.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/IntegrationTests/AccessibilityManagerTest.js b/IntegrationTests/AccessibilityManagerTest.js
index dfa9e9a19f289d..74dbe9ba19edab 100644
--- a/IntegrationTests/AccessibilityManagerTest.js
+++ b/IntegrationTests/AccessibilityManagerTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AccessibilityManagerTest
diff --git a/IntegrationTests/AppEventsTest.js b/IntegrationTests/AppEventsTest.js
index 62299ec337858d..ae061e167b86d8 100644
--- a/IntegrationTests/AppEventsTest.js
+++ b/IntegrationTests/AppEventsTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AppEventsTest
  * @flow
diff --git a/IntegrationTests/AsyncStorageTest.js b/IntegrationTests/AsyncStorageTest.js
index ef7df1f1f365e5..3ce0265dd8ceb0 100644
--- a/IntegrationTests/AsyncStorageTest.js
+++ b/IntegrationTests/AsyncStorageTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AsyncStorageTest
diff --git a/IntegrationTests/ImageCachePolicyTest.js b/IntegrationTests/ImageCachePolicyTest.js
index 29b5e68d1d2117..d6fa4f544a1bf9 100644
--- a/IntegrationTests/ImageCachePolicyTest.js
+++ b/IntegrationTests/ImageCachePolicyTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ImageCachePolicyTest
diff --git a/IntegrationTests/ImageSnapshotTest.js b/IntegrationTests/ImageSnapshotTest.js
index ccb232796927ca..8ba7734286d673 100644
--- a/IntegrationTests/ImageSnapshotTest.js
+++ b/IntegrationTests/ImageSnapshotTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ImageSnapshotTest
diff --git a/IntegrationTests/IntegrationTestHarnessTest.js b/IntegrationTests/IntegrationTestHarnessTest.js
index 7c9f2527cabbd0..6291c915d68643 100644
--- a/IntegrationTests/IntegrationTestHarnessTest.js
+++ b/IntegrationTests/IntegrationTestHarnessTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule IntegrationTestHarnessTest
diff --git a/IntegrationTests/IntegrationTestsApp.js b/IntegrationTests/IntegrationTestsApp.js
index 0594e289b7b145..6b255c2befe54a 100644
--- a/IntegrationTests/IntegrationTestsApp.js
+++ b/IntegrationTests/IntegrationTestsApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule IntegrationTestsApp
diff --git a/IntegrationTests/LayoutEventsTest.js b/IntegrationTests/LayoutEventsTest.js
index ab7bc6040d113d..769ff98f6be8b5 100644
--- a/IntegrationTests/LayoutEventsTest.js
+++ b/IntegrationTests/LayoutEventsTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LayoutEventsTest
  * @flow
diff --git a/IntegrationTests/LoggingTestModule.js b/IntegrationTests/LoggingTestModule.js
index ec07f3271bf700..25b409353ce1d4 100644
--- a/IntegrationTests/LoggingTestModule.js
+++ b/IntegrationTests/LoggingTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LoggingTestModule
  */
diff --git a/IntegrationTests/PromiseTest.js b/IntegrationTests/PromiseTest.js
index 9cf8651e3a3511..f6a81e3d6d5d16 100644
--- a/IntegrationTests/PromiseTest.js
+++ b/IntegrationTests/PromiseTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule PromiseTest
diff --git a/IntegrationTests/PropertiesUpdateTest.js b/IntegrationTests/PropertiesUpdateTest.js
index a279c5aed0af08..623dc82c8ee94b 100644
--- a/IntegrationTests/PropertiesUpdateTest.js
+++ b/IntegrationTests/PropertiesUpdateTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  * @providesModule PropertiesUpdateTest
  */
 'use strict';
diff --git a/IntegrationTests/RCTRootViewIntegrationTestApp.js b/IntegrationTests/RCTRootViewIntegrationTestApp.js
index 3793938d7e5adf..a97873d2c3224e 100644
--- a/IntegrationTests/RCTRootViewIntegrationTestApp.js
+++ b/IntegrationTests/RCTRootViewIntegrationTestApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTRootViewIntegrationTestApp
  */
diff --git a/IntegrationTests/ReactContentSizeUpdateTest.js b/IntegrationTests/ReactContentSizeUpdateTest.js
index 3524ef92ed385e..c5f5ae80c246b0 100644
--- a/IntegrationTests/ReactContentSizeUpdateTest.js
+++ b/IntegrationTests/ReactContentSizeUpdateTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  * @providesModule ReactContentSizeUpdateTest
  */
 'use strict';
diff --git a/IntegrationTests/SimpleSnapshotTest.js b/IntegrationTests/SimpleSnapshotTest.js
index 3998118dda8f6e..1c0be2a431d469 100644
--- a/IntegrationTests/SimpleSnapshotTest.js
+++ b/IntegrationTests/SimpleSnapshotTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SimpleSnapshotTest
diff --git a/IntegrationTests/SizeFlexibilityUpdateTest.js b/IntegrationTests/SizeFlexibilityUpdateTest.js
index 77895f40006498..679694a0d631ce 100644
--- a/IntegrationTests/SizeFlexibilityUpdateTest.js
+++ b/IntegrationTests/SizeFlexibilityUpdateTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  * @providesModule SizeFlexibilityUpdateTest
  */
 'use strict';
diff --git a/IntegrationTests/SyncMethodTest.js b/IntegrationTests/SyncMethodTest.js
index 76bb70a81f41d7..6318eaa4f14282 100644
--- a/IntegrationTests/SyncMethodTest.js
+++ b/IntegrationTests/SyncMethodTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SyncMethodTest
diff --git a/IntegrationTests/TimersTest.js b/IntegrationTests/TimersTest.js
index ddd052081cffd4..23da99dc6edbdc 100644
--- a/IntegrationTests/TimersTest.js
+++ b/IntegrationTests/TimersTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TimersTest
diff --git a/IntegrationTests/WebSocketTest.js b/IntegrationTests/WebSocketTest.js
index 78d00701b53683..6e459f913babc3 100644
--- a/IntegrationTests/WebSocketTest.js
+++ b/IntegrationTests/WebSocketTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule WebSocketTest
diff --git a/IntegrationTests/WebViewTest.js b/IntegrationTests/WebViewTest.js
index c0381c639a8256..a41e244b58be3a 100644
--- a/IntegrationTests/WebViewTest.js
+++ b/IntegrationTests/WebViewTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebViewTest
  */
diff --git a/IntegrationTests/launchWebSocketServer.command b/IntegrationTests/launchWebSocketServer.command
index ebb305dc150326..a6531c5f8d78b2 100755
--- a/IntegrationTests/launchWebSocketServer.command
+++ b/IntegrationTests/launchWebSocketServer.command
@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 
 # Copyright (c) 2015-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 # Set terminal title
 echo -en "\033]0;Web Socket Test Server\a"
diff --git a/IntegrationTests/websocket_integration_test_server.js b/IntegrationTests/websocket_integration_test_server.js
index b7887f1c5e3753..e338d85ae3b89d 100755
--- a/IntegrationTests/websocket_integration_test_server.js
+++ b/IntegrationTests/websocket_integration_test_server.js
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule websocket_integration_test_server
diff --git a/Libraries/ART/ARTCGFloatArray.h b/Libraries/ART/ARTCGFloatArray.h
index 9d748549973d30..72286a50527e84 100644
--- a/Libraries/ART/ARTCGFloatArray.h
+++ b/Libraries/ART/ARTCGFloatArray.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // A little helper to make sure we have the right memory allocation ready for use.
diff --git a/Libraries/ART/ARTContainer.h b/Libraries/ART/ARTContainer.h
index d83f7ae1a559f8..532145825bd74b 100644
--- a/Libraries/ART/ARTContainer.h
+++ b/Libraries/ART/ARTContainer.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/ART/ARTGroup.h b/Libraries/ART/ARTGroup.h
index 4d94a9acded24b..d9dcb48c87b180 100644
--- a/Libraries/ART/ARTGroup.h
+++ b/Libraries/ART/ARTGroup.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/ART/ARTGroup.m b/Libraries/ART/ARTGroup.m
index 672c3b6ebeb9f8..1bc70725c030e8 100644
--- a/Libraries/ART/ARTGroup.m
+++ b/Libraries/ART/ARTGroup.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTGroup.h"
diff --git a/Libraries/ART/ARTNode.h b/Libraries/ART/ARTNode.h
index 0ade1f21b57a6c..8b66c205ef2440 100644
--- a/Libraries/ART/ARTNode.h
+++ b/Libraries/ART/ARTNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/UIView+React.h>
diff --git a/Libraries/ART/ARTNode.m b/Libraries/ART/ARTNode.m
index 38b01a0c56c449..b27b014b9e7d0e 100644
--- a/Libraries/ART/ARTNode.m
+++ b/Libraries/ART/ARTNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTNode.h"
diff --git a/Libraries/ART/ARTRenderable.h b/Libraries/ART/ARTRenderable.h
index 8eae9c25ae4a70..e5735a1fbd81ef 100644
--- a/Libraries/ART/ARTRenderable.h
+++ b/Libraries/ART/ARTRenderable.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/ART/ARTRenderable.m b/Libraries/ART/ARTRenderable.m
index 7ba9a9a6073915..d7a3115586f3dd 100644
--- a/Libraries/ART/ARTRenderable.m
+++ b/Libraries/ART/ARTRenderable.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTRenderable.h"
diff --git a/Libraries/ART/ARTSerializablePath.js b/Libraries/ART/ARTSerializablePath.js
index 4e8b3c2271a6c7..7f52bc6540eda2 100644
--- a/Libraries/ART/ARTSerializablePath.js
+++ b/Libraries/ART/ARTSerializablePath.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ARTSerializablePath
  */
diff --git a/Libraries/ART/ARTShape.h b/Libraries/ART/ARTShape.h
index 7d13c268f6e802..ce685c564b06be 100644
--- a/Libraries/ART/ARTShape.h
+++ b/Libraries/ART/ARTShape.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/ART/ARTShape.m b/Libraries/ART/ARTShape.m
index c07d68e62aa4a3..935c8894994a2b 100644
--- a/Libraries/ART/ARTShape.m
+++ b/Libraries/ART/ARTShape.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTShape.h"
diff --git a/Libraries/ART/ARTSurfaceView.h b/Libraries/ART/ARTSurfaceView.h
index 8be8d95040c146..cb42928cedbe12 100644
--- a/Libraries/ART/ARTSurfaceView.h
+++ b/Libraries/ART/ARTSurfaceView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/ART/ARTSurfaceView.m b/Libraries/ART/ARTSurfaceView.m
index 16e2029083de59..c8f46069038603 100644
--- a/Libraries/ART/ARTSurfaceView.m
+++ b/Libraries/ART/ARTSurfaceView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTSurfaceView.h"
diff --git a/Libraries/ART/ARTText.h b/Libraries/ART/ARTText.h
index ee976e329a46e8..cdf8393a137629 100644
--- a/Libraries/ART/ARTText.h
+++ b/Libraries/ART/ARTText.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/ART/ARTText.m b/Libraries/ART/ARTText.m
index dfffde26546656..0953c850dc293e 100644
--- a/Libraries/ART/ARTText.m
+++ b/Libraries/ART/ARTText.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTText.h"
diff --git a/Libraries/ART/ARTTextFrame.h b/Libraries/ART/ARTTextFrame.h
index 1f6b557bfc77af..8ad06e0a01baed 100644
--- a/Libraries/ART/ARTTextFrame.h
+++ b/Libraries/ART/ARTTextFrame.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreText/CoreText.h>
diff --git a/Libraries/ART/Brushes/ARTBrush.h b/Libraries/ART/Brushes/ARTBrush.h
index 05020dd7bafa26..95709e65f19bc9 100644
--- a/Libraries/ART/Brushes/ARTBrush.h
+++ b/Libraries/ART/Brushes/ARTBrush.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreGraphics/CoreGraphics.h>
diff --git a/Libraries/ART/Brushes/ARTBrush.m b/Libraries/ART/Brushes/ARTBrush.m
index 1cc762b650f04a..4ade2c221143f7 100644
--- a/Libraries/ART/Brushes/ARTBrush.m
+++ b/Libraries/ART/Brushes/ARTBrush.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTBrush.h"
diff --git a/Libraries/ART/Brushes/ARTLinearGradient.h b/Libraries/ART/Brushes/ARTLinearGradient.h
index d7ff2e5684458f..8e6abbc5fbbfde 100644
--- a/Libraries/ART/Brushes/ARTLinearGradient.h
+++ b/Libraries/ART/Brushes/ARTLinearGradient.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTBrush.h"
diff --git a/Libraries/ART/Brushes/ARTLinearGradient.m b/Libraries/ART/Brushes/ARTLinearGradient.m
index f8412163b319c0..1415a6ffcbc80f 100644
--- a/Libraries/ART/Brushes/ARTLinearGradient.m
+++ b/Libraries/ART/Brushes/ARTLinearGradient.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTLinearGradient.h"
diff --git a/Libraries/ART/Brushes/ARTPattern.h b/Libraries/ART/Brushes/ARTPattern.h
index 5f513ec60e2ae6..ce1767cc9b0bc8 100644
--- a/Libraries/ART/Brushes/ARTPattern.h
+++ b/Libraries/ART/Brushes/ARTPattern.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTBrush.h"
diff --git a/Libraries/ART/Brushes/ARTPattern.m b/Libraries/ART/Brushes/ARTPattern.m
index 0d720613b80182..5c43586452d198 100644
--- a/Libraries/ART/Brushes/ARTPattern.m
+++ b/Libraries/ART/Brushes/ARTPattern.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTPattern.h"
diff --git a/Libraries/ART/Brushes/ARTRadialGradient.h b/Libraries/ART/Brushes/ARTRadialGradient.h
index 7f86d93058ce80..d7895f8b74d084 100644
--- a/Libraries/ART/Brushes/ARTRadialGradient.h
+++ b/Libraries/ART/Brushes/ARTRadialGradient.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTBrush.h"
diff --git a/Libraries/ART/Brushes/ARTRadialGradient.m b/Libraries/ART/Brushes/ARTRadialGradient.m
index 1dd449595316e7..19db9cb97b567a 100644
--- a/Libraries/ART/Brushes/ARTRadialGradient.m
+++ b/Libraries/ART/Brushes/ARTRadialGradient.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTRadialGradient.h"
diff --git a/Libraries/ART/Brushes/ARTSolidColor.h b/Libraries/ART/Brushes/ARTSolidColor.h
index f212c735680f60..a16c2b915c72f8 100644
--- a/Libraries/ART/Brushes/ARTSolidColor.h
+++ b/Libraries/ART/Brushes/ARTSolidColor.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTBrush.h"
diff --git a/Libraries/ART/Brushes/ARTSolidColor.m b/Libraries/ART/Brushes/ARTSolidColor.m
index 900621cfb4ea3c..096c4e043ed429 100644
--- a/Libraries/ART/Brushes/ARTSolidColor.m
+++ b/Libraries/ART/Brushes/ARTSolidColor.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTSolidColor.h"
diff --git a/Libraries/ART/RCTConvert+ART.h b/Libraries/ART/RCTConvert+ART.h
index ef46e4e9341e3c..1deb3c600176ab 100644
--- a/Libraries/ART/RCTConvert+ART.h
+++ b/Libraries/ART/RCTConvert+ART.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <QuartzCore/QuartzCore.h>
diff --git a/Libraries/ART/RCTConvert+ART.m b/Libraries/ART/RCTConvert+ART.m
index 6135dc4f4fd250..ea22d5426f18f9 100644
--- a/Libraries/ART/RCTConvert+ART.m
+++ b/Libraries/ART/RCTConvert+ART.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTConvert+ART.h"
diff --git a/Libraries/ART/ReactNativeART.js b/Libraries/ART/ReactNativeART.js
index 4a56d0275822ee..7d9f1b59063459 100644
--- a/Libraries/ART/ReactNativeART.js
+++ b/Libraries/ART/ReactNativeART.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ReactNativeART
  */
diff --git a/Libraries/ART/ViewManagers/ARTGroupManager.h b/Libraries/ART/ViewManagers/ARTGroupManager.h
index 0a90eb3d6c18c9..a35e09481be639 100644
--- a/Libraries/ART/ViewManagers/ARTGroupManager.h
+++ b/Libraries/ART/ViewManagers/ARTGroupManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTNodeManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTGroupManager.m b/Libraries/ART/ViewManagers/ARTGroupManager.m
index 8b277641588803..2de0d0e5688739 100644
--- a/Libraries/ART/ViewManagers/ARTGroupManager.m
+++ b/Libraries/ART/ViewManagers/ARTGroupManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTGroupManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTNodeManager.h b/Libraries/ART/ViewManagers/ARTNodeManager.h
index 22f2ef166b24cf..3a8f99e7abdc7a 100644
--- a/Libraries/ART/ViewManagers/ARTNodeManager.h
+++ b/Libraries/ART/ViewManagers/ARTNodeManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/ART/ViewManagers/ARTNodeManager.m b/Libraries/ART/ViewManagers/ARTNodeManager.m
index 3c697c129783aa..8e568ce6d8efd4 100644
--- a/Libraries/ART/ViewManagers/ARTNodeManager.m
+++ b/Libraries/ART/ViewManagers/ARTNodeManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTNodeManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTRenderableManager.h b/Libraries/ART/ViewManagers/ARTRenderableManager.h
index 376fcf518b3293..1e4b554f0f79f7 100644
--- a/Libraries/ART/ViewManagers/ARTRenderableManager.h
+++ b/Libraries/ART/ViewManagers/ARTRenderableManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTNodeManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTRenderableManager.m b/Libraries/ART/ViewManagers/ARTRenderableManager.m
index aaed2e31d11179..a30841b50c1046 100644
--- a/Libraries/ART/ViewManagers/ARTRenderableManager.m
+++ b/Libraries/ART/ViewManagers/ARTRenderableManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTRenderableManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTShapeManager.h b/Libraries/ART/ViewManagers/ARTShapeManager.h
index d6bc76baa09fdb..2f31b23a0eab10 100644
--- a/Libraries/ART/ViewManagers/ARTShapeManager.h
+++ b/Libraries/ART/ViewManagers/ARTShapeManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTRenderableManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTShapeManager.m b/Libraries/ART/ViewManagers/ARTShapeManager.m
index 3997586d18e4d1..57b603ca1a16b6 100644
--- a/Libraries/ART/ViewManagers/ARTShapeManager.m
+++ b/Libraries/ART/ViewManagers/ARTShapeManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTShapeManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
index fc36435edb7707..5915536bd6f917 100644
--- a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
+++ b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m
index 10772b72c7f23d..54052a331d4585 100644
--- a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m
+++ b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTSurfaceViewManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTTextManager.h b/Libraries/ART/ViewManagers/ARTTextManager.h
index 48da9c891f4757..c7d5304da3a3eb 100644
--- a/Libraries/ART/ViewManagers/ARTTextManager.h
+++ b/Libraries/ART/ViewManagers/ARTTextManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTRenderableManager.h"
diff --git a/Libraries/ART/ViewManagers/ARTTextManager.m b/Libraries/ART/ViewManagers/ARTTextManager.m
index 430f26db537ab1..ac6688c3d925b9 100644
--- a/Libraries/ART/ViewManagers/ARTTextManager.m
+++ b/Libraries/ART/ViewManagers/ARTTextManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ARTTextManager.h"
diff --git a/Libraries/ActionSheetIOS/ActionSheetIOS.js b/Libraries/ActionSheetIOS/ActionSheetIOS.js
index 9797b47b36e51c..23db7680ab34e1 100644
--- a/Libraries/ActionSheetIOS/ActionSheetIOS.js
+++ b/Libraries/ActionSheetIOS/ActionSheetIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ActionSheetIOS
  * @flow
diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.h b/Libraries/ActionSheetIOS/RCTActionSheetManager.h
index 313939149fd1a6..b9a5b2df7329a1 100644
--- a/Libraries/ActionSheetIOS/RCTActionSheetManager.h
+++ b/Libraries/ActionSheetIOS/RCTActionSheetManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.m b/Libraries/ActionSheetIOS/RCTActionSheetManager.m
index 9f550f77af32a4..91f047323769c7 100644
--- a/Libraries/ActionSheetIOS/RCTActionSheetManager.m
+++ b/Libraries/ActionSheetIOS/RCTActionSheetManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTActionSheetManager.h"
diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
index 3f2e2379eeb44a..7c775fddf7ece5 100644
--- a/Libraries/Alert/Alert.js
+++ b/Libraries/Alert/Alert.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Alert
  * @flow
diff --git a/Libraries/Alert/AlertIOS.js b/Libraries/Alert/AlertIOS.js
index 8f4170a5a616fb..25dff6f34d4d81 100644
--- a/Libraries/Alert/AlertIOS.js
+++ b/Libraries/Alert/AlertIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AlertIOS
  * @flow
diff --git a/Libraries/Alert/RCTAlertManager.android.js b/Libraries/Alert/RCTAlertManager.android.js
index f8ad604e16da60..f819b55e1b3d1f 100644
--- a/Libraries/Alert/RCTAlertManager.android.js
+++ b/Libraries/Alert/RCTAlertManager.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTAlertManager
 */
diff --git a/Libraries/Alert/RCTAlertManager.ios.js b/Libraries/Alert/RCTAlertManager.ios.js
index 409ecf5caf0430..3aef740abed4d5 100644
--- a/Libraries/Alert/RCTAlertManager.ios.js
+++ b/Libraries/Alert/RCTAlertManager.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTAlertManager
  * @flow
diff --git a/Libraries/Animated/release/gulpfile.js b/Libraries/Animated/release/gulpfile.js
index 3d2a52c4a40405..5787276888a516 100644
--- a/Libraries/Animated/release/gulpfile.js
+++ b/Libraries/Animated/release/gulpfile.js
@@ -1,10 +1,8 @@
 /**
- * Copyright 2013-2015, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  * @providesModule gulpfile
  */
 
diff --git a/Libraries/Animated/src/Animated.js b/Libraries/Animated/src/Animated.js
index 1eacd03c48c66e..cfe2be06876811 100644
--- a/Libraries/Animated/src/Animated.js
+++ b/Libraries/Animated/src/Animated.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Animated
  * @flow
diff --git a/Libraries/Animated/src/AnimatedEvent.js b/Libraries/Animated/src/AnimatedEvent.js
index 206516f5d96a95..f9300feb4e79ea 100644
--- a/Libraries/Animated/src/AnimatedEvent.js
+++ b/Libraries/Animated/src/AnimatedEvent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedEvent
  * @flow
diff --git a/Libraries/Animated/src/AnimatedImplementation.js b/Libraries/Animated/src/AnimatedImplementation.js
index 08d69c3bd80eca..b23a44db0e4fc7 100644
--- a/Libraries/Animated/src/AnimatedImplementation.js
+++ b/Libraries/Animated/src/AnimatedImplementation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedImplementation
  * @flow
diff --git a/Libraries/Animated/src/AnimatedWeb.js b/Libraries/Animated/src/AnimatedWeb.js
index b88acb940bd65b..f3af397b740931 100644
--- a/Libraries/Animated/src/AnimatedWeb.js
+++ b/Libraries/Animated/src/AnimatedWeb.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AnimatedWeb
diff --git a/Libraries/Animated/src/Easing.js b/Libraries/Animated/src/Easing.js
index 6cad73c334ccbe..f5c00fd813f7dc 100644
--- a/Libraries/Animated/src/Easing.js
+++ b/Libraries/Animated/src/Easing.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Easing
  * @flow
diff --git a/Libraries/Animated/src/NativeAnimatedHelper.js b/Libraries/Animated/src/NativeAnimatedHelper.js
index 6bebbe427cb50e..5765dcfc63b829 100644
--- a/Libraries/Animated/src/NativeAnimatedHelper.js
+++ b/Libraries/Animated/src/NativeAnimatedHelper.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NativeAnimatedHelper
  * @flow
diff --git a/Libraries/Animated/src/SpringConfig.js b/Libraries/Animated/src/SpringConfig.js
index e74d167efecedc..5b476f6723469e 100644
--- a/Libraries/Animated/src/SpringConfig.js
+++ b/Libraries/Animated/src/SpringConfig.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SpringConfig
  * @flow
diff --git a/Libraries/Animated/src/__tests__/Animated-test.js b/Libraries/Animated/src/__tests__/Animated-test.js
index c8f2b94223df26..d6409d7f8a9224 100644
--- a/Libraries/Animated/src/__tests__/Animated-test.js
+++ b/Libraries/Animated/src/__tests__/Animated-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Animated/src/__tests__/AnimatedNative-test.js b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
index 62c40c8388d79b..77306dd8fffd05 100644
--- a/Libraries/Animated/src/__tests__/AnimatedNative-test.js
+++ b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Animated/src/__tests__/Easing-test.js b/Libraries/Animated/src/__tests__/Easing-test.js
index 048fdb711d3a49..14f18aacd628e0 100644
--- a/Libraries/Animated/src/__tests__/Easing-test.js
+++ b/Libraries/Animated/src/__tests__/Easing-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Animated/src/__tests__/Interpolation-test.js b/Libraries/Animated/src/__tests__/Interpolation-test.js
index e95365423cb09b..27f4438ab1568d 100644
--- a/Libraries/Animated/src/__tests__/Interpolation-test.js
+++ b/Libraries/Animated/src/__tests__/Interpolation-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Animated/src/animations/Animation.js b/Libraries/Animated/src/animations/Animation.js
index 90ea28196ed014..000e44d77f9bc8 100644
--- a/Libraries/Animated/src/animations/Animation.js
+++ b/Libraries/Animated/src/animations/Animation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Animation
  * @flow
diff --git a/Libraries/Animated/src/animations/DecayAnimation.js b/Libraries/Animated/src/animations/DecayAnimation.js
index 652bd9c9d3b708..7df0e104b72f48 100644
--- a/Libraries/Animated/src/animations/DecayAnimation.js
+++ b/Libraries/Animated/src/animations/DecayAnimation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DecayAnimation
  * @flow
diff --git a/Libraries/Animated/src/animations/SpringAnimation.js b/Libraries/Animated/src/animations/SpringAnimation.js
index 67dee081b81b6a..8b6f96fe67bdb6 100644
--- a/Libraries/Animated/src/animations/SpringAnimation.js
+++ b/Libraries/Animated/src/animations/SpringAnimation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SpringAnimation
  * @flow
diff --git a/Libraries/Animated/src/animations/TimingAnimation.js b/Libraries/Animated/src/animations/TimingAnimation.js
index a3db014fe1190c..1b6a4ae94cd9b0 100644
--- a/Libraries/Animated/src/animations/TimingAnimation.js
+++ b/Libraries/Animated/src/animations/TimingAnimation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TimingAnimation
  * @flow
diff --git a/Libraries/Animated/src/createAnimatedComponent.js b/Libraries/Animated/src/createAnimatedComponent.js
index 42110be681988c..357ee0bd59bcd1 100644
--- a/Libraries/Animated/src/createAnimatedComponent.js
+++ b/Libraries/Animated/src/createAnimatedComponent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule createAnimatedComponent
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedAddition.js b/Libraries/Animated/src/nodes/AnimatedAddition.js
index 53d338836ecf8b..2e3453965565f0 100644
--- a/Libraries/Animated/src/nodes/AnimatedAddition.js
+++ b/Libraries/Animated/src/nodes/AnimatedAddition.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedAddition
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedDiffClamp.js b/Libraries/Animated/src/nodes/AnimatedDiffClamp.js
index eac26a10271b53..0f64e75c723c06 100644
--- a/Libraries/Animated/src/nodes/AnimatedDiffClamp.js
+++ b/Libraries/Animated/src/nodes/AnimatedDiffClamp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedDiffClamp
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedDivision.js b/Libraries/Animated/src/nodes/AnimatedDivision.js
index 8d658f458a5463..606e63937b9a86 100644
--- a/Libraries/Animated/src/nodes/AnimatedDivision.js
+++ b/Libraries/Animated/src/nodes/AnimatedDivision.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedDivision
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedInterpolation.js b/Libraries/Animated/src/nodes/AnimatedInterpolation.js
index 141929e5be1020..eb4cc5d6995d77 100644
--- a/Libraries/Animated/src/nodes/AnimatedInterpolation.js
+++ b/Libraries/Animated/src/nodes/AnimatedInterpolation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedInterpolation
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedModulo.js b/Libraries/Animated/src/nodes/AnimatedModulo.js
index 3ff75e737216da..24cd3f0b077c12 100644
--- a/Libraries/Animated/src/nodes/AnimatedModulo.js
+++ b/Libraries/Animated/src/nodes/AnimatedModulo.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedModulo
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedMultiplication.js b/Libraries/Animated/src/nodes/AnimatedMultiplication.js
index d30ce2594a1675..dc01f7f17127f1 100644
--- a/Libraries/Animated/src/nodes/AnimatedMultiplication.js
+++ b/Libraries/Animated/src/nodes/AnimatedMultiplication.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedMultiplication
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedNode.js b/Libraries/Animated/src/nodes/AnimatedNode.js
index c29f4b7f1a80b0..e75cfaf0e5c8fb 100644
--- a/Libraries/Animated/src/nodes/AnimatedNode.js
+++ b/Libraries/Animated/src/nodes/AnimatedNode.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedNode
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedProps.js b/Libraries/Animated/src/nodes/AnimatedProps.js
index 0b9f6508d1526d..78cd11189edfa7 100644
--- a/Libraries/Animated/src/nodes/AnimatedProps.js
+++ b/Libraries/Animated/src/nodes/AnimatedProps.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedProps
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedStyle.js b/Libraries/Animated/src/nodes/AnimatedStyle.js
index f2cdf31dfdea0a..c7bb24e3b42b14 100644
--- a/Libraries/Animated/src/nodes/AnimatedStyle.js
+++ b/Libraries/Animated/src/nodes/AnimatedStyle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedStyle
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedTracking.js b/Libraries/Animated/src/nodes/AnimatedTracking.js
index 0ec517d12bd560..cf20d6e8bbf3fc 100644
--- a/Libraries/Animated/src/nodes/AnimatedTracking.js
+++ b/Libraries/Animated/src/nodes/AnimatedTracking.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedTracking
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedTransform.js b/Libraries/Animated/src/nodes/AnimatedTransform.js
index c95aa16f699d2b..fd5049e9b8d8af 100644
--- a/Libraries/Animated/src/nodes/AnimatedTransform.js
+++ b/Libraries/Animated/src/nodes/AnimatedTransform.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedTransform
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedValue.js b/Libraries/Animated/src/nodes/AnimatedValue.js
index d5a5de9a9e48c7..862d25f8e53a28 100644
--- a/Libraries/Animated/src/nodes/AnimatedValue.js
+++ b/Libraries/Animated/src/nodes/AnimatedValue.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedValue
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedValueXY.js b/Libraries/Animated/src/nodes/AnimatedValueXY.js
index 13aee1e50d1cde..52c207c0f42ffe 100644
--- a/Libraries/Animated/src/nodes/AnimatedValueXY.js
+++ b/Libraries/Animated/src/nodes/AnimatedValueXY.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedValueXY
  * @flow
diff --git a/Libraries/Animated/src/nodes/AnimatedWithChildren.js b/Libraries/Animated/src/nodes/AnimatedWithChildren.js
index 4676437a9eae47..1f58cd834e165e 100644
--- a/Libraries/Animated/src/nodes/AnimatedWithChildren.js
+++ b/Libraries/Animated/src/nodes/AnimatedWithChildren.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnimatedWithChildren
  * @flow
diff --git a/Libraries/Animated/src/polyfills/InteractionManager.js b/Libraries/Animated/src/polyfills/InteractionManager.js
index db45ede6426fd0..c063e9234b3df1 100644
--- a/Libraries/Animated/src/polyfills/InteractionManager.js
+++ b/Libraries/Animated/src/polyfills/InteractionManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/Libraries/Animated/src/polyfills/Set.js b/Libraries/Animated/src/polyfills/Set.js
index 988f0b3f13ff21..fd071410d42395 100644
--- a/Libraries/Animated/src/polyfills/Set.js
+++ b/Libraries/Animated/src/polyfills/Set.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/Libraries/Animated/src/polyfills/flattenStyle.js b/Libraries/Animated/src/polyfills/flattenStyle.js
index 42a68020c6539c..2e4c8a1d36b476 100644
--- a/Libraries/Animated/src/polyfills/flattenStyle.js
+++ b/Libraries/Animated/src/polyfills/flattenStyle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 module.exports = function(style) {
diff --git a/Libraries/AppState/AppState.js b/Libraries/AppState/AppState.js
index ebdb6d54913bb4..3fc13c5888d33e 100644
--- a/Libraries/AppState/AppState.js
+++ b/Libraries/AppState/AppState.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AppState
  * @flow
diff --git a/Libraries/BatchedBridge/BatchedBridge.js b/Libraries/BatchedBridge/BatchedBridge.js
index 46e8b5f41052a8..bfc6862cb83551 100644
--- a/Libraries/BatchedBridge/BatchedBridge.js
+++ b/Libraries/BatchedBridge/BatchedBridge.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BatchedBridge
  * @flow
diff --git a/Libraries/BatchedBridge/MessageQueue.js b/Libraries/BatchedBridge/MessageQueue.js
index 4309de35519cf6..428d388173989e 100644
--- a/Libraries/BatchedBridge/MessageQueue.js
+++ b/Libraries/BatchedBridge/MessageQueue.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MessageQueue
  * @flow
diff --git a/Libraries/BatchedBridge/NativeModules.js b/Libraries/BatchedBridge/NativeModules.js
index 2bf0f26c875119..324c4f6e995bdd 100644
--- a/Libraries/BatchedBridge/NativeModules.js
+++ b/Libraries/BatchedBridge/NativeModules.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NativeModules
  * @flow
diff --git a/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js b/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js
index 09ec56663b5c46..40ad81f5f5cb5f 100644
--- a/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js
+++ b/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * These don't actually exist anywhere in the code.
  */
diff --git a/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js b/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js
index 380bacf65e2c66..8c4f7d3c03063f 100644
--- a/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js
+++ b/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 'use strict';
diff --git a/Libraries/BatchedBridge/__tests__/MessageQueue-test.js b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
index 106821dd2fcffe..ecf60bcd0455cc 100644
--- a/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
+++ b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  * @format
diff --git a/Libraries/BatchedBridge/__tests__/NativeModules-test.js b/Libraries/BatchedBridge/__tests__/NativeModules-test.js
index 88435513e72966..b9cc2411d29512 100644
--- a/Libraries/BatchedBridge/__tests__/NativeModules-test.js
+++ b/Libraries/BatchedBridge/__tests__/NativeModules-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Blob/Blob.js b/Libraries/Blob/Blob.js
index 3f077a05d71fc1..eca13a6a309e8f 100644
--- a/Libraries/Blob/Blob.js
+++ b/Libraries/Blob/Blob.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Blob
  * @flow
diff --git a/Libraries/Blob/BlobManager.js b/Libraries/Blob/BlobManager.js
index a1cf9b489e6007..dd7cc00eabc652 100644
--- a/Libraries/Blob/BlobManager.js
+++ b/Libraries/Blob/BlobManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BlobManager
  * @flow
diff --git a/Libraries/Blob/BlobRegistry.js b/Libraries/Blob/BlobRegistry.js
index 925e78f3a78453..330c1659ae4235 100644
--- a/Libraries/Blob/BlobRegistry.js
+++ b/Libraries/Blob/BlobRegistry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BlobRegistry
  * @flow
diff --git a/Libraries/Blob/BlobTypes.js b/Libraries/Blob/BlobTypes.js
index c053c08cfc8deb..8e895d9006108f 100644
--- a/Libraries/Blob/BlobTypes.js
+++ b/Libraries/Blob/BlobTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BlobTypes
  * @flow
diff --git a/Libraries/Blob/File.js b/Libraries/Blob/File.js
index 8e999b20f41dd0..f5b03d85f7f178 100644
--- a/Libraries/Blob/File.js
+++ b/Libraries/Blob/File.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule File
  * @flow
diff --git a/Libraries/Blob/FileReader.js b/Libraries/Blob/FileReader.js
index 121f7ef76caa21..b3ed89dc9318e6 100644
--- a/Libraries/Blob/FileReader.js
+++ b/Libraries/Blob/FileReader.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule FileReader
  * @flow
diff --git a/Libraries/Blob/RCTBlobManager.h b/Libraries/Blob/RCTBlobManager.h
index 8e8d355f60b7ac..24b589ef987ae5 100755
--- a/Libraries/Blob/RCTBlobManager.h
+++ b/Libraries/Blob/RCTBlobManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridge.h>
diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm
index aa45072553dcbe..56235ee04b6dfe 100755
--- a/Libraries/Blob/RCTBlobManager.mm
+++ b/Libraries/Blob/RCTBlobManager.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBlobManager.h"
diff --git a/Libraries/Blob/RCTFileReaderModule.h b/Libraries/Blob/RCTFileReaderModule.h
index 8728c7c3dc0b67..72d224b0d968cb 100644
--- a/Libraries/Blob/RCTFileReaderModule.h
+++ b/Libraries/Blob/RCTFileReaderModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/Libraries/Blob/RCTFileReaderModule.m b/Libraries/Blob/RCTFileReaderModule.m
index debbae8cbd771b..5059e0b84180ee 100644
--- a/Libraries/Blob/RCTFileReaderModule.m
+++ b/Libraries/Blob/RCTFileReaderModule.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 
diff --git a/Libraries/Blob/URL.js b/Libraries/Blob/URL.js
index 8b761ca708ce0b..7349f7752f268c 100644
--- a/Libraries/Blob/URL.js
+++ b/Libraries/Blob/URL.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule URL
  * @format
diff --git a/Libraries/Blob/__mocks__/BlobModule.js b/Libraries/Blob/__mocks__/BlobModule.js
index 1cbda950883312..2542c3a9339adc 100644
--- a/Libraries/Blob/__mocks__/BlobModule.js
+++ b/Libraries/Blob/__mocks__/BlobModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/Libraries/Blob/__mocks__/FileReaderModule.js b/Libraries/Blob/__mocks__/FileReaderModule.js
index d4b35e00c24cc2..f5ccc39d36e200 100644
--- a/Libraries/Blob/__mocks__/FileReaderModule.js
+++ b/Libraries/Blob/__mocks__/FileReaderModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/Libraries/Blob/__tests__/Blob-test.js b/Libraries/Blob/__tests__/Blob-test.js
index 85532c819494f9..8d37915720c9b3 100644
--- a/Libraries/Blob/__tests__/Blob-test.js
+++ b/Libraries/Blob/__tests__/Blob-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+react_native
diff --git a/Libraries/Blob/__tests__/BlobManager-test.js b/Libraries/Blob/__tests__/BlobManager-test.js
index 6422861b0d2780..2ed118b446be1c 100644
--- a/Libraries/Blob/__tests__/BlobManager-test.js
+++ b/Libraries/Blob/__tests__/BlobManager-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+react_native
diff --git a/Libraries/Blob/__tests__/File-test.js b/Libraries/Blob/__tests__/File-test.js
index 99957873242ff6..d466d61b8b3502 100644
--- a/Libraries/Blob/__tests__/File-test.js
+++ b/Libraries/Blob/__tests__/File-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+react_native
diff --git a/Libraries/Blob/__tests__/FileReader-test.js b/Libraries/Blob/__tests__/FileReader-test.js
index 58a0e92f6218f7..a278a4918a9d10 100644
--- a/Libraries/Blob/__tests__/FileReader-test.js
+++ b/Libraries/Blob/__tests__/FileReader-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+react_native
diff --git a/Libraries/BugReporting/BugReporting.js b/Libraries/BugReporting/BugReporting.js
index bf795899139a69..11a59e6d5222ca 100644
--- a/Libraries/BugReporting/BugReporting.js
+++ b/Libraries/BugReporting/BugReporting.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BugReporting
  * @flow
diff --git a/Libraries/BugReporting/dumpReactTree.js b/Libraries/BugReporting/dumpReactTree.js
index 88a5b7f8ffbe2e..f8a137ceff7f2c 100644
--- a/Libraries/BugReporting/dumpReactTree.js
+++ b/Libraries/BugReporting/dumpReactTree.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule dumpReactTree
  * @flow
diff --git a/Libraries/BugReporting/getReactData.js b/Libraries/BugReporting/getReactData.js
index 18f4b0888f846a..53c8fb6ccfc110 100644
--- a/Libraries/BugReporting/getReactData.js
+++ b/Libraries/BugReporting/getReactData.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule getReactData
  * @flow
diff --git a/Libraries/CameraRoll/CameraRoll.js b/Libraries/CameraRoll/CameraRoll.js
index 91fba6d8fe893c..0c91dc7fd0233b 100644
--- a/Libraries/CameraRoll/CameraRoll.js
+++ b/Libraries/CameraRoll/CameraRoll.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CameraRoll
  * @flow
diff --git a/Libraries/CameraRoll/ImagePickerIOS.js b/Libraries/CameraRoll/ImagePickerIOS.js
index a67884dc843571..24d1309d2e1b91 100644
--- a/Libraries/CameraRoll/ImagePickerIOS.js
+++ b/Libraries/CameraRoll/ImagePickerIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImagePickerIOS
  * @flow
diff --git a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h
index 405ba289aeda1d..8189bb56e4ea8c 100644
--- a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h
+++ b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridge.h>
diff --git a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m
index 30a3baf6515a09..e9637d7c4c16b5 100644
--- a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m
+++ b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAssetsLibraryRequestHandler.h"
diff --git a/Libraries/CameraRoll/RCTCameraRollManager.h b/Libraries/CameraRoll/RCTCameraRollManager.h
index f2bf18cb27cf69..b8b2c7d2ad63c7 100644
--- a/Libraries/CameraRoll/RCTCameraRollManager.h
+++ b/Libraries/CameraRoll/RCTCameraRollManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <AssetsLibrary/AssetsLibrary.h>
diff --git a/Libraries/CameraRoll/RCTCameraRollManager.m b/Libraries/CameraRoll/RCTCameraRollManager.m
index 72e128d6ecad33..b5d9a85dadb44b 100644
--- a/Libraries/CameraRoll/RCTCameraRollManager.m
+++ b/Libraries/CameraRoll/RCTCameraRollManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTCameraRollManager.h"
diff --git a/Libraries/CameraRoll/RCTImagePickerManager.h b/Libraries/CameraRoll/RCTImagePickerManager.h
index e3053f6a128cec..825e7721a46c01 100644
--- a/Libraries/CameraRoll/RCTImagePickerManager.h
+++ b/Libraries/CameraRoll/RCTImagePickerManager.h
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/CameraRoll/RCTImagePickerManager.m b/Libraries/CameraRoll/RCTImagePickerManager.m
index e851b5fca4d3c6..1ee31752f2a992 100644
--- a/Libraries/CameraRoll/RCTImagePickerManager.m
+++ b/Libraries/CameraRoll/RCTImagePickerManager.m
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h
index 67e5cfe5271ba8..0a45f184dab73c 100644
--- a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h
+++ b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTImageLoader.h>
diff --git a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m
index 0c2adb7f5206df..ac27231adc9e9a 100644
--- a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m
+++ b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPhotoLibraryImageLoader.h"
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
index 2fb4517714a588..f7d326f01b5305 100644
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AccessibilityInfo
  * @flow
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
index fb3ce8095c0e61..6472c359cfb4b4 100644
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AccessibilityInfo
  * @flow
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
index 6ea90069cdb125..df941368da1736 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ActivityIndicator
  * @flow
diff --git a/Libraries/Components/AppleTV/TVEventHandler.android.js b/Libraries/Components/AppleTV/TVEventHandler.android.js
index dc5a1d6b94e931..718fa84a8de515 100644
--- a/Libraries/Components/AppleTV/TVEventHandler.android.js
+++ b/Libraries/Components/AppleTV/TVEventHandler.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TVEventHandler
  * @flow
diff --git a/Libraries/Components/AppleTV/TVEventHandler.ios.js b/Libraries/Components/AppleTV/TVEventHandler.ios.js
index c01f2b065a76fd..94e67c23cf3532 100644
--- a/Libraries/Components/AppleTV/TVEventHandler.ios.js
+++ b/Libraries/Components/AppleTV/TVEventHandler.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TVEventHandler
  * @flow
diff --git a/Libraries/Components/AppleTV/TVViewPropTypes.js b/Libraries/Components/AppleTV/TVViewPropTypes.js
index b2c426d86241e3..cf5f5b03b7679e 100644
--- a/Libraries/Components/AppleTV/TVViewPropTypes.js
+++ b/Libraries/Components/AppleTV/TVViewPropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TVViewPropTypes
  * @flow
diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js
index fc3f2ef5aab3ad..dc5071f83193c9 100644
--- a/Libraries/Components/Button.js
+++ b/Libraries/Components/Button.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Button
  * @flow
diff --git a/Libraries/Components/CheckBox/CheckBox.android.js b/Libraries/Components/CheckBox/CheckBox.android.js
index ef1a84730b4655..e4a14c6f73dafb 100644
--- a/Libraries/Components/CheckBox/CheckBox.android.js
+++ b/Libraries/Components/CheckBox/CheckBox.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CheckBox
  * @flow
diff --git a/Libraries/Components/CheckBox/CheckBox.ios.js b/Libraries/Components/CheckBox/CheckBox.ios.js
index 02124a885a6477..386255541d47ec 100644
--- a/Libraries/Components/CheckBox/CheckBox.ios.js
+++ b/Libraries/Components/CheckBox/CheckBox.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CheckBox
  * @flow
diff --git a/Libraries/Components/Clipboard/Clipboard.js b/Libraries/Components/Clipboard/Clipboard.js
index ac8641c834701a..80d067cce257c0 100644
--- a/Libraries/Components/Clipboard/Clipboard.js
+++ b/Libraries/Components/Clipboard/Clipboard.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Clipboard
  * @flow
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.android.js b/Libraries/Components/DatePicker/DatePickerIOS.android.js
index 9a2b2669711b4b..8a1db045e01763 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.android.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerIOS
  */
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
index 88ae7d5c876d0e..9d3e1e30e5d5ce 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.ios.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerIOS
  * @flow
diff --git a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js
index 11910ead0ad33c..750ed921f0684b 100644
--- a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js
+++ b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerAndroid
  * @flow
diff --git a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.ios.js b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.ios.js
index afc8a19c2e8d7d..a23602128078f8 100644
--- a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.ios.js
+++ b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerAndroid
  * @flow
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
index e75e40534ab697..3a39a7d02f6b9e 100644
--- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DrawerLayoutAndroid
  */
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js
index 6c0b34e3b59108..d5b950c5b41ef0 100644
--- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DrawerLayoutAndroid
  */
diff --git a/Libraries/Components/Keyboard/Keyboard.js b/Libraries/Components/Keyboard/Keyboard.js
index d85801c9d871f4..55d9891902ea7a 100644
--- a/Libraries/Components/Keyboard/Keyboard.js
+++ b/Libraries/Components/Keyboard/Keyboard.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Keyboard
  * @flow
diff --git a/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
index 0ee09ea9c3086a..ffb6c58fe6379f 100644
--- a/Libraries/Components/Keyboard/KeyboardAvoidingView.js
+++ b/Libraries/Components/Keyboard/KeyboardAvoidingView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule KeyboardAvoidingView
  * @flow
diff --git a/Libraries/Components/LazyRenderer.js b/Libraries/Components/LazyRenderer.js
index 3f026273556e07..826c0eb559faf6 100644
--- a/Libraries/Components/LazyRenderer.js
+++ b/Libraries/Components/LazyRenderer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LazyRenderer
  */
diff --git a/Libraries/Components/MaskedView/MaskedViewIOS.android.js b/Libraries/Components/MaskedView/MaskedViewIOS.android.js
index 57b4be358ff63c..ad37017e1c201b 100644
--- a/Libraries/Components/MaskedView/MaskedViewIOS.android.js
+++ b/Libraries/Components/MaskedView/MaskedViewIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MaskedViewIOS
  * @flow
diff --git a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
index 85b28cb4a8b8ae..0d61728c4b29b1 100644
--- a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
+++ b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MaskedViewIOS
  * @flow
diff --git a/Libraries/Components/Navigation/NavigatorIOS.android.js b/Libraries/Components/Navigation/NavigatorIOS.android.js
index 12699e09c6a9a6..271f7ea0143fc5 100644
--- a/Libraries/Components/Navigation/NavigatorIOS.android.js
+++ b/Libraries/Components/Navigation/NavigatorIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NavigatorIOS
  */
diff --git a/Libraries/Components/Navigation/NavigatorIOS.ios.js b/Libraries/Components/Navigation/NavigatorIOS.ios.js
index 9a5596fe383bda..66aa906f61a4fd 100644
--- a/Libraries/Components/Navigation/NavigatorIOS.ios.js
+++ b/Libraries/Components/Navigation/NavigatorIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NavigatorIOS
  * @flow
diff --git a/Libraries/Components/Picker/Picker.js b/Libraries/Components/Picker/Picker.js
index 443622221b624d..d4b225c8abe7a3 100644
--- a/Libraries/Components/Picker/Picker.js
+++ b/Libraries/Components/Picker/Picker.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Picker
  * @flow
diff --git a/Libraries/Components/Picker/PickerAndroid.android.js b/Libraries/Components/Picker/PickerAndroid.android.js
index 35aea2b33581b0..c164db953731ed 100644
--- a/Libraries/Components/Picker/PickerAndroid.android.js
+++ b/Libraries/Components/Picker/PickerAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PickerAndroid
  * @flow
diff --git a/Libraries/Components/Picker/PickerAndroid.ios.js b/Libraries/Components/Picker/PickerAndroid.ios.js
index fc589882864a71..b84e15bad67af0 100644
--- a/Libraries/Components/Picker/PickerAndroid.ios.js
+++ b/Libraries/Components/Picker/PickerAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PickerAndroid
  */
diff --git a/Libraries/Components/Picker/PickerIOS.android.js b/Libraries/Components/Picker/PickerIOS.android.js
index 7c5b39112a9ecf..ce50c2ad4e4157 100644
--- a/Libraries/Components/Picker/PickerIOS.android.js
+++ b/Libraries/Components/Picker/PickerIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PickerIOS
  *
diff --git a/Libraries/Components/Picker/PickerIOS.ios.js b/Libraries/Components/Picker/PickerIOS.ios.js
index 5d58c00cfc939a..3963a9485f259a 100644
--- a/Libraries/Components/Picker/PickerIOS.ios.js
+++ b/Libraries/Components/Picker/PickerIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PickerIOS
  *
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
index 6f076e53dc3f0b..f5dcb10cfb9508 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ProgressBarAndroid
  */
diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js
index 99f01c81f36c20..92bae8066abe69 100644
--- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js
+++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ProgressBarAndroid
  */
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
index d4a7da54aa98ec..46591f62802974 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
@@ -1,11 +1,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ProgressViewIOS
  */
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
index e6a5485f85b30c..310f02507c9421 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ProgressViewIOS
  * @flow
diff --git a/Libraries/Components/RefreshControl/RefreshControl.js b/Libraries/Components/RefreshControl/RefreshControl.js
index 825b8c3f2886e3..14f383dc08c274 100644
--- a/Libraries/Components/RefreshControl/RefreshControl.js
+++ b/Libraries/Components/RefreshControl/RefreshControl.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RefreshControl
  * @flow
diff --git a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
index cb02f672b17947..04312d5d4c5dbe 100644
--- a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
+++ b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.android.js b/Libraries/Components/SafeAreaView/SafeAreaView.android.js
index 46265995522ded..62a81a8a284352 100644
--- a/Libraries/Components/SafeAreaView/SafeAreaView.android.js
+++ b/Libraries/Components/SafeAreaView/SafeAreaView.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SafeAreaView
  * @flow
diff --git a/Libraries/Components/SafeAreaView/SafeAreaView.ios.js b/Libraries/Components/SafeAreaView/SafeAreaView.ios.js
index 73336990a7a6f6..344cbe5f301ef1 100644
--- a/Libraries/Components/SafeAreaView/SafeAreaView.ios.js
+++ b/Libraries/Components/SafeAreaView/SafeAreaView.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SafeAreaView
  * @flow
diff --git a/Libraries/Components/ScrollResponder.js b/Libraries/Components/ScrollResponder.js
index e44f21f4fc005d..9d60c462ef1dc7 100644
--- a/Libraries/Components/ScrollResponder.js
+++ b/Libraries/Components/ScrollResponder.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ScrollResponder
  * @flow
diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index 43e89b5ab74672..354fd952b8191e 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ScrollView
  * @flow
diff --git a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
index 54956acf3fee7c..597bbbb432b217 100644
--- a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
+++ b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ScrollViewStickyHeader
  * @flow
diff --git a/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js b/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
index 6aa19b2f0eda40..eaa8bb7385e367 100644
--- a/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
+++ b/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/Libraries/Components/ScrollView/processDecelerationRate.js b/Libraries/Components/ScrollView/processDecelerationRate.js
index 71955a025bcfef..9cb5a52a557715 100644
--- a/Libraries/Components/ScrollView/processDecelerationRate.js
+++ b/Libraries/Components/ScrollView/processDecelerationRate.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule processDecelerationRate
  */
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
index 15ac90078588dd..16be1c8f2b1458 100644
--- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
+++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
@@ -1,11 +1,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SegmentedControlIOS
  */
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
index e5297d8f28b845..f7748fcc8dbf45 100644
--- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
+++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SegmentedControlIOS
  * @flow
diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js
index 91b780f7aa73a1..683789520e5685 100644
--- a/Libraries/Components/Slider/Slider.js
+++ b/Libraries/Components/Slider/Slider.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Slider
  * @flow
diff --git a/Libraries/Components/StaticContainer.react.js b/Libraries/Components/StaticContainer.react.js
index ee19d7d4b84431..81e06ace1fdb5f 100644
--- a/Libraries/Components/StaticContainer.react.js
+++ b/Libraries/Components/StaticContainer.react.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StaticContainer.react
  * @flow
diff --git a/Libraries/Components/StaticRenderer.js b/Libraries/Components/StaticRenderer.js
index 380a556f937b67..d5474e943bccad 100644
--- a/Libraries/Components/StaticRenderer.js
+++ b/Libraries/Components/StaticRenderer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StaticRenderer
  * @flow
diff --git a/Libraries/Components/StatusBar/StatusBar.js b/Libraries/Components/StatusBar/StatusBar.js
index c545b381050767..0562a315493853 100644
--- a/Libraries/Components/StatusBar/StatusBar.js
+++ b/Libraries/Components/StatusBar/StatusBar.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StatusBar
  * @flow
diff --git a/Libraries/Components/StatusBar/StatusBarIOS.android.js b/Libraries/Components/StatusBar/StatusBarIOS.android.js
index 2be8f34eaf5fb5..5c69c15339addf 100644
--- a/Libraries/Components/StatusBar/StatusBarIOS.android.js
+++ b/Libraries/Components/StatusBar/StatusBarIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StatusBarIOS
  * @flow
diff --git a/Libraries/Components/StatusBar/StatusBarIOS.ios.js b/Libraries/Components/StatusBar/StatusBarIOS.ios.js
index a3aceaac7e0988..f132f005696def 100644
--- a/Libraries/Components/StatusBar/StatusBarIOS.ios.js
+++ b/Libraries/Components/StatusBar/StatusBarIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StatusBarIOS
  * @flow
diff --git a/Libraries/Components/Subscribable.js b/Libraries/Components/Subscribable.js
index 0244ad673c2404..3dfe6a4bb1732b 100644
--- a/Libraries/Components/Subscribable.js
+++ b/Libraries/Components/Subscribable.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Subscribable
  * @flow
diff --git a/Libraries/Components/Switch/Switch.js b/Libraries/Components/Switch/Switch.js
index 8ee3225f3a0ee7..545b29b271f02f 100644
--- a/Libraries/Components/Switch/Switch.js
+++ b/Libraries/Components/Switch/Switch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Switch
  * @flow
diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.android.js b/Libraries/Components/TabBarIOS/TabBarIOS.android.js
index 0c6465bb38af25..c52d947ebd325e 100644
--- a/Libraries/Components/TabBarIOS/TabBarIOS.android.js
+++ b/Libraries/Components/TabBarIOS/TabBarIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TabBarIOS
  * @flow
diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
index c373bc57ac27e8..2e838b097df387 100644
--- a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TabBarIOS
  * @flow
diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js
index 43cf6d429e0bfa..ffd46d9c59d8e9 100644
--- a/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js
+++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TabBarItemIOS
  */
diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
index d4e2687c198ff4..eb5c6b2326269f 100644
--- a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TabBarItemIOS
  * @noflow
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 47e6bc4fc08045..ab685dc75060c4 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TextInput
  * @flow
diff --git a/Libraries/Components/TextInput/TextInputState.js b/Libraries/Components/TextInput/TextInputState.js
index 7d17fe639352d6..46524070fe2147 100644
--- a/Libraries/Components/TextInput/TextInputState.js
+++ b/Libraries/Components/TextInput/TextInputState.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TextInputState
  * @flow
diff --git a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js
index e837075ded13b4..be7f4c4f9286c6 100644
--- a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js
+++ b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TimePickerAndroid
  * @flow
diff --git a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.ios.js b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.ios.js
index 1214d231ca6754..a6b630d7c394a4 100644
--- a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.ios.js
+++ b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TimePickerAndroid
  * @flow
diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.android.js b/Libraries/Components/ToastAndroid/ToastAndroid.android.js
index 2555b83b4daa4e..5434126660f317 100644
--- a/Libraries/Components/ToastAndroid/ToastAndroid.android.js
+++ b/Libraries/Components/ToastAndroid/ToastAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ToastAndroid
  * @flow
diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.ios.js b/Libraries/Components/ToastAndroid/ToastAndroid.ios.js
index 4fc912777abb2f..b44f812ecff0f5 100644
--- a/Libraries/Components/ToastAndroid/ToastAndroid.ios.js
+++ b/Libraries/Components/ToastAndroid/ToastAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ToastAndroid
  * @noflow
diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
index 85435eaea6bfa4..941d1432855a70 100644
--- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
+++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ToolbarAndroid
  */
diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js
index 28a8901ff890fd..68ef4ef8300aba 100644
--- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js
+++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ToolbarAndroid
  */
diff --git a/Libraries/Components/Touchable/BoundingDimensions.js b/Libraries/Components/Touchable/BoundingDimensions.js
index a5877717b6b651..73e700ca313bb9 100644
--- a/Libraries/Components/Touchable/BoundingDimensions.js
+++ b/Libraries/Components/Touchable/BoundingDimensions.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BoundingDimensions
  */
diff --git a/Libraries/Components/Touchable/Position.js b/Libraries/Components/Touchable/Position.js
index 77dd3ad11b81e9..229e791fb92794 100644
--- a/Libraries/Components/Touchable/Position.js
+++ b/Libraries/Components/Touchable/Position.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Position
  */
diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js
index e8f925e90d5b11..ff63195b089ada 100644
--- a/Libraries/Components/Touchable/Touchable.js
+++ b/Libraries/Components/Touchable/Touchable.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Touchable
  */
diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js
index f034e582f4941b..2f0949b6ff22f2 100644
--- a/Libraries/Components/Touchable/TouchableBounce.js
+++ b/Libraries/Components/Touchable/TouchableBounce.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableBounce
  * @flow
diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
index 04af3d17fff631..823bd63edaf65f 100644
--- a/Libraries/Components/Touchable/TouchableHighlight.js
+++ b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableHighlight
  * @flow
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
index f5e43340e04389..effad37642759a 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableNativeFeedback
  */
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
index 99abaa3a07055a..9b7ff5e7e82d41 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableNativeFeedback
  */
diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
index a27907ecef88be..e8d6ca171abc6e 100644
--- a/Libraries/Components/Touchable/TouchableOpacity.js
+++ b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableOpacity
  * @noflow
diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
index 2a285dfa8013c6..642c8593cbe023 100755
--- a/Libraries/Components/Touchable/TouchableWithoutFeedback.js
+++ b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchableWithoutFeedback
  * @flow
diff --git a/Libraries/Components/Touchable/__mocks__/ensureComponentIsNative.js b/Libraries/Components/Touchable/__mocks__/ensureComponentIsNative.js
index e537f2be044863..8f036c71e8cddf 100644
--- a/Libraries/Components/Touchable/__mocks__/ensureComponentIsNative.js
+++ b/Libraries/Components/Touchable/__mocks__/ensureComponentIsNative.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js b/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
index 99a94fca6af72f..396b7387b218cc 100644
--- a/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
+++ b/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Components/Touchable/ensureComponentIsNative.js b/Libraries/Components/Touchable/ensureComponentIsNative.js
index c66735b508b16c..de01d017716ba2 100644
--- a/Libraries/Components/Touchable/ensureComponentIsNative.js
+++ b/Libraries/Components/Touchable/ensureComponentIsNative.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ensureComponentIsNative
  * @flow
diff --git a/Libraries/Components/Touchable/ensurePositiveDelayProps.js b/Libraries/Components/Touchable/ensurePositiveDelayProps.js
index d2f6a09e8c89ed..85f60091f6049f 100644
--- a/Libraries/Components/Touchable/ensurePositiveDelayProps.js
+++ b/Libraries/Components/Touchable/ensurePositiveDelayProps.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ensurePositiveDelayProps
  * @flow
diff --git a/Libraries/Components/UnimplementedViews/UnimplementedView.js b/Libraries/Components/UnimplementedViews/UnimplementedView.js
index 15568f4b7d08e1..5da72d04f35430 100644
--- a/Libraries/Components/UnimplementedViews/UnimplementedView.js
+++ b/Libraries/Components/UnimplementedViews/UnimplementedView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule UnimplementedView
  * @flow
diff --git a/Libraries/Components/View/PlatformViewPropTypes.android.js b/Libraries/Components/View/PlatformViewPropTypes.android.js
index 7d4734bdaa5f84..64425f94110961 100644
--- a/Libraries/Components/View/PlatformViewPropTypes.android.js
+++ b/Libraries/Components/View/PlatformViewPropTypes.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PlatformViewPropTypes
  * @flow
diff --git a/Libraries/Components/View/PlatformViewPropTypes.ios.js b/Libraries/Components/View/PlatformViewPropTypes.ios.js
index 7957c7b4a90ecf..2394a51746d199 100644
--- a/Libraries/Components/View/PlatformViewPropTypes.ios.js
+++ b/Libraries/Components/View/PlatformViewPropTypes.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PlatformViewPropTypes
  * @flow
diff --git a/Libraries/Components/View/ReactNativeStyleAttributes.js b/Libraries/Components/View/ReactNativeStyleAttributes.js
index 821c5fa9167e77..462e9b7caeb6bb 100644
--- a/Libraries/Components/View/ReactNativeStyleAttributes.js
+++ b/Libraries/Components/View/ReactNativeStyleAttributes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ReactNativeStyleAttributes
  * @flow
diff --git a/Libraries/Components/View/ReactNativeViewAttributes.js b/Libraries/Components/View/ReactNativeViewAttributes.js
index ab12b9fdc4d860..64f81c7196691c 100644
--- a/Libraries/Components/View/ReactNativeViewAttributes.js
+++ b/Libraries/Components/View/ReactNativeViewAttributes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ReactNativeViewAttributes
  * @flow
diff --git a/Libraries/Components/View/ShadowPropTypesIOS.js b/Libraries/Components/View/ShadowPropTypesIOS.js
index 8bf7acbfe99f13..f4f2f0ab4c481a 100644
--- a/Libraries/Components/View/ShadowPropTypesIOS.js
+++ b/Libraries/Components/View/ShadowPropTypesIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ShadowPropTypesIOS
  * @flow
diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index 2393f43526b709..04c7bebb15eed4 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule View
  * @flow
diff --git a/Libraries/Components/View/View.js.flow b/Libraries/Components/View/View.js.flow
index fb62d61037f498..88dffece3c06f0 100644
--- a/Libraries/Components/View/View.js.flow
+++ b/Libraries/Components/View/View.js.flow
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule View
  * @flow
diff --git a/Libraries/Components/View/ViewAccessibility.js b/Libraries/Components/View/ViewAccessibility.js
index c5f6c42e3221aa..b45366fd079755 100644
--- a/Libraries/Components/View/ViewAccessibility.js
+++ b/Libraries/Components/View/ViewAccessibility.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewAccessibility
  * @flow
diff --git a/Libraries/Components/View/ViewContext.js b/Libraries/Components/View/ViewContext.js
index ed73187b0bb8d6..563d2b253b93e0 100644
--- a/Libraries/Components/View/ViewContext.js
+++ b/Libraries/Components/View/ViewContext.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewContext
  * @flow
diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js
index 20efa0c46765f4..7731c7e4a8cef2 100644
--- a/Libraries/Components/View/ViewPropTypes.js
+++ b/Libraries/Components/View/ViewPropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewPropTypes
  * @flow
diff --git a/Libraries/Components/View/ViewStylePropTypes.js b/Libraries/Components/View/ViewStylePropTypes.js
index 3c6886249a74ce..6e9c92163b3181 100644
--- a/Libraries/Components/View/ViewStylePropTypes.js
+++ b/Libraries/Components/View/ViewStylePropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewStylePropTypes
  * @flow
diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
index a44cd15b755c72..bcc1d8609a5f3a 100644
--- a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
+++ b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewPagerAndroid
  * @flow
diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js b/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js
index 35d4196b489037..ee0022ae5453fa 100644
--- a/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js
+++ b/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewPagerAndroid
  */
diff --git a/Libraries/Components/WebView/WebView.android.js b/Libraries/Components/WebView/WebView.android.js
index 07fb34309bf344..851378755da463 100644
--- a/Libraries/Components/WebView/WebView.android.js
+++ b/Libraries/Components/WebView/WebView.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebView
  */
diff --git a/Libraries/Components/WebView/WebView.ios.js b/Libraries/Components/WebView/WebView.ios.js
index b68aecd1864f74..e11f8e3851b622 100644
--- a/Libraries/Components/WebView/WebView.ios.js
+++ b/Libraries/Components/WebView/WebView.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebView
  * @noflow
diff --git a/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js b/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js
index 347bdf79ba1e27..beaa629d765d77 100644
--- a/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js
+++ b/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Core/Devtools/getDevServer.js b/Libraries/Core/Devtools/getDevServer.js
index ff34314cadd839..e413709da1cece 100644
--- a/Libraries/Core/Devtools/getDevServer.js
+++ b/Libraries/Core/Devtools/getDevServer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule getDevServer
  * @flow
diff --git a/Libraries/Core/Devtools/openFileInEditor.js b/Libraries/Core/Devtools/openFileInEditor.js
index 650cb568340c4f..a5f9da59e6b1ab 100644
--- a/Libraries/Core/Devtools/openFileInEditor.js
+++ b/Libraries/Core/Devtools/openFileInEditor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule openFileInEditor
  * @flow
diff --git a/Libraries/Core/Devtools/parseErrorStack.js b/Libraries/Core/Devtools/parseErrorStack.js
index 11466533f5585f..e1ae27294fee68 100644
--- a/Libraries/Core/Devtools/parseErrorStack.js
+++ b/Libraries/Core/Devtools/parseErrorStack.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule parseErrorStack
  * @flow
diff --git a/Libraries/Core/Devtools/setupDevtools.js b/Libraries/Core/Devtools/setupDevtools.js
index b1c32960abf5a9..cbfb8df3983b59 100644
--- a/Libraries/Core/Devtools/setupDevtools.js
+++ b/Libraries/Core/Devtools/setupDevtools.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule setupDevtools
  * @flow
diff --git a/Libraries/Core/Devtools/symbolicateStackTrace.js b/Libraries/Core/Devtools/symbolicateStackTrace.js
index 283e4b78cc94aa..5ac25fe03e98fb 100644
--- a/Libraries/Core/Devtools/symbolicateStackTrace.js
+++ b/Libraries/Core/Devtools/symbolicateStackTrace.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule symbolicateStackTrace
  * @flow
diff --git a/Libraries/Core/ExceptionsManager.js b/Libraries/Core/ExceptionsManager.js
index 56ced328d2114a..8a63ec3bff4bcc 100644
--- a/Libraries/Core/ExceptionsManager.js
+++ b/Libraries/Core/ExceptionsManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ExceptionsManager
  * @flow
diff --git a/Libraries/Core/InitializeCore.js b/Libraries/Core/InitializeCore.js
index 761846f862ad4a..3e09e566078cca 100644
--- a/Libraries/Core/InitializeCore.js
+++ b/Libraries/Core/InitializeCore.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InitializeCore
  * @flow
diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index 2f78126ef691a6..52b8f9c47b8f26 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -2,11 +2,9 @@
  * @generated by scripts/bump-oss-version.js
  *
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ReactNativeVersion
diff --git a/Libraries/Core/ReactNativeVersionCheck.js b/Libraries/Core/ReactNativeVersionCheck.js
index 39c416118d896e..acbac3337baffd 100644
--- a/Libraries/Core/ReactNativeVersionCheck.js
+++ b/Libraries/Core/ReactNativeVersionCheck.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ReactNativeVersionCheck
  * @flow
diff --git a/Libraries/Core/Timers/JSTimers.js b/Libraries/Core/Timers/JSTimers.js
index 6d8da69e866af8..5fae3408aa5158 100644
--- a/Libraries/Core/Timers/JSTimers.js
+++ b/Libraries/Core/Timers/JSTimers.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule JSTimers
  * @format
diff --git a/Libraries/Core/__mocks__/ErrorUtils.js b/Libraries/Core/__mocks__/ErrorUtils.js
index 2c9a98f5645247..2ab128040cffca 100644
--- a/Libraries/Core/__mocks__/ErrorUtils.js
+++ b/Libraries/Core/__mocks__/ErrorUtils.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // This mock only provides short-circuited methods of applyWithGuard and guard.
diff --git a/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js b/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js
index 4cbe744fe08498..e5c8cefddf15bb 100644
--- a/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js
+++ b/Libraries/Core/__tests__/ReactNativeVersionCheck-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+react_native
diff --git a/Libraries/EventEmitter/MissingNativeEventEmitterShim.js b/Libraries/EventEmitter/MissingNativeEventEmitterShim.js
index 04362de06ac789..d4abfc228a4ba1 100644
--- a/Libraries/EventEmitter/MissingNativeEventEmitterShim.js
+++ b/Libraries/EventEmitter/MissingNativeEventEmitterShim.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MissingNativeEventEmitterShim
  * @flow
diff --git a/Libraries/EventEmitter/NativeEventEmitter.js b/Libraries/EventEmitter/NativeEventEmitter.js
index 5c979600295b54..f453cbc5184e42 100644
--- a/Libraries/EventEmitter/NativeEventEmitter.js
+++ b/Libraries/EventEmitter/NativeEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NativeEventEmitter
  * @flow
diff --git a/Libraries/EventEmitter/RCTDeviceEventEmitter.js b/Libraries/EventEmitter/RCTDeviceEventEmitter.js
index 01e2e0ac5d7741..57ce4fa08990c8 100644
--- a/Libraries/EventEmitter/RCTDeviceEventEmitter.js
+++ b/Libraries/EventEmitter/RCTDeviceEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTDeviceEventEmitter
  * @flow
diff --git a/Libraries/EventEmitter/RCTEventEmitter.js b/Libraries/EventEmitter/RCTEventEmitter.js
index 76200db890f062..581515482f1c9b 100644
--- a/Libraries/EventEmitter/RCTEventEmitter.js
+++ b/Libraries/EventEmitter/RCTEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTEventEmitter
  * @flow
diff --git a/Libraries/EventEmitter/RCTNativeAppEventEmitter.js b/Libraries/EventEmitter/RCTNativeAppEventEmitter.js
index a940a6ec25bfc8..9fe0a1573fe18f 100644
--- a/Libraries/EventEmitter/RCTNativeAppEventEmitter.js
+++ b/Libraries/EventEmitter/RCTNativeAppEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTNativeAppEventEmitter
  * @flow
diff --git a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
index e2aa9526571b63..d65243424b4a50 100644
--- a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
+++ b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/Libraries/Experimental/Incremental.js b/Libraries/Experimental/Incremental.js
index c0d486eb021c31..45c0a7dce5a071 100644
--- a/Libraries/Experimental/Incremental.js
+++ b/Libraries/Experimental/Incremental.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Incremental
  * @flow
diff --git a/Libraries/Experimental/IncrementalExample.js b/Libraries/Experimental/IncrementalExample.js
index 13272627fb5838..280d36f198cfa0 100644
--- a/Libraries/Experimental/IncrementalExample.js
+++ b/Libraries/Experimental/IncrementalExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule IncrementalExample
  * @flow
diff --git a/Libraries/Experimental/IncrementalGroup.js b/Libraries/Experimental/IncrementalGroup.js
index 81714929afe351..e2aefae6836f2d 100644
--- a/Libraries/Experimental/IncrementalGroup.js
+++ b/Libraries/Experimental/IncrementalGroup.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule IncrementalGroup
  * @flow
diff --git a/Libraries/Experimental/IncrementalPresenter.js b/Libraries/Experimental/IncrementalPresenter.js
index 8f273974c20acf..03c69d1fcdcf71 100644
--- a/Libraries/Experimental/IncrementalPresenter.js
+++ b/Libraries/Experimental/IncrementalPresenter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule IncrementalPresenter
  * @flow
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js b/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js
index 6aa7c253ae6ee6..f7f78b40103acf 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableFlatList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableFlatList
  * @flow
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListView.js b/Libraries/Experimental/SwipeableRow/SwipeableListView.js
index 1daf0a1e483c3e..569f3581d04770 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableListView.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableListView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableListView
  * @flow
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js b/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js
index 4fc44549688e2b..bda3bd3b530651 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableListViewDataSource
  */
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
index 59cccbe3d85869..315b8a2f64c389 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableQuickActionButton
  * @flow
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
index c5e53d55e80db4..96fe1d23daab47 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableQuickActions
  * @flow
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableRow.js b/Libraries/Experimental/SwipeableRow/SwipeableRow.js
index 18c5bbd0eff93c..e03970c637fa8b 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableRow.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableRow.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableRow
  * @flow
diff --git a/Libraries/Experimental/WindowedListView.js b/Libraries/Experimental/WindowedListView.js
index a457bea4ed3d2d..2a102b23f3c47c 100644
--- a/Libraries/Experimental/WindowedListView.js
+++ b/Libraries/Experimental/WindowedListView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WindowedListView
  * @flow
diff --git a/Libraries/Geolocation/Geolocation.js b/Libraries/Geolocation/Geolocation.js
index d387b83e47076f..d5d8fcd30a96bf 100644
--- a/Libraries/Geolocation/Geolocation.js
+++ b/Libraries/Geolocation/Geolocation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Geolocation
  * @flow
diff --git a/Libraries/Geolocation/RCTLocationObserver.h b/Libraries/Geolocation/RCTLocationObserver.h
index 631bdf1cc80bdd..5de0ea289d881d 100644
--- a/Libraries/Geolocation/RCTLocationObserver.h
+++ b/Libraries/Geolocation/RCTLocationObserver.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventEmitter.h>
diff --git a/Libraries/Geolocation/RCTLocationObserver.m b/Libraries/Geolocation/RCTLocationObserver.m
index 11b344a6f46cf1..9e15facfa7ef68 100644
--- a/Libraries/Geolocation/RCTLocationObserver.m
+++ b/Libraries/Geolocation/RCTLocationObserver.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTLocationObserver.h"
diff --git a/Libraries/Image/AssetRegistry.js b/Libraries/Image/AssetRegistry.js
index 4871fe370f70fd..7dabcfb9b53561 100644
--- a/Libraries/Image/AssetRegistry.js
+++ b/Libraries/Image/AssetRegistry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AssetRegistry
  * @flow
diff --git a/Libraries/Image/AssetSourceResolver.js b/Libraries/Image/AssetSourceResolver.js
index f8166c07d41ac8..819353e03846ea 100644
--- a/Libraries/Image/AssetSourceResolver.js
+++ b/Libraries/Image/AssetSourceResolver.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AssetSourceResolver
  * @flow
diff --git a/Libraries/Image/Image.android.js b/Libraries/Image/Image.android.js
index d3dec7a8adfb76..bdb29ab8fe8965 100644
--- a/Libraries/Image/Image.android.js
+++ b/Libraries/Image/Image.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Image
  * @flow
diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js
index 45b17d37229e04..173d78704f6610 100644
--- a/Libraries/Image/Image.ios.js
+++ b/Libraries/Image/Image.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Image
  * @flow
diff --git a/Libraries/Image/ImageBackground.js b/Libraries/Image/ImageBackground.js
index 13f4e2e9f85e1a..95d2b688a35006 100644
--- a/Libraries/Image/ImageBackground.js
+++ b/Libraries/Image/ImageBackground.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageBackground
  * @flow
diff --git a/Libraries/Image/ImageEditor.js b/Libraries/Image/ImageEditor.js
index 90868c7736623e..ddd7fd381285c5 100644
--- a/Libraries/Image/ImageEditor.js
+++ b/Libraries/Image/ImageEditor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageEditor
  * @flow
diff --git a/Libraries/Image/ImageResizeMode.js b/Libraries/Image/ImageResizeMode.js
index 26c0029e247fa3..25d937d60efe5f 100644
--- a/Libraries/Image/ImageResizeMode.js
+++ b/Libraries/Image/ImageResizeMode.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageResizeMode
  * @flow
diff --git a/Libraries/Image/ImageSource.js b/Libraries/Image/ImageSource.js
index 59fa2c0174729a..533eb513219ca2 100644
--- a/Libraries/Image/ImageSource.js
+++ b/Libraries/Image/ImageSource.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageSource
  * @flow
diff --git a/Libraries/Image/ImageSourcePropType.js b/Libraries/Image/ImageSourcePropType.js
index 3ace885f6e15ad..af9dac3c479477 100644
--- a/Libraries/Image/ImageSourcePropType.js
+++ b/Libraries/Image/ImageSourcePropType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageSourcePropType
  * @no-flow
diff --git a/Libraries/Image/ImageStore.js b/Libraries/Image/ImageStore.js
index 6eb06418eebd91..215bdec246cb1e 100644
--- a/Libraries/Image/ImageStore.js
+++ b/Libraries/Image/ImageStore.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageStore
  * @flow
diff --git a/Libraries/Image/ImageStylePropTypes.js b/Libraries/Image/ImageStylePropTypes.js
index 2953b81ab7156f..9a688ac7f9d425 100644
--- a/Libraries/Image/ImageStylePropTypes.js
+++ b/Libraries/Image/ImageStylePropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageStylePropTypes
  * @flow
diff --git a/Libraries/Image/RCTGIFImageDecoder.h b/Libraries/Image/RCTGIFImageDecoder.h
index 01128297c39cb5..1f942aef4c8ce6 100644
--- a/Libraries/Image/RCTGIFImageDecoder.h
+++ b/Libraries/Image/RCTGIFImageDecoder.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTImageLoader.h>
diff --git a/Libraries/Image/RCTGIFImageDecoder.m b/Libraries/Image/RCTGIFImageDecoder.m
index e9777bec16a5e6..48ca8aefcf74b4 100644
--- a/Libraries/Image/RCTGIFImageDecoder.m
+++ b/Libraries/Image/RCTGIFImageDecoder.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTGIFImageDecoder.h"
diff --git a/Libraries/Image/RCTImageBlurUtils.h b/Libraries/Image/RCTImageBlurUtils.h
index db8c90943789fa..44df37441af92a 100644
--- a/Libraries/Image/RCTImageBlurUtils.h
+++ b/Libraries/Image/RCTImageBlurUtils.h
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/Image/RCTImageBlurUtils.m b/Libraries/Image/RCTImageBlurUtils.m
index 193c042770a12e..84c90019bfbcc9 100644
--- a/Libraries/Image/RCTImageBlurUtils.m
+++ b/Libraries/Image/RCTImageBlurUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageBlurUtils.h"
diff --git a/Libraries/Image/RCTImageCache.h b/Libraries/Image/RCTImageCache.h
index b0cf1b69257703..c0d24ad25a2d41 100644
--- a/Libraries/Image/RCTImageCache.h
+++ b/Libraries/Image/RCTImageCache.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/Image/RCTImageCache.m b/Libraries/Image/RCTImageCache.m
index ed825f00c13997..8caedae7cf8186 100644
--- a/Libraries/Image/RCTImageCache.m
+++ b/Libraries/Image/RCTImageCache.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageCache.h"
diff --git a/Libraries/Image/RCTImageEditingManager.h b/Libraries/Image/RCTImageEditingManager.h
index e2d87600dba37c..dda409af33fc22 100644
--- a/Libraries/Image/RCTImageEditingManager.h
+++ b/Libraries/Image/RCTImageEditingManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/Libraries/Image/RCTImageEditingManager.m b/Libraries/Image/RCTImageEditingManager.m
index 89341f652646c4..2c8330ee9a302b 100644
--- a/Libraries/Image/RCTImageEditingManager.m
+++ b/Libraries/Image/RCTImageEditingManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageEditingManager.h"
diff --git a/Libraries/Image/RCTImageLoader.h b/Libraries/Image/RCTImageLoader.h
index 5326845ee69ac4..a0c6e798a8a960 100644
--- a/Libraries/Image/RCTImageLoader.h
+++ b/Libraries/Image/RCTImageLoader.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Image/RCTImageLoader.m b/Libraries/Image/RCTImageLoader.m
index 8b5b96c7bc70d3..bc50fb03a0eaca 100644
--- a/Libraries/Image/RCTImageLoader.m
+++ b/Libraries/Image/RCTImageLoader.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <stdatomic.h>
diff --git a/Libraries/Image/RCTImageShadowView.h b/Libraries/Image/RCTImageShadowView.h
index 292a790748ec28..168f0f4c1de86d 100644
--- a/Libraries/Image/RCTImageShadowView.h
+++ b/Libraries/Image/RCTImageShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
diff --git a/Libraries/Image/RCTImageShadowView.m b/Libraries/Image/RCTImageShadowView.m
index 3dc16c4f0d0f5e..c9ba82e32188cc 100644
--- a/Libraries/Image/RCTImageShadowView.m
+++ b/Libraries/Image/RCTImageShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageShadowView.h"
diff --git a/Libraries/Image/RCTImageStoreManager.m b/Libraries/Image/RCTImageStoreManager.m
index 87fe71387eac14..443885becfff2e 100644
--- a/Libraries/Image/RCTImageStoreManager.m
+++ b/Libraries/Image/RCTImageStoreManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageStoreManager.h"
diff --git a/Libraries/Image/RCTImageUtils.h b/Libraries/Image/RCTImageUtils.h
index 371770cb1b92cd..d6090ac67ffb48 100644
--- a/Libraries/Image/RCTImageUtils.h
+++ b/Libraries/Image/RCTImageUtils.h
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/Image/RCTImageUtils.m b/Libraries/Image/RCTImageUtils.m
index f64f1f7b686887..52fe3893307307 100644
--- a/Libraries/Image/RCTImageUtils.m
+++ b/Libraries/Image/RCTImageUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageUtils.h"
diff --git a/Libraries/Image/RCTImageView.h b/Libraries/Image/RCTImageView.h
index 7c632b3bfa66a1..70357c359b142e 100644
--- a/Libraries/Image/RCTImageView.h
+++ b/Libraries/Image/RCTImageView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Image/RCTImageView.m b/Libraries/Image/RCTImageView.m
index 144fff6cbff33c..a754bb1078dc3b 100644
--- a/Libraries/Image/RCTImageView.m
+++ b/Libraries/Image/RCTImageView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageView.h"
diff --git a/Libraries/Image/RCTImageViewManager.h b/Libraries/Image/RCTImageViewManager.h
index 60ba85df174fa2..f718a70246ef41 100644
--- a/Libraries/Image/RCTImageViewManager.h
+++ b/Libraries/Image/RCTImageViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/Image/RCTImageViewManager.m b/Libraries/Image/RCTImageViewManager.m
index b313e016fd3094..bd382e4bf191d0 100644
--- a/Libraries/Image/RCTImageViewManager.m
+++ b/Libraries/Image/RCTImageViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageViewManager.h"
diff --git a/Libraries/Image/RCTLocalAssetImageLoader.h b/Libraries/Image/RCTLocalAssetImageLoader.h
index 011484f2d800aa..4cd79bd403c5a2 100644
--- a/Libraries/Image/RCTLocalAssetImageLoader.h
+++ b/Libraries/Image/RCTLocalAssetImageLoader.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTImageLoader.h>
diff --git a/Libraries/Image/RCTLocalAssetImageLoader.m b/Libraries/Image/RCTLocalAssetImageLoader.m
index 7186f9aa59bf51..091cd70e0eafef 100644
--- a/Libraries/Image/RCTLocalAssetImageLoader.m
+++ b/Libraries/Image/RCTLocalAssetImageLoader.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTLocalAssetImageLoader.h"
diff --git a/Libraries/Image/RCTResizeMode.h b/Libraries/Image/RCTResizeMode.h
index 52f888073894d6..ce0fba5e31afad 100644
--- a/Libraries/Image/RCTResizeMode.h
+++ b/Libraries/Image/RCTResizeMode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTConvert.h>
diff --git a/Libraries/Image/RCTResizeMode.m b/Libraries/Image/RCTResizeMode.m
index 6142fc6ab1fb73..1094b7ff96e8c9 100644
--- a/Libraries/Image/RCTResizeMode.m
+++ b/Libraries/Image/RCTResizeMode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTResizeMode.h"
diff --git a/Libraries/Image/RelativeImageStub.js b/Libraries/Image/RelativeImageStub.js
index 37984d7ff217d8..4adf66b806b4f2 100644
--- a/Libraries/Image/RelativeImageStub.js
+++ b/Libraries/Image/RelativeImageStub.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RelativeImageStub
  * @flow
diff --git a/Libraries/Image/__tests__/assetRelativePathInSnapshot.js b/Libraries/Image/__tests__/assetRelativePathInSnapshot.js
index c0c0b96c89525e..262e636b4710ff 100644
--- a/Libraries/Image/__tests__/assetRelativePathInSnapshot.js
+++ b/Libraries/Image/__tests__/assetRelativePathInSnapshot.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Image/__tests__/resolveAssetSource-test.js b/Libraries/Image/__tests__/resolveAssetSource-test.js
index bf0507d752bb92..50a666a5b54897 100644
--- a/Libraries/Image/__tests__/resolveAssetSource-test.js
+++ b/Libraries/Image/__tests__/resolveAssetSource-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Image/nativeImageSource.js b/Libraries/Image/nativeImageSource.js
index 66af917254bf7c..26b194ace776be 100644
--- a/Libraries/Image/nativeImageSource.js
+++ b/Libraries/Image/nativeImageSource.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule nativeImageSource
  * @flow
diff --git a/Libraries/Image/resolveAssetSource.js b/Libraries/Image/resolveAssetSource.js
index cabed0a0a69621..a5b6229d35d738 100644
--- a/Libraries/Image/resolveAssetSource.js
+++ b/Libraries/Image/resolveAssetSource.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule resolveAssetSource
  * @flow
diff --git a/Libraries/Inspector/BorderBox.js b/Libraries/Inspector/BorderBox.js
index 782c7c2e02bf6c..c121de5ea1dabb 100644
--- a/Libraries/Inspector/BorderBox.js
+++ b/Libraries/Inspector/BorderBox.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BorderBox
  * @flow
diff --git a/Libraries/Inspector/BoxInspector.js b/Libraries/Inspector/BoxInspector.js
index 2b4c2786cc870e..31bedeecdaa0c8 100644
--- a/Libraries/Inspector/BoxInspector.js
+++ b/Libraries/Inspector/BoxInspector.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BoxInspector
  * @flow
diff --git a/Libraries/Inspector/ElementBox.js b/Libraries/Inspector/ElementBox.js
index db4f7b8f0da818..b9caef093cc340 100644
--- a/Libraries/Inspector/ElementBox.js
+++ b/Libraries/Inspector/ElementBox.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ElementBox
  * @flow
diff --git a/Libraries/Inspector/ElementProperties.js b/Libraries/Inspector/ElementProperties.js
index 880dcb84d173b8..f7937c5f7edb2a 100644
--- a/Libraries/Inspector/ElementProperties.js
+++ b/Libraries/Inspector/ElementProperties.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ElementProperties
  * @flow
diff --git a/Libraries/Inspector/Inspector.js b/Libraries/Inspector/Inspector.js
index 3eb6682f2bd97c..90e30b346a9461 100644
--- a/Libraries/Inspector/Inspector.js
+++ b/Libraries/Inspector/Inspector.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Inspector
  * @flow
diff --git a/Libraries/Inspector/InspectorOverlay.js b/Libraries/Inspector/InspectorOverlay.js
index 716c0e1a7d62b2..d441ba59884ea9 100644
--- a/Libraries/Inspector/InspectorOverlay.js
+++ b/Libraries/Inspector/InspectorOverlay.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InspectorOverlay
  * @flow
diff --git a/Libraries/Inspector/InspectorPanel.js b/Libraries/Inspector/InspectorPanel.js
index a37b37f8ef2885..c4031a355d5c45 100644
--- a/Libraries/Inspector/InspectorPanel.js
+++ b/Libraries/Inspector/InspectorPanel.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InspectorPanel
  * @flow
diff --git a/Libraries/Inspector/NetworkOverlay.js b/Libraries/Inspector/NetworkOverlay.js
index db0216a0059e82..789ac6de824c65 100644
--- a/Libraries/Inspector/NetworkOverlay.js
+++ b/Libraries/Inspector/NetworkOverlay.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NetworkOverlay
  * @flow
diff --git a/Libraries/Inspector/PerformanceOverlay.js b/Libraries/Inspector/PerformanceOverlay.js
index c6c6f1c023e1eb..8240a43244ac6b 100644
--- a/Libraries/Inspector/PerformanceOverlay.js
+++ b/Libraries/Inspector/PerformanceOverlay.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PerformanceOverlay
  * @flow
diff --git a/Libraries/Inspector/StyleInspector.js b/Libraries/Inspector/StyleInspector.js
index 192d7b93fc4e77..7bd137bdea7de6 100644
--- a/Libraries/Inspector/StyleInspector.js
+++ b/Libraries/Inspector/StyleInspector.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StyleInspector
  * @flow
diff --git a/Libraries/Inspector/resolveBoxStyle.js b/Libraries/Inspector/resolveBoxStyle.js
index 0c2857bd0e658b..28f4af50525b33 100644
--- a/Libraries/Inspector/resolveBoxStyle.js
+++ b/Libraries/Inspector/resolveBoxStyle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule resolveBoxStyle
  * @flow
diff --git a/Libraries/Interaction/Batchinator.js b/Libraries/Interaction/Batchinator.js
index e807e5515e7f81..3f3b4e069a019e 100644
--- a/Libraries/Interaction/Batchinator.js
+++ b/Libraries/Interaction/Batchinator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Batchinator
  * @flow
diff --git a/Libraries/Interaction/BridgeSpyStallHandler.js b/Libraries/Interaction/BridgeSpyStallHandler.js
index 78d61c0321baae..f47f0751d8ad67 100644
--- a/Libraries/Interaction/BridgeSpyStallHandler.js
+++ b/Libraries/Interaction/BridgeSpyStallHandler.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BridgeSpyStallHandler
  * @flow
diff --git a/Libraries/Interaction/FrameRateLogger.js b/Libraries/Interaction/FrameRateLogger.js
index 3f1265b4140b03..072adeb930f8d8 100644
--- a/Libraries/Interaction/FrameRateLogger.js
+++ b/Libraries/Interaction/FrameRateLogger.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule FrameRateLogger
  * @flow
diff --git a/Libraries/Interaction/InteractionManager.js b/Libraries/Interaction/InteractionManager.js
index 489c5de9148f5f..227e1b05bd3a73 100644
--- a/Libraries/Interaction/InteractionManager.js
+++ b/Libraries/Interaction/InteractionManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InteractionManager
  * @flow
diff --git a/Libraries/Interaction/InteractionMixin.js b/Libraries/Interaction/InteractionMixin.js
index b0e3104407ea36..9e81a4fddaec1e 100644
--- a/Libraries/Interaction/InteractionMixin.js
+++ b/Libraries/Interaction/InteractionMixin.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InteractionMixin
  * @flow
diff --git a/Libraries/Interaction/InteractionStallDebugger.js b/Libraries/Interaction/InteractionStallDebugger.js
index 782abbf7edaeaf..8d2bcc82e5f9ba 100644
--- a/Libraries/Interaction/InteractionStallDebugger.js
+++ b/Libraries/Interaction/InteractionStallDebugger.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InteractionStallDebugger
  * @flow
diff --git a/Libraries/Interaction/JSEventLoopWatchdog.js b/Libraries/Interaction/JSEventLoopWatchdog.js
index 702f18d6c1d70b..2d1866a0c77f2f 100644
--- a/Libraries/Interaction/JSEventLoopWatchdog.js
+++ b/Libraries/Interaction/JSEventLoopWatchdog.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule JSEventLoopWatchdog
  * @flow
diff --git a/Libraries/Interaction/PanResponder.js b/Libraries/Interaction/PanResponder.js
index bc6774e985eb66..db7d85c87e2714 100644
--- a/Libraries/Interaction/PanResponder.js
+++ b/Libraries/Interaction/PanResponder.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PanResponder
  */
diff --git a/Libraries/Interaction/ReactPerfStallHandler.js b/Libraries/Interaction/ReactPerfStallHandler.js
index 0644ace6af5eeb..394bc7533ca1c7 100644
--- a/Libraries/Interaction/ReactPerfStallHandler.js
+++ b/Libraries/Interaction/ReactPerfStallHandler.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ReactPerfStallHandler
  * @flow
diff --git a/Libraries/Interaction/TaskQueue.js b/Libraries/Interaction/TaskQueue.js
index 660241fb35bc5a..0ee5e4500af9f0 100644
--- a/Libraries/Interaction/TaskQueue.js
+++ b/Libraries/Interaction/TaskQueue.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TaskQueue
  * @flow
diff --git a/Libraries/Interaction/__tests__/Batchinator-test.js b/Libraries/Interaction/__tests__/Batchinator-test.js
index 3d28fa0cff5c5e..a0afacd4e0d0cd 100644
--- a/Libraries/Interaction/__tests__/Batchinator-test.js
+++ b/Libraries/Interaction/__tests__/Batchinator-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Interaction/__tests__/InteractionManager-test.js b/Libraries/Interaction/__tests__/InteractionManager-test.js
index 3c5a7c8814ebb6..0a74b7cc766485 100644
--- a/Libraries/Interaction/__tests__/InteractionManager-test.js
+++ b/Libraries/Interaction/__tests__/InteractionManager-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Interaction/__tests__/InteractionMixin-test.js b/Libraries/Interaction/__tests__/InteractionMixin-test.js
index 44f63fbb9c828f..08f33d759f5016 100644
--- a/Libraries/Interaction/__tests__/InteractionMixin-test.js
+++ b/Libraries/Interaction/__tests__/InteractionMixin-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Interaction/__tests__/TaskQueue-test.js b/Libraries/Interaction/__tests__/TaskQueue-test.js
index cd4f7aeed412cc..407e8fa435cd0b 100644
--- a/Libraries/Interaction/__tests__/TaskQueue-test.js
+++ b/Libraries/Interaction/__tests__/TaskQueue-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/JSInspector/InspectorAgent.js b/Libraries/JSInspector/InspectorAgent.js
index c0d9314a3baec0..a5b6cca0da3da3 100644
--- a/Libraries/JSInspector/InspectorAgent.js
+++ b/Libraries/JSInspector/InspectorAgent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InspectorAgent
  * @flow
diff --git a/Libraries/JSInspector/JSInspector.js b/Libraries/JSInspector/JSInspector.js
index 859188420c8642..9a6b13ffb7c690 100644
--- a/Libraries/JSInspector/JSInspector.js
+++ b/Libraries/JSInspector/JSInspector.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule JSInspector
  * @flow
diff --git a/Libraries/JSInspector/NetworkAgent.js b/Libraries/JSInspector/NetworkAgent.js
index 4314411b8e0076..56f6f2a37fdccf 100644
--- a/Libraries/JSInspector/NetworkAgent.js
+++ b/Libraries/JSInspector/NetworkAgent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NetworkAgent
  * @flow
diff --git a/Libraries/LayoutAnimation/LayoutAnimation.js b/Libraries/LayoutAnimation/LayoutAnimation.js
index dc0720ba09b2da..fe4a2cc2b84328 100644
--- a/Libraries/LayoutAnimation/LayoutAnimation.js
+++ b/Libraries/LayoutAnimation/LayoutAnimation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LayoutAnimation
  * @flow
diff --git a/Libraries/Linking/Linking.js b/Libraries/Linking/Linking.js
index 06dc75c3b9eef8..799ad055cbe850 100644
--- a/Libraries/Linking/Linking.js
+++ b/Libraries/Linking/Linking.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Linking
  * @flow
diff --git a/Libraries/LinkingIOS/RCTLinkingManager.h b/Libraries/LinkingIOS/RCTLinkingManager.h
index 8f5f8b89aa7b27..55187727ac95d2 100644
--- a/Libraries/LinkingIOS/RCTLinkingManager.h
+++ b/Libraries/LinkingIOS/RCTLinkingManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/LinkingIOS/RCTLinkingManager.m b/Libraries/LinkingIOS/RCTLinkingManager.m
index 51a2896cfe4943..50982fa976d669 100644
--- a/Libraries/LinkingIOS/RCTLinkingManager.m
+++ b/Libraries/LinkingIOS/RCTLinkingManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTLinkingManager.h"
diff --git a/Libraries/Lists/FillRateHelper.js b/Libraries/Lists/FillRateHelper.js
index 8d52111e1cdbab..f060897356b73a 100644
--- a/Libraries/Lists/FillRateHelper.js
+++ b/Libraries/Lists/FillRateHelper.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule FillRateHelper
  * @flow
diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index faf93d859c47d3..dc0f5db8b5f8d3 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule FlatList
  * @flow
diff --git a/Libraries/Lists/ListView/ListView.js b/Libraries/Lists/ListView/ListView.js
index 37c3f34cc21fc5..9aefd2ea9222b3 100644
--- a/Libraries/Lists/ListView/ListView.js
+++ b/Libraries/Lists/ListView/ListView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ListView
  * @flow
diff --git a/Libraries/Lists/ListView/ListViewDataSource.js b/Libraries/Lists/ListView/ListViewDataSource.js
index 3f7a4c10d64cb2..ec63c94d0f46dd 100644
--- a/Libraries/Lists/ListView/ListViewDataSource.js
+++ b/Libraries/Lists/ListView/ListViewDataSource.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ListViewDataSource
  * @flow
diff --git a/Libraries/Lists/ListView/__mocks__/ListViewMock.js b/Libraries/Lists/ListView/__mocks__/ListViewMock.js
index 732dc5e1caf208..a691136be39a4f 100644
--- a/Libraries/Lists/ListView/__mocks__/ListViewMock.js
+++ b/Libraries/Lists/ListView/__mocks__/ListViewMock.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/Libraries/Lists/MetroListView.js b/Libraries/Lists/MetroListView.js
index c839dc020ed346..906164fa9e88f6 100644
--- a/Libraries/Lists/MetroListView.js
+++ b/Libraries/Lists/MetroListView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MetroListView
  * @flow
diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index 354d6c6a426707..3dfc99bd3a17dd 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SectionList
  * @flow
diff --git a/Libraries/Lists/ViewabilityHelper.js b/Libraries/Lists/ViewabilityHelper.js
index 04bbef2f06e5fe..0c0a8356019075 100644
--- a/Libraries/Lists/ViewabilityHelper.js
+++ b/Libraries/Lists/ViewabilityHelper.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewabilityHelper
  * @flow
diff --git a/Libraries/Lists/VirtualizeUtils.js b/Libraries/Lists/VirtualizeUtils.js
index 8845ed83566f16..663b36b8cc6e76 100644
--- a/Libraries/Lists/VirtualizeUtils.js
+++ b/Libraries/Lists/VirtualizeUtils.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule VirtualizeUtils
  * @flow
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 22fffa79cc2adf..7ca090e88e1809 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule VirtualizedList
  * @flow
diff --git a/Libraries/Lists/VirtualizedSectionList.js b/Libraries/Lists/VirtualizedSectionList.js
index fbc83e2d153551..2bb196814abf13 100644
--- a/Libraries/Lists/VirtualizedSectionList.js
+++ b/Libraries/Lists/VirtualizedSectionList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule VirtualizedSectionList
  * @flow
diff --git a/Libraries/Lists/__flowtests__/FlatList-flowtest.js b/Libraries/Lists/__flowtests__/FlatList-flowtest.js
index 3fe757b63d8439..d8cbd75a153db4 100644
--- a/Libraries/Lists/__flowtests__/FlatList-flowtest.js
+++ b/Libraries/Lists/__flowtests__/FlatList-flowtest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/Libraries/Lists/__flowtests__/SectionList-flowtest.js b/Libraries/Lists/__flowtests__/SectionList-flowtest.js
index 035e9e6f0f010c..93fa77c4631682 100644
--- a/Libraries/Lists/__flowtests__/SectionList-flowtest.js
+++ b/Libraries/Lists/__flowtests__/SectionList-flowtest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/Libraries/Lists/__tests__/FillRateHelper-test.js b/Libraries/Lists/__tests__/FillRateHelper-test.js
index 22e09f5a0a5816..612d02c5bf9ab0 100644
--- a/Libraries/Lists/__tests__/FillRateHelper-test.js
+++ b/Libraries/Lists/__tests__/FillRateHelper-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *
  * @format
diff --git a/Libraries/Lists/__tests__/FlatList-test.js b/Libraries/Lists/__tests__/FlatList-test.js
index a6d1ca5054163f..28dd377bd13862 100644
--- a/Libraries/Lists/__tests__/FlatList-test.js
+++ b/Libraries/Lists/__tests__/FlatList-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *
  * @format
diff --git a/Libraries/Lists/__tests__/SectionList-test.js b/Libraries/Lists/__tests__/SectionList-test.js
index 338cf5273c67cf..f669879df839d9 100644
--- a/Libraries/Lists/__tests__/SectionList-test.js
+++ b/Libraries/Lists/__tests__/SectionList-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *
  * @format
diff --git a/Libraries/Lists/__tests__/ViewabilityHelper-test.js b/Libraries/Lists/__tests__/ViewabilityHelper-test.js
index 1494b5b2f33542..ed94f7f7e253d2 100644
--- a/Libraries/Lists/__tests__/ViewabilityHelper-test.js
+++ b/Libraries/Lists/__tests__/ViewabilityHelper-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *
  * @format
diff --git a/Libraries/Lists/__tests__/VirtualizeUtils-test.js b/Libraries/Lists/__tests__/VirtualizeUtils-test.js
index 3e8b2c9433f592..2361a86aaeff62 100644
--- a/Libraries/Lists/__tests__/VirtualizeUtils-test.js
+++ b/Libraries/Lists/__tests__/VirtualizeUtils-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *
  * @format
diff --git a/Libraries/Lists/__tests__/VirtualizedList-test.js b/Libraries/Lists/__tests__/VirtualizedList-test.js
index d9c4e09a52ea45..14aec9140f1195 100644
--- a/Libraries/Lists/__tests__/VirtualizedList-test.js
+++ b/Libraries/Lists/__tests__/VirtualizedList-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *
  * @format
diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js
index 6d3c16a20a9738..50a73dd1919720 100644
--- a/Libraries/Modal/Modal.js
+++ b/Libraries/Modal/Modal.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Modal
  * @flow
diff --git a/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h b/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
index 3364f174ae3734..40763fd5b3a281 100644
--- a/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
+++ b/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreGraphics/CoreGraphics.h>
diff --git a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h
index 8d6cdd3e566971..d6ae6701e6ef99 100644
--- a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimationDriver.h"
diff --git a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
index 027ca81524f25f..b1e84d675db765 100644
--- a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDecayAnimation.h"
diff --git a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
index 9fef45c83ec350..c6b6f7979b28bc 100644
--- a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventDispatcher.h>
diff --git a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m
index dd7dfc9cf327d0..9c35b13fc237fa 100644
--- a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTEventAnimation.h"
diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h
index 403ce7796a42d4..979c45a8c32dfe 100644
--- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimationDriver.h"
diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
index 53846b2d0a2204..ddcc056acfe975 100644
--- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTFrameAnimation.h"
diff --git a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h
index acf1ae6063bedf..fe721f61d09d1a 100644
--- a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimationDriver.h"
diff --git a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
index 932433a16dae08..7356738f22c5c1 100644
--- a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
+++ b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSpringAnimation.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.h
index 83641afead8442..0e2853df2cc151 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m
index 54175b6b419e76..0bfb4d576be9b6 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAdditionAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
index a8cad4e939c82e..e9d000910ffe3b 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m
index 0b8bd7ab02f16e..71397403a09e72 100644
--- a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h
index 3d6f1db192a228..5d89091eafcebc 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m
index 811382a3bf1888..f2e7d8cd0574a5 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDiffClampAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.h
index 83fac043b5437d..0702012dbab1ec 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m
index 0ae3712ef1e364..a66807c3d3f878 100644
--- a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDivisionAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h
index 2257e49646dc20..e083525d688da2 100644
--- a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
index be804eda0492f4..b7fa8b50974d23 100644
--- a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTInterpolationAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h
index 5a50bf34d0533e..08de0e1aee2f27 100644
--- a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m
index adf252cdfceac3..c2802741d23789 100644
--- a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModuloAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.h
index 43a1ff9b957ca9..481c3d5aa5b310 100644
--- a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m
index c75c00e825e48e..29c151aed3f9a1 100644
--- a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMultiplicationAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h
index ac220f43f4e0ae..24919120a951b4 100644
--- a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
index e25b8cf42d3771..24fb1e82da888c 100644
--- a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPropsAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h
index 285ebf9deea6a0..637b120c48a42a 100644
--- a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m
index 774cdbf526668c..a62d0309306620 100644
--- a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTStyleAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.h
index 18d9eba0b8aa76..59d6951def67ad 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m
index b2daa88b2c9c09..fd8ca221f93c72 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTransformAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h
index 5b66520b8210b5..8360dc659fb810 100644
--- a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m
index 82eff7b62daed3..c433bba3414c81 100644
--- a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTValueAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.h b/Libraries/NativeAnimation/RCTAnimationUtils.h
index 5327c36676405a..d1dba830ee96aa 100644
--- a/Libraries/NativeAnimation/RCTAnimationUtils.h
+++ b/Libraries/NativeAnimation/RCTAnimationUtils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreGraphics/CoreGraphics.h>
diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.m b/Libraries/NativeAnimation/RCTAnimationUtils.m
index d159c05b80416d..8f8d4cfb817a72 100644
--- a/Libraries/NativeAnimation/RCTAnimationUtils.m
+++ b/Libraries/NativeAnimation/RCTAnimationUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimationUtils.h"
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
index e4ffa3aa95cb27..5ca4e95bd82562 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
index 1125513ae08b06..2032f3a01a03c8 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 #import "RCTNativeAnimatedModule.h"
 
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
index 1a0b684c10a271..ae2176684007d6 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
index ee82a8008c7cf6..e05286decf9eb2 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNativeAnimatedNodesManager.h"
diff --git a/Libraries/Network/FormData.js b/Libraries/Network/FormData.js
index 63e1cb6320df1b..669bf0f2a30cf7 100644
--- a/Libraries/Network/FormData.js
+++ b/Libraries/Network/FormData.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule FormData
  * @flow
diff --git a/Libraries/Network/NetInfo.js b/Libraries/Network/NetInfo.js
index 70466719cb809e..64a8386d07b77a 100644
--- a/Libraries/Network/NetInfo.js
+++ b/Libraries/Network/NetInfo.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NetInfo
  * @flow
diff --git a/Libraries/Network/RCTDataRequestHandler.h b/Libraries/Network/RCTDataRequestHandler.h
index 11f84592ec7d30..b0ded9161f283a 100644
--- a/Libraries/Network/RCTDataRequestHandler.h
+++ b/Libraries/Network/RCTDataRequestHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTInvalidating.h>
diff --git a/Libraries/Network/RCTDataRequestHandler.m b/Libraries/Network/RCTDataRequestHandler.m
index c71ce79a8ef258..f0e36dfb472654 100644
--- a/Libraries/Network/RCTDataRequestHandler.m
+++ b/Libraries/Network/RCTDataRequestHandler.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDataRequestHandler.h"
diff --git a/Libraries/Network/RCTFileRequestHandler.h b/Libraries/Network/RCTFileRequestHandler.h
index 261e7a0fbf1b90..7ee7952c5259d9 100644
--- a/Libraries/Network/RCTFileRequestHandler.h
+++ b/Libraries/Network/RCTFileRequestHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTInvalidating.h>
diff --git a/Libraries/Network/RCTFileRequestHandler.m b/Libraries/Network/RCTFileRequestHandler.m
index bc2e14171a3908..7c4585a509d0f9 100644
--- a/Libraries/Network/RCTFileRequestHandler.m
+++ b/Libraries/Network/RCTFileRequestHandler.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTFileRequestHandler.h"
diff --git a/Libraries/Network/RCTHTTPRequestHandler.h b/Libraries/Network/RCTHTTPRequestHandler.h
index b2395ce4d514f6..5148e6a510cc42 100644
--- a/Libraries/Network/RCTHTTPRequestHandler.h
+++ b/Libraries/Network/RCTHTTPRequestHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTInvalidating.h>
diff --git a/Libraries/Network/RCTHTTPRequestHandler.mm b/Libraries/Network/RCTHTTPRequestHandler.mm
index 1a6858820a20c1..6376ad31c812b2 100644
--- a/Libraries/Network/RCTHTTPRequestHandler.mm
+++ b/Libraries/Network/RCTHTTPRequestHandler.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTHTTPRequestHandler.h"
diff --git a/Libraries/Network/RCTNetInfo.h b/Libraries/Network/RCTNetInfo.h
index fabc291e0fbbf6..e38162d2dcbb7b 100644
--- a/Libraries/Network/RCTNetInfo.h
+++ b/Libraries/Network/RCTNetInfo.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <SystemConfiguration/SystemConfiguration.h>
diff --git a/Libraries/Network/RCTNetInfo.m b/Libraries/Network/RCTNetInfo.m
index be04f411881ecc..e41079b89699cd 100644
--- a/Libraries/Network/RCTNetInfo.m
+++ b/Libraries/Network/RCTNetInfo.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNetInfo.h"
diff --git a/Libraries/Network/RCTNetworkTask.h b/Libraries/Network/RCTNetworkTask.h
index f39e32a50c8867..5d54adaf4ffdfd 100644
--- a/Libraries/Network/RCTNetworkTask.h
+++ b/Libraries/Network/RCTNetworkTask.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/Network/RCTNetworkTask.m b/Libraries/Network/RCTNetworkTask.m
index 409da0e719fc9a..e13b3f6328b0e6 100644
--- a/Libraries/Network/RCTNetworkTask.m
+++ b/Libraries/Network/RCTNetworkTask.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTLog.h>
diff --git a/Libraries/Network/RCTNetworking.android.js b/Libraries/Network/RCTNetworking.android.js
index e6292ccfefa6ea..9ec01dccecb838 100644
--- a/Libraries/Network/RCTNetworking.android.js
+++ b/Libraries/Network/RCTNetworking.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTNetworking
  * @flow
diff --git a/Libraries/Network/RCTNetworking.h b/Libraries/Network/RCTNetworking.h
index 2aba529bf4eac1..463dc8f988a107 100644
--- a/Libraries/Network/RCTNetworking.h
+++ b/Libraries/Network/RCTNetworking.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventEmitter.h>
diff --git a/Libraries/Network/RCTNetworking.ios.js b/Libraries/Network/RCTNetworking.ios.js
index 4e2bfd1bef765f..004322a080f1bc 100644
--- a/Libraries/Network/RCTNetworking.ios.js
+++ b/Libraries/Network/RCTNetworking.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTNetworking
  * @flow
diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm
index 9e10791efc0edf..fe86d31e67e0ff 100644
--- a/Libraries/Network/RCTNetworking.mm
+++ b/Libraries/Network/RCTNetworking.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 
diff --git a/Libraries/Network/XHRInterceptor.js b/Libraries/Network/XHRInterceptor.js
index 0c037c8e0359a7..09cc3b22038a56 100644
--- a/Libraries/Network/XHRInterceptor.js
+++ b/Libraries/Network/XHRInterceptor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule XHRInterceptor
  */
diff --git a/Libraries/Network/XMLHttpRequest.js b/Libraries/Network/XMLHttpRequest.js
index 082aaa8932fe23..d17001d3743f34 100644
--- a/Libraries/Network/XMLHttpRequest.js
+++ b/Libraries/Network/XMLHttpRequest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule XMLHttpRequest
  * @flow
diff --git a/Libraries/Network/__tests__/FormData-test.js b/Libraries/Network/__tests__/FormData-test.js
index fe132232eb02e5..a2b8eb0e7a4f1c 100644
--- a/Libraries/Network/__tests__/FormData-test.js
+++ b/Libraries/Network/__tests__/FormData-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Network/__tests__/XMLHttpRequest-test.js b/Libraries/Network/__tests__/XMLHttpRequest-test.js
index e03172db000edf..e4a4ed066494d0 100644
--- a/Libraries/Network/__tests__/XMLHttpRequest-test.js
+++ b/Libraries/Network/__tests__/XMLHttpRequest-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Network/convertRequestBody.js b/Libraries/Network/convertRequestBody.js
index 9a826d46e2c603..2d3ecc7353aa8d 100644
--- a/Libraries/Network/convertRequestBody.js
+++ b/Libraries/Network/convertRequestBody.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule convertRequestBody
  * @flow
diff --git a/Libraries/Network/fetch.js b/Libraries/Network/fetch.js
index d34d46987a1484..5a0de646c91258 100644
--- a/Libraries/Network/fetch.js
+++ b/Libraries/Network/fetch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule fetch
  *
diff --git a/Libraries/Performance/QuickPerformanceLogger.js b/Libraries/Performance/QuickPerformanceLogger.js
index 99516a4d5a0683..4eec7220a7cc7c 100644
--- a/Libraries/Performance/QuickPerformanceLogger.js
+++ b/Libraries/Performance/QuickPerformanceLogger.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule QuickPerformanceLogger
  * @flow
diff --git a/Libraries/Performance/SamplingProfiler.js b/Libraries/Performance/SamplingProfiler.js
index 87142782efc4d0..739274399bde9f 100644
--- a/Libraries/Performance/SamplingProfiler.js
+++ b/Libraries/Performance/SamplingProfiler.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SamplingProfiler
  * @flow
diff --git a/Libraries/Performance/Systrace.js b/Libraries/Performance/Systrace.js
index e491d7765dd2f5..002c12f34fa7b4 100644
--- a/Libraries/Performance/Systrace.js
+++ b/Libraries/Performance/Systrace.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Systrace
  * @flow
diff --git a/Libraries/PermissionsAndroid/PermissionsAndroid.js b/Libraries/PermissionsAndroid/PermissionsAndroid.js
index f06e6af51ecd9b..7cb8a8411c08c4 100644
--- a/Libraries/PermissionsAndroid/PermissionsAndroid.js
+++ b/Libraries/PermissionsAndroid/PermissionsAndroid.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PermissionsAndroid
  * @flow
diff --git a/Libraries/Promise.js b/Libraries/Promise.js
index 61ea1ede732dc7..288ee75f6f0f72 100644
--- a/Libraries/Promise.js
+++ b/Libraries/Promise.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Promise
  * @flow
diff --git a/Libraries/PushNotificationIOS/PushNotificationIOS.js b/Libraries/PushNotificationIOS/PushNotificationIOS.js
index 0b13954834954f..1a131a5744e353 100644
--- a/Libraries/PushNotificationIOS/PushNotificationIOS.js
+++ b/Libraries/PushNotificationIOS/PushNotificationIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PushNotificationIOS
  * @flow
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
index 82605468f1867d..8f19ede508a7d7 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventEmitter.h>
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
index aeb8af20224087..77aff3cbe81fa0 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPushNotificationManager.h"
diff --git a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h
index 889108f5d0662e..98e7f9ce2c1c34 100644
--- a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h
+++ b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.h
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m
index cee6e01b97e045..9c500274942718 100644
--- a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m
+++ b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestCase.m
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.h b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.h
index 6ae45d2313d629..21e55d847d2715 100644
--- a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.h
+++ b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.h
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
index 73af891598867d..40bc79a085926b 100644
--- a/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
+++ b/Libraries/RCTTest/FBSnapshotTestCase/FBSnapshotTestController.m
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/RCTTest/RCTSnapshotManager.h b/Libraries/RCTTest/RCTSnapshotManager.h
index 24486906b638e1..de7ecc818c49b6 100644
--- a/Libraries/RCTTest/RCTSnapshotManager.h
+++ b/Libraries/RCTTest/RCTSnapshotManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/RCTTest/RCTSnapshotManager.m b/Libraries/RCTTest/RCTSnapshotManager.m
index e74cf9c3005d7b..5f1d97337cbfa2 100644
--- a/Libraries/RCTTest/RCTSnapshotManager.m
+++ b/Libraries/RCTTest/RCTSnapshotManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSnapshotManager.h"
diff --git a/Libraries/RCTTest/RCTTestModule.h b/Libraries/RCTTest/RCTTestModule.h
index 7bf93034e24d7d..b658a76c1fca9e 100644
--- a/Libraries/RCTTest/RCTTestModule.h
+++ b/Libraries/RCTTest/RCTTestModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/RCTTest/RCTTestModule.m b/Libraries/RCTTest/RCTTestModule.m
index dd2424d31ddbbc..4f44c4c40c9e68 100644
--- a/Libraries/RCTTest/RCTTestModule.m
+++ b/Libraries/RCTTest/RCTTestModule.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTestModule.h"
diff --git a/Libraries/RCTTest/RCTTestRunner.h b/Libraries/RCTTest/RCTTestRunner.h
index 9a50e94b2c9f13..39e032650e1477 100644
--- a/Libraries/RCTTest/RCTTestRunner.h
+++ b/Libraries/RCTTest/RCTTestRunner.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/RCTTest/RCTTestRunner.m b/Libraries/RCTTest/RCTTestRunner.m
index cb865302087975..00e97137282d0b 100644
--- a/Libraries/RCTTest/RCTTestRunner.m
+++ b/Libraries/RCTTest/RCTTestRunner.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTestRunner.h"
diff --git a/Libraries/RCTTest/SnapshotViewIOS.android.js b/Libraries/RCTTest/SnapshotViewIOS.android.js
index c9127822d50c2b..ef8eb9d7bf67f6 100644
--- a/Libraries/RCTTest/SnapshotViewIOS.android.js
+++ b/Libraries/RCTTest/SnapshotViewIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SnapshotViewIOS
  */
diff --git a/Libraries/RCTTest/SnapshotViewIOS.ios.js b/Libraries/RCTTest/SnapshotViewIOS.ios.js
index a3f4ee06cadf41..494830cd4ff3c0 100644
--- a/Libraries/RCTTest/SnapshotViewIOS.ios.js
+++ b/Libraries/RCTTest/SnapshotViewIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SnapshotViewIOS
  * @flow
diff --git a/Libraries/ReactNative/AppContainer.js b/Libraries/ReactNative/AppContainer.js
index 3c5e3e2cd40c53..cb1ea048e4adbc 100644
--- a/Libraries/ReactNative/AppContainer.js
+++ b/Libraries/ReactNative/AppContainer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AppContainer
  * @format
diff --git a/Libraries/ReactNative/AppRegistry.js b/Libraries/ReactNative/AppRegistry.js
index 98699f18f0a17d..87bd07a6dd14f2 100644
--- a/Libraries/ReactNative/AppRegistry.js
+++ b/Libraries/ReactNative/AppRegistry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AppRegistry
  * @flow
diff --git a/Libraries/ReactNative/FabricUIManager.js b/Libraries/ReactNative/FabricUIManager.js
index df6ea4f0c83d75..641df41755fdc9 100644
--- a/Libraries/ReactNative/FabricUIManager.js
+++ b/Libraries/ReactNative/FabricUIManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule FabricUIManager
  * @flow
diff --git a/Libraries/ReactNative/I18nManager.js b/Libraries/ReactNative/I18nManager.js
index 7c6ad67a4e2bfe..a8a256d515f480 100644
--- a/Libraries/ReactNative/I18nManager.js
+++ b/Libraries/ReactNative/I18nManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule I18nManager
  * @flow
diff --git a/Libraries/ReactNative/UIManager.js b/Libraries/ReactNative/UIManager.js
index ed56fb626862b5..0ad18a0b27dcdb 100644
--- a/Libraries/ReactNative/UIManager.js
+++ b/Libraries/ReactNative/UIManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule UIManager
  * @flow
diff --git a/Libraries/ReactNative/UIManagerStatTracker.js b/Libraries/ReactNative/UIManagerStatTracker.js
index 5d03e432aa3099..31f0a83613ffd1 100644
--- a/Libraries/ReactNative/UIManagerStatTracker.js
+++ b/Libraries/ReactNative/UIManagerStatTracker.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule UIManagerStatTracker
  * @flow
diff --git a/Libraries/ReactNative/YellowBox.js b/Libraries/ReactNative/YellowBox.js
index 08421ad2538c85..8bd31d3cd8b768 100644
--- a/Libraries/ReactNative/YellowBox.js
+++ b/Libraries/ReactNative/YellowBox.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule YellowBox
  * @flow
diff --git a/Libraries/ReactNative/queryLayoutByID.js b/Libraries/ReactNative/queryLayoutByID.js
index 3b6909e460cccb..d484405920d29a 100644
--- a/Libraries/ReactNative/queryLayoutByID.js
+++ b/Libraries/ReactNative/queryLayoutByID.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule queryLayoutByID
  * @flow
diff --git a/Libraries/ReactNative/renderApplication.js b/Libraries/ReactNative/renderApplication.js
index 6d6783ec2b6a4e..ed9bf46a34198c 100644
--- a/Libraries/ReactNative/renderApplication.js
+++ b/Libraries/ReactNative/renderApplication.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule renderApplication
  * @format
diff --git a/Libraries/ReactNative/renderFabricSurface.js b/Libraries/ReactNative/renderFabricSurface.js
index 268e588e4f2907..59eb2f2926aa8a 100644
--- a/Libraries/ReactNative/renderFabricSurface.js
+++ b/Libraries/ReactNative/renderFabricSurface.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule renderFabricSurface
  * @format
diff --git a/Libraries/ReactNative/requireNativeComponent.js b/Libraries/ReactNative/requireNativeComponent.js
index 763572dc0d00b0..c4320c0a84b998 100644
--- a/Libraries/ReactNative/requireNativeComponent.js
+++ b/Libraries/ReactNative/requireNativeComponent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule requireNativeComponent
  * @flow
diff --git a/Libraries/ReactNative/verifyPropTypes.js b/Libraries/ReactNative/verifyPropTypes.js
index cea7fc7bde80e3..30d29f200adb60 100644
--- a/Libraries/ReactNative/verifyPropTypes.js
+++ b/Libraries/ReactNative/verifyPropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule verifyPropTypes
  * @flow
diff --git a/Libraries/Settings/RCTSettingsManager.h b/Libraries/Settings/RCTSettingsManager.h
index 2a2f920fc143a2..a331074c64a4f4 100644
--- a/Libraries/Settings/RCTSettingsManager.h
+++ b/Libraries/Settings/RCTSettingsManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/Libraries/Settings/RCTSettingsManager.m b/Libraries/Settings/RCTSettingsManager.m
index d41dc3a9d0e934..79c18707016c53 100644
--- a/Libraries/Settings/RCTSettingsManager.m
+++ b/Libraries/Settings/RCTSettingsManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSettingsManager.h"
diff --git a/Libraries/Settings/Settings.android.js b/Libraries/Settings/Settings.android.js
index d13a32ba9218bc..946c4aa9cde219 100644
--- a/Libraries/Settings/Settings.android.js
+++ b/Libraries/Settings/Settings.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Settings
  * @flow
diff --git a/Libraries/Settings/Settings.ios.js b/Libraries/Settings/Settings.ios.js
index beda544b43e51c..08f1be6a1c8ae1 100644
--- a/Libraries/Settings/Settings.ios.js
+++ b/Libraries/Settings/Settings.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Settings
  * @flow
diff --git a/Libraries/Share/Share.js b/Libraries/Share/Share.js
index 44d7433218bed2..e41b29db8e54d8 100644
--- a/Libraries/Share/Share.js
+++ b/Libraries/Share/Share.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Share
  * @flow
diff --git a/Libraries/Storage/AsyncStorage.js b/Libraries/Storage/AsyncStorage.js
index fb54d6beef95b8..62228f7830a593 100644
--- a/Libraries/Storage/AsyncStorage.js
+++ b/Libraries/Storage/AsyncStorage.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AsyncStorage
  * @noflow
diff --git a/Libraries/StyleSheet/ColorPropType.js b/Libraries/StyleSheet/ColorPropType.js
index faca884315ee0e..60e362275bfbc9 100644
--- a/Libraries/StyleSheet/ColorPropType.js
+++ b/Libraries/StyleSheet/ColorPropType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ColorPropType
  */
diff --git a/Libraries/StyleSheet/EdgeInsetsPropType.js b/Libraries/StyleSheet/EdgeInsetsPropType.js
index 9c38774478744b..307c6be2e5daed 100644
--- a/Libraries/StyleSheet/EdgeInsetsPropType.js
+++ b/Libraries/StyleSheet/EdgeInsetsPropType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EdgeInsetsPropType
  * @flow
diff --git a/Libraries/StyleSheet/LayoutPropTypes.js b/Libraries/StyleSheet/LayoutPropTypes.js
index 03f49e3ce99cab..5921334c5b7cea 100644
--- a/Libraries/StyleSheet/LayoutPropTypes.js
+++ b/Libraries/StyleSheet/LayoutPropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LayoutPropTypes
  * @flow
diff --git a/Libraries/StyleSheet/PointPropType.js b/Libraries/StyleSheet/PointPropType.js
index 7257e365dd97d0..a55628adbee7d3 100644
--- a/Libraries/StyleSheet/PointPropType.js
+++ b/Libraries/StyleSheet/PointPropType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PointPropType
  * @flow
diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index c32d1a9b64a0df..3971365c98e9c8 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StyleSheet
  * @flow
diff --git a/Libraries/StyleSheet/StyleSheetPropType.js b/Libraries/StyleSheet/StyleSheetPropType.js
index 5bea428c2e62ba..ac779f915393c8 100644
--- a/Libraries/StyleSheet/StyleSheetPropType.js
+++ b/Libraries/StyleSheet/StyleSheetPropType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StyleSheetPropType
  * @flow
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index 73fb354435fb1a..cfd0f50bba2ccf 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StyleSheetTypes
  * @flow
diff --git a/Libraries/StyleSheet/StyleSheetValidation.js b/Libraries/StyleSheet/StyleSheetValidation.js
index a1f63aa037e9a9..3e1af7bc1dd2f7 100644
--- a/Libraries/StyleSheet/StyleSheetValidation.js
+++ b/Libraries/StyleSheet/StyleSheetValidation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule StyleSheetValidation
  * @flow
diff --git a/Libraries/StyleSheet/TransformPropTypes.js b/Libraries/StyleSheet/TransformPropTypes.js
index da3e39e56c805f..bd1f3d352e116d 100644
--- a/Libraries/StyleSheet/TransformPropTypes.js
+++ b/Libraries/StyleSheet/TransformPropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TransformPropTypes
  * @flow
diff --git a/Libraries/StyleSheet/__tests__/flattenStyle-test.js b/Libraries/StyleSheet/__tests__/flattenStyle-test.js
index 316737424e76bf..6613944ed9664a 100644
--- a/Libraries/StyleSheet/__tests__/flattenStyle-test.js
+++ b/Libraries/StyleSheet/__tests__/flattenStyle-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/StyleSheet/__tests__/normalizeColor-test.js b/Libraries/StyleSheet/__tests__/normalizeColor-test.js
index 65eee3facc80cb..d7482a9c55bd55 100644
--- a/Libraries/StyleSheet/__tests__/normalizeColor-test.js
+++ b/Libraries/StyleSheet/__tests__/normalizeColor-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/StyleSheet/__tests__/processColor-test.js b/Libraries/StyleSheet/__tests__/processColor-test.js
index 48f7be3ca08209..2af0baa108a742 100644
--- a/Libraries/StyleSheet/__tests__/processColor-test.js
+++ b/Libraries/StyleSheet/__tests__/processColor-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/StyleSheet/__tests__/processTransform-test.js b/Libraries/StyleSheet/__tests__/processTransform-test.js
index bd2317dba4d7e9..2a5c9380a370b6 100644
--- a/Libraries/StyleSheet/__tests__/processTransform-test.js
+++ b/Libraries/StyleSheet/__tests__/processTransform-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js b/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js
index 7057cf70453607..13e47aff565726 100644
--- a/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js
+++ b/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/StyleSheet/flattenStyle.js b/Libraries/StyleSheet/flattenStyle.js
index f0998626979d77..88f839e2885ec3 100644
--- a/Libraries/StyleSheet/flattenStyle.js
+++ b/Libraries/StyleSheet/flattenStyle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule flattenStyle
  * @flow
diff --git a/Libraries/StyleSheet/normalizeColor.js b/Libraries/StyleSheet/normalizeColor.js
index d4f0252b5ac88a..09c2e1525d5473 100755
--- a/Libraries/StyleSheet/normalizeColor.js
+++ b/Libraries/StyleSheet/normalizeColor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule normalizeColor
  * @flow
diff --git a/Libraries/StyleSheet/processColor.js b/Libraries/StyleSheet/processColor.js
index b4b471432334ae..7d3a802bbbe3c2 100644
--- a/Libraries/StyleSheet/processColor.js
+++ b/Libraries/StyleSheet/processColor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule processColor
  * @flow
diff --git a/Libraries/StyleSheet/processTransform.js b/Libraries/StyleSheet/processTransform.js
index eed0f16caa2aa7..09cc7ca95d18c0 100644
--- a/Libraries/StyleSheet/processTransform.js
+++ b/Libraries/StyleSheet/processTransform.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule processTransform
  * @flow
diff --git a/Libraries/StyleSheet/setNormalizedColorAlpha.js b/Libraries/StyleSheet/setNormalizedColorAlpha.js
index cd943309922c0e..309d86cea12e80 100644
--- a/Libraries/StyleSheet/setNormalizedColorAlpha.js
+++ b/Libraries/StyleSheet/setNormalizedColorAlpha.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule setNormalizedColorAlpha
  * @flow
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.h b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.h
index 49017bda5bdc92..99e89e56ad95c9 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.h
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <ComponentKit/CKComponent.h>
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm
index d2875f2136f3f6..6cbdbd8a99716c 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponent.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceBackedComponent.h"
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h
index 819d927d0ea444..c2bfbc81bf095a 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.mm b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.mm
index 25d1819a552aac..60a72cb0ad25be 100644
--- a/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.mm
+++ b/Libraries/SurfaceBackedComponent/RCTSurfaceBackedComponentState.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceBackedComponentState.h"
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent+Internal.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent+Internal.h
index 184ff32a9342c6..269c73e79eccbe 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent+Internal.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent+Internal.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <RCTSurfaceHostingComponent/RCTSurfaceHostingComponent.h>
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.h
index c1dd823afb5bb7..975a72bbc64e68 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <ComponentKit/CKComponent.h>
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
index 2d2a2cc10f0b63..963813ff80eedf 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponent.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceHostingComponent.h"
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.h
index 04b8fcafa308c8..7937090ab225cd 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <ComponentKit/CKComponentController.h>
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm
index c44dbcd007e162..73ba8e3767da55 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentController.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceHostingComponentController.h"
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h
index 001cbd84e1f7a7..5c9946eb350af1 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentOptions.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h
index b1279aaa595322..2759fdd9fcdbeb 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm
index f5573db67fc50f..c2e44c9db345ff 100644
--- a/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm
+++ b/Libraries/SurfaceHostingComponent/RCTSurfaceHostingComponentState.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceHostingComponentState.h"
diff --git a/Libraries/Text/BaseText/RCTBaseTextShadowView.h b/Libraries/Text/BaseText/RCTBaseTextShadowView.h
index 736eed8ac0b950..331d1ca2161e3f 100644
--- a/Libraries/Text/BaseText/RCTBaseTextShadowView.h
+++ b/Libraries/Text/BaseText/RCTBaseTextShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
diff --git a/Libraries/Text/BaseText/RCTBaseTextShadowView.m b/Libraries/Text/BaseText/RCTBaseTextShadowView.m
index efafad36de0959..85162926eb198b 100644
--- a/Libraries/Text/BaseText/RCTBaseTextShadowView.m
+++ b/Libraries/Text/BaseText/RCTBaseTextShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextShadowView.h"
diff --git a/Libraries/Text/BaseText/RCTBaseTextViewManager.h b/Libraries/Text/BaseText/RCTBaseTextViewManager.h
index da73cf07083fe9..b6c105e3759f54 100644
--- a/Libraries/Text/BaseText/RCTBaseTextViewManager.h
+++ b/Libraries/Text/BaseText/RCTBaseTextViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/Text/BaseText/RCTBaseTextViewManager.m b/Libraries/Text/BaseText/RCTBaseTextViewManager.m
index 89640c7e9a68bc..a5d0b2c630975c 100644
--- a/Libraries/Text/BaseText/RCTBaseTextViewManager.m
+++ b/Libraries/Text/BaseText/RCTBaseTextViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextViewManager.h"
diff --git a/Libraries/Text/RCTConvert+Text.h b/Libraries/Text/RCTConvert+Text.h
index f48a794a2b2a54..4cead0948ab73c 100644
--- a/Libraries/Text/RCTConvert+Text.h
+++ b/Libraries/Text/RCTConvert+Text.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTConvert.h>
diff --git a/Libraries/Text/RCTConvert+Text.m b/Libraries/Text/RCTConvert+Text.m
index 5e4815b1e70eba..d4d1b167c8797c 100644
--- a/Libraries/Text/RCTConvert+Text.m
+++ b/Libraries/Text/RCTConvert+Text.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTConvert+Text.h"
diff --git a/Libraries/Text/RCTTextAttributes.h b/Libraries/Text/RCTTextAttributes.h
index 7752c2c66b9ee0..df9171c85d0aa1 100644
--- a/Libraries/Text/RCTTextAttributes.h
+++ b/Libraries/Text/RCTTextAttributes.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/RCTTextAttributes.m b/Libraries/Text/RCTTextAttributes.m
index 9b1ba122196cef..6427e303158bb9 100644
--- a/Libraries/Text/RCTTextAttributes.m
+++ b/Libraries/Text/RCTTextAttributes.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTextAttributes.h"
diff --git a/Libraries/Text/RawText/RCTRawTextShadowView.h b/Libraries/Text/RawText/RCTRawTextShadowView.h
index 52e61f0ba90d3b..51760308ba090e 100644
--- a/Libraries/Text/RawText/RCTRawTextShadowView.h
+++ b/Libraries/Text/RawText/RCTRawTextShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
diff --git a/Libraries/Text/RawText/RCTRawTextShadowView.m b/Libraries/Text/RawText/RCTRawTextShadowView.m
index d350d29684c91d..12c01d1b5f6af5 100644
--- a/Libraries/Text/RawText/RCTRawTextShadowView.m
+++ b/Libraries/Text/RawText/RCTRawTextShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRawTextShadowView.h"
diff --git a/Libraries/Text/RawText/RCTRawTextViewManager.h b/Libraries/Text/RawText/RCTRawTextViewManager.h
index 38d83e385be9d3..8ff302815527e7 100644
--- a/Libraries/Text/RawText/RCTRawTextViewManager.h
+++ b/Libraries/Text/RawText/RCTRawTextViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/Text/RawText/RCTRawTextViewManager.m b/Libraries/Text/RawText/RCTRawTextViewManager.m
index 17233cdc790d33..f159f73d3b92bb 100644
--- a/Libraries/Text/RawText/RCTRawTextViewManager.m
+++ b/Libraries/Text/RawText/RCTRawTextViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRawTextViewManager.h"
diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index 110a8489fa97c6..c2ded14887e533 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Text
  * @flow
diff --git a/Libraries/Text/Text/NSTextStorage+FontScaling.h b/Libraries/Text/Text/NSTextStorage+FontScaling.h
index f3ea09ab26ad0e..8372a0d2be9183 100644
--- a/Libraries/Text/Text/NSTextStorage+FontScaling.h
+++ b/Libraries/Text/Text/NSTextStorage+FontScaling.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/Text/NSTextStorage+FontScaling.m b/Libraries/Text/Text/NSTextStorage+FontScaling.m
index 4233bef9675d04..5002dddd8a425c 100644
--- a/Libraries/Text/Text/NSTextStorage+FontScaling.m
+++ b/Libraries/Text/Text/NSTextStorage+FontScaling.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "NSTextStorage+FontScaling.h"
diff --git a/Libraries/Text/Text/RCTTextShadowView.h b/Libraries/Text/Text/RCTTextShadowView.h
index 6cdd8fdd316908..d62748df8169cf 100644
--- a/Libraries/Text/Text/RCTTextShadowView.h
+++ b/Libraries/Text/Text/RCTTextShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
diff --git a/Libraries/Text/Text/RCTTextShadowView.m b/Libraries/Text/Text/RCTTextShadowView.m
index 790916354067b0..574454ac3bd512 100644
--- a/Libraries/Text/Text/RCTTextShadowView.m
+++ b/Libraries/Text/Text/RCTTextShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTextShadowView.h"
diff --git a/Libraries/Text/Text/RCTTextView.h b/Libraries/Text/Text/RCTTextView.h
index c8ba22adcbcc31..b8923b1ef5fa4e 100644
--- a/Libraries/Text/Text/RCTTextView.h
+++ b/Libraries/Text/Text/RCTTextView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/Text/RCTTextView.m b/Libraries/Text/Text/RCTTextView.m
index d065e8073a3c50..45c09313909d51 100644
--- a/Libraries/Text/Text/RCTTextView.m
+++ b/Libraries/Text/Text/RCTTextView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTextView.h"
diff --git a/Libraries/Text/Text/RCTTextViewManager.h b/Libraries/Text/Text/RCTTextViewManager.h
index 957c88d477bf39..d11e4b5919d066 100644
--- a/Libraries/Text/Text/RCTTextViewManager.h
+++ b/Libraries/Text/Text/RCTTextViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/Libraries/Text/Text/RCTTextViewManager.m b/Libraries/Text/Text/RCTTextViewManager.m
index f3d28ee7201dec..a729e644898286 100644
--- a/Libraries/Text/Text/RCTTextViewManager.m
+++ b/Libraries/Text/Text/RCTTextViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTextViewManager.h"
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h
index 7d280235976cf6..97466f4d455eba 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputView.h"
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
index d97c95172ecfd2..b2d3cbe894c98b 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMultilineTextInputView.h"
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h
index b2053435fc54a5..db6c62751ab828 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputViewManager.h"
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
index de84955739872d..0a2b6d5a4c9a63 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMultilineTextInputViewManager.h"
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.h b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
index c87e092ce1704c..c460d7f1e47b0f 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.h
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
index 3462b833ff5218..80d49a5f5aef7d 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.m
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUITextView.h"
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h b/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
index d124ef2ec54aa0..c580a11ead1c1f 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
+++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
index b9914c23558f37..6968313acff585 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
+++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
index 856d708f6f1709..a095c3d0f6f5a3 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
+++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBackedTextInputDelegateAdapter.h"
diff --git a/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h b/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
index 32a2a6ae3e65e6..d19e221064c84f 100644
--- a/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
+++ b/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h
index 3f1e8185b323bb..ea8abd3fdcee78 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h
+++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextShadowView.h"
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
index 0d60c3c49d59b6..d1fdbcd3d25012 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputShadowView.h"
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.h b/Libraries/Text/TextInput/RCTBaseTextInputView.h
index 56c8d2b947d92d..fe86b334ba8a3a 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.h
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index 177b4afccd25ea..2d8bb0035fbdd5 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputView.h"
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h
index 710536aaa48ee6..c370779b206610 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h
+++ b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextViewManager.h"
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
index 1e192fe944aacd..e9b53769690b71 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputViewManager.h"
diff --git a/Libraries/Text/TextInput/RCTTextSelection.h b/Libraries/Text/TextInput/RCTTextSelection.h
index 804af5f283845f..b77746a91647d6 100644
--- a/Libraries/Text/TextInput/RCTTextSelection.h
+++ b/Libraries/Text/TextInput/RCTTextSelection.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTConvert.h>
diff --git a/Libraries/Text/TextInput/RCTTextSelection.m b/Libraries/Text/TextInput/RCTTextSelection.m
index f37d00662d6d6c..436228c5545ab2 100644
--- a/Libraries/Text/TextInput/RCTTextSelection.m
+++ b/Libraries/Text/TextInput/RCTTextSelection.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTextSelection.h"
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h
index 5338e0c630c870..1c99fed6354501 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputView.h"
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m
index 4f4959b63616a1..d3e29b266aad02 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSinglelineTextInputView.h"
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h
index 57439e6bf35b06..b19ff183925daa 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextInputViewManager.h"
diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m
index 6a74da53c98a23..4399c3677ff6ac 100644
--- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m
+++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSinglelineTextInputViewManager.h"
diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.h b/Libraries/Text/TextInput/Singleline/RCTUITextField.h
index 27ae073006f3f8..b56d6a81df6317 100644
--- a/Libraries/Text/TextInput/Singleline/RCTUITextField.h
+++ b/Libraries/Text/TextInput/Singleline/RCTUITextField.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.m b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
index 4b21e594b1bfd0..281bd63945deeb 100644
--- a/Libraries/Text/TextInput/Singleline/RCTUITextField.m
+++ b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUITextField.h"
diff --git a/Libraries/Text/TextProps.js b/Libraries/Text/TextProps.js
index 309f5fc6b73066..7b077f9cd7851e 100644
--- a/Libraries/Text/TextProps.js
+++ b/Libraries/Text/TextProps.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TextProps
  * @flow
diff --git a/Libraries/Text/TextStylePropTypes.js b/Libraries/Text/TextStylePropTypes.js
index d92708683d981e..c5e67ca99e17f5 100644
--- a/Libraries/Text/TextStylePropTypes.js
+++ b/Libraries/Text/TextStylePropTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TextStylePropTypes
  * @flow
diff --git a/Libraries/Text/TextUpdateTest.js b/Libraries/Text/TextUpdateTest.js
index f0de98e9a3ae48..ec81ddab1c7903 100644
--- a/Libraries/Text/TextUpdateTest.js
+++ b/Libraries/Text/TextUpdateTest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TextUpdateTest
  * @flow
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h
index ae5d158b0ef860..159a155f994a7b 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h
+++ b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextShadowView.h"
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
index b5710f13c0545e..55fd8a6eef5746 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
+++ b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTVirtualTextShadowView.h"
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h
index b7225dbb51652e..cf2072f5df5750 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h
+++ b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBaseTextViewManager.h"
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m
index 64cf1617202bc5..adc3c885405e36 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m
+++ b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTVirtualTextViewManager.h"
diff --git a/Libraries/Types/CoreEventTypes.js b/Libraries/Types/CoreEventTypes.js
index db66628811d68e..d0839cf46f84ea 100644
--- a/Libraries/Types/CoreEventTypes.js
+++ b/Libraries/Types/CoreEventTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CoreEventTypes
  * @flow
diff --git a/Libraries/UTFSequence.js b/Libraries/UTFSequence.js
index cf5ad295af328f..9bff51555d5563 100644
--- a/Libraries/UTFSequence.js
+++ b/Libraries/UTFSequence.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule UTFSequence
  * @flow
diff --git a/Libraries/Utilities/BackAndroid.js b/Libraries/Utilities/BackAndroid.js
index 0289b34c65d82c..4fc029341f4b9e 100644
--- a/Libraries/Utilities/BackAndroid.js
+++ b/Libraries/Utilities/BackAndroid.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * BackAndroid has been moved to BackHandler.  This stub calls BackHandler methods
  * after generating a warning to remind users to move to the new BackHandler module.
diff --git a/Libraries/Utilities/BackHandler.android.js b/Libraries/Utilities/BackHandler.android.js
index e9ccd1a5809390..8f34cfacd1c349 100644
--- a/Libraries/Utilities/BackHandler.android.js
+++ b/Libraries/Utilities/BackHandler.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BackHandler
  */
diff --git a/Libraries/Utilities/BackHandler.ios.js b/Libraries/Utilities/BackHandler.ios.js
index 7c9a00ecc4e8bf..33c6a8c1d6aa48 100644
--- a/Libraries/Utilities/BackHandler.ios.js
+++ b/Libraries/Utilities/BackHandler.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * On Apple TV, this implements back navigation using the TV remote's menu button.
  * On iOS, this just implements a stub.
diff --git a/Libraries/Utilities/DebugEnvironment.js b/Libraries/Utilities/DebugEnvironment.js
index 375d0f4d485b36..71014d9bfdff68 100644
--- a/Libraries/Utilities/DebugEnvironment.js
+++ b/Libraries/Utilities/DebugEnvironment.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DebugEnvironment
  * @flow
diff --git a/Libraries/Utilities/DeviceInfo.js b/Libraries/Utilities/DeviceInfo.js
index 819916b153f84a..8503ac75ca31f5 100644
--- a/Libraries/Utilities/DeviceInfo.js
+++ b/Libraries/Utilities/DeviceInfo.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DeviceInfo
  * @flow
diff --git a/Libraries/Utilities/Dimensions.js b/Libraries/Utilities/Dimensions.js
index 898c8cbe89580f..d13b14f1bd18ea 100644
--- a/Libraries/Utilities/Dimensions.js
+++ b/Libraries/Utilities/Dimensions.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Dimensions
  * @flow
diff --git a/Libraries/Utilities/HMRClient.js b/Libraries/Utilities/HMRClient.js
index 27246a3482b85b..ff897afda8bf99 100644
--- a/Libraries/Utilities/HMRClient.js
+++ b/Libraries/Utilities/HMRClient.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule HMRClient
  * @format
diff --git a/Libraries/Utilities/HMRLoadingView.android.js b/Libraries/Utilities/HMRLoadingView.android.js
index 82075ffa1920b6..ebda3ee65c81ec 100644
--- a/Libraries/Utilities/HMRLoadingView.android.js
+++ b/Libraries/Utilities/HMRLoadingView.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule HMRLoadingView
  * @flow
diff --git a/Libraries/Utilities/HMRLoadingView.ios.js b/Libraries/Utilities/HMRLoadingView.ios.js
index ea0559fc41d0dd..7100164d4ca667 100644
--- a/Libraries/Utilities/HMRLoadingView.ios.js
+++ b/Libraries/Utilities/HMRLoadingView.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule HMRLoadingView
  * @flow
diff --git a/Libraries/Utilities/HeapCapture.js b/Libraries/Utilities/HeapCapture.js
index d686a903c8866a..49e9d678e1eef2 100644
--- a/Libraries/Utilities/HeapCapture.js
+++ b/Libraries/Utilities/HeapCapture.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule HeapCapture
  * @flow
diff --git a/Libraries/Utilities/JSDevSupportModule.js b/Libraries/Utilities/JSDevSupportModule.js
index 3aa91255f5725f..0b8cdca1f6835c 100644
--- a/Libraries/Utilities/JSDevSupportModule.js
+++ b/Libraries/Utilities/JSDevSupportModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule JSDevSupportModule
  * @flow
diff --git a/Libraries/Utilities/MatrixMath.js b/Libraries/Utilities/MatrixMath.js
index e5f82ea1b3eab5..b36b316833fcb7 100755
--- a/Libraries/Utilities/MatrixMath.js
+++ b/Libraries/Utilities/MatrixMath.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MatrixMath
  * @noflow
diff --git a/Libraries/Utilities/PerformanceLogger.js b/Libraries/Utilities/PerformanceLogger.js
index 584da0886bbd56..80184eda1c5c53 100644
--- a/Libraries/Utilities/PerformanceLogger.js
+++ b/Libraries/Utilities/PerformanceLogger.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PerformanceLogger
  * @flow
diff --git a/Libraries/Utilities/PixelRatio.js b/Libraries/Utilities/PixelRatio.js
index 6d68ef03c70e2c..bd8a6a0b9571dc 100644
--- a/Libraries/Utilities/PixelRatio.js
+++ b/Libraries/Utilities/PixelRatio.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PixelRatio
  * @flow
diff --git a/Libraries/Utilities/Platform.android.js b/Libraries/Utilities/Platform.android.js
index 4bab19c5287227..006f371777ec86 100644
--- a/Libraries/Utilities/Platform.android.js
+++ b/Libraries/Utilities/Platform.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Platform
  * @flow
diff --git a/Libraries/Utilities/Platform.ios.js b/Libraries/Utilities/Platform.ios.js
index 3238a44627fe9c..00bd3882651f83 100644
--- a/Libraries/Utilities/Platform.ios.js
+++ b/Libraries/Utilities/Platform.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Platform
  * @flow
diff --git a/Libraries/Utilities/PlatformOS.android.js b/Libraries/Utilities/PlatformOS.android.js
index 2da52e6e711ce9..ff2a383759c455 100644
--- a/Libraries/Utilities/PlatformOS.android.js
+++ b/Libraries/Utilities/PlatformOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PlatformOS
  * @flow
diff --git a/Libraries/Utilities/PlatformOS.ios.js b/Libraries/Utilities/PlatformOS.ios.js
index c9891368d8981f..11fed5978096cb 100644
--- a/Libraries/Utilities/PlatformOS.ios.js
+++ b/Libraries/Utilities/PlatformOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PlatformOS
  * @flow
diff --git a/Libraries/Utilities/PolyfillFunctions.js b/Libraries/Utilities/PolyfillFunctions.js
index aa35c149915aa5..5bf31ee118b4d2 100644
--- a/Libraries/Utilities/PolyfillFunctions.js
+++ b/Libraries/Utilities/PolyfillFunctions.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PolyfillFunctions
  * @flow
diff --git a/Libraries/Utilities/RCTLog.js b/Libraries/Utilities/RCTLog.js
index a51d38d2d36cff..2514d9b4039d29 100644
--- a/Libraries/Utilities/RCTLog.js
+++ b/Libraries/Utilities/RCTLog.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RCTLog
  * @flow
diff --git a/Libraries/Utilities/SceneTracker.js b/Libraries/Utilities/SceneTracker.js
index 568bf62aaeece4..9cebe76a99d5d2 100644
--- a/Libraries/Utilities/SceneTracker.js
+++ b/Libraries/Utilities/SceneTracker.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SceneTracker
  * @flow
diff --git a/Libraries/Utilities/__mocks__/BackHandler.js b/Libraries/Utilities/__mocks__/BackHandler.js
index e8b5435e2ea069..e6319f8974ac80 100644
--- a/Libraries/Utilities/__mocks__/BackHandler.js
+++ b/Libraries/Utilities/__mocks__/BackHandler.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/Libraries/Utilities/__tests__/MatrixMath-test.js b/Libraries/Utilities/__tests__/MatrixMath-test.js
index 35d120a2ffed0f..2eb14cb5ba3c7b 100644
--- a/Libraries/Utilities/__tests__/MatrixMath-test.js
+++ b/Libraries/Utilities/__tests__/MatrixMath-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/Platform-test.js b/Libraries/Utilities/__tests__/Platform-test.js
index 14a789153fd16b..1fdfaaa1a75ca3 100644
--- a/Libraries/Utilities/__tests__/Platform-test.js
+++ b/Libraries/Utilities/__tests__/Platform-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/SceneTracker-test.js b/Libraries/Utilities/__tests__/SceneTracker-test.js
index bb81d4eae7b090..22dd9cadba85de 100644
--- a/Libraries/Utilities/__tests__/SceneTracker-test.js
+++ b/Libraries/Utilities/__tests__/SceneTracker-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js b/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js
index 5f537f4519d00a..ccb5f7edfb31c5 100644
--- a/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js
+++ b/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js b/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js
index f8791a68a35e56..cc307eedac0ee8 100644
--- a/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js
+++ b/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/groupByEveryN-test.js b/Libraries/Utilities/__tests__/groupByEveryN-test.js
index e5b9d80ac0f09e..5fe34833549e2f 100644
--- a/Libraries/Utilities/__tests__/groupByEveryN-test.js
+++ b/Libraries/Utilities/__tests__/groupByEveryN-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/mapWithSeparator-test.js b/Libraries/Utilities/__tests__/mapWithSeparator-test.js
index 0e42f0b1ef1ccb..8f64e0dfa17d38 100644
--- a/Libraries/Utilities/__tests__/mapWithSeparator-test.js
+++ b/Libraries/Utilities/__tests__/mapWithSeparator-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/__tests__/truncate-test.js b/Libraries/Utilities/__tests__/truncate-test.js
index c134ec47ee2163..9c38d1e1e701c9 100644
--- a/Libraries/Utilities/__tests__/truncate-test.js
+++ b/Libraries/Utilities/__tests__/truncate-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/binaryToBase64.js b/Libraries/Utilities/binaryToBase64.js
index 008c6ac19c7b7f..d17c4d403c8705 100644
--- a/Libraries/Utilities/binaryToBase64.js
+++ b/Libraries/Utilities/binaryToBase64.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule binaryToBase64
  * @flow
diff --git a/Libraries/Utilities/buildStyleInterpolator.js b/Libraries/Utilities/buildStyleInterpolator.js
index 41d65e1bf344b9..ec174441173965 100644
--- a/Libraries/Utilities/buildStyleInterpolator.js
+++ b/Libraries/Utilities/buildStyleInterpolator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule buildStyleInterpolator
  */
diff --git a/Libraries/Utilities/clamp.js b/Libraries/Utilities/clamp.js
index 46d67895d4821c..5d15d8b3b12f3f 100644
--- a/Libraries/Utilities/clamp.js
+++ b/Libraries/Utilities/clamp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule clamp
  * @typechecks
diff --git a/Libraries/Utilities/createStrictShapeTypeChecker.js b/Libraries/Utilities/createStrictShapeTypeChecker.js
index 078d103a3e2cbe..89347d15e0b86a 100644
--- a/Libraries/Utilities/createStrictShapeTypeChecker.js
+++ b/Libraries/Utilities/createStrictShapeTypeChecker.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule createStrictShapeTypeChecker
  * @flow
diff --git a/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js b/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
index 4e651b110e14a7..19cb60a9c56d6f 100644
--- a/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
+++ b/Libraries/Utilities/deepFreezeAndThrowOnMutationInDev.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule deepFreezeAndThrowOnMutationInDev
  * @flow
diff --git a/Libraries/Utilities/defineLazyObjectProperty.js b/Libraries/Utilities/defineLazyObjectProperty.js
index 25c5e0057b38ee..87e893037913b4 100644
--- a/Libraries/Utilities/defineLazyObjectProperty.js
+++ b/Libraries/Utilities/defineLazyObjectProperty.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule defineLazyObjectProperty
  * @flow
diff --git a/Libraries/Utilities/deprecatedPropType.js b/Libraries/Utilities/deprecatedPropType.js
index 26a1a46bf4c947..8b08854fabb043 100644
--- a/Libraries/Utilities/deprecatedPropType.js
+++ b/Libraries/Utilities/deprecatedPropType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule deprecatedPropType
  * @flow
diff --git a/Libraries/Utilities/differ/__tests__/deepDiffer-test.js b/Libraries/Utilities/differ/__tests__/deepDiffer-test.js
index 7ff8e664f06872..6fadfdbe575478 100644
--- a/Libraries/Utilities/differ/__tests__/deepDiffer-test.js
+++ b/Libraries/Utilities/differ/__tests__/deepDiffer-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/Utilities/differ/deepDiffer.js b/Libraries/Utilities/differ/deepDiffer.js
index 4dec6bd7bb892d..af0bd295694b19 100644
--- a/Libraries/Utilities/differ/deepDiffer.js
+++ b/Libraries/Utilities/differ/deepDiffer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule deepDiffer
  * @flow
diff --git a/Libraries/Utilities/differ/insetsDiffer.js b/Libraries/Utilities/differ/insetsDiffer.js
index df81eff93b703a..1d497c0948e53a 100644
--- a/Libraries/Utilities/differ/insetsDiffer.js
+++ b/Libraries/Utilities/differ/insetsDiffer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule insetsDiffer
  * @flow
diff --git a/Libraries/Utilities/differ/matricesDiffer.js b/Libraries/Utilities/differ/matricesDiffer.js
index 948cc4cd08545c..25e741a4ff8283 100644
--- a/Libraries/Utilities/differ/matricesDiffer.js
+++ b/Libraries/Utilities/differ/matricesDiffer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule matricesDiffer
  */
diff --git a/Libraries/Utilities/differ/pointsDiffer.js b/Libraries/Utilities/differ/pointsDiffer.js
index 7c22bf1978bf4a..cb41cec85494a4 100644
--- a/Libraries/Utilities/differ/pointsDiffer.js
+++ b/Libraries/Utilities/differ/pointsDiffer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule pointsDiffer
  * @flow
diff --git a/Libraries/Utilities/differ/sizesDiffer.js b/Libraries/Utilities/differ/sizesDiffer.js
index 7b24ea52f8dc43..55ea66ded36ca5 100644
--- a/Libraries/Utilities/differ/sizesDiffer.js
+++ b/Libraries/Utilities/differ/sizesDiffer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule sizesDiffer
  */
diff --git a/Libraries/Utilities/dismissKeyboard.js b/Libraries/Utilities/dismissKeyboard.js
index 183fa4a88caf3a..febcc82bfa9a65 100644
--- a/Libraries/Utilities/dismissKeyboard.js
+++ b/Libraries/Utilities/dismissKeyboard.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule dismissKeyboard
  *
diff --git a/Libraries/Utilities/groupByEveryN.js b/Libraries/Utilities/groupByEveryN.js
index a8b353ad66dde6..ea400392291231 100644
--- a/Libraries/Utilities/groupByEveryN.js
+++ b/Libraries/Utilities/groupByEveryN.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule groupByEveryN
  * @flow
diff --git a/Libraries/Utilities/infoLog.js b/Libraries/Utilities/infoLog.js
index 6a2a726a60822d..66278f520e8424 100644
--- a/Libraries/Utilities/infoLog.js
+++ b/Libraries/Utilities/infoLog.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule infoLog
  */
diff --git a/Libraries/Utilities/logError.js b/Libraries/Utilities/logError.js
index 62a8d984e6b251..6cf212b1f14712 100644
--- a/Libraries/Utilities/logError.js
+++ b/Libraries/Utilities/logError.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule logError
  * @flow
diff --git a/Libraries/Utilities/mapWithSeparator.js b/Libraries/Utilities/mapWithSeparator.js
index ff3048a2609df6..0beceda0174c0f 100644
--- a/Libraries/Utilities/mapWithSeparator.js
+++ b/Libraries/Utilities/mapWithSeparator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule mapWithSeparator
  * @flow
diff --git a/Libraries/Utilities/mergeFast.js b/Libraries/Utilities/mergeFast.js
index 78a06cb4be4120..60ad36c20464a8 100644
--- a/Libraries/Utilities/mergeFast.js
+++ b/Libraries/Utilities/mergeFast.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule mergeFast
  * @flow
diff --git a/Libraries/Utilities/mergeIntoFast.js b/Libraries/Utilities/mergeIntoFast.js
index b7160875a453b0..ff048311403a87 100644
--- a/Libraries/Utilities/mergeIntoFast.js
+++ b/Libraries/Utilities/mergeIntoFast.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule mergeIntoFast
  * @flow
diff --git a/Libraries/Utilities/stringifySafe.js b/Libraries/Utilities/stringifySafe.js
index 750a932b644970..39ada622714243 100644
--- a/Libraries/Utilities/stringifySafe.js
+++ b/Libraries/Utilities/stringifySafe.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule stringifySafe
  * @flow
diff --git a/Libraries/Utilities/truncate.js b/Libraries/Utilities/truncate.js
index 96c423225b116b..6a1204f9c4c2fb 100644
--- a/Libraries/Utilities/truncate.js
+++ b/Libraries/Utilities/truncate.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule truncate
  * @flow
diff --git a/Libraries/Vibration/RCTVibration.h b/Libraries/Vibration/RCTVibration.h
index 935d32669944d3..d1efc147c4aa49 100644
--- a/Libraries/Vibration/RCTVibration.h
+++ b/Libraries/Vibration/RCTVibration.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/Libraries/Vibration/RCTVibration.m b/Libraries/Vibration/RCTVibration.m
index f2544d76790862..3a9e065c585992 100644
--- a/Libraries/Vibration/RCTVibration.m
+++ b/Libraries/Vibration/RCTVibration.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTVibration.h"
diff --git a/Libraries/Vibration/Vibration.js b/Libraries/Vibration/Vibration.js
index b4b54375603002..e01da3d4022663 100644
--- a/Libraries/Vibration/Vibration.js
+++ b/Libraries/Vibration/Vibration.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Vibration
  * @flow
diff --git a/Libraries/Vibration/VibrationIOS.android.js b/Libraries/Vibration/VibrationIOS.android.js
index 37cdf859c1eb8c..0b2279b696ccb5 100644
--- a/Libraries/Vibration/VibrationIOS.android.js
+++ b/Libraries/Vibration/VibrationIOS.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * Stub of VibrationIOS for Android.
  *
diff --git a/Libraries/Vibration/VibrationIOS.ios.js b/Libraries/Vibration/VibrationIOS.ios.js
index 56da5a815b12dc..ec55640442f670 100644
--- a/Libraries/Vibration/VibrationIOS.ios.js
+++ b/Libraries/Vibration/VibrationIOS.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule VibrationIOS
  * @flow
diff --git a/Libraries/WebSocket/RCTReconnectingWebSocket.h b/Libraries/WebSocket/RCTReconnectingWebSocket.h
index 7eb8fabb736f71..bcadb3b0ad3241 100644
--- a/Libraries/WebSocket/RCTReconnectingWebSocket.h
+++ b/Libraries/WebSocket/RCTReconnectingWebSocket.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTDefines.h>
diff --git a/Libraries/WebSocket/RCTReconnectingWebSocket.m b/Libraries/WebSocket/RCTReconnectingWebSocket.m
index 899120e8e2b8ae..04e5dee57b67e7 100644
--- a/Libraries/WebSocket/RCTReconnectingWebSocket.m
+++ b/Libraries/WebSocket/RCTReconnectingWebSocket.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTReconnectingWebSocket.h"
diff --git a/Libraries/WebSocket/RCTWebSocketExecutor.h b/Libraries/WebSocket/RCTWebSocketExecutor.h
index 733da2adb7cc40..5aa7cdb44635ef 100644
--- a/Libraries/WebSocket/RCTWebSocketExecutor.h
+++ b/Libraries/WebSocket/RCTWebSocketExecutor.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTDefines.h>
diff --git a/Libraries/WebSocket/RCTWebSocketExecutor.m b/Libraries/WebSocket/RCTWebSocketExecutor.m
index 9747730df0d0fc..14f53a43c2daab 100644
--- a/Libraries/WebSocket/RCTWebSocketExecutor.m
+++ b/Libraries/WebSocket/RCTWebSocketExecutor.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTWebSocketExecutor.h"
diff --git a/Libraries/WebSocket/RCTWebSocketModule.h b/Libraries/WebSocket/RCTWebSocketModule.h
index 2875d0eb3a9f3d..18632a9a6fbbad 100644
--- a/Libraries/WebSocket/RCTWebSocketModule.h
+++ b/Libraries/WebSocket/RCTWebSocketModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventEmitter.h>
diff --git a/Libraries/WebSocket/RCTWebSocketModule.m b/Libraries/WebSocket/RCTWebSocketModule.m
index 90d6180c124f8d..425ff9873643b9 100644
--- a/Libraries/WebSocket/RCTWebSocketModule.m
+++ b/Libraries/WebSocket/RCTWebSocketModule.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTWebSocketModule.h"
diff --git a/Libraries/WebSocket/WebSocket.js b/Libraries/WebSocket/WebSocket.js
index 3a70b3792803d5..13e614557d78b4 100644
--- a/Libraries/WebSocket/WebSocket.js
+++ b/Libraries/WebSocket/WebSocket.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebSocket
  * @flow
diff --git a/Libraries/WebSocket/WebSocketEvent.js b/Libraries/WebSocket/WebSocketEvent.js
index 27ca093bc29d7c..93133902a94a8d 100644
--- a/Libraries/WebSocket/WebSocketEvent.js
+++ b/Libraries/WebSocket/WebSocketEvent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebSocketEvent
  */
diff --git a/Libraries/WebSocket/WebSocketInterceptor.js b/Libraries/WebSocket/WebSocketInterceptor.js
index 3ac649a16219d4..10251dfa1a2045 100644
--- a/Libraries/WebSocket/WebSocketInterceptor.js
+++ b/Libraries/WebSocket/WebSocketInterceptor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebSocketInterceptor
  */
diff --git a/Libraries/WebSocket/__tests__/WebSocket-test.js b/Libraries/WebSocket/__tests__/WebSocket-test.js
index 405cf814cdf2ea..c6e04bf0a6d998 100644
--- a/Libraries/WebSocket/__tests__/WebSocket-test.js
+++ b/Libraries/WebSocket/__tests__/WebSocket-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+react_native
  */
diff --git a/Libraries/polyfills/Array.es6.js b/Libraries/polyfills/Array.es6.js
index e6621252994e6c..0075d7ae1e070c 100644
--- a/Libraries/polyfills/Array.es6.js
+++ b/Libraries/polyfills/Array.es6.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Array.es6
  * @polyfill
diff --git a/Libraries/polyfills/Array.prototype.es6.js b/Libraries/polyfills/Array.prototype.es6.js
index 67799decae7a09..2bf044144eb7a9 100644
--- a/Libraries/polyfills/Array.prototype.es6.js
+++ b/Libraries/polyfills/Array.prototype.es6.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Array.prototype.es6
  * @polyfill
diff --git a/Libraries/polyfills/Number.es6.js b/Libraries/polyfills/Number.es6.js
index 9323b2d3ef2e9f..ef7d4ac88e4f41 100644
--- a/Libraries/polyfills/Number.es6.js
+++ b/Libraries/polyfills/Number.es6.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Number.es6
  * @polyfill
diff --git a/Libraries/polyfills/Object.es6.js b/Libraries/polyfills/Object.es6.js
index a87a40311e5b2e..0aa884e8be9596 100644
--- a/Libraries/polyfills/Object.es6.js
+++ b/Libraries/polyfills/Object.es6.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Object.es6
  * @polyfill
diff --git a/Libraries/polyfills/Object.es7.js b/Libraries/polyfills/Object.es7.js
index 2147c81d8fc16f..294756b11c3638 100644
--- a/Libraries/polyfills/Object.es7.js
+++ b/Libraries/polyfills/Object.es7.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Object.es7
  * @polyfill
diff --git a/Libraries/polyfills/String.prototype.es6.js b/Libraries/polyfills/String.prototype.es6.js
index 9d9b47c6bd65ef..b3bd95be6b88bc 100644
--- a/Libraries/polyfills/String.prototype.es6.js
+++ b/Libraries/polyfills/String.prototype.es6.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule String.prototype.es6
  * @polyfill
diff --git a/Libraries/polyfills/__tests__/Object.es7-test.js b/Libraries/polyfills/__tests__/Object.es7-test.js
index e8c4746c1d44ee..528a479f3b6b93 100644
--- a/Libraries/polyfills/__tests__/Object.es7-test.js
+++ b/Libraries/polyfills/__tests__/Object.es7-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+jsinfra
  */
diff --git a/Libraries/polyfills/babelHelpers.js b/Libraries/polyfills/babelHelpers.js
index 4965e5529ca230..dfe819464f09c4 100644
--- a/Libraries/polyfills/babelHelpers.js
+++ b/Libraries/polyfills/babelHelpers.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule babelHelpers
  * @polyfill
diff --git a/Libraries/polyfills/console.js b/Libraries/polyfills/console.js
index 0564491afb33dd..37a92b1a62fe1f 100644
--- a/Libraries/polyfills/console.js
+++ b/Libraries/polyfills/console.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule console
  * @polyfill
diff --git a/Libraries/polyfills/error-guard.js b/Libraries/polyfills/error-guard.js
index 24433346f92c80..632e7e0e4f02d6 100644
--- a/Libraries/polyfills/error-guard.js
+++ b/Libraries/polyfills/error-guard.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule error-guard
  * @polyfill
diff --git a/Libraries/promiseRejectionIsError.js b/Libraries/promiseRejectionIsError.js
index 60d1a0032950d1..ce3ee915cff47f 100644
--- a/Libraries/promiseRejectionIsError.js
+++ b/Libraries/promiseRejectionIsError.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule promiseRejectionIsError
  * @flow
diff --git a/Libraries/react-native/React.js b/Libraries/react-native/React.js
index ba075690bf5ff8..f000f1403b5d6a 100644
--- a/Libraries/react-native/React.js
+++ b/Libraries/react-native/React.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule React
  */
diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js
index 577a896cd7258d..200409bcbc041b 100644
--- a/Libraries/react-native/react-native-implementation.js
+++ b/Libraries/react-native/react-native-implementation.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule react-native-implementation
  * @flow
diff --git a/Libraries/react-native/react-native-interface.js b/Libraries/react-native/react-native-interface.js
index 764952ff8915cf..fd4ad545c31b10 100644
--- a/Libraries/react-native/react-native-interface.js
+++ b/Libraries/react-native/react-native-interface.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule react-native-interface
diff --git a/Libraries/vendor/core/ErrorUtils.js b/Libraries/vendor/core/ErrorUtils.js
index eed9a06d6ae982..8b36c611105d0e 100644
--- a/Libraries/vendor/core/ErrorUtils.js
+++ b/Libraries/vendor/core/ErrorUtils.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ErrorUtils
  * @flow
diff --git a/Libraries/vendor/core/Map.js b/Libraries/vendor/core/Map.js
index 7d708657122fa8..e9e687a15ce99e 100644
--- a/Libraries/vendor/core/Map.js
+++ b/Libraries/vendor/core/Map.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Map
  * @preventMunge
diff --git a/Libraries/vendor/core/Set.js b/Libraries/vendor/core/Set.js
index 658722b6cf0b36..b43313205ef7e3 100644
--- a/Libraries/vendor/core/Set.js
+++ b/Libraries/vendor/core/Set.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Set
  * @preventMunge
diff --git a/Libraries/vendor/core/_shouldPolyfillES6Collection.js b/Libraries/vendor/core/_shouldPolyfillES6Collection.js
index 80222a94735438..e3f77b169dece5 100644
--- a/Libraries/vendor/core/_shouldPolyfillES6Collection.js
+++ b/Libraries/vendor/core/_shouldPolyfillES6Collection.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule _shouldPolyfillES6Collection
  * @preventMunge
diff --git a/Libraries/vendor/core/getObjectValues.js b/Libraries/vendor/core/getObjectValues.js
index 732313dc11bf63..aac327c2eaed9d 100644
--- a/Libraries/vendor/core/getObjectValues.js
+++ b/Libraries/vendor/core/getObjectValues.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule getObjectValues
  * @typechecks
diff --git a/Libraries/vendor/core/guid.js b/Libraries/vendor/core/guid.js
index cf6e4d584957cb..74c97cf383de1f 100644
--- a/Libraries/vendor/core/guid.js
+++ b/Libraries/vendor/core/guid.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule guid
  */
diff --git a/Libraries/vendor/core/isEmpty.js b/Libraries/vendor/core/isEmpty.js
index 301efef721db50..1f55d4519ff3af 100644
--- a/Libraries/vendor/core/isEmpty.js
+++ b/Libraries/vendor/core/isEmpty.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule isEmpty
  */
diff --git a/Libraries/vendor/core/mergeHelpers.js b/Libraries/vendor/core/mergeHelpers.js
index d021e2ffc93443..4eb2d9d2aec8f1 100644
--- a/Libraries/vendor/core/mergeHelpers.js
+++ b/Libraries/vendor/core/mergeHelpers.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule mergeHelpers
  *
diff --git a/Libraries/vendor/core/toIterator.js b/Libraries/vendor/core/toIterator.js
index ce28f94a3032be..b396c469c03f3e 100644
--- a/Libraries/vendor/core/toIterator.js
+++ b/Libraries/vendor/core/toIterator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule toIterator
  */
diff --git a/Libraries/vendor/document/selection/DocumentSelectionState.js b/Libraries/vendor/document/selection/DocumentSelectionState.js
index fbfcc3062302cc..a702582c6965d0 100644
--- a/Libraries/vendor/document/selection/DocumentSelectionState.js
+++ b/Libraries/vendor/document/selection/DocumentSelectionState.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DocumentSelectionState
  * @typechecks
diff --git a/Libraries/vendor/emitter/EmitterSubscription.js b/Libraries/vendor/emitter/EmitterSubscription.js
index 93c1ee376eb74c..e352e71675c9b9 100644
--- a/Libraries/vendor/emitter/EmitterSubscription.js
+++ b/Libraries/vendor/emitter/EmitterSubscription.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EmitterSubscription
  * @flow
diff --git a/Libraries/vendor/emitter/EventEmitter.js b/Libraries/vendor/emitter/EventEmitter.js
index 5f981ceeb1b103..4fdb10a051593a 100644
--- a/Libraries/vendor/emitter/EventEmitter.js
+++ b/Libraries/vendor/emitter/EventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EventEmitter
  * @noflow
diff --git a/Libraries/vendor/emitter/EventEmitterWithHolding.js b/Libraries/vendor/emitter/EventEmitterWithHolding.js
index a74d37c01681b0..8c082222e8f73f 100644
--- a/Libraries/vendor/emitter/EventEmitterWithHolding.js
+++ b/Libraries/vendor/emitter/EventEmitterWithHolding.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EventEmitterWithHolding
  * @flow
diff --git a/Libraries/vendor/emitter/EventHolder.js b/Libraries/vendor/emitter/EventHolder.js
index 8957ad5cce4204..3bb7062e020f6a 100644
--- a/Libraries/vendor/emitter/EventHolder.js
+++ b/Libraries/vendor/emitter/EventHolder.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EventHolder
  * @flow
diff --git a/Libraries/vendor/emitter/EventSubscription.js b/Libraries/vendor/emitter/EventSubscription.js
index 955a234ecbf976..82cb06fc4fd556 100644
--- a/Libraries/vendor/emitter/EventSubscription.js
+++ b/Libraries/vendor/emitter/EventSubscription.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EventSubscription
  * @flow
diff --git a/Libraries/vendor/emitter/EventSubscriptionVendor.js b/Libraries/vendor/emitter/EventSubscriptionVendor.js
index 7078766a01b4c9..aa2a4e76b90b21 100644
--- a/Libraries/vendor/emitter/EventSubscriptionVendor.js
+++ b/Libraries/vendor/emitter/EventSubscriptionVendor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EventSubscriptionVendor
  * @flow
diff --git a/Libraries/vendor/emitter/EventValidator.js b/Libraries/vendor/emitter/EventValidator.js
index 6671c17c1061ca..9930236776b210 100644
--- a/Libraries/vendor/emitter/EventValidator.js
+++ b/Libraries/vendor/emitter/EventValidator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule EventValidator
  * @flow
diff --git a/Libraries/vendor/emitter/mixInEventEmitter.js b/Libraries/vendor/emitter/mixInEventEmitter.js
index b8693f055b4b19..6ee08d6d31acb0 100644
--- a/Libraries/vendor/emitter/mixInEventEmitter.js
+++ b/Libraries/vendor/emitter/mixInEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule mixInEventEmitter
  * @flow
diff --git a/RNTester/RNTester/AppDelegate.h b/RNTester/RNTester/AppDelegate.h
index 64cd15e5ae4885..f74364db7052d7 100644
--- a/RNTester/RNTester/AppDelegate.h
+++ b/RNTester/RNTester/AppDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTester/AppDelegate.m b/RNTester/RNTester/AppDelegate.m
index 55b9ab5f7648ab..d1e3548a75cc7a 100644
--- a/RNTester/RNTester/AppDelegate.m
+++ b/RNTester/RNTester/AppDelegate.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.h b/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.h
index 1073b2809a3b91..bca55cd86b72c0 100644
--- a/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.h
+++ b/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m b/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m
index 08e519fc58a78b..dacb4f9ec25435 100644
--- a/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m
+++ b/RNTester/RNTester/NativeExampleViews/FlexibleSizeExampleView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.h b/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.h
index 10d3ad9e76b2f4..9ca7e89c23a6ab 100644
--- a/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.h
+++ b/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m b/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m
index c8ddfb1fbe7d10..083f0e538ad3f8 100644
--- a/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m
+++ b/RNTester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTester/main.m b/RNTester/RNTester/main.m
index 71f040ff1a0728..4094e2a9143067 100644
--- a/RNTester/RNTester/main.m
+++ b/RNTester/RNTester/main.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m b/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m
index 4f23baf0470dab..b93b96337f9b47 100644
--- a/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m
+++ b/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m b/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m
index fc015278359fdd..18007b0cf0efbd 100644
--- a/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m
+++ b/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterIntegrationTests/RCTUIManagerScenarioTests.m b/RNTester/RNTesterIntegrationTests/RCTUIManagerScenarioTests.m
index 4e23f431ff8cc7..d91c489211bdc4 100644
--- a/RNTester/RNTesterIntegrationTests/RCTUIManagerScenarioTests.m
+++ b/RNTester/RNTesterIntegrationTests/RCTUIManagerScenarioTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m b/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m
index 005d0e899ee371..5f432ec0580dff 100644
--- a/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m
+++ b/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m b/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
index 2e9afbd3d0bd58..12c7599744b253 100644
--- a/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
+++ b/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterIntegrationTests/RNTesterTestModule.m b/RNTester/RNTesterIntegrationTests/RNTesterTestModule.m
index a5099f1a4a1876..a6aaaca8c0c753 100644
--- a/RNTester/RNTesterIntegrationTests/RNTesterTestModule.m
+++ b/RNTester/RNTesterIntegrationTests/RNTesterTestModule.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/RNTester/RNTesterUnitTests/RCTAllocationTests.m b/RNTester/RNTesterUnitTests/RCTAllocationTests.m
index cef41707f687ca..bb100f71c5aeee 100644
--- a/RNTester/RNTesterUnitTests/RCTAllocationTests.m
+++ b/RNTester/RNTesterUnitTests/RCTAllocationTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m b/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m
index bd60019dd5477e..acd729c0b59f15 100644
--- a/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m
+++ b/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m b/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m
index 892a5f76f17d4e..cffde57aa4d796 100644
--- a/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m
+++ b/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m b/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m
index e25a9a83f64c69..bc48eebfc37884 100644
--- a/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m
+++ b/RNTester/RNTesterUnitTests/RCTBundleURLProviderTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 #import <XCTest/XCTest.h>
diff --git a/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m b/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m
index 759c2e3b42281f..fd9fdf7e8bb8fb 100644
--- a/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m
+++ b/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m b/RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m
index 8c6a1ec170b875..830bebb27f564a 100644
--- a/RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m
+++ b/RNTester/RNTesterUnitTests/RCTConvert_NSURLTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m b/RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m
index 6ce63ecf070392..a12f525f288e22 100644
--- a/RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m
+++ b/RNTester/RNTesterUnitTests/RCTConvert_YGValueTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTDevMenuTests.m b/RNTester/RNTesterUnitTests/RCTDevMenuTests.m
index fd67246ce5a222..9dc5112a5b080e 100644
--- a/RNTester/RNTesterUnitTests/RCTDevMenuTests.m
+++ b/RNTester/RNTesterUnitTests/RCTDevMenuTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m b/RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m
index f58fd45ac0e55a..d057aae878a4b7 100644
--- a/RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m
+++ b/RNTester/RNTesterUnitTests/RCTEventDispatcherTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTFontTests.m b/RNTester/RNTesterUnitTests/RCTFontTests.m
index 148a0bcf7a1536..1d9573b489e1b2 100644
--- a/RNTester/RNTesterUnitTests/RCTFontTests.m
+++ b/RNTester/RNTesterUnitTests/RCTFontTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTGzipTests.m b/RNTester/RNTesterUnitTests/RCTGzipTests.m
index e15742d94d0fae..ea91bac8ffb4f3 100644
--- a/RNTester/RNTesterUnitTests/RCTGzipTests.m
+++ b/RNTester/RNTesterUnitTests/RCTGzipTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h b/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h
index da8c03fd859c8b..116aafcc7d8d96 100644
--- a/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h
+++ b/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m b/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m
index ef0661b2f6ea91..25178917b5130a 100644
--- a/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m
+++ b/RNTester/RNTesterUnitTests/RCTImageLoaderHelpers.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTImageLoaderTests.m b/RNTester/RNTesterUnitTests/RCTImageLoaderTests.m
index 2f20a0504b84b0..b17ed4bcd3c9e9 100644
--- a/RNTester/RNTesterUnitTests/RCTImageLoaderTests.m
+++ b/RNTester/RNTesterUnitTests/RCTImageLoaderTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTImageUtilTests.m b/RNTester/RNTesterUnitTests/RCTImageUtilTests.m
index e5aa49f43634a2..b160fca59913f0 100644
--- a/RNTester/RNTesterUnitTests/RCTImageUtilTests.m
+++ b/RNTester/RNTesterUnitTests/RCTImageUtilTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTJSONTests.m b/RNTester/RNTesterUnitTests/RCTJSONTests.m
index 5eaa9655c76184..dce9b1013f8843 100644
--- a/RNTester/RNTesterUnitTests/RCTJSONTests.m
+++ b/RNTester/RNTesterUnitTests/RCTJSONTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m b/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m
index ee36570e9104c4..268b7366de5d42 100644
--- a/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m
+++ b/RNTester/RNTesterUnitTests/RCTMethodArgumentTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m b/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m
index df90f2a872d31e..ca5b1c7ef6207e 100644
--- a/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m
+++ b/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTModuleInitTests.m b/RNTester/RNTesterUnitTests/RCTModuleInitTests.m
index aaae1dc1ea488e..1942d824aa1b99 100644
--- a/RNTester/RNTesterUnitTests/RCTModuleInitTests.m
+++ b/RNTester/RNTesterUnitTests/RCTModuleInitTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm b/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm
index 7abcd37aaf170f..4fa8012d9d4b47 100644
--- a/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm
+++ b/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTMultipartStreamReaderTests.m b/RNTester/RNTesterUnitTests/RCTMultipartStreamReaderTests.m
index c92a505a9ec8fa..8d8de7cf0076ba 100644
--- a/RNTester/RNTesterUnitTests/RCTMultipartStreamReaderTests.m
+++ b/RNTester/RNTesterUnitTests/RCTMultipartStreamReaderTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m b/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
index 358264899fb528..efe0b952789622 100644
--- a/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
+++ b/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTShadowViewTests.m b/RNTester/RNTesterUnitTests/RCTShadowViewTests.m
index 34543cf19b42be..a8b41780224cf5 100644
--- a/RNTester/RNTesterUnitTests/RCTShadowViewTests.m
+++ b/RNTester/RNTesterUnitTests/RCTShadowViewTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTUIManagerTests.m b/RNTester/RNTesterUnitTests/RCTUIManagerTests.m
index 7dd21446ec4c79..bfa0be867b6451 100644
--- a/RNTester/RNTesterUnitTests/RCTUIManagerTests.m
+++ b/RNTester/RNTesterUnitTests/RCTUIManagerTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTURLUtilsTests.m b/RNTester/RNTesterUnitTests/RCTURLUtilsTests.m
index 93b2601c5cbf20..aeff07fefa0378 100644
--- a/RNTester/RNTesterUnitTests/RCTURLUtilsTests.m
+++ b/RNTester/RNTesterUnitTests/RCTURLUtilsTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m b/RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m
index 38d614e1f47a6b..02f217e0fe3584 100644
--- a/RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m
+++ b/RNTester/RNTesterUnitTests/RCTUnicodeDecodeTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js b/RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js
index 603e784c8aa874..f0a455ff355294 100644
--- a/RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js
+++ b/RNTester/RNTesterUnitTests/RNTesterUnitTestsBundle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterUnitTestsBundle
  */
diff --git a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
index 2c707b160eac65..5b55c3b26e5e12 100644
--- a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
+++ b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
index 9c943204224375..b8c61a384ac443 100644
--- a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
+++ b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/RNTester/js/ARTExample.js b/RNTester/js/ARTExample.js
index 95aa4e8bc534d7..704a9c06bbdc3e 100644
--- a/RNTester/js/ARTExample.js
+++ b/RNTester/js/ARTExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ARTExample
diff --git a/RNTester/js/AccessibilityAndroidExample.android.js b/RNTester/js/AccessibilityAndroidExample.android.js
index 2567fd54886e5a..54b087fa207fdf 100644
--- a/RNTester/js/AccessibilityAndroidExample.android.js
+++ b/RNTester/js/AccessibilityAndroidExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AccessibilityAndroidExample
  */
diff --git a/RNTester/js/AccessibilityIOSExample.js b/RNTester/js/AccessibilityIOSExample.js
index 30aef0df31eaaa..0deead7538d62e 100644
--- a/RNTester/js/AccessibilityIOSExample.js
+++ b/RNTester/js/AccessibilityIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AccessibilityIOSExample
diff --git a/RNTester/js/ActionSheetIOSExample.js b/RNTester/js/ActionSheetIOSExample.js
index a4b7ea07d4d1a8..ac9d9737863780 100644
--- a/RNTester/js/ActionSheetIOSExample.js
+++ b/RNTester/js/ActionSheetIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ActionSheetIOSExample
diff --git a/RNTester/js/ActivityIndicatorExample.js b/RNTester/js/ActivityIndicatorExample.js
index 5daaf362155eb2..692acd01c7d167 100644
--- a/RNTester/js/ActivityIndicatorExample.js
+++ b/RNTester/js/ActivityIndicatorExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ActivityIndicatorExample
diff --git a/RNTester/js/AlertExample.js b/RNTester/js/AlertExample.js
index 8e1062ab2a625b..93c82e4069c9f3 100644
--- a/RNTester/js/AlertExample.js
+++ b/RNTester/js/AlertExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AlertExample
  */
diff --git a/RNTester/js/AlertIOSExample.js b/RNTester/js/AlertIOSExample.js
index fdd1d6a31bf02c..b8b1cee43f85f7 100644
--- a/RNTester/js/AlertIOSExample.js
+++ b/RNTester/js/AlertIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AlertIOSExample
diff --git a/RNTester/js/AnimatedExample.js b/RNTester/js/AnimatedExample.js
index 9e9fbffd1ddd42..8130a9d9f62908 100644
--- a/RNTester/js/AnimatedExample.js
+++ b/RNTester/js/AnimatedExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AnimatedExample
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExApp.js b/RNTester/js/AnimatedGratuitousApp/AnExApp.js
index 268a409faeb068..1116a84ee98254 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExApp.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnExApp
  * @flow
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExBobble.js b/RNTester/js/AnimatedGratuitousApp/AnExBobble.js
index 88667a2cae0fdb..d3f8885275eb91 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExBobble.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExBobble.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnExBobble
  * @flow
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExChained.js b/RNTester/js/AnimatedGratuitousApp/AnExChained.js
index 124ed34e23a685..63a83804ed34c9 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExChained.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExChained.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnExChained
  * @flow
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExScroll.js b/RNTester/js/AnimatedGratuitousApp/AnExScroll.js
index 855580a9339268..b7f69425437fdf 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExScroll.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExScroll.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnExScroll
  * @flow
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExSet.js b/RNTester/js/AnimatedGratuitousApp/AnExSet.js
index e3ea2acff32a46..a89fd2008a3f04 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExSet.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExSet.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnExSet
  * @flow
diff --git a/RNTester/js/AnimatedGratuitousApp/AnExTilt.js b/RNTester/js/AnimatedGratuitousApp/AnExTilt.js
index 53e7c87e58dba2..a5678b6865073c 100644
--- a/RNTester/js/AnimatedGratuitousApp/AnExTilt.js
+++ b/RNTester/js/AnimatedGratuitousApp/AnExTilt.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AnExTilt
  * @flow
diff --git a/RNTester/js/AppStateExample.js b/RNTester/js/AppStateExample.js
index 7a64197b1c8576..8088d77fc06f37 100644
--- a/RNTester/js/AppStateExample.js
+++ b/RNTester/js/AppStateExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule AppStateExample
  * @flow
diff --git a/RNTester/js/AssetScaledImageExample.js b/RNTester/js/AssetScaledImageExample.js
index 05f32d22a7e8e0..b723d8f50ea588 100644
--- a/RNTester/js/AssetScaledImageExample.js
+++ b/RNTester/js/AssetScaledImageExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AssetScaledImageExample
diff --git a/RNTester/js/AsyncStorageExample.js b/RNTester/js/AsyncStorageExample.js
index 872baf8d0795cb..5e16a6b847c42c 100644
--- a/RNTester/js/AsyncStorageExample.js
+++ b/RNTester/js/AsyncStorageExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule AsyncStorageExample
diff --git a/RNTester/js/BorderExample.js b/RNTester/js/BorderExample.js
index 3bb5de8fce78ca..8885537fb35b43 100644
--- a/RNTester/js/BorderExample.js
+++ b/RNTester/js/BorderExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BorderExample
  */
diff --git a/RNTester/js/BoxShadowExample.js b/RNTester/js/BoxShadowExample.js
index eadb19acea85a2..bddce0490b3b2c 100644
--- a/RNTester/js/BoxShadowExample.js
+++ b/RNTester/js/BoxShadowExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule BoxShadowExample
  */
diff --git a/RNTester/js/ButtonExample.js b/RNTester/js/ButtonExample.js
index 10a3567b609dce..6c850a2121a7f6 100644
--- a/RNTester/js/ButtonExample.js
+++ b/RNTester/js/ButtonExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ButtonExample
diff --git a/RNTester/js/CameraRollExample.js b/RNTester/js/CameraRollExample.js
index 74188072a71270..508980d47196ad 100644
--- a/RNTester/js/CameraRollExample.js
+++ b/RNTester/js/CameraRollExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule CameraRollExample
diff --git a/RNTester/js/CameraRollView.js b/RNTester/js/CameraRollView.js
index 40d5606885620c..fc1f063b2560c1 100644
--- a/RNTester/js/CameraRollView.js
+++ b/RNTester/js/CameraRollView.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CameraRollView
  * @flow
diff --git a/RNTester/js/CheckBoxExample.js b/RNTester/js/CheckBoxExample.js
index 42e689180fc381..98685fac4be787 100644
--- a/RNTester/js/CheckBoxExample.js
+++ b/RNTester/js/CheckBoxExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule CheckBoxExample
diff --git a/RNTester/js/ClipboardExample.js b/RNTester/js/ClipboardExample.js
index f4e6d45afb2693..8526cea43340e4 100644
--- a/RNTester/js/ClipboardExample.js
+++ b/RNTester/js/ClipboardExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ClipboardExample
diff --git a/RNTester/js/DatePickerAndroidExample.js b/RNTester/js/DatePickerAndroidExample.js
index 8665d45a3bf155..926071b66d7a4a 100644
--- a/RNTester/js/DatePickerAndroidExample.js
+++ b/RNTester/js/DatePickerAndroidExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerAndroidExample
  */
diff --git a/RNTester/js/DatePickerIOSExample.js b/RNTester/js/DatePickerIOSExample.js
index d03c19faefc726..b11e0644c20d80 100644
--- a/RNTester/js/DatePickerIOSExample.js
+++ b/RNTester/js/DatePickerIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule DatePickerIOSExample
diff --git a/RNTester/js/DimensionsExample.js b/RNTester/js/DimensionsExample.js
index 9560a43d31d4e5..9611eedd482de1 100644
--- a/RNTester/js/DimensionsExample.js
+++ b/RNTester/js/DimensionsExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DimensionsExample
  * @flow
diff --git a/RNTester/js/ExampleTypes.js b/RNTester/js/ExampleTypes.js
index 9b6ae77878a713..e747e43be9f940 100644
--- a/RNTester/js/ExampleTypes.js
+++ b/RNTester/js/ExampleTypes.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ExampleTypes
  * @flow
diff --git a/RNTester/js/FlatListExample.js b/RNTester/js/FlatListExample.js
index aa2f805b73563b..9effcf9396c9ce 100644
--- a/RNTester/js/FlatListExample.js
+++ b/RNTester/js/FlatListExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule FlatListExample
diff --git a/RNTester/js/GeolocationExample.js b/RNTester/js/GeolocationExample.js
index 02088ea295776d..1282673f0acb91 100644
--- a/RNTester/js/GeolocationExample.js
+++ b/RNTester/js/GeolocationExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule GeolocationExample
diff --git a/RNTester/js/ImageCapInsetsExample.js b/RNTester/js/ImageCapInsetsExample.js
index 88830779e1d424..645d002b9be457 100644
--- a/RNTester/js/ImageCapInsetsExample.js
+++ b/RNTester/js/ImageCapInsetsExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ImageCapInsetsExample
  * @flow
diff --git a/RNTester/js/ImageEditingExample.js b/RNTester/js/ImageEditingExample.js
index f59e5891ab2d10..d9defa775f5ae3 100644
--- a/RNTester/js/ImageEditingExample.js
+++ b/RNTester/js/ImageEditingExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ImageEditingExample
diff --git a/RNTester/js/ImageExample.js b/RNTester/js/ImageExample.js
index 1c56c3eab0b9f0..d30a24ca7c93b2 100644
--- a/RNTester/js/ImageExample.js
+++ b/RNTester/js/ImageExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ImageExample
diff --git a/RNTester/js/KeyboardAvoidingViewExample.js b/RNTester/js/KeyboardAvoidingViewExample.js
index 1f26e18f9915cb..3b52f3accbb760 100644
--- a/RNTester/js/KeyboardAvoidingViewExample.js
+++ b/RNTester/js/KeyboardAvoidingViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule KeyboardAvoidingViewExample
  */
diff --git a/RNTester/js/LayoutAnimationExample.js b/RNTester/js/LayoutAnimationExample.js
index 58a2950eb3c095..92134409879afe 100644
--- a/RNTester/js/LayoutAnimationExample.js
+++ b/RNTester/js/LayoutAnimationExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule LayoutAnimationExample
diff --git a/RNTester/js/LayoutEventsExample.js b/RNTester/js/LayoutEventsExample.js
index c1e99d4964ebca..37b9811d8d4080 100644
--- a/RNTester/js/LayoutEventsExample.js
+++ b/RNTester/js/LayoutEventsExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule LayoutEventsExample
diff --git a/RNTester/js/LayoutExample.js b/RNTester/js/LayoutExample.js
index 8292befad39179..eec0faa433d265 100644
--- a/RNTester/js/LayoutExample.js
+++ b/RNTester/js/LayoutExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule LayoutExample
diff --git a/RNTester/js/LinkingExample.js b/RNTester/js/LinkingExample.js
index 7da8f99fca9e7c..52297f07cf8ed6 100644
--- a/RNTester/js/LinkingExample.js
+++ b/RNTester/js/LinkingExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LinkingExample
  */
diff --git a/RNTester/js/ListExampleShared.js b/RNTester/js/ListExampleShared.js
index d9569efb0d1c97..84d2fb37cc8538 100644
--- a/RNTester/js/ListExampleShared.js
+++ b/RNTester/js/ListExampleShared.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ListExampleShared
diff --git a/RNTester/js/ListViewExample.js b/RNTester/js/ListViewExample.js
index 7937739c7f2b63..ee828423618784 100644
--- a/RNTester/js/ListViewExample.js
+++ b/RNTester/js/ListViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ListViewExample
diff --git a/RNTester/js/ListViewGridLayoutExample.js b/RNTester/js/ListViewGridLayoutExample.js
index 8e31ebb3ea3d79..636db62fccecb7 100644
--- a/RNTester/js/ListViewGridLayoutExample.js
+++ b/RNTester/js/ListViewGridLayoutExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ListViewGridLayoutExample
diff --git a/RNTester/js/ListViewPagingExample.js b/RNTester/js/ListViewPagingExample.js
index b247f167884c51..3d68e7ec54683c 100644
--- a/RNTester/js/ListViewPagingExample.js
+++ b/RNTester/js/ListViewPagingExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ListViewPagingExample
  * @flow
diff --git a/RNTester/js/MaskedViewExample.js b/RNTester/js/MaskedViewExample.js
index 84a757eee6b998..cca734b53576a1 100644
--- a/RNTester/js/MaskedViewExample.js
+++ b/RNTester/js/MaskedViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule MaskedViewExample
diff --git a/RNTester/js/ModalExample.js b/RNTester/js/ModalExample.js
index e0c4a55b22c5cb..12093f4d8f4e07 100644
--- a/RNTester/js/ModalExample.js
+++ b/RNTester/js/ModalExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ModalExample
diff --git a/RNTester/js/MultiColumnExample.js b/RNTester/js/MultiColumnExample.js
index cad2560eefc61f..cc323cfcdad8c0 100644
--- a/RNTester/js/MultiColumnExample.js
+++ b/RNTester/js/MultiColumnExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule MultiColumnExample
diff --git a/RNTester/js/NativeAnimationsExample.js b/RNTester/js/NativeAnimationsExample.js
index 4aaf2063de57a0..983b0c9d290fe0 100644
--- a/RNTester/js/NativeAnimationsExample.js
+++ b/RNTester/js/NativeAnimationsExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule NativeAnimationsExample
diff --git a/RNTester/js/NavigatorIOSBarStyleExample.js b/RNTester/js/NavigatorIOSBarStyleExample.js
index 761d54304e4beb..d9d53edd3c99a2 100644
--- a/RNTester/js/NavigatorIOSBarStyleExample.js
+++ b/RNTester/js/NavigatorIOSBarStyleExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * The examples provided by Facebook are for non-commercial testing and
  * evaluation purposes only.
diff --git a/RNTester/js/NavigatorIOSColorsExample.js b/RNTester/js/NavigatorIOSColorsExample.js
index 62aed681200beb..f34c9c9d10aff3 100644
--- a/RNTester/js/NavigatorIOSColorsExample.js
+++ b/RNTester/js/NavigatorIOSColorsExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NavigatorIOSColorsExample
  */
diff --git a/RNTester/js/NavigatorIOSExample.js b/RNTester/js/NavigatorIOSExample.js
index 458445e68dc347..79ee6f0fd07065 100644
--- a/RNTester/js/NavigatorIOSExample.js
+++ b/RNTester/js/NavigatorIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule NavigatorIOSExample
diff --git a/RNTester/js/NetInfoExample.js b/RNTester/js/NetInfoExample.js
index 6c909a57e75a11..0ba8dd2ff8c895 100644
--- a/RNTester/js/NetInfoExample.js
+++ b/RNTester/js/NetInfoExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule NetInfoExample
diff --git a/RNTester/js/OrientationChangeExample.js b/RNTester/js/OrientationChangeExample.js
index 6dde81f9ef9344..af6f9b1feeca09 100644
--- a/RNTester/js/OrientationChangeExample.js
+++ b/RNTester/js/OrientationChangeExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule OrientationChangeExample
  * @flow
diff --git a/RNTester/js/PanResponderExample.js b/RNTester/js/PanResponderExample.js
index 2acc3b594496c5..27d9a8016677b4 100644
--- a/RNTester/js/PanResponderExample.js
+++ b/RNTester/js/PanResponderExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow weak
  * @providesModule PanResponderExample
diff --git a/RNTester/js/PermissionsExampleAndroid.android.js b/RNTester/js/PermissionsExampleAndroid.android.js
index aff60b4d94d504..cb837183a6295d 100644
--- a/RNTester/js/PermissionsExampleAndroid.android.js
+++ b/RNTester/js/PermissionsExampleAndroid.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PermissionsExampleAndroid
  * @flow
diff --git a/RNTester/js/PickerExample.js b/RNTester/js/PickerExample.js
index 595ee87a37315e..1a1005cdaa2d03 100644
--- a/RNTester/js/PickerExample.js
+++ b/RNTester/js/PickerExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule PickerExample
diff --git a/RNTester/js/PickerIOSExample.js b/RNTester/js/PickerIOSExample.js
index 34f04ca59c32af..a4d5de63a046c7 100644
--- a/RNTester/js/PickerIOSExample.js
+++ b/RNTester/js/PickerIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule PickerIOSExample
diff --git a/RNTester/js/PointerEventsExample.js b/RNTester/js/PointerEventsExample.js
index e255d2f4754137..ac838c4eb8e370 100644
--- a/RNTester/js/PointerEventsExample.js
+++ b/RNTester/js/PointerEventsExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule PointerEventsExample
diff --git a/RNTester/js/ProgressBarAndroidExample.android.js b/RNTester/js/ProgressBarAndroidExample.android.js
index 263e0e067e4acd..baa75b9ff1e6d2 100644
--- a/RNTester/js/ProgressBarAndroidExample.android.js
+++ b/RNTester/js/ProgressBarAndroidExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ProgressBarAndroidExample
diff --git a/RNTester/js/ProgressViewIOSExample.js b/RNTester/js/ProgressViewIOSExample.js
index 6b7be48a07a90b..d0641760965c6a 100644
--- a/RNTester/js/ProgressViewIOSExample.js
+++ b/RNTester/js/ProgressViewIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ProgressViewIOSExample
diff --git a/RNTester/js/PushNotificationIOSExample.js b/RNTester/js/PushNotificationIOSExample.js
index 10b8f7700485fd..c2368e9a782b14 100644
--- a/RNTester/js/PushNotificationIOSExample.js
+++ b/RNTester/js/PushNotificationIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule PushNotificationIOSExample
diff --git a/RNTester/js/RCTRootViewIOSExample.js b/RNTester/js/RCTRootViewIOSExample.js
index 17303d5fe9a074..f6b3b20536efa4 100644
--- a/RNTester/js/RCTRootViewIOSExample.js
+++ b/RNTester/js/RCTRootViewIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RCTRootViewIOSExample
diff --git a/RNTester/js/RNTesterActions.js b/RNTester/js/RNTesterActions.js
index ad203842b48825..2bf967b3c2e66b 100644
--- a/RNTester/js/RNTesterActions.js
+++ b/RNTester/js/RNTesterActions.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterActions
diff --git a/RNTester/js/RNTesterApp.android.js b/RNTester/js/RNTesterApp.android.js
index b185191b4aafd4..d5f05d12a90a3c 100644
--- a/RNTester/js/RNTesterApp.android.js
+++ b/RNTester/js/RNTesterApp.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterApp
  * @flow
diff --git a/RNTester/js/RNTesterApp.ios.js b/RNTester/js/RNTesterApp.ios.js
index 49feb6243f6355..249b2754f886ef 100644
--- a/RNTester/js/RNTesterApp.ios.js
+++ b/RNTester/js/RNTesterApp.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterApp
  * @flow
diff --git a/RNTester/js/RNTesterBlock.js b/RNTester/js/RNTesterBlock.js
index bd854ed1793a6a..58ca4d0a5f0c03 100644
--- a/RNTester/js/RNTesterBlock.js
+++ b/RNTester/js/RNTesterBlock.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterBlock
  * @flow
diff --git a/RNTester/js/RNTesterButton.js b/RNTester/js/RNTesterButton.js
index 94329d21bfddb9..835eb9db113edd 100644
--- a/RNTester/js/RNTesterButton.js
+++ b/RNTester/js/RNTesterButton.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterButton
diff --git a/RNTester/js/RNTesterExampleContainer.js b/RNTester/js/RNTesterExampleContainer.js
index 635cd021471f40..e5d1ab816d1dcb 100644
--- a/RNTester/js/RNTesterExampleContainer.js
+++ b/RNTester/js/RNTesterExampleContainer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterExampleContainer
  */
diff --git a/RNTester/js/RNTesterExampleList.js b/RNTester/js/RNTesterExampleList.js
index 7df411bcd4b80a..072a31f3d1b650 100644
--- a/RNTester/js/RNTesterExampleList.js
+++ b/RNTester/js/RNTesterExampleList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterExampleList
diff --git a/RNTester/js/RNTesterList.android.js b/RNTester/js/RNTesterList.android.js
index eee084dd023864..feea07f72cdb85 100644
--- a/RNTester/js/RNTesterList.android.js
+++ b/RNTester/js/RNTesterList.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterList
diff --git a/RNTester/js/RNTesterList.ios.js b/RNTester/js/RNTesterList.ios.js
index b01a54d792be68..1542a4e4ac80ad 100644
--- a/RNTester/js/RNTesterList.ios.js
+++ b/RNTester/js/RNTesterList.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterList
diff --git a/RNTester/js/RNTesterNavigationReducer.js b/RNTester/js/RNTesterNavigationReducer.js
index 0bedcb24daac93..c8ffa5a5fe7c00 100644
--- a/RNTester/js/RNTesterNavigationReducer.js
+++ b/RNTester/js/RNTesterNavigationReducer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterNavigationReducer
diff --git a/RNTester/js/RNTesterPage.js b/RNTester/js/RNTesterPage.js
index ed5d58f0d0e68f..5dfb3bda2039ea 100644
--- a/RNTester/js/RNTesterPage.js
+++ b/RNTester/js/RNTesterPage.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterPage
  * @flow
diff --git a/RNTester/js/RNTesterSettingSwitchRow.js b/RNTester/js/RNTesterSettingSwitchRow.js
index c252476f8d3cf1..97d2f8d60be40a 100644
--- a/RNTester/js/RNTesterSettingSwitchRow.js
+++ b/RNTester/js/RNTesterSettingSwitchRow.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterSettingSwitchRow
  * @flow
diff --git a/RNTester/js/RNTesterStatePersister.js b/RNTester/js/RNTesterStatePersister.js
index 1e6f42cb6f4d80..310386c49bb7f4 100644
--- a/RNTester/js/RNTesterStatePersister.js
+++ b/RNTester/js/RNTesterStatePersister.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RNTesterStatePersister
diff --git a/RNTester/js/RNTesterTitle.js b/RNTester/js/RNTesterTitle.js
index 255ed72287ba0e..9afd68a66a7c05 100644
--- a/RNTester/js/RNTesterTitle.js
+++ b/RNTester/js/RNTesterTitle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RNTesterTitle
  * @flow
diff --git a/RNTester/js/RTLExample.js b/RNTester/js/RTLExample.js
index c7cf4930b454b5..aad38a9fedc9df 100644
--- a/RNTester/js/RTLExample.js
+++ b/RNTester/js/RTLExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/RNTester/js/RefreshControlExample.js b/RNTester/js/RefreshControlExample.js
index c2ef5b5fdb62fd..7962a457e29bc0 100644
--- a/RNTester/js/RefreshControlExample.js
+++ b/RNTester/js/RefreshControlExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule RefreshControlExample
  */
diff --git a/RNTester/js/RootViewSizeFlexibilityExampleApp.js b/RNTester/js/RootViewSizeFlexibilityExampleApp.js
index 296a22dc1b3aae..066a6d425e926b 100644
--- a/RNTester/js/RootViewSizeFlexibilityExampleApp.js
+++ b/RNTester/js/RootViewSizeFlexibilityExampleApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule RootViewSizeFlexibilityExampleApp
diff --git a/RNTester/js/SafeAreaViewExample.js b/RNTester/js/SafeAreaViewExample.js
index aafb8d74ef711d..c3d5a99f8208e6 100644
--- a/RNTester/js/SafeAreaViewExample.js
+++ b/RNTester/js/SafeAreaViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/RNTester/js/ScrollViewExample.js b/RNTester/js/ScrollViewExample.js
index 4af1ddada33cce..f0d1e9bb19c617 100644
--- a/RNTester/js/ScrollViewExample.js
+++ b/RNTester/js/ScrollViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ScrollViewExample
diff --git a/RNTester/js/ScrollViewSimpleExample.js b/RNTester/js/ScrollViewSimpleExample.js
index c3ac0786bd7f1d..0a6713122a885d 100644
--- a/RNTester/js/ScrollViewSimpleExample.js
+++ b/RNTester/js/ScrollViewSimpleExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ScrollViewSimpleExample
diff --git a/RNTester/js/SectionListExample.js b/RNTester/js/SectionListExample.js
index 51708951506a99..d5d7e685c6c6e1 100644
--- a/RNTester/js/SectionListExample.js
+++ b/RNTester/js/SectionListExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SectionListExample
diff --git a/RNTester/js/SegmentedControlIOSExample.js b/RNTester/js/SegmentedControlIOSExample.js
index e6c4c054f0b897..c5441e7cc4dc87 100644
--- a/RNTester/js/SegmentedControlIOSExample.js
+++ b/RNTester/js/SegmentedControlIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SegmentedControlIOSExample
diff --git a/RNTester/js/SetPropertiesExampleApp.js b/RNTester/js/SetPropertiesExampleApp.js
index a3b5f90142454e..8113f5279570db 100644
--- a/RNTester/js/SetPropertiesExampleApp.js
+++ b/RNTester/js/SetPropertiesExampleApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SetPropertiesExampleApp
diff --git a/RNTester/js/ShareExample.js b/RNTester/js/ShareExample.js
index 9b4d05342dab2c..00d3330d83c27c 100644
--- a/RNTester/js/ShareExample.js
+++ b/RNTester/js/ShareExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ShareExample
diff --git a/RNTester/js/SliderExample.js b/RNTester/js/SliderExample.js
index 906c9092258389..3b4980ac800488 100644
--- a/RNTester/js/SliderExample.js
+++ b/RNTester/js/SliderExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SliderExample
diff --git a/RNTester/js/SnapshotExample.js b/RNTester/js/SnapshotExample.js
index d0d9c172b7dd83..160434b53b260b 100644
--- a/RNTester/js/SnapshotExample.js
+++ b/RNTester/js/SnapshotExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SnapshotExample
diff --git a/RNTester/js/StatusBarExample.js b/RNTester/js/StatusBarExample.js
index bb84bd05b29bc4..0df43f42edb371 100644
--- a/RNTester/js/StatusBarExample.js
+++ b/RNTester/js/StatusBarExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule StatusBarExample
diff --git a/RNTester/js/SwipeableFlatListExample.js b/RNTester/js/SwipeableFlatListExample.js
index ac69abec01ce11..432e6d813d5053 100644
--- a/RNTester/js/SwipeableFlatListExample.js
+++ b/RNTester/js/SwipeableFlatListExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeableFlatListExample
  * @flow
diff --git a/RNTester/js/SwipeableListViewExample.js b/RNTester/js/SwipeableListViewExample.js
index 42e9c9c8947033..c004f86e3e6aad 100644
--- a/RNTester/js/SwipeableListViewExample.js
+++ b/RNTester/js/SwipeableListViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SwipeableListViewExample
diff --git a/RNTester/js/SwitchExample.js b/RNTester/js/SwitchExample.js
index ee6902d43a0db6..ca721ce4488e6c 100644
--- a/RNTester/js/SwitchExample.js
+++ b/RNTester/js/SwitchExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule SwitchExample
diff --git a/RNTester/js/TVEventHandlerExample.js b/RNTester/js/TVEventHandlerExample.js
index 4d0aa3ae826144..bc6346d0d2b04f 100644
--- a/RNTester/js/TVEventHandlerExample.js
+++ b/RNTester/js/TVEventHandlerExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TVEventHandlerExample
diff --git a/RNTester/js/TabBarIOSBarStyleExample.js b/RNTester/js/TabBarIOSBarStyleExample.js
index 1b4b193db2dd9d..5c42c5ccf1ef11 100644
--- a/RNTester/js/TabBarIOSBarStyleExample.js
+++ b/RNTester/js/TabBarIOSBarStyleExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * The examples provided by Facebook are for non-commercial testing and
  * evaluation purposes only.
diff --git a/RNTester/js/TabBarIOSExample.js b/RNTester/js/TabBarIOSExample.js
index 4fe3c80fd8b33c..82c47cccdfe2f3 100644
--- a/RNTester/js/TabBarIOSExample.js
+++ b/RNTester/js/TabBarIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TabBarIOSExample
diff --git a/RNTester/js/TextExample.android.js b/RNTester/js/TextExample.android.js
index 17133be48cf50c..a4579d9d931cce 100644
--- a/RNTester/js/TextExample.android.js
+++ b/RNTester/js/TextExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TextExample
diff --git a/RNTester/js/TextExample.ios.js b/RNTester/js/TextExample.ios.js
index 5064a63dc8fc89..4afcc78668e5ea 100644
--- a/RNTester/js/TextExample.ios.js
+++ b/RNTester/js/TextExample.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TextExample
diff --git a/RNTester/js/TextInputExample.android.js b/RNTester/js/TextInputExample.android.js
index fa0d5986bad5d8..92843e3459f7fe 100644
--- a/RNTester/js/TextInputExample.android.js
+++ b/RNTester/js/TextInputExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TextInputExample
diff --git a/RNTester/js/TextInputExample.ios.js b/RNTester/js/TextInputExample.ios.js
index cca082b92dc0ff..a55206355046da 100644
--- a/RNTester/js/TextInputExample.ios.js
+++ b/RNTester/js/TextInputExample.ios.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TextInputExample
diff --git a/RNTester/js/TimePickerAndroidExample.js b/RNTester/js/TimePickerAndroidExample.js
index b16a8d16c7b3e1..7e1afa6367d7d1 100644
--- a/RNTester/js/TimePickerAndroidExample.js
+++ b/RNTester/js/TimePickerAndroidExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TimePickerAndroidExample
  */
diff --git a/RNTester/js/TimerExample.js b/RNTester/js/TimerExample.js
index 7faf66756adf7d..d7e966010f9ada 100644
--- a/RNTester/js/TimerExample.js
+++ b/RNTester/js/TimerExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TimerExample
diff --git a/RNTester/js/ToastAndroidExample.android.js b/RNTester/js/ToastAndroidExample.android.js
index 90b5bc6d1b90c7..e86a21cb83ef3b 100644
--- a/RNTester/js/ToastAndroidExample.android.js
+++ b/RNTester/js/ToastAndroidExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ToastAndroidExample
diff --git a/RNTester/js/ToolbarAndroidExample.android.js b/RNTester/js/ToolbarAndroidExample.android.js
index b7e833ccc41ffb..e197518704740f 100644
--- a/RNTester/js/ToolbarAndroidExample.android.js
+++ b/RNTester/js/ToolbarAndroidExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ToolbarAndroidExample
diff --git a/RNTester/js/TouchableExample.js b/RNTester/js/TouchableExample.js
index 4977daafdfcda3..f505891177d571 100644
--- a/RNTester/js/TouchableExample.js
+++ b/RNTester/js/TouchableExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TouchableExample
diff --git a/RNTester/js/TransformExample.js b/RNTester/js/TransformExample.js
index 731ced76edf61a..17e2a89fc98d26 100644
--- a/RNTester/js/TransformExample.js
+++ b/RNTester/js/TransformExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TransformExample
diff --git a/RNTester/js/TransparentHitTestExample.js b/RNTester/js/TransparentHitTestExample.js
index 1eb8633b85daca..89db856a473500 100644
--- a/RNTester/js/TransparentHitTestExample.js
+++ b/RNTester/js/TransparentHitTestExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule TransparentHitTestExample
diff --git a/RNTester/js/URIActionMap.js b/RNTester/js/URIActionMap.js
index 76c108f59c9498..fb47214aadd5c0 100644
--- a/RNTester/js/URIActionMap.js
+++ b/RNTester/js/URIActionMap.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule URIActionMap
diff --git a/RNTester/js/VibrationExample.js b/RNTester/js/VibrationExample.js
index 4e68083d7c56b7..9e6d6d7d768b8a 100644
--- a/RNTester/js/VibrationExample.js
+++ b/RNTester/js/VibrationExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule VibrationExample
diff --git a/RNTester/js/VibrationIOSExample.js b/RNTester/js/VibrationIOSExample.js
index 24b4342ccb92fe..9093ff87af28ce 100644
--- a/RNTester/js/VibrationIOSExample.js
+++ b/RNTester/js/VibrationIOSExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule VibrationIOSExample
diff --git a/RNTester/js/ViewExample.js b/RNTester/js/ViewExample.js
index 0516462cc9e443..b4c4a6c2a65818 100644
--- a/RNTester/js/ViewExample.js
+++ b/RNTester/js/ViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ViewExample
diff --git a/RNTester/js/ViewPagerAndroidExample.android.js b/RNTester/js/ViewPagerAndroidExample.android.js
index f59a59dc47793f..1f2ac75d8f22eb 100644
--- a/RNTester/js/ViewPagerAndroidExample.android.js
+++ b/RNTester/js/ViewPagerAndroidExample.android.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewPagerAndroidExample
  */
diff --git a/RNTester/js/WebSocketExample.js b/RNTester/js/WebSocketExample.js
index a859c5cc7f3c87..ad4a6f8be4719a 100644
--- a/RNTester/js/WebSocketExample.js
+++ b/RNTester/js/WebSocketExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule WebSocketExample
  * @format
diff --git a/RNTester/js/WebViewExample.js b/RNTester/js/WebViewExample.js
index d04600512d1705..d3bc575361e5fd 100644
--- a/RNTester/js/WebViewExample.js
+++ b/RNTester/js/WebViewExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule WebViewExample
diff --git a/RNTester/js/XHRExample.js b/RNTester/js/XHRExample.js
index cd14fe88a4774f..1ee8315d03ba67 100644
--- a/RNTester/js/XHRExample.js
+++ b/RNTester/js/XHRExample.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExample
diff --git a/RNTester/js/XHRExampleBinaryUpload.js b/RNTester/js/XHRExampleBinaryUpload.js
index adf854d235aeef..e5635724378683 100644
--- a/RNTester/js/XHRExampleBinaryUpload.js
+++ b/RNTester/js/XHRExampleBinaryUpload.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExampleBinaryUpload
diff --git a/RNTester/js/XHRExampleCookies.js b/RNTester/js/XHRExampleCookies.js
index e9328af09f75c4..08ff72b369cb22 100644
--- a/RNTester/js/XHRExampleCookies.js
+++ b/RNTester/js/XHRExampleCookies.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExampleCookies
diff --git a/RNTester/js/XHRExampleDownload.js b/RNTester/js/XHRExampleDownload.js
index e636ab298aaff0..a419f9ba539ed2 100644
--- a/RNTester/js/XHRExampleDownload.js
+++ b/RNTester/js/XHRExampleDownload.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExampleDownload
diff --git a/RNTester/js/XHRExampleFetch.js b/RNTester/js/XHRExampleFetch.js
index 7917bfe11b8350..2aea3be975f4fb 100644
--- a/RNTester/js/XHRExampleFetch.js
+++ b/RNTester/js/XHRExampleFetch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExampleFetch
diff --git a/RNTester/js/XHRExampleFormData.js b/RNTester/js/XHRExampleFormData.js
index 7d9409853207bb..228af6345bd4a0 100644
--- a/RNTester/js/XHRExampleFormData.js
+++ b/RNTester/js/XHRExampleFormData.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExampleFormData
diff --git a/RNTester/js/XHRExampleHeaders.js b/RNTester/js/XHRExampleHeaders.js
index b0aad13bdc64ac..8476b1600ef670 100644
--- a/RNTester/js/XHRExampleHeaders.js
+++ b/RNTester/js/XHRExampleHeaders.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @noflow
  * @providesModule XHRExampleHeaders
diff --git a/RNTester/js/XHRExampleOnTimeOut.js b/RNTester/js/XHRExampleOnTimeOut.js
index 7d30f0d7a2b041..d3c50025c2d0fe 100644
--- a/RNTester/js/XHRExampleOnTimeOut.js
+++ b/RNTester/js/XHRExampleOnTimeOut.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule XHRExampleOnTimeOut
diff --git a/RNTester/js/createExamplePage.js b/RNTester/js/createExamplePage.js
index 55c9a666661ddf..e381f05b8d2c54 100644
--- a/RNTester/js/createExamplePage.js
+++ b/RNTester/js/createExamplePage.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule createExamplePage
  * @flow
diff --git a/RNTester/js/http_test_server.js b/RNTester/js/http_test_server.js
index c2222121770132..cd9e18e5407d7f 100755
--- a/RNTester/js/http_test_server.js
+++ b/RNTester/js/http_test_server.js
@@ -1,11 +1,9 @@
 #!/usr/bin/env node
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule http_test_server
diff --git a/RNTester/js/websocket_test_server.js b/RNTester/js/websocket_test_server.js
index 01feb12d54d77c..83a48ed213f062 100755
--- a/RNTester/js/websocket_test_server.js
+++ b/RNTester/js/websocket_test_server.js
@@ -1,11 +1,9 @@
 #!/usr/bin/env node
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule websocket_test_server
diff --git a/React/Base/RCTAssert.h b/React/Base/RCTAssert.h
index c3bb2cf7f694d6..5e60a7b206a4b9 100644
--- a/React/Base/RCTAssert.h
+++ b/React/Base/RCTAssert.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTAssert.m b/React/Base/RCTAssert.m
index 79db51973c46ec..61cefe2ad5fca2 100644
--- a/React/Base/RCTAssert.m
+++ b/React/Base/RCTAssert.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAssert.h"
diff --git a/React/Base/RCTBridge+Private.h b/React/Base/RCTBridge+Private.h
index fd49df387f8772..1995801ffcaaea 100644
--- a/React/Base/RCTBridge+Private.h
+++ b/React/Base/RCTBridge+Private.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <JavaScriptCore/JavaScriptCore.h>
diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
index 0ddce95bec1e4a..7db16baea37735 100644
--- a/React/Base/RCTBridge.h
+++ b/React/Base/RCTBridge.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index da8e40b6c4314e..a84a966e361810 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBridge.h"
diff --git a/React/Base/RCTBridgeDelegate.h b/React/Base/RCTBridgeDelegate.h
index a5035b036998ef..b457e87dbc143c 100644
--- a/React/Base/RCTBridgeDelegate.h
+++ b/React/Base/RCTBridgeDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTJavaScriptLoader.h>
diff --git a/React/Base/RCTBridgeMethod.h b/React/Base/RCTBridgeMethod.h
index 8ffea53965c9e2..04202c6a5f0663 100644
--- a/React/Base/RCTBridgeMethod.h
+++ b/React/Base/RCTBridgeMethod.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTBridgeModule.h b/React/Base/RCTBridgeModule.h
index 25bff04134e40b..2f8887a58de644 100644
--- a/React/Base/RCTBridgeModule.h
+++ b/React/Base/RCTBridgeModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTBundleURLProvider.h b/React/Base/RCTBundleURLProvider.h
index 7a2562e415585e..234b7ebf4f5e2c 100644
--- a/React/Base/RCTBundleURLProvider.h
+++ b/React/Base/RCTBundleURLProvider.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTBundleURLProvider.m b/React/Base/RCTBundleURLProvider.m
index f6fb3ce8af29fe..53af54d93efff0 100644
--- a/React/Base/RCTBundleURLProvider.m
+++ b/React/Base/RCTBundleURLProvider.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBundleURLProvider.h"
diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h
index b3ef27cdb4cedf..a92927a68d013c 100644
--- a/React/Base/RCTConvert.h
+++ b/React/Base/RCTConvert.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <QuartzCore/QuartzCore.h>
diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
index f2410f60f7f21d..173c9047530491 100644
--- a/React/Base/RCTConvert.m
+++ b/React/Base/RCTConvert.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTConvert.h"
diff --git a/React/Base/RCTCxxConvert.h b/React/Base/RCTCxxConvert.h
index c7c063ffca3877..8519e774a79c3b 100644
--- a/React/Base/RCTCxxConvert.h
+++ b/React/Base/RCTCxxConvert.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTCxxConvert.m b/React/Base/RCTCxxConvert.m
index 5b65cdca72776c..458a1b90846863 100644
--- a/React/Base/RCTCxxConvert.m
+++ b/React/Base/RCTCxxConvert.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTCxxConvert.h"
diff --git a/React/Base/RCTDefines.h b/React/Base/RCTDefines.h
index 0124bf340561db..6956ec4df761b7 100644
--- a/React/Base/RCTDefines.h
+++ b/React/Base/RCTDefines.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #if __OBJC__
diff --git a/React/Base/RCTDisplayLink.h b/React/Base/RCTDisplayLink.h
index d4de929c050c39..e6d850ef83dc4c 100644
--- a/React/Base/RCTDisplayLink.h
+++ b/React/Base/RCTDisplayLink.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTDisplayLink.m b/React/Base/RCTDisplayLink.m
index a53d35701fc5ba..9a4df006f05b46 100644
--- a/React/Base/RCTDisplayLink.m
+++ b/React/Base/RCTDisplayLink.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDisplayLink.h"
diff --git a/React/Base/RCTErrorCustomizer.h b/React/Base/RCTErrorCustomizer.h
index 23c8b24d36ebf9..b7d9e391bd8a9e 100644
--- a/React/Base/RCTErrorCustomizer.h
+++ b/React/Base/RCTErrorCustomizer.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTErrorInfo.h b/React/Base/RCTErrorInfo.h
index aaa42221410411..aff6b208d23e49 100644
--- a/React/Base/RCTErrorInfo.h
+++ b/React/Base/RCTErrorInfo.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTErrorInfo.m b/React/Base/RCTErrorInfo.m
index 37e055fd56496c..f3a25560cdad77 100644
--- a/React/Base/RCTErrorInfo.m
+++ b/React/Base/RCTErrorInfo.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTErrorInfo.h"
diff --git a/React/Base/RCTEventDispatcher.h b/React/Base/RCTEventDispatcher.h
index c5e36e64506499..f91e66e218b47f 100644
--- a/React/Base/RCTEventDispatcher.h
+++ b/React/Base/RCTEventDispatcher.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTEventDispatcher.m b/React/Base/RCTEventDispatcher.m
index 239da26654306f..00ec08f2f95df7 100644
--- a/React/Base/RCTEventDispatcher.m
+++ b/React/Base/RCTEventDispatcher.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTEventDispatcher.h"
diff --git a/React/Base/RCTFrameUpdate.h b/React/Base/RCTFrameUpdate.h
index bbf4bb6c9be9ac..197aef68983757 100644
--- a/React/Base/RCTFrameUpdate.h
+++ b/React/Base/RCTFrameUpdate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTFrameUpdate.m b/React/Base/RCTFrameUpdate.m
index dbbcc4a32b23ec..a5dea324c559d9 100644
--- a/React/Base/RCTFrameUpdate.m
+++ b/React/Base/RCTFrameUpdate.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <QuartzCore/CADisplayLink.h>
diff --git a/React/Base/RCTImageSource.h b/React/Base/RCTImageSource.h
index ade263ae68a31d..81f184e3e0b2df 100644
--- a/React/Base/RCTImageSource.h
+++ b/React/Base/RCTImageSource.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTImageSource.m b/React/Base/RCTImageSource.m
index b474d9b1125341..feb2f5abd24fe4 100644
--- a/React/Base/RCTImageSource.m
+++ b/React/Base/RCTImageSource.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTImageSource.h"
diff --git a/React/Base/RCTInvalidating.h b/React/Base/RCTInvalidating.h
index 1c8cf7920ed87a..89b7162d7d58aa 100644
--- a/React/Base/RCTInvalidating.h
+++ b/React/Base/RCTInvalidating.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTJSCErrorHandling.h b/React/Base/RCTJSCErrorHandling.h
index 4e948fe200214e..cd3c11400c2f0a 100644
--- a/React/Base/RCTJSCErrorHandling.h
+++ b/React/Base/RCTJSCErrorHandling.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <JavaScriptCore/JavaScriptCore.h>
diff --git a/React/Base/RCTJSCErrorHandling.mm b/React/Base/RCTJSCErrorHandling.mm
index 3030c19b613e2d..ed0490d94766e3 100644
--- a/React/Base/RCTJSCErrorHandling.mm
+++ b/React/Base/RCTJSCErrorHandling.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTJSCErrorHandling.h"
diff --git a/React/Base/RCTJSStackFrame.h b/React/Base/RCTJSStackFrame.h
index 34c0fbe93b248e..3a4504c7ed75a0 100644
--- a/React/Base/RCTJSStackFrame.h
+++ b/React/Base/RCTJSStackFrame.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTJSStackFrame.m b/React/Base/RCTJSStackFrame.m
index 08aabec6e99216..60976f673ba542 100644
--- a/React/Base/RCTJSStackFrame.m
+++ b/React/Base/RCTJSStackFrame.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTJSStackFrame.h"
diff --git a/React/Base/RCTJavaScriptExecutor.h b/React/Base/RCTJavaScriptExecutor.h
index 24df68852fc433..b7c8f7421d9ac9 100644
--- a/React/Base/RCTJavaScriptExecutor.h
+++ b/React/Base/RCTJavaScriptExecutor.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <objc/runtime.h>
diff --git a/React/Base/RCTJavaScriptLoader.h b/React/Base/RCTJavaScriptLoader.h
index 641b1ce6f9b3de..17e88212021dca 100755
--- a/React/Base/RCTJavaScriptLoader.h
+++ b/React/Base/RCTJavaScriptLoader.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTJavaScriptLoader.mm b/React/Base/RCTJavaScriptLoader.mm
index 09fd6c089b8d5e..983555dbd1a4b2 100755
--- a/React/Base/RCTJavaScriptLoader.mm
+++ b/React/Base/RCTJavaScriptLoader.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTJavaScriptLoader.h"
diff --git a/React/Base/RCTKeyCommands.h b/React/Base/RCTKeyCommands.h
index d93485749e2ea8..111031ba64c018 100644
--- a/React/Base/RCTKeyCommands.h
+++ b/React/Base/RCTKeyCommands.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTKeyCommands.m b/React/Base/RCTKeyCommands.m
index 29ceb84f91d9e4..581e937433e793 100644
--- a/React/Base/RCTKeyCommands.m
+++ b/React/Base/RCTKeyCommands.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTKeyCommands.h"
diff --git a/React/Base/RCTLog.h b/React/Base/RCTLog.h
index 0c6e2a048482bb..9f9317da410c66 100644
--- a/React/Base/RCTLog.h
+++ b/React/Base/RCTLog.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTLog.mm b/React/Base/RCTLog.mm
index fd6c6b80d3f869..edb92fe0146879 100644
--- a/React/Base/RCTLog.mm
+++ b/React/Base/RCTLog.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTLog.h"
diff --git a/React/Base/RCTManagedPointer.h b/React/Base/RCTManagedPointer.h
index e084911230a4a8..5e7ef3a199f0bb 100644
--- a/React/Base/RCTManagedPointer.h
+++ b/React/Base/RCTManagedPointer.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #ifdef __cplusplus
diff --git a/React/Base/RCTManagedPointer.mm b/React/Base/RCTManagedPointer.mm
index a00a6a9820fb46..5cdb120f429f2d 100644
--- a/React/Base/RCTManagedPointer.mm
+++ b/React/Base/RCTManagedPointer.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTManagedPointer.h"
diff --git a/React/Base/RCTModuleData.h b/React/Base/RCTModuleData.h
index ad8523a74f8a11..14fa0a8ded7690 100644
--- a/React/Base/RCTModuleData.h
+++ b/React/Base/RCTModuleData.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTModuleData.mm b/React/Base/RCTModuleData.mm
index 54821f8a9a7dae..b248d51b728bb1 100644
--- a/React/Base/RCTModuleData.mm
+++ b/React/Base/RCTModuleData.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModuleData.h"
diff --git a/React/Base/RCTModuleMethod.h b/React/Base/RCTModuleMethod.h
index b9ef3f9ffa7485..1882e2259151ac 100644
--- a/React/Base/RCTModuleMethod.h
+++ b/React/Base/RCTModuleMethod.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTModuleMethod.mm b/React/Base/RCTModuleMethod.mm
index 9e1f534dc5f6b9..a8361482c4edcd 100644
--- a/React/Base/RCTModuleMethod.mm
+++ b/React/Base/RCTModuleMethod.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModuleMethod.h"
diff --git a/React/Base/RCTMultipartDataTask.h b/React/Base/RCTMultipartDataTask.h
index 25f559e3d524be..92967e2ae3ad65 100644
--- a/React/Base/RCTMultipartDataTask.h
+++ b/React/Base/RCTMultipartDataTask.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTMultipartDataTask.m b/React/Base/RCTMultipartDataTask.m
index 6ca63f3c4d8f16..c87a590fee70a4 100644
--- a/React/Base/RCTMultipartDataTask.m
+++ b/React/Base/RCTMultipartDataTask.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMultipartDataTask.h"
diff --git a/React/Base/RCTMultipartStreamReader.h b/React/Base/RCTMultipartStreamReader.h
index 30ffe5726d9ea8..7f7c6f95b27cd5 100644
--- a/React/Base/RCTMultipartStreamReader.h
+++ b/React/Base/RCTMultipartStreamReader.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTMultipartStreamReader.m b/React/Base/RCTMultipartStreamReader.m
index ad8c24c6dd1e75..53a16305a8d5a5 100644
--- a/React/Base/RCTMultipartStreamReader.m
+++ b/React/Base/RCTMultipartStreamReader.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMultipartStreamReader.h"
diff --git a/React/Base/RCTNullability.h b/React/Base/RCTNullability.h
index 6d250ee4702e9b..9994a075617653 100644
--- a/React/Base/RCTNullability.h
+++ b/React/Base/RCTNullability.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTParserUtils.h b/React/Base/RCTParserUtils.h
index 1dff0d5a858801..56945b34851004 100644
--- a/React/Base/RCTParserUtils.h
+++ b/React/Base/RCTParserUtils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTParserUtils.m b/React/Base/RCTParserUtils.m
index d70c4181b8e2a8..aa13b6344ac4cb 100644
--- a/React/Base/RCTParserUtils.m
+++ b/React/Base/RCTParserUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTParserUtils.h"
diff --git a/React/Base/RCTPerformanceLogger.h b/React/Base/RCTPerformanceLogger.h
index 7f82fc6956f741..92ede0c0c9d2b1 100644
--- a/React/Base/RCTPerformanceLogger.h
+++ b/React/Base/RCTPerformanceLogger.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTPerformanceLogger.m b/React/Base/RCTPerformanceLogger.m
index da1a2537df2c52..2427d7a8a64505 100644
--- a/React/Base/RCTPerformanceLogger.m
+++ b/React/Base/RCTPerformanceLogger.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <QuartzCore/QuartzCore.h>
diff --git a/React/Base/RCTPlatform.h b/React/Base/RCTPlatform.h
index 57b523414a2f00..5eae2a8c50c65d 100644
--- a/React/Base/RCTPlatform.h
+++ b/React/Base/RCTPlatform.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTPlatform.m b/React/Base/RCTPlatform.m
index 82a63167c23e82..8aed9fe386947f 100644
--- a/React/Base/RCTPlatform.m
+++ b/React/Base/RCTPlatform.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPlatform.h"
diff --git a/React/Base/RCTReloadCommand.h b/React/Base/RCTReloadCommand.h
index 352ffd17304599..d70492fe52e8b6 100644
--- a/React/Base/RCTReloadCommand.h
+++ b/React/Base/RCTReloadCommand.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTReloadCommand.m b/React/Base/RCTReloadCommand.m
index 8428511a9c4308..98c0f2f8da7244 100644
--- a/React/Base/RCTReloadCommand.m
+++ b/React/Base/RCTReloadCommand.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTReloadCommand.h"
diff --git a/React/Base/RCTRootContentView.h b/React/Base/RCTRootContentView.h
index f667085e7ae43e..28a0646cfed752 100644
--- a/React/Base/RCTRootContentView.h
+++ b/React/Base/RCTRootContentView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTRootContentView.m b/React/Base/RCTRootContentView.m
index 2bd63c9ebc40c8..9de3f78e095817 100644
--- a/React/Base/RCTRootContentView.m
+++ b/React/Base/RCTRootContentView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRootContentView.h"
diff --git a/React/Base/RCTRootView.h b/React/Base/RCTRootView.h
index bb4c9b7f59f319..9c04c822263625 100644
--- a/React/Base/RCTRootView.h
+++ b/React/Base/RCTRootView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTRootView.m b/React/Base/RCTRootView.m
index 6504097d426454..204dd5871be16b 100644
--- a/React/Base/RCTRootView.m
+++ b/React/Base/RCTRootView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRootView.h"
diff --git a/React/Base/RCTRootViewDelegate.h b/React/Base/RCTRootViewDelegate.h
index d5f6e4885e5d38..55630a2fa317c4 100644
--- a/React/Base/RCTRootViewDelegate.h
+++ b/React/Base/RCTRootViewDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTRootViewInternal.h b/React/Base/RCTRootViewInternal.h
index 1b3ff7bb7e81c9..93f7a88ef6bc51 100644
--- a/React/Base/RCTRootViewInternal.h
+++ b/React/Base/RCTRootViewInternal.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTRootView.h>
diff --git a/React/Base/RCTTVRemoteHandler.h b/React/Base/RCTTVRemoteHandler.h
index aedd9aefe0a93c..b220414a4bd5a4 100644
--- a/React/Base/RCTTVRemoteHandler.h
+++ b/React/Base/RCTTVRemoteHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTTVRemoteHandler.m b/React/Base/RCTTVRemoteHandler.m
index 8b39e8eddd2529..68d365c9166f93 100644
--- a/React/Base/RCTTVRemoteHandler.m
+++ b/React/Base/RCTTVRemoteHandler.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTVRemoteHandler.h"
diff --git a/React/Base/RCTTouchEvent.h b/React/Base/RCTTouchEvent.h
index 329f84df0a9364..2d259b15f28fff 100644
--- a/React/Base/RCTTouchEvent.h
+++ b/React/Base/RCTTouchEvent.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTTouchEvent.m b/React/Base/RCTTouchEvent.m
index 02e0b528378a0a..0f1fdc30552f32 100644
--- a/React/Base/RCTTouchEvent.m
+++ b/React/Base/RCTTouchEvent.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTouchEvent.h"
diff --git a/React/Base/RCTTouchHandler.h b/React/Base/RCTTouchHandler.h
index 6f2df0444c3705..a4c2cf3af5d20b 100644
--- a/React/Base/RCTTouchHandler.h
+++ b/React/Base/RCTTouchHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/RCTTouchHandler.m b/React/Base/RCTTouchHandler.m
index df4d2131178ada..00c5af9859162a 100644
--- a/React/Base/RCTTouchHandler.m
+++ b/React/Base/RCTTouchHandler.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTouchHandler.h"
diff --git a/React/Base/RCTURLRequestDelegate.h b/React/Base/RCTURLRequestDelegate.h
index f038d1d6a998a5..6bc7afcd3824ff 100644
--- a/React/Base/RCTURLRequestDelegate.h
+++ b/React/Base/RCTURLRequestDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/RCTURLRequestHandler.h b/React/Base/RCTURLRequestHandler.h
index 3cceb898394e86..acf0c2c489fc3d 100644
--- a/React/Base/RCTURLRequestHandler.h
+++ b/React/Base/RCTURLRequestHandler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/React/Base/RCTUtils.h b/React/Base/RCTUtils.h
index 6a3e0c08dfe9d4..910953f5b18acf 100644
--- a/React/Base/RCTUtils.h
+++ b/React/Base/RCTUtils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <tgmath.h>
diff --git a/React/Base/RCTUtils.m b/React/Base/RCTUtils.m
index e1610a6f40ee9c..22c426addcab0b 100644
--- a/React/Base/RCTUtils.m
+++ b/React/Base/RCTUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUtils.h"
diff --git a/React/Base/RCTVersion.h b/React/Base/RCTVersion.h
index c741022e5b8537..f224a341af3eaa 100644
--- a/React/Base/RCTVersion.h
+++ b/React/Base/RCTVersion.h
@@ -2,11 +2,9 @@
  * @generated by scripts/bump-oss-version.js
  *
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #define RCT_REACT_NATIVE_VERSION @{ \
diff --git a/React/Base/Surface/RCTSurface.h b/React/Base/Surface/RCTSurface.h
index 44a53f6569cba5..66f5cabbc535c2 100644
--- a/React/Base/Surface/RCTSurface.h
+++ b/React/Base/Surface/RCTSurface.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
index 2c5b55cd176429..80d04b363e1f6f 100644
--- a/React/Base/Surface/RCTSurface.mm
+++ b/React/Base/Surface/RCTSurface.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurface.h"
diff --git a/React/Base/Surface/RCTSurfaceDelegate.h b/React/Base/Surface/RCTSurfaceDelegate.h
index 5455320feb57af..adfea477bf6cf7 100644
--- a/React/Base/Surface/RCTSurfaceDelegate.h
+++ b/React/Base/Surface/RCTSurfaceDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.h b/React/Base/Surface/RCTSurfaceRootShadowView.h
index e3ff17506c814a..09a9015996f2c4 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.h
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.m b/React/Base/Surface/RCTSurfaceRootShadowView.m
index fb4d28deb983ae..a0765583b3fa79 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.m
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceRootShadowView.h"
diff --git a/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h b/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h
index 1cfa6aecbcd587..bfc38f4ba9435a 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h
+++ b/React/Base/Surface/RCTSurfaceRootShadowViewDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/RCTSurfaceRootView.h b/React/Base/Surface/RCTSurfaceRootView.h
index 927563a51f9718..0d8a8fd1e7df50 100644
--- a/React/Base/Surface/RCTSurfaceRootView.h
+++ b/React/Base/Surface/RCTSurfaceRootView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/RCTSurfaceRootView.mm b/React/Base/Surface/RCTSurfaceRootView.mm
index 5888b18867a6c8..25f67d5f267d4f 100644
--- a/React/Base/Surface/RCTSurfaceRootView.mm
+++ b/React/Base/Surface/RCTSurfaceRootView.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceRootView.h"
diff --git a/React/Base/Surface/RCTSurfaceStage.h b/React/Base/Surface/RCTSurfaceStage.h
index 8021ba7fc73329..08fd6663d2cc0d 100644
--- a/React/Base/Surface/RCTSurfaceStage.h
+++ b/React/Base/Surface/RCTSurfaceStage.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/RCTSurfaceStage.m b/React/Base/Surface/RCTSurfaceStage.m
index 322185be42e0c1..bf1234fa9017ab 100644
--- a/React/Base/Surface/RCTSurfaceStage.m
+++ b/React/Base/Surface/RCTSurfaceStage.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceStage.h"
diff --git a/React/Base/Surface/RCTSurfaceView+Internal.h b/React/Base/Surface/RCTSurfaceView+Internal.h
index b41bd3a34a2fe5..512bf3fb88c4f6 100644
--- a/React/Base/Surface/RCTSurfaceView+Internal.h
+++ b/React/Base/Surface/RCTSurfaceView+Internal.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/RCTSurfaceView.h b/React/Base/Surface/RCTSurfaceView.h
index 030cdcf4371316..eff7051045df6d 100644
--- a/React/Base/Surface/RCTSurfaceView.h
+++ b/React/Base/Surface/RCTSurfaceView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/RCTSurfaceView.mm b/React/Base/Surface/RCTSurfaceView.mm
index b062c1aff6b870..0c78f54eaa4b74 100644
--- a/React/Base/Surface/RCTSurfaceView.mm
+++ b/React/Base/Surface/RCTSurfaceView.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceView.h"
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
index 48c91eba554220..340a7c33b1987d 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
index 68fbb40e258f00..3fd9048d128828 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSurfaceHostingView.h"
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h
index 37831e4e273761..d463d36d091aff 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm
index 22cada768fcd03..5d1689b1b369a9 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/CxxBridge/NSDataBigString.h b/React/CxxBridge/NSDataBigString.h
index 8e24bdf821ae5b..c11d26efa92bf7 100644
--- a/React/CxxBridge/NSDataBigString.h
+++ b/React/CxxBridge/NSDataBigString.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/CxxBridge/NSDataBigString.mm b/React/CxxBridge/NSDataBigString.mm
index a295b51c255069..bea45458cdeeb1 100644
--- a/React/CxxBridge/NSDataBigString.mm
+++ b/React/CxxBridge/NSDataBigString.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "NSDataBigString.h"
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 4c958b83b54f2f..1da12b8a217e3a 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <atomic>
diff --git a/React/CxxBridge/RCTCxxBridgeDelegate.h b/React/CxxBridge/RCTCxxBridgeDelegate.h
index 9c24ee21611fe9..cbb56b75a85121 100644
--- a/React/CxxBridge/RCTCxxBridgeDelegate.h
+++ b/React/CxxBridge/RCTCxxBridgeDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <memory>
diff --git a/React/CxxBridge/RCTJSCHelpers.h b/React/CxxBridge/RCTJSCHelpers.h
index 3c3775b31c8acd..38eb26a1dad137 100644
--- a/React/CxxBridge/RCTJSCHelpers.h
+++ b/React/CxxBridge/RCTJSCHelpers.h
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/React/CxxBridge/RCTJSCHelpers.mm b/React/CxxBridge/RCTJSCHelpers.mm
index 39948820853aa3..760c50022aa176 100644
--- a/React/CxxBridge/RCTJSCHelpers.mm
+++ b/React/CxxBridge/RCTJSCHelpers.mm
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTJSCHelpers.h"
diff --git a/React/CxxBridge/RCTMessageThread.h b/React/CxxBridge/RCTMessageThread.h
index e4b83912e4d3ab..d87bb5256f94b7 100644
--- a/React/CxxBridge/RCTMessageThread.h
+++ b/React/CxxBridge/RCTMessageThread.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <string>
diff --git a/React/CxxBridge/RCTMessageThread.mm b/React/CxxBridge/RCTMessageThread.mm
index e3b85ff90c80e4..a1214051db35da 100644
--- a/React/CxxBridge/RCTMessageThread.mm
+++ b/React/CxxBridge/RCTMessageThread.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTMessageThread.h"
diff --git a/React/CxxBridge/RCTObjcExecutor.h b/React/CxxBridge/RCTObjcExecutor.h
index 89cad3cbbf4af4..08a6f922215867 100644
--- a/React/CxxBridge/RCTObjcExecutor.h
+++ b/React/CxxBridge/RCTObjcExecutor.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <functional>
diff --git a/React/CxxBridge/RCTObjcExecutor.mm b/React/CxxBridge/RCTObjcExecutor.mm
index 94c07178969b1b..d6445e9c27dc6a 100644
--- a/React/CxxBridge/RCTObjcExecutor.mm
+++ b/React/CxxBridge/RCTObjcExecutor.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTObjcExecutor.h"
diff --git a/React/CxxModule/DispatchMessageQueueThread.h b/React/CxxModule/DispatchMessageQueueThread.h
index 2877f5800bf6bc..4c8be7b502c675 100644
--- a/React/CxxModule/DispatchMessageQueueThread.h
+++ b/React/CxxModule/DispatchMessageQueueThread.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <React/RCTLog.h>
diff --git a/React/CxxModule/RCTCxxMethod.h b/React/CxxModule/RCTCxxMethod.h
index 85fc2e050a32dd..3d0d6aa9587e6c 100644
--- a/React/CxxModule/RCTCxxMethod.h
+++ b/React/CxxModule/RCTCxxMethod.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/CxxModule/RCTCxxMethod.mm b/React/CxxModule/RCTCxxMethod.mm
index 222c487986f52a..82ee01dce771cb 100644
--- a/React/CxxModule/RCTCxxMethod.mm
+++ b/React/CxxModule/RCTCxxMethod.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTCxxMethod.h"
diff --git a/React/CxxModule/RCTCxxModule.h b/React/CxxModule/RCTCxxModule.h
index 6df9836834a444..7bce985a57b9e2 100644
--- a/React/CxxModule/RCTCxxModule.h
+++ b/React/CxxModule/RCTCxxModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <memory>
diff --git a/React/CxxModule/RCTCxxModule.mm b/React/CxxModule/RCTCxxModule.mm
index 295aac82c257f1..98cd09860cec05 100644
--- a/React/CxxModule/RCTCxxModule.mm
+++ b/React/CxxModule/RCTCxxModule.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTCxxModule.h"
diff --git a/React/CxxModule/RCTCxxUtils.h b/React/CxxModule/RCTCxxUtils.h
index 7c1a6b21231ed1..5e38a8a3a8e5c7 100644
--- a/React/CxxModule/RCTCxxUtils.h
+++ b/React/CxxModule/RCTCxxUtils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <memory>
diff --git a/React/CxxModule/RCTCxxUtils.mm b/React/CxxModule/RCTCxxUtils.mm
index 053f45c0d8f959..2bc43a37c9710e 100644
--- a/React/CxxModule/RCTCxxUtils.mm
+++ b/React/CxxModule/RCTCxxUtils.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTCxxUtils.h"
diff --git a/React/CxxModule/RCTNativeModule.h b/React/CxxModule/RCTNativeModule.h
index 072c5ca2150b06..76e9e406575396 100644
--- a/React/CxxModule/RCTNativeModule.h
+++ b/React/CxxModule/RCTNativeModule.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTModuleData.h>
diff --git a/React/CxxModule/RCTNativeModule.mm b/React/CxxModule/RCTNativeModule.mm
index 25e62cb330c7f2..077b729789d29b 100644
--- a/React/CxxModule/RCTNativeModule.mm
+++ b/React/CxxModule/RCTNativeModule.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNativeModule.h"
diff --git a/React/CxxUtils/RCTFollyConvert.h b/React/CxxUtils/RCTFollyConvert.h
index c5a16f20cd5eac..589b688da8d9a6 100644
--- a/React/CxxUtils/RCTFollyConvert.h
+++ b/React/CxxUtils/RCTFollyConvert.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/CxxUtils/RCTFollyConvert.mm b/React/CxxUtils/RCTFollyConvert.mm
index 0a728047e0bae0..0c6e08bb568939 100644
--- a/React/CxxUtils/RCTFollyConvert.mm
+++ b/React/CxxUtils/RCTFollyConvert.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTFollyConvert.h"
diff --git a/React/DevSupport/RCTDevLoadingView.h b/React/DevSupport/RCTDevLoadingView.h
index e8fed7ffecf60f..dae01f04577142 100644
--- a/React/DevSupport/RCTDevLoadingView.h
+++ b/React/DevSupport/RCTDevLoadingView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/React/DevSupport/RCTDevLoadingView.m b/React/DevSupport/RCTDevLoadingView.m
index 0b921374d80fa8..e7614a896489f4 100644
--- a/React/DevSupport/RCTDevLoadingView.m
+++ b/React/DevSupport/RCTDevLoadingView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDevLoadingView.h"
diff --git a/React/DevSupport/RCTDevMenu.h b/React/DevSupport/RCTDevMenu.h
index c02f9c92e32d67..cd60f87e108be8 100644
--- a/React/DevSupport/RCTDevMenu.h
+++ b/React/DevSupport/RCTDevMenu.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/DevSupport/RCTDevMenu.m b/React/DevSupport/RCTDevMenu.m
index 58b337ff384768..24b2f47e5127a9 100644
--- a/React/DevSupport/RCTDevMenu.m
+++ b/React/DevSupport/RCTDevMenu.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDevMenu.h"
diff --git a/React/DevSupport/RCTPackagerClient.h b/React/DevSupport/RCTPackagerClient.h
index 3b5e38c8766d3d..fb8e8961afffa3 100644
--- a/React/DevSupport/RCTPackagerClient.h
+++ b/React/DevSupport/RCTPackagerClient.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTDefines.h>
diff --git a/React/DevSupport/RCTPackagerClient.m b/React/DevSupport/RCTPackagerClient.m
index e0befe33da8395..a15c01fbe5f3da 100644
--- a/React/DevSupport/RCTPackagerClient.m
+++ b/React/DevSupport/RCTPackagerClient.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPackagerClient.h"
diff --git a/React/DevSupport/RCTPackagerConnection.h b/React/DevSupport/RCTPackagerConnection.h
index 155dd45153aba6..ed3f464b6bdfff 100644
--- a/React/DevSupport/RCTPackagerConnection.h
+++ b/React/DevSupport/RCTPackagerConnection.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/DevSupport/RCTPackagerConnection.mm b/React/DevSupport/RCTPackagerConnection.mm
index 572c14faa25849..10fbca844e3fd0 100644
--- a/React/DevSupport/RCTPackagerConnection.mm
+++ b/React/DevSupport/RCTPackagerConnection.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPackagerConnection.h"
diff --git a/React/Fabric/RCTFabricUIManager.h b/React/Fabric/RCTFabricUIManager.h
index 4a22c96144bb23..371ac19ba6984c 100644
--- a/React/Fabric/RCTFabricUIManager.h
+++ b/React/Fabric/RCTFabricUIManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Fabric/RCTFabricUIManager.mm b/React/Fabric/RCTFabricUIManager.mm
index 2aca771d324739..88fb08e6025151 100644
--- a/React/Fabric/RCTFabricUIManager.mm
+++ b/React/Fabric/RCTFabricUIManager.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTFabricUIManager.h"
diff --git a/React/Modules/RCTAccessibilityManager.h b/React/Modules/RCTAccessibilityManager.h
index 6884894dcccfa0..0e153afbfb7e0e 100644
--- a/React/Modules/RCTAccessibilityManager.h
+++ b/React/Modules/RCTAccessibilityManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTAccessibilityManager.m b/React/Modules/RCTAccessibilityManager.m
index 6434becff7c242..e79fc4232eebb0 100644
--- a/React/Modules/RCTAccessibilityManager.m
+++ b/React/Modules/RCTAccessibilityManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAccessibilityManager.h"
diff --git a/React/Modules/RCTAlertManager.h b/React/Modules/RCTAlertManager.h
index e576329185f60f..7999dd1c09a320 100644
--- a/React/Modules/RCTAlertManager.h
+++ b/React/Modules/RCTAlertManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTAlertManager.m b/React/Modules/RCTAlertManager.m
index c5129af50664ab..b92f915c11373e 100644
--- a/React/Modules/RCTAlertManager.m
+++ b/React/Modules/RCTAlertManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAlertManager.h"
diff --git a/React/Modules/RCTAppState.h b/React/Modules/RCTAppState.h
index 225b14d030bb79..7d56cab63ab34e 100644
--- a/React/Modules/RCTAppState.h
+++ b/React/Modules/RCTAppState.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventEmitter.h>
diff --git a/React/Modules/RCTAppState.m b/React/Modules/RCTAppState.m
index 9c6d59a19cb715..686e5ab42f5be6 100644
--- a/React/Modules/RCTAppState.m
+++ b/React/Modules/RCTAppState.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAppState.h"
diff --git a/React/Modules/RCTAsyncLocalStorage.h b/React/Modules/RCTAsyncLocalStorage.h
index cbb8cb42bed406..446a54f76218ba 100644
--- a/React/Modules/RCTAsyncLocalStorage.h
+++ b/React/Modules/RCTAsyncLocalStorage.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/React/Modules/RCTAsyncLocalStorage.m b/React/Modules/RCTAsyncLocalStorage.m
index 1064e04f2f8f12..c33ddb25d4a957 100644
--- a/React/Modules/RCTAsyncLocalStorage.m
+++ b/React/Modules/RCTAsyncLocalStorage.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAsyncLocalStorage.h"
diff --git a/React/Modules/RCTClipboard.h b/React/Modules/RCTClipboard.h
index 45ff6e32bf8652..317716816291fb 100644
--- a/React/Modules/RCTClipboard.h
+++ b/React/Modules/RCTClipboard.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/React/Modules/RCTClipboard.m b/React/Modules/RCTClipboard.m
index 8115f5e522c1ff..e624904d7d1059 100644
--- a/React/Modules/RCTClipboard.m
+++ b/React/Modules/RCTClipboard.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTClipboard.h"
diff --git a/React/Modules/RCTDevSettings.h b/React/Modules/RCTDevSettings.h
index e4aa72a065be2a..bdf30324aeb877 100644
--- a/React/Modules/RCTDevSettings.h
+++ b/React/Modules/RCTDevSettings.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridge.h>
diff --git a/React/Modules/RCTDevSettings.mm b/React/Modules/RCTDevSettings.mm
index 7de283c510c318..db61029d8ae892 100644
--- a/React/Modules/RCTDevSettings.mm
+++ b/React/Modules/RCTDevSettings.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDevSettings.h"
diff --git a/React/Modules/RCTDeviceInfo.h b/React/Modules/RCTDeviceInfo.h
index 2ff2ad965d5a08..a21750e7cd4b2a 100644
--- a/React/Modules/RCTDeviceInfo.h
+++ b/React/Modules/RCTDeviceInfo.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTDeviceInfo.m b/React/Modules/RCTDeviceInfo.m
index 6eb028d9bf256e..20e53d55af611f 100644
--- a/React/Modules/RCTDeviceInfo.m
+++ b/React/Modules/RCTDeviceInfo.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDeviceInfo.h"
diff --git a/React/Modules/RCTEventEmitter.h b/React/Modules/RCTEventEmitter.h
index 489b2503962831..3192d473cf07aa 100644
--- a/React/Modules/RCTEventEmitter.h
+++ b/React/Modules/RCTEventEmitter.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridge.h>
diff --git a/React/Modules/RCTEventEmitter.m b/React/Modules/RCTEventEmitter.m
index 4550e2d57eae5e..1b4478566d4776 100644
--- a/React/Modules/RCTEventEmitter.m
+++ b/React/Modules/RCTEventEmitter.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTEventEmitter.h"
diff --git a/React/Modules/RCTExceptionsManager.h b/React/Modules/RCTExceptionsManager.h
index 393d591b2b3824..57e81fb9e4905d 100644
--- a/React/Modules/RCTExceptionsManager.h
+++ b/React/Modules/RCTExceptionsManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTExceptionsManager.m b/React/Modules/RCTExceptionsManager.m
index 3bb2a1d66f92a9..192675bf39af1c 100644
--- a/React/Modules/RCTExceptionsManager.m
+++ b/React/Modules/RCTExceptionsManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTExceptionsManager.h"
diff --git a/React/Modules/RCTI18nManager.h b/React/Modules/RCTI18nManager.h
index d246249577df8d..c99a3b1ac56bcf 100644
--- a/React/Modules/RCTI18nManager.h
+++ b/React/Modules/RCTI18nManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTBridgeModule.h>
diff --git a/React/Modules/RCTI18nManager.m b/React/Modules/RCTI18nManager.m
index 72e2ae3a29d1de..4059ea5d85aa70 100644
--- a/React/Modules/RCTI18nManager.m
+++ b/React/Modules/RCTI18nManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTI18nManager.h"
diff --git a/React/Modules/RCTI18nUtil.h b/React/Modules/RCTI18nUtil.h
index 8157f4192ea22f..967e90d4c9089d 100644
--- a/React/Modules/RCTI18nUtil.h
+++ b/React/Modules/RCTI18nUtil.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTI18nUtil.m b/React/Modules/RCTI18nUtil.m
index 9a6eb3b1f06598..183b4c4987d7c3 100644
--- a/React/Modules/RCTI18nUtil.m
+++ b/React/Modules/RCTI18nUtil.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTJSCSamplingProfiler.h b/React/Modules/RCTJSCSamplingProfiler.h
index b1f1d559e7c11f..8facaa674c6ad2 100644
--- a/React/Modules/RCTJSCSamplingProfiler.h
+++ b/React/Modules/RCTJSCSamplingProfiler.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTJSCSamplingProfiler.m b/React/Modules/RCTJSCSamplingProfiler.m
index 651fb27ab7a941..1d06e053829591 100644
--- a/React/Modules/RCTJSCSamplingProfiler.m
+++ b/React/Modules/RCTJSCSamplingProfiler.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTJSCSamplingProfiler.h"
diff --git a/React/Modules/RCTKeyboardObserver.h b/React/Modules/RCTKeyboardObserver.h
index 5ae5637e35f4bf..891e174225e20f 100644
--- a/React/Modules/RCTKeyboardObserver.h
+++ b/React/Modules/RCTKeyboardObserver.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTEventEmitter.h>
diff --git a/React/Modules/RCTKeyboardObserver.m b/React/Modules/RCTKeyboardObserver.m
index 5909e09afacad6..bef74f7fefdf62 100644
--- a/React/Modules/RCTKeyboardObserver.m
+++ b/React/Modules/RCTKeyboardObserver.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTKeyboardObserver.h"
diff --git a/React/Modules/RCTLayoutAnimation.h b/React/Modules/RCTLayoutAnimation.h
index b1cdb782f81ee2..04f966f4d03e3b 100644
--- a/React/Modules/RCTLayoutAnimation.h
+++ b/React/Modules/RCTLayoutAnimation.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTLayoutAnimation.m b/React/Modules/RCTLayoutAnimation.m
index 4d5bf29c47c125..9834103feb5083 100644
--- a/React/Modules/RCTLayoutAnimation.m
+++ b/React/Modules/RCTLayoutAnimation.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTLayoutAnimation.h"
diff --git a/React/Modules/RCTLayoutAnimationGroup.h b/React/Modules/RCTLayoutAnimationGroup.h
index 651e28727623bd..5b4635af718f50 100644
--- a/React/Modules/RCTLayoutAnimationGroup.h
+++ b/React/Modules/RCTLayoutAnimationGroup.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTLayoutAnimationGroup.m b/React/Modules/RCTLayoutAnimationGroup.m
index c85b25f9444309..73db8b68c6b133 100644
--- a/React/Modules/RCTLayoutAnimationGroup.m
+++ b/React/Modules/RCTLayoutAnimationGroup.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTLayoutAnimationGroup.h"
diff --git a/React/Modules/RCTRedBox.h b/React/Modules/RCTRedBox.h
index db72279cca1260..29ed3958cefa9f 100644
--- a/React/Modules/RCTRedBox.h
+++ b/React/Modules/RCTRedBox.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTRedBox.m b/React/Modules/RCTRedBox.m
index 71728640d1fa39..0cbd1fc5aced9a 100644
--- a/React/Modules/RCTRedBox.m
+++ b/React/Modules/RCTRedBox.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRedBox.h"
diff --git a/React/Modules/RCTRedBoxExtraDataViewController.h b/React/Modules/RCTRedBoxExtraDataViewController.h
index 484547814476e7..17575a15aca103 100644
--- a/React/Modules/RCTRedBoxExtraDataViewController.h
+++ b/React/Modules/RCTRedBoxExtraDataViewController.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTRedBoxExtraDataViewController.m b/React/Modules/RCTRedBoxExtraDataViewController.m
index 6011bf95873f86..94d371249b9b2e 100644
--- a/React/Modules/RCTRedBoxExtraDataViewController.m
+++ b/React/Modules/RCTRedBoxExtraDataViewController.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRedBoxExtraDataViewController.h"
diff --git a/React/Modules/RCTSourceCode.h b/React/Modules/RCTSourceCode.h
index 29218749fd6487..f0f60cc0d951ad 100644
--- a/React/Modules/RCTSourceCode.h
+++ b/React/Modules/RCTSourceCode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTSourceCode.m b/React/Modules/RCTSourceCode.m
index 4be46582a8b647..1886476bd7552d 100644
--- a/React/Modules/RCTSourceCode.m
+++ b/React/Modules/RCTSourceCode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSourceCode.h"
diff --git a/React/Modules/RCTStatusBarManager.h b/React/Modules/RCTStatusBarManager.h
index 6960da5ec68576..237d3518f0259a 100644
--- a/React/Modules/RCTStatusBarManager.h
+++ b/React/Modules/RCTStatusBarManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTStatusBarManager.m b/React/Modules/RCTStatusBarManager.m
index 82a4fd9f9965d5..18bd5b0a66cd0b 100644
--- a/React/Modules/RCTStatusBarManager.m
+++ b/React/Modules/RCTStatusBarManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTStatusBarManager.h"
diff --git a/React/Modules/RCTTVNavigationEventEmitter.h b/React/Modules/RCTTVNavigationEventEmitter.h
index 5a162effe0cdf5..05b19f1b6f7844 100644
--- a/React/Modules/RCTTVNavigationEventEmitter.h
+++ b/React/Modules/RCTTVNavigationEventEmitter.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTEventEmitter.h"
diff --git a/React/Modules/RCTTVNavigationEventEmitter.m b/React/Modules/RCTTVNavigationEventEmitter.m
index bbc42e14f4c55c..7d6774b012ddbe 100644
--- a/React/Modules/RCTTVNavigationEventEmitter.m
+++ b/React/Modules/RCTTVNavigationEventEmitter.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTVNavigationEventEmitter.h"
diff --git a/React/Modules/RCTTiming.h b/React/Modules/RCTTiming.h
index 0ccb48ace3fe89..b126dca18d5e5b 100644
--- a/React/Modules/RCTTiming.h
+++ b/React/Modules/RCTTiming.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTTiming.m b/React/Modules/RCTTiming.m
index b04c5e5cfa7f9d..d1dafdc11c9d44 100644
--- a/React/Modules/RCTTiming.m
+++ b/React/Modules/RCTTiming.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTiming.h"
diff --git a/React/Modules/RCTUIManager.h b/React/Modules/RCTUIManager.h
index 1c8a12a5a44510..05308fcfc8bcc4 100644
--- a/React/Modules/RCTUIManager.h
+++ b/React/Modules/RCTUIManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index ded51a99378786..eea58fcb22b1cd 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUIManager.h"
diff --git a/React/Modules/RCTUIManagerObserverCoordinator.h b/React/Modules/RCTUIManagerObserverCoordinator.h
index ea07f796f9488c..83478b60268ab3 100644
--- a/React/Modules/RCTUIManagerObserverCoordinator.h
+++ b/React/Modules/RCTUIManagerObserverCoordinator.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Modules/RCTUIManagerObserverCoordinator.mm b/React/Modules/RCTUIManagerObserverCoordinator.mm
index 86d68c73c6ce35..90e0255c930909 100644
--- a/React/Modules/RCTUIManagerObserverCoordinator.mm
+++ b/React/Modules/RCTUIManagerObserverCoordinator.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUIManagerObserverCoordinator.h"
diff --git a/React/Modules/RCTUIManagerUtils.h b/React/Modules/RCTUIManagerUtils.h
index 5858255f2c3f79..c063ab8f51ec7c 100644
--- a/React/Modules/RCTUIManagerUtils.h
+++ b/React/Modules/RCTUIManagerUtils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Modules/RCTUIManagerUtils.m b/React/Modules/RCTUIManagerUtils.m
index b6c79baa8912dd..a62445650c4625 100644
--- a/React/Modules/RCTUIManagerUtils.m
+++ b/React/Modules/RCTUIManagerUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUIManagerUtils.h"
diff --git a/React/Profiler/RCTFPSGraph.h b/React/Profiler/RCTFPSGraph.h
index 7179cb9cb57d36..a71ac9ab33f400 100644
--- a/React/Profiler/RCTFPSGraph.h
+++ b/React/Profiler/RCTFPSGraph.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Profiler/RCTFPSGraph.m b/React/Profiler/RCTFPSGraph.m
index 0b1d1e5ed85ea7..6b22ef349f4c61 100644
--- a/React/Profiler/RCTFPSGraph.m
+++ b/React/Profiler/RCTFPSGraph.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTFPSGraph.h"
diff --git a/React/Profiler/RCTMacros.h b/React/Profiler/RCTMacros.h
index 0df0ba62aeb90c..ea4c5f40e8c521 100644
--- a/React/Profiler/RCTMacros.h
+++ b/React/Profiler/RCTMacros.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #define _CONCAT(A, B) A##B
diff --git a/React/Profiler/RCTPerfMonitor.m b/React/Profiler/RCTPerfMonitor.m
index 9751935aeabd7d..768142437b0bd5 100644
--- a/React/Profiler/RCTPerfMonitor.m
+++ b/React/Profiler/RCTPerfMonitor.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDefines.h"
diff --git a/React/Profiler/RCTProfile.h b/React/Profiler/RCTProfile.h
index b0ab6cd8127198..88ff3d41f32ff4 100644
--- a/React/Profiler/RCTProfile.h
+++ b/React/Profiler/RCTProfile.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m
index 1c94a3b6709526..3b255505800c1f 100644
--- a/React/Profiler/RCTProfile.m
+++ b/React/Profiler/RCTProfile.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTProfile.h"
diff --git a/React/Profiler/RCTProfileTrampoline-arm.S b/React/Profiler/RCTProfileTrampoline-arm.S
index aa622bbd0d7c6b..d4061fed883199 100644
--- a/React/Profiler/RCTProfileTrampoline-arm.S
+++ b/React/Profiler/RCTProfileTrampoline-arm.S
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTDefines.h"
diff --git a/React/Profiler/RCTProfileTrampoline-arm64.S b/React/Profiler/RCTProfileTrampoline-arm64.S
index e513696870551e..af4733b5bf6331 100644
--- a/React/Profiler/RCTProfileTrampoline-arm64.S
+++ b/React/Profiler/RCTProfileTrampoline-arm64.S
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTDefines.h"
diff --git a/React/Profiler/RCTProfileTrampoline-i386.S b/React/Profiler/RCTProfileTrampoline-i386.S
index d1adf1a0898ecd..a33e8a21f2c752 100644
--- a/React/Profiler/RCTProfileTrampoline-i386.S
+++ b/React/Profiler/RCTProfileTrampoline-i386.S
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTDefines.h"
diff --git a/React/Profiler/RCTProfileTrampoline-x86_64.S b/React/Profiler/RCTProfileTrampoline-x86_64.S
index 21072d84241906..d687214193adce 100644
--- a/React/Profiler/RCTProfileTrampoline-x86_64.S
+++ b/React/Profiler/RCTProfileTrampoline-x86_64.S
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "RCTDefines.h"
diff --git a/React/UIUtils/RCTUIUtils.h b/React/UIUtils/RCTUIUtils.h
index 5f6f0e02228969..02e57abaf023b6 100644
--- a/React/UIUtils/RCTUIUtils.h
+++ b/React/UIUtils/RCTUIUtils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreGraphics/CoreGraphics.h>
diff --git a/React/UIUtils/RCTUIUtils.m b/React/UIUtils/RCTUIUtils.m
index ad9d44dd474169..17d8a8567278cb 100644
--- a/React/UIUtils/RCTUIUtils.m
+++ b/React/UIUtils/RCTUIUtils.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTUIUtils.h"
diff --git a/React/Views/RCTActivityIndicatorView.h b/React/Views/RCTActivityIndicatorView.h
index ae802a448efb42..580ae77816dc27 100644
--- a/React/Views/RCTActivityIndicatorView.h
+++ b/React/Views/RCTActivityIndicatorView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTActivityIndicatorView.m b/React/Views/RCTActivityIndicatorView.m
index 29ce6dbc3fa990..1fa29d15111b5b 100644
--- a/React/Views/RCTActivityIndicatorView.m
+++ b/React/Views/RCTActivityIndicatorView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTActivityIndicatorView.h"
diff --git a/React/Views/RCTActivityIndicatorViewManager.h b/React/Views/RCTActivityIndicatorViewManager.h
index 67bc20984feaa0..9871a9d7d67be4 100644
--- a/React/Views/RCTActivityIndicatorViewManager.h
+++ b/React/Views/RCTActivityIndicatorViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTActivityIndicatorViewManager.m b/React/Views/RCTActivityIndicatorViewManager.m
index c28b86983b3c22..2ba37a2288e8a7 100644
--- a/React/Views/RCTActivityIndicatorViewManager.m
+++ b/React/Views/RCTActivityIndicatorViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTActivityIndicatorViewManager.h"
diff --git a/React/Views/RCTAnimationType.h b/React/Views/RCTAnimationType.h
index 0f2703ea6b3295..fb3ddc3c83c8d0 100644
--- a/React/Views/RCTAnimationType.h
+++ b/React/Views/RCTAnimationType.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTAutoInsetsProtocol.h b/React/Views/RCTAutoInsetsProtocol.h
index 8e7c72c8054adc..934f4702ae8ced 100644
--- a/React/Views/RCTAutoInsetsProtocol.h
+++ b/React/Views/RCTAutoInsetsProtocol.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTBorderDrawing.h b/React/Views/RCTBorderDrawing.h
index 3835359da7c147..089f92fa01ca23 100644
--- a/React/Views/RCTBorderDrawing.h
+++ b/React/Views/RCTBorderDrawing.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTBorderDrawing.m b/React/Views/RCTBorderDrawing.m
index ec85e92c4d68ec..7674f1d154f8ef 100644
--- a/React/Views/RCTBorderDrawing.m
+++ b/React/Views/RCTBorderDrawing.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTBorderDrawing.h"
diff --git a/React/Views/RCTBorderStyle.h b/React/Views/RCTBorderStyle.h
index 470d832314b711..c3d7acdfbe4cea 100644
--- a/React/Views/RCTBorderStyle.h
+++ b/React/Views/RCTBorderStyle.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTComponent.h b/React/Views/RCTComponent.h
index 499bd9e0e48a78..639c220dca0534 100644
--- a/React/Views/RCTComponent.h
+++ b/React/Views/RCTComponent.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreGraphics/CoreGraphics.h>
diff --git a/React/Views/RCTComponentData.h b/React/Views/RCTComponentData.h
index 633fd7139d27bc..f2080992bc4a6e 100644
--- a/React/Views/RCTComponentData.h
+++ b/React/Views/RCTComponentData.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTComponentData.m b/React/Views/RCTComponentData.m
index 976d9fb2054cf6..06bfdbaf2c2501 100644
--- a/React/Views/RCTComponentData.m
+++ b/React/Views/RCTComponentData.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTComponentData.h"
diff --git a/React/Views/RCTConvert+CoreLocation.h b/React/Views/RCTConvert+CoreLocation.h
index 7191e384a92e3e..bfe61029ebc723 100644
--- a/React/Views/RCTConvert+CoreLocation.h
+++ b/React/Views/RCTConvert+CoreLocation.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <CoreLocation/CoreLocation.h>
diff --git a/React/Views/RCTConvert+CoreLocation.m b/React/Views/RCTConvert+CoreLocation.m
index 505a6aba3f3368..67607b1520db94 100644
--- a/React/Views/RCTConvert+CoreLocation.m
+++ b/React/Views/RCTConvert+CoreLocation.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTConvert+CoreLocation.h"
diff --git a/React/Views/RCTConvert+Transform.h b/React/Views/RCTConvert+Transform.h
index 29c65823bcb26c..c07fac3c159970 100644
--- a/React/Views/RCTConvert+Transform.h
+++ b/React/Views/RCTConvert+Transform.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTConvert.h"
diff --git a/React/Views/RCTConvert+Transform.m b/React/Views/RCTConvert+Transform.m
index 1625a4917d30e7..bd5b144905206d 100644
--- a/React/Views/RCTConvert+Transform.m
+++ b/React/Views/RCTConvert+Transform.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTConvert+Transform.h"
diff --git a/React/Views/RCTDatePicker.h b/React/Views/RCTDatePicker.h
index f036651b427edc..2b2759575a3322 100644
--- a/React/Views/RCTDatePicker.h
+++ b/React/Views/RCTDatePicker.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTDatePicker.m b/React/Views/RCTDatePicker.m
index 0e392dcec1e156..664d15b202e86b 100644
--- a/React/Views/RCTDatePicker.m
+++ b/React/Views/RCTDatePicker.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDatePicker.h"
diff --git a/React/Views/RCTDatePickerManager.h b/React/Views/RCTDatePickerManager.h
index df964a0ca0c035..0693b34afe8044 100644
--- a/React/Views/RCTDatePickerManager.h
+++ b/React/Views/RCTDatePickerManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTConvert.h>
diff --git a/React/Views/RCTDatePickerManager.m b/React/Views/RCTDatePickerManager.m
index 6c70c76c1c23cb..cd1138626596e2 100644
--- a/React/Views/RCTDatePickerManager.m
+++ b/React/Views/RCTDatePickerManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTDatePickerManager.h"
diff --git a/React/Views/RCTFont.h b/React/Views/RCTFont.h
index 711721d2a71cc5..e812f69df353e5 100644
--- a/React/Views/RCTFont.h
+++ b/React/Views/RCTFont.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTFont.mm b/React/Views/RCTFont.mm
index dc3877cb352cbc..3fb3e36177cd19 100644
--- a/React/Views/RCTFont.mm
+++ b/React/Views/RCTFont.mm
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAssert.h"
diff --git a/React/Views/RCTLayout.h b/React/Views/RCTLayout.h
index 79af03ecd715c3..4c000136d8990c 100644
--- a/React/Views/RCTLayout.h
+++ b/React/Views/RCTLayout.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTLayout.m b/React/Views/RCTLayout.m
index 60727621d97a6c..8b0f6a2b6e75af 100644
--- a/React/Views/RCTLayout.m
+++ b/React/Views/RCTLayout.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <yoga/Yoga.h>
diff --git a/React/Views/RCTMaskedView.h b/React/Views/RCTMaskedView.h
index 02b11a70ad0492..2406d6ce8ab541 100644
--- a/React/Views/RCTMaskedView.h
+++ b/React/Views/RCTMaskedView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTMaskedView.m b/React/Views/RCTMaskedView.m
index d3c43126c58e9e..5a1a4218127df7 100644
--- a/React/Views/RCTMaskedView.m
+++ b/React/Views/RCTMaskedView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMaskedView.h"
diff --git a/React/Views/RCTMaskedViewManager.h b/React/Views/RCTMaskedViewManager.h
index 9cf66573b5fda0..42e03124363886 100644
--- a/React/Views/RCTMaskedViewManager.h
+++ b/React/Views/RCTMaskedViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTMaskedViewManager.m b/React/Views/RCTMaskedViewManager.m
index 1c4e1f0fc3cbaf..d6bd575948ab29 100644
--- a/React/Views/RCTMaskedViewManager.m
+++ b/React/Views/RCTMaskedViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTMaskedViewManager.h"
diff --git a/React/Views/RCTModalHostView.h b/React/Views/RCTModalHostView.h
index e638df3246bace..08506545acd983 100644
--- a/React/Views/RCTModalHostView.h
+++ b/React/Views/RCTModalHostView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTModalHostView.m b/React/Views/RCTModalHostView.m
index 6dbd6b658fc14b..102ccde8fd98b7 100644
--- a/React/Views/RCTModalHostView.m
+++ b/React/Views/RCTModalHostView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModalHostView.h"
diff --git a/React/Views/RCTModalHostViewController.h b/React/Views/RCTModalHostViewController.h
index ebcb0dcd428216..f7b27351214721 100644
--- a/React/Views/RCTModalHostViewController.h
+++ b/React/Views/RCTModalHostViewController.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTModalHostViewController.m b/React/Views/RCTModalHostViewController.m
index 8b57356c3a77c4..4b5c5281dce7ee 100644
--- a/React/Views/RCTModalHostViewController.m
+++ b/React/Views/RCTModalHostViewController.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModalHostViewController.h"
diff --git a/React/Views/RCTModalHostViewManager.h b/React/Views/RCTModalHostViewManager.h
index edf6daba7748b0..b325a9c6604d38 100644
--- a/React/Views/RCTModalHostViewManager.h
+++ b/React/Views/RCTModalHostViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTInvalidating.h>
diff --git a/React/Views/RCTModalHostViewManager.m b/React/Views/RCTModalHostViewManager.m
index dbc1f6af8cd68e..bb235dc625b755 100644
--- a/React/Views/RCTModalHostViewManager.m
+++ b/React/Views/RCTModalHostViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModalHostViewManager.h"
diff --git a/React/Views/RCTModalManager.h b/React/Views/RCTModalManager.h
index 33c0784e9b7df4..62c1743d7fb2e5 100644
--- a/React/Views/RCTModalManager.h
+++ b/React/Views/RCTModalManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTModalManager.m b/React/Views/RCTModalManager.m
index 551b263668d360..0920ad66528e4a 100644
--- a/React/Views/RCTModalManager.m
+++ b/React/Views/RCTModalManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTModalManager.h"
diff --git a/React/Views/RCTNavItem.h b/React/Views/RCTNavItem.h
index 735d7b0ecbd1f1..9cabdf2e600a6a 100644
--- a/React/Views/RCTNavItem.h
+++ b/React/Views/RCTNavItem.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTNavItem.m b/React/Views/RCTNavItem.m
index 1b47128d1a1fe7..58923e2450a917 100644
--- a/React/Views/RCTNavItem.m
+++ b/React/Views/RCTNavItem.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNavItem.h"
diff --git a/React/Views/RCTNavItemManager.h b/React/Views/RCTNavItemManager.h
index b5b9fa58c928f1..8fcb61c3690457 100644
--- a/React/Views/RCTNavItemManager.h
+++ b/React/Views/RCTNavItemManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTConvert.h>
diff --git a/React/Views/RCTNavItemManager.m b/React/Views/RCTNavItemManager.m
index b281938a2cf473..d9d349c5ad531c 100644
--- a/React/Views/RCTNavItemManager.m
+++ b/React/Views/RCTNavItemManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNavItemManager.h"
diff --git a/React/Views/RCTNavigator.h b/React/Views/RCTNavigator.h
index 88ee698208d949..b8ad30141c872d 100644
--- a/React/Views/RCTNavigator.h
+++ b/React/Views/RCTNavigator.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTNavigator.m b/React/Views/RCTNavigator.m
index dbe48f796b5905..0a0bfe61cf15e2 100644
--- a/React/Views/RCTNavigator.m
+++ b/React/Views/RCTNavigator.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNavigator.h"
diff --git a/React/Views/RCTNavigatorManager.h b/React/Views/RCTNavigatorManager.h
index e8be0494311af3..58c40c94e7f1f7 100644
--- a/React/Views/RCTNavigatorManager.h
+++ b/React/Views/RCTNavigatorManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTNavigatorManager.m b/React/Views/RCTNavigatorManager.m
index dee4187491046c..99a03cbb364439 100644
--- a/React/Views/RCTNavigatorManager.m
+++ b/React/Views/RCTNavigatorManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTNavigatorManager.h"
diff --git a/React/Views/RCTPicker.h b/React/Views/RCTPicker.h
index d4931dec607d0e..3424f58f32d5b7 100644
--- a/React/Views/RCTPicker.h
+++ b/React/Views/RCTPicker.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTPicker.m b/React/Views/RCTPicker.m
index b9ac79387bd42b..3193417bdfdd8c 100644
--- a/React/Views/RCTPicker.m
+++ b/React/Views/RCTPicker.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPicker.h"
diff --git a/React/Views/RCTPickerManager.h b/React/Views/RCTPickerManager.h
index d2feb7caaefdb4..a24de5c6eb56df 100644
--- a/React/Views/RCTPickerManager.h
+++ b/React/Views/RCTPickerManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTPickerManager.m b/React/Views/RCTPickerManager.m
index 3e6a6e6dd614df..32947d0001c42d 100644
--- a/React/Views/RCTPickerManager.m
+++ b/React/Views/RCTPickerManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTPickerManager.h"
diff --git a/React/Views/RCTPointerEvents.h b/React/Views/RCTPointerEvents.h
index 1eff59b5c4822d..b8a34fcf79e0c8 100644
--- a/React/Views/RCTPointerEvents.h
+++ b/React/Views/RCTPointerEvents.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTProgressViewManager.h b/React/Views/RCTProgressViewManager.h
index bf183f6372f0eb..6528d8ea861ca8 100644
--- a/React/Views/RCTProgressViewManager.h
+++ b/React/Views/RCTProgressViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTProgressViewManager.m b/React/Views/RCTProgressViewManager.m
index 65fe2df3c88689..d9381c100a57ce 100644
--- a/React/Views/RCTProgressViewManager.m
+++ b/React/Views/RCTProgressViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTProgressViewManager.h"
diff --git a/React/Views/RCTRefreshControl.h b/React/Views/RCTRefreshControl.h
index cc7a8c91eaa3f7..fa0a1b49473c4d 100644
--- a/React/Views/RCTRefreshControl.h
+++ b/React/Views/RCTRefreshControl.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTRefreshControl.m b/React/Views/RCTRefreshControl.m
index 3b447de55a5227..6bce70938592e7 100644
--- a/React/Views/RCTRefreshControl.m
+++ b/React/Views/RCTRefreshControl.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRefreshControl.h"
diff --git a/React/Views/RCTRefreshControlManager.h b/React/Views/RCTRefreshControlManager.h
index 00d117ed9ff4f3..ca9fec0739bc69 100644
--- a/React/Views/RCTRefreshControlManager.h
+++ b/React/Views/RCTRefreshControlManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTRefreshControlManager.m b/React/Views/RCTRefreshControlManager.m
index cd5e1759149c42..355d35073ae37d 100644
--- a/React/Views/RCTRefreshControlManager.m
+++ b/React/Views/RCTRefreshControlManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRefreshControlManager.h"
diff --git a/React/Views/RCTRootShadowView.h b/React/Views/RCTRootShadowView.h
index 8f1d0108c2a1aa..38a65d0fb87a90 100644
--- a/React/Views/RCTRootShadowView.h
+++ b/React/Views/RCTRootShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
diff --git a/React/Views/RCTRootShadowView.m b/React/Views/RCTRootShadowView.m
index 87dad3d8edf394..a1353a4ed0a00f 100644
--- a/React/Views/RCTRootShadowView.m
+++ b/React/Views/RCTRootShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTRootShadowView.h"
diff --git a/React/Views/RCTSegmentedControl.h b/React/Views/RCTSegmentedControl.h
index 4809816879b6d0..d29774a2b26376 100644
--- a/React/Views/RCTSegmentedControl.h
+++ b/React/Views/RCTSegmentedControl.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTSegmentedControl.m b/React/Views/RCTSegmentedControl.m
index 4d10a3d205fed6..4b3650c9c8bf47 100644
--- a/React/Views/RCTSegmentedControl.m
+++ b/React/Views/RCTSegmentedControl.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSegmentedControl.h"
diff --git a/React/Views/RCTSegmentedControlManager.h b/React/Views/RCTSegmentedControlManager.h
index 4b6c8f8e05e9ba..ad642a6dbf011f 100644
--- a/React/Views/RCTSegmentedControlManager.h
+++ b/React/Views/RCTSegmentedControlManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTSegmentedControlManager.m b/React/Views/RCTSegmentedControlManager.m
index 9d1002e546995f..8805917deaa327 100644
--- a/React/Views/RCTSegmentedControlManager.m
+++ b/React/Views/RCTSegmentedControlManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSegmentedControlManager.h"
diff --git a/React/Views/RCTShadowView+Internal.h b/React/Views/RCTShadowView+Internal.h
index cf2d3bf5a2fb89..a5518410a7fc8a 100644
--- a/React/Views/RCTShadowView+Internal.h
+++ b/React/Views/RCTShadowView+Internal.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTShadowView+Internal.m b/React/Views/RCTShadowView+Internal.m
index 09b74ca2e2505d..2a10f2d623e3f2 100644
--- a/React/Views/RCTShadowView+Internal.m
+++ b/React/Views/RCTShadowView+Internal.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTShadowView+Layout.h"
diff --git a/React/Views/RCTShadowView+Layout.h b/React/Views/RCTShadowView+Layout.h
index 8c6d3fe160489f..c7d0f16c5f772a 100644
--- a/React/Views/RCTShadowView+Layout.h
+++ b/React/Views/RCTShadowView+Layout.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTShadowView+Layout.m b/React/Views/RCTShadowView+Layout.m
index 4071c8f037086e..af2987c1fa1ee1 100644
--- a/React/Views/RCTShadowView+Layout.m
+++ b/React/Views/RCTShadowView+Layout.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTShadowView+Layout.h"
diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h
index 826386f82782d5..ccf0d80cf28d32 100644
--- a/React/Views/RCTShadowView.h
+++ b/React/Views/RCTShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m
index 4c2e24b8403fe3..f29dbcbbd3631e 100644
--- a/React/Views/RCTShadowView.m
+++ b/React/Views/RCTShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTShadowView.h"
diff --git a/React/Views/RCTSlider.h b/React/Views/RCTSlider.h
index 35c07902ce88fd..139d5dfa6f92d8 100644
--- a/React/Views/RCTSlider.h
+++ b/React/Views/RCTSlider.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTSlider.m b/React/Views/RCTSlider.m
index 358d443fbb8b97..50407057a6d05c 100644
--- a/React/Views/RCTSlider.m
+++ b/React/Views/RCTSlider.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSlider.h"
diff --git a/React/Views/RCTSliderManager.h b/React/Views/RCTSliderManager.h
index a4696ec31b9b36..a500a16963d80d 100644
--- a/React/Views/RCTSliderManager.h
+++ b/React/Views/RCTSliderManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTSliderManager.m b/React/Views/RCTSliderManager.m
index 50638f2cb9c2c7..a8a5d24a9165f2 100644
--- a/React/Views/RCTSliderManager.m
+++ b/React/Views/RCTSliderManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSliderManager.h"
diff --git a/React/Views/RCTSwitch.h b/React/Views/RCTSwitch.h
index 09da30a544c40c..2bd430707b4070 100644
--- a/React/Views/RCTSwitch.h
+++ b/React/Views/RCTSwitch.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTSwitch.m b/React/Views/RCTSwitch.m
index 6c4e2856495931..23e07bfc641101 100644
--- a/React/Views/RCTSwitch.m
+++ b/React/Views/RCTSwitch.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSwitch.h"
diff --git a/React/Views/RCTSwitchManager.h b/React/Views/RCTSwitchManager.h
index 538d25c0030955..b37b1ee86a8e29 100644
--- a/React/Views/RCTSwitchManager.h
+++ b/React/Views/RCTSwitchManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTSwitchManager.m b/React/Views/RCTSwitchManager.m
index 7fe065baa82866..6642623e7919ee 100644
--- a/React/Views/RCTSwitchManager.m
+++ b/React/Views/RCTSwitchManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSwitchManager.h"
diff --git a/React/Views/RCTTVView.h b/React/Views/RCTTVView.h
index a7bb5137fbfeba..4f8b2f79c62b9f 100644
--- a/React/Views/RCTTVView.h
+++ b/React/Views/RCTTVView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTTVView.m b/React/Views/RCTTVView.m
index 204b6f390d9288..dcd086499c1f54 100644
--- a/React/Views/RCTTVView.m
+++ b/React/Views/RCTTVView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTVView.h"
diff --git a/React/Views/RCTTabBar.h b/React/Views/RCTTabBar.h
index d2f1c1e7a5de0e..249aa9baaba073 100644
--- a/React/Views/RCTTabBar.h
+++ b/React/Views/RCTTabBar.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTTabBar.m b/React/Views/RCTTabBar.m
index a5c59a47b22268..0d02bb5a8ad4d7 100644
--- a/React/Views/RCTTabBar.m
+++ b/React/Views/RCTTabBar.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTabBar.h"
diff --git a/React/Views/RCTTabBarItem.h b/React/Views/RCTTabBarItem.h
index 0f4350eae223af..25e36de62da252 100644
--- a/React/Views/RCTTabBarItem.h
+++ b/React/Views/RCTTabBarItem.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTTabBarItem.m b/React/Views/RCTTabBarItem.m
index b48cb4d152d953..57ffe57c931d4d 100644
--- a/React/Views/RCTTabBarItem.m
+++ b/React/Views/RCTTabBarItem.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTabBarItem.h"
diff --git a/React/Views/RCTTabBarItemManager.h b/React/Views/RCTTabBarItemManager.h
index 484ec23a32ee7a..fd72e35b123d0a 100644
--- a/React/Views/RCTTabBarItemManager.h
+++ b/React/Views/RCTTabBarItemManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTTabBarItemManager.m b/React/Views/RCTTabBarItemManager.m
index ca4684577587cf..b51952b4e073cb 100644
--- a/React/Views/RCTTabBarItemManager.m
+++ b/React/Views/RCTTabBarItemManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTabBarItemManager.h"
diff --git a/React/Views/RCTTabBarManager.h b/React/Views/RCTTabBarManager.h
index 99f59805312ce7..b41f52b89a2854 100644
--- a/React/Views/RCTTabBarManager.h
+++ b/React/Views/RCTTabBarManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTTabBarManager.m b/React/Views/RCTTabBarManager.m
index f8e98854d05590..6813ffb5d436c7 100644
--- a/React/Views/RCTTabBarManager.m
+++ b/React/Views/RCTTabBarManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTabBarManager.h"
diff --git a/React/Views/RCTTextDecorationLineType.h b/React/Views/RCTTextDecorationLineType.h
index 1167f50064e8fa..21152baea4fb49 100644
--- a/React/Views/RCTTextDecorationLineType.h
+++ b/React/Views/RCTTextDecorationLineType.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <Foundation/Foundation.h>
diff --git a/React/Views/RCTView.h b/React/Views/RCTView.h
index 992dc65c647122..68cf22ef20ff1e 100644
--- a/React/Views/RCTView.h
+++ b/React/Views/RCTView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTView.m b/React/Views/RCTView.m
index 41d780c3086d8f..d8888cbdc681b5 100644
--- a/React/Views/RCTView.m
+++ b/React/Views/RCTView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTView.h"
diff --git a/React/Views/RCTViewManager.h b/React/Views/RCTViewManager.h
index 4495a24cc42f0d..7be342a8e25b62 100644
--- a/React/Views/RCTViewManager.h
+++ b/React/Views/RCTViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m
index 06035516fa2914..626e923d35e5db 100644
--- a/React/Views/RCTViewManager.m
+++ b/React/Views/RCTViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTViewManager.h"
diff --git a/React/Views/RCTWebView.h b/React/Views/RCTWebView.h
index 92e9c6bb7ea791..eccb5b94c6daa3 100644
--- a/React/Views/RCTWebView.h
+++ b/React/Views/RCTWebView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTView.h>
diff --git a/React/Views/RCTWebView.m b/React/Views/RCTWebView.m
index 596f87e9680330..61042b221f79ef 100644
--- a/React/Views/RCTWebView.m
+++ b/React/Views/RCTWebView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTWebView.h"
diff --git a/React/Views/RCTWebViewManager.h b/React/Views/RCTWebViewManager.h
index bb075c22ae8adc..2c83b2f64169fc 100644
--- a/React/Views/RCTWebViewManager.h
+++ b/React/Views/RCTWebViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/RCTWebViewManager.m b/React/Views/RCTWebViewManager.m
index ec6192ef5672b1..8f4ef9b0f4f793 100644
--- a/React/Views/RCTWebViewManager.m
+++ b/React/Views/RCTWebViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTWebViewManager.h"
diff --git a/React/Views/RCTWrapperViewController.h b/React/Views/RCTWrapperViewController.h
index 7e27d904f2a0de..7baa0c08c533ed 100644
--- a/React/Views/RCTWrapperViewController.h
+++ b/React/Views/RCTWrapperViewController.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/RCTWrapperViewController.m b/React/Views/RCTWrapperViewController.m
index 71a7d84acda3f8..30103019eef4f2 100644
--- a/React/Views/RCTWrapperViewController.m
+++ b/React/Views/RCTWrapperViewController.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTWrapperViewController.h"
diff --git a/React/Views/SafeAreaView/RCTSafeAreaShadowView.h b/React/Views/SafeAreaView/RCTSafeAreaShadowView.h
index 9987b22e5937e7..8ce55759f86ec3 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaShadowView.h
+++ b/React/Views/SafeAreaView/RCTSafeAreaShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTShadowView.h>
diff --git a/React/Views/SafeAreaView/RCTSafeAreaShadowView.m b/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
index 8b749bcce9132f..333c0da7fbe43f 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSafeAreaShadowView.h"
diff --git a/React/Views/SafeAreaView/RCTSafeAreaView.h b/React/Views/SafeAreaView/RCTSafeAreaView.h
index c2605f095ae0a5..1964b0b65f9f6f 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaView.h
+++ b/React/Views/SafeAreaView/RCTSafeAreaView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/SafeAreaView/RCTSafeAreaView.m b/React/Views/SafeAreaView/RCTSafeAreaView.m
index 971408ae25dfac..e4fe4b6d17146a 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaView.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSafeAreaView.h"
diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h
index 8e2fdac7b1abe0..a644890c6abefc 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h
+++ b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m
index 674c9ff3531b6e..0c38d89344755a 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSafeAreaViewLocalData.h"
diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewManager.h b/React/Views/SafeAreaView/RCTSafeAreaViewManager.h
index 9c8f5f28b9c22e..aeaf69a73deba8 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaViewManager.h
+++ b/React/Views/SafeAreaView/RCTSafeAreaViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/SafeAreaView/RCTSafeAreaViewManager.m b/React/Views/SafeAreaView/RCTSafeAreaViewManager.m
index bdbe7394cb52b6..6bc64562358ccc 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaViewManager.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTSafeAreaViewManager.h"
diff --git a/React/Views/ScrollView/RCTScrollContentShadowView.h b/React/Views/ScrollView/RCTScrollContentShadowView.h
index 8b94dd2d61c0fb..e10573cca94ae1 100644
--- a/React/Views/ScrollView/RCTScrollContentShadowView.h
+++ b/React/Views/ScrollView/RCTScrollContentShadowView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/ScrollView/RCTScrollContentShadowView.m b/React/Views/ScrollView/RCTScrollContentShadowView.m
index d53a658edb0b97..3988ee381e7e66 100644
--- a/React/Views/ScrollView/RCTScrollContentShadowView.m
+++ b/React/Views/ScrollView/RCTScrollContentShadowView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTScrollContentShadowView.h"
diff --git a/React/Views/ScrollView/RCTScrollContentView.h b/React/Views/ScrollView/RCTScrollContentView.h
index f25250cc5f8269..5271bf250b1591 100644
--- a/React/Views/ScrollView/RCTScrollContentView.h
+++ b/React/Views/ScrollView/RCTScrollContentView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/ScrollView/RCTScrollContentView.m b/React/Views/ScrollView/RCTScrollContentView.m
index a7fb9d2180e18d..a6426dec89a954 100644
--- a/React/Views/ScrollView/RCTScrollContentView.m
+++ b/React/Views/ScrollView/RCTScrollContentView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTScrollContentView.h"
diff --git a/React/Views/ScrollView/RCTScrollContentViewManager.h b/React/Views/ScrollView/RCTScrollContentViewManager.h
index e1c90e31bff541..bf5c250a5fb0da 100644
--- a/React/Views/ScrollView/RCTScrollContentViewManager.h
+++ b/React/Views/ScrollView/RCTScrollContentViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTViewManager.h>
diff --git a/React/Views/ScrollView/RCTScrollContentViewManager.m b/React/Views/ScrollView/RCTScrollContentViewManager.m
index 18585fb88d1f11..732f976556f610 100644
--- a/React/Views/ScrollView/RCTScrollContentViewManager.m
+++ b/React/Views/ScrollView/RCTScrollContentViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTScrollContentViewManager.h"
diff --git a/React/Views/ScrollView/RCTScrollView.h b/React/Views/ScrollView/RCTScrollView.h
index dda27dfce04551..e1853e5d9d3558 100644
--- a/React/Views/ScrollView/RCTScrollView.h
+++ b/React/Views/ScrollView/RCTScrollView.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIScrollView.h>
diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m
index ecdb9ddaa2ddc0..f146ba0d2369a0 100644
--- a/React/Views/ScrollView/RCTScrollView.m
+++ b/React/Views/ScrollView/RCTScrollView.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTScrollView.h"
diff --git a/React/Views/ScrollView/RCTScrollViewManager.h b/React/Views/ScrollView/RCTScrollViewManager.h
index 5faeb5b99d4cf4..40c1a9ddb10b42 100644
--- a/React/Views/ScrollView/RCTScrollViewManager.h
+++ b/React/Views/ScrollView/RCTScrollViewManager.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <React/RCTConvert.h>
diff --git a/React/Views/ScrollView/RCTScrollViewManager.m b/React/Views/ScrollView/RCTScrollViewManager.m
index 3c7d11405a74dd..e5824afd3f386d 100644
--- a/React/Views/ScrollView/RCTScrollViewManager.m
+++ b/React/Views/ScrollView/RCTScrollViewManager.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTScrollViewManager.h"
diff --git a/React/Views/ScrollView/RCTScrollableProtocol.h b/React/Views/ScrollView/RCTScrollableProtocol.h
index a143d638602fa1..33ed067ec4acac 100644
--- a/React/Views/ScrollView/RCTScrollableProtocol.h
+++ b/React/Views/ScrollView/RCTScrollableProtocol.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/UIView+Private.h b/React/Views/UIView+Private.h
index 078f16e07219e0..7a8d6587ddcebd 100644
--- a/React/Views/UIView+Private.h
+++ b/React/Views/UIView+Private.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/UIView+React.h b/React/Views/UIView+React.h
index 1c90f16dbef806..94de7aae753130 100644
--- a/React/Views/UIView+React.h
+++ b/React/Views/UIView+React.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/React/Views/UIView+React.m b/React/Views/UIView+React.m
index a764eb46a941aa..22d14f82c4a334 100644
--- a/React/Views/UIView+React.m
+++ b/React/Views/UIView+React.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "UIView+React.h"
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java
index 159fee03ecb87c..713ab5962d6d40 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AbstractScrollViewTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java
index 4379470164fc54..0d1e87860033e6 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/AssertModule.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java
index e62d09ecb0c14a..2d52005eb0976a 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeAsyncLocalStorage.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java
index 45dcff4114b0d0..b5bf197683c4e1 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FakeWebSocketModule.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java
index 9def548b072eec..cdfb21491bdba0 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/InstanceSpecForTestPackage.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java
index 5cf7e4373ef600..7806dacdf62ce6 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/IntRecordingModule.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java
index 1ddf186c90de2f..59b949e979509e 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/JSIntegrationTestChecker.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/MultipleFailureException.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/MultipleFailureException.java
index a996403d44f337..6073cd6b96e5e2 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/MultipleFailureException.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/MultipleFailureException.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
index eeb8c02e06715d..8b93eeb8b19a87 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppInstrumentationTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
index 9ba33a3fc4c223..96c18030635055 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
index f58efec73f1a46..4f37e63f7d97bc 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
index 3a61f2563223d2..31947b0682778a 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java
index 7990c398208eb7..47137dbbe177af 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactSettingsForTests.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestAppShell.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestAppShell.java
index 7f5d2cd6c99ee1..54d03bc35f192b 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestAppShell.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestAppShell.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestApplicationImpl.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestApplicationImpl.java
index 6f58924f6a360d..fdf40c300f3dc5 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestApplicationImpl.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestApplicationImpl.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java
index 95dc551badd140..c15ffc29f2590c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestFactory.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
index 63554242b9d002..1452899dba9725 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java
index 8d4da285bf2167..42eb0abfda88fa 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ScreenshotingFrameLayout.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
index f0ae877a953d42..027291dcaf8f5b 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/SingleTouchGestureGenerator.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java
index 8caa3b8f7117b1..bc827f2a85ff3c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/StringRecordingModule.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
index 1b94b7c1fc88db..d32494f92a5d5f 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/IdleWaiter.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing.idledetection;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
index 4aaa451e43ab24..6509897a3425e8 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactBridgeIdleSignaler.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing.idledetection;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
index af6ca2ebb82a55..00f9aefaa4e99b 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/idledetection/ReactIdleDetectionUtil.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing.idledetection;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
index a6059a8925230f..9a6917078c78b5 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/NetworkRecordingModuleMock.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.testing.network;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java
index eb5a7e9d30ffed..6f3d5843b1a91e 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMeasureLayoutTest.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMultitouchHandlingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMultitouchHandlingTestCase.java
index 3b13dabeb73fc7..1a2a783dcc9beb 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMultitouchHandlingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystMultitouchHandlingTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
index 174444f35b4822..ffaeb08148cb22 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
index 6208e73a0cefb0..dec91a4ea5449e 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSArgumentsTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
index c47e8f2619a621..0430858c6cf46f 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJavaToJSReturnValuesTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java
index 6f7f5831f06c1a..4b360901013fc3 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystSubviewsClippingTestCase.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java
index 41b7b10bcb12a3..b150641e020155 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystTouchBubblingTestCase.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
index c7de7b9ba02070..d753d03f96dec2 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java
index 4b6e2fd2a19036..cf5949e667a81d 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/DatePickerDialogTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java
index 951c593533e453..99de8a830014fc 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/InitialPropsTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
index 7c87754e897d19..5e0b9ff62f67c8 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSLocaleTest.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSResponderTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSResponderTestCase.java
index dc02df16a14bd1..ca05cfae197fed 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSResponderTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/JSResponderTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/LayoutEventsTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/LayoutEventsTestCase.java
index fbd94d6d732751..bab295fa709c42 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/LayoutEventsTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/LayoutEventsTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java
index e547fed89a3a69..6888f021d9757d 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/NativeIdTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
index fdc03beaa0dd97..38ed87b5d8c31f 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java
index 963442d470624d..52a8750d43066a 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
index dd93ee5fccccbf..cc2f680a37941c 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactPickerTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactRootViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactRootViewTestCase.java
index 6ee0bed8796f27..f912347b497d82 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactRootViewTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactRootViewTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactScrollViewTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactScrollViewTestCase.java
index 45a47a67383e5d..b947e50a87a405 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactScrollViewTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactScrollViewTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java
index bbef082ff10329..417bf4159b98a5 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactSwipeRefreshLayoutTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java
index 184bda6c1f6d4f..ccfa9f2b862d6a 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ShareTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TestIdTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TestIdTestCase.java
index 3db5d4ee8a6896..1b0a904cdfddbc 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TestIdTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TestIdTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
index 08d19cae168923..cd0e8362d8f415 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TextInputTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java
index 3988911c429f9d..3af83b91877572 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/TimePickerDialogTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
index 42e0c75f081754..11a2328021db36 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
@@ -1,9 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.tests;
diff --git a/ReactAndroid/src/androidTest/js/Asserts.js b/ReactAndroid/src/androidTest/js/Asserts.js
index 9a4e9654ad550c..0cebeea419d20d 100644
--- a/ReactAndroid/src/androidTest/js/Asserts.js
+++ b/ReactAndroid/src/androidTest/js/Asserts.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule Asserts
  */
diff --git a/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js b/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js
index d9ada150d9f6bc..33f0592a4832ef 100644
--- a/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js
+++ b/ReactAndroid/src/androidTest/js/CatalystRootViewTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule CatalystRootViewTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/DatePickerDialogTestModule.js b/ReactAndroid/src/androidTest/js/DatePickerDialogTestModule.js
index 88c9e5fc2f1bd1..0cd5685820cacc 100644
--- a/ReactAndroid/src/androidTest/js/DatePickerDialogTestModule.js
+++ b/ReactAndroid/src/androidTest/js/DatePickerDialogTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule DatePickerDialogTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/InitialPropsTestApp.js b/ReactAndroid/src/androidTest/js/InitialPropsTestApp.js
index 3a4f403015044c..173ef647f48267 100644
--- a/ReactAndroid/src/androidTest/js/InitialPropsTestApp.js
+++ b/ReactAndroid/src/androidTest/js/InitialPropsTestApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule InitialPropsTestApp
  */
diff --git a/ReactAndroid/src/androidTest/js/JSResponderTestApp.js b/ReactAndroid/src/androidTest/js/JSResponderTestApp.js
index 2d9aedd911e421..50612afb9e2e91 100644
--- a/ReactAndroid/src/androidTest/js/JSResponderTestApp.js
+++ b/ReactAndroid/src/androidTest/js/JSResponderTestApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule JSResponderTestApp
  */
diff --git a/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js b/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js
index 9b354761edc4e9..d9ecf2ca1b54e7 100644
--- a/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js
+++ b/ReactAndroid/src/androidTest/js/LayoutEventsTestApp.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule LayoutEventsTestApp
  */
diff --git a/ReactAndroid/src/androidTest/js/MeasureLayoutTestModule.js b/ReactAndroid/src/androidTest/js/MeasureLayoutTestModule.js
index 12ef60816d0645..92ac114b6cc7fd 100644
--- a/ReactAndroid/src/androidTest/js/MeasureLayoutTestModule.js
+++ b/ReactAndroid/src/androidTest/js/MeasureLayoutTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MeasureLayoutTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js b/ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js
index 38b17db2c75f94..7daa884359fa9a 100644
--- a/ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js
+++ b/ReactAndroid/src/androidTest/js/MultitouchHandlingTestAppModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule MultitouchHandlingTestAppModule
  */
diff --git a/ReactAndroid/src/androidTest/js/NativeIdTestModule.js b/ReactAndroid/src/androidTest/js/NativeIdTestModule.js
index 711f2ddce99b5a..2e1acad3422756 100644
--- a/ReactAndroid/src/androidTest/js/NativeIdTestModule.js
+++ b/ReactAndroid/src/androidTest/js/NativeIdTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule NativeIdTestModule
  * @flow
diff --git a/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js b/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js
index faba7ec7de4094..0f7255d1564089 100644
--- a/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js
+++ b/ReactAndroid/src/androidTest/js/PickerAndroidTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule PickerAndroidTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js b/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js
index d27428049f29bb..bd466144c522d7 100644
--- a/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ProgressBarTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
index 0081c50b216643..24371b0f76570c 100644
--- a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ScrollViewTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/ShareTestModule.js b/ReactAndroid/src/androidTest/js/ShareTestModule.js
index 4ef9b78e6243e2..f7311f656041e9 100644
--- a/ReactAndroid/src/androidTest/js/ShareTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ShareTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ShareTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js b/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js
index 4154e2a543bbe4..70fa837eed6b7a 100644
--- a/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js
+++ b/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SubviewsClippingTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js b/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js
index 80e2c6eb50d24a..277a768e9430f4 100644
--- a/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js
+++ b/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule SwipeRefreshLayoutTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TestBundle.js b/ReactAndroid/src/androidTest/js/TestBundle.js
index 5cbfea239e59aa..21fd06247e415f 100644
--- a/ReactAndroid/src/androidTest/js/TestBundle.js
+++ b/ReactAndroid/src/androidTest/js/TestBundle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TestBundle
  */
diff --git a/ReactAndroid/src/androidTest/js/TestIdTestModule.js b/ReactAndroid/src/androidTest/js/TestIdTestModule.js
index 962d2e6c736a85..eee76fbc05c00c 100644
--- a/ReactAndroid/src/androidTest/js/TestIdTestModule.js
+++ b/ReactAndroid/src/androidTest/js/TestIdTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TestIdTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js b/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js
index eff35902c901ad..be6bfc12a3a208 100644
--- a/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js
+++ b/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TestJSLocaleModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TestJSToJavaParametersModule.js b/ReactAndroid/src/androidTest/js/TestJSToJavaParametersModule.js
index a20a62c0e1a307..bc526e7722ba2d 100644
--- a/ReactAndroid/src/androidTest/js/TestJSToJavaParametersModule.js
+++ b/ReactAndroid/src/androidTest/js/TestJSToJavaParametersModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TestJSToJavaParametersModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js b/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js
index 3e18819dcdafa6..b5abe26a8eeb57 100644
--- a/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js
+++ b/ReactAndroid/src/androidTest/js/TestJavaToJSArgumentsModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TestJavaToJSArgumentsModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js b/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js
index ad42aaad8a7ec4..135816a5c9d659 100644
--- a/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js
+++ b/ReactAndroid/src/androidTest/js/TestJavaToJSReturnValuesModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TestJavaToJSReturnValuesModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TextInputTestModule.js b/ReactAndroid/src/androidTest/js/TextInputTestModule.js
index 058ef7e45557cc..94593a3ab71449 100644
--- a/ReactAndroid/src/androidTest/js/TextInputTestModule.js
+++ b/ReactAndroid/src/androidTest/js/TextInputTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TextInputTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TimePickerDialogTestModule.js b/ReactAndroid/src/androidTest/js/TimePickerDialogTestModule.js
index 7a8db9e072ed93..ebf8cdb4f1271a 100644
--- a/ReactAndroid/src/androidTest/js/TimePickerDialogTestModule.js
+++ b/ReactAndroid/src/androidTest/js/TimePickerDialogTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TimePickerDialogTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/TouchBubblingTestAppModule.js b/ReactAndroid/src/androidTest/js/TouchBubblingTestAppModule.js
index 47e3d8660ef083..cd8bcb51c52842 100644
--- a/ReactAndroid/src/androidTest/js/TouchBubblingTestAppModule.js
+++ b/ReactAndroid/src/androidTest/js/TouchBubblingTestAppModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule TouchBubblingTestAppModule
  */
diff --git a/ReactAndroid/src/androidTest/js/UIManagerTestModule.js b/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
index 236cfce2ea387b..5c976ce76dc3f9 100644
--- a/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
+++ b/ReactAndroid/src/androidTest/js/UIManagerTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule UIManagerTestModule
  */
diff --git a/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js b/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js
index f10aeed87025ad..36d9328c93e209 100644
--- a/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ViewRenderingTestModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @providesModule ViewRenderingTestModule
  */
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/IteratorHelper.java b/ReactAndroid/src/main/java/com/facebook/jni/IteratorHelper.java
index aca1cb50fb04e9..928870d2bfc434 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/IteratorHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/IteratorHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.jni;
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/MapIteratorHelper.java b/ReactAndroid/src/main/java/com/facebook/jni/MapIteratorHelper.java
index aa9283ed2f898a..e50cd7d56bc150 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/MapIteratorHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/MapIteratorHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.jni;
diff --git a/ReactAndroid/src/main/java/com/facebook/jni/NativeRunnable.java b/ReactAndroid/src/main/java/com/facebook/jni/NativeRunnable.java
index 151cc8ad80f0a3..34216a29c8ff54 100644
--- a/ReactAndroid/src/main/java/com/facebook/jni/NativeRunnable.java
+++ b/ReactAndroid/src/main/java/com/facebook/jni/NativeRunnable.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.jni;
diff --git a/ReactAndroid/src/main/java/com/facebook/perftest/PerfTestConfig.java b/ReactAndroid/src/main/java/com/facebook/perftest/PerfTestConfig.java
index 28336820266728..e8fef3b4299e77 100644
--- a/ReactAndroid/src/main/java/com/facebook/perftest/PerfTestConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/perftest/PerfTestConfig.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.perftest;
diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java
index 86a3f2c3fb6e2b..a2752bbb0f8a3c 100644
--- a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java
+++ b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/DoNotStrip.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.proguard.annotations;
diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/KeepGettersAndSetters.java b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/KeepGettersAndSetters.java
index 11f4f32b9878ac..4c261c5c9b27ea 100644
--- a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/KeepGettersAndSetters.java
+++ b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/KeepGettersAndSetters.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.proguard.annotations;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java
index 187cabf2a69248..ab82f0d9643264 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CompositeReactPackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
index 7b0ac3253bf402..43515b59febd8b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java b/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
index 3a83bd330b5d88..290082e545ba0c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java b/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java
index 3add544a9fd78f..6bfac567bb2a04 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java
index 7a038505976746..68c184a0e1ccdf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
index 926b665e653593..3a8ca14b3ce8c7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.java b/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.java
index 6b74532dfe546e..88b7ab2093fc1b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java b/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
index 9671b0a1d70854..10bbd9d89639eb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactFragmentActivity.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 71844e945a89f2..2ba53056f02ca7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstancePackage.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstancePackage.java
index 24de64936a4a99..03e872ae79da8b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstancePackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstancePackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
index 734597e8394dae..243053fcfe689f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java
index fb1f8517d731d9..51828a144a249a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index c67cab536cd656..a19382fbf5eec8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java
index e78d0ca2f13cdf..7f17809ffbb19a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.java
index 0fba5f90bbb244..5b2640f60049cd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNode.java
index 61e02b1055e900..beaa02926368ce 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNodeValueListener.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNodeValueListener.java
index fa0248cb3e1947..09dbb65bc34bfc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNodeValueListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimatedNodeValueListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java
index b2ae607513a13f..079a07add26733 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/AnimationDriver.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
index fb7c00d018f33d..1547633a386585 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/DecayAnimation.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.java
index bd59c807ccc88d..8f812a4b8143e7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.java
index 152bc049af70e0..8dc720e72ce924 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java
index 20a6a8f83348ee..e0a1b0d1234037 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
index 3d37846fb0c6f0..d243fd8f45c940 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java
index 6c38e12e229f29..b1a138e2b54f48 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.animated;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.java
index 2bce6b806362bb..d942d757459914 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.java
index 2f79e1a91ebb71..ae1a4d7b850760 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
index ac60f85c9e97db..de29f0383455f7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
index d54d24bd668ea9..1fad4e52d3cd4f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java
index 036f88435cc21e..813d72b075e6b0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java
index be68582f818307..0b77e1f043fca5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.java
index 10dc12a4ac2ff3..d5f7f79b8efddd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java
index 77dc74c70d6869..a28511b481b76f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractFloatPairPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractFloatPairPropertyUpdater.java
index e2b86a29f4b4f5..e29a94a2e46225 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractFloatPairPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractFloatPairPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractSingleFloatProperyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractSingleFloatProperyUpdater.java
index d393fe8325b685..2ef6befadbb964 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractSingleFloatProperyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AbstractSingleFloatProperyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/Animation.java b/ReactAndroid/src/main/java/com/facebook/react/animation/Animation.java
index 37a6d2a1969997..670db11335181f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/Animation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/Animation.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationListener.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationListener.java
index a3678ed91ff26c..ed192daeef3a9b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationPropertyUpdater.java
index 37c42bb831dd13..3f0a8d1a37c101 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java
index 74f0bedf47ef59..4df661c8be1c92 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/AnimationRegistry.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/ImmediateAnimation.java b/ReactAndroid/src/main/java/com/facebook/react/animation/ImmediateAnimation.java
index da72250548190e..dff3fa06d497a5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/ImmediateAnimation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/ImmediateAnimation.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/NoopAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/NoopAnimationPropertyUpdater.java
index 83dbe3d9aebc11..7a94de2ddf5da9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/NoopAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/NoopAnimationPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/OpacityAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/OpacityAnimationPropertyUpdater.java
index d1acf3da59174d..e53aa8227cf678 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/OpacityAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/OpacityAnimationPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/PositionAnimationPairPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/PositionAnimationPairPropertyUpdater.java
index b90740c5172c25..ab3678ff0e9310 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/PositionAnimationPairPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/PositionAnimationPairPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/RotationAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/RotationAnimationPropertyUpdater.java
index 214c84f6671e11..e089fdec658bf0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/RotationAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/RotationAnimationPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXAnimationPropertyUpdater.java
index 9eb5567557a048..de4167972a66ed 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXAnimationPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXYAnimationPairPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXYAnimationPairPropertyUpdater.java
index 3ca9429d01928b..996e95d68f7149 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXYAnimationPairPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleXYAnimationPairPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleYAnimationPropertyUpdater.java b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleYAnimationPropertyUpdater.java
index 25b02f2d0d9b09..533d6717f2efa2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleYAnimationPropertyUpdater.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/ScaleYAnimationPropertyUpdater.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animation;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java
index 267a9ca8e5f210..1979edaa880c6e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Arguments.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.bridge;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.java
index fa574cc3e93aa3..651ec03a927497 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
index d43174f50632f8..694428509b1a06 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Callback.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Callback.java
index ab72c46ba27565..1a7810d6f97b11 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Callback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Callback.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java
index 5b82505ce65a92..e1d28cfb8500e2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
index 29f03a1a17c1e0..361cfda0f2fb1d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
index fe3cef73f85966..c583fbec1b2130 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java
index 8f3471819294f9..ff5340631a214f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ContextBaseJavaModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultNativeModuleCallExceptionHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultNativeModuleCallExceptionHandler.java
index 4d47156c747956..c730a5de7548e9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultNativeModuleCallExceptionHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultNativeModuleCallExceptionHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Dynamic.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Dynamic.java
index b817c48a27b8ee..feeab03bb228f1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Dynamic.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Dynamic.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java
index 6b03442e362a31..6c107feeaa50a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java
index ce20452dd89696..4d268ea8614ccc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java
index 679f802e3dd020..816c3d6c3b1dfc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedAsyncTask.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedAsyncTask.java
index 83a7fb014e34c9..749d6555338efc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedAsyncTask.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/GuardedAsyncTask.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.java
index 2e5261b7fe3e5b..e57fe494f18001 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationCausedNativeException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationCausedNativeException.java
index 38ad4a2f5cfa2b..7c6d5faa893af5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationCausedNativeException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationCausedNativeException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationIllegalArgumentException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationIllegalArgumentException.java
index ad491ab50100a9..70716b269a4759 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationIllegalArgumentException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSApplicationIllegalArgumentException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java
index a3031d112f9ba2..61bc6f01816273 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java
index e329cf5dbfb36e..ee77eda70b984c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutor.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java
index 8cc59a876ccc7e..5e360808c03d6e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSCJavaScriptExecutorFactory.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java
index 43473839bd48b6..fb1333680e1241 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSInstance.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java
index 0b119ce7f664c1..801b550a8c1569 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java
index 63af54d2a4e3e9..e0490c10a8bb12 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java
index 4e46ca4878dce5..ae91556b269034 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java
index dd648f53d1c1b8..0533cfd3e4c829 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
index 3b9ccf6fdde9de..62be17622de388 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java
index 562e4fde605358..e4195aff332841 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutor.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutorFactory.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutorFactory.java
index 7e12b9f599fc1c..e34b4b1d00b3fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutorFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptExecutorFactory.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModule.java
index af23afcfe01e30..c086508a3d6cdf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java
index 6062e81dbd5f26..5df3309135e915 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriter.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriter.java
index 664a7a27394e82..33714b555102d8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriter.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.java
index 99b6593a2e1b09..cc55b7d9259714 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JsonWriterHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/LifecycleEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/LifecycleEventListener.java
index 169874ddfd3687..3fa44d4b8ecd3a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/LifecycleEventListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/LifecycleEventListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.java
index 6eddfe56f755ea..537a610e513b27 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.java
index 7efeb1476630cf..7cd373a6785ab8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java
index 26cd356cb7541d..bd314caf65985c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java
index ea0b6b1420f00a..55b32d7171d752 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
index 8dffd27badb154..a57b41f93cc698 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleCallExceptionHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleCallExceptionHandler.java
index 708bdfd8d03899..9d77885dac77c7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleCallExceptionHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleCallExceptionHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
index 6015b4a208cb44..d30b7a5a378890 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NoSuchKeyException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NoSuchKeyException.java
index 4d5630f9fda36e..e1b1e2829acbf8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NoSuchKeyException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NoSuchKeyException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.java
index aa571141c05c50..a10fa295399dc0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.java
index 9b374c145ea852..4faaa4fe363108 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ObjectAlreadyConsumedException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.java
index 25db113ae0d5a2..5448bc8fd06ad5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/PerformanceCounter.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/PerformanceCounter.java
index 87a2e4b080e307..b4a075ae6c3491 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/PerformanceCounter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/PerformanceCounter.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.bridge;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.java
index 9e87cc1414e5dd..aa8c3bee4a83fb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.java
index 519448f6d9ed79..1ee2380ff8bba6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
index 08a225948b96bb..db04655d35479c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java
index ccf9f7998355a3..1d33a2d24a2e2a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
index 89ebbd7403ee75..a9463c20dd5752 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCallback.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCallback.java
index 94784cb306133f..7cd1e898142857 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCallback.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
index 37bb9b64cf34f4..713f5a7fd8156e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
index 6a73f73ccb25ef..2a7c4482136ff6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMethod.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMethod.java
index 821cc79a56716d..1a15f6ab31432f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMethod.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMethod.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactModuleWithSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactModuleWithSpec.java
index b0af8b48592aeb..e7dac2d49593e5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactModuleWithSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactModuleWithSpec.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
index 01c9e34a197f52..f4e17403f27cfa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMap.java
index f035041884e170..1af1631b8a353b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMapKeySetIterator.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMapKeySetIterator.java
index 9710496b602a7d..fad9c994ed728c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMapKeySetIterator.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableMapKeySetIterator.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
index 9ed4c1ca9e7cee..2e2b13f1bcc178 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
index ea1d04d0738fb1..82f7f20a0229dd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableType.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableType.java
index 0c6e2a04414d42..b1a9057e8e198b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableType.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java
index 4b0396e0c21cf9..b9093263671655 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java
index 17c8c99fe3327e..292efedd310196 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/UnexpectedNativeTypeException.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/UnexpectedNativeTypeException.java
index fee3ebbde7baf9..f15e4886a19b03 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/UnexpectedNativeTypeException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/UnexpectedNativeTypeException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableArray.java
index 6861669cb4844b..0b7b5d175d5e36 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableMap.java
index 765fe39a584711..62073f177ca2db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java
index 6b30bc326b23c5..90bd2de5add358 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java
index 04e5bdfdc2e1d1..e10caeb95c28c5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThread.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThread.java
index fca4ddc18ac914..2449cafb726c37 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThread.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThread.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java
index 6350180fdb918c..d2be287f9e338c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java
index 1afaa10ce5b120..be06d0615ba44d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.java
index 800371c9c854f7..c9df9ca5436c78 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnable.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnable.java
index fa3a208f668c3d..f474e8f972e350 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnable.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnable.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnableDeprecated.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnableDeprecated.java
index 9e77c7eb88c7d4..4da397799cef42 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnableDeprecated.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/NativeRunnableDeprecated.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/QueueThreadExceptionHandler.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/QueueThreadExceptionHandler.java
index 262f4aa5c47353..4139da528c47d6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/QueueThreadExceptionHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/QueueThreadExceptionHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfiguration.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfiguration.java
index b5b44a9a2c51a0..010dc872daef44 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfiguration.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfiguration.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.java
index 60d7e0eb164302..cc02e072190d41 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java
index a112f217c608de..d49a26b5434c2d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge.queue;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java b/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java
index 804b9f54bb934c..4c10cb114f99cd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java b/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java
index d1e68004fd064a..ecb1ba83eca3ea 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java b/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java
index f6e4843b0e390e..45402ab0da5a56 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java b/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java
index 74bced6cfa94e8..883bd714ceabb6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java
index f73fbdae352dd4..151fbf144d0fcc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java b/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java
index 7de8d922fa8b45..eae26cdebb35b6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java b/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java
index b3388bdbd48ae8..5d14415072fd20 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java b/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java
index ad45e838ed9c3f..3f541304849041 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java b/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java
index 49b51967315399..0c26d6c499db81 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.common;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java b/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java
index 348855edbbfa0f..4877b64ea9765f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.java b/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.java
index f9a71ab1832119..4d77e7f3a05dce 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common.annotations;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java b/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java
index 91abd2970af4a6..dcbc7c8fd26df0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common.build;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java b/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java
index 9caf34cd62312a..aca28f748fe7db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common.futures;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java b/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java
index 1d199203c423d1..e7b5380a1c56b3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- * <p/>
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.common.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
index a5501081ac90f8..cf257cc8f629ba 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java
index c7dcad64088f5c..b56cbfc7e8c719 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
index dec05232797a03..e3204e6457bf9f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
index bb45f8d5d7da72..7641b25a3d9d07 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevLoadingViewController.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
index 32002c750b8799..4d7bd7c84fc207 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java
index 13a6efdb41cbb4..757887ba7d243b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSettingsActivity.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
index b725cfb14ed9ce..59cc883375c9e5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
index c1db27fec1cf5d..656ccd61426604 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
index 51bc07e8a59c33..3441755eb94356 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java
index 71742026b370c3..a6fcfa6dcdbf21 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.java
index 75dea0a30e4d05..8a65c8bc39c503 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.java
index 8ef0e5e35bc114..cc1c8bf763dba2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java
index b710b6de328d2d..7f99c0fd0f2f42 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCSamplingProfiler.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCSamplingProfiler.java
index 049f72c3284468..c69c8eb631fb31 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCSamplingProfiler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCSamplingProfiler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java
index 3a812499713cd2..132ae6ba30a6e3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSException.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSException.java
index ca83f57bb7b7da..d4dfb627225ada 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
index 7a661eb031ecee..80eb0b6e4d51a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java
index 3b53ffd9a0b558..7694c68db9dbca 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReactInstanceManagerDevHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java
index 4c4d046da66768..6d912d545f90ef 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialog.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java
index ad20145a21c6b8..071e7dc4d3c6a7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
index be331756d0c1db..75ca90d532911f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java
index 858f7e004c790a..9a4a581e761bf8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java
index 3f45d3e911e5df..661a8cba243613 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport.interfaces;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevOptionHandler.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevOptionHandler.java
index c0123cb5f53c89..9efe1bd75483cf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevOptionHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevOptionHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport.interfaces;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
index b12027f15308d5..4a081e56d43b67 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport.interfaces;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorCustomizer.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorCustomizer.java
index 03f273e97e42fa..8612d2db9da5c5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorCustomizer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/ErrorCustomizer.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.devsupport.interfaces;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PackagerStatusCallback.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PackagerStatusCallback.java
index f5abfb9bd0489e..5fc3027c555c21 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PackagerStatusCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PackagerStatusCallback.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport.interfaces;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.java
index 2e9903092ded3c..3fdc1ea07e94b7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/StackFrame.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport.interfaces;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawBorder.java b/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawBorder.java
index e8e19bf9158081..9ebbf1baabcfe9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawBorder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawBorder.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawCommand.java b/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawCommand.java
index f6576d71957c38..fd924b8d110445 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawCommand.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawCommand.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java
index 98d0f89d52cebc..9658620aced638 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/AndroidView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/AttachDetachListener.java b/ReactAndroid/src/main/java/com/facebook/react/flat/AttachDetachListener.java
index af51827b9e448b..1498380f3edb0d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/AttachDetachListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/AttachDetachListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/BitmapUpdateListener.java b/ReactAndroid/src/main/java/com/facebook/react/flat/BitmapUpdateListener.java
index 16432e0be13842..3eeb4888d3e3e7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/BitmapUpdateListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/BitmapUpdateListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
index 0008ee69e57781..390f8f9225e8b2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBackgroundColor.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBackgroundColor.java
index a8e62c5f87bdf0..ec9291180d7b40 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBackgroundColor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBackgroundColor.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBorder.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBorder.java
index 1264790961740d..d48b3d326c2a9c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBorder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawBorder.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommand.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommand.java
index e88436fb316ac6..b7f2d5f41f903f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommand.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommand.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommandManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommandManager.java
index 0f695f04780555..bdab8db25e8639 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommandManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawCommandManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImage.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImage.java
index a61ebafeaefab6..05b9503d0edea4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImageWithDrawee.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImageWithDrawee.java
index da506de63f35b5..8797cce68e83ad 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImageWithDrawee.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImageWithDrawee.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawTextLayout.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawTextLayout.java
index 52fdb6fa0b78ab..495a53e0d06843 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawTextLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawTextLayout.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java
index b378ab22dc23c0..e2bdce5fb95201 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DraweeRequestHelper.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DraweeRequestHelper.java
index 89f4ef236ba4e8..bf32f740395e30 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/DraweeRequestHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DraweeRequestHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/ElementsList.java b/ReactAndroid/src/main/java/com/facebook/react/flat/ElementsList.java
index b0e5eb86856189..e741cde43306ca 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/ElementsList.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/ElementsList.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java
index c8afc3e54ac26e..f6382b80befccb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewShadowNode.java
index 64a127538dd723..09fa6a42a42969 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatARTSurfaceViewShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatMeasuredViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatMeasuredViewGroup.java
index 573f8944f08ca7..7e7ee2e46ac427 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatMeasuredViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatMeasuredViewGroup.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java
index d7d74eb2e7f5a7..eb2d082bdf89ab 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java
index 4a180685d0ee9b..01191247c84edc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatReactModalShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java
index d339a14ba34082..b60ab205b7a406 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootViewManager.java
index 6451d62d26dd95..929c8ce81836aa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatRootViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
index f9959b8b8651cf..9f96433b8094f0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatTextShadowNode.java
index 893e508512c75e..90a349d2e573ba 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatTextShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
index 3eacf06ba54f49..74174d2b6ab50a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIImplementation.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java
index d2f9bd4e6011d0..3806e2ebc602ab 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatUIViewOperationQueue.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
index f46d6745b5e7fc..ae94b744b9fdfa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewManager.java
index 5bfe0aee6b6421..8969b67243b80b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FontStylingSpan.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FontStylingSpan.java
index 6fb32828f0feeb..d7490984da726a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FontStylingSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FontStylingSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/HitSlopNodeRegion.java b/ReactAndroid/src/main/java/com/facebook/react/flat/HitSlopNodeRegion.java
index 09ef242545839f..09bb2f90cb52fb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/HitSlopNodeRegion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/HitSlopNodeRegion.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/HorizontalDrawCommandManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/HorizontalDrawCommandManager.java
index e80c4a0a746cfc..9621c9b3ebeb03 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/HorizontalDrawCommandManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/HorizontalDrawCommandManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/InlineImageSpanWithPipeline.java b/ReactAndroid/src/main/java/com/facebook/react/flat/InlineImageSpanWithPipeline.java
index 47f0b2dc1cc14e..9f7aca9a72019a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/InlineImageSpanWithPipeline.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/InlineImageSpanWithPipeline.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/MoveProxy.java b/ReactAndroid/src/main/java/com/facebook/react/flat/MoveProxy.java
index 08d2e6f81dda3c..6f786b80f85459 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/MoveProxy.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/MoveProxy.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java
index 06f1b35b43e814..a930f7504daa6f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/NativeViewWrapper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/NodeRegion.java b/ReactAndroid/src/main/java/com/facebook/react/flat/NodeRegion.java
index 36e7b765c54efd..41169f7f2de481 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/NodeRegion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/NodeRegion.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/PipelineRequestHelper.java b/ReactAndroid/src/main/java/com/facebook/react/flat/PipelineRequestHelper.java
index 8d2881b690aaf9..77b4fb0dcd9d99 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/PipelineRequestHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/PipelineRequestHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java
index fd4da4a3d5e736..7b74a130b4964c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageViewManager.java
index 7813bc2241fab6..6d7dcd494e8bcd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTModalHostManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTModalHostManager.java
index f9f7b4d66ba6c6..1b49f57534dbb8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTModalHostManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTModalHostManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawText.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawText.java
index 4d675b9433c950..f0a8d1d33861b6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawText.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawTextManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawTextManager.java
index b50dd7a1adfb29..c1695c507489be 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawTextManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTRawTextManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java
index 4e07754ff8214a..683aabf6d6f7d8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java
index 8a0f937ca984a9..728df41d51d4bd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImageManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImageManager.java
index f4c73e586a7d6d..f670378585e5f0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImageManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImageManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java
index 221117a6c8ab2e..77d3cd9a33b3f2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInputManager.java
index c641acd7566499..62fe19960cba5e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInputManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextManager.java
index fc94166c65e762..77ec1fb256e285 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTView.java
index 547fe5f1838920..2beaa2230ce624 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java
index 98f861e61b99ab..2e08dde5d2116a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewPagerManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewPagerManager.java
index ea6ef191e2175c..23b00fe198431c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewPagerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewPagerManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java
index f50749fb188e32..1c0bcee7913a58 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualText.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualTextManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualTextManager.java
index d32cf8eca0493c..0c1ff3fd97863b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualTextManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTVirtualTextManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/ShadowStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/flat/ShadowStyleSpan.java
index 6f79adcb4e1f5f..a0435b409ba834 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/ShadowStyleSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/ShadowStyleSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
index 61bf2bc7797e46..301a488581c817 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/TextNodeRegion.java b/ReactAndroid/src/main/java/com/facebook/react/flat/TextNodeRegion.java
index 434520209d9855..9440ebc0835156 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/TextNodeRegion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/TextNodeRegion.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/TypefaceCache.java b/ReactAndroid/src/main/java/com/facebook/react/flat/TypefaceCache.java
index 52da24a01f9311..c684af4adaaa92 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/TypefaceCache.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/TypefaceCache.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/VerticalDrawCommandManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/VerticalDrawCommandManager.java
index 0584823b855687..9cf730fcbc4425 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/VerticalDrawCommandManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/VerticalDrawCommandManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/ViewResolver.java b/ReactAndroid/src/main/java/com/facebook/react/flat/ViewResolver.java
index 0ff867f5da7a8e..1d742ec8f1eefa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/ViewResolver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/ViewResolver.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/VirtualViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/VirtualViewManager.java
index 04078415e1e011..dc382fea10f9aa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/VirtualViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/VirtualViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.flat;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskEventListener.java
index fd81539b4508db..af7acc6da72d55 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskEventListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskEventListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.jstasks;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.java b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.java
index 23c9437116c5bd..e70ae678a44d9c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.module.annotations;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/AppRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/AppRegistry.java
index 37e07edd30a276..16b39acd67a9c0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/AppRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appregistry/AppRegistry.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.appregistry;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
index 78be38352c55f5..f4bc26fbafedbf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.appstate;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
index 7e1c4954af8b7e..0c2adc91d43fb7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.modules.blob;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java
index 2404f2dbab1393..8e46ba7f0bd066 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.modules.blob;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java
index d8cd3c73e63e91..88a15734836385 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.blob;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java
index c10c46dde89db9..eb332268ad6690 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.camera;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java
index 02ff3ec13f7ea1..930a12fb757c19 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageEditingManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.camera;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
index 1cae0f27284c1f..5615bbd0d1a280 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.camera;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
index 62187356b814c6..4aeaea2d7ba61b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/clipboard/ClipboardModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.clipboard;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/common/ModuleDataCleaner.java b/ReactAndroid/src/main/java/com/facebook/react/modules/common/ModuleDataCleaner.java
index 0e811e1a04817f..e085008dd48eda 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/common/ModuleDataCleaner.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/common/ModuleDataCleaner.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.common;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ChoreographerCompat.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ChoreographerCompat.java
index bfad9499670c70..cfa29c7af11f21 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ChoreographerCompat.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ChoreographerCompat.java
@@ -1,10 +1,8 @@
 /*
- *  Copyright (c) 2013, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) 2013-present, Facebook, Inc.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  *  This file was pulled from the facebook/rebound repository.
  */
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DefaultHardwareBackBtnHandler.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DefaultHardwareBackBtnHandler.java
index 55c2810bb1cd92..ec0e92188f15a2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DefaultHardwareBackBtnHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DefaultHardwareBackBtnHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java
index 806455cdae004a..11570143e09c87 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
index af6e133e5bba81..c3b995baac638a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.java
index 5f4c0799d422a2..62fd4d553ac8d8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/JSTimers.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/JSTimers.java
index 1e0ab729d5b67d..5520a713770211 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/JSTimers.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/JSTimers.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.java
index 50506f99ba2581..f8c780626c9a2c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.java
index c4011ea1370979..205ce21c894e68 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/RCTNativeAppEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/RCTNativeAppEventEmitter.java
index 2f678a97b48d9a..c59d8e0e11380c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/RCTNativeAppEventEmitter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/RCTNativeAppEventEmitter.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java
index 4e622f52451ec0..653b9d999edbb1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java
index aeb467082c9702..0716ddaa56b6da 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.core;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java
index 50d77884110603..8ba3c5555205f2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogFragment.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.datepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
index 1aeea410d4e1d2..8d531ce65dd323 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerDialogModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.datepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerMode.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerMode.java
index 5106c9cce475bd..a499657a67d273 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DatePickerMode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.datepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java
index cdedafc60beb83..18c3ea2faac9db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.datepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java
index d935d58d84d542..582dc8c954e315 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/SupportDatePickerDialogFragment.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.datepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java
index 5e991d4c48c67d..96884ba62a24b5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.debug;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.java
index 3f5876a4cb4026..37bf6596f6da76 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.debug;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.java
index eda077bab8223a..ee55407636be4b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.debug;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java
index 51b9c208f9e3d9..a631589365c6a3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.debug;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.java
index 6c51bc6891798d..9850d0e2722a30 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/interfaces/DeveloperSettings.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.debug.interfaces;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
index d6b43bf4b795a4..ea2f46948121ff 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.deviceinfo;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java
index 9f23515c63c3b7..a233b9130fc0c7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.dialog;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
index 6c2f39d180d691..df1f45aca0e0e9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.dialog;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java
index f93c8afa7110a1..dea3c71a6f60fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/SupportAlertFragment.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.dialog;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
index b4e0b997d4480d..40e0a22eb0cdb1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.fresco;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java
index a2bdfca5ba446b..40f96f7aa515f3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactNetworkImageRequest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- * <p/>
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.fresco;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.java
index 9d8a34ec439793..5b89fec6a50a95 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- * <p/>
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.fresco;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
index 4124dbecd11c44..fdbf4b4ee62c9e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.i18nmanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java
index 1a2ecf11e50957..9bba7414285525 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.i18nmanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java
index 92ab18ca5e3804..3e10ad9262ef88 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.image;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java
index 8d3cc8b751a424..2a4c20ed56c352 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.intent;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
index bdc908ca704c2d..ba5059f93d471c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/location/LocationModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.location;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/location/PositionError.java b/ReactAndroid/src/main/java/com/facebook/react/modules/location/PositionError.java
index 5df0372e4993a0..82f7d0dc801544 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/location/PositionError.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/location/PositionError.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.location;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java
index 58c57387eba9b5..98c6a5f1761fa9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/netinfo/NetInfoModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.netinfo;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.java
index 15f136753ca6b6..2f23bb15c1d806 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkInterceptorCreator.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
index fe379bb1f2e414..2635157116643c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.modules.network;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.java
index 9e417d00fdc7bf..25d2e521106d74 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientFactory.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
index c90e908ad1c931..125059675d8883 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressListener.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressListener.java
index 5cca72845cde8d..19376825dff0d6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.java
index 0e478228f4e048..914ce3c901106a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressiveStringDecoder.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressiveStringDecoder.java
index 1d528e77563648..afc6fdd94d26d0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressiveStringDecoder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressiveStringDecoder.java
@@ -1,10 +1,8 @@
 /**
 * Copyright (c) 2017-present, Facebook, Inc.
-* All rights reserved.
 *
-* This source code is licensed under the BSD-style license found in the
-* LICENSE file in the root directory of this source tree. An additional grant
-* of patent rights can be found in the PATENTS file in the same directory.
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
 */
 package com.facebook.react.modules.network;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java
index 121d1971b659ef..2f4c13c32c48e4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.java
index cd5aabff0fdceb..5d009245d0312b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java
index 0fd2a2d8676889..0cd441e6fb5c07 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.modules.network;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java
index 634dc89555fc05..0b943bc6c08e7d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.permissions;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java
index 06b4a1aea17084..aa9717e0b3bc15 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.share;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java
index 296e9f09c5356b..333b5ce5a4e788 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- * <p/>
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.statusbar;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java
index ea6487c9b49818..11f9a569e655e2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncLocalStorageUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.storage;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java
index 75f25617e5071b..381b46bd02d7bf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageErrorUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.storage;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
index 0dba149d85d04f..c9fc96e575f169 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.storage;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java
index 9787ddf6a978a8..6e845fb802dd26 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/ReactDatabaseSupplier.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.storage;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
index 700b6a616bb40b..98ca742f716803 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.systeminfo;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
index b6514ec58be729..9e8ac43662b364 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -2,11 +2,9 @@
  * @generated by scripts/bump-oss-version.js
  *
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.systeminfo;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/DismissableTimePickerDialog.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/DismissableTimePickerDialog.java
index 53da526aafda6a..8e59a1b482dc8e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/DismissableTimePickerDialog.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/DismissableTimePickerDialog.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.timepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/SupportTimePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/SupportTimePickerDialogFragment.java
index d745984a1d42bd..3dc5579cbd49e1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/SupportTimePickerDialogFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/SupportTimePickerDialogFragment.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.timepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java
index 2450aa92755320..a5bf836efd5557 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogFragment.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.timepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java
index 178d50fd843ee5..d74f3a712ddca7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerDialogModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.timepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerMode.java b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerMode.java
index 1dd547f7069f6d..26657481c87ea6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/timepicker/TimePickerMode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.timepicker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java
index 6902df223e859f..a75f1a9a995cd0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.toast;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java
index 932d82a8038c4e..8d92f019337044 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.vibration;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
index c7b6c8bbe50d79..fcdb890f8c4632 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.websocket;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
index 5f55f03d8cc6f0..11cb364573728c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
index efa8fbc111296d..50340d6d5fe622 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java
index dc337019cb99b3..1ff1f2c6e149a8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java
index 488601521364f7..5ef2b73f7bc58b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java
index cc00f3d8e3fb39..46cfb6d907a196 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java
index 4d7a25231ee72b..d6f97f97132a78 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestHandler.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java
index 9e617bee728bf9..d4af3571fc736f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java
index b91a0a7d1d8a08..c2d4a1f5d4792d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/Responder.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/SamplingProfilerPackagerMethod.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/SamplingProfilerPackagerMethod.java
index a4457d7393948a..f1de5e198efe87 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/SamplingProfilerPackagerMethod.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/SamplingProfilerPackagerMethod.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java b/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java
index a5fd60a1573a02..388709b87eaaeb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/shell/MainPackageConfig.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.shell;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
index 73b478ea030b03..aa8193d08e4def 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.shell;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/JSResponderHandler.java b/ReactAndroid/src/main/java/com/facebook/react/touch/JSResponderHandler.java
index 7140e2c303fea8..c206bc725752b3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/JSResponderHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/JSResponderHandler.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.touch;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.java
index 299d2f4ae0ca5b..6bb2e71b907e10 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/OnInterceptTouchEventListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.touch;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/ReactHitSlopView.java b/ReactAndroid/src/main/java/com/facebook/react/touch/ReactHitSlopView.java
index adda78ab020cfc..82f7f3d6bb5d2b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/ReactHitSlopView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/ReactHitSlopView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.touch;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.java
index d7b919b7f18e98..c75c1b017f268f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.touch;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityHelper.java
index 036badada735ca..615bfbbcd8f6c7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/AccessibilityHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
index a8d130ca621aa9..4d2ad3b55d2d43 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java
index 35caa12caeeaed..79930641fbbc2c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/GuardedFrameCallback.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/GuardedFrameCallback.java
index 60ea1ddc9861be..abc9d1fb4c67ba 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/GuardedFrameCallback.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/GuardedFrameCallback.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java
index 3f5899e55bf885..4707a9c143c5b0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/IllegalViewOperationException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
index 86abf04fdd3f19..096a7beb69f384 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecAssertions.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecAssertions.java
index 3247709e619aed..5dd2f36ac7711a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecAssertions.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecAssertions.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
index 66a333b41f6eac..95d919ed10d8c9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
index f1ab0472b0ad1c..de23eeaa1cce25 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.java
index d8c125a72a6ed8..7fdf9d8943533c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
index 118a1bbdc3ed6c..47de61c9a6d7fa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java
index 6a3ecd0a592936..4f69c62e50059e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java
index 1d86fe7494c57c..da4f248fa76027 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/PointerEvents.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroup.java
index 1ff1bfb6074cc1..a6b0f51efcbe73 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroup.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java
index eab4ae170f6156..009cab688e4ae4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundView.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundView.java
index 980e35d6256367..4f2f27976f0a45 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundViewGroup.java
index 345dea9f9184bc..e78f67bc9a230d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactCompoundViewGroup.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java
index e219f18ccd0857..4ac48ee9d9579d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactInvalidPropertyException.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPointerEventsView.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPointerEventsView.java
index e47e13e483cb21..334b1949079749 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPointerEventsView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPointerEventsView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
index de2b4425127747..87950f69f0c4b0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.uimanager;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index 55c49d70e5ac19..e6bb9a5865878c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.uimanager;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.java
index 601acfe45693ff..d57504f4bb1002 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStylesDiffMap.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.java
index 6863740ea3dea6..1ce0316f9b9966 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java
index b9ee413b4a577a..c590a53eaf2ad8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java
index f9076cbe45b8de..98727a39a8fdbe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.java
index cf25abc4d348f6..1b3cebc1fb2495 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/SimpleViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/SimpleViewManager.java
index 3ddaa406330952..9430ca7a62cd5b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/SimpleViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/SimpleViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/SizeMonitoringFrameLayout.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/SizeMonitoringFrameLayout.java
index fa952878dbcaac..9e6c580155cf03 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/SizeMonitoringFrameLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/SizeMonitoringFrameLayout.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java
index 2dc9ffb66dc7aa..53bea8824d7607 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
index f3a1a2f10863c3..375df0d05ff884 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
index 90ad8acfd364a2..fc8c4cb1476d3e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
index b58d25aaa6f1e5..98e4a592c6ec9d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.uimanager;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java
index 305519af9e62c9..51e0d66e93b915 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementationProvider.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.uimanager;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
index 7becf4ad48f221..6a8d6db53f8219 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java
index 8f5cba8c3bc854..1eea5018a8dfc5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
index 76e0b9ecea2d20..beb067f1313ab0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleListener.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleListener.java
index 1dda859eb3f459..46e5807a3b1466 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
index c09a7cfccd4e07..dcce5b8ed9b44d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java
index 6ceef2632d36f4..18d95d7c17160f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java
index 5ee3cc36ab2f00..0ccacd7f5dab7e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
index 7ea9a57399f92c..b96562ed1713a4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
index 103529a0e96857..017fb5764e7237 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java
index 3b46b626841342..6c0ae3dd62d40d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewHierarchyDumper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
index 4972cbbde45f1e..1895adc1ad17b1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java
index 66559f9e78fed0..7e71b566b5799d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
index 18f238320e4989..ec703e8cf9e317 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java
index 6f35ca06588eeb..c1ac00488f3906 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/debug/NotThreadSafeViewHierarchyUpdateDebugListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.debug;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java
index 56eeabc5004b90..68d07f3f87887a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
index caaf1c6ce070e8..c53a9f3dec5fb0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcher.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java
index 6ef3011b2a8add..41328fd24c7493 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/NativeGestureUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java
index 4fa6f36770cb5e..b964186059f372 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
index 03d922852ea361..1d16c159523231 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java
index 3003dedb4c5d32..3ead8fc7bfe4f3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventCoalescingKeyHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventType.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventType.java
index 36f32966114e90..6d6cac7b6cf0ed 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEventType.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java
index 43a12b073fde9f..cf435590f70275 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java b/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java
index d3ebe61320ac1d..7a3d5f02e0dac3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/util/JSStackTrace.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.util;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java
index 2f83aeeb30522c..780147294f1a44 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java
index 2bae8758dc11ee..bb98853f652f7a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java
index ca5e4f136d5eba..dc8980ae2ebc06 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceView.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceView.java
index ea55d0b415f112..93f2c21eb1aacd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java
index 88046a62ca261f..24787ef84a5364 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewShadowNode.java
index e3c78600bd260b..429812e1991627 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTSurfaceViewShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java
index d6e1583529cc29..b10f59bff8d247 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java
index ac9739b02d4c50..5cc9d49f65f984 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/PropHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/PropHelper.java
index 04497fc4d88d4d..b841cf856b1eea 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/PropHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/PropHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.art;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java
index 88e7f6aa745062..324a9b2c7869ff 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBox.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2017-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.views.checkbox;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxEvent.java
index 085edcec63c25d..0f41725efdb64b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxEvent.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2017-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.views.checkbox;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java
index b064d940fa363b..e71c601f4e7b74 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/checkbox/ReactCheckBoxManager.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2017-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2017-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.views.checkbox;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
index cdb0265e26e49f..acd637a7166e98 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.drawer;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
index e61d1266e1f29e..1620d637a9d977 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.drawer;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java
index a6845037d89702..4f51b7f596bf47 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerClosedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.drawer.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java
index b94d5937ae4510..471cd079dad652 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerOpenedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.drawer.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java
index 5010ee6befa480..ca4260e44f9335 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.drawer.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java
index a4d9294875201b..41682e17f6eb65 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.drawer.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java
index f47c34540164c7..d21984a3f306e0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMethod.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMethod.java
index ff366b0c28958c..98fb2fe7151c2d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMethod.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMethod.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java
index 96f22e326da2f7..3cff8b9667a292 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
index e77fd6fd98e541..21014c5c7b0fd5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
index 940ae7f1b002de..3fa2e66eb82e6d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java
index 9a914cb66edbb2..116ef13bb92f7b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ImageSource.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.imagehelper;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.java
index ef3f4f981ee198..d01b314e83681a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.imagehelper;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
index 0e2a20e574a0e5..de962cecab2312 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.imagehelper;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
index 8c3b5fde63e7ba..98c5f0db69aaa9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.modal;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
index 68d4c91f1e9773..0f67e9c9e0bb13 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.modal;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
index b191afd028e3fb..1d64cb83f8f018 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.modal;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java
index 133488760441bf..ec3129dc8d069d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.modal;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java
index a0851ccf75e6c9..6e76cb71e66fac 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.modal;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java
index cf3597d4d73823..9d0f6c9371a428 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDialogPickerManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.picker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java
index ba92aa69e93be8..e099e467de8962 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactDropdownPickerManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.picker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java
index a5e4a12b74bdab..cb0ee6d4d781ba 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPicker.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.picker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
index 5e1e9ccf33a236..59f5461ab60795 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.picker;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java
index 3eb45f48b74424..91b15a94539f49 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/events/PickerItemSelectEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.picker.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
index e8209c002b6298..7975f67fbd9cd3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.progressbar;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java
index 22610aaa0c63d9..e35eafe1efd9e0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.progressbar;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/FpsListener.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/FpsListener.java
index dfff3149a0f987..2ce0ae2d5baa8f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/FpsListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/FpsListener.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java
index c0014311f9551c..b8d0c11158de37 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/OnScrollDispatchHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
index ebcd2d50110663..90b9d1fc4d3a9c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
index 9b59dc6c55ff56..f0d9a6011684fc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
index 509964ceb13064..acf3458ef5f023 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.java
index 0e2df5918c15d8..7eaa06386d5b71 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
index f71c2965019900..a034694b4bd9d7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
index aaba2fb7261121..ecab38a6d16e9d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
index 7dc9c4feb112f7..bf3da944d4773e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEventType.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEventType.java
index 5e01b47a1b26b6..5a3810d035b3a9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEventType.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEventType.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.java
index 612daa862b48b6..5972b25632a189 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.scroll;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java
index 666d9d14664f70..644be5c0bfc6cc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlider.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.slider;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java
index f45dc71f301794..dabb326a530407 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.slider;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
index e1f33cb01d86af..3c5547606dd8a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.slider;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java
index 1dceb63ee4c685..37553abaf22c2b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSlidingCompleteEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.slider;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java
index 9f8ede6537c768..3ffa43dfde936e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/ReactSwipeRefreshLayout.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.swiperefresh;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java
index 0745d2adbecee7..c03b4a11dc3858 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.swiperefresh;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
index 99b62b4a96b67e..4988129234edd5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.swiperefresh;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
index 13b4653049d4c4..3c9dc82b848a5e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.switchview;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java
index 0b60076448979a..75dfe794499e32 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.switchview;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
index 1f98b13aa6e4c6..1bec8c42841ce9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // switchview because switch is a keyword
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java
index abba786b1bd44d..ed72dfa9b13d5e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLineHeightSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
index a4a1db4847cc70..127e3ab82d4d4f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.java
index 51edb5a32c8778..92bfe2511aa566 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
index 5b23adab70d041..0be8fa6265512e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.views.text;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
index 1e63a209492369..001cba18810f2b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
- * <p/>
- * This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java
index 35bdf2a3c32600..ff994f98ce33e6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
index 6cf0200c746265..6bc7cc93d0f4f3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
@@ -1,9 +1,8 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+ * Copyright (c) 2015-present, Facebook, Inc.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.views.text;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTagSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTagSpan.java
index 9bdc7c03f61941..772adc7a9c0855 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTagSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTagSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
index 4782b70d73e913..71ba5eef46095f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * <p>This source code is licensed under the BSD-style license found in the LICENSE file in the root
- * directory of this source tree. An additional grant of patent rights can be found in the PATENTS
- * file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
index 3f4b2b9363f6d3..7f63093b3778bf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
index 6bd12cc697945d..35e1824894dd52 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
index 9f67aec6180dee..964f92ed6a37dc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
index 41ca82f4cd4992..226a5d4e0f4686 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
index 2ade0ece3fd0cf..8b6578f38b9f9c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.java
index 64753b8a7524c1..2df5718b5ad274 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ShadowStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ShadowStyleSpan.java
index 9e030f838ca98a..2b2dd1fa94b4c2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ShadowStyleSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ShadowStyleSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineImageSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineImageSpan.java
index c987260fd0f380..db620cb6157cb6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineImageSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextInlineImageSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
  package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
index d662c79c9382f0..e069c8f5cab4cc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text.frescosupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java
index 2293bc67472c52..da53a968703fa8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text.frescosupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.java
index bf5ac353f3697b..ca1ee0baba1350 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text.frescosupport;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ContentSizeWatcher.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ContentSizeWatcher.java
index fab6bbc1e34d1a..e02a8c9e0969b0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ContentSizeWatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ContentSizeWatcher.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java
index 2ad1a1c3a37315..e9cf4fffe7acae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index e1796270a09bf8..0dde905faed0ee 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
index 5a06db595e2027..f0e12e61f340e5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java
index 7b9f2829b12ae9..7ecb6ef86d50a4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java
index a51d01677e8107..bb15cc6ed47fa3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputBlurEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java
index 9c6975cf7a9869..812bea17461d6d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java
index caab8c136c0eb4..2df3a8380a91db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java
index 3ca67c3d944008..883069b0e97e6d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputFocusEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java
index 7771a1d0e1d83c..f3530d0e3df53e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputLocalData.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputLocalData.java
index f12cf8832c531f..3940e4f7c62043 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputLocalData.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputLocalData.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index b4904a9e3b172e..bf27f485dca392 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
index c9e5a4153715ef..f34e342a518fd4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
index 3fac6104ec0422..cdc1d1196fb4f5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java
index 32b9755a0129d3..e0819785034b60 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java
index ec2ac41c56e074..079d8555428d09 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java
index f569067ab91687..0ac6d0e5cbfcdb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java
index 8b92242914c90b..7d8a5f5dadcf88 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/DrawableWithIntrinsicSize.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.toolbar;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java
index 57d8c6d0d0fc5b..e0526dc159f898 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbar.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.toolbar;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java
index 6521544d53321a..be9377047a90c8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/ReactToolbarManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.toolbar;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/events/ToolbarClickEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/events/ToolbarClickEvent.java
index ecbf31dac3b27a..6b88f2dee676a0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/events/ToolbarClickEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/toolbar/events/ToolbarClickEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.views.toolbar.events;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java
index a8efbd777d0d40..1e57cc8e793ad1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.view;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
index a4dda0d9d3d89a..2675c10d2790a8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.view;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
index 4990dd4236a893..9e374b4c502ecb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.view;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
index 4ab4e9119cc222..3641d120dab333 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.view;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
index 0ca79f814e07fe..0cd8f4ccf58b9c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.view;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java
index 6eeac56d747ba1..2d4dc97c884fa0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.viewpager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollStateChangedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollStateChangedEvent.java
index d3a5a7c4a10302..49ba9f322d8f8c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollStateChangedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageScrollStateChangedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.viewpager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageSelectedEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageSelectedEvent.java
index 6145c08230bcc2..773c31bedbeea8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageSelectedEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/PageSelectedEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.viewpager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
index 7d99e272a40153..77e93269bdcf3f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.viewpager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java
index f211b7b04bfe6d..65d676ac91591e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPagerManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.viewpager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
index 05b6740ad66b0b..3097beea5aadd6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.webview;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/WebViewConfig.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/WebViewConfig.java
index 7b2f1241efadbd..9e6d594ccd30a4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/WebViewConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/WebViewConfig.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.webview;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingErrorEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingErrorEvent.java
index 795b29f69a4533..02336a418eb74c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingErrorEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingErrorEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.webview.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingFinishEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingFinishEvent.java
index e858fbc176dff9..088a512606757d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingFinishEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingFinishEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.webview.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingStartEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingStartEvent.java
index 171cf6e6515712..154415d5eaa690 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingStartEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopLoadingStartEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.webview.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopMessageEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopMessageEvent.java
index db5a4200d7fd6e..75c26a9346d922 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopMessageEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/webview/events/TopMessageEvent.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.webview.events;
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java b/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
index bea7a86825d7aa..c3576f0b49c20a 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.systrace;
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java b/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java
index 3a255eb940047b..03dec5938b9318 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.systrace;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
index deb45f1d8d6cf5..bea5aebda8ea88 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaAlign.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaBaselineFunction.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaBaselineFunction.java
index c0984012347b95..9ec41e7eae440a 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaBaselineFunction.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaBaselineFunction.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
index 5e82fe22cd7806..3741583b96a2bb 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
index 43f78139c45420..e11c1044daf8f5 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
index b6cb1f84759973..b0d89226d28665 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDimension.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
index 29789fcb08b173..dd6444e12ea792 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
index b7d416ec287f5e..e6e52aadef9acb 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaDisplay.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
index 53677cff22bb7a..053490dabfb014 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaEdge.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
index 02dad1ed6bc9dd..a8a4be1432a514 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
index 19bdd20420d0f3..cf192d6c07ac31 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaFlexDirection.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
index 283e0b57399897..9e15dc4a95286d 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaJustify.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
index d16d98f4be4d54..458e1b950ebb88 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogLevel.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java
index b27597bc531c73..66f62c89d7172a 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaLogger.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.java
index cf32f1fadee940..2d2b304d3f967d 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
index 42633fa29a6bc0..9719377630fa85 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureMode.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureOutput.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureOutput.java
index b127c132e62951..1d2141d12a05ac 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureOutput.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureOutput.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
index 1a280dd8d100d5..1ba81249c6f950 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeClonedFunction.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeClonedFunction.java
index 8c27d16bfe83ad..f469546495f855 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeClonedFunction.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeClonedFunction.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
index 1b565ea1901bfe..fb767b0587eee8 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeType.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
index 510f0af43f370f..9563d3036410ee 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaOverflow.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
index bbaeba38f249b7..be42a999231a93 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPositionType.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
index 58e2dc95e04783..5a804adf4552c4 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaPrintOptions.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
index 8a08b0e5c39b6a..8eb2b31680a534 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaUnit.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaValue.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaValue.java
index ae9bd05fc9b860..a99d564189058b 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaValue.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaValue.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
index a19d3de3baff44..1eaa9f7ad6f220 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaWrap.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga;
diff --git a/ReactAndroid/src/main/jni/first-party/fb/assert.cpp b/ReactAndroid/src/main/jni/first-party/fb/assert.cpp
index db9a43159978bc..d39c29e45cc176 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/assert.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/assert.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdarg>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h
index 0ed1c5fd6ab8f8..5f231cb7c8f20f 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /** @file ALog.h
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h
index 1e402a3fcb2345..1fafba36ae85e9 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Countable.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h
index 34864fc328f898..319e96ecb08628 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h
index 36f7737f643684..92b45406f3c471 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h
index d21fe697ea5adc..ee19960fa3547d 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h
index 6d943972a61f94..c5ecc2fedce515 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h
index d86a2f0deac66d..1b868c44fe61dc 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h
index 1ff0740ace2e34..ea0c3f65edb258 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #ifndef FBASSERT_H
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni.h
index 66944c1caae8f3..e67aa1641313bb 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h
index c816924c5fceb8..595bfacfe6d108 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Boxed.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ByteBuffer.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ByteBuffer.h
index 26ae3589aa676d..21d17a27ad8e33 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ByteBuffer.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ByteBuffer.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Common.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Common.h
index 9da51c406e989f..a7775db6d2efb7 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Common.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Common.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /** @file Common.h
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Context.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Context.h
index 8630aa6bf49d80..726a25333f0ced 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Context.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Context.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses-inl.h
index 9149df24e8d140..147f885684af3d 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses-inl.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses.h
index 76eecb87b1c176..abfe45ce0d0514 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/CoreClasses.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Exceptions.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Exceptions.h
index b1089139d50900..689b9be3463ac0 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Exceptions.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Exceptions.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/File.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/File.h
index 29fc9850a95ce2..74c752a0785ec7 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/File.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/File.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Hybrid.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Hybrid.h
index e2cac448fd7aa4..7ca5016a80dc67 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Hybrid.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Hybrid.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator-inl.h
index 206d2b4b17a577..c056e16af15695 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator-inl.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator.h
index aa3652666e7da2..0da2c36237d0bb 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Iterator.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JThread.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JThread.h
index 60b3cac20ab56b..1bb61199fbf0a9 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JThread.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/JThread.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-forward.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-forward.h
index ff08aff4607520..60dfee44d34ff2 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-forward.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-forward.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h
index 05ecd237e89e9f..ad44470a86fb06 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta-inl.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta.h
index 4aefb0ca1825ed..e9717bf7fd8bb3 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Meta.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /** @file meta.h
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/NativeRunnable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/NativeRunnable.h
index 68da6a25fb4c7d..0502e36b5a1139 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/NativeRunnable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/NativeRunnable.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators-inl.h
index cd1be640d0d294..b78f66040230dd 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators-inl.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators.h
index 024ba797ff2905..a971263ad0d9c2 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/ReferenceAllocators.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-forward.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-forward.h
index 8dabf67cb62e60..58ce511d50e56e 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-forward.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-forward.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-inl.h
index 74a01e1843e8f0..fc6c689ea40b77 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References-inl.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References.h
index 796b8029677161..39cc71a2498c6d 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/References.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration-inl.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration-inl.h
index 33da549c337cb7..ce0636e014747b 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration-inl.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration-inl.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration.h
index ecead9fff87903..cae1ab48b82376 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/Registration.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/TypeTraits.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/TypeTraits.h
index 26472669dc7184..36c8bec15dae27 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/TypeTraits.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/fbjni/TypeTraits.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h
index 7212cc4d0896a7..5dbc03126ad1c9 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h
index 37f006a498d1d2..41152f5d171ede 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/fb/visibility.h b/ReactAndroid/src/main/jni/first-party/fb/include/fb/visibility.h
index 7011a06bc6daa1..6c14b50c159b7f 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/fb/visibility.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/fb/visibility.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/Countable.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/Countable.h
index 24f27c692a2c10..ae59441babdb1a 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/Countable.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/Countable.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/GlobalReference.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/GlobalReference.h
index f0faf5fb884169..20c275e2de2ca6 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/GlobalReference.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/GlobalReference.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/JniTerminateHandler.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/JniTerminateHandler.h
index 843f988d2c0268..509405b31a8b22 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/JniTerminateHandler.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/JniTerminateHandler.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalReference.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalReference.h
index 22a558dc76add9..531f26ef8efc73 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalReference.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalReference.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalString.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalString.h
index 5ed89a1b1aa899..9d07ef6441cff8 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalString.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/LocalString.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/Registration.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/Registration.h
index 243a947889d710..8b91cba35e2061 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/Registration.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/Registration.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/WeakReference.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/WeakReference.h
index d8d59f9b7e4506..898f91e9eb804c 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/WeakReference.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/WeakReference.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/include/jni/jni_helpers.h b/ReactAndroid/src/main/jni/first-party/fb/include/jni/jni_helpers.h
index 808593ab3499a6..93912f4a0a59a0 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/include/jni/jni_helpers.h
+++ b/ReactAndroid/src/main/jni/first-party/fb/include/jni/jni_helpers.h
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/ByteBuffer.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/ByteBuffer.cpp
index 2e839ecf432a2c..5a5317f9f2b15c 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/ByteBuffer.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/ByteBuffer.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/fbjni/ByteBuffer.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/Countable.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/Countable.cpp
index 0d7c388f53f6a6..ee958bf57157ee 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/Countable.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/Countable.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <cstdint>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/Environment.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/Environment.cpp
index 48060107e2bc6c..eae5c73ebc8be8 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/Environment.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/Environment.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/log.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/Exceptions.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/Exceptions.cpp
index 3dca10b76a7541..783f468c4de3f9 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/Exceptions.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/Exceptions.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/fbjni/CoreClasses.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp
index 9d7cdcbf16f6e6..dfcf858fd16da5 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/Hybrid.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "fb/fbjni.h"
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/LocalString.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/LocalString.cpp
index 7e60d2642300c4..7679d09404b825 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/LocalString.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/LocalString.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <jni/LocalString.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp
index 0334729c8e20b6..228621cbd90f43 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/OnLoad.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <jni/Countable.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/References.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/References.cpp
index 0ef4b0d6d0525e..37160cdd1bb1e4 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/References.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/References.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/fbjni/References.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/WeakReference.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/WeakReference.cpp
index 1fd4e50ac2c06b..dfaa02f6c76fd2 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/WeakReference.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/WeakReference.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/Environment.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/android/ReferenceChecking.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/android/ReferenceChecking.cpp
index 9893db41d3a97b..7d3fc5716d12bd 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/android/ReferenceChecking.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/android/ReferenceChecking.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #ifndef __ANDROID__
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp
index e595ea90f6495c..b455ad845199a3 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/fbjni.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/fbjni.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppException.java b/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppException.java
index a0c845dd62878a..6308d5dc269310 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppException.java
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppException.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.jni;
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppSystemErrorException.java b/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppSystemErrorException.java
index 13090a18ce30a3..942a617148a629 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppSystemErrorException.java
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/java/CppSystemErrorException.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.jni;
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/java/UnknownCppException.java b/ReactAndroid/src/main/jni/first-party/fb/jni/java/UnknownCppException.java
index 45e9bfe0cee0dd..902159d9fcdf99 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/java/UnknownCppException.java
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/java/UnknownCppException.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.jni;
diff --git a/ReactAndroid/src/main/jni/first-party/fb/jni/jni_helpers.cpp b/ReactAndroid/src/main/jni/first-party/fb/jni/jni_helpers.cpp
index 8bf7c3542770a4..b6ad635450cdf1 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/jni/jni_helpers.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/jni/jni_helpers.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <jni.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/log.cpp b/ReactAndroid/src/main/jni/first-party/fb/log.cpp
index b58b7ac9452a03..b6baa2dad22b67 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/log.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/log.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/log.h>
diff --git a/ReactAndroid/src/main/jni/first-party/fb/onload.cpp b/ReactAndroid/src/main/jni/first-party/fb/onload.cpp
index 2caebc37a4eb38..0594526d38167a 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/onload.cpp
+++ b/ReactAndroid/src/main/jni/first-party/fb/onload.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <jni.h>
diff --git a/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK b/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
index 254602fbc56c70..79f4fce30259ce 100644
--- a/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
@@ -1,11 +1,9 @@
 load("//ReactNative:DEFS.bzl", "cxx_library")
 
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 cxx_library(
     name = "jni-hack",
diff --git a/ReactAndroid/src/main/jni/first-party/jni-hack/jni.h b/ReactAndroid/src/main/jni/first-party/jni-hack/jni.h
index d768a112771533..166908733ef313 100644
--- a/ReactAndroid/src/main/jni/first-party/jni-hack/jni.h
+++ b/ReactAndroid/src/main/jni/first-party/jni-hack/jni.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
index b8cfe0a620cc74..eb9d8120dc3dc4 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <fb/fbjni.h>
diff --git a/ReactAndroid/src/test/java/com/facebook/common/logging/FakeLoggingDelegate.java b/ReactAndroid/src/test/java/com/facebook/common/logging/FakeLoggingDelegate.java
index 80ebb0cee82897..baf9b9913b8bc8 100644
--- a/ReactAndroid/src/test/java/com/facebook/common/logging/FakeLoggingDelegate.java
+++ b/ReactAndroid/src/test/java/com/facebook/common/logging/FakeLoggingDelegate.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.common.logging;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.java b/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.java
index d6eb5332797420..f12b8b178c168e 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/CompositeReactPackageTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java b/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
index 3bcdab6acdd5cb..c293858b4b6ade 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java b/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
index e1d1958613e6ee..3c31cb1cf00c12 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.java
index 6af5b690529935..637bd812b35c83 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/BaseJavaModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/FallbackJSBundleLoaderTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/FallbackJSBundleLoaderTest.java
index df8e0002834400..6b0a18177a1740 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/FallbackJSBundleLoaderTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/FallbackJSBundleLoaderTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyArrayTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyArrayTest.java
index 1ce3971258051c..d2d95b197ae412 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyArrayTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyArrayTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/JsonWriterTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/JsonWriterTest.java
index 2e6466a88ba848..353d743587d333 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/JsonWriterTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/JsonWriterTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/ModuleSpecTest.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/ModuleSpecTest.java
index 772e506d68f765..4f01b2070ae051 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/ModuleSpecTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/ModuleSpecTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java b/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
index 1886a481b3dc1a..e35d7ea8f583a3 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.bridge;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java b/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
index ec8637c068e5d0..4763eabbed21a4 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java b/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java
index e304694319b899..04a947a346403e 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/MultipartStreamReaderTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.java b/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.java
index 3ece540947fcef..b348bd14995dc3 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.devsupport;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.java
index 4339dcd5e4b3db..67283dc0e6e8b7 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/blob/BlobModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.blob;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java
index 5c618858d0bc7e..1ed67fb9434acb 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/camera/ImageStoreManagerTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.modules.camera;
 
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
index adfa1e2eac1a21..a0d93c4db3bd3e 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/clipboard/ClipboardModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.clipboard;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java
index 0d5ff98fda22ec..847c71954a75bb 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/dialog/DialogModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.dialog;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
index 8ad39cd16e2070..29e3e6a27d9757 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.network;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressiveStringDecoderTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressiveStringDecoderTest.java
index a43a32c8752f64..09b2365513ec54 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressiveStringDecoderTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressiveStringDecoderTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 package com.facebook.react.modules.network;
 
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java
index f9d1b31e7037db..86f99cd9dc1928 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.share;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java
index 291e1604819de3..472f9678f79008 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.storage;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java
index b98071d331e9f2..91c6484846f449 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.timing;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
index 9a2de1dbea1846..6d14bef454fcb3 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.packagerconnection;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java
index f516e3b40586e7..3d78d5cf43140a 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/LayoutPropertyApplicatorTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.java
index 8df49c6f6e69ab..f989f62dd5c1ed 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterSpecTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.java
index 33e0b8892e8fce..d06f810e10b931 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java
index 2c849051ea2f21..a4ee1a39056db8 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.java
index 04f57cda05e2ff..799018bfa4600d 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSetterTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.java
index 8b9717dd7ebe9c..0120f7a0865106 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropForShadowNodeSpecTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
index b97941d93f3e26..0b3ac61dfe3317 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java
index 687440a1dc3ce0..40a8c68b46697f 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java
index 70bfac8f3f77e4..6a90e84b628cd1 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.uimanager;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java
index 55ace7944c72fa..5bea9ba4d1fb33 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
index 0e051ab79fbd32..93dc7845007e09 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.image;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/slider/ReactSliderPropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/slider/ReactSliderPropertyTest.java
index 7cb756121cd9ee..628b43c7c3f611 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/slider/ReactSliderPropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/slider/ReactSliderPropertyTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.slider;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java
index 7e5765d06c4638..2c14111e4acd8f 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
index cd2bc0e7c9607b..89e9b0a5bdfe43 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java
index ae5a7d90f9c35c..988482eeabdeeb 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/textinput/TextInputTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.textinput;
diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java
index 9b79b2594f0acb..335458952a13c1 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/views/view/ColorUtilTest.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.view;
diff --git a/ReactAndroid/src/test/java/org/mockito/configuration/MockitoConfiguration.java b/ReactAndroid/src/test/java/org/mockito/configuration/MockitoConfiguration.java
index 20f4aa035f43f2..427dd77b534134 100644
--- a/ReactAndroid/src/test/java/org/mockito/configuration/MockitoConfiguration.java
+++ b/ReactAndroid/src/test/java/org/mockito/configuration/MockitoConfiguration.java
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package org.mockito.configuration;
diff --git a/ReactCommon/jschelpers/JSCWrapper.cpp b/ReactCommon/jschelpers/JSCWrapper.cpp
index 422fb7f8ea4e06..bc432eb05f624a 100644
--- a/ReactCommon/jschelpers/JSCWrapper.cpp
+++ b/ReactCommon/jschelpers/JSCWrapper.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "JSCWrapper.h"
diff --git a/ReactCommon/jschelpers/JSCWrapper.h b/ReactCommon/jschelpers/JSCWrapper.h
index c722199c2dfd1a..19cc720f96b317 100644
--- a/ReactCommon/jschelpers/JSCWrapper.h
+++ b/ReactCommon/jschelpers/JSCWrapper.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactCommon/jschelpers/JavaScriptCore.h b/ReactCommon/jschelpers/JavaScriptCore.h
index 9cae11681117cc..056da7167fb875 100644
--- a/ReactCommon/jschelpers/JavaScriptCore.h
+++ b/ReactCommon/jschelpers/JavaScriptCore.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactCommon/jschelpers/systemJSCWrapper.cpp b/ReactCommon/jschelpers/systemJSCWrapper.cpp
index e050468b43f805..b2720923301309 100644
--- a/ReactCommon/jschelpers/systemJSCWrapper.cpp
+++ b/ReactCommon/jschelpers/systemJSCWrapper.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <jschelpers/JSCWrapper.h>
diff --git a/ReactCommon/jsinspector/InspectorInterfaces.cpp b/ReactCommon/jsinspector/InspectorInterfaces.cpp
index bb20b8ad6b9472..326495d031162a 100644
--- a/ReactCommon/jsinspector/InspectorInterfaces.cpp
+++ b/ReactCommon/jsinspector/InspectorInterfaces.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "InspectorInterfaces.h"
diff --git a/ReactCommon/jsinspector/InspectorInterfaces.h b/ReactCommon/jsinspector/InspectorInterfaces.h
index d62eab40117a36..c37c2d574d2ff8 100644
--- a/ReactCommon/jsinspector/InspectorInterfaces.h
+++ b/ReactCommon/jsinspector/InspectorInterfaces.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactCommon/yoga/yoga/Utils.cpp b/ReactCommon/yoga/yoga/Utils.cpp
index d7f548e61685ea..110c7f0d7022cb 100644
--- a/ReactCommon/yoga/yoga/Utils.cpp
+++ b/ReactCommon/yoga/yoga/Utils.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Utils.h"
diff --git a/ReactCommon/yoga/yoga/Utils.h b/ReactCommon/yoga/yoga/Utils.h
index 431fe315facb53..db52acd672c0a2 100644
--- a/ReactCommon/yoga/yoga/Utils.h
+++ b/ReactCommon/yoga/yoga/Utils.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactCommon/yoga/yoga/YGEnums.cpp b/ReactCommon/yoga/yoga/YGEnums.cpp
index af3c27cf387471..7f16628ce14910 100644
--- a/ReactCommon/yoga/yoga/YGEnums.cpp
+++ b/ReactCommon/yoga/yoga/YGEnums.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "YGEnums.h"
diff --git a/ReactCommon/yoga/yoga/YGEnums.h b/ReactCommon/yoga/yoga/YGEnums.h
index 89567b162ab6f2..0976d78d947923 100644
--- a/ReactCommon/yoga/yoga/YGEnums.h
+++ b/ReactCommon/yoga/yoga/YGEnums.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactCommon/yoga/yoga/YGMacros.h b/ReactCommon/yoga/yoga/YGMacros.h
index 2b9c5193ec8abb..15ed81d3820a2d 100644
--- a/ReactCommon/yoga/yoga/YGMacros.h
+++ b/ReactCommon/yoga/yoga/YGMacros.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactCommon/yoga/yoga/YGNode.cpp b/ReactCommon/yoga/yoga/YGNode.cpp
index d9a8448094f08a..56ce1b4928c9d1 100644
--- a/ReactCommon/yoga/yoga/YGNode.cpp
+++ b/ReactCommon/yoga/yoga/YGNode.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "YGNode.h"
diff --git a/ReactCommon/yoga/yoga/YGNode.h b/ReactCommon/yoga/yoga/YGNode.h
index 512b3baa9bee25..b3e31256961bf3 100644
--- a/ReactCommon/yoga/yoga/YGNode.h
+++ b/ReactCommon/yoga/yoga/YGNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactCommon/yoga/yoga/YGNodePrint.cpp b/ReactCommon/yoga/yoga/YGNodePrint.cpp
index 6e5047145aba45..395fe1819ad067 100644
--- a/ReactCommon/yoga/yoga/YGNodePrint.cpp
+++ b/ReactCommon/yoga/yoga/YGNodePrint.cpp
@@ -1,10 +1,8 @@
 /*
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "YGNodePrint.h"
diff --git a/ReactCommon/yoga/yoga/YGNodePrint.h b/ReactCommon/yoga/yoga/YGNodePrint.h
index 18942b7bfd19a6..16259fcff7cf8e 100644
--- a/ReactCommon/yoga/yoga/YGNodePrint.h
+++ b/ReactCommon/yoga/yoga/YGNodePrint.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 #pragma once
 #include <string>
diff --git a/ReactCommon/yoga/yoga/Yoga-internal.h b/ReactCommon/yoga/yoga/Yoga-internal.h
index 923e5a897744df..6432e6cfcc08e0 100644
--- a/ReactCommon/yoga/yoga/Yoga-internal.h
+++ b/ReactCommon/yoga/yoga/Yoga-internal.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp
index 8f1f5e04e84ecd..ff57e99f36a215 100644
--- a/ReactCommon/yoga/yoga/Yoga.cpp
+++ b/ReactCommon/yoga/yoga/Yoga.cpp
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "Yoga.h"
diff --git a/ReactCommon/yoga/yoga/Yoga.h b/ReactCommon/yoga/yoga/Yoga.h
index bca51da28d373a..689f9f3e4e717b 100644
--- a/ReactCommon/yoga/yoga/Yoga.h
+++ b/ReactCommon/yoga/yoga/Yoga.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once
diff --git a/babel-preset/configs/hmr.js b/babel-preset/configs/hmr.js
index 0fff0fc9a68fd4..91cb9a356c654b 100644
--- a/babel-preset/configs/hmr.js
+++ b/babel-preset/configs/hmr.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/babel-preset/configs/main.js b/babel-preset/configs/main.js
index 89ebef095b0f21..dca6ddebd8e216 100644
--- a/babel-preset/configs/main.js
+++ b/babel-preset/configs/main.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/babel-preset/index.js b/babel-preset/index.js
index a1e2956ed5631d..aaff5ba9f15c05 100644
--- a/babel-preset/index.js
+++ b/babel-preset/index.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/babel-preset/lib/resolvePlugins.js b/babel-preset/lib/resolvePlugins.js
index 438e5c74d4728f..05476f1a4d33ce 100644
--- a/babel-preset/lib/resolvePlugins.js
+++ b/babel-preset/lib/resolvePlugins.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/babel-preset/plugins.js b/babel-preset/plugins.js
index d629bd92cbbb1a..d572a11b042e54 100644
--- a/babel-preset/plugins.js
+++ b/babel-preset/plugins.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/bots/code-analysis-bot.js b/bots/code-analysis-bot.js
index 0c3a8bdda21585..4ab9af0779618d 100644
--- a/bots/code-analysis-bot.js
+++ b/bots/code-analysis-bot.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/bots/dangerfile.js b/bots/dangerfile.js
index 327e75ce54baca..52079c27df5e02 100644
--- a/bots/dangerfile.js
+++ b/bots/dangerfile.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/cli.js b/cli.js
index 88837275f14e00..272a78dfcdcf25 100644
--- a/cli.js
+++ b/cli.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/flow-github/metro.js b/flow-github/metro.js
index 12f50d287f61ef..ec84de96ddb216 100644
--- a/flow-github/metro.js
+++ b/flow-github/metro.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/flow/Map.js b/flow/Map.js
index da397dfd2dda35..f2021affd67a63 100644
--- a/flow/Map.js
+++ b/flow/Map.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/flow/Position.js b/flow/Position.js
index d72ff6aa02fca3..58e3330b0b926a 100644
--- a/flow/Position.js
+++ b/flow/Position.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @nolint
diff --git a/flow/Promise.js b/flow/Promise.js
index 4f6fb3971eebcb..d69944eb4b47e2 100644
--- a/flow/Promise.js
+++ b/flow/Promise.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/flow/Set.js b/flow/Set.js
index 6239a530439c86..54b997a68a6f44 100644
--- a/flow/Set.js
+++ b/flow/Set.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @nolint
diff --git a/flow/console.js b/flow/console.js
index bef6d036b20e4e..4e57ba953715c3 100644
--- a/flow/console.js
+++ b/flow/console.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/flow/create-react-class.js b/flow/create-react-class.js
index 238ff44cf01df7..571653b18de83b 100644
--- a/flow/create-react-class.js
+++ b/flow/create-react-class.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @nolint
diff --git a/flow/fbjs.js b/flow/fbjs.js
index 5698508cc82460..f7b41b5a6a3ad8 100644
--- a/flow/fbjs.js
+++ b/flow/fbjs.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 declare module 'fbjs/lib/invariant' {
diff --git a/flow/prop-types.js b/flow/prop-types.js
index 13f7a65d53df77..c79dab62ba9345 100644
--- a/flow/prop-types.js
+++ b/flow/prop-types.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @nolint
diff --git a/jest/assetFileTransformer.js b/jest/assetFileTransformer.js
index 81bdee21e83a8c..e3a318aed3c187 100644
--- a/jest/assetFileTransformer.js
+++ b/jest/assetFileTransformer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2017-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/jest/mockComponent.js b/jest/mockComponent.js
index bb63a3e3ea635b..84c162d867f4f4 100644
--- a/jest/mockComponent.js
+++ b/jest/mockComponent.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/jest/preprocessor.js b/jest/preprocessor.js
index a5b96062e0eedc..6bc4dc9c531d1e 100644
--- a/jest/preprocessor.js
+++ b/jest/preprocessor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/jest/setup.js b/jest/setup.js
index 2fa1075b6451df..6285550434e491 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/lib/InitializeJavaScriptAppEngine.js b/lib/InitializeJavaScriptAppEngine.js
index c560dccac1b5cf..6709e0a27109d5 100644
--- a/lib/InitializeJavaScriptAppEngine.js
+++ b/lib/InitializeJavaScriptAppEngine.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/RCTEventEmitter.js b/lib/RCTEventEmitter.js
index b48677174a868c..8968fb8641df78 100644
--- a/lib/RCTEventEmitter.js
+++ b/lib/RCTEventEmitter.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/TextInputState.js b/lib/TextInputState.js
index 74f58bb27e36d3..37738ceb670a91 100644
--- a/lib/TextInputState.js
+++ b/lib/TextInputState.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/UIManager.js b/lib/UIManager.js
index bf87c346ca8ac0..6bd741903fb3c9 100644
--- a/lib/UIManager.js
+++ b/lib/UIManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/UIManagerStatTracker.js b/lib/UIManagerStatTracker.js
index 6c66a042033b10..9300a7c6f7eaa9 100644
--- a/lib/UIManagerStatTracker.js
+++ b/lib/UIManagerStatTracker.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/View.js b/lib/View.js
index 5174bdea4fe9c5..6e3f20a858556c 100644
--- a/lib/View.js
+++ b/lib/View.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/deepDiffer.js b/lib/deepDiffer.js
index e7584bc64cb850..ad3d3cb05329ba 100644
--- a/lib/deepDiffer.js
+++ b/lib/deepDiffer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/deepFreezeAndThrowOnMutationInDev.js b/lib/deepFreezeAndThrowOnMutationInDev.js
index acee5bff5b7e5b..92d9f8f40e0b47 100644
--- a/lib/deepFreezeAndThrowOnMutationInDev.js
+++ b/lib/deepFreezeAndThrowOnMutationInDev.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/lib/flattenStyle.js b/lib/flattenStyle.js
index e4dfd467007bdc..3c5651fdc60250 100644
--- a/lib/flattenStyle.js
+++ b/lib/flattenStyle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/__mocks__/beeper.js b/local-cli/__mocks__/beeper.js
index 79410a08cbd449..2bbac3717fbcad 100644
--- a/local-cli/__mocks__/beeper.js
+++ b/local-cli/__mocks__/beeper.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
  'use strict';
 
diff --git a/local-cli/__mocks__/fs.js b/local-cli/__mocks__/fs.js
index a9bd37c8df557b..bd4d5c10001c8e 100644
--- a/local-cli/__mocks__/fs.js
+++ b/local-cli/__mocks__/fs.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  */
diff --git a/local-cli/__tests__/fs-mock-test.js b/local-cli/__tests__/fs-mock-test.js
index 39f6e9e1248f49..46a3a9f96c9406 100644
--- a/local-cli/__tests__/fs-mock-test.js
+++ b/local-cli/__tests__/fs-mock-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  * @flow
diff --git a/local-cli/bundle/__mocks__/sign.js b/local-cli/bundle/__mocks__/sign.js
index 80ff1860e3f736..a7f2bdb6fc8aad 100644
--- a/local-cli/bundle/__mocks__/sign.js
+++ b/local-cli/bundle/__mocks__/sign.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/bundle/__tests__/filterPlatformAssetScales-test.js b/local-cli/bundle/__tests__/filterPlatformAssetScales-test.js
index f9e3091ac3239c..d39058dc6ba073 100644
--- a/local-cli/bundle/__tests__/filterPlatformAssetScales-test.js
+++ b/local-cli/bundle/__tests__/filterPlatformAssetScales-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js b/local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js
index 35ce285e3328d4..bd8e78d18d0645 100644
--- a/local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js
+++ b/local-cli/bundle/__tests__/getAssetDestPathAndroid-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/bundle/__tests__/getAssetDestPathIOS-test.js b/local-cli/bundle/__tests__/getAssetDestPathIOS-test.js
index 4de3b3051b5830..52e54530ba7fc8 100644
--- a/local-cli/bundle/__tests__/getAssetDestPathIOS-test.js
+++ b/local-cli/bundle/__tests__/getAssetDestPathIOS-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/bundle/assetPathUtils.js b/local-cli/bundle/assetPathUtils.js
index cc67d949ca69ce..891908eb480f31 100644
--- a/local-cli/bundle/assetPathUtils.js
+++ b/local-cli/bundle/assetPathUtils.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js
index 6265de5c21c930..0d1ea067998002 100644
--- a/local-cli/bundle/buildBundle.js
+++ b/local-cli/bundle/buildBundle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/bundle/bundle.js b/local-cli/bundle/bundle.js
index 3a177bd960de18..7bc7099b58fbb2 100644
--- a/local-cli/bundle/bundle.js
+++ b/local-cli/bundle/bundle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/bundle/bundleCommandLineArgs.js b/local-cli/bundle/bundleCommandLineArgs.js
index 8fbd2775af7277..cc63e32505a25d 100644
--- a/local-cli/bundle/bundleCommandLineArgs.js
+++ b/local-cli/bundle/bundleCommandLineArgs.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/bundle/filterPlatformAssetScales.js b/local-cli/bundle/filterPlatformAssetScales.js
index d9e8daa2e02ed8..0843b75dce6b76 100644
--- a/local-cli/bundle/filterPlatformAssetScales.js
+++ b/local-cli/bundle/filterPlatformAssetScales.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/local-cli/bundle/getAssetDestPathAndroid.js b/local-cli/bundle/getAssetDestPathAndroid.js
index c267aed8ba446b..bdd3c49e32e415 100644
--- a/local-cli/bundle/getAssetDestPathAndroid.js
+++ b/local-cli/bundle/getAssetDestPathAndroid.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/bundle/getAssetDestPathIOS.js b/local-cli/bundle/getAssetDestPathIOS.js
index 4e6290748b2a61..61b935a1703aee 100644
--- a/local-cli/bundle/getAssetDestPathIOS.js
+++ b/local-cli/bundle/getAssetDestPathIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/bundle/saveAssets.js b/local-cli/bundle/saveAssets.js
index 32b18c5de9e30b..94fe559a2b49e2 100644
--- a/local-cli/bundle/saveAssets.js
+++ b/local-cli/bundle/saveAssets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/bundle/types.flow.js b/local-cli/bundle/types.flow.js
index ef6f5671236bab..5c164d1ad2cf7c 100644
--- a/local-cli/bundle/types.flow.js
+++ b/local-cli/bundle/types.flow.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/bundle/unbundle.js b/local-cli/bundle/unbundle.js
index 1081edc29ff293..bc7785fd0ee80b 100644
--- a/local-cli/bundle/unbundle.js
+++ b/local-cli/bundle/unbundle.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/cli.js b/local-cli/cli.js
index 14cf1a8d8d6bb0..3f31cbad4770be 100644
--- a/local-cli/cli.js
+++ b/local-cli/cli.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/cliEntry.js b/local-cli/cliEntry.js
index 3062394a866f1b..018dd8459a5f19 100644
--- a/local-cli/cliEntry.js
+++ b/local-cli/cliEntry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/commands.js b/local-cli/commands.js
index 9f27908e9d6dcf..1e1a2054738429 100644
--- a/local-cli/commands.js
+++ b/local-cli/commands.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/core/Constants.js b/local-cli/core/Constants.js
index 66d59f8e9d8937..73fddbbb1035aa 100644
--- a/local-cli/core/Constants.js
+++ b/local-cli/core/Constants.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2016-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js b/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
index ea87ca03e4fbf9..dcbb8002d3c4c9 100644
--- a/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
+++ b/local-cli/core/__tests__/android/findAndroidAppFolder.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/android/findManifest.spec.js b/local-cli/core/__tests__/android/findManifest.spec.js
index 8aaeab85b53cdf..73834b61da6780 100644
--- a/local-cli/core/__tests__/android/findManifest.spec.js
+++ b/local-cli/core/__tests__/android/findManifest.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/android/findPackageClassName.spec.js b/local-cli/core/__tests__/android/findPackageClassName.spec.js
index e441b3afbdb83d..36da8b4df31dad 100644
--- a/local-cli/core/__tests__/android/findPackageClassName.spec.js
+++ b/local-cli/core/__tests__/android/findPackageClassName.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/android/getDependencyConfig.spec.js b/local-cli/core/__tests__/android/getDependencyConfig.spec.js
index 3ed4efe976391e..31ae35ad4f49ba 100644
--- a/local-cli/core/__tests__/android/getDependencyConfig.spec.js
+++ b/local-cli/core/__tests__/android/getDependencyConfig.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/android/getProjectConfig.spec.js b/local-cli/core/__tests__/android/getProjectConfig.spec.js
index c680f52d3849ab..02ee04512a4245 100644
--- a/local-cli/core/__tests__/android/getProjectConfig.spec.js
+++ b/local-cli/core/__tests__/android/getProjectConfig.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/android/readManifest.spec.js b/local-cli/core/__tests__/android/readManifest.spec.js
index 05aefb8b480cb1..8a1dead25f15d7 100644
--- a/local-cli/core/__tests__/android/readManifest.spec.js
+++ b/local-cli/core/__tests__/android/readManifest.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/findAssets.spec.js b/local-cli/core/__tests__/findAssets.spec.js
index 3cf93eca45f239..768be38029409f 100644
--- a/local-cli/core/__tests__/findAssets.spec.js
+++ b/local-cli/core/__tests__/findAssets.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/findPlugins.spec.js b/local-cli/core/__tests__/findPlugins.spec.js
index 3cc7488a30eade..aba8e95d5da142 100644
--- a/local-cli/core/__tests__/findPlugins.spec.js
+++ b/local-cli/core/__tests__/findPlugins.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/ios/findPodfilePath.spec.js b/local-cli/core/__tests__/ios/findPodfilePath.spec.js
index 4f4b8edd2367ff..b3390e9d14a4a5 100644
--- a/local-cli/core/__tests__/ios/findPodfilePath.spec.js
+++ b/local-cli/core/__tests__/ios/findPodfilePath.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/core/__tests__/ios/findPodspecName.spec.js b/local-cli/core/__tests__/ios/findPodspecName.spec.js
index 2f28fb228622b4..984441d927b1df 100644
--- a/local-cli/core/__tests__/ios/findPodspecName.spec.js
+++ b/local-cli/core/__tests__/ios/findPodspecName.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/core/__tests__/ios/findProject.spec.js b/local-cli/core/__tests__/ios/findProject.spec.js
index 33cc75ce89649e..78b4be1e3a0147 100644
--- a/local-cli/core/__tests__/ios/findProject.spec.js
+++ b/local-cli/core/__tests__/ios/findProject.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/ios/getProjectConfig.spec.js b/local-cli/core/__tests__/ios/getProjectConfig.spec.js
index 108a13e1eb7ca3..5d3c72caeef692 100644
--- a/local-cli/core/__tests__/ios/getProjectConfig.spec.js
+++ b/local-cli/core/__tests__/ios/getProjectConfig.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/__tests__/makeCommand.spec.js b/local-cli/core/__tests__/makeCommand.spec.js
index f269572a9b59cb..95110375cef10b 100644
--- a/local-cli/core/__tests__/makeCommand.spec.js
+++ b/local-cli/core/__tests__/makeCommand.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/core/android/findAndroidAppFolder.js b/local-cli/core/android/findAndroidAppFolder.js
index 3a76f4d189b123..6eac1dea16c227 100644
--- a/local-cli/core/android/findAndroidAppFolder.js
+++ b/local-cli/core/android/findAndroidAppFolder.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/android/findManifest.js b/local-cli/core/android/findManifest.js
index bbe71696d02303..481a8a4745259a 100644
--- a/local-cli/core/android/findManifest.js
+++ b/local-cli/core/android/findManifest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/android/findPackageClassName.js b/local-cli/core/android/findPackageClassName.js
index 8d59aba2689c03..45e2706a4d2959 100644
--- a/local-cli/core/android/findPackageClassName.js
+++ b/local-cli/core/android/findPackageClassName.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/android/index.js b/local-cli/core/android/index.js
index 68d2a073c52e13..c21ca60d8f7e14 100644
--- a/local-cli/core/android/index.js
+++ b/local-cli/core/android/index.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/android/readManifest.js b/local-cli/core/android/readManifest.js
index 8a39c7d27a0459..7215c67b18e57b 100644
--- a/local-cli/core/android/readManifest.js
+++ b/local-cli/core/android/readManifest.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/findAssets.js b/local-cli/core/findAssets.js
index ddfa9beea388c9..1240f25e7ebc0f 100644
--- a/local-cli/core/findAssets.js
+++ b/local-cli/core/findAssets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/findPlugins.js b/local-cli/core/findPlugins.js
index 8a3c30a4253418..fbf3f064f703bf 100644
--- a/local-cli/core/findPlugins.js
+++ b/local-cli/core/findPlugins.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/index.js b/local-cli/core/index.js
index 0d43e87c24122f..e5f2ba33af6b37 100644
--- a/local-cli/core/index.js
+++ b/local-cli/core/index.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/core/ios/findProject.js b/local-cli/core/ios/findProject.js
index 71170337e50082..05b9e20b9b7ac1 100644
--- a/local-cli/core/ios/findProject.js
+++ b/local-cli/core/ios/findProject.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/ios/index.js b/local-cli/core/ios/index.js
index 0d69ac9f11129f..bb306f47846bbc 100644
--- a/local-cli/core/ios/index.js
+++ b/local-cli/core/ios/index.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/makeCommand.js b/local-cli/core/makeCommand.js
index 2eab6caf13922f..a386a0fba376ab 100644
--- a/local-cli/core/makeCommand.js
+++ b/local-cli/core/makeCommand.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/core/wrapCommands.js b/local-cli/core/wrapCommands.js
index c7a7fe1e51067d..f47cec265406b2 100644
--- a/local-cli/core/wrapCommands.js
+++ b/local-cli/core/wrapCommands.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/dependencies/dependencies.js b/local-cli/dependencies/dependencies.js
index 3558f576cffb4b..eb69d45af4f5fe 100644
--- a/local-cli/dependencies/dependencies.js
+++ b/local-cli/dependencies/dependencies.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/eject/eject.js b/local-cli/eject/eject.js
index e49b5a5ecd4caa..569299018d3a32 100644
--- a/local-cli/eject/eject.js
+++ b/local-cli/eject/eject.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/generator/copyProjectTemplateAndReplace.js b/local-cli/generator/copyProjectTemplateAndReplace.js
index 91a392ee49904b..5840e587e7ef16 100644
--- a/local-cli/generator/copyProjectTemplateAndReplace.js
+++ b/local-cli/generator/copyProjectTemplateAndReplace.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/generator/printRunInstructions.js b/local-cli/generator/printRunInstructions.js
index d553a73c90d008..cc39a61fd3e677 100644
--- a/local-cli/generator/printRunInstructions.js
+++ b/local-cli/generator/printRunInstructions.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/generator/templates.js b/local-cli/generator/templates.js
index cc7145c2397d26..98e2897a5d0212 100644
--- a/local-cli/generator/templates.js
+++ b/local-cli/generator/templates.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/info/info.js b/local-cli/info/info.js
index ac423da27ba103..d5e4284fe0b65e 100644
--- a/local-cli/info/info.js
+++ b/local-cli/info/info.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/init/init.js b/local-cli/init/init.js
index 7ea2f363230259..d0233b1ab810db 100644
--- a/local-cli/init/init.js
+++ b/local-cli/init/init.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/install/install.js b/local-cli/install/install.js
index b3d55312a9096a..2efc64978d0541 100644
--- a/local-cli/install/install.js
+++ b/local-cli/install/install.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/install/uninstall.js b/local-cli/install/uninstall.js
index a45d11a06ae8d1..0d6fc5ed755bf9 100644
--- a/local-cli/install/uninstall.js
+++ b/local-cli/install/uninstall.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/library/library.js b/local-cli/library/library.js
index 9dacc1134eb969..e8246ff7a106fd 100644
--- a/local-cli/library/library.js
+++ b/local-cli/library/library.js
@@ -1,10 +1,8 @@
  /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/link/__tests__/android/applyPatch.spec.js b/local-cli/link/__tests__/android/applyPatch.spec.js
index 000743f1484d76..b1213dbf315faa 100644
--- a/local-cli/link/__tests__/android/applyPatch.spec.js
+++ b/local-cli/link/__tests__/android/applyPatch.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/android/isInstalled.spec.js b/local-cli/link/__tests__/android/isInstalled.spec.js
index f87f0d14bf9cee..01ddc38219f67d 100644
--- a/local-cli/link/__tests__/android/isInstalled.spec.js
+++ b/local-cli/link/__tests__/android/isInstalled.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/android/makeBuildPatch.spec.js b/local-cli/link/__tests__/android/makeBuildPatch.spec.js
index e731bc4e477d2f..c37ecc8b8c20ea 100644
--- a/local-cli/link/__tests__/android/makeBuildPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeBuildPatch.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/android/makeImportPatch.spec.js b/local-cli/link/__tests__/android/makeImportPatch.spec.js
index b41775c8c7d845..4e59f7bee6042f 100644
--- a/local-cli/link/__tests__/android/makeImportPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeImportPatch.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/android/makePackagePatch.spec.js b/local-cli/link/__tests__/android/makePackagePatch.spec.js
index 8407fe6ed076ad..72b379d101c470 100644
--- a/local-cli/link/__tests__/android/makePackagePatch.spec.js
+++ b/local-cli/link/__tests__/android/makePackagePatch.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/android/makeSettingsPatch.spec.js b/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
index 1ca5681217bfb6..223f0d6c405c14 100644
--- a/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/android/makeStringsPatch.spec.js b/local-cli/link/__tests__/android/makeStringsPatch.spec.js
index 4232ba789f6bbc..faa8f8681f0901 100644
--- a/local-cli/link/__tests__/android/makeStringsPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeStringsPatch.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/getDependencyConfig.spec.js b/local-cli/link/__tests__/getDependencyConfig.spec.js
index 87cf12755d4a6d..f8abb0192bb338 100644
--- a/local-cli/link/__tests__/getDependencyConfig.spec.js
+++ b/local-cli/link/__tests__/getDependencyConfig.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/getProjectDependencies.spec.js b/local-cli/link/__tests__/getProjectDependencies.spec.js
index 28ad2a61ac0b89..fc7dd3cd91dd69 100644
--- a/local-cli/link/__tests__/getProjectDependencies.spec.js
+++ b/local-cli/link/__tests__/getProjectDependencies.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/groupFilesByType.spec.js b/local-cli/link/__tests__/groupFilesByType.spec.js
index 2154583d5b4211..49d57daf9ef9cf 100644
--- a/local-cli/link/__tests__/groupFilesByType.spec.js
+++ b/local-cli/link/__tests__/groupFilesByType.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/addFileToProject.spec.js b/local-cli/link/__tests__/ios/addFileToProject.spec.js
index 335e53e37954c0..a82c99db475acb 100644
--- a/local-cli/link/__tests__/ios/addFileToProject.spec.js
+++ b/local-cli/link/__tests__/ios/addFileToProject.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js b/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
index 4c7858f4eda302..4d20621e0afd24 100644
--- a/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
+++ b/local-cli/link/__tests__/ios/addProjectToLibraries.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/ios/addSharedLibraries.spec.js b/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
index 58bff8c6abc55b..dd628c45ca74f7 100644
--- a/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
+++ b/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/createGroup.spec.js b/local-cli/link/__tests__/ios/createGroup.spec.js
index 5f1bf4424608a2..a997d4e5b5368a 100644
--- a/local-cli/link/__tests__/ios/createGroup.spec.js
+++ b/local-cli/link/__tests__/ios/createGroup.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/getBuildProperty.spec.js b/local-cli/link/__tests__/ios/getBuildProperty.spec.js
index fbe9fd49b2de42..ed4ab075b0f7a1 100644
--- a/local-cli/link/__tests__/ios/getBuildProperty.spec.js
+++ b/local-cli/link/__tests__/ios/getBuildProperty.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/getGroup.spec.js b/local-cli/link/__tests__/ios/getGroup.spec.js
index 9569a998f08751..cbc241821f8fab 100644
--- a/local-cli/link/__tests__/ios/getGroup.spec.js
+++ b/local-cli/link/__tests__/ios/getGroup.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js b/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
index e63de35cb3bf24..49d27084ae925f 100644
--- a/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
+++ b/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js b/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
index 8d2830ed834dc2..19f53bca545d22 100644
--- a/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
+++ b/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/getPlist.spec.js b/local-cli/link/__tests__/ios/getPlist.spec.js
index df900c19224525..36ae648ce63b82 100644
--- a/local-cli/link/__tests__/ios/getPlist.spec.js
+++ b/local-cli/link/__tests__/ios/getPlist.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/getPlistPath.spec.js b/local-cli/link/__tests__/ios/getPlistPath.spec.js
index 783cbb26c0c486..346da6872e64eb 100644
--- a/local-cli/link/__tests__/ios/getPlistPath.spec.js
+++ b/local-cli/link/__tests__/ios/getPlistPath.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/getProducts.spec.js b/local-cli/link/__tests__/ios/getProducts.spec.js
index 93bc0fcca66d41..f304d106982e77 100644
--- a/local-cli/link/__tests__/ios/getProducts.spec.js
+++ b/local-cli/link/__tests__/ios/getProducts.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/getTargets.spec.js b/local-cli/link/__tests__/ios/getTargets.spec.js
index 77bdf39bce4ec9..a2917a26ee1a83 100644
--- a/local-cli/link/__tests__/ios/getTargets.spec.js
+++ b/local-cli/link/__tests__/ios/getTargets.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/hasLibraryImported.spec.js b/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
index 8882ac2f8dd619..4a2b9789240408 100644
--- a/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
+++ b/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/isInstalled.spec.js b/local-cli/link/__tests__/ios/isInstalled.spec.js
index 45c9a05d2280f4..d55970e8d3aa9e 100644
--- a/local-cli/link/__tests__/ios/isInstalled.spec.js
+++ b/local-cli/link/__tests__/ios/isInstalled.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js b/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
index 0f2b743d21261b..9a480c4c1affe6 100644
--- a/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
+++ b/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/removeProjectFromLibraries.js b/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
index 5328291a1f3e42..18baf84b4af126 100644
--- a/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
+++ b/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js b/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
index adb4eac7fd016c..02dbdf02eba0c0 100644
--- a/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
+++ b/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js b/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
index ece8b176ef1d16..455c8d9ec89024 100644
--- a/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
+++ b/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/ios/writePlist.spec.js b/local-cli/link/__tests__/ios/writePlist.spec.js
index 29ea0bfd7d72e4..0d2e086d00132e 100644
--- a/local-cli/link/__tests__/ios/writePlist.spec.js
+++ b/local-cli/link/__tests__/ios/writePlist.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/link.spec.js b/local-cli/link/__tests__/link.spec.js
index f15fc3fee43a58..5ff3ab73a19ebe 100644
--- a/local-cli/link/__tests__/link.spec.js
+++ b/local-cli/link/__tests__/link.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/link/__tests__/pods/findLineToAddPod.spec.js b/local-cli/link/__tests__/pods/findLineToAddPod.spec.js
index 3940136a9920de..1c8d33956c76b9 100644
--- a/local-cli/link/__tests__/pods/findLineToAddPod.spec.js
+++ b/local-cli/link/__tests__/pods/findLineToAddPod.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js b/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
index 9e2a8bed8e4c2e..a62e69b915a8d5 100644
--- a/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
+++ b/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/pods/findPodTargetLine.spec.js b/local-cli/link/__tests__/pods/findPodTargetLine.spec.js
index 1d382315d7cad2..e9d3371c897432 100644
--- a/local-cli/link/__tests__/pods/findPodTargetLine.spec.js
+++ b/local-cli/link/__tests__/pods/findPodTargetLine.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/pods/isInstalled.spec.js b/local-cli/link/__tests__/pods/isInstalled.spec.js
index 1060baa456199f..4a9a1f43b006c5 100644
--- a/local-cli/link/__tests__/pods/isInstalled.spec.js
+++ b/local-cli/link/__tests__/pods/isInstalled.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/pods/removePodEntry.spec.js b/local-cli/link/__tests__/pods/removePodEntry.spec.js
index aa8fd5a26a34b8..1c9032be647dd5 100644
--- a/local-cli/link/__tests__/pods/removePodEntry.spec.js
+++ b/local-cli/link/__tests__/pods/removePodEntry.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/__tests__/promiseWaterfall.spec.js b/local-cli/link/__tests__/promiseWaterfall.spec.js
index ca1d30db1a427d..0675e6e58db4f7 100644
--- a/local-cli/link/__tests__/promiseWaterfall.spec.js
+++ b/local-cli/link/__tests__/promiseWaterfall.spec.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * All rights reserved.
  *
diff --git a/local-cli/link/android/copyAssets.js b/local-cli/link/android/copyAssets.js
index 6b3702fa7afeec..f4bd67ff6a1e54 100644
--- a/local-cli/link/android/copyAssets.js
+++ b/local-cli/link/android/copyAssets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs-extra');
diff --git a/local-cli/link/android/fs.js b/local-cli/link/android/fs.js
index b485a9ebfbd168..9ace2aba924f03 100644
--- a/local-cli/link/android/fs.js
+++ b/local-cli/link/android/fs.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs-extra');
diff --git a/local-cli/link/android/isInstalled.js b/local-cli/link/android/isInstalled.js
index c191c0f68c5fdd..2accb2a0160d21 100644
--- a/local-cli/link/android/isInstalled.js
+++ b/local-cli/link/android/isInstalled.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs');
diff --git a/local-cli/link/android/patches/applyParams.js b/local-cli/link/android/patches/applyParams.js
index 4574399d22d4b9..5f57f3cb8fa891 100644
--- a/local-cli/link/android/patches/applyParams.js
+++ b/local-cli/link/android/patches/applyParams.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const toCamelCase = require('lodash').camelCase;
diff --git a/local-cli/link/android/patches/applyPatch.js b/local-cli/link/android/patches/applyPatch.js
index bc6396602dac78..df9680c507236e 100644
--- a/local-cli/link/android/patches/applyPatch.js
+++ b/local-cli/link/android/patches/applyPatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs');
diff --git a/local-cli/link/android/patches/makeBuildPatch.js b/local-cli/link/android/patches/makeBuildPatch.js
index 473ab291cf0646..67f7d8aac3f1d2 100644
--- a/local-cli/link/android/patches/makeBuildPatch.js
+++ b/local-cli/link/android/patches/makeBuildPatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 module.exports = function makeBuildPatch(name) {
diff --git a/local-cli/link/android/patches/makeImportPatch.js b/local-cli/link/android/patches/makeImportPatch.js
index 219242e6dcd036..9cb9aaddc995e2 100644
--- a/local-cli/link/android/patches/makeImportPatch.js
+++ b/local-cli/link/android/patches/makeImportPatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 module.exports = function makeImportPatch(packageImportPath) {
diff --git a/local-cli/link/android/patches/makePackagePatch.js b/local-cli/link/android/patches/makePackagePatch.js
index 7789cbc4deae0a..054c2ac5649b79 100644
--- a/local-cli/link/android/patches/makePackagePatch.js
+++ b/local-cli/link/android/patches/makePackagePatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const applyParams = require('./applyParams');
diff --git a/local-cli/link/android/patches/makeSettingsPatch.js b/local-cli/link/android/patches/makeSettingsPatch.js
index 5b0983a9304d9d..a8a6e148333f04 100644
--- a/local-cli/link/android/patches/makeSettingsPatch.js
+++ b/local-cli/link/android/patches/makeSettingsPatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const path = require('path');
diff --git a/local-cli/link/android/patches/makeStringsPatch.js b/local-cli/link/android/patches/makeStringsPatch.js
index a8a2981a12970c..281582afb97167 100644
--- a/local-cli/link/android/patches/makeStringsPatch.js
+++ b/local-cli/link/android/patches/makeStringsPatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const toCamelCase = require('lodash').camelCase;
diff --git a/local-cli/link/android/patches/revokePatch.js b/local-cli/link/android/patches/revokePatch.js
index 037e2a13052fa3..9437e56cb08834 100644
--- a/local-cli/link/android/patches/revokePatch.js
+++ b/local-cli/link/android/patches/revokePatch.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs');
diff --git a/local-cli/link/android/registerNativeModule.js b/local-cli/link/android/registerNativeModule.js
index f6d37b5519c36b..0ce77c4e6ed4da 100644
--- a/local-cli/link/android/registerNativeModule.js
+++ b/local-cli/link/android/registerNativeModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const applyPatch = require('./patches/applyPatch');
diff --git a/local-cli/link/android/unlinkAssets.js b/local-cli/link/android/unlinkAssets.js
index dbaae6f7bcc9ba..b0eeefed93c357 100644
--- a/local-cli/link/android/unlinkAssets.js
+++ b/local-cli/link/android/unlinkAssets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs-extra');
diff --git a/local-cli/link/android/unregisterNativeModule.js b/local-cli/link/android/unregisterNativeModule.js
index 51eb157858036c..b6b8d166531841 100644
--- a/local-cli/link/android/unregisterNativeModule.js
+++ b/local-cli/link/android/unregisterNativeModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs');
diff --git a/local-cli/link/commandStub.js b/local-cli/link/commandStub.js
index 7529fe4ed9fcbd..13078bd3404f10 100644
--- a/local-cli/link/commandStub.js
+++ b/local-cli/link/commandStub.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 module.exports = (cb) => cb();
diff --git a/local-cli/link/getDependencyConfig.js b/local-cli/link/getDependencyConfig.js
index 751f746a8881c9..71ce26590906ea 100644
--- a/local-cli/link/getDependencyConfig.js
+++ b/local-cli/link/getDependencyConfig.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/getProjectDependencies.js b/local-cli/link/getProjectDependencies.js
index 1d670574ef1f97..1d5b0781a9b866 100644
--- a/local-cli/link/getProjectDependencies.js
+++ b/local-cli/link/getProjectDependencies.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const path = require('path');
diff --git a/local-cli/link/groupFilesByType.js b/local-cli/link/groupFilesByType.js
index 0a5dce030e1395..786c71532e9feb 100644
--- a/local-cli/link/groupFilesByType.js
+++ b/local-cli/link/groupFilesByType.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const groupBy = require('lodash').groupBy;
diff --git a/local-cli/link/ios/addFileToProject.js b/local-cli/link/ios/addFileToProject.js
index 3ed3340afb21cd..168220f8038187 100644
--- a/local-cli/link/ios/addFileToProject.js
+++ b/local-cli/link/ios/addFileToProject.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const PbxFile = require('xcode/lib/pbxFile');
diff --git a/local-cli/link/ios/addProjectToLibraries.js b/local-cli/link/ios/addProjectToLibraries.js
index d79f643aaf9226..045697dec1f74d 100644
--- a/local-cli/link/ios/addProjectToLibraries.js
+++ b/local-cli/link/ios/addProjectToLibraries.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/addSharedLibraries.js b/local-cli/link/ios/addSharedLibraries.js
index ad29ef9a2dda8f..a0c6f16e649d9f 100644
--- a/local-cli/link/ios/addSharedLibraries.js
+++ b/local-cli/link/ios/addSharedLibraries.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const createGroupWithMessage = require('./createGroupWithMessage');
diff --git a/local-cli/link/ios/addToHeaderSearchPaths.js b/local-cli/link/ios/addToHeaderSearchPaths.js
index b3d3e56e21c9a6..579007ecf81c21 100644
--- a/local-cli/link/ios/addToHeaderSearchPaths.js
+++ b/local-cli/link/ios/addToHeaderSearchPaths.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const mapHeaderSearchPaths = require('./mapHeaderSearchPaths');
diff --git a/local-cli/link/ios/copyAssets.js b/local-cli/link/ios/copyAssets.js
index dec1cb0c9962c2..8f6d2b86eb1309 100644
--- a/local-cli/link/ios/copyAssets.js
+++ b/local-cli/link/ios/copyAssets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs-extra');
diff --git a/local-cli/link/ios/createGroup.js b/local-cli/link/ios/createGroup.js
index 586e933b8c9e0d..62f79e1c9742c1 100644
--- a/local-cli/link/ios/createGroup.js
+++ b/local-cli/link/ios/createGroup.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const getGroup = require('./getGroup');
diff --git a/local-cli/link/ios/createGroupWithMessage.js b/local-cli/link/ios/createGroupWithMessage.js
index e782813009d8ad..4b598940da95a8 100644
--- a/local-cli/link/ios/createGroupWithMessage.js
+++ b/local-cli/link/ios/createGroupWithMessage.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const log = require('npmlog');
diff --git a/local-cli/link/ios/getBuildProperty.js b/local-cli/link/ios/getBuildProperty.js
index 6fc82fe496da54..bb1c7b78b88fa7 100644
--- a/local-cli/link/ios/getBuildProperty.js
+++ b/local-cli/link/ios/getBuildProperty.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/getGroup.js b/local-cli/link/ios/getGroup.js
index dd64332a42fa32..c66205be0117b8 100644
--- a/local-cli/link/ios/getGroup.js
+++ b/local-cli/link/ios/getGroup.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const getFirstProject = (project) => project.getFirstProject().firstProject;
diff --git a/local-cli/link/ios/getHeaderSearchPath.js b/local-cli/link/ios/getHeaderSearchPath.js
index 9857bb62f46c36..c5f2572c622165 100644
--- a/local-cli/link/ios/getHeaderSearchPath.js
+++ b/local-cli/link/ios/getHeaderSearchPath.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const path = require('path');
diff --git a/local-cli/link/ios/getHeadersInFolder.js b/local-cli/link/ios/getHeadersInFolder.js
index b0426f01a4775a..a4c2250ab47c05 100644
--- a/local-cli/link/ios/getHeadersInFolder.js
+++ b/local-cli/link/ios/getHeadersInFolder.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const glob = require('glob');
diff --git a/local-cli/link/ios/getPlist.js b/local-cli/link/ios/getPlist.js
index adc530310fb602..61c877258e9018 100644
--- a/local-cli/link/ios/getPlist.js
+++ b/local-cli/link/ios/getPlist.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const plistParser = require('plist');
diff --git a/local-cli/link/ios/getPlistPath.js b/local-cli/link/ios/getPlistPath.js
index a82d086fd3ae1e..0609f5f581f95b 100644
--- a/local-cli/link/ios/getPlistPath.js
+++ b/local-cli/link/ios/getPlistPath.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const path = require('path');
diff --git a/local-cli/link/ios/getProducts.js b/local-cli/link/ios/getProducts.js
index 590ff831431906..7e24f15826beea 100644
--- a/local-cli/link/ios/getProducts.js
+++ b/local-cli/link/ios/getProducts.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/getTargets.js b/local-cli/link/ios/getTargets.js
index b2441e9acf2c8b..c85bcd16a2ebca 100644
--- a/local-cli/link/ios/getTargets.js
+++ b/local-cli/link/ios/getTargets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/hasLibraryImported.js b/local-cli/link/ios/hasLibraryImported.js
index 077591a7c991c0..0372f0b4b920e2 100644
--- a/local-cli/link/ios/hasLibraryImported.js
+++ b/local-cli/link/ios/hasLibraryImported.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/isInstalled.js b/local-cli/link/ios/isInstalled.js
index 095925688c4e37..7b0e4a94672ab8 100644
--- a/local-cli/link/ios/isInstalled.js
+++ b/local-cli/link/ios/isInstalled.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const xcode = require('xcode');
diff --git a/local-cli/link/ios/mapHeaderSearchPaths.js b/local-cli/link/ios/mapHeaderSearchPaths.js
index f31c2d1507c325..cb2a583f25f450 100644
--- a/local-cli/link/ios/mapHeaderSearchPaths.js
+++ b/local-cli/link/ios/mapHeaderSearchPaths.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/registerNativeModule.js b/local-cli/link/ios/registerNativeModule.js
index 74b828548f4cb9..470776898c2f6f 100644
--- a/local-cli/link/ios/registerNativeModule.js
+++ b/local-cli/link/ios/registerNativeModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const xcode = require('xcode');
diff --git a/local-cli/link/ios/removeFromHeaderSearchPaths.js b/local-cli/link/ios/removeFromHeaderSearchPaths.js
index 9dbe99e3643710..f662991210c251 100644
--- a/local-cli/link/ios/removeFromHeaderSearchPaths.js
+++ b/local-cli/link/ios/removeFromHeaderSearchPaths.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const mapHeaderSearchPaths = require('./mapHeaderSearchPaths');
diff --git a/local-cli/link/ios/removeFromPbxItemContainerProxySection.js b/local-cli/link/ios/removeFromPbxItemContainerProxySection.js
index ee5e31777efb98..44a3fb2db83fdb 100644
--- a/local-cli/link/ios/removeFromPbxItemContainerProxySection.js
+++ b/local-cli/link/ios/removeFromPbxItemContainerProxySection.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/removeFromPbxReferenceProxySection.js b/local-cli/link/ios/removeFromPbxReferenceProxySection.js
index 09561896e2a012..ba3626b796cb36 100644
--- a/local-cli/link/ios/removeFromPbxReferenceProxySection.js
+++ b/local-cli/link/ios/removeFromPbxReferenceProxySection.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/removeFromProjectReferences.js b/local-cli/link/ios/removeFromProjectReferences.js
index b0c9eada9cebda..5edc858807f991 100644
--- a/local-cli/link/ios/removeFromProjectReferences.js
+++ b/local-cli/link/ios/removeFromProjectReferences.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/removeFromStaticLibraries.js b/local-cli/link/ios/removeFromStaticLibraries.js
index 861d319f14415c..391088c15702f4 100644
--- a/local-cli/link/ios/removeFromStaticLibraries.js
+++ b/local-cli/link/ios/removeFromStaticLibraries.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const PbxFile = require('xcode/lib/pbxFile');
diff --git a/local-cli/link/ios/removeProductGroup.js b/local-cli/link/ios/removeProductGroup.js
index 6326540b638b0d..888f2a44200601 100644
--- a/local-cli/link/ios/removeProductGroup.js
+++ b/local-cli/link/ios/removeProductGroup.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 module.exports = function removeProductGroup(project, productGroupId) {
diff --git a/local-cli/link/ios/removeProjectFromLibraries.js b/local-cli/link/ios/removeProjectFromLibraries.js
index 48b356c81a7529..9eaee4758bf87f 100644
--- a/local-cli/link/ios/removeProjectFromLibraries.js
+++ b/local-cli/link/ios/removeProjectFromLibraries.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/ios/removeProjectFromProject.js b/local-cli/link/ios/removeProjectFromProject.js
index e9f2379a051679..cb7c1711497439 100644
--- a/local-cli/link/ios/removeProjectFromProject.js
+++ b/local-cli/link/ios/removeProjectFromProject.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const PbxFile = require('xcode/lib/pbxFile');
diff --git a/local-cli/link/ios/removeSharedLibraries.js b/local-cli/link/ios/removeSharedLibraries.js
index 6da91f119668a8..dd2629ebb03c6b 100644
--- a/local-cli/link/ios/removeSharedLibraries.js
+++ b/local-cli/link/ios/removeSharedLibraries.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 module.exports = function removeSharedLibraries(project, libraries) {
diff --git a/local-cli/link/ios/unlinkAssets.js b/local-cli/link/ios/unlinkAssets.js
index 083519e38fe816..a7c38446f4ce61 100644
--- a/local-cli/link/ios/unlinkAssets.js
+++ b/local-cli/link/ios/unlinkAssets.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const fs = require('fs-extra');
diff --git a/local-cli/link/ios/unregisterNativeModule.js b/local-cli/link/ios/unregisterNativeModule.js
index 8f09484cff9434..b35a6c31aefa13 100644
--- a/local-cli/link/ios/unregisterNativeModule.js
+++ b/local-cli/link/ios/unregisterNativeModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const xcode = require('xcode');
diff --git a/local-cli/link/ios/writePlist.js b/local-cli/link/ios/writePlist.js
index c7d424fcddb627..0c025d2e9d2277 100644
--- a/local-cli/link/ios/writePlist.js
+++ b/local-cli/link/ios/writePlist.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const plistParser = require('plist');
diff --git a/local-cli/link/link.js b/local-cli/link/link.js
index 8711f278bd08cc..7799b5c171f6e8 100644
--- a/local-cli/link/link.js
+++ b/local-cli/link/link.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/link/pods/addPodEntry.js b/local-cli/link/pods/addPodEntry.js
index bc9e2ced1739a7..ea9218623678ed 100644
--- a/local-cli/link/pods/addPodEntry.js
+++ b/local-cli/link/pods/addPodEntry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/findLineToAddPod.js b/local-cli/link/pods/findLineToAddPod.js
index f275f1c3f79855..dca2e391cc482a 100644
--- a/local-cli/link/pods/findLineToAddPod.js
+++ b/local-cli/link/pods/findLineToAddPod.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/findMarkedLinesInPodfile.js b/local-cli/link/pods/findMarkedLinesInPodfile.js
index 8d084987e7b87b..42ef7c8bedd44b 100644
--- a/local-cli/link/pods/findMarkedLinesInPodfile.js
+++ b/local-cli/link/pods/findMarkedLinesInPodfile.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/findPodTargetLine.js b/local-cli/link/pods/findPodTargetLine.js
index fea3b38c835c03..d5a8c97fb2b31c 100644
--- a/local-cli/link/pods/findPodTargetLine.js
+++ b/local-cli/link/pods/findPodTargetLine.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/isInstalled.js b/local-cli/link/pods/isInstalled.js
index 59072a2762e61e..251376541d14c7 100644
--- a/local-cli/link/pods/isInstalled.js
+++ b/local-cli/link/pods/isInstalled.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/readPodfile.js b/local-cli/link/pods/readPodfile.js
index a0b85cc3d27955..85ac7ed9bf3dee 100644
--- a/local-cli/link/pods/readPodfile.js
+++ b/local-cli/link/pods/readPodfile.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/registerNativeModule.js b/local-cli/link/pods/registerNativeModule.js
index 37041cf78322c8..b00d93c6f2d6d8 100644
--- a/local-cli/link/pods/registerNativeModule.js
+++ b/local-cli/link/pods/registerNativeModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/removePodEntry.js b/local-cli/link/pods/removePodEntry.js
index 490a2300a1a957..8af044734d3121 100644
--- a/local-cli/link/pods/removePodEntry.js
+++ b/local-cli/link/pods/removePodEntry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/savePodFile.js b/local-cli/link/pods/savePodFile.js
index dbd98686f6f166..5572311105d591 100644
--- a/local-cli/link/pods/savePodFile.js
+++ b/local-cli/link/pods/savePodFile.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pods/unregisterNativeModule.js b/local-cli/link/pods/unregisterNativeModule.js
index 10da38f158a7dd..3b2408bf992c8c 100644
--- a/local-cli/link/pods/unregisterNativeModule.js
+++ b/local-cli/link/pods/unregisterNativeModule.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/link/pollParams.js b/local-cli/link/pollParams.js
index b5e0da823436a6..4c084a6d3ffec7 100644
--- a/local-cli/link/pollParams.js
+++ b/local-cli/link/pollParams.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 var inquirer = require('inquirer');
diff --git a/local-cli/link/promiseWaterfall.js b/local-cli/link/promiseWaterfall.js
index d88135535938bc..fa8b621a9f5a76 100644
--- a/local-cli/link/promiseWaterfall.js
+++ b/local-cli/link/promiseWaterfall.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /**
diff --git a/local-cli/link/promisify.js b/local-cli/link/promisify.js
index 38c0237843d316..665b640f216f7a 100644
--- a/local-cli/link/promisify.js
+++ b/local-cli/link/promisify.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 module.exports = (func) => new Promise((resolve, reject) =>
diff --git a/local-cli/link/unlink.js b/local-cli/link/unlink.js
index ed3772c4b45c39..54e6df37401d57 100644
--- a/local-cli/link/unlink.js
+++ b/local-cli/link/unlink.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const log = require('npmlog');
diff --git a/local-cli/logAndroid/logAndroid.js b/local-cli/logAndroid/logAndroid.js
index be3cc12f647af3..7a1aace4bf78b1 100644
--- a/local-cli/logAndroid/logAndroid.js
+++ b/local-cli/logAndroid/logAndroid.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/logIOS/logIOS.js b/local-cli/logIOS/logIOS.js
index 0a9fb14615bc7d..3e7b1ffb7c25f2 100644
--- a/local-cli/logIOS/logIOS.js
+++ b/local-cli/logIOS/logIOS.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/runAndroid/adb.js b/local-cli/runAndroid/adb.js
index 221b710af55bed..8206093e3fa867 100644
--- a/local-cli/runAndroid/adb.js
+++ b/local-cli/runAndroid/adb.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/runAndroid/runAndroid.js b/local-cli/runAndroid/runAndroid.js
index d88235d1c40a18..eb17d38210ebb7 100644
--- a/local-cli/runAndroid/runAndroid.js
+++ b/local-cli/runAndroid/runAndroid.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/runIOS/__tests__/findMatchingSimulator-test.js b/local-cli/runIOS/__tests__/findMatchingSimulator-test.js
index 8c355b462d15f1..6433605beb9017 100644
--- a/local-cli/runIOS/__tests__/findMatchingSimulator-test.js
+++ b/local-cli/runIOS/__tests__/findMatchingSimulator-test.js
@@ -1,11 +1,9 @@
 /**
  * /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/runIOS/__tests__/findXcodeProject-test.js b/local-cli/runIOS/__tests__/findXcodeProject-test.js
index 21203d9655fa4d..305605feab23ef 100644
--- a/local-cli/runIOS/__tests__/findXcodeProject-test.js
+++ b/local-cli/runIOS/__tests__/findXcodeProject-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/runIOS/__tests__/parseIOSDevicesList-test.js b/local-cli/runIOS/__tests__/parseIOSDevicesList-test.js
index 6e18b1ec98e327..aea241c8fe374d 100644
--- a/local-cli/runIOS/__tests__/parseIOSDevicesList-test.js
+++ b/local-cli/runIOS/__tests__/parseIOSDevicesList-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @emails oncall+javascript_foundation
  */
diff --git a/local-cli/runIOS/findXcodeProject.js b/local-cli/runIOS/findXcodeProject.js
index 0d6cd302c6d0a6..ecb80b3d3da1d5 100644
--- a/local-cli/runIOS/findXcodeProject.js
+++ b/local-cli/runIOS/findXcodeProject.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/runIOS/parseIOSDevicesList.js b/local-cli/runIOS/parseIOSDevicesList.js
index 3ccbeac33059d4..d0c10a3a5ea8e7 100644
--- a/local-cli/runIOS/parseIOSDevicesList.js
+++ b/local-cli/runIOS/parseIOSDevicesList.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js
index d2ec2b82d63df1..22fbf6ef5f183e 100644
--- a/local-cli/runIOS/runIOS.js
+++ b/local-cli/runIOS/runIOS.js
@@ -1,10 +1,8 @@
 /**
 * Copyright (c) 2015-present, Facebook, Inc.
-* All rights reserved.
 *
-* This source code is licensed under the BSD-style license found in the
-* LICENSE file in the root directory of this source tree. An additional grant
-* of patent rights can be found in the PATENTS file in the same directory.
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
 */
 'use strict';
 
diff --git a/local-cli/server/checkNodeVersion.js b/local-cli/server/checkNodeVersion.js
index b589304fec1f35..46ec6cdc2f78e5 100644
--- a/local-cli/server/checkNodeVersion.js
+++ b/local-cli/server/checkNodeVersion.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/copyToClipBoardMiddleware.js b/local-cli/server/middleware/copyToClipBoardMiddleware.js
index 4a630c335b2d31..723fbd30c881df 100644
--- a/local-cli/server/middleware/copyToClipBoardMiddleware.js
+++ b/local-cli/server/middleware/copyToClipBoardMiddleware.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/getDevToolsMiddleware.js b/local-cli/server/middleware/getDevToolsMiddleware.js
index e6621ac57e8383..4a01d964d3fd76 100644
--- a/local-cli/server/middleware/getDevToolsMiddleware.js
+++ b/local-cli/server/middleware/getDevToolsMiddleware.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  */
diff --git a/local-cli/server/middleware/indexPage.js b/local-cli/server/middleware/indexPage.js
index 1ba7dca5b77c3d..dee12456db2ab2 100644
--- a/local-cli/server/middleware/indexPage.js
+++ b/local-cli/server/middleware/indexPage.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/loadRawBodyMiddleware.js b/local-cli/server/middleware/loadRawBodyMiddleware.js
index 2b59195f415aa7..924275009ebe28 100644
--- a/local-cli/server/middleware/loadRawBodyMiddleware.js
+++ b/local-cli/server/middleware/loadRawBodyMiddleware.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/openStackFrameInEditorMiddleware.js b/local-cli/server/middleware/openStackFrameInEditorMiddleware.js
index b94598f216f6f5..471c8ed8bbef17 100644
--- a/local-cli/server/middleware/openStackFrameInEditorMiddleware.js
+++ b/local-cli/server/middleware/openStackFrameInEditorMiddleware.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/statusPageMiddleware.js b/local-cli/server/middleware/statusPageMiddleware.js
index fb793468ff0e0a..cd8fb80200c1e7 100644
--- a/local-cli/server/middleware/statusPageMiddleware.js
+++ b/local-cli/server/middleware/statusPageMiddleware.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/systraceProfileMiddleware.js b/local-cli/server/middleware/systraceProfileMiddleware.js
index a06f0100a9ddd9..fc1669468f8034 100644
--- a/local-cli/server/middleware/systraceProfileMiddleware.js
+++ b/local-cli/server/middleware/systraceProfileMiddleware.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/middleware/unless.js b/local-cli/server/middleware/unless.js
index c074a6c13f5830..acf0643cf3a05c 100644
--- a/local-cli/server/middleware/unless.js
+++ b/local-cli/server/middleware/unless.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index 1288d769b73102..870652fc956ddc 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/local-cli/server/server.js b/local-cli/server/server.js
index df4fd22a2c7f85..f188a3e82dd48d 100644
--- a/local-cli/server/server.js
+++ b/local-cli/server/server.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/server/util/attachWebsocketServer.js b/local-cli/server/util/attachWebsocketServer.js
index fcbe0f7198da97..66f8fe953a4ad0 100644
--- a/local-cli/server/util/attachWebsocketServer.js
+++ b/local-cli/server/util/attachWebsocketServer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @flow
diff --git a/local-cli/server/util/copyToClipBoard.js b/local-cli/server/util/copyToClipBoard.js
index e0113ce5a413bd..bb2259e8150389 100644
--- a/local-cli/server/util/copyToClipBoard.js
+++ b/local-cli/server/util/copyToClipBoard.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/util/debugger-ui/DeltaPatcher.js b/local-cli/server/util/debugger-ui/DeltaPatcher.js
index 1787307b99a396..c137894942c51c 100644
--- a/local-cli/server/util/debugger-ui/DeltaPatcher.js
+++ b/local-cli/server/util/debugger-ui/DeltaPatcher.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  */
diff --git a/local-cli/server/util/debugger-ui/debuggerWorker.js b/local-cli/server/util/debugger-ui/debuggerWorker.js
index c05f558d87962b..e70ca0ec973547 100644
--- a/local-cli/server/util/debugger-ui/debuggerWorker.js
+++ b/local-cli/server/util/debugger-ui/debuggerWorker.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /* global __fbBatchedBridge, self, importScripts, postMessage, onmessage: true */
diff --git a/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js b/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js
index 5a206ce2281809..afc1dd5caea3d6 100644
--- a/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js
+++ b/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/local-cli/server/util/debugger-ui/index.html b/local-cli/server/util/debugger-ui/index.html
index c21a21892ba313..57d377629abd79 100644
--- a/local-cli/server/util/debugger-ui/index.html
+++ b/local-cli/server/util/debugger-ui/index.html
@@ -1,11 +1,9 @@
 <!DOCTYPE html>
 <!--
   Copyright (c) 2015-present, Facebook, Inc.
-  All rights reserved.
-
-  This source code is licensed under the BSD-style license found in the
-  LICENSE file in the root directory of this source tree. An additional grant
-  of patent rights can be found in the PATENTS file in the same directory.
+  
+  This source code is licensed under the MIT license found in the
+  LICENSE file in the root directory of this source tree.
 -->
 <html>
 <head>
diff --git a/local-cli/server/util/jsPackagerClient.js b/local-cli/server/util/jsPackagerClient.js
index 582e74416a29e6..3b449db160e404 100644
--- a/local-cli/server/util/jsPackagerClient.js
+++ b/local-cli/server/util/jsPackagerClient.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/local-cli/server/util/launchChrome.js b/local-cli/server/util/launchChrome.js
index 8dd1900a8f3610..6999a3d0bdd0bd 100644
--- a/local-cli/server/util/launchChrome.js
+++ b/local-cli/server/util/launchChrome.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/server/util/launchEditor.js b/local-cli/server/util/launchEditor.js
index 3ea5e9621a71c5..f78927d82d6e47 100644
--- a/local-cli/server/util/launchEditor.js
+++ b/local-cli/server/util/launchEditor.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/util/messageSocket.js b/local-cli/server/util/messageSocket.js
index d8b0236dd78036..bceb72fab01c5d 100644
--- a/local-cli/server/util/messageSocket.js
+++ b/local-cli/server/util/messageSocket.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/server/util/webSocketProxy.js b/local-cli/server/util/webSocketProxy.js
index f862c34bf8bd60..2a854c6d81d571 100644
--- a/local-cli/server/util/webSocketProxy.js
+++ b/local-cli/server/util/webSocketProxy.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/setup_env.bat b/local-cli/setup_env.bat
index 9cd1e826648fc9..e5c135e5abff82 100755
--- a/local-cli/setup_env.bat
+++ b/local-cli/setup_env.bat
@@ -1,6 +1,4 @@
 :: Copyright (c) 2015-present, Facebook, Inc.
-:: All rights reserved.
 ::
-:: This source code is licensed under the BSD-style license found in the
-:: LICENSE file in the root directory of this source tree. An additional grant
-:: of patent rights can be found in the PATENTS file in the same directory.
+:: This source code is licensed under the MIT license found in the
+:: LICENSE file in the root directory of this source tree.
diff --git a/local-cli/setup_env.sh b/local-cli/setup_env.sh
index 87a722b5c154e5..0087df50c04aa4 100755
--- a/local-cli/setup_env.sh
+++ b/local-cli/setup_env.sh
@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 # Copyright (c) 2015-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 # 2048 is the max for non root users on Mac
 ulimit -n 2048
diff --git a/local-cli/templates/HelloNavigation/components/KeyboardSpacer.js b/local-cli/templates/HelloNavigation/components/KeyboardSpacer.js
index f38567ea3ae206..72e10391757c57 100644
--- a/local-cli/templates/HelloNavigation/components/KeyboardSpacer.js
+++ b/local-cli/templates/HelloNavigation/components/KeyboardSpacer.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h
index a9654d5e01b18c..d4f2580b1ea1b8 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m
index 7807738016e386..23a3b137c46c99 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "AppDelegate.h"
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/main.m b/local-cli/templates/HelloWorld/ios/HelloWorld/main.m
index 3d767fcbb9fced..c73e006253a31d 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld/main.m
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld/main.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m b/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m
index 161aba80468287..45fba113383af7 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m
+++ b/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
diff --git a/local-cli/upgrade/upgrade.js b/local-cli/upgrade/upgrade.js
index 2feb3f3149271b..93e3a7815d1f6a 100644
--- a/local-cli/upgrade/upgrade.js
+++ b/local-cli/upgrade/upgrade.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/Config.js b/local-cli/util/Config.js
index 132ef3e286ec67..ac7e3bf2cef038 100644
--- a/local-cli/util/Config.js
+++ b/local-cli/util/Config.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @flow
diff --git a/local-cli/util/PackageManager.js b/local-cli/util/PackageManager.js
index 6d866a0505aa23..89024ff2712baf 100644
--- a/local-cli/util/PackageManager.js
+++ b/local-cli/util/PackageManager.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/__mocks__/log.js b/local-cli/util/__mocks__/log.js
index 5fff767d2e025a..742b2c03701e49 100644
--- a/local-cli/util/__mocks__/log.js
+++ b/local-cli/util/__mocks__/log.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/__tests__/findSymlinkedModules-test.js b/local-cli/util/__tests__/findSymlinkedModules-test.js
index 8a1900453aa27a..25c1b52d27ad99 100644
--- a/local-cli/util/__tests__/findSymlinkedModules-test.js
+++ b/local-cli/util/__tests__/findSymlinkedModules-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @emails oncall+javascript_foundation
diff --git a/local-cli/util/assertRequiredOptions.js b/local-cli/util/assertRequiredOptions.js
index 28bbc9b34e2ce2..877caf0583b9c7 100644
--- a/local-cli/util/assertRequiredOptions.js
+++ b/local-cli/util/assertRequiredOptions.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/copyAndReplace.js b/local-cli/util/copyAndReplace.js
index c48c80b8e9a25f..543bc6ecf012ee 100644
--- a/local-cli/util/copyAndReplace.js
+++ b/local-cli/util/copyAndReplace.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/findReactNativeScripts.js b/local-cli/util/findReactNativeScripts.js
index a66bb110d90e1a..28317cd60f2f9d 100644
--- a/local-cli/util/findReactNativeScripts.js
+++ b/local-cli/util/findReactNativeScripts.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  */
diff --git a/local-cli/util/findSymlinkedModules.js b/local-cli/util/findSymlinkedModules.js
index 64191b585864f5..428ed3ead05607 100644
--- a/local-cli/util/findSymlinkedModules.js
+++ b/local-cli/util/findSymlinkedModules.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @format
  * @flow
diff --git a/local-cli/util/findSymlinksPaths.js b/local-cli/util/findSymlinksPaths.js
index 61edda340ed368..e9d2d5670bfd26 100644
--- a/local-cli/util/findSymlinksPaths.js
+++ b/local-cli/util/findSymlinksPaths.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const path = require('path');
diff --git a/local-cli/util/isPackagerRunning.js b/local-cli/util/isPackagerRunning.js
index fbdebd08d255f9..1384e6be953544 100644
--- a/local-cli/util/isPackagerRunning.js
+++ b/local-cli/util/isPackagerRunning.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/isValidPackageName.js b/local-cli/util/isValidPackageName.js
index 89be87fbee78fb..6bf1fdf91671d0 100644
--- a/local-cli/util/isValidPackageName.js
+++ b/local-cli/util/isValidPackageName.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/log.js b/local-cli/util/log.js
index 16bbbae58e7a64..6215de5e76e86d 100644
--- a/local-cli/util/log.js
+++ b/local-cli/util/log.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/parseCommandLine.js b/local-cli/util/parseCommandLine.js
index 10b8d3537aaf5b..d216959d68c9ab 100644
--- a/local-cli/util/parseCommandLine.js
+++ b/local-cli/util/parseCommandLine.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * Wrapper on-top of `optimist` in order to properly support boolean flags
  * and have a slightly less awkward API.
diff --git a/local-cli/util/walk.js b/local-cli/util/walk.js
index fae2fc2000b322..5ca1c8d52f32d3 100644
--- a/local-cli/util/walk.js
+++ b/local-cli/util/walk.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/util/yarn.js b/local-cli/util/yarn.js
index 8bef7804eb9b09..f2edb1c382df3c 100644
--- a/local-cli/util/yarn.js
+++ b/local-cli/util/yarn.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/local-cli/wrong-react-native.js b/local-cli/wrong-react-native.js
index 2555fa04546983..57f04feadc39d4 100755
--- a/local-cli/wrong-react-native.js
+++ b/local-cli/wrong-react-native.js
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 const isWindows = process.platform === 'win32';
diff --git a/react-native-cli/index.js b/react-native-cli/index.js
index 4de761a7ff4653..5cde164967a715 100755
--- a/react-native-cli/index.js
+++ b/react-native-cli/index.js
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/react-native-git-upgrade/checks.js b/react-native-git-upgrade/checks.js
index 3be8f7b7a0cdfc..1660addd00e2b8 100644
--- a/react-native-git-upgrade/checks.js
+++ b/react-native-git-upgrade/checks.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/react-native-git-upgrade/cli.js b/react-native-git-upgrade/cli.js
index f664d9583e5c7c..94647fd16c48da 100644
--- a/react-native-git-upgrade/cli.js
+++ b/react-native-git-upgrade/cli.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/react-native-git-upgrade/cliEntry.js b/react-native-git-upgrade/cliEntry.js
index 757852e61bbc67..a9cbfa5641f369 100644
--- a/react-native-git-upgrade/cliEntry.js
+++ b/react-native-git-upgrade/cliEntry.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/react-native-git-upgrade/index.js b/react-native-git-upgrade/index.js
index c676a7a65ee93b..dea50c344e9ab8 100644
--- a/react-native-git-upgrade/index.js
+++ b/react-native-git-upgrade/index.js
@@ -2,11 +2,9 @@
 
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 var argv = require('minimist')(process.argv.slice(2));
diff --git a/react-native-git-upgrade/yarn.js b/react-native-git-upgrade/yarn.js
index 7dda2501dc64e7..9e461190e458cd 100644
--- a/react-native-git-upgrade/yarn.js
+++ b/react-native-git-upgrade/yarn.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/rn-cli.config.js b/rn-cli.config.js
index 2f6f5f2031f74d..694fd8d6399ee6 100644
--- a/rn-cli.config.js
+++ b/rn-cli.config.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @format
diff --git a/rn-get-polyfills.js b/rn-get-polyfills.js
index a228d6f1f91875..e7dd869c6f4ef6 100644
--- a/rn-get-polyfills.js
+++ b/rn-get-polyfills.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  */
 
diff --git a/scripts/android-e2e-test.js b/scripts/android-e2e-test.js
index 1feda1e4fe35a1..bb0e109607defd 100644
--- a/scripts/android-e2e-test.js
+++ b/scripts/android-e2e-test.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * Used in run-ci-e2e-test.js and executed in Circle CI.
  * E2e test that verifies that init app can be installed, compiled, started and Hot Module reloading and Chrome debugging work.
diff --git a/scripts/bump-oss-version.js b/scripts/bump-oss-version.js
index b8fe500a621383..03f5ec19093df2 100755
--- a/scripts/bump-oss-version.js
+++ b/scripts/bump-oss-version.js
@@ -1,11 +1,9 @@
 #!/usr/bin/env node
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/scripts/launchPackager.bat b/scripts/launchPackager.bat
index 00ac056a362b83..09f1de98737002 100644
--- a/scripts/launchPackager.bat
+++ b/scripts/launchPackager.bat
@@ -1,9 +1,7 @@
 :: Copyright (c) 2015-present, Facebook, Inc.
-:: All rights reserved.
 ::
-:: This source code is licensed under the BSD-style license found in the
-:: LICENSE file in the root directory of this source tree. An additional grant
-:: of patent rights can be found in the PATENTS file in the same directory.
+:: This source code is licensed under the MIT license found in the
+:: LICENSE file in the root directory of this source tree.
 
 @echo off
 title Metro Bundler
diff --git a/scripts/launchPackager.command b/scripts/launchPackager.command
index 20bbf8e06f9a21..b4570cd3c63027 100755
--- a/scripts/launchPackager.command
+++ b/scripts/launchPackager.command
@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 
 # Copyright (c) 2015-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 # Set terminal title
 echo -en "\033]0;Metro Bundler\a"
diff --git a/scripts/packager.sh b/scripts/packager.sh
index f7ce245a42403d..ee3966923a2bb0 100755
--- a/scripts/packager.sh
+++ b/scripts/packager.sh
@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 
 # Copyright (c) 2015-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 THIS_DIR=$(dirname "$0")
 source "${THIS_DIR}/.packager.env"
diff --git a/scripts/publish-npm.js b/scripts/publish-npm.js
index 96e37318108a64..269fc7014dd3ff 100644
--- a/scripts/publish-npm.js
+++ b/scripts/publish-npm.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/scripts/react-native-xcode.sh b/scripts/react-native-xcode.sh
index 04a309f38bdf92..1e259741276241 100755
--- a/scripts/react-native-xcode.sh
+++ b/scripts/react-native-xcode.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
 # Copyright (c) 2015-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 # Bundle React Native app's code and image assets.
 # This script is supposed to be invoked as part of Xcode build process
diff --git a/scripts/run-android-ci-instrumentation-tests.js b/scripts/run-android-ci-instrumentation-tests.js
index 9cf72b9763aa5e..17d382a32e1525 100644
--- a/scripts/run-android-ci-instrumentation-tests.js
+++ b/scripts/run-android-ci-instrumentation-tests.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/scripts/run-ci-e2e-tests.js b/scripts/run-ci-e2e-tests.js
index 5c38ae676c3a06..cd1163f0ba2443 100644
--- a/scripts/run-ci-e2e-tests.js
+++ b/scripts/run-ci-e2e-tests.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/scripts/try-n-times.js b/scripts/try-n-times.js
index 66cfb71a139b7e..51cba900c22b72 100644
--- a/scripts/try-n-times.js
+++ b/scripts/try-n-times.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 /* globals echo:false */
diff --git a/scripts/versiontemplates/RCTVersion.h.template b/scripts/versiontemplates/RCTVersion.h.template
index f188ae8a2ba71d..1ab81aacc44aec 100644
--- a/scripts/versiontemplates/RCTVersion.h.template
+++ b/scripts/versiontemplates/RCTVersion.h.template
@@ -2,11 +2,9 @@
  * @generated by scripts/bump-oss-version.js
  *
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #define RCT_REACT_NATIVE_VERSION @{ \
diff --git a/scripts/versiontemplates/ReactNativeVersion.java.template b/scripts/versiontemplates/ReactNativeVersion.java.template
index 7ae1cecc8b120d..12d55c3db4df0f 100644
--- a/scripts/versiontemplates/ReactNativeVersion.java.template
+++ b/scripts/versiontemplates/ReactNativeVersion.java.template
@@ -2,11 +2,9 @@
  * @generated by scripts/bump-oss-version.js
  *
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.modules.systeminfo;
diff --git a/scripts/versiontemplates/ReactNativeVersion.js.template b/scripts/versiontemplates/ReactNativeVersion.js.template
index 357625b87230c7..1f1ccdd741dd32 100644
--- a/scripts/versiontemplates/ReactNativeVersion.js.template
+++ b/scripts/versiontemplates/ReactNativeVersion.js.template
@@ -2,11 +2,9 @@
  * @generated by scripts/bump-oss-version.js
  *
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  *
  * @flow
  * @providesModule ReactNativeVersion
diff --git a/setupBabel.js b/setupBabel.js
index b581e0d3c16114..15e0f19a458bb2 100644
--- a/setupBabel.js
+++ b/setupBabel.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';

From 26684cf3adf4094eb6c405d345a75bf8c7c0bf88 Mon Sep 17 00:00:00 2001
From: Sophie Alpert <sophiebits@fb.com>
Date: Fri, 16 Feb 2018 18:25:02 -0800
Subject: [PATCH 053/267] Update to MIT license

Summary: Manual changes.

Reviewed By: TheSavior, yungsters

Differential Revision: D7012152

fbshipit-source-id: de7459be3db13c687868b45059856f125c4f2eb1
---
 CONTRIBUTING.md                               |  2 +-
 LICENSE                                       | 43 ++++++++-----------
 Libraries/Animated/release/gulpfile.js        |  9 ++--
 Libraries/Animated/release/package.json       |  2 +-
 PATENTS                                       | 33 --------------
 README.md                                     |  2 +-
 React.podspec                                 |  2 +-
 ReactAndroid/release.gradle                   |  2 +-
 ReactCommon/yoga/yoga.podspec                 |  2 +-
 babel-preset/package.json                     |  2 +-
 local-cli/runIOS/findMatchingSimulator.js     |  6 +--
 package.json                                  |  3 +-
 react-native-cli/package.json                 |  2 +-
 react-native-git-upgrade/package.json         |  2 +-
 scripts/sync-css-layout.sh                    |  7 ++-
 third-party-podspecs/DoubleConversion.podspec |  2 +-
 16 files changed, 36 insertions(+), 85 deletions(-)
 delete mode 100644 PATENTS

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 96152932684a48..bc151d02603d62 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -208,5 +208,5 @@ However, there are still some styles that the linter cannot pick up.
 
 ## License
 
-By contributing to React Native, you agree that your contributions will be licensed under its BSD license.
+By contributing to React Native, you agree that your contributions will be licensed under its MIT license.
 <!-- generated_contributing_end -->
diff --git a/LICENSE b/LICENSE
index 8085fec497caf6..9e051010d82dc6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,30 +1,21 @@
-BSD License
+MIT License
 
-For React Native software
+Copyright (c) 2015-present, Facebook, Inc.
 
-Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- * Neither the name Facebook nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Libraries/Animated/release/gulpfile.js b/Libraries/Animated/release/gulpfile.js
index 5787276888a516..b454ea790c2731 100644
--- a/Libraries/Animated/release/gulpfile.js
+++ b/Libraries/Animated/release/gulpfile.js
@@ -30,13 +30,10 @@ var PRODUCTION_HEADER = [
   '/**',
   ' * Animated v<%= version %>',
   ' *',
-  ' * Copyright 2013-2015, Facebook, Inc.',
-  ' * All rights reserved.',
-  ' *',
-  ' * This source code is licensed under the BSD-style license found in the',
-  ' * LICENSE file in the root directory of this source tree. An additional grant',
-  ' * of patent rights can be found in the PATENTS file in the same directory.',
+  ' * Copyright (c) 2013-present, Facebook, Inc.',
   ' *',
+  ' * This source code is licensed under the MIT license found in the',
+  ' * LICENSE file in the root directory of this source tree.',
   ' */'
 ].join('\n') + '\n';
 
diff --git a/Libraries/Animated/release/package.json b/Libraries/Animated/release/package.json
index 33654f7eae10e2..74f457a4dcd33c 100644
--- a/Libraries/Animated/release/package.json
+++ b/Libraries/Animated/release/package.json
@@ -7,7 +7,7 @@
     "animated",
     "animation"
   ],
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "main": "Animated.js",
   "dependencies": {
     "fbjs": "^0.2.1"
diff --git a/PATENTS b/PATENTS
deleted file mode 100644
index f26186660aa7b0..00000000000000
--- a/PATENTS
+++ /dev/null
@@ -1,33 +0,0 @@
-Additional Grant of Patent Rights Version 2
-
-"Software" means the React Native software distributed by Facebook, Inc.
-
-Facebook, Inc. (“Facebook”) hereby grants to each recipient of the Software
-(“you”) a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
-(subject to the termination provision below) license under any Necessary
-Claims, to make, have made, use, sell, offer to sell, import, and otherwise
-transfer the Software. For avoidance of doubt, no license is granted under
-Facebook's rights in any patent claims that are infringed by (i) modifications
-to the Software made by you or any third party or (ii) the Software in
-combination with any software or other technology.
-
-The license granted hereunder will terminate, automatically and without notice,
-if you (or any of your subsidiaries, corporate affiliates or agents) initiate
-directly or indirectly, or take a direct financial interest in, any Patent
-Assertion: (i) against Facebook or any of its subsidiaries or corporate
-affiliates, (ii) against any party if such Patent Assertion arises in whole or
-in part from any software, technology, product or service of Facebook or any of
-its subsidiaries or corporate affiliates, or (iii) against any party relating
-to the Software. Notwithstanding the foregoing, if Facebook or any of its
-subsidiaries or corporate affiliates files a lawsuit alleging patent
-infringement against you in the first instance, and you respond by filing a
-patent infringement counterclaim in that lawsuit against that party that is
-unrelated to the Software, the license granted hereunder will not terminate
-under section (i) of this paragraph due to such counterclaim.
-
-A "Necessary Claim" is a claim of a patent owned by Facebook that is
-necessarily infringed by the Software standing alone.
-
-A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
-or contributory infringement or inducement to infringe any patent, including a
-cross-claim or counterclaim.
diff --git a/README.md b/README.md
index 05aafba3ca7806..a9c12562f1a698 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ We have a list of [beginner friendly issues](https://github.com/facebook/react-n
 
 ## License
 
-React Native is [BSD licensed](./LICENSE). We also provide an additional [patent grant](./PATENTS).
+React Native is [MIT licensed](./LICENSE).
 
 React Native documentation is [Creative Commons licensed](./LICENSE-docs).
 
diff --git a/React.podspec b/React.podspec
index eb9b0c979a9ddb..9d222499f38414 100644
--- a/React.podspec
+++ b/React.podspec
@@ -39,7 +39,7 @@ Pod::Spec.new do |s|
   s.requires_arc            = true
   s.platforms               = { :ios => "8.0", :tvos => "9.2" }
   s.pod_target_xcconfig     = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" }
-  s.preserve_paths          = "package.json", "LICENSE", "LICENSE-docs", "PATENTS"
+  s.preserve_paths          = "package.json", "LICENSE", "LICENSE-docs"
   s.cocoapods_version       = ">= 1.2.0"
 
   s.subspec "Core" do |ss|
diff --git a/ReactAndroid/release.gradle b/ReactAndroid/release.gradle
index 51e431a98e9a22..13cfbaf826ad3f 100644
--- a/ReactAndroid/release.gradle
+++ b/ReactAndroid/release.gradle
@@ -39,7 +39,7 @@ def configureReactNativePom(def pom) {
 
         licenses {
             license {
-                name 'BSD License'
+                name 'MIT License'
                 url 'https://github.com/facebook/react-native/blob/master/LICENSE'
                 distribution 'repo'
             }
diff --git a/ReactCommon/yoga/yoga.podspec b/ReactCommon/yoga/yoga.podspec
index 4d0577e80dbec5..c38f4c09796cb6 100644
--- a/ReactCommon/yoga/yoga.podspec
+++ b/ReactCommon/yoga/yoga.podspec
@@ -12,7 +12,7 @@ end
 Pod::Spec.new do |spec|
   spec.name = 'yoga'
   spec.version = "#{version}.React"
-  spec.license =  { :type => 'BSD' }
+  spec.license =  { :type => 'MIT' }
   spec.homepage = 'https://facebook.github.io/yoga/'
   spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/c/'
 
diff --git a/babel-preset/package.json b/babel-preset/package.json
index 77e1090ed1754a..3181ee146f24a4 100644
--- a/babel-preset/package.json
+++ b/babel-preset/package.json
@@ -9,7 +9,7 @@
     "preset",
     "react-native"
   ],
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/facebook/react-native/issues"
   },
diff --git a/local-cli/runIOS/findMatchingSimulator.js b/local-cli/runIOS/findMatchingSimulator.js
index eb14e4b843685f..ceef5c669ee337 100644
--- a/local-cli/runIOS/findMatchingSimulator.js
+++ b/local-cli/runIOS/findMatchingSimulator.js
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.*
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 'use strict';
 
diff --git a/package.json b/package.json
index 631a0394dcdac7..f57e73a70e80b0 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "react-native",
   "version": "1000.0.0",
   "description": "A framework for building native apps using React",
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git@github.com:facebook/react-native.git"
@@ -112,7 +112,6 @@
     "LICENSE",
     "local-cli",
     "packager",
-    "PATENTS",
     "react.gradle",
     "React.podspec",
     "React",
diff --git a/react-native-cli/package.json b/react-native-cli/package.json
index 1d7498c49a6757..fb966fa17c4b34 100644
--- a/react-native-cli/package.json
+++ b/react-native-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-native-cli",
   "version": "2.0.1",
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "description": "The React Native CLI tools",
   "main": "index.js",
   "engines": {
diff --git a/react-native-git-upgrade/package.json b/react-native-git-upgrade/package.json
index 9556cc277a082a..21cfa896188626 100644
--- a/react-native-git-upgrade/package.json
+++ b/react-native-git-upgrade/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-native-git-upgrade",
   "version": "0.2.7",
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "description": "The React Native upgrade tool",
   "main": "cli.js",
   "bin": {
diff --git a/scripts/sync-css-layout.sh b/scripts/sync-css-layout.sh
index fcd5bb525a0090..6c2f2f3c01f2a4 100755
--- a/scripts/sync-css-layout.sh
+++ b/scripts/sync-css-layout.sh
@@ -8,10 +8,9 @@ function patchfile {
   # Add React Native copyright
   printf "/**\n"  > /tmp/yogasync.tmp
   printf " * Copyright (c) 2014-present, Facebook, Inc.\n"  >> /tmp/yogasync.tmp
-  printf " * All rights reserved.\n" >> /tmp/yogasync.tmp
-  printf " * This source code is licensed under the BSD-style license found in the\n"  >> /tmp/yogasync.tmp
-  printf " * LICENSE file in the root directory of this source tree. An additional grant\n"  >> /tmp/yogasync.tmp
-  printf " * of patent rights can be found in the PATENTS file in the same directory.\n"  >> /tmp/yogasync.tmp
+  printf " *\n" >> /tmp/yogasync.tmp
+  printf " * This source code is licensed under the MIT license found in the\n"  >> /tmp/yogasync.tmp
+  printf " * LICENSE file in the root directory of this source tree.\n"  >> /tmp/yogasync.tmp
   printf " */\n\n"  >> /tmp/yogasync.tmp
   printf "// NOTE: this file is auto-copied from https://github.com/facebook/css-layout\n" >> /tmp/yogasync.tmp
   # The following is split over four lines so Phabricator doesn't think this file is generated
diff --git a/third-party-podspecs/DoubleConversion.podspec b/third-party-podspecs/DoubleConversion.podspec
index 514194ed61040a..52f7ec1279f9c8 100644
--- a/third-party-podspecs/DoubleConversion.podspec
+++ b/third-party-podspecs/DoubleConversion.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
   spec.name = 'DoubleConversion'
   spec.version = '1.1.5'
-  spec.license = { :type => 'BSD' }
+  spec.license = { :type => 'MIT' }
   spec.homepage = 'https://github.com/google/double-conversion'
   spec.summary = 'Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles'
   spec.authors = 'Google'

From da3424c929220304ff01032a9bf473fb251375f1 Mon Sep 17 00:00:00 2001
From: Caleb Meredith <calebmer@fb.com>
Date: Fri, 16 Feb 2018 19:59:54 -0800
Subject: [PATCH 054/267] @allow-large-files Upgrade xplat/js to Flow v0.66

Reviewed By: gabelevi

Differential Revision: D7016717

fbshipit-source-id: 2bd2fd67074ba5d405ecd63a1aeb37354f8634c9
---
 .flowconfig                                       |  2 +-
 Libraries/CameraRoll/CameraRoll.js                |  4 +++-
 Libraries/Components/TextInput/TextInput.js       |  3 ---
 Libraries/Core/InitializeCore.js                  |  3 ---
 .../Experimental/SwipeableRow/SwipeableRow.js     |  3 ---
 Libraries/Lists/FlatList.js                       |  6 ++++++
 Libraries/Lists/MetroListView.js                  |  2 --
 Libraries/Lists/SectionList.js                    |  3 +++
 Libraries/Lists/VirtualizedList.js                |  4 +++-
 Libraries/ReactNative/requireNativeComponent.js   |  3 ---
 RNTester/js/CameraRollView.js                     |  1 -
 jest/preprocessor.js                              |  6 ------
 local-cli/__tests__/fs-mock-test.js               | 12 ------------
 local-cli/bundle/buildBundle.js                   | 15 ---------------
 local-cli/bundle/types.flow.js                    |  3 ---
 local-cli/server/runServer.js                     |  9 ---------
 local-cli/templates/HelloWorld/_flowconfig        |  2 +-
 package.json                                      |  2 +-
 18 files changed, 18 insertions(+), 65 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index 735e7816a35829..b7aa19446d88dc 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -52,4 +52,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.65.0
+^0.66.0
diff --git a/Libraries/CameraRoll/CameraRoll.js b/Libraries/CameraRoll/CameraRoll.js
index 0c91dc7fd0233b..3bc48664f35db1 100644
--- a/Libraries/CameraRoll/CameraRoll.js
+++ b/Libraries/CameraRoll/CameraRoll.js
@@ -113,8 +113,10 @@ type GetPhotosReturn = Promise<{
  * Shape of the return value of the `getPhotos` function.
  */
 const getPhotosReturnChecker = createStrictShapeTypeChecker({
-  // $FlowFixMe(>=0.41.0)
   edges: PropTypes.arrayOf(
+    /* $FlowFixMe(>=0.66.0 site=react_native_fb) This comment suppresses an
+     * error found when Flow v0.66 was deployed. To see the error delete this
+     * comment and run Flow. */
     createStrictShapeTypeChecker({
       node: createStrictShapeTypeChecker({
         type: PropTypes.string.isRequired,
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index ab685dc75060c4..b9eb03bd67526e 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -31,9 +31,6 @@ const UIManager = require('UIManager');
 const ViewPropTypes = require('ViewPropTypes');
 const {ViewContextTypes} = require('ViewContext');
 
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const emptyFunction = require('fbjs/lib/emptyFunction');
 const invariant = require('fbjs/lib/invariant');
 const requireNativeComponent = require('requireNativeComponent');
diff --git a/Libraries/Core/InitializeCore.js b/Libraries/Core/InitializeCore.js
index 3e09e566078cca..3e6ebb680732bb 100644
--- a/Libraries/Core/InitializeCore.js
+++ b/Libraries/Core/InitializeCore.js
@@ -195,9 +195,6 @@ if (__DEV__) {
 
     // Set up inspector
     const JSInspector = require('JSInspector');
-    /* $FlowFixMe(>=0.56.0 site=react_native_oss) This comment suppresses an
-     * error found when Flow v0.56 was deployed. To see the error delete this
-     * comment and run Flow. */
     /* $FlowFixMe(>=0.56.0 site=react_native_fb,react_native_oss) This comment
      * suppresses an error found when Flow v0.56 was deployed. To see the error
      * delete this comment and run Flow. */
diff --git a/Libraries/Experimental/SwipeableRow/SwipeableRow.js b/Libraries/Experimental/SwipeableRow/SwipeableRow.js
index e03970c637fa8b..80e627376e8482 100644
--- a/Libraries/Experimental/SwipeableRow/SwipeableRow.js
+++ b/Libraries/Experimental/SwipeableRow/SwipeableRow.js
@@ -22,9 +22,6 @@ const TimerMixin = require('react-timer-mixin');
 const View = require('View');
 
 const createReactClass = require('create-react-class');
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const emptyFunction = require('fbjs/lib/emptyFunction');
 
 const IS_RTL = I18nManager.isRTL;
diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index dc0f5db8b5f8d3..e5b4a8310330c7 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -627,8 +627,14 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
   render() {
     if (this.props.legacyImplementation) {
       return (
+        /* $FlowFixMe(>=0.66.0 site=react_native_fb) This comment suppresses an
+         * error found when Flow v0.66 was deployed. To see the error delete
+         * this comment and run Flow. */
         <MetroListView
           {...this.props}
+          /* $FlowFixMe(>=0.66.0 site=react_native_fb) This comment suppresses
+           * an error found when Flow v0.66 was deployed. To see the error
+           * delete this comment and run Flow. */
           items={this.props.data}
           ref={this._captureRef}
         />
diff --git a/Libraries/Lists/MetroListView.js b/Libraries/Lists/MetroListView.js
index 906164fa9e88f6..5f22eb264ee85b 100644
--- a/Libraries/Lists/MetroListView.js
+++ b/Libraries/Lists/MetroListView.js
@@ -50,8 +50,6 @@ type NormalProps = {
 type DefaultProps = {
   keyExtractor: (item: Item, index: number) => string,
 };
-/* $FlowFixMe - the renderItem passed in from SectionList is optional there but
- * required here */
 type Props = NormalProps & DefaultProps;
 
 /**
diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js
index 3dfc99bd3a17dd..2404d26f54c72a 100644
--- a/Libraries/Lists/SectionList.js
+++ b/Libraries/Lists/SectionList.js
@@ -326,6 +326,9 @@ class SectionList<SectionT: SectionBase<any>> extends React.PureComponent<
     const List = this.props.legacyImplementation
       ? MetroListView
       : VirtualizedSectionList;
+    /* $FlowFixMe(>=0.66.0 site=react_native_fb) This comment suppresses an
+     * error found when Flow v0.66 was deployed. To see the error delete this
+     * comment and run Flow. */
     return <List {...this.props} ref={this._captureRef} />;
   }
 
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 7ca090e88e1809..f40b44e404c4f6 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -52,7 +52,9 @@ type ViewabilityHelperCallbackTuple = {
 };
 
 type RequiredProps = {
-  renderItem: renderItemType,
+  // TODO: Conflicts with the optional `renderItem` in
+  // `VirtualizedSectionList`'s props.
+  renderItem: $FlowFixMe<renderItemType>,
   /**
    * The default accessor functions assume this is an Array<{key: string}> but you can override
    * getItem, getItemCount, and keyExtractor to handle any type of index-based data.
diff --git a/Libraries/ReactNative/requireNativeComponent.js b/Libraries/ReactNative/requireNativeComponent.js
index c4320c0a84b998..2a6c7c8ca71e8d 100644
--- a/Libraries/ReactNative/requireNativeComponent.js
+++ b/Libraries/ReactNative/requireNativeComponent.js
@@ -23,9 +23,6 @@ const processColor = require('processColor');
 const resolveAssetSource = require('resolveAssetSource');
 const sizesDiffer = require('sizesDiffer');
 const verifyPropTypes = require('verifyPropTypes');
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const invariant = require('fbjs/lib/invariant');
 const warning = require('fbjs/lib/warning');
 
diff --git a/RNTester/js/CameraRollView.js b/RNTester/js/CameraRollView.js
index fc1f063b2560c1..f69a4feed65fcb 100644
--- a/RNTester/js/CameraRollView.js
+++ b/RNTester/js/CameraRollView.js
@@ -72,7 +72,6 @@ var propTypes = {
 
 var CameraRollView = createReactClass({
   displayName: 'CameraRollView',
-  // $FlowFixMe(>=0.41.0)
   propTypes: propTypes,
 
   getDefaultProps: function(): Object {
diff --git a/jest/preprocessor.js b/jest/preprocessor.js
index 6bc4dc9c531d1e..05b87ad5860015 100644
--- a/jest/preprocessor.js
+++ b/jest/preprocessor.js
@@ -11,9 +11,6 @@
 
 'use strict';
 
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const babel = require('babel-core');
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
  * found when Flow v0.54 was deployed. To see the error delete this comment and
@@ -33,9 +30,6 @@ const nodeOptions = babelRegisterOnly.config([nodeFiles]);
 
 babelRegisterOnly([]);
 
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const transformer = require('metro/src/transformer.js');
 module.exports = {
   process(src/*: string*/, file/*: string*/) {
diff --git a/local-cli/__tests__/fs-mock-test.js b/local-cli/__tests__/fs-mock-test.js
index 46a3a9f96c9406..4928f3bd9ecf23 100644
--- a/local-cli/__tests__/fs-mock-test.js
+++ b/local-cli/__tests__/fs-mock-test.js
@@ -30,16 +30,10 @@ describe('fs mock', () => {
     it('stores content correctly', () => {
       fs.writeFileSync('/test', 'foobar', 'utf8');
       const content = fs.readFileSync('/test', 'utf8');
-      /* $FlowFixMe(>=0.56.0 site=react_native_oss) This comment suppresses an
-       * error found when Flow v0.56 was deployed. To see the error delete this
-       * comment and run Flow. */
       expect(content).toEqual('foobar');
     });
 
     it('fails on missing path', () => {
-      /* $FlowFixMe(>=0.56.0 site=react_native_oss) This comment suppresses an
-       * error found when Flow v0.56 was deployed. To see the error delete this
-       * comment and run Flow. */
       expect(() =>
         fs.writeFileSync('/dir/test', 'foobar', 'utf8'),
       ).toThrowError('ENOENT: no such file or directory');
@@ -57,9 +51,6 @@ describe('fs mock', () => {
       fs.mkdirSync('/dir', 0o777);
       fs.writeFileSync('/dir/test', 'foobar', 'utf8');
       const content = fs.readFileSync('/dir/test', 'utf8');
-      /* $FlowFixMe(>=0.56.0 site=react_native_oss) This comment suppresses an
-       * error found when Flow v0.56 was deployed. To see the error delete this
-       * comment and run Flow. */
       expect(content).toEqual('foobar');
     });
 
@@ -68,9 +59,6 @@ describe('fs mock', () => {
       fs.writeFileSync('/dir/test', 'foobar', 'utf8');
       fs.mkdirSync('/dir', 0o777);
       const content = fs.readFileSync('/dir/test', 'utf8');
-      /* $FlowFixMe(>=0.56.0 site=react_native_oss) This comment suppresses an
-       * error found when Flow v0.56 was deployed. To see the error delete this
-       * comment and run Flow. */
       expect(content).toEqual('foobar');
     });
   });
diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js
index 0d1ea067998002..524c1ac84eabf8 100644
--- a/local-cli/bundle/buildBundle.js
+++ b/local-cli/bundle/buildBundle.js
@@ -10,24 +10,12 @@
 'use strict';
 
 const log = require('../util/log').out('bundle');
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const Server = require('metro/src/Server');
 const {Terminal} = require('metro-core');
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const TerminalReporter = require('metro/src/lib/TerminalReporter');
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const TransformCaching = require('metro/src/lib/TransformCaching');
 
 const {defaults} = require('metro');
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const outputBundle = require('metro/src/shared/output/bundle');
 const path = require('path');
 const saveAssets = require('./saveAssets');
@@ -40,9 +28,6 @@ import type {ConfigT} from 'metro';
 const defaultAssetExts = defaults.assetExts;
 const defaultSourceExts = defaults.sourceExts;
 const defaultPlatforms = defaults.platforms;
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const defaultProvidesModuleNodeModules = defaults.providesModuleNodeModules;
 
 async function buildBundle(
diff --git a/local-cli/bundle/types.flow.js b/local-cli/bundle/types.flow.js
index 5c164d1ad2cf7c..4008030640d068 100644
--- a/local-cli/bundle/types.flow.js
+++ b/local-cli/bundle/types.flow.js
@@ -8,7 +8,4 @@
  */
 'use strict';
 
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 export type {OutputOptions, RequestOptions} from 'metro/src/shared/types.flow';
diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index 870652fc956ddc..4c821465d2248b 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -25,9 +25,6 @@ const copyToClipBoardMiddleware = require('./middleware/copyToClipBoardMiddlewar
 const defaultAssetExts = Metro.defaults.assetExts;
 const defaultSourceExts = Metro.defaults.sourceExts;
 const defaultPlatforms = Metro.defaults.platforms;
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const defaultProvidesModuleNodeModules =
   Metro.defaults.providesModuleNodeModules;
 const errorhandler = require('errorhandler');
@@ -46,17 +43,11 @@ const statusPageMiddleware = require('./middleware/statusPageMiddleware.js');
 const systraceProfileMiddleware = require('./middleware/systraceProfileMiddleware.js');
 const webSocketProxy = require('./util/webSocketProxy.js');
 
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 const TransformCaching = require('metro/src/lib/TransformCaching');
 
 const {ASSET_REGISTRY_PATH} = require('../core/Constants');
 
 import type {ConfigT} from 'metro';
-/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
- * found when Flow v0.54 was deployed. To see the error delete this comment and
- * run Flow. */
 import type {Reporter} from 'metro/src/lib/reporting';
 
 export type Args = {|
diff --git a/local-cli/templates/HelloWorld/_flowconfig b/local-cli/templates/HelloWorld/_flowconfig
index 10cb8d509a45a8..080b459b22fd77 100644
--- a/local-cli/templates/HelloWorld/_flowconfig
+++ b/local-cli/templates/HelloWorld/_flowconfig
@@ -51,4 +51,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.65.0
+^0.66.0
diff --git a/package.json b/package.json
index f57e73a70e80b0..db9bd84bfa8df4 100644
--- a/package.json
+++ b/package.json
@@ -214,7 +214,7 @@
     "eslint-plugin-jest": "21.8.0",
     "eslint-plugin-prettier": "2.6.0",
     "eslint-plugin-react": "7.6.1",
-    "flow-bin": "^0.65.0",
+    "flow-bin": "^0.66.0",
     "jest": "22.3.0",
     "jest-junit": "3.6.0",
     "prettier": "1.9.1",

From 54dc11a5fbafaccc9c0a781f1151225909717597 Mon Sep 17 00:00:00 2001
From: Tadeu Valentt <tadeu.valentt@gmail.com>
Date: Fri, 16 Feb 2018 20:39:27 -0800
Subject: [PATCH 055/267] Fix #17610, Add fixtures to metro blacklist

Summary:
Include a default blacklist into the build settings to prevent
processing of incorrect fixture files by Metro.

<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

Fix #17610 issue, preventing metro from processing fixture files

1. Have a working demo
2. Install https://github.com/oblador/react-native-vector-icons
3. Use in a component
4. Start the app
5. The app starts successfully and display the icons

[ GENERAL  ]  [ BUGFIX ]  [local-cli/util/Config.js] - Add default file blacklist
Closes https://github.com/facebook/react-native/pull/17672

Differential Revision: D7014627

Pulled By: hramos

fbshipit-source-id: 20974e6fdd0977eeeb1048c29c9d621c803c26e9
---
 local-cli/util/Config.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/local-cli/util/Config.js b/local-cli/util/Config.js
index ac7e3bf2cef038..9fc4487fe83ee8 100644
--- a/local-cli/util/Config.js
+++ b/local-cli/util/Config.js
@@ -15,7 +15,7 @@ const getPolyfills = require('../../rn-get-polyfills');
 const invariant = require('fbjs/lib/invariant');
 const path = require('path');
 
-const {Config: MetroConfig} = require('metro');
+const {Config: MetroConfig, createBlacklist} = require('metro');
 
 const RN_CLI_CONFIG = 'rn-cli.config.js';
 
@@ -54,6 +54,10 @@ const getProjectRoots = () => {
   return resolveSymlinksForRoots([getProjectPath()]);
 };
 
+const getBlacklistRE = () => {
+  return createBlacklist([/.*\/__fixtures__\/.*/]);
+};
+
 /**
  * Module capable of getting the configuration out of a given file.
  *
@@ -65,6 +69,7 @@ const getProjectRoots = () => {
 const Config = {
   DEFAULT: ({
     ...MetroConfig.DEFAULT,
+    getBlacklistRE,
     getProjectRoots,
     getPolyfills,
     getModulesRunBeforeMainModule: () => [

From 4454fdc219a7ea9e45c126a776d9fe07658328e6 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Mon, 19 Feb 2018 10:29:01 -0800
Subject: [PATCH 056/267] fix Flow typing for OSS

Summary:
Add ignores for these requires, some of them mistakenly removed by https://github.com/facebook/react-native/commit/da3424c929220304ff01032a9bf473fb251375f1.

```
yarn flow
```

CircleCI should be green again.
Closes https://github.com/facebook/react-native/pull/18021

Differential Revision: D7025304

Pulled By: jeanlauliac

fbshipit-source-id: 731232093ae3ab39b3eff6fb2004ff4e7090d5ae
---
 jest/preprocessor.js            | 1 +
 local-cli/bundle/buildBundle.js | 4 ++++
 local-cli/bundle/types.flow.js  | 1 +
 local-cli/server/runServer.js   | 3 +++
 4 files changed, 9 insertions(+)

diff --git a/jest/preprocessor.js b/jest/preprocessor.js
index 05b87ad5860015..e6a897f8e02abc 100644
--- a/jest/preprocessor.js
+++ b/jest/preprocessor.js
@@ -30,6 +30,7 @@ const nodeOptions = babelRegisterOnly.config([nodeFiles]);
 
 babelRegisterOnly([]);
 
+/* $FlowFixMe(site=react_native_oss) */
 const transformer = require('metro/src/transformer.js');
 module.exports = {
   process(src/*: string*/, file/*: string*/) {
diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js
index 524c1ac84eabf8..66fad891ae77f8 100644
--- a/local-cli/bundle/buildBundle.js
+++ b/local-cli/bundle/buildBundle.js
@@ -10,12 +10,16 @@
 'use strict';
 
 const log = require('../util/log').out('bundle');
+/* $FlowFixMe(site=react_native_oss) */
 const Server = require('metro/src/Server');
 const {Terminal} = require('metro-core');
+/* $FlowFixMe(site=react_native_oss) */
 const TerminalReporter = require('metro/src/lib/TerminalReporter');
+/* $FlowFixMe(site=react_native_oss) */
 const TransformCaching = require('metro/src/lib/TransformCaching');
 
 const {defaults} = require('metro');
+/* $FlowFixMe(site=react_native_oss) */
 const outputBundle = require('metro/src/shared/output/bundle');
 const path = require('path');
 const saveAssets = require('./saveAssets');
diff --git a/local-cli/bundle/types.flow.js b/local-cli/bundle/types.flow.js
index 4008030640d068..ecf86af407ee6b 100644
--- a/local-cli/bundle/types.flow.js
+++ b/local-cli/bundle/types.flow.js
@@ -8,4 +8,5 @@
  */
 'use strict';
 
+/* $FlowFixMe(site=react_native_oss) */
 export type {OutputOptions, RequestOptions} from 'metro/src/shared/types.flow';
diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index 4c821465d2248b..396c57ce6741b7 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -43,11 +43,14 @@ const statusPageMiddleware = require('./middleware/statusPageMiddleware.js');
 const systraceProfileMiddleware = require('./middleware/systraceProfileMiddleware.js');
 const webSocketProxy = require('./util/webSocketProxy.js');
 
+/* $FlowFixMe(site=react_native_oss) */
 const TransformCaching = require('metro/src/lib/TransformCaching');
 
 const {ASSET_REGISTRY_PATH} = require('../core/Constants');
 
+/* $FlowFixMe(site=react_native_oss) */
 import type {ConfigT} from 'metro';
+/* $FlowFixMe(site=react_native_oss) */
 import type {Reporter} from 'metro/src/lib/reporting';
 
 export type Args = {|

From 973ef9728cd196f6853c24449af28569fa592462 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Mon, 19 Feb 2018 22:30:36 -0800
Subject: [PATCH 057/267] RN: Remove React Stack Systrace Logic

Reviewed By: sophiebits

Differential Revision: D7027263

fbshipit-source-id: f4eb3fab402eda337f464e4ebb0771202a9b93f2
---
 Libraries/Core/InitializeCore.js  |  2 +-
 Libraries/Performance/Systrace.js | 61 +++----------------------------
 2 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/Libraries/Core/InitializeCore.js b/Libraries/Core/InitializeCore.js
index 3e6ebb680732bb..e2a624e468ab51 100644
--- a/Libraries/Core/InitializeCore.js
+++ b/Libraries/Core/InitializeCore.js
@@ -54,7 +54,7 @@ if (!global.process.env.NODE_ENV) {
 // Setup the Systrace profiling hooks if necessary
 if (global.__RCTProfileIsProfiling) {
   const Systrace = require('Systrace');
-  Systrace.installReactHook(true);
+  Systrace.installReactHook();
   Systrace.setEnabled(true);
 }
 
diff --git a/Libraries/Performance/Systrace.js b/Libraries/Performance/Systrace.js
index 002c12f34fa7b4..1abedee7c1734b 100644
--- a/Libraries/Performance/Systrace.js
+++ b/Libraries/Performance/Systrace.js
@@ -32,7 +32,6 @@ let _asyncCookie = 0;
 const _markStack = [];
 let _markStackIndex = -1;
 let _canInstallReactHook = false;
-let _useFiber = false;
 
 // Implements a subset of User Timing API necessary for React measurements.
 // https://developer.mozilla.org/en-US/docs/Web/API/User_Timing_API
@@ -98,54 +97,13 @@ const userTimingPolyfill = __DEV__ ? {
   },
 } : null;
 
-// A hook to get React Stack markers in Systrace.
-const reactDebugToolHook = __DEV__ ? {
-  onBeforeMountComponent(debugID) {
-    const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
-    const displayName = ReactComponentTreeHook.getDisplayName(debugID);
-    Systrace.beginEvent(`ReactReconciler.mountComponent(${displayName})`);
-  },
-  onMountComponent(debugID) {
-    Systrace.endEvent();
-  },
-  onBeforeUpdateComponent(debugID) {
-    const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
-    const displayName = ReactComponentTreeHook.getDisplayName(debugID);
-    Systrace.beginEvent(`ReactReconciler.updateComponent(${displayName})`);
-  },
-  onUpdateComponent(debugID) {
-    Systrace.endEvent();
-  },
-  onBeforeUnmountComponent(debugID) {
-    const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
-    const displayName = ReactComponentTreeHook.getDisplayName(debugID);
-    Systrace.beginEvent(`ReactReconciler.unmountComponent(${displayName})`);
-  },
-  onUnmountComponent(debugID) {
-    Systrace.endEvent();
-  },
-  onBeginLifeCycleTimer(debugID, timerType) {
-    const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
-    const displayName = ReactComponentTreeHook.getDisplayName(debugID);
-    Systrace.beginEvent(`${displayName}.${timerType}()`);
-  },
-  onEndLifeCycleTimer(debugID, timerType) {
-    Systrace.endEvent();
-  },
-} : null;
-
 const Systrace = {
-  installReactHook(useFiber: boolean) {
+  installReactHook() {
     if (_enabled) {
       if (__DEV__) {
-        if (useFiber) {
-          global.performance = userTimingPolyfill;
-        } else {
-          require('ReactDebugTool').addHook(reactDebugToolHook);
-        }
+        global.performance = userTimingPolyfill;
       }
     }
-    _useFiber = useFiber;
     _canInstallReactHook = true;
   },
 
@@ -158,17 +116,8 @@ const Systrace = {
           global.nativeTraceEndLegacy && global.nativeTraceEndLegacy(TRACE_TAG_JS_VM_CALLS);
         }
         if (_canInstallReactHook) {
-          if (_useFiber) {
-            if (enabled && global.performance === undefined) {
-              global.performance = userTimingPolyfill;
-            }
-          } else {
-            const ReactDebugTool = require('ReactDebugTool');
-            if (enabled) {
-              ReactDebugTool.addHook(reactDebugToolHook);
-            } else {
-              ReactDebugTool.removeHook(reactDebugToolHook);
-            }
+          if (enabled && global.performance === undefined) {
+            global.performance = userTimingPolyfill;
           }
         }
       }
@@ -240,7 +189,7 @@ const Systrace = {
   attachToRelayProfiler(relayProfiler: RelayProfiler) {
     relayProfiler.attachProfileHandler('*', (name, state?) => {
       if (state != null && state.queryName !== undefined) {
-        name += '_' + state.queryName
+        name += '_' + state.queryName;
       }
       const cookie = Systrace.beginAsyncEvent(name);
       return () => {

From b9991d33e323f59af4071cb2c42ed411d89354b3 Mon Sep 17 00:00:00 2001
From: Pritesh Nandgaonkar <prit91@fb.com>
Date: Tue, 20 Feb 2018 05:41:48 -0800
Subject: [PATCH 058/267] Move YGStyle to seperate file and add constructors

Reviewed By: emilsjolander

Differential Revision: D7016575

fbshipit-source-id: eb28df0ffb4cc813b23edaff80d7d4ebc56ce6af
---
 React/React.xcodeproj/project.pbxproj |  12 ++
 ReactCommon/yoga/yoga/YGNode.cpp      |   2 +-
 ReactCommon/yoga/yoga/YGNode.h        |   2 +-
 ReactCommon/yoga/yoga/YGStyle.cpp     |  78 ++++++++++++
 ReactCommon/yoga/yoga/YGStyle.h       |  43 +++++++
 ReactCommon/yoga/yoga/Yoga-internal.h | 170 +++-----------------------
 scripts/.packager.env                 |   1 +
 7 files changed, 153 insertions(+), 155 deletions(-)
 create mode 100644 ReactCommon/yoga/yoga/YGStyle.cpp
 create mode 100644 ReactCommon/yoga/yoga/YGStyle.h
 create mode 100644 scripts/.packager.env

diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index 4d9c41ed13d0a8..539f62fc672662 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -952,6 +952,10 @@
 		3DFE0D1C1DF8575800459392 /* Yoga.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77081DF767AF001F9587 /* Yoga.h */; };
 		3EDCA8A51D3591E700450C31 /* RCTErrorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */; };
 		5335D5411FE81A4700883D58 /* RCTShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5335D5401FE81A4700883D58 /* RCTShadowView.m */; };
+		5352C5752038FF9500A3B97E /* YGStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5352C5722038FF8D00A3B97E /* YGStyle.cpp */; };
+		5352C5762038FF9700A3B97E /* YGStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5352C5722038FF8D00A3B97E /* YGStyle.cpp */; };
+		5352C5772038FF9A00A3B97E /* YGStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5352C5712038FF8D00A3B97E /* YGStyle.h */; };
+		5352C5782038FF9B00A3B97E /* YGStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5352C5712038FF8D00A3B97E /* YGStyle.h */; };
 		53756E3B2004FFFA00FBBD99 /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53756E372004FFF700FBBD99 /* Utils.cpp */; };
 		53756E3C2004FFFC00FBBD99 /* Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 53756E382004FFF700FBBD99 /* Utils.h */; };
 		53756E3D2004FFFE00FBBD99 /* Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 53756E382004FFF700FBBD99 /* Utils.h */; };
@@ -2144,6 +2148,8 @@
 		3EDCA8A31D3591E700450C31 /* RCTErrorInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorInfo.h; sourceTree = "<group>"; };
 		3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTErrorInfo.m; sourceTree = "<group>"; };
 		5335D5401FE81A4700883D58 /* RCTShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowView.m; sourceTree = "<group>"; };
+		5352C5712038FF8D00A3B97E /* YGStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YGStyle.h; sourceTree = "<group>"; };
+		5352C5722038FF8D00A3B97E /* YGStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YGStyle.cpp; sourceTree = "<group>"; };
 		53756E372004FFF700FBBD99 /* Utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utils.cpp; sourceTree = "<group>"; };
 		53756E382004FFF700FBBD99 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
 		5376C5E01FC6DDB20083513D /* YGNodePrint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YGNodePrint.h; sourceTree = "<group>"; };
@@ -2332,6 +2338,8 @@
 		130A77021DF767AF001F9587 /* yoga */ = {
 			isa = PBXGroup;
 			children = (
+				5352C5722038FF8D00A3B97E /* YGStyle.cpp */,
+				5352C5712038FF8D00A3B97E /* YGStyle.h */,
 				53756E372004FFF700FBBD99 /* Utils.cpp */,
 				53756E382004FFF700FBBD99 /* Utils.h */,
 				53EC85DF1FDEC75A0051B2B5 /* YGNode.cpp */,
@@ -3268,6 +3276,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5352C5782038FF9B00A3B97E /* YGStyle.h in Headers */,
 				53EC85E41FDEC7630051B2B5 /* YGNode.h in Headers */,
 				53D1239F1FBF1EFB001B8A10 /* Yoga-internal.h in Headers */,
 				3DFE0D161DF8574D00459392 /* YGEnums.h in Headers */,
@@ -3346,6 +3355,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5352C5772038FF9A00A3B97E /* YGStyle.h in Headers */,
 				53EC85E51FDEC7630051B2B5 /* YGNode.h in Headers */,
 				53D1239E1FBF1EFB001B8A10 /* Yoga-internal.h in Headers */,
 				133957881DF76D3500EC27BE /* YGEnums.h in Headers */,
@@ -4292,6 +4302,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				53D123A01FBF1EFF001B8A10 /* Yoga.cpp in Sources */,
+				5352C5752038FF9500A3B97E /* YGStyle.cpp in Sources */,
 				53EC85E21FDEC75F0051B2B5 /* YGNode.cpp in Sources */,
 				53D1239A1FBF1EF2001B8A10 /* YGEnums.cpp in Sources */,
 				53756E3B2004FFFA00FBBD99 /* Utils.cpp in Sources */,
@@ -4304,6 +4315,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				53D123A11FBF1EFF001B8A10 /* Yoga.cpp in Sources */,
+				5352C5762038FF9700A3B97E /* YGStyle.cpp in Sources */,
 				53EC85E31FDEC75F0051B2B5 /* YGNode.cpp in Sources */,
 				53D1239B1FBF1EF4001B8A10 /* YGEnums.cpp in Sources */,
 				53756E3E2005000300FBBD99 /* Utils.cpp in Sources */,
diff --git a/ReactCommon/yoga/yoga/YGNode.cpp b/ReactCommon/yoga/yoga/YGNode.cpp
index 56ce1b4928c9d1..24a00a883f7053 100644
--- a/ReactCommon/yoga/yoga/YGNode.cpp
+++ b/ReactCommon/yoga/yoga/YGNode.cpp
@@ -382,7 +382,7 @@ YGNode::YGNode()
       measure_(nullptr),
       baseline_(nullptr),
       dirtied_(nullptr),
-      style_(gYGNodeStyleDefaults),
+      style_(YGStyle()),
       layout_(gYGNodeLayoutDefaults),
       lineIndex_(0),
       parent_(nullptr),
diff --git a/ReactCommon/yoga/yoga/YGNode.h b/ReactCommon/yoga/yoga/YGNode.h
index b3e31256961bf3..452b8f31065036 100644
--- a/ReactCommon/yoga/yoga/YGNode.h
+++ b/ReactCommon/yoga/yoga/YGNode.h
@@ -7,7 +7,7 @@
 
 #pragma once
 #include <stdio.h>
-
+#include "YGStyle.h"
 #include "Yoga-internal.h"
 
 struct YGNode {
diff --git a/ReactCommon/yoga/yoga/YGStyle.cpp b/ReactCommon/yoga/yoga/YGStyle.cpp
new file mode 100644
index 00000000000000..516ce061818af6
--- /dev/null
+++ b/ReactCommon/yoga/yoga/YGStyle.cpp
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+#include "YGStyle.h"
+
+YGStyle::YGStyle()
+    : direction(YGDirectionInherit),
+      flexDirection(YGFlexDirectionColumn),
+      justifyContent(YGJustifyFlexStart),
+      alignContent(YGAlignFlexStart),
+      alignItems(YGAlignStretch),
+      alignSelf(YGAlignAuto),
+      positionType(YGPositionTypeRelative),
+      flexWrap(YGWrapNoWrap),
+      overflow(YGOverflowVisible),
+      display(YGDisplayFlex),
+      flex(YGUndefined),
+      flexGrow(YGUndefined),
+      flexShrink(YGUndefined),
+      flexBasis(kYGValueAuto),
+      margin(kYGDefaultEdgeValuesUnit),
+      position(kYGDefaultEdgeValuesUnit),
+      padding(kYGDefaultEdgeValuesUnit),
+      border(kYGDefaultEdgeValuesUnit),
+      dimensions(kYGDefaultDimensionValuesAutoUnit),
+      minDimensions(kYGDefaultDimensionValuesUnit),
+      maxDimensions(kYGDefaultDimensionValuesUnit),
+      aspectRatio(YGUndefined) {}
+
+// Yoga specific properties, not compatible with flexbox specification
+bool YGStyle::operator==(const YGStyle& style) {
+  bool areNonFloatValuesEqual = direction == style.direction &&
+      flexDirection == style.flexDirection &&
+      justifyContent == style.justifyContent &&
+      alignContent == style.alignContent && alignItems == style.alignItems &&
+      alignSelf == style.alignSelf && positionType == style.positionType &&
+      flexWrap == style.flexWrap && overflow == style.overflow &&
+      display == style.display && YGValueEqual(flexBasis, style.flexBasis) &&
+      YGValueArrayEqual(margin, style.margin) &&
+      YGValueArrayEqual(position, style.position) &&
+      YGValueArrayEqual(padding, style.padding) &&
+      YGValueArrayEqual(border, style.border) &&
+      YGValueArrayEqual(dimensions, style.dimensions) &&
+      YGValueArrayEqual(minDimensions, style.minDimensions) &&
+      YGValueArrayEqual(maxDimensions, style.maxDimensions);
+
+  if (!(std::isnan(flex) && std::isnan(style.flex))) {
+    areNonFloatValuesEqual = areNonFloatValuesEqual && flex == style.flex;
+  }
+
+  if (!(std::isnan(flexGrow) && std::isnan(style.flexGrow))) {
+    areNonFloatValuesEqual =
+        areNonFloatValuesEqual && flexGrow == style.flexGrow;
+  }
+
+  if (!(std::isnan(flexShrink) && std::isnan(style.flexShrink))) {
+    areNonFloatValuesEqual =
+        areNonFloatValuesEqual && flexShrink == style.flexShrink;
+  }
+
+  if (!(std::isnan(aspectRatio) && std::isnan(style.aspectRatio))) {
+    areNonFloatValuesEqual =
+        areNonFloatValuesEqual && aspectRatio == style.aspectRatio;
+  }
+
+  return areNonFloatValuesEqual;
+}
+
+bool YGStyle::operator!=(YGStyle style) {
+  return !(*this == style);
+}
+
+YGStyle::~YGStyle() {}
diff --git a/ReactCommon/yoga/yoga/YGStyle.h b/ReactCommon/yoga/yoga/YGStyle.h
new file mode 100644
index 00000000000000..a95b4a297e7667
--- /dev/null
+++ b/ReactCommon/yoga/yoga/YGStyle.h
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+#pragma once
+#include "Yoga-internal.h"
+#include "Yoga.h"
+
+struct YGStyle {
+  YGDirection direction;
+  YGFlexDirection flexDirection;
+  YGJustify justifyContent;
+  YGAlign alignContent;
+  YGAlign alignItems;
+  YGAlign alignSelf;
+  YGPositionType positionType;
+  YGWrap flexWrap;
+  YGOverflow overflow;
+  YGDisplay display;
+  float flex;
+  float flexGrow;
+  float flexShrink;
+  YGValue flexBasis;
+  std::array<YGValue, YGEdgeCount> margin;
+  std::array<YGValue, YGEdgeCount> position;
+  std::array<YGValue, YGEdgeCount> padding;
+  std::array<YGValue, YGEdgeCount> border;
+  std::array<YGValue, 2> dimensions;
+  std::array<YGValue, 2> minDimensions;
+  std::array<YGValue, 2> maxDimensions;
+  float aspectRatio;
+
+  YGStyle();
+  // Yoga specific properties, not compatible with flexbox specification
+  bool operator==(const YGStyle& style);
+
+  bool operator!=(YGStyle style);
+  ~YGStyle();
+};
diff --git a/ReactCommon/yoga/yoga/Yoga-internal.h b/ReactCommon/yoga/yoga/Yoga-internal.h
index 6432e6cfcc08e0..b1bb0de3ded6e4 100644
--- a/ReactCommon/yoga/yoga/Yoga-internal.h
+++ b/ReactCommon/yoga/yoga/Yoga-internal.h
@@ -10,7 +10,6 @@
 #include <array>
 #include <cmath>
 #include <vector>
-
 #include "Yoga.h"
 
 using YGVector = std::vector<YGNodeRef>;
@@ -42,6 +41,23 @@ bool YGValueArrayEqual(
   return areEqual;
 }
 
+const YGValue kYGValueUndefined = {YGUndefined, YGUnitUndefined};
+const YGValue kYGValueAuto = {YGUndefined, YGUnitAuto};
+const std::array<YGValue, YGEdgeCount> kYGDefaultEdgeValuesUnit = {
+    {kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined}};
+const std::array<YGValue, 2> kYGDefaultDimensionValuesAutoUnit = {
+    {kYGValueAuto, kYGValueAuto}};
+const std::array<YGValue, 2> kYGDefaultDimensionValuesUnit = {
+    {kYGValueUndefined, kYGValueUndefined}};
+
 struct YGCachedMeasurement {
   float availableWidth;
   float availableHeight;
@@ -141,74 +157,6 @@ struct YGLayout {
   }
 };
 
-struct YGStyle {
-  YGDirection direction;
-  YGFlexDirection flexDirection;
-  YGJustify justifyContent;
-  YGAlign alignContent;
-  YGAlign alignItems;
-  YGAlign alignSelf;
-  YGPositionType positionType;
-  YGWrap flexWrap;
-  YGOverflow overflow;
-  YGDisplay display;
-  float flex;
-  float flexGrow;
-  float flexShrink;
-  YGValue flexBasis;
-  std::array<YGValue, YGEdgeCount> margin;
-  std::array<YGValue, YGEdgeCount> position;
-  std::array<YGValue, YGEdgeCount> padding;
-  std::array<YGValue, YGEdgeCount> border;
-  std::array<YGValue, 2> dimensions;
-  std::array<YGValue, 2> minDimensions;
-  std::array<YGValue, 2> maxDimensions;
-
-  // Yoga specific properties, not compatible with flexbox specification
-  float aspectRatio;
-  bool operator==(YGStyle style) {
-    bool areNonFloatValuesEqual = direction == style.direction &&
-        flexDirection == style.flexDirection &&
-        justifyContent == style.justifyContent &&
-        alignContent == style.alignContent && alignItems == style.alignItems &&
-        alignSelf == style.alignSelf && positionType == style.positionType &&
-        flexWrap == style.flexWrap && overflow == style.overflow &&
-        display == style.display && YGValueEqual(flexBasis, style.flexBasis) &&
-        YGValueArrayEqual(margin, style.margin) &&
-        YGValueArrayEqual(position, style.position) &&
-        YGValueArrayEqual(padding, style.padding) &&
-        YGValueArrayEqual(border, style.border) &&
-        YGValueArrayEqual(dimensions, style.dimensions) &&
-        YGValueArrayEqual(minDimensions, style.minDimensions) &&
-        YGValueArrayEqual(maxDimensions, style.maxDimensions);
-
-    if (!(std::isnan(flex) && std::isnan(style.flex))) {
-      areNonFloatValuesEqual = areNonFloatValuesEqual && flex == style.flex;
-    }
-
-    if (!(std::isnan(flexGrow) && std::isnan(style.flexGrow))) {
-      areNonFloatValuesEqual =
-          areNonFloatValuesEqual && flexGrow == style.flexGrow;
-    }
-
-    if (!(std::isnan(flexShrink) && std::isnan(style.flexShrink))) {
-      areNonFloatValuesEqual =
-          areNonFloatValuesEqual && flexShrink == style.flexShrink;
-    }
-
-    if (!(std::isnan(aspectRatio) && std::isnan(style.aspectRatio))) {
-      areNonFloatValuesEqual =
-          areNonFloatValuesEqual && aspectRatio == style.aspectRatio;
-    }
-
-    return areNonFloatValuesEqual;
-  }
-
-  bool operator!=(YGStyle style) {
-    return !(*this == style);
-  }
-};
-
 struct YGConfig {
   bool experimentalFeatures[YGExperimentalFeatureCount + 1];
   bool useWebDefaults;
@@ -220,94 +168,10 @@ struct YGConfig {
   void* context;
 };
 
-#define YG_UNDEFINED_VALUES \
-  { .value = YGUndefined, .unit = YGUnitUndefined }
-
-#define YG_AUTO_VALUES \
-  { .value = YGUndefined, .unit = YGUnitAuto }
-
-#define YG_DEFAULT_EDGE_VALUES_UNIT                                            \
-  {                                                                            \
-    [YGEdgeLeft] = YG_UNDEFINED_VALUES, [YGEdgeTop] = YG_UNDEFINED_VALUES,     \
-    [YGEdgeRight] = YG_UNDEFINED_VALUES, [YGEdgeBottom] = YG_UNDEFINED_VALUES, \
-    [YGEdgeStart] = YG_UNDEFINED_VALUES, [YGEdgeEnd] = YG_UNDEFINED_VALUES,    \
-    [YGEdgeHorizontal] = YG_UNDEFINED_VALUES,                                  \
-    [YGEdgeVertical] = YG_UNDEFINED_VALUES, [YGEdgeAll] = YG_UNDEFINED_VALUES, \
-  }
-
-#define YG_DEFAULT_DIMENSION_VALUES \
-  { [YGDimensionWidth] = YGUndefined, [YGDimensionHeight] = YGUndefined, }
-
-#define YG_DEFAULT_DIMENSION_VALUES_UNIT       \
-  {                                            \
-    [YGDimensionWidth] = YG_UNDEFINED_VALUES,  \
-    [YGDimensionHeight] = YG_UNDEFINED_VALUES, \
-  }
-
-#define YG_DEFAULT_DIMENSION_VALUES_AUTO_UNIT \
-  { [YGDimensionWidth] = YG_AUTO_VALUES, [YGDimensionHeight] = YG_AUTO_VALUES, }
-
 static const float kDefaultFlexGrow = 0.0f;
 static const float kDefaultFlexShrink = 0.0f;
 static const float kWebDefaultFlexShrink = 1.0f;
 
-static const YGStyle gYGNodeStyleDefaults = {
-    .direction = YGDirectionInherit,
-    .flexDirection = YGFlexDirectionColumn,
-    .justifyContent = YGJustifyFlexStart,
-    .alignContent = YGAlignFlexStart,
-    .alignItems = YGAlignStretch,
-    .alignSelf = YGAlignAuto,
-    .positionType = YGPositionTypeRelative,
-    .flexWrap = YGWrapNoWrap,
-    .overflow = YGOverflowVisible,
-    .display = YGDisplayFlex,
-    .flex = YGUndefined,
-    .flexGrow = YGUndefined,
-    .flexShrink = YGUndefined,
-    .flexBasis = YG_AUTO_VALUES,
-    .margin = {{YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES}},
-    .position = {{YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES,
-                  YG_UNDEFINED_VALUES}},
-    .padding = {{YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES,
-                 YG_UNDEFINED_VALUES}},
-    .border = {{YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES,
-                YG_UNDEFINED_VALUES}},
-    .dimensions = {{YG_AUTO_VALUES, YG_AUTO_VALUES}},
-    .minDimensions = {{YG_UNDEFINED_VALUES, YG_UNDEFINED_VALUES}},
-    .maxDimensions = {{YG_UNDEFINED_VALUES, YG_UNDEFINED_VALUES}},
-    .aspectRatio = YGUndefined,
-};
-
 static const YGLayout gYGNodeLayoutDefaults = {
     .position = {},
     .dimensions = {{YGUndefined, YGUndefined}},
diff --git a/scripts/.packager.env b/scripts/.packager.env
new file mode 100644
index 00000000000000..361f5fb47d34ac
--- /dev/null
+++ b/scripts/.packager.env
@@ -0,0 +1 @@
+export RCT_METRO_PORT=8081

From c75ce8146f9366b9d1ea7cdc6fc73c87fb518430 Mon Sep 17 00:00:00 2001
From: Pritesh Nandgaonkar <prit91@fb.com>
Date: Tue, 20 Feb 2018 05:41:50 -0800
Subject: [PATCH 059/267] Add constructor in YGLayout

Reviewed By: emilsjolander

Differential Revision: D7019653

fbshipit-source-id: 5a2655626db0915fcebe7d4517e2d0b2e2484460
---
 React/React.xcodeproj/project.pbxproj |  12 +++
 ReactCommon/yoga/yoga/YGLayout.cpp    |  73 ++++++++++++++++++
 ReactCommon/yoga/yoga/YGLayout.h      |  42 ++++++++++
 ReactCommon/yoga/yoga/YGNode.cpp      |   2 +-
 ReactCommon/yoga/yoga/YGNode.h        |   1 +
 ReactCommon/yoga/yoga/YGStyle.cpp     |  21 +++++
 ReactCommon/yoga/yoga/Yoga-internal.h | 107 --------------------------
 7 files changed, 150 insertions(+), 108 deletions(-)
 create mode 100644 ReactCommon/yoga/yoga/YGLayout.cpp
 create mode 100644 ReactCommon/yoga/yoga/YGLayout.h

diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index 539f62fc672662..0f79353b3f2dea 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -952,6 +952,10 @@
 		3DFE0D1C1DF8575800459392 /* Yoga.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77081DF767AF001F9587 /* Yoga.h */; };
 		3EDCA8A51D3591E700450C31 /* RCTErrorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */; };
 		5335D5411FE81A4700883D58 /* RCTShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5335D5401FE81A4700883D58 /* RCTShadowView.m */; };
+		53438962203905BB008E0CB3 /* YGLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5343895E203905B6008E0CB3 /* YGLayout.cpp */; };
+		53438963203905BC008E0CB3 /* YGLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5343895E203905B6008E0CB3 /* YGLayout.cpp */; };
+		53438964203905BF008E0CB3 /* YGLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 5343895F203905B6008E0CB3 /* YGLayout.h */; };
+		53438965203905C0008E0CB3 /* YGLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 5343895F203905B6008E0CB3 /* YGLayout.h */; };
 		5352C5752038FF9500A3B97E /* YGStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5352C5722038FF8D00A3B97E /* YGStyle.cpp */; };
 		5352C5762038FF9700A3B97E /* YGStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5352C5722038FF8D00A3B97E /* YGStyle.cpp */; };
 		5352C5772038FF9A00A3B97E /* YGStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5352C5712038FF8D00A3B97E /* YGStyle.h */; };
@@ -2148,6 +2152,8 @@
 		3EDCA8A31D3591E700450C31 /* RCTErrorInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTErrorInfo.h; sourceTree = "<group>"; };
 		3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTErrorInfo.m; sourceTree = "<group>"; };
 		5335D5401FE81A4700883D58 /* RCTShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowView.m; sourceTree = "<group>"; };
+		5343895E203905B6008E0CB3 /* YGLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YGLayout.cpp; sourceTree = "<group>"; };
+		5343895F203905B6008E0CB3 /* YGLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YGLayout.h; sourceTree = "<group>"; };
 		5352C5712038FF8D00A3B97E /* YGStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YGStyle.h; sourceTree = "<group>"; };
 		5352C5722038FF8D00A3B97E /* YGStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YGStyle.cpp; sourceTree = "<group>"; };
 		53756E372004FFF700FBBD99 /* Utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utils.cpp; sourceTree = "<group>"; };
@@ -2338,6 +2344,8 @@
 		130A77021DF767AF001F9587 /* yoga */ = {
 			isa = PBXGroup;
 			children = (
+				5343895E203905B6008E0CB3 /* YGLayout.cpp */,
+				5343895F203905B6008E0CB3 /* YGLayout.h */,
 				5352C5722038FF8D00A3B97E /* YGStyle.cpp */,
 				5352C5712038FF8D00A3B97E /* YGStyle.h */,
 				53756E372004FFF700FBBD99 /* Utils.cpp */,
@@ -3284,6 +3292,7 @@
 				53756E3D2004FFFE00FBBD99 /* Utils.h in Headers */,
 				5376C5E71FC6DDC20083513D /* YGNodePrint.h in Headers */,
 				3DFE0D191DF8574D00459392 /* Yoga.h in Headers */,
+				53438965203905C0008E0CB3 /* YGLayout.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3363,6 +3372,7 @@
 				53756E3C2004FFFC00FBBD99 /* Utils.h in Headers */,
 				5376C5E61FC6DDC10083513D /* YGNodePrint.h in Headers */,
 				133957891DF76D3500EC27BE /* YGMacros.h in Headers */,
+				53438964203905BF008E0CB3 /* YGLayout.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4306,6 +4316,7 @@
 				53EC85E21FDEC75F0051B2B5 /* YGNode.cpp in Sources */,
 				53D1239A1FBF1EF2001B8A10 /* YGEnums.cpp in Sources */,
 				53756E3B2004FFFA00FBBD99 /* Utils.cpp in Sources */,
+				53438962203905BB008E0CB3 /* YGLayout.cpp in Sources */,
 				5376C5E41FC6DDBC0083513D /* YGNodePrint.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4319,6 +4330,7 @@
 				53EC85E31FDEC75F0051B2B5 /* YGNode.cpp in Sources */,
 				53D1239B1FBF1EF4001B8A10 /* YGEnums.cpp in Sources */,
 				53756E3E2005000300FBBD99 /* Utils.cpp in Sources */,
+				53438963203905BC008E0CB3 /* YGLayout.cpp in Sources */,
 				5376C5E51FC6DDBD0083513D /* YGNodePrint.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/ReactCommon/yoga/yoga/YGLayout.cpp b/ReactCommon/yoga/yoga/YGLayout.cpp
new file mode 100644
index 00000000000000..8f00c0f3ef42bd
--- /dev/null
+++ b/ReactCommon/yoga/yoga/YGLayout.cpp
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+#include "YGLayout.h"
+
+const std::array<float, 2> kYGDefaultDimensionValues = {
+    {YGUndefined, YGUndefined}};
+
+YGLayout::YGLayout()
+    : position(),
+      dimensions(kYGDefaultDimensionValues),
+      margin(),
+      border(),
+      padding(),
+      direction(YGDirectionInherit),
+      computedFlexBasisGeneration(0),
+      computedFlexBasis(YGUndefined),
+      hadOverflow(false),
+      generationCount(0),
+      lastParentDirection((YGDirection)-1),
+      nextCachedMeasurementsIndex(0),
+      cachedMeasurements(),
+      measuredDimensions(kYGDefaultDimensionValues),
+      cachedLayout({
+          .availableWidth = 0,
+          .availableHeight = 0,
+          .widthMeasureMode = (YGMeasureMode)-1,
+          .heightMeasureMode = (YGMeasureMode)-1,
+          .computedWidth = -1,
+          .computedHeight = -1,
+      }),
+      didUseLegacyFlag(false),
+      doesLegacyStretchFlagAffectsLayout(false) {}
+
+bool YGLayout::operator==(YGLayout layout) const {
+  bool isEqual = position == layout.position &&
+      dimensions == layout.dimensions && margin == layout.margin &&
+      border == layout.border && padding == layout.padding &&
+      direction == layout.direction && hadOverflow == layout.hadOverflow &&
+      lastParentDirection == layout.lastParentDirection &&
+      nextCachedMeasurementsIndex == layout.nextCachedMeasurementsIndex &&
+      cachedLayout == layout.cachedLayout;
+
+  for (uint32_t i = 0; i < YG_MAX_CACHED_RESULT_COUNT && isEqual; ++i) {
+    isEqual = isEqual && cachedMeasurements[i] == layout.cachedMeasurements[i];
+  }
+
+  if (!YGFloatIsUndefined(computedFlexBasis) ||
+      !YGFloatIsUndefined(layout.computedFlexBasis)) {
+    isEqual = isEqual && (computedFlexBasis == layout.computedFlexBasis);
+  }
+  if (!YGFloatIsUndefined(measuredDimensions[0]) ||
+      !YGFloatIsUndefined(layout.measuredDimensions[0])) {
+    isEqual =
+        isEqual && (measuredDimensions[0] == layout.measuredDimensions[0]);
+  }
+  if (!YGFloatIsUndefined(measuredDimensions[1]) ||
+      !YGFloatIsUndefined(layout.measuredDimensions[1])) {
+    isEqual =
+        isEqual && (measuredDimensions[1] == layout.measuredDimensions[1]);
+  }
+
+  return isEqual;
+}
+
+bool YGLayout::operator!=(YGLayout layout) const {
+  return !(*this == layout);
+}
diff --git a/ReactCommon/yoga/yoga/YGLayout.h b/ReactCommon/yoga/yoga/YGLayout.h
new file mode 100644
index 00000000000000..125a6d0b03ed0a
--- /dev/null
+++ b/ReactCommon/yoga/yoga/YGLayout.h
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+#pragma once
+#include "Yoga-internal.h"
+
+struct YGLayout {
+  std::array<float, 4> position;
+  std::array<float, 2> dimensions;
+  std::array<float, 6> margin;
+  std::array<float, 6> border;
+  std::array<float, 6> padding;
+  YGDirection direction;
+
+  uint32_t computedFlexBasisGeneration;
+  float computedFlexBasis;
+  bool hadOverflow;
+
+  // Instead of recomputing the entire layout every single time, we
+  // cache some information to break early when nothing changed
+  uint32_t generationCount;
+  YGDirection lastParentDirection;
+
+  uint32_t nextCachedMeasurementsIndex;
+  std::array<YGCachedMeasurement, YG_MAX_CACHED_RESULT_COUNT>
+      cachedMeasurements;
+  std::array<float, 2> measuredDimensions;
+
+  YGCachedMeasurement cachedLayout;
+  bool didUseLegacyFlag;
+  bool doesLegacyStretchFlagAffectsLayout;
+
+  YGLayout();
+
+  bool operator==(YGLayout layout) const;
+  bool operator!=(YGLayout layout) const;
+};
diff --git a/ReactCommon/yoga/yoga/YGNode.cpp b/ReactCommon/yoga/yoga/YGNode.cpp
index 24a00a883f7053..89be5bfe3bb5e0 100644
--- a/ReactCommon/yoga/yoga/YGNode.cpp
+++ b/ReactCommon/yoga/yoga/YGNode.cpp
@@ -383,7 +383,7 @@ YGNode::YGNode()
       baseline_(nullptr),
       dirtied_(nullptr),
       style_(YGStyle()),
-      layout_(gYGNodeLayoutDefaults),
+      layout_(YGLayout()),
       lineIndex_(0),
       parent_(nullptr),
       children_(YGVector()),
diff --git a/ReactCommon/yoga/yoga/YGNode.h b/ReactCommon/yoga/yoga/YGNode.h
index 452b8f31065036..27a1ed68fac113 100644
--- a/ReactCommon/yoga/yoga/YGNode.h
+++ b/ReactCommon/yoga/yoga/YGNode.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include <stdio.h>
+#include "YGLayout.h"
 #include "YGStyle.h"
 #include "Yoga-internal.h"
 
diff --git a/ReactCommon/yoga/yoga/YGStyle.cpp b/ReactCommon/yoga/yoga/YGStyle.cpp
index 516ce061818af6..a73cb3ce6dd6ad 100644
--- a/ReactCommon/yoga/yoga/YGStyle.cpp
+++ b/ReactCommon/yoga/yoga/YGStyle.cpp
@@ -8,6 +8,27 @@
  */
 #include "YGStyle.h"
 
+const YGValue kYGValueUndefined = {YGUndefined, YGUnitUndefined};
+
+const YGValue kYGValueAuto = {YGUndefined, YGUnitAuto};
+
+const std::array<YGValue, YGEdgeCount> kYGDefaultEdgeValuesUnit = {
+    {kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined,
+     kYGValueUndefined}};
+
+const std::array<YGValue, 2> kYGDefaultDimensionValuesAutoUnit = {
+    {kYGValueAuto, kYGValueAuto}};
+
+const std::array<YGValue, 2> kYGDefaultDimensionValuesUnit = {
+    {kYGValueUndefined, kYGValueUndefined}};
+
 YGStyle::YGStyle()
     : direction(YGDirectionInherit),
       flexDirection(YGFlexDirectionColumn),
diff --git a/ReactCommon/yoga/yoga/Yoga-internal.h b/ReactCommon/yoga/yoga/Yoga-internal.h
index b1bb0de3ded6e4..43723df087db65 100644
--- a/ReactCommon/yoga/yoga/Yoga-internal.h
+++ b/ReactCommon/yoga/yoga/Yoga-internal.h
@@ -41,23 +41,6 @@ bool YGValueArrayEqual(
   return areEqual;
 }
 
-const YGValue kYGValueUndefined = {YGUndefined, YGUnitUndefined};
-const YGValue kYGValueAuto = {YGUndefined, YGUnitAuto};
-const std::array<YGValue, YGEdgeCount> kYGDefaultEdgeValuesUnit = {
-    {kYGValueUndefined,
-     kYGValueUndefined,
-     kYGValueUndefined,
-     kYGValueUndefined,
-     kYGValueUndefined,
-     kYGValueUndefined,
-     kYGValueUndefined,
-     kYGValueUndefined,
-     kYGValueUndefined}};
-const std::array<YGValue, 2> kYGDefaultDimensionValuesAutoUnit = {
-    {kYGValueAuto, kYGValueAuto}};
-const std::array<YGValue, 2> kYGDefaultDimensionValuesUnit = {
-    {kYGValueUndefined, kYGValueUndefined}};
-
 struct YGCachedMeasurement {
   float availableWidth;
   float availableHeight;
@@ -95,68 +78,6 @@ struct YGCachedMeasurement {
 // layouts should not require more than 16 entries to fit within the cache.
 #define YG_MAX_CACHED_RESULT_COUNT 16
 
-struct YGLayout {
-  std::array<float, 4> position;
-  std::array<float, 2> dimensions;
-  std::array<float, 6> margin;
-  std::array<float, 6> border;
-  std::array<float, 6> padding;
-  YGDirection direction;
-
-  uint32_t computedFlexBasisGeneration;
-  float computedFlexBasis;
-  bool hadOverflow;
-
-  // Instead of recomputing the entire layout every single time, we
-  // cache some information to break early when nothing changed
-  uint32_t generationCount;
-  YGDirection lastParentDirection;
-
-  uint32_t nextCachedMeasurementsIndex;
-  YGCachedMeasurement cachedMeasurements[YG_MAX_CACHED_RESULT_COUNT];
-  std::array<float, 2> measuredDimensions;
-
-  YGCachedMeasurement cachedLayout;
-  bool didUseLegacyFlag;
-  bool doesLegacyStretchFlagAffectsLayout;
-
-  bool operator==(YGLayout layout) const {
-    bool isEqual = position == layout.position &&
-        dimensions == layout.dimensions && margin == layout.margin &&
-        border == layout.border && padding == layout.padding &&
-        direction == layout.direction && hadOverflow == layout.hadOverflow &&
-        lastParentDirection == layout.lastParentDirection &&
-        nextCachedMeasurementsIndex == layout.nextCachedMeasurementsIndex &&
-        cachedLayout == layout.cachedLayout;
-
-    for (uint32_t i = 0; i < YG_MAX_CACHED_RESULT_COUNT && isEqual; ++i) {
-      isEqual =
-          isEqual && cachedMeasurements[i] == layout.cachedMeasurements[i];
-    }
-
-    if (!YGFloatIsUndefined(computedFlexBasis) ||
-        !YGFloatIsUndefined(layout.computedFlexBasis)) {
-      isEqual = isEqual && (computedFlexBasis == layout.computedFlexBasis);
-    }
-    if (!YGFloatIsUndefined(measuredDimensions[0]) ||
-        !YGFloatIsUndefined(layout.measuredDimensions[0])) {
-      isEqual =
-          isEqual && (measuredDimensions[0] == layout.measuredDimensions[0]);
-    }
-    if (!YGFloatIsUndefined(measuredDimensions[1]) ||
-        !YGFloatIsUndefined(layout.measuredDimensions[1])) {
-      isEqual =
-          isEqual && (measuredDimensions[1] == layout.measuredDimensions[1]);
-    }
-
-    return isEqual;
-  }
-
-  bool operator!=(YGLayout layout) const {
-    return !(*this == layout);
-  }
-};
-
 struct YGConfig {
   bool experimentalFeatures[YGExperimentalFeatureCount + 1];
   bool useWebDefaults;
@@ -172,34 +93,6 @@ static const float kDefaultFlexGrow = 0.0f;
 static const float kDefaultFlexShrink = 0.0f;
 static const float kWebDefaultFlexShrink = 1.0f;
 
-static const YGLayout gYGNodeLayoutDefaults = {
-    .position = {},
-    .dimensions = {{YGUndefined, YGUndefined}},
-    .margin = {},
-    .border = {},
-    .padding = {},
-    .direction = YGDirectionInherit,
-    .computedFlexBasisGeneration = 0,
-    .computedFlexBasis = YGUndefined,
-    .hadOverflow = false,
-    .generationCount = 0,
-    .lastParentDirection = (YGDirection)-1,
-    .nextCachedMeasurementsIndex = 0,
-    .cachedMeasurements = {},
-    .measuredDimensions = {{YGUndefined, YGUndefined}},
-    .cachedLayout =
-        {
-            .availableWidth = 0,
-            .availableHeight = 0,
-            .widthMeasureMode = (YGMeasureMode)-1,
-            .heightMeasureMode = (YGMeasureMode)-1,
-            .computedWidth = -1,
-            .computedHeight = -1,
-        },
-    .didUseLegacyFlag = false,
-    .doesLegacyStretchFlagAffectsLayout = false,
-};
-
 extern bool YGFloatsEqual(const float a, const float b);
 extern bool YGValueEqual(const YGValue a, const YGValue b);
 extern const YGValue* YGComputedEdgeValue(

From 22cf81571b2ae3ffb0b754fe4ed4afcfc50e74d5 Mon Sep 17 00:00:00 2001
From: Pritesh Nandgaonkar <prit91@fb.com>
Date: Tue, 20 Feb 2018 05:41:52 -0800
Subject: [PATCH 060/267] Added default constructor for YGCachedMeasurement

Reviewed By: emilsjolander

Differential Revision: D7020337

fbshipit-source-id: e084e234bf6a2ae22e53e739959683abca169b88
---
 ReactCommon/yoga/yoga/YGLayout.cpp    | 9 +--------
 ReactCommon/yoga/yoga/Yoga-internal.h | 8 ++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ReactCommon/yoga/yoga/YGLayout.cpp b/ReactCommon/yoga/yoga/YGLayout.cpp
index 8f00c0f3ef42bd..66348fc29c055c 100644
--- a/ReactCommon/yoga/yoga/YGLayout.cpp
+++ b/ReactCommon/yoga/yoga/YGLayout.cpp
@@ -26,14 +26,7 @@ YGLayout::YGLayout()
       nextCachedMeasurementsIndex(0),
       cachedMeasurements(),
       measuredDimensions(kYGDefaultDimensionValues),
-      cachedLayout({
-          .availableWidth = 0,
-          .availableHeight = 0,
-          .widthMeasureMode = (YGMeasureMode)-1,
-          .heightMeasureMode = (YGMeasureMode)-1,
-          .computedWidth = -1,
-          .computedHeight = -1,
-      }),
+      cachedLayout(YGCachedMeasurement()),
       didUseLegacyFlag(false),
       doesLegacyStretchFlagAffectsLayout(false) {}
 
diff --git a/ReactCommon/yoga/yoga/Yoga-internal.h b/ReactCommon/yoga/yoga/Yoga-internal.h
index 43723df087db65..21b14b239fc870 100644
--- a/ReactCommon/yoga/yoga/Yoga-internal.h
+++ b/ReactCommon/yoga/yoga/Yoga-internal.h
@@ -50,6 +50,14 @@ struct YGCachedMeasurement {
   float computedWidth;
   float computedHeight;
 
+  YGCachedMeasurement()
+      : availableWidth(0),
+        availableHeight(0),
+        widthMeasureMode((YGMeasureMode)-1),
+        heightMeasureMode((YGMeasureMode)-1),
+        computedWidth(-1),
+        computedHeight(-1) {}
+
   bool operator==(YGCachedMeasurement measurement) const {
     bool isEqual = widthMeasureMode == measurement.widthMeasureMode &&
         heightMeasureMode == measurement.heightMeasureMode;

From 9dd7608c975077121253f032e38c7c4bf0b2bff1 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Tue, 20 Feb 2018 17:35:29 -0800
Subject: [PATCH 061/267] Replaced unstable_AsyncComponent with
 unstable_AsyncMode

Reviewed By: gaearon

Differential Revision: D7025510

fbshipit-source-id: 1aff984ce7479e5fdff71259d0f552193a6cdcea
---
 Libraries/ReactNative/renderApplication.js   | 11 ++---------
 Libraries/ReactNative/renderFabricSurface.js | 11 ++---------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/Libraries/ReactNative/renderApplication.js b/Libraries/ReactNative/renderApplication.js
index ed9bf46a34198c..e72853e8e459c0 100644
--- a/Libraries/ReactNative/renderApplication.js
+++ b/Libraries/ReactNative/renderApplication.js
@@ -42,15 +42,8 @@ function renderApplication<Props: Object>(
     RootComponent.prototype.unstable_isAsyncReactComponent === true
   ) {
     // $FlowFixMe This is not yet part of the official public API
-    class AppContainerAsyncWrapper extends React.unstable_AsyncComponent {
-      render() {
-        return this.props.children;
-      }
-    }
-
-    renderable = (
-      <AppContainerAsyncWrapper>{renderable}</AppContainerAsyncWrapper>
-    );
+    const AsyncMode = React.unstable_AsyncMode;
+    renderable = <AsyncMode>{renderable}</AsyncMode>;
   }
 
   ReactNative.render(renderable, rootTag);
diff --git a/Libraries/ReactNative/renderFabricSurface.js b/Libraries/ReactNative/renderFabricSurface.js
index 59eb2f2926aa8a..f8acdd2c8dcb1f 100644
--- a/Libraries/ReactNative/renderFabricSurface.js
+++ b/Libraries/ReactNative/renderFabricSurface.js
@@ -43,15 +43,8 @@ function renderFabricSurface<Props: Object>(
     RootComponent.prototype.unstable_isAsyncReactComponent === true
   ) {
     // $FlowFixMe This is not yet part of the official public API
-    class AppContainerAsyncWrapper extends React.unstable_AsyncComponent {
-      render() {
-        return this.props.children;
-      }
-    }
-
-    renderable = (
-      <AppContainerAsyncWrapper>{renderable}</AppContainerAsyncWrapper>
-    );
+    const AsyncMode = React.unstable_AsyncMode;
+    renderable = <AsyncMode>{renderable}</AsyncMode>;
   }
 
   ReactFabric.render(renderable, rootTag);

From ad06403c3e693b804193ed029893a4853e8bd8ba Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Tue, 20 Feb 2018 19:03:59 -0800
Subject: [PATCH 062/267] Introduce cloning mechanism for React Shadow Node

Reviewed By: achen1

Differential Revision: D7018869

fbshipit-source-id: beca45b1df9602ebbc9172091b24a2bf44e103f4
---
 .../react/uimanager/ReactShadowNode.java      | 10 +++
 .../react/uimanager/ReactShadowNodeImpl.java  | 65 ++++++++++++++++---
 .../react/uimanager/YogaNodePool.java         |  2 +-
 3 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
index 87950f69f0c4b0..92e5badc695830 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
@@ -67,6 +67,11 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
    */
   boolean isYogaLeafNode();
 
+  /**
+   * @return a mutable copy of the {@link ReactShadowNode}
+   */
+  T mutableCopy();
+
   String getViewClass();
 
   boolean hasUpdates();
@@ -127,8 +132,11 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   T getRootNode();
 
+  @Deprecated() //Replaced by setRootTag method.
   void setRootNode(T rootNode);
 
+  void setRootTag(int rootTag);
+
   void setViewClassName(String viewClassName);
 
   @Nullable
@@ -159,6 +167,8 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   T removeNativeChildAt(int i);
 
+  void removeAllChildren();
+
   void removeAllNativeChildren();
 
   int getNativeChildCount();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index e6bb9a5865878c..1029519ec4d3f9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -6,6 +6,8 @@
  */
 package com.facebook.react.uimanager;
 
+import static java.lang.System.arraycopy;
+
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.uimanager.annotations.ReactPropertyHolder;
 import com.facebook.yoga.YogaAlign;
@@ -53,9 +55,17 @@
 @ReactPropertyHolder
 public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl> {
 
+  private static final YogaConfig sYogaConfig;
+  static {
+    sYogaConfig = new YogaConfig();
+    sYogaConfig.setPointScaleFactor(0f);
+    sYogaConfig.setUseLegacyStretchBehaviour(true);
+  }
+
   private int mReactTag;
   private @Nullable String mViewClassName;
   private @Nullable ReactShadowNodeImpl mRootNode;
+  private int mRootTag;
   private @Nullable ThemedReactContext mThemedContext;
   private boolean mShouldNotifyOnLayout;
   private boolean mNodeUpdated = true;
@@ -75,26 +85,50 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
   private final float[] mPadding = new float[Spacing.ALL + 1];
   private final boolean[] mPaddingIsPercent = new boolean[Spacing.ALL + 1];
   private final YogaNode mYogaNode;
-  private static YogaConfig sYogaConfig;
 
   public ReactShadowNodeImpl() {
     if (!isVirtual()) {
       YogaNode node = YogaNodePool.get().acquire();
-      if (sYogaConfig == null) {
-        sYogaConfig = new YogaConfig();
-        sYogaConfig.setPointScaleFactor(0f);
-        sYogaConfig.setUseLegacyStretchBehaviour(true);
-      }
-      if (node == null) {
-        node = new YogaNode(sYogaConfig);
-      }
-      mYogaNode = node;
+      mYogaNode = node == null ? new YogaNode(sYogaConfig) : node;
       Arrays.fill(mPadding, YogaConstants.UNDEFINED);
     } else {
       mYogaNode = null;
     }
   }
 
+  public ReactShadowNodeImpl(ReactShadowNodeImpl original) {
+    try {
+      mReactTag = original.mReactTag;
+      mRootTag = original.mRootTag;
+      mViewClassName = original.mViewClassName;
+      mRootNode = original.mRootNode;
+      mThemedContext = original.mThemedContext;
+      mShouldNotifyOnLayout = original.mShouldNotifyOnLayout;
+      mNodeUpdated = original.mNodeUpdated;
+      mChildren = original.mChildren == null ? null : new ArrayList<>(original.mChildren);
+      mParent = original.mParent;
+      mIsLayoutOnly = original.mIsLayoutOnly;
+      mTotalNativeChildren = original.mTotalNativeChildren;
+      mNativeParent = original.mNativeParent;
+      mNativeChildren = original.mNativeChildren == null ? null : new ArrayList<>(original.mNativeChildren);
+      mNativeParent = original.mNativeParent;
+      mScreenX = original.mScreenX;
+      mScreenY = original.mScreenY;
+      mScreenWidth = original.mScreenWidth;
+      mScreenHeight = original.mScreenHeight;
+      arraycopy(original.mPadding, 0, mPadding, 0, original.mPadding.length);
+      arraycopy(original.mPaddingIsPercent, 0, mPaddingIsPercent, 0, original.mPaddingIsPercent.length);
+      mYogaNode = original.mYogaNode.clone();
+    } catch (CloneNotSupportedException e) {
+      // it should never happen
+      throw new IllegalArgumentException();
+    }
+  }
+
+  public ReactShadowNodeImpl mutableCopy() {
+    return new ReactShadowNodeImpl(this);
+  }
+
   /**
    * Nodes that return {@code true} will be treated as "virtual" nodes. That is, nodes that are not
    * mapped into native views (e.g. nested text node). By default this method returns {@code false}.
@@ -378,6 +412,11 @@ public final void setRootNode(ReactShadowNodeImpl rootNode) {
     mRootNode = rootNode;
   }
 
+  @Override
+  public void setRootTag(int rootTag) {
+    mRootTag = rootTag;
+  }
+
   @Override
   public final void setViewClassName(String viewClassName) {
     mViewClassName = viewClassName;
@@ -451,6 +490,12 @@ public final ReactShadowNodeImpl removeNativeChildAt(int i) {
     return removed;
   }
 
+  @Override
+  public final void removeAllChildren() {
+    removeAllNativeChildren();
+    mChildren.clear();
+  }
+
   @Override
   public final void removeAllNativeChildren() {
     if (mNativeChildren != null) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java
index c71b2612376d95..ac6f5b380b3b33 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.java
@@ -20,7 +20,7 @@ public static ClearableSynchronizedPool<YogaNode> get() {
 
     synchronized (sInitLock) {
       if (sPool == null) {
-        sPool = new ClearableSynchronizedPool<YogaNode>(1024);
+        sPool = new ClearableSynchronizedPool<>(1024);
       }
       return sPool;
     }

From 8c036ce090529dee3d44c23edf2dd965284e3df7 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Tue, 20 Feb 2018 20:13:22 -0800
Subject: [PATCH 063/267] RN: Remove Animated -> ScrollView -> Animated Cycle

Reviewed By: sahrens

Differential Revision: D7027223

fbshipit-source-id: 59924fada0f29a5e2ce1ae9a3694a94cfb26367c
---
 Libraries/Animated/src/Animated.js            | 25 ++++++++-----------
 .../src/__tests__/AnimatedNative-test.js      |  1 +
 Libraries/Components/ScrollView/ScrollView.js |  8 +++---
 .../ScrollView/ScrollViewStickyHeader.js      | 11 +++++---
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/Libraries/Animated/src/Animated.js b/Libraries/Animated/src/Animated.js
index cfe2be06876811..32ec9ff8046954 100644
--- a/Libraries/Animated/src/Animated.js
+++ b/Libraries/Animated/src/Animated.js
@@ -6,30 +6,25 @@
  *
  * @providesModule Animated
  * @flow
+ * @format
  */
-'use strict';
-
 
-var AnimatedImplementation = require('AnimatedImplementation');
-var Image = require('Image');
-var Text = require('Text');
-var View = require('View');
+'use strict';
 
-let AnimatedScrollView;
+const AnimatedImplementation = require('AnimatedImplementation');
+const Image = require('Image');
+const ScrollView = require('ScrollView');
+const Text = require('Text');
+const View = require('View');
 
 const Animated = {
   View: AnimatedImplementation.createAnimatedComponent(View),
   Text: AnimatedImplementation.createAnimatedComponent(Text),
   Image: AnimatedImplementation.createAnimatedComponent(Image),
-  get ScrollView() {
-    // Make this lazy to avoid circular reference.
-    if (!AnimatedScrollView) {
-      AnimatedScrollView = AnimatedImplementation.createAnimatedComponent(require('ScrollView'));
-    }
-    return AnimatedScrollView;
-  },
+  ScrollView: AnimatedImplementation.createAnimatedComponent(ScrollView),
 };
 
 Object.assign((Animated: Object), AnimatedImplementation);
 
-module.exports = ((Animated: any): (typeof AnimatedImplementation) & typeof Animated);
+module.exports = ((Animated: any): typeof AnimatedImplementation &
+  typeof Animated);
diff --git a/Libraries/Animated/src/__tests__/AnimatedNative-test.js b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
index 77306dd8fffd05..1c6700e4dc0652 100644
--- a/Libraries/Animated/src/__tests__/AnimatedNative-test.js
+++ b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
@@ -16,6 +16,7 @@ jest
   .setMock('Text', ClassComponentMock)
   .setMock('View', ClassComponentMock)
   .setMock('Image', ClassComponentMock)
+  .setMock('ScrollView', ClassComponentMock)
   .setMock('React', {Component: class {}})
   .setMock('NativeModules', {
     NativeAnimatedModule: {},
diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index 354fd952b8191e..5d0d007fe29f3f 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -9,7 +9,7 @@
  */
 'use strict';
 
-const Animated = require('Animated');
+const AnimatedImplementation = require('AnimatedImplementation');
 const ColorPropType = require('ColorPropType');
 const EdgeInsetsPropType = require('EdgeInsetsPropType');
 const Platform = require('Platform');
@@ -497,7 +497,7 @@ const ScrollView = createReactClass({
 
   mixins: [ScrollResponder.Mixin],
 
-  _scrollAnimatedValue: (new Animated.Value(0): Animated.Value),
+  _scrollAnimatedValue: (new AnimatedImplementation.Value(0): AnimatedImplementation.Value),
   _scrollAnimatedValueAttachment: (null: ?{detach: () => void}),
   _stickyHeaderRefs: (new Map(): Map<number, ScrollViewStickyHeader>),
   _headerLayoutYs: (new Map(): Map<string, number>),
@@ -509,7 +509,7 @@ const ScrollView = createReactClass({
   },
 
   UNSAFE_componentWillMount: function() {
-    this._scrollAnimatedValue = new Animated.Value(this.props.contentOffset ? this.props.contentOffset.y : 0);
+    this._scrollAnimatedValue = new AnimatedImplementation.Value(this.props.contentOffset ? this.props.contentOffset.y : 0);
     this._scrollAnimatedValue.setOffset(this.props.contentInset ? this.props.contentInset.top : 0);
     this._stickyHeaderRefs = new Map();
     this._headerLayoutYs = new Map();
@@ -623,7 +623,7 @@ const ScrollView = createReactClass({
       this._scrollAnimatedValueAttachment.detach();
     }
     if (this.props.stickyHeaderIndices && this.props.stickyHeaderIndices.length > 0) {
-      this._scrollAnimatedValueAttachment = Animated.attachNativeEvent(
+      this._scrollAnimatedValueAttachment = AnimatedImplementation.attachNativeEvent(
         this._scrollViewRef,
         'onScroll',
         [{nativeEvent: {contentOffset: {y: this._scrollAnimatedValue}}}]
diff --git a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
index 597bbbb432b217..af9dc9b8b63549 100644
--- a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
+++ b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js
@@ -10,17 +10,20 @@
  */
 'use strict';
 
-const Animated = require('Animated');
+const AnimatedImplementation = require('AnimatedImplementation');
 const React = require('React');
 const StyleSheet = require('StyleSheet');
+const View = require('View');
 
 import type {LayoutEvent} from 'CoreEventTypes';
 
+const AnimatedView = AnimatedImplementation.createAnimatedComponent(View);
+
 type Props = {
   children?: React.Element<any>,
   nextHeaderLayoutY: ?number,
   onLayout: (event: LayoutEvent) => void,
-  scrollAnimatedValue: Animated.Value,
+  scrollAnimatedValue: AnimatedImplementation.Value,
   // Will cause sticky headers to stick at the bottom of the ScrollView instead
   // of the top.
   inverted: ?boolean,
@@ -136,7 +139,7 @@ class ScrollViewStickyHeader extends React.Component<Props, State> {
     const child = React.Children.only(this.props.children);
 
     return (
-      <Animated.View
+      <AnimatedView
         collapsable={false}
         onLayout={this._onLayout}
         style={[child.props.style, styles.header, {transform: [{translateY}]}]}>
@@ -144,7 +147,7 @@ class ScrollViewStickyHeader extends React.Component<Props, State> {
           style: styles.fill, // We transfer the child style to the wrapper.
           onLayout: undefined, // we call this manually through our this._onLayout
         })}
-      </Animated.View>
+      </AnimatedView>
     );
   }
 }

From b90c1cf6c30454859579278be18ac650c66f516b Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Tue, 20 Feb 2018 22:11:51 -0800
Subject: [PATCH 064/267] RCTSurface: Optional sync ShadowView/View registing

Summary:
See the comment in code.
If we on the main thread on registering time, we can/will break sequentiality of registering and mounting processes doing registration asynchronously.
We need this to make sync mouting eventually possible.

Reviewed By: fkgozali

Differential Revision: D7014176

fbshipit-source-id: 110ad5e5d86e3422eac15c3b1bdb29ae04acd7e6
---
 React/Base/Surface/RCTSurface.mm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
index 80d04b363e1f6f..f217c66b5681ac 100644
--- a/React/Base/Surface/RCTSurface.mm
+++ b/React/Base/Surface/RCTSurface.mm
@@ -321,7 +321,9 @@ - (void)_registerRootView
 
   RCTUIManager *uiManager = batchedBridge.uiManager;
 
-  RCTExecuteOnUIManagerQueue(^{
+  // If we are on the main queue now, we have to proceed synchronously.
+  // Otherwise, we cannot perform synchronous waiting for some stages later.
+  (RCTIsMainQueue() ? RCTUnsafeExecuteOnUIManagerQueueSync : RCTExecuteOnUIManagerQueue)(^{
     [uiManager registerRootViewTag:self->_rootViewTag];
 
     RCTSurfaceRootShadowView *rootShadowView =

From 60c000022e13753c8c766f2b452ec64315d07f6b Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Tue, 20 Feb 2018 22:11:53 -0800
Subject: [PATCH 065/267] Enforcing sequential ordering of creating view and
 applying props in UIManager

Summary: See the comment in code.

Reviewed By: fkgozali

Differential Revision: D7014177

fbshipit-source-id: c58db856d7701a285564470eb1f024b5012dd451
---
 React/Modules/RCTUIManager.m | 37 +++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index eea58fcb22b1cd..1ea715c944d06a 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -923,21 +923,36 @@ - (void)_manageChildren:(NSNumber *)containerTag
 
   // Dispatch view creation directly to the main thread instead of adding to
   // UIBlocks array. This way, it doesn't get deferred until after layout.
-  __weak RCTUIManager *weakManager = self;
-  RCTExecuteOnMainQueue(^{
-    RCTUIManager *uiManager = weakManager;
-    if (!uiManager) {
+  __block UIView *preliminaryCreatedView = nil;
+
+  void (^createViewBlock)(void) = ^{
+    // Do nothing on the second run.
+    if (preliminaryCreatedView) {
       return;
     }
-    UIView *view = [componentData createViewWithTag:reactTag];
-    if (view) {
-      uiManager->_viewRegistry[reactTag] = view;
+
+    preliminaryCreatedView = [componentData createViewWithTag:reactTag];
+
+    if (preliminaryCreatedView) {
+      self->_viewRegistry[reactTag] = preliminaryCreatedView;
     }
-  });
+  };
 
-  [self addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    UIView *view = viewRegistry[reactTag];
-    [componentData setProps:props forView:view];
+  // We cannot guarantee that asynchronously scheduled block will be executed
+  // *before* a block is added to the regular mounting process (simply because
+  // mounting process can be managed externally while the main queue is
+  // locked).
+  // So, we positively dispatch it asynchronously and double check inside
+  // the regular mounting block.
+
+  RCTExecuteOnMainQueue(createViewBlock);
+
+  [self addUIBlock:^(__unused RCTUIManager *uiManager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+    createViewBlock();
+
+    if (preliminaryCreatedView) {
+      [componentData setProps:props forView:preliminaryCreatedView];
+    }
   }];
 
   [self _shadowView:shadowView didReceiveUpdatedProps:[props allKeys]];

From 402ae2f01fd91051be5b717b0578e18b863854af Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Tue, 20 Feb 2018 22:11:55 -0800
Subject: [PATCH 066/267] New UIManager API allowing intercept/delay mounting
 process

Summary: In some embedding/interop cases (RN inside, something else outside), the interop layer has to have the ability to control (intercept, delay, perform synchronously with another stuff) mounting process. This API allows doing that.

Reviewed By: fkgozali

Differential Revision: D7014179

fbshipit-source-id: 04036095f7e60a5ff7e69025ff6066fea92eb361
---
 React/Modules/RCTUIManager.m                  | 31 ++++++++++++++-----
 .../Modules/RCTUIManagerObserverCoordinator.h |  9 ++++++
 .../RCTUIManagerObserverCoordinator.mm        | 14 +++++++++
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index 1ea715c944d06a..5dcce46588ba58 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -1081,21 +1081,36 @@ - (void)flushUIBlocksWithCompletion:(void (^)(void))completion;
     return;
   }
 
-  // Execute the previously queued UI blocks
-  RCTProfileBeginFlowEvent();
-  RCTExecuteOnMainQueue(^{
-    RCTProfileEndFlowEvent();
-    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[UIManager flushUIBlocks]", (@{
-      @"count": [@(previousPendingUIBlocks.count) stringValue],
-    }));
+  __weak typeof(self) weakSelf = self;
+
+   void (^mountingBlock)(void) = ^{
+    typeof(self) strongSelf = weakSelf;
+
     @try {
       for (RCTViewManagerUIBlock block in previousPendingUIBlocks) {
-        block(self, self->_viewRegistry);
+        block(strongSelf, strongSelf->_viewRegistry);
       }
     }
     @catch (NSException *exception) {
       RCTLogError(@"Exception thrown while executing UI block: %@", exception);
     }
+  };
+
+  if ([self.observerCoordinator uiManager:self performMountingWithBlock:mountingBlock]) {
+    completion();
+    return;
+  }
+
+  // Execute the previously queued UI blocks
+  RCTProfileBeginFlowEvent();
+  RCTExecuteOnMainQueue(^{
+    RCTProfileEndFlowEvent();
+    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[UIManager flushUIBlocks]", (@{
+      @"count": [@(previousPendingUIBlocks.count) stringValue],
+    }));
+
+    mountingBlock();
+
     RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
 
     RCTExecuteOnUIManagerQueue(completion);
diff --git a/React/Modules/RCTUIManagerObserverCoordinator.h b/React/Modules/RCTUIManagerObserverCoordinator.h
index 83478b60268ab3..fc40640270af37 100644
--- a/React/Modules/RCTUIManagerObserverCoordinator.h
+++ b/React/Modules/RCTUIManagerObserverCoordinator.h
@@ -9,6 +9,8 @@
 
 #import <React/RCTViewManager.h>
 
+typedef dispatch_block_t RCTUIManagerMountingBlock;
+
 /**
  * Allows hooking into UIManager internals. This can be used to execute code at
  * specific points during the view updating process.
@@ -43,6 +45,13 @@
  */
 - (void)uiManagerWillPerformMounting:(RCTUIManager *)manager;
 
+/**
+ * Called right before flushing UI blocks and allows to intercept the mounting process.
+ * Return `YES` to cancel default execution of the `block` (and perform the
+ * execution later).
+ */
+- (BOOL)uiManager:(RCTUIManager *)manager performMountingWithBlock:(RCTUIManagerMountingBlock)block;
+
 /**
  * Called just after flushing UI blocks.
  * This is called from the UIManager queue.
diff --git a/React/Modules/RCTUIManagerObserverCoordinator.mm b/React/Modules/RCTUIManagerObserverCoordinator.mm
index 90e0255c930909..a8fa5f6db3b048 100644
--- a/React/Modules/RCTUIManagerObserverCoordinator.mm
+++ b/React/Modules/RCTUIManagerObserverCoordinator.mm
@@ -72,6 +72,20 @@ - (void)uiManagerWillPerformMounting:(RCTUIManager *)manager
   }
 }
 
+- (BOOL)uiManager:(RCTUIManager *)manager performMountingWithBlock:(RCTUIManagerMountingBlock)block
+{
+  std::lock_guard<std::mutex> lock(_mutex);
+
+  for (id<RCTUIManagerObserver> observer in _observers) {
+    if ([observer respondsToSelector:@selector(uiManager:performMountingWithBlock:)]) {
+      if ([observer uiManager:manager performMountingWithBlock:block]) {
+        return YES;
+      }
+    }
+  }
+  return NO;
+}
+
 - (void)uiManagerDidPerformMounting:(RCTUIManager *)manager
 {
   std::lock_guard<std::mutex> lock(_mutex);

From b7fbeb253ac03b39c1f2432ebcb66bb86a442a78 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Tue, 20 Feb 2018 22:11:56 -0800
Subject: [PATCH 067/267] RCTSurface: Support for synchronous waiting for
 mounting stage

Summary:
So, all initial operations can now be done synchronously (and on the main thread).
To do so, instancitate `RCTSurface` object and call `synchronouslyWaitForStage:timeout:` method like that:

RCTSurface *surface = [[RCTSurface alloc] initWithBridge:... moduleName:... initialProperties:...];
BOOL success = [surface synchronouslyWaitForStage:RCTSurfaceStageSurfaceDidInitialMounting timeout:timeout];

or

RCTSurfaceHostingView *surfaceHostingView = [[RCTSurfaceHostingView alloc] initWithBridge:... moduleName:... initialProperties:...];
BOOL success = [surfaceHostingView.surface synchronouslyWaitForStage:RCTSurfaceStageSurfaceDidInitialMounting timeout:timeout];

Reviewed By: fkgozali

Differential Revision: D7014178

fbshipit-source-id: c3c13904a3587ff2a222fa71623c40c8f30bc8af
---
 React/Base/Surface/RCTSurface.mm | 82 +++++++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 7 deletions(-)

diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
index f217c66b5681ac..3581ac1e7f0520 100644
--- a/React/Base/Surface/RCTSurface.mm
+++ b/React/Base/Surface/RCTSurface.mm
@@ -9,6 +9,7 @@
 #import "RCTSurfaceView+Internal.h"
 
 #import <mutex>
+#import <stdatomic.h>
 
 #import "RCTAssert.h"
 #import "RCTBridge+Private.h"
@@ -21,9 +22,10 @@
 #import "RCTSurfaceView.h"
 #import "RCTTouchHandler.h"
 #import "RCTUIManager.h"
+#import "RCTUIManagerObserverCoordinator.h"
 #import "RCTUIManagerUtils.h"
 
-@interface RCTSurface () <RCTSurfaceRootShadowViewDelegate>
+@interface RCTSurface () <RCTSurfaceRootShadowViewDelegate, RCTUIManagerObserver>
 @end
 
 @implementation RCTSurface {
@@ -40,6 +42,7 @@ @implementation RCTSurface {
   CGSize _minimumSize;
   CGSize _maximumSize;
   CGSize _intrinsicSize;
+  RCTUIManagerMountingBlock _mountingBlock;
 
   // The Main thread only
   RCTSurfaceView *_Nullable _view;
@@ -48,6 +51,10 @@ @implementation RCTSurface {
   // Semaphores
   dispatch_semaphore_t _rootShadowViewDidStartRenderingSemaphore;
   dispatch_semaphore_t _rootShadowViewDidStartLayingOutSemaphore;
+  dispatch_semaphore_t _uiManagerDidPerformMountingSemaphore;
+
+  // Atomics
+  atomic_bool _waitingForMountingStageOnMainQueue;
 }
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
@@ -62,8 +69,10 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _moduleName = moduleName;
     _properties = [initialProperties copy];
     _rootViewTag = RCTAllocateRootViewTag();
+
     _rootShadowViewDidStartRenderingSemaphore = dispatch_semaphore_create(0);
     _rootShadowViewDidStartLayingOutSemaphore = dispatch_semaphore_create(0);
+    _uiManagerDidPerformMountingSemaphore = dispatch_semaphore_create(0);
 
     _minimumSize = CGSizeZero;
     _maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
@@ -84,6 +93,8 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
       _stage = _stage | RCTSurfaceStageBridgeDidLoad;
     }
 
+    [_bridge.uiManager.observerCoordinator addObserver:self];
+
     [self _registerRootView];
     [self _run];
   }
@@ -435,16 +446,20 @@ - (CGSize)intrinsicSize
 
 - (BOOL)synchronouslyWaitForStage:(RCTSurfaceStage)stage timeout:(NSTimeInterval)timeout
 {
-  if (RCTIsMainQueue() && (stage == RCTSurfaceStageSurfaceDidInitialRendering)) {
-    // This case *temporary* does not supported.
-    stage = RCTSurfaceStageSurfaceDidInitialLayout;
-  }
-
   if (RCTIsUIManagerQueue()) {
     RCTLogInfo(@"Synchronous waiting is not supported on UIManager queue.");
     return NO;
   }
 
+  if (RCTIsMainQueue() && (stage == RCTSurfaceStageSurfaceDidInitialMounting)) {
+    // All main-threaded execution (especially mounting process) has to be
+    // intercepted, captured and performed synchnously at the end of this method
+    // right after the semaphore signals.
+
+    // Atomic variant of `_waitingForMountingStageOnMainQueue = YES;`
+    atomic_fetch_or(&_waitingForMountingStageOnMainQueue, 1);
+  }
+
   dispatch_semaphore_t semaphore;
   switch (stage) {
     case RCTSurfaceStageSurfaceDidInitialLayout:
@@ -453,17 +468,39 @@ - (BOOL)synchronouslyWaitForStage:(RCTSurfaceStage)stage timeout:(NSTimeInterval
     case RCTSurfaceStageSurfaceDidInitialRendering:
       semaphore = _rootShadowViewDidStartRenderingSemaphore;
       break;
+    case RCTSurfaceStageSurfaceDidInitialMounting:
+      semaphore = _uiManagerDidPerformMountingSemaphore;
+      break;
     default:
-      RCTAssert(NO, @"Only waiting for `RCTSurfaceStageSurfaceDidInitialRendering` and `RCTSurfaceStageSurfaceDidInitialLayout` stages is supported.");
+      RCTAssert(NO, @"Only waiting for `RCTSurfaceStageSurfaceDidInitialRendering`, `RCTSurfaceStageSurfaceDidInitialLayout` and `RCTSurfaceStageSurfaceDidInitialMounting` stages are supported.");
   }
 
   BOOL timeoutOccurred = dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, timeout * NSEC_PER_SEC));
+
+  // Atomic equivalent of `_waitingForMountingStageOnMainQueue = NO;`.
+  atomic_fetch_and(&_waitingForMountingStageOnMainQueue, 0);
+
   if (!timeoutOccurred) {
     // Balancing the semaphore.
     // Note: `dispatch_semaphore_wait` reverts the decrement in case when timeout occurred.
     dispatch_semaphore_signal(semaphore);
   }
 
+  if (RCTIsMainQueue() && (stage == RCTSurfaceStageSurfaceDidInitialMounting)) {
+    // Time to apply captured mounting block.
+    RCTUIManagerMountingBlock mountingBlock;
+    {
+      std::lock_guard<std::mutex> lock(_mutex);
+      mountingBlock = _mountingBlock;
+      _mountingBlock = nil;
+    }
+
+    if (mountingBlock) {
+      mountingBlock();
+      [self _mountRootViewIfNeeded];
+    }
+  }
+
   return !timeoutOccurred;
 }
 
@@ -493,4 +530,35 @@ - (void)rootShadowViewDidStartLayingOut:(RCTSurfaceRootShadowView *)rootShadowVi
   });
 }
 
+#pragma mark - RCTUIManagerObserver
+
+- (BOOL)uiManager:(RCTUIManager *)manager performMountingWithBlock:(RCTUIManagerMountingBlock)block
+{
+  if (atomic_load(&_waitingForMountingStageOnMainQueue) && (self.stage & RCTSurfaceStageSurfaceDidInitialLayout)) {
+    // Atomic equivalent of `_waitingForMountingStageOnMainQueue = NO;`.
+    atomic_fetch_and(&_waitingForMountingStageOnMainQueue, 0);
+
+    {
+      std::lock_guard<std::mutex> lock(_mutex);
+      _mountingBlock = block;
+    }
+    return YES;
+  }
+
+  return NO;
+}
+
+- (void)uiManagerDidPerformMounting:(RCTUIManager *)manager
+{
+  if (self.stage & RCTSurfaceStageSurfaceDidInitialLayout) {
+    [self _setStage:RCTSurfaceStageSurfaceDidInitialMounting];
+    dispatch_semaphore_signal(_uiManagerDidPerformMountingSemaphore);
+
+    // No need to listen to UIManager anymore.
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
+      [self->_bridge.uiManager.observerCoordinator removeObserver:self];
+    });
+  }
+}
+
 @end

From 47addd8e34a8ee1233694f250e9badae8b86defa Mon Sep 17 00:00:00 2001
From: Eric Rozell <erozell@outlook.com>
Date: Wed, 21 Feb 2018 09:01:35 -0800
Subject: [PATCH 068/267] Remove unused reference in Text.js

Summary:
Previously, the Platform module was used to detect when RCTVirtualText should be used. Recently, this has changed to detecting the availability of a native virtual text component on the UIManager. The import for the Platform module can be deleted.

I was cleaning up source code copied in react-native-windows and noticed this reference is no longer used in Text.js.

Run jest tests.

N/A

<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
Closes https://github.com/facebook/react-native/pull/18039

Differential Revision: D7042473

Pulled By: hramos

fbshipit-source-id: d318cfdfd2d052bd1662ac469dd51633f6d59d17
---
 Libraries/Text/Text.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index c2ded14887e533..9a31838f5aa8fe 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -13,7 +13,6 @@
 const ColorPropType = require('ColorPropType');
 const EdgeInsetsPropType = require('EdgeInsetsPropType');
 const NativeMethodsMixin = require('NativeMethodsMixin');
-const Platform = require('Platform');
 const React = require('React');
 const PropTypes = require('prop-types');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');

From 4371d1e1d0318c3aa03738583a24b833f0a33ba1 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Wed, 21 Feb 2018 09:21:34 -0800
Subject: [PATCH 069/267] Implement FabricUIManagerModule in Android

Reviewed By: achen1

Differential Revision: D7031902

fbshipit-source-id: a8d9d505f981ac4268760efa32f4cbc7955aec32
---
 .../facebook/react/CoreModulesPackage.java    |  2 +-
 .../facebook/react/ReactInstanceManager.java  | 18 +++--
 .../react/fabric/FabricUIManagerModule.java   | 68 ++++++++++++++-----
 .../react/uimanager/UIImplementation.java     |  1 +
 .../react/uimanager/UIManagerModule.java      |  3 +-
 .../facebook/react/uimanager/UIModule.java    |  7 ++
 6 files changed, 75 insertions(+), 24 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/UIModule.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
index 43515b59febd8b..ecda016133b275 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -170,7 +170,7 @@ public List<String> getViewManagerNames() {
       } else {
         return new UIManagerModule(
             reactContext,
-            mReactInstanceManager.createAllViewManagers(reactContext),
+            mReactInstanceManager.getOrCreateViewManagers(reactContext),
             mUIImplementationProvider,
             mMinTimeLeftInFrameForNonBatchedOperationMs);
       }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 2ba53056f02ca7..4c2b560999719e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -156,6 +156,7 @@ public interface ReactInstanceEventListener {
   private final boolean mLazyNativeModulesEnabled;
   private final boolean mDelayViewManagerClassLoadsEnabled;
   private final @Nullable BridgeListener mBridgeListener;
+  private List<ViewManager> mViewManagers;
 
   private class ReactContextInitParams {
     private final JavaScriptExecutorFactory mJsExecutorFactory;
@@ -774,18 +775,23 @@ public void detachRootView(ReactRootView rootView) {
   /**
    * Uses configured {@link ReactPackage} instances to create all view managers.
    */
-  public List<ViewManager> createAllViewManagers(
+  public List<ViewManager> getOrCreateViewManagers(
       ReactApplicationContext catalystApplicationContext) {
     ReactMarker.logMarker(CREATE_VIEW_MANAGERS_START);
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createAllViewManagers");
     try {
-      synchronized (mPackages) {
-        List<ViewManager> allViewManagers = new ArrayList<>();
-        for (ReactPackage reactPackage : mPackages) {
-          allViewManagers.addAll(reactPackage.createViewManagers(catalystApplicationContext));
+      if (mViewManagers == null) {
+        synchronized (mPackages) {
+          if (mViewManagers == null) {
+            mViewManagers = new ArrayList<>();
+            for (ReactPackage reactPackage : mPackages) {
+              mViewManagers.addAll(reactPackage.createViewManagers(catalystApplicationContext));
+            }
+            return mViewManagers;
+          }
         }
-        return allViewManagers;
       }
+      return mViewManagers;
     } finally {
       Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
       ReactMarker.logMarker(CREATE_VIEW_MANAGERS_END);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
index 0e52bcd36a701b..10acfbc278df33 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
@@ -4,7 +4,15 @@
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.MeasureSpecProvider;
+import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
+import com.facebook.react.uimanager.ReactRootViewTagGenerator;
 import com.facebook.react.uimanager.ReactShadowNode;
+import com.facebook.react.uimanager.ReactStylesDiffMap;
+import com.facebook.react.uimanager.SizeMonitoringFrameLayout;
+import com.facebook.react.uimanager.UIModule;
+import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.uimanager.ViewManagerRegistry;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -13,12 +21,16 @@
  * This class is responsible to create, clone and update {@link ReactShadowNode} using the
  * Fabric API.
  */
-public class FabricUIManagerModule {
+@SuppressWarnings("unused") // used from JNI
+public class FabricUIManagerModule implements UIModule {
 
   private final ReactApplicationContext mReactApplicationContext;
+  private final ViewManagerRegistry mViewManagerRegistry;
 
-  public FabricUIManagerModule(ReactApplicationContext reactContext) {
+  public FabricUIManagerModule(ReactApplicationContext reactContext,
+      ViewManagerRegistry viewManagerRegistry) {
     mReactApplicationContext = reactContext;
+    mViewManagerRegistry = viewManagerRegistry;
   }
 
   /**
@@ -28,10 +40,24 @@ public FabricUIManagerModule(ReactApplicationContext reactContext) {
   public ReactShadowNode createNode(int reactTag,
       String viewName,
       int rootTag,
-      ReadableMap props,
-      int instanceHandle) {
-    //TODO T25560658
-    return null;
+      ReadableMap props) {
+
+    ViewManager viewManager = mViewManagerRegistry.get(viewName);
+    ReactShadowNode shadowNode = viewManager.createShadowNodeInstance(mReactApplicationContext);
+    shadowNode.setRootTag(rootTag);
+    shadowNode.setReactTag(reactTag);
+    ReactStylesDiffMap styles = updateProps(props, shadowNode);
+
+    return shadowNode;
+  }
+
+  private ReactStylesDiffMap updateProps(ReadableMap props, ReactShadowNode shadowNode) {
+    ReactStylesDiffMap styles = null;
+    if (props != null) {
+      styles = new ReactStylesDiffMap(props);
+      shadowNode.updateProperties(styles);
+    }
+    return styles;
   }
 
   /**
@@ -41,8 +67,7 @@ public ReactShadowNode createNode(int reactTag,
    */
   @Nullable
   public ReactShadowNode cloneNode(ReactShadowNode node) {
-    //TODO T25560658
-    return null;
+    return node.mutableCopy();
   }
 
   /**
@@ -52,8 +77,9 @@ public ReactShadowNode cloneNode(ReactShadowNode node) {
    */
   @Nullable
   public ReactShadowNode cloneNodeWithNewChildren(ReactShadowNode node) {
-    //TODO T25560658
-    return null;
+    ReactShadowNode clone = cloneNode(node);
+    clone.removeAllChildren();
+    return clone;
   }
 
   /**
@@ -63,8 +89,9 @@ public ReactShadowNode cloneNodeWithNewChildren(ReactShadowNode node) {
    */
   @Nullable
   public ReactShadowNode cloneNodeWithNewProps(ReactShadowNode node, ReadableMap newProps) {
-    //TODO T25560658
-    return null;
+    ReactShadowNode clone = cloneNode(node);
+    updateProps(newProps, clone);
+    return clone;
   }
 
   /**
@@ -77,8 +104,9 @@ public ReactShadowNode cloneNodeWithNewProps(ReactShadowNode node, ReadableMap n
   public ReactShadowNode cloneNodeWithNewChildrenAndProps(
       ReactShadowNode node,
       ReadableMap newProps) {
-    //TODO T25560658
-    return null;
+    ReactShadowNode clone = cloneNodeWithNewChildren(node);
+    updateProps(newProps, clone);
+    return clone;
   }
 
   /**
@@ -87,7 +115,7 @@ public ReactShadowNode cloneNodeWithNewChildrenAndProps(
    */
   @Nullable
   public void appendChild(ReactShadowNode parent, ReactShadowNode child) {
-    //TODO T25560658
+    parent.addChildAt(child, parent.getChildCount());
   }
 
   /**
@@ -106,7 +134,15 @@ public void appendChildToSet(List<ReactShadowNode> childList, ReactShadowNode ch
   }
 
   public void completeRoot(int rootTag, List<ReactShadowNode> childList) {
-    //TODO T25560658
+    // TODO Diffing old Tree with new Tree?
+    // Do we need to hold references to old and new tree?
+  }
+
+  @Override
+  public <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(
+    final T rootView) {
+    // TODO: complete with actual implementation
+    return ReactRootViewTagGenerator.getNextRootViewTag();
   }
 
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
index 98e4a592c6ec9d..7c59caafb67a2c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
@@ -277,6 +277,7 @@ public void createView(int tag, String className, int rootViewTag, ReadableMap p
     cssNode.setReactTag(tag);
     cssNode.setViewClassName(className);
     cssNode.setRootNode(rootNode);
+    if (rootNode != null) cssNode.setRootTag(rootNode.getReactTag());
     cssNode.setThemedContext(rootNode.getThemedContext());
 
     mShadowNodeRegistry.addNode(cssNode);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
index 6a8d6db53f8219..d4ceecfb660fc7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
@@ -72,7 +72,7 @@
  */
 @ReactModule(name = UIManagerModule.NAME)
 public class UIManagerModule extends ReactContextBaseJavaModule implements
-    OnBatchCompleteListener, LifecycleEventListener, PerformanceCounter {
+    OnBatchCompleteListener, LifecycleEventListener, PerformanceCounter, UIModule {
 
   /**
    * Enables lazy discovery of a specific {@link ViewManager} by its name.
@@ -287,6 +287,7 @@ public Map<String, Long> getPerformanceCounters() {
    *
    * <p>TODO(6242243): Make addRootView thread safe NB: this method is horribly not-thread-safe.
    */
+  @Override
   public <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(
       final T rootView) {
     Systrace.beginSection(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIModule.java
new file mode 100644
index 00000000000000..a3fee6652d25e0
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIModule.java
@@ -0,0 +1,7 @@
+package com.facebook.react.uimanager;
+
+public interface UIModule {
+
+  <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(final T rootView);
+
+}

From 7dd12a26b9d967cd216d0579c7d893aee7cddcef Mon Sep 17 00:00:00 2001
From: Alex Kotliarskyi <alex.kotliarskyi@oculus.com>
Date: Wed, 21 Feb 2018 11:06:19 -0800
Subject: [PATCH 070/267] Mock static methods of TouchableNativeFeedback on iOS

Reviewed By: TheSavior

Differential Revision: D7016679

fbshipit-source-id: bd04244eaf876e3ffab4f0c64792769a9ea40abd
---
 .../Components/Touchable/TouchableNativeFeedback.ios.js      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
index 9b7ff5e7e82d41..c624cb7fdbf0d0 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
@@ -15,6 +15,11 @@ var Text = require('Text');
 var View = require('View');
 
 class DummyTouchableNativeFeedback extends React.Component {
+  static SelectableBackground = () => ({});
+  static SelectableBackgroundBorderless = () => ({});
+  static Ripple = () => ({});
+  static canUseNativeForeground = () => false;
+
   render() {
     return (
       <View style={[styles.container, this.props.style]}>

From 190e6bef2e42b6f106853514d305bb0adb1c65a1 Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Wed, 21 Feb 2018 12:36:41 -0800
Subject: [PATCH 071/267] FabricUIManagerModuleTest setup and testCloneNode

Reviewed By: mdvacca

Differential Revision: D7037558

fbshipit-source-id: a62617c7e16102cf7d12ecde48a95feec264fa51
---
 .../react/uimanager/ReactShadowNodeImpl.java    |  4 +---
 .../uimanager/ReactYogaConfigProvider.java      | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index 1029519ec4d3f9..8233fc224f111f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -57,9 +57,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
 
   private static final YogaConfig sYogaConfig;
   static {
-    sYogaConfig = new YogaConfig();
-    sYogaConfig.setPointScaleFactor(0f);
-    sYogaConfig.setUseLegacyStretchBehaviour(true);
+    sYogaConfig = ReactYogaConfigProvider.get();
   }
 
   private int mReactTag;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.java
new file mode 100644
index 00000000000000..3e2b109765d441
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.java
@@ -0,0 +1,17 @@
+package com.facebook.react.uimanager;
+
+import com.facebook.yoga.YogaConfig;
+
+public class ReactYogaConfigProvider {
+
+  private static YogaConfig YOGA_CONFIG;
+
+  public static YogaConfig get() {
+    if (YOGA_CONFIG == null) {
+      YOGA_CONFIG = new YogaConfig();
+      YOGA_CONFIG.setPointScaleFactor(0f);
+      YOGA_CONFIG.setUseLegacyStretchBehaviour(true);
+    }
+    return YOGA_CONFIG;
+  }
+}

From 13ee1b5920ad9444cbea6eaded11926a00dc6882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Nison?= <mael@fb.com>
Date: Thu, 22 Feb 2018 06:06:38 -0800
Subject: [PATCH 072/267] Uses Yargs instead of Command

Summary: This diff allows Metro to throw an error when a configuration file cannot be found, by using a new strict: true option.

Reviewed By: rafeca

Differential Revision: D6998613

fbshipit-source-id: b704633be18d5c007f1a022fa811d0a74c636fc9
---
 local-cli/dependencies/dependencies.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/local-cli/dependencies/dependencies.js b/local-cli/dependencies/dependencies.js
index eb69d45af4f5fe..33af4d084c567a 100644
--- a/local-cli/dependencies/dependencies.js
+++ b/local-cli/dependencies/dependencies.js
@@ -86,6 +86,7 @@ function dependencies(argv, config, args, packagerInstance) {
 
 module.exports = {
   name: 'dependencies',
+  description: 'lists dependencies',
   func: dependencies,
   options: [
     {

From 47e57ef8c1acf6a02d6d3fae3b2f1bef0645b782 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya <byk@fb.com>
Date: Thu, 22 Feb 2018 06:14:06 -0800
Subject: [PATCH 073/267] Upgrade Jest to 22.4.0 to pull fixes for
 jest-haste-map

Reviewed By: mjesun

Differential Revision: D7041111

fbshipit-source-id: 6dbd0cbf7b62a54d0b5f16bbf2fa81332542f14e
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index db9bd84bfa8df4..e4041fc55db551 100644
--- a/package.json
+++ b/package.json
@@ -215,7 +215,7 @@
     "eslint-plugin-prettier": "2.6.0",
     "eslint-plugin-react": "7.6.1",
     "flow-bin": "^0.66.0",
-    "jest": "22.3.0",
+    "jest": "22.4.0",
     "jest-junit": "3.6.0",
     "prettier": "1.9.1",
     "react": "^16.3.0-alpha.1",

From edb6ca72fdc04576a503aa8e5f34c32d2f727750 Mon Sep 17 00:00:00 2001
From: Mats Byrkeland <matsbyr@gmail.com>
Date: Thu, 22 Feb 2018 07:04:35 -0800
Subject: [PATCH 074/267] Fix ESLint warnings using 'yarn lint --fix'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Hi! I would like to contribute to React Native, and I am just starting out. I forked the repo and found that it has quite a lot of ESLint warnings – many of which were automatically fixable. This PR is simply the result of running `yarn lint --fix` from the root folder.

Most changes are removing trailing spaces from comments.

Haven't really done any manual testing, since I haven't done any code changes manually. `yarn test` runs fine, `yarn flow` runs fine, `yarn prettier` is satisfied.

N/A

[INTERNAL][MINOR][] - Fix ESLint warnings
Closes https://github.com/facebook/react-native/pull/18047

Differential Revision: D7054948

Pulled By: hramos

fbshipit-source-id: d53e692698d1687de5821c3fb5cdb76a5e03b71e
---
 Libraries/Alert/Alert.js                      |   4 +-
 Libraries/Alert/AlertIOS.js                   |   2 +-
 Libraries/AppState/AppState.js                |  12 +--
 .../AccessibilityInfo.android.js              |   4 +-
 .../AccessibilityInfo.ios.js                  |  22 ++--
 .../ActivityIndicator/ActivityIndicator.js    |   8 +-
 Libraries/Components/View/ViewPropTypes.js    | 100 +++++++++---------
 Libraries/Geolocation/Geolocation.js          |   8 +-
 Libraries/Linking/Linking.js                  |   6 +-
 Libraries/Modal/Modal.js                      |  22 ++--
 Libraries/Network/NetInfo.js                  |  16 +--
 .../PermissionsAndroid/PermissionsAndroid.js  |   6 +-
 .../PushNotificationIOS.js                    |  36 +++----
 Libraries/Storage/AsyncStorage.js             |  24 ++---
 Libraries/Vibration/Vibration.js              |   6 +-
 RNTester/js/ListExampleShared.js              |   2 +-
 RNTester/js/RNTesterApp.ios.js                |   6 +-
 bots/dangerfile.js                            |   4 +-
 flow-github/metro.js                          |   2 +-
 local-cli/link/ios/getTargets.js              |   2 +-
 local-cli/link/ios/registerNativeModule.js    |   8 +-
 local-cli/link/unlink.js                      |   2 +-
 22 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
index 7c775fddf7ece5..bcb51714440444 100644
--- a/Libraries/Alert/Alert.js
+++ b/Libraries/Alert/Alert.js
@@ -28,14 +28,14 @@ type Options = {
 
 /**
  * Launches an alert dialog with the specified title and message.
- * 
+ *
  * See http://facebook.github.io/react-native/docs/alert.html
  */
 class Alert {
 
   /**
    * Launches an alert dialog with the specified title and message.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/alert.html#alert
    */
   static alert(
diff --git a/Libraries/Alert/AlertIOS.js b/Libraries/Alert/AlertIOS.js
index 25dff6f34d4d81..b254406462399e 100644
--- a/Libraries/Alert/AlertIOS.js
+++ b/Libraries/Alert/AlertIOS.js
@@ -101,7 +101,7 @@ class AlertIOS {
 
   /**
    * Create and display a prompt to enter some text.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/alertios.html#prompt
    */
   static prompt(
diff --git a/Libraries/AppState/AppState.js b/Libraries/AppState/AppState.js
index 3fc13c5888d33e..f2faa9480d2b57 100644
--- a/Libraries/AppState/AppState.js
+++ b/Libraries/AppState/AppState.js
@@ -45,8 +45,8 @@ class AppState extends NativeEventEmitter {
     let eventUpdated = false;
 
     // TODO: this is a terrible solution - in order to ensure `currentState`
-    // prop is up to date, we have to register an observer that updates it 
-    // whenever the state changes, even if nobody cares. We should just 
+    // prop is up to date, we have to register an observer that updates it
+    // whenever the state changes, even if nobody cares. We should just
     // deprecate the `currentState` property and get rid of this.
     this.addListener(
       'appStateDidChange',
@@ -70,14 +70,14 @@ class AppState extends NativeEventEmitter {
   }
 
   // TODO: now that AppState is a subclass of NativeEventEmitter, we could
-  // deprecate `addEventListener` and `removeEventListener` and just use 
-  // addListener` and `listener.remove()` directly. That will be a breaking 
+  // deprecate `addEventListener` and `removeEventListener` and just use
+  // addListener` and `listener.remove()` directly. That will be a breaking
   // change though, as both the method and event names are different
   // (addListener events are currently required to be globally unique).
    /**
    * Add a handler to AppState changes by listening to the `change` event type
    * and providing the handler.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/appstate.html#addeventlistener
    */
   addEventListener(
@@ -105,7 +105,7 @@ class AppState extends NativeEventEmitter {
 
   /**
    * Remove a handler by passing the `change` event type and the handler.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/appstate.html#removeeventlistener
    */
   removeEventListener(
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
index f7d326f01b5305..b08593a066724f 100644
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
@@ -25,8 +25,8 @@ var _subscriptions = new Map();
 /**
  * Sometimes it's useful to know whether or not the device has a screen reader
  * that is currently active. The `AccessibilityInfo` API is designed for this
- * purpose. You can use it to query the current state of the screen reader as 
- * well as to register to be notified when the state of the screen reader 
+ * purpose. You can use it to query the current state of the screen reader as
+ * well as to register to be notified when the state of the screen reader
  * changes.
  *
  * See http://facebook.github.io/react-native/docs/accessibilityinfo.html
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
index 6472c359cfb4b4..822f0dcbaab8bd 100644
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
@@ -28,8 +28,8 @@ var _subscriptions = new Map();
 /**
  * Sometimes it's useful to know whether or not the device has a screen reader
  * that is currently active. The `AccessibilityInfo` API is designed for this
- * purpose. You can use it to query the current state of the screen reader as 
- * well as to register to be notified when the state of the screen reader 
+ * purpose. You can use it to query the current state of the screen reader as
+ * well as to register to be notified when the state of the screen reader
  * changes.
  *
  * See http://facebook.github.io/react-native/docs/accessibilityinfo.html
@@ -37,11 +37,11 @@ var _subscriptions = new Map();
 var AccessibilityInfo = {
 
   /**
-   * Query whether a screen reader is currently enabled. 
-   * 
-   * Returns a promise which resolves to a boolean. 
+   * Query whether a screen reader is currently enabled.
+   *
+   * Returns a promise which resolves to a boolean.
    * The result is `true` when a screen reader is enabledand `false` otherwise.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#fetch
    */
   fetch: function(): Promise {
@@ -65,7 +65,7 @@ var AccessibilityInfo = {
    *     - `announcement`: The string announced by the screen reader.
    *     - `success`: A boolean indicating whether the announcement was
    *       successfully made.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#addeventlistener
    */
   addEventListener: function (
@@ -94,9 +94,9 @@ var AccessibilityInfo = {
 
   /**
    * Set accessibility focus to a react component.
-   * 
+   *
    * @platform ios
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#setaccessibilityfocus
    */
   setAccessibilityFocus: function(
@@ -109,7 +109,7 @@ var AccessibilityInfo = {
    * Post a string to be announced by the screen reader.
    *
    * @platform ios
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#announceforaccessibility
    */
   announceForAccessibility: function(
@@ -120,7 +120,7 @@ var AccessibilityInfo = {
 
   /**
    * Remove an event handler.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/accessibilityinfo.html#removeeventlistener
    */
   removeEventListener: function(
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
index df941368da1736..6f9d34966dc284 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
@@ -46,20 +46,20 @@ const ActivityIndicator = createReactClass({
     ...ViewPropTypes,
     /**
      * Whether to show the indicator (true, the default) or hide it (false).
-     * 
+     *
      * See http://facebook.github.io/react-native/docs/activityindicator.html#animating
      */
     animating: PropTypes.bool,
     /**
      * The foreground color of the spinner (default is gray).
-     * 
+     *
      * See http://facebook.github.io/react-native/docs/activityindicator.html#color
      */
     color: ColorPropType,
     /**
      * Size of the indicator (default is 'small').
      * Passing a number to the size prop is only supported on Android.
-     * 
+     *
      * See http://facebook.github.io/react-native/docs/activityindicator.html#size
      */
     size: PropTypes.oneOfType([
@@ -70,7 +70,7 @@ const ActivityIndicator = createReactClass({
      * Whether the indicator should hide when not animating (true by default).
      *
      * @platform ios
-     * 
+     *
      * See http://facebook.github.io/react-native/docs/activityindicator.html#hideswhenstopped
      */
     hidesWhenStopped: PropTypes.bool,
diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js
index 7731c7e4a8cef2..7ced5e35f2bf5a 100644
--- a/Libraries/Components/View/ViewPropTypes.js
+++ b/Libraries/Components/View/ViewPropTypes.js
@@ -84,9 +84,9 @@ module.exports = {
   ...PlatformViewPropTypes,
 
   /**
-   * When `true`, indicates that the view is an accessibility element. 
+   * When `true`, indicates that the view is an accessibility element.
    * By default, all the touchable elements are accessible.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessible
    */
   accessible: PropTypes.bool,
@@ -95,7 +95,7 @@ module.exports = {
    * Overrides the text that's read by the screen reader when the user interacts
    * with the element. By default, the label is constructed by traversing all
    * the children and accumulating all the `Text` nodes separated by space.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessibilitylabel
    */
   accessibilityLabel: PropTypes.node,
@@ -112,7 +112,7 @@ module.exports = {
    * native one. Works for Android only.
    *
    * @platform android
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessibilitycomponenttype
    */
   accessibilityComponentType: PropTypes.oneOf(AccessibilityComponentTypes),
@@ -122,7 +122,7 @@ module.exports = {
    * when this view changes. Works for Android API >= 19 only.
    *
    * @platform android
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessibilityliveregion
    */
   accessibilityLiveRegion: PropTypes.oneOf([
@@ -137,7 +137,7 @@ module.exports = {
    * that query the screen. Works for Android only.
    *
    * @platform android
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#importantforaccessibility
    */
   importantForAccessibility: PropTypes.oneOf([
@@ -154,7 +154,7 @@ module.exports = {
    * You can provide one trait or an array of many traits.
    *
    * @platform ios
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessibilitytraits
    */
   accessibilityTraits: PropTypes.oneOfType([
@@ -168,17 +168,17 @@ module.exports = {
    * Default is `false`.
    *
    * @platform ios
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessibilityviewismodal
    */
   accessibilityViewIsModal: PropTypes.bool,
-  
+
   /**
    * A value indicating whether the accessibility elements contained within
    * this accessibility element are hidden.
    *
    * @platform ios
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#accessibilityElementsHidden
    */
   accessibilityElementsHidden: PropTypes.bool,
@@ -194,7 +194,7 @@ module.exports = {
   /**
    * When `accessible` is true, the system will try to invoke this function
    * when the user performs accessibility tap gesture.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onaccessibilitytap
    */
   onAccessibilityTap: PropTypes.func,
@@ -202,7 +202,7 @@ module.exports = {
   /**
    * When `accessible` is `true`, the system will invoke this function when the
    * user performs the magic tap gesture.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onmagictap
    */
   onMagicTap: PropTypes.func,
@@ -211,7 +211,7 @@ module.exports = {
    * Used to locate this view in end-to-end tests.
    *
    * > This disables the 'layout-only view removal' optimization for this view!
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#testid
    */
   testID: PropTypes.string,
@@ -220,7 +220,7 @@ module.exports = {
    * Used to locate this view from native classes.
    *
    * > This disables the 'layout-only view removal' optimization for this view!
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#nativeid
    */
   nativeID: PropTypes.string,
@@ -232,12 +232,12 @@ module.exports = {
    */
 
   /**
-   * The View is now responding for touch events. This is the time to highlight 
+   * The View is now responding for touch events. This is the time to highlight
    * and show the user what is happening.
    *
    * `View.props.onResponderGrant: (event) => {}`, where `event` is a synthetic
    * touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onrespondergrant
    */
   onResponderGrant: PropTypes.func,
@@ -245,20 +245,20 @@ module.exports = {
   /**
    * The user is moving their finger.
    *
-   * `View.props.onResponderMove: (event) => {}`, where `event` is a synthetic 
+   * `View.props.onResponderMove: (event) => {}`, where `event` is a synthetic
    * touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onrespondermove
    */
   onResponderMove: PropTypes.func,
 
   /**
-   * Another responder is already active and will not release it to that `View` 
+   * Another responder is already active and will not release it to that `View`
    * asking to be the responder.
    *
-   * `View.props.onResponderReject: (event) => {}`, where `event` is a 
+   * `View.props.onResponderReject: (event) => {}`, where `event` is a
    * synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onresponderreject
    */
   onResponderReject: PropTypes.func,
@@ -266,33 +266,33 @@ module.exports = {
   /**
    * Fired at the end of the touch.
    *
-   * `View.props.onResponderRelease: (event) => {}`, where `event` is a 
+   * `View.props.onResponderRelease: (event) => {}`, where `event` is a
    * synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onresponderrelease
    */
   onResponderRelease: PropTypes.func,
 
   /**
    * The responder has been taken from the `View`. Might be taken by other
-   * views after a call to `onResponderTerminationRequest`, or might be taken 
-   * by the OS without asking (e.g., happens with control center/ notification 
+   * views after a call to `onResponderTerminationRequest`, or might be taken
+   * by the OS without asking (e.g., happens with control center/ notification
    * center on iOS)
    *
-   * `View.props.onResponderTerminate: (event) => {}`, where `event` is a 
+   * `View.props.onResponderTerminate: (event) => {}`, where `event` is a
    * synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onresponderterminate
    */
   onResponderTerminate: PropTypes.func,
 
   /**
-   * Some other `View` wants to become responder and is asking this `View` to 
+   * Some other `View` wants to become responder and is asking this `View` to
    * release its responder. Returning `true` allows its release.
    *
-   * `View.props.onResponderTerminationRequest: (event) => {}`, where `event` 
+   * `View.props.onResponderTerminationRequest: (event) => {}`, where `event`
    * is a synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onresponderterminationrequest
    */
   onResponderTerminationRequest: PropTypes.func,
@@ -300,31 +300,31 @@ module.exports = {
   /**
    * Does this view want to become responder on the start of a touch?
    *
-   * `View.props.onStartShouldSetResponder: (event) => [true | false]`, where 
+   * `View.props.onStartShouldSetResponder: (event) => [true | false]`, where
    * `event` is a synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onstartshouldsetresponder
    */
   onStartShouldSetResponder: PropTypes.func,
 
   /**
-   * If a parent `View` wants to prevent a child `View` from becoming responder 
+   * If a parent `View` wants to prevent a child `View` from becoming responder
    * on a touch start, it should have this handler which returns `true`.
    *
-   * `View.props.onStartShouldSetResponderCapture: (event) => [true | false]`, 
+   * `View.props.onStartShouldSetResponderCapture: (event) => [true | false]`,
    * where `event` is a synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onstartshouldsetrespondercapture
    */
   onStartShouldSetResponderCapture: PropTypes.func,
 
   /**
-   * Does this view want to "claim" touch responsiveness? This is called for 
+   * Does this view want to "claim" touch responsiveness? This is called for
    * every touch move on the `View` when it is not the responder.
    *
-   * `View.props.onMoveShouldSetResponder: (event) => [true | false]`, where 
+   * `View.props.onMoveShouldSetResponder: (event) => [true | false]`, where
    * `event` is a synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onmoveshouldsetresponder
    */
   onMoveShouldSetResponder: PropTypes.func,
@@ -332,10 +332,10 @@ module.exports = {
   /**
    * If a parent `View` wants to prevent a child `View` from becoming responder
    * on a move, it should have this handler which returns `true`.
-   * 
+   *
    * `View.props.onMoveShouldSetResponderCapture: (event) => [true | false]`,
    * where `event` is a synthetic touch event as described above.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onMoveShouldsetrespondercapture
    */
   onMoveShouldSetResponderCapture: PropTypes.func,
@@ -348,7 +348,7 @@ module.exports = {
    * > The touch area never extends past the parent view bounds and the Z-index
    * > of sibling views always takes precedence if a touch hits two overlapping
    * > views.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#hitslop
    */
   hitSlop: EdgeInsetsPropType,
@@ -361,14 +361,14 @@ module.exports = {
    * This event is fired immediately once the layout has been calculated, but
    * the new layout may not yet be reflected on the screen at the time the
    * event is received, especially if a layout animation is in progress.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#onlayout
    */
   onLayout: PropTypes.func,
 
   /**
    * Controls whether the `View` can be the target of touch events.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#pointerevents
    */
   pointerEvents: PropTypes.oneOf([
@@ -390,7 +390,7 @@ module.exports = {
    * view that contains many subviews that extend outside its bound. The
    * subviews must also have `overflow: hidden`, as should the containing view
    * (or one of its superviews).
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#removeclippedsubviews
    */
   removeClippedSubviews: PropTypes.bool,
@@ -400,7 +400,7 @@ module.exports = {
    * single hardware texture on the GPU.
    *
    * @platform android
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#rendertohardwaretextureandroid
    */
   renderToHardwareTextureAndroid: PropTypes.bool,
@@ -409,7 +409,7 @@ module.exports = {
    * Whether this `View` should be rendered as a bitmap before compositing.
    *
    * @platform ios
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#shouldrasterizeios
    */
   shouldRasterizeIOS: PropTypes.bool,
@@ -421,17 +421,17 @@ module.exports = {
    * ensure that this `View` exists in the native view hierarchy.
    *
    * @platform android
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#collapsable
    */
   collapsable: PropTypes.bool,
 
   /**
-   * Whether this `View` needs to rendered offscreen and composited with an 
-   * alpha in order to preserve 100% correct colors and blending behavior. 
+   * Whether this `View` needs to rendered offscreen and composited with an
+   * alpha in order to preserve 100% correct colors and blending behavior.
    *
    * @platform android
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/view.html#needsoffscreenalphacompositing
    */
   needsOffscreenAlphaCompositing: PropTypes.bool,
diff --git a/Libraries/Geolocation/Geolocation.js b/Libraries/Geolocation/Geolocation.js
index d5d8fcd30a96bf..a4efe4c0201cb5 100644
--- a/Libraries/Geolocation/Geolocation.js
+++ b/Libraries/Geolocation/Geolocation.js
@@ -63,7 +63,7 @@ var Geolocation = {
 
   /*
    * Request suitable Location permission based on the key configured on pList.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/geolocation.html#requestauthorization
    */
   requestAuthorization: function() {
@@ -71,8 +71,8 @@ var Geolocation = {
   },
 
   /*
-   * Invokes the success callback once with the latest location info. 
-   * 
+   * Invokes the success callback once with the latest location info.
+   *
    * See https://facebook.github.io/react-native/docs/geolocation.html#getcurrentposition
    */
   getCurrentPosition: async function(
@@ -109,7 +109,7 @@ var Geolocation = {
 
   /*
    * Invokes the success callback whenever the location changes.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/geolocation.html#watchposition
    */
   watchPosition: function(success: Function, error?: Function, options?: GeoOptions): number {
diff --git a/Libraries/Linking/Linking.js b/Libraries/Linking/Linking.js
index 799ad055cbe850..a621e647adccf8 100644
--- a/Libraries/Linking/Linking.js
+++ b/Libraries/Linking/Linking.js
@@ -21,7 +21,7 @@ const LinkingManager = Platform.OS === 'android' ?
 /**
  * `Linking` gives you a general interface to interact with both incoming
  * and outgoing app links.
- * 
+ *
  * See https://facebook.github.io/react-native/docs/linking.html
  */
 class Linking extends NativeEventEmitter {
@@ -33,7 +33,7 @@ class Linking extends NativeEventEmitter {
   /**
    * Add a handler to Linking changes by listening to the `url` event type
    * and providing the handler
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/linking.html#addeventlistener
    */
   addEventListener(type: string, handler: Function) {
@@ -42,7 +42,7 @@ class Linking extends NativeEventEmitter {
 
   /**
    * Remove a handler by passing the `url` event type and the handler.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/linking.html#removeeventlistener
    */
   removeEventListener(type: string, handler: Function ) {
diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js
index 50a73dd1919720..dabdbc5d92f618 100644
--- a/Libraries/Modal/Modal.js
+++ b/Libraries/Modal/Modal.js
@@ -29,7 +29,7 @@ import type EmitterSubscription from 'EmitterSubscription';
 
 /**
  * The Modal component is a simple way to present content above an enclosing view.
- * 
+ *
  * See https://facebook.github.io/react-native/docs/modal.html
  */
 
@@ -49,48 +49,48 @@ class Modal extends React.Component<Object> {
     animationType: PropTypes.oneOf(['none', 'slide', 'fade']),
     /**
      * The `presentationStyle` prop controls how the modal appears.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#presentationstyle
      */
     presentationStyle: PropTypes.oneOf(['fullScreen', 'pageSheet', 'formSheet', 'overFullScreen']),
     /**
      * The `transparent` prop determines whether your modal will fill the
-     * entire view. 
-     * 
+     * entire view.
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#transparent
      */
     transparent: PropTypes.bool,
     /**
      * The `hardwareAccelerated` prop controls whether to force hardware
      * acceleration for the underlying window.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#hardwareaccelerated
      */
     hardwareAccelerated: PropTypes.bool,
     /**
      * The `visible` prop determines whether your modal is visible.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#visible
      */
     visible: PropTypes.bool,
     /**
      * The `onRequestClose` callback is called when the user taps the hardware
      * back button on Android or the menu button on Apple TV.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#onrequestclose
      */
     onRequestClose: (Platform.isTVOS || Platform.OS === 'android') ? PropTypes.func.isRequired : PropTypes.func,
     /**
      * The `onShow` prop allows passing a function that will be called once the
      * modal has been shown.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#onshow
      */
     onShow: PropTypes.func,
     /**
      * The `onDismiss` prop allows passing a function that will be called once
      * the modal has been dismissed.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#ondismiss
      */
     onDismiss: PropTypes.func,
@@ -100,13 +100,13 @@ class Modal extends React.Component<Object> {
     ),
     /**
      * The `supportedOrientations` prop allows the modal to be rotated to any of the specified orientations.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#supportedorientations
      */
     supportedOrientations: PropTypes.arrayOf(PropTypes.oneOf(['portrait', 'portrait-upside-down', 'landscape', 'landscape-left', 'landscape-right'])),
     /**
      * The `onOrientationChange` callback is called when the orientation changes while the modal is being displayed.
-     * 
+     *
      * See https://facebook.github.io/react-native/docs/modal.html#onorientationchange
      */
     onOrientationChange: PropTypes.func,
diff --git a/Libraries/Network/NetInfo.js b/Libraries/Network/NetInfo.js
index 64a8386d07b77a..0db9d4eab26825 100644
--- a/Libraries/Network/NetInfo.js
+++ b/Libraries/Network/NetInfo.js
@@ -80,13 +80,13 @@ const _isConnectedSubscriptions = new Map();
 
 /**
  * NetInfo exposes info about online/offline status.
- * 
+ *
  * See https://facebook.github.io/react-native/docs/netinfo.html
  */
 const NetInfo = {
   /**
    * Adds an event handler.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/netinfo.html#addeventlistener
    */
   addEventListener(
@@ -128,7 +128,7 @@ const NetInfo = {
 
   /**
    * Removes the listener for network status changes.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/netinfo.html#removeeventlistener
    */
   removeEventListener(
@@ -144,10 +144,10 @@ const NetInfo = {
   },
 
   /**
-   * This function is deprecated. Use `getConnectionInfo` instead. 
+   * This function is deprecated. Use `getConnectionInfo` instead.
    * Returns a promise that resolves with one of the deprecated connectivity
    * types:
-   * 
+   *
    * The following connectivity types are deprecated. They're used by the
    * deprecated APIs `fetch` and the `change` event.
    *
@@ -167,13 +167,13 @@ const NetInfo = {
    * - `MOBILE_HIPRI` - A High Priority Mobile data connection.
    * - `MOBILE_MMS` - An MMS-specific Mobile data connection.
    * - `MOBILE_SUPL` -  A SUPL-specific Mobile data connection.
-   * - `VPN` -  A virtual network using one or more native bearers. Requires 
+   * - `VPN` -  A virtual network using one or more native bearers. Requires
    * API Level 21
    * - `WIFI` - The WIFI data connection.
    * - `WIMAX` -  The WiMAX data connection.
    * - `UNKNOWN` - Unknown data connection.
    *
-   * The rest of the connectivity types are hidden by the Android API, but can 
+   * The rest of the connectivity types are hidden by the Android API, but can
    * be used if necessary.
    */
   fetch(): Promise<any> {
@@ -196,7 +196,7 @@ const NetInfo = {
   /**
    * An object with the same methods as above but the listener receives a
    * boolean which represents the internet connectivity.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/netinfo.html#isconnected
    */
   isConnected: {
diff --git a/Libraries/PermissionsAndroid/PermissionsAndroid.js b/Libraries/PermissionsAndroid/PermissionsAndroid.js
index 7cb8a8411c08c4..18858e1669dbf7 100644
--- a/Libraries/PermissionsAndroid/PermissionsAndroid.js
+++ b/Libraries/PermissionsAndroid/PermissionsAndroid.js
@@ -19,7 +19,7 @@ type Rationale = {
 type PermissionStatus = 'granted' | 'denied' | 'never_ask_again';
 /**
  * `PermissionsAndroid` provides access to Android M's new permissions model.
- * 
+ *
  * See https://facebook.github.io/react-native/docs/permissionsandroid.html
  */
 
@@ -81,7 +81,7 @@ class PermissionsAndroid {
   /**
    * Returns a promise resolving to a boolean value as to whether the specified
    * permissions has been granted
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/permissionsandroid.html#check
    */
   check(permission: string) : Promise<boolean> {
@@ -135,7 +135,7 @@ class PermissionsAndroid {
    * Prompts the user to enable multiple permissions in the same dialog and
    * returns an object with the permissions as keys and strings as values
    * indicating whether the user allowed or denied the request
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/permissionsandroid.html#requestmultiple
    */
   requestMultiple(permissions: Array<string>) : Promise<{[permission: string]: PermissionStatus}> {
diff --git a/Libraries/PushNotificationIOS/PushNotificationIOS.js b/Libraries/PushNotificationIOS/PushNotificationIOS.js
index 1a131a5744e353..955bdf8c1adc9d 100644
--- a/Libraries/PushNotificationIOS/PushNotificationIOS.js
+++ b/Libraries/PushNotificationIOS/PushNotificationIOS.js
@@ -102,7 +102,7 @@ class PushNotificationIOS {
 
   /**
    * Cancels all scheduled localNotifications.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#cancelalllocalnotifications
    */
   static cancelAllLocalNotifications() {
@@ -111,7 +111,7 @@ class PushNotificationIOS {
 
   /**
    * Remove all delivered notifications from Notification Center.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#removealldeliverednotifications
    */
   static removeAllDeliveredNotifications(): void {
@@ -138,7 +138,7 @@ class PushNotificationIOS {
 
   /**
    * Sets the badge number for the app icon on the home screen.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#setapplicationiconbadgenumber
    */
   static setApplicationIconBadgeNumber(number: number) {
@@ -147,7 +147,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the current badge number for the app icon on the home screen.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getapplicationiconbadgenumber
    */
   static getApplicationIconBadgeNumber(callback: Function) {
@@ -165,7 +165,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the local notifications that are currently scheduled.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getscheduledlocalnotifications
    */
   static getScheduledLocalNotifications(callback: Function) {
@@ -219,7 +219,7 @@ class PushNotificationIOS {
   /**
    * Removes the event listener. Do this in `componentWillUnmount` to prevent
    * memory leaks.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#removeeventlistener
    */
   static removeEventListener(type: PushNotificationEventName, handler: Function) {
@@ -240,7 +240,7 @@ class PushNotificationIOS {
    * dialog box. By default, it will request all notification permissions, but
    * a subset of these can be requested by passing a map of requested
    * permissions.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#requestpermissions
    */
   static requestPermissions(permissions?: {
@@ -281,7 +281,7 @@ class PushNotificationIOS {
   /**
    * See what push permissions are currently enabled. `callback` will be
    * invoked with a `permissions` object.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#checkpermissions
    */
   static checkPermissions(callback: Function) {
@@ -295,7 +295,7 @@ class PushNotificationIOS {
   /**
    * This method returns a promise that resolves to either the notification
    * object if the app was launched by a push notification, or `null` otherwise.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getinitialnotification
    */
   static getInitialNotification(): Promise<?PushNotificationIOS> {
@@ -308,7 +308,7 @@ class PushNotificationIOS {
    * You will never need to instantiate `PushNotificationIOS` yourself.
    * Listening to the `notification` event and invoking
    * `getInitialNotification` is sufficient
-   * 
+   *
    */
   constructor(nativeNotif: Object) {
     this._data = {};
@@ -347,7 +347,7 @@ class PushNotificationIOS {
   /**
    * This method is available for remote notifications that have been received via:
    * `application:didReceiveRemoteNotification:fetchCompletionHandler:`
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#finish
    */
   finish(fetchResult: string) {
@@ -369,7 +369,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the sound string from the `aps` object
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getsound
    */
   getSound(): ?string {
@@ -378,7 +378,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the category string from the `aps` object
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getcategory
    */
   getCategory(): ?string {
@@ -387,7 +387,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the notification's main message from the `aps` object
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getalert
    */
   getAlert(): ?string | ?Object {
@@ -396,7 +396,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the content-available number from the `aps` object
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getcontentavailable
    */
   getContentAvailable(): ContentAvailable {
@@ -405,7 +405,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the badge count number from the `aps` object
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getbadgecount
    */
   getBadgeCount(): ?number {
@@ -414,7 +414,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the data object on the notif
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getdata
    */
   getData(): ?Object {
@@ -423,7 +423,7 @@ class PushNotificationIOS {
 
   /**
    * Gets the thread ID on the notif
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/pushnotificationios.html#getthreadid
    */
   getThreadID(): ?string {
diff --git a/Libraries/Storage/AsyncStorage.js b/Libraries/Storage/AsyncStorage.js
index 62228f7830a593..4e262e6150c36f 100644
--- a/Libraries/Storage/AsyncStorage.js
+++ b/Libraries/Storage/AsyncStorage.js
@@ -20,9 +20,9 @@ const RCTAsyncStorage = NativeModules.AsyncRocksDBStorage ||
 
 /**
  * `AsyncStorage` is a simple, unencrypted, asynchronous, persistent, key-value
- * storage system that is global to the app.  It should be used instead of 
+ * storage system that is global to the app.  It should be used instead of
  * LocalStorage.
- * 
+ *
  * See http://facebook.github.io/react-native/docs/asyncstorage.html
  */
 var AsyncStorage = {
@@ -32,7 +32,7 @@ var AsyncStorage = {
 
   /**
    * Fetches an item for a `key` and invokes a callback upon completion.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#getitem
    */
   getItem: function(
@@ -56,7 +56,7 @@ var AsyncStorage = {
 
   /**
    * Sets the value for a `key` and invokes a callback upon completion.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#setitem
    */
   setItem: function(
@@ -79,7 +79,7 @@ var AsyncStorage = {
 
   /**
    * Removes an item for a `key` and invokes a callback upon completion.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#removeitem
    */
   removeItem: function(
@@ -129,7 +129,7 @@ var AsyncStorage = {
    * Erases *all* `AsyncStorage` for all clients, libraries, etc. You probably
    * don't want to call this; use `removeItem` or `multiRemove` to clear only
    * your app's keys.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#clear
    */
   clear: function(callback?: ?(error: ?Error) => void): Promise {
@@ -173,9 +173,9 @@ var AsyncStorage = {
    * indicate which key caused the error.
    */
 
-  /** 
+  /**
    * Flushes any pending requests using a single batch call to get the data.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#flushgetrequests
    * */
   flushGetRequests: function(): void {
@@ -209,7 +209,7 @@ var AsyncStorage = {
    * This allows you to batch the fetching of items given an array of `key`
    * inputs. Your callback will be invoked with an array of corresponding
    * key-value pairs found.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#multiget
    */
   multiGet: function(
@@ -273,7 +273,7 @@ var AsyncStorage = {
 
   /**
    * Call this to batch the deletion of all keys in the `keys` array.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#multiremove
    */
   multiRemove: function(
@@ -296,9 +296,9 @@ var AsyncStorage = {
   /**
    * Batch operation to merge in existing and new values for a given set of
    * keys. This assumes that the values are stringified JSON.
-   * 
+   *
    * **NOTE**: This is not supported by all native implementations.
-   * 
+   *
    * See http://facebook.github.io/react-native/docs/asyncstorage.html#multimerge
    */
   multiMerge: function(
diff --git a/Libraries/Vibration/Vibration.js b/Libraries/Vibration/Vibration.js
index e01da3d4022663..7f10cda29f8fab 100644
--- a/Libraries/Vibration/Vibration.js
+++ b/Libraries/Vibration/Vibration.js
@@ -15,7 +15,7 @@ var Platform = require('Platform');
 
 /**
  * Vibration API
- * 
+ *
  * See https://facebook.github.io/react-native/docs/vibration.html
  */
 
@@ -57,7 +57,7 @@ function vibrateScheduler(id, pattern: Array<number>, repeat: boolean, nextIndex
 var Vibration = {
   /**
    * Trigger a vibration with specified `pattern`.
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/vibration.html#vibrate
    */
   vibrate: function(pattern: number | Array<number> = 400, repeat: boolean = false) {
@@ -84,7 +84,7 @@ var Vibration = {
   },
   /**
    * Stop vibration
-   * 
+   *
    * See https://facebook.github.io/react-native/docs/vibration.html#cancel
    */
   cancel: function() {
diff --git a/RNTester/js/ListExampleShared.js b/RNTester/js/ListExampleShared.js
index 84d2fb37cc8538..96ace615655be1 100644
--- a/RNTester/js/ListExampleShared.js
+++ b/RNTester/js/ListExampleShared.js
@@ -199,7 +199,7 @@ function pressItem(context: Object, key: string) {
 }
 
 function renderSmallSwitchOption(context: Object, key: string) {
-  if(Platform.isTVOS) {
+  if (Platform.isTVOS) {
     return null;
   }
   return (
diff --git a/RNTester/js/RNTesterApp.ios.js b/RNTester/js/RNTesterApp.ios.js
index 249b2754f886ef..26ee1ebbdd976d 100644
--- a/RNTester/js/RNTesterApp.ios.js
+++ b/RNTester/js/RNTesterApp.ios.js
@@ -144,9 +144,9 @@ const styles = StyleSheet.create({
     borderBottomColor: '#96969A',
     backgroundColor: '#F5F5F6',
   },
-  header: { 
-    height: 40, 
-    flexDirection: 'row' 
+  header: {
+    height: 40,
+    flexDirection: 'row'
   },
   headerLeft: {
   },
diff --git a/bots/dangerfile.js b/bots/dangerfile.js
index 52079c27df5e02..fc727e2f0a1b9f 100644
--- a/bots/dangerfile.js
+++ b/bots/dangerfile.js
@@ -99,7 +99,7 @@ if (danger.git.modified_files + danger.git.added_files + danger.git.deleted_file
 const issueCommandsFileModified = includes(danger.git.modified_files, 'bots/IssueCommands.txt');
 if (issueCommandsFileModified) {
   const title = ':exclamation: Bots';
-  const idea = 'This PR appears to modify the list of people that may issue ' + 
+  const idea = 'This PR appears to modify the list of people that may issue ' +
   'commands to the GitHub bot.';
   warn(`${title} - <i>${idea}</i>`);
 }
@@ -107,7 +107,7 @@ if (issueCommandsFileModified) {
 // Warns if the PR is opened against stable, as commits need to be cherry picked and tagged by a release maintainer.
 // Fails if the PR is opened against anything other than `master` or `-stable`.
 const isMergeRefMaster = danger.github.pr.base.ref === 'master';
-const isMergeRefStable = danger.github.pr.base.ref.indexOf(`-stable`) !== -1;
+const isMergeRefStable = danger.github.pr.base.ref.indexOf('-stable') !== -1;
 if (!isMergeRefMaster && isMergeRefStable) {
   const title = ':grey_question: Base Branch';
   const idea = 'The base branch for this PR is something other than `master`. Are you sure you want to merge these changes into a stable release? If you are interested in backporting updates to an older release, the suggested approach is to land those changes on `master` first and then cherry-pick the commits into the branch for that release. The [Releases Guide](https://github.com/facebook/react-native/blob/master/Releases.md) has more information.';
diff --git a/flow-github/metro.js b/flow-github/metro.js
index ec84de96ddb216..ff06b427774628 100644
--- a/flow-github/metro.js
+++ b/flow-github/metro.js
@@ -21,4 +21,4 @@ declare module 'metro/src/HmrServer' {
 
 declare module 'metro/src/lib/bundle-modules/HMRClient' {
   declare module.exports: any;
-}
\ No newline at end of file
+}
diff --git a/local-cli/link/ios/getTargets.js b/local-cli/link/ios/getTargets.js
index c85bcd16a2ebca..784eed2177f3f4 100644
--- a/local-cli/link/ios/getTargets.js
+++ b/local-cli/link/ios/getTargets.js
@@ -22,6 +22,6 @@ module.exports = function getTargets(project) {
       target: nativeTargetSection[key],
         name: nativeTargetSection[key].productReference_comment,
       isTVOS: (buildConfiguration.buildSettings.SDKROOT && (buildConfiguration.buildSettings.SDKROOT.indexOf('appletv') !== -1)) || false
-    }
+    };
   });
 };
diff --git a/local-cli/link/ios/registerNativeModule.js b/local-cli/link/ios/registerNativeModule.js
index 470776898c2f6f..fed2b0bb2cfc55 100644
--- a/local-cli/link/ios/registerNativeModule.js
+++ b/local-cli/link/ios/registerNativeModule.js
@@ -46,8 +46,8 @@ module.exports = function registerNativeModuleIOS(dependencyConfig, projectConfi
   getTargets(dependencyProject).forEach(product => {
     var i;
     if (!product.isTVOS) {
-      for (i=0; i<targets.length; i++) {
-        if(!targets[i].isTVOS) {
+      for (i = 0; i < targets.length; i++) {
+        if (!targets[i].isTVOS) {
           project.addStaticLibrary(product.name, {
             target: targets[i].uuid
           });
@@ -56,8 +56,8 @@ module.exports = function registerNativeModuleIOS(dependencyConfig, projectConfi
     }
 
     if (product.isTVOS) {
-      for (i=0; i<targets.length; i++) {
-        if(targets[i].isTVOS) {
+      for (i = 0; i < targets.length; i++) {
+        if (targets[i].isTVOS) {
           project.addStaticLibrary(product.name, {
             target: targets[i].uuid
           });
diff --git a/local-cli/link/unlink.js b/local-cli/link/unlink.js
index 54e6df37401d57..1b504e3ed4d01a 100644
--- a/local-cli/link/unlink.js
+++ b/local-cli/link/unlink.js
@@ -114,7 +114,7 @@ function unlink(args, config) {
           if (!linkConfig || !linkConfig.unlinkAssets) {
             return;
           }
-    
+
           log.info(`Unlinking assets from ${platform} project`);
           linkConfig.unlinkAssets(assets, project[platform]);
         });

From cf0193f9e0a94e5b24b3735e104adea20c2be025 Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Thu, 22 Feb 2018 12:20:34 -0800
Subject: [PATCH 075/267] More tests for FabricUIManagerModule

Reviewed By: mdvacca

Differential Revision: D7045459

fbshipit-source-id: f96758cf04b41836f73b29e62d43a122d955c67a
---
 .../com/facebook/react/uimanager/ReactShadowNodeImpl.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index 8233fc224f111f..cf0b8b37a12108 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -491,7 +491,9 @@ public final ReactShadowNodeImpl removeNativeChildAt(int i) {
   @Override
   public final void removeAllChildren() {
     removeAllNativeChildren();
-    mChildren.clear();
+    if (mChildren != null) {
+      mChildren.clear();
+    }
   }
 
   @Override

From ef9d1fba237c08a158c8f32e823f229921e7c052 Mon Sep 17 00:00:00 2001
From: Krzysztof Magiera <krzys@swmansion.com>
Date: Thu, 22 Feb 2018 13:26:32 -0800
Subject: [PATCH 076/267] Fix IllegalStateException in looped timing native
 animation

Summary:
This PR fixes regression introduced in #17896 with IllegalStateException being thrown in FrameBasedAnimationDriver.

After investigating it seemed that the root cause was the code responsible for looping animations that was setting next frame time by adding the frame interval to the current time. In some circumstances the next frame would run earlier than that and as a result the calculated frame index was negative.

Here is the stacktrace as reported by axemclion https://github.com/facebook/react-native/pull/17896/files#r170007224
```
Caused by: java.lang.IllegalStateException: Calculated frame index should never be lower than 0
	at com.facebook.react.animated.FrameBasedAnimationDriver.runAnimationStep(FrameBasedAnimationDriver.java:60)
	at com.facebook.react.animated.NativeAnimatedNodesManager.runUpdates(NativeAnimatedNodesManager.java:444)
	at com.facebook.react.animated.NativeAnimatedModule$1.doFrameGuarded(NativeAnimatedModule.java:100)
	at com.facebook.react.uimanager.GuardedFrameCallback.doFrame(GuardedFrameCallback.java:29)
```

Run native animated tests suite. Run RNTester and scroll to the loop animation and see it working correctly

[ANDROID][BUGFIX][Animated] - Fix exception thrown by timing animation when looping
Closes https://github.com/facebook/react-native/pull/18061

Differential Revision: D7059335

Pulled By: hramos

fbshipit-source-id: b08dfd1398d028eeeabeb11863743666379da374
---
 .../facebook/react/animated/FrameBasedAnimationDriver.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
index d243fd8f45c940..f8fca1f9d22921 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/FrameBasedAnimationDriver.java
@@ -52,7 +52,10 @@ public void resetConfig(ReadableMap config) {
   public void runAnimationStep(long frameTimeNanos) {
     if (mStartFrameTimeNanos < 0) {
       mStartFrameTimeNanos = frameTimeNanos;
-      mFromValue = mAnimatedValue.mValue;
+      if (mCurrentLoop == 1) {
+        // initiate start value when animation runs for the first time
+        mFromValue = mAnimatedValue.mValue;
+      }
     }
     long timeFromStartMillis = (frameTimeNanos - mStartFrameTimeNanos) / 1000000;
     int frameIndex = (int) Math.round(timeFromStartMillis / FRAME_TIME_MILLIS);
@@ -66,7 +69,7 @@ public void runAnimationStep(long frameTimeNanos) {
     if (frameIndex >= mFrames.length - 1) {
       nextValue = mToValue;
       if (mIterations == -1 || mCurrentLoop < mIterations) { // looping animation, return to start
-        mStartFrameTimeNanos = frameTimeNanos + ((long) FRAME_TIME_MILLIS) * 1000000L;
+        mStartFrameTimeNanos = -1;
         mCurrentLoop++;
       } else { // animation has completed, no more frames left
         mHasFinished = true;

From b57a78c3def50eda11e57542be0e5233a62d173b Mon Sep 17 00:00:00 2001
From: Islam Magdy <islam@in1t.com>
Date: Thu, 22 Feb 2018 17:57:27 -0800
Subject: [PATCH 077/267] Fix for #17348, Scrollable failing due to uglify-es

Summary:
Fixes https://github.com/facebook/react-native/issues/17348 - Unhandled JS Exception: TypeError: undefined is not an object (evaluating 'this._subscribableSubscriptions.forEach')

Same existing tests applies, just added extra checks.

This patch fixes the issue https://github.com/facebook/react-native/issues/17348

 [ANDROID] [BUGFIX] [Subscribable] - Fix for https://github.com/facebook/react-native/issues/17348
 [IOS] [BUGFIX] [Subscribable] - Fix for https://github.com/facebook/react-native/issues/17348
Closes https://github.com/facebook/react-native/pull/17463

Reviewed By: sahrens

Differential Revision: D7062101

Pulled By: TheSavior

fbshipit-source-id: 1306f4695ffc8748f674de70740ded09e1e390f7
---
 Libraries/Components/Subscribable.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Libraries/Components/Subscribable.js b/Libraries/Components/Subscribable.js
index 3dfe6a4bb1732b..cc665ef98f78db 100644
--- a/Libraries/Components/Subscribable.js
+++ b/Libraries/Components/Subscribable.js
@@ -28,7 +28,9 @@ Subscribable.Mixin = {
   },
 
   componentWillUnmount: function() {
-    this._subscribableSubscriptions.forEach(
+    // This null check is a fix for a broken version of uglify-es. Should be deleted eventually
+    // https://github.com/facebook/react-native/issues/17348
+    this._subscribableSubscriptions && this._subscribableSubscriptions.forEach(
       (subscription) => subscription.remove()
     );
     this._subscribableSubscriptions = null;

From d352c93487dba7359428fa0a3eb74f504ac34f2d Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Thu, 22 Feb 2018 22:48:48 -0800
Subject: [PATCH 078/267] Register ReactRootView into FabricUIManagerModule

Reviewed By: achen1

Differential Revision: D7043902

fbshipit-source-id: fecef5a019dadd3d2802baa20dd8a3711e566ed3
---
 .../main/java/com/facebook/react/fabric/BUCK  | 13 ++---
 .../react/fabric/FabricUIManagerModule.java   | 48 ++++++++++++++-----
 .../react/fabric/RootShadowNodeRegistry.java  | 29 +++++++++++
 .../react/uimanager/ReactShadowNode.java      |  3 --
 .../react/uimanager/ReactShadowNodeImpl.java  |  5 --
 .../react/uimanager/UIImplementation.java     |  1 -
 6 files changed, 73 insertions(+), 26 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
index 3ff8cc422dfa64..a5c3d74099be35 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
@@ -1,6 +1,6 @@
 load("//ReactNative:DEFS.bzl", "rn_android_library", "react_native_dep", "react_native_target")
 
-android_library(
+rn_android_library(
     name = "fabric",
     srcs = glob(["*.java"]),
     provided_deps = [
@@ -13,10 +13,11 @@ android_library(
     deps = [
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
-        react_native_target("java/com/facebook/react:reactAndroid"),
-        react_native_target("java/com/facebook/react/bridge:bridgeAndroid"),
-        react_native_target("java/com/facebook/react/uimanager:uimanagerAndroid"),
-        react_native_target("java/com/facebook/react/uimanager/annotations:annotationsAndroid"),
-        react_native_target("java/com/facebook/react/module/annotations:annotationsAndroid"),
+        react_native_target("java/com/facebook/react:react"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/uimanager:uimanager"),
+        react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
+        react_native_target("java/com/facebook/react/module/annotations:annotations"),
+        react_native_target("java/com/facebook/react/modules/i18nmanager:i18nmanager"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
index 10acfbc278df33..473eee7f6247e5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
@@ -4,12 +4,14 @@
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.uimanager.MeasureSpecProvider;
-import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
 import com.facebook.react.uimanager.ReactRootViewTagGenerator;
 import com.facebook.react.uimanager.ReactShadowNode;
+import com.facebook.react.uimanager.ReactShadowNodeImpl;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.SizeMonitoringFrameLayout;
+import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
@@ -24,6 +26,7 @@
 @SuppressWarnings("unused") // used from JNI
 public class FabricUIManagerModule implements UIModule {
 
+  private final RootShadowNodeRegistry mRootShadowNodeRegistry = new RootShadowNodeRegistry();
   private final ReactApplicationContext mReactApplicationContext;
   private final ViewManagerRegistry mViewManagerRegistry;
 
@@ -43,19 +46,23 @@ public ReactShadowNode createNode(int reactTag,
       ReadableMap props) {
 
     ViewManager viewManager = mViewManagerRegistry.get(viewName);
-    ReactShadowNode shadowNode = viewManager.createShadowNodeInstance(mReactApplicationContext);
-    shadowNode.setRootTag(rootTag);
-    shadowNode.setReactTag(reactTag);
-    ReactStylesDiffMap styles = updateProps(props, shadowNode);
+    ReactShadowNode node = viewManager.createShadowNodeInstance(mReactApplicationContext);
+    node.setRootNode(getRootNode(rootTag));
+    node.setReactTag(reactTag);
+    ReactStylesDiffMap styles = updateProps(props, node);
 
-    return shadowNode;
+    return node;
   }
 
-  private ReactStylesDiffMap updateProps(ReadableMap props, ReactShadowNode shadowNode) {
+  private ReactShadowNode getRootNode(int rootTag) {
+    return mRootShadowNodeRegistry.getNode(rootTag);
+  }
+
+  private ReactStylesDiffMap updateProps(ReadableMap props, ReactShadowNode node) {
     ReactStylesDiffMap styles = null;
     if (props != null) {
       styles = new ReactStylesDiffMap(props);
-      shadowNode.updateProperties(styles);
+      node.updateProperties(styles);
     }
     return styles;
   }
@@ -134,15 +141,34 @@ public void appendChildToSet(List<ReactShadowNode> childList, ReactShadowNode ch
   }
 
   public void completeRoot(int rootTag, List<ReactShadowNode> childList) {
-    // TODO Diffing old Tree with new Tree?
+    // TODO Diffing old Tree with new Tree
     // Do we need to hold references to old and new tree?
   }
 
   @Override
   public <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(
     final T rootView) {
-    // TODO: complete with actual implementation
-    return ReactRootViewTagGenerator.getNextRootViewTag();
+    int rootTag = ReactRootViewTagGenerator.getNextRootViewTag();
+    ThemedReactContext themedRootContext = new ThemedReactContext(
+        mReactApplicationContext,
+        rootView.getContext());
+
+    mRootShadowNodeRegistry.addNode(createRootShadowNode(rootTag, themedRootContext));
+    return rootTag;
+  }
+
+  public void removeRootView(int rootTag) {
+    mRootShadowNodeRegistry.removeNode(rootTag);
+  }
+
+  private ReactShadowNode createRootShadowNode(int rootTag, ThemedReactContext themedReactContext) {
+    ReactShadowNode rootNode = new ReactShadowNodeImpl();
+    I18nUtil sharedI18nUtilInstance = I18nUtil.getInstance();
+    // TODO: setLayoutDirection for the rootNode
+    rootNode.setViewClassName("Root");
+    rootNode.setReactTag(rootTag);
+    rootNode.setThemedContext(themedReactContext);
+    return rootNode;
   }
 
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java
new file mode 100644
index 00000000000000..5aeff65500afca
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java
@@ -0,0 +1,29 @@
+package com.facebook.react.fabric;
+
+import android.util.SparseArray;
+import com.facebook.react.uimanager.ReactShadowNode;
+
+/**
+ * Simple container class to keep track of {@link ReactShadowNode}s that represents the Root
+ * Shadow Nodes of a {@link FabricUIManagerModule}
+ */
+public class RootShadowNodeRegistry {
+
+  private final SparseArray<ReactShadowNode> mTagsToRootNodes;
+
+  public RootShadowNodeRegistry() {
+    mTagsToRootNodes = new SparseArray<>();
+  }
+
+  public void addNode(ReactShadowNode node) {
+    mTagsToRootNodes.put(node.getReactTag(), node);
+  }
+
+  public void removeNode(int tag) {
+    mTagsToRootNodes.remove(tag);
+  }
+
+  public ReactShadowNode getNode(int tag) {
+    return mTagsToRootNodes.get(tag);
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
index 92e5badc695830..69c130aa80b79e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
@@ -132,11 +132,8 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   T getRootNode();
 
-  @Deprecated() //Replaced by setRootTag method.
   void setRootNode(T rootNode);
 
-  void setRootTag(int rootTag);
-
   void setViewClassName(String viewClassName);
 
   @Nullable
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index cf0b8b37a12108..c12f5fb9ff8a4d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -410,11 +410,6 @@ public final void setRootNode(ReactShadowNodeImpl rootNode) {
     mRootNode = rootNode;
   }
 
-  @Override
-  public void setRootTag(int rootTag) {
-    mRootTag = rootTag;
-  }
-
   @Override
   public final void setViewClassName(String viewClassName) {
     mViewClassName = viewClassName;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
index 7c59caafb67a2c..98e4a592c6ec9d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
@@ -277,7 +277,6 @@ public void createView(int tag, String className, int rootViewTag, ReadableMap p
     cssNode.setReactTag(tag);
     cssNode.setViewClassName(className);
     cssNode.setRootNode(rootNode);
-    if (rootNode != null) cssNode.setRootTag(rootNode.getReactTag());
     cssNode.setThemedContext(rootNode.getThemedContext());
 
     mShadowNodeRegistry.addNode(cssNode);

From e214bb39710b8ee1af95ef075422115c73efdb5c Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Fri, 23 Feb 2018 03:25:25 -0800
Subject: [PATCH 079/267] `DevSupportManager`: tag `RELOAD` marker with metro
 host

Summary: Adds the configured metro host to `ReactMarker.logMarker(ReactMarkerConstants.RELOAD)`. This may be used for diagnostics in marker listeners

Reviewed By: bnham

Differential Revision: D7041086

fbshipit-source-id: 0b0777b1cd4c74b29b9245e925cf7851b24985fa
---
 .../com/facebook/react/devsupport/DevSupportManagerImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
index 656ccd61426604..c04211a98b0942 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
@@ -825,7 +825,9 @@ public void handleReloadJS() {
 
     UiThreadUtil.assertOnUiThread();
 
-    ReactMarker.logMarker(ReactMarkerConstants.RELOAD);
+    ReactMarker.logMarker(
+        ReactMarkerConstants.RELOAD,
+        mDevSettings.getPackagerConnectionSettings().getDebugServerHost());
 
     // dismiss redbox if exists
     hideRedboxDialog();

From a29906a209f65c671eab9ad3327aa28b1e9ea530 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya <byk@fb.com>
Date: Fri, 23 Feb 2018 03:25:47 -0800
Subject: [PATCH 080/267] Upgrade Jest to 22.4.2

Reviewed By: mjesun

Differential Revision: D7060484

fbshipit-source-id: 91cc7b6d66a2bb99242c144e011eef4393f87e9e
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e4041fc55db551..d37d109c99d67f 100644
--- a/package.json
+++ b/package.json
@@ -215,7 +215,7 @@
     "eslint-plugin-prettier": "2.6.0",
     "eslint-plugin-react": "7.6.1",
     "flow-bin": "^0.66.0",
-    "jest": "22.4.0",
+    "jest": "22.4.2",
     "jest-junit": "3.6.0",
     "prettier": "1.9.1",
     "react": "^16.3.0-alpha.1",

From 8d74af4d60d00294d9275c50ac1814ac1fc2bd1a Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya <byk@fb.com>
Date: Fri, 23 Feb 2018 07:35:49 -0800
Subject: [PATCH 081/267] Release Metro 0.27.0

Reviewed By: davidaurelio

Differential Revision: D7067140

fbshipit-source-id: a2ae64a8049e5ef883c08f4abbe108401427b0aa
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d37d109c99d67f..9b8c58cb290d45 100644
--- a/package.json
+++ b/package.json
@@ -174,8 +174,8 @@
     "graceful-fs": "^4.1.3",
     "inquirer": "^3.0.6",
     "lodash": "^4.17.5",
-    "metro": "^0.26.0",
-    "metro-core": "^0.26.0",
+    "metro": "^0.27.0",
+    "metro-core": "^0.27.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",

From 33a893e18b9cc59bbfaf86b3f0089fe49913b5b8 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Fri, 23 Feb 2018 08:46:48 -0800
Subject: [PATCH 082/267] react-native: prefer custom source extensions over
 default extensions

Reviewed By: mjesun

Differential Revision: D7066617

fbshipit-source-id: cdde7451cb817d62d6705071752fce0686cf04dc
---
 local-cli/bundle/buildBundle.js | 2 +-
 local-cli/server/runServer.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js
index 66fad891ae77f8..36081a6052cb8a 100644
--- a/local-cli/bundle/buildBundle.js
+++ b/local-cli/bundle/buildBundle.js
@@ -100,7 +100,7 @@ async function buildBundle(
     providesModuleNodeModules: providesModuleNodeModules,
     resetCache: args.resetCache,
     reporter: new TerminalReporter(terminal),
-    sourceExts: defaultSourceExts.concat(sourceExts),
+    sourceExts: sourceExts.concat(defaultSourceExts),
     transformCache: TransformCaching.useTempDir(),
     transformModulePath: transformModulePath,
     watch: false,
diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index 396c57ce6741b7..8054190e1b85b7 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -187,7 +187,7 @@ function getPackagerServer(args, config, reporter) {
     providesModuleNodeModules: providesModuleNodeModules,
     reporter,
     resetCache: args.resetCache,
-    sourceExts: defaultSourceExts.concat(args.sourceExts),
+    sourceExts: args.sourceExts.concat(defaultSourceExts),
     transformModulePath: transformModulePath,
     transformCache: TransformCaching.useTempDir(),
     verbose: args.verbose,

From 87f98bcd7c79b3ddcf6ffcae8ad11814ef296bb1 Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Fri, 23 Feb 2018 09:43:45 -0800
Subject: [PATCH 083/267] BundleDownloader/DevServerHelper: Close http
 responses

Reviewed By: amnn

Differential Revision: D7067204

fbshipit-source-id: 9b3dde374280b8d7bdc028a14e9218f37cfc87f2
---
 .../react/devsupport/BundleDownloader.java    | 205 +++++++++++-------
 .../react/devsupport/DevServerHelper.java     |   3 +-
 2 files changed, 122 insertions(+), 86 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
index cf257cc8f629ba..b7c7ed7b962a8a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.java
@@ -110,99 +110,136 @@ public void downloadBundleFromURL(
             // .addHeader("Accept", "multipart/mixed")
             .build();
     mDownloadBundleFromURLCall = Assertions.assertNotNull(mClient.newCall(request));
-    mDownloadBundleFromURLCall.enqueue(new Callback() {
-      @Override
-      public void onFailure(Call call, IOException e) {
-        // ignore callback if call was cancelled
-        if (mDownloadBundleFromURLCall == null || mDownloadBundleFromURLCall.isCanceled()) {
-          mDownloadBundleFromURLCall = null;
-          return;
-        }
-        mDownloadBundleFromURLCall = null;
-
-        callback.onFailure(DebugServerException.makeGeneric(
-            "Could not connect to development server.",
-            "URL: " + call.request().url().toString(),
-            e));
-      }
+    mDownloadBundleFromURLCall.enqueue(
+        new Callback() {
+          @Override
+          public void onFailure(Call call, IOException e) {
+            // ignore callback if call was cancelled
+            if (mDownloadBundleFromURLCall == null || mDownloadBundleFromURLCall.isCanceled()) {
+              mDownloadBundleFromURLCall = null;
+              return;
+            }
+            mDownloadBundleFromURLCall = null;
 
-      @Override
-      public void onResponse(Call call, final Response response) throws IOException {
-        // ignore callback if call was cancelled
-        if (mDownloadBundleFromURLCall == null || mDownloadBundleFromURLCall.isCanceled()) {
-          mDownloadBundleFromURLCall = null;
-          return;
-        }
-        mDownloadBundleFromURLCall = null;
-
-        final String url = response.request().url().toString();
-
-        // Make sure the result is a multipart response and parse the boundary.
-        String contentType = response.header("content-type");
-        Pattern regex = Pattern.compile("multipart/mixed;.*boundary=\"([^\"]+)\"");
-        Matcher match = regex.matcher(contentType);
-        if (match.find()) {
-          String boundary = match.group(1);
-          MultipartStreamReader bodyReader = new MultipartStreamReader(response.body().source(), boundary);
-          boolean completed = bodyReader.readAllParts(new MultipartStreamReader.ChunkListener() {
-            @Override
-            public void onChunkComplete(Map<String, String> headers, Buffer body, boolean isLastChunk) throws IOException {
-              // This will get executed for every chunk of the multipart response. The last chunk
-              // (isLastChunk = true) will be the JS bundle, the other ones will be progress events
-              // encoded as JSON.
-              if (isLastChunk) {
-                // The http status code for each separate chunk is in the X-Http-Status header.
-                int status = response.code();
-                if (headers.containsKey("X-Http-Status")) {
-                  status = Integer.parseInt(headers.get("X-Http-Status"));
-                }
-                processBundleResult(url, status, Headers.of(headers), body, outputFile, bundleInfo, callback);
+            callback.onFailure(
+                DebugServerException.makeGeneric(
+                    "Could not connect to development server.",
+                    "URL: " + call.request().url().toString(),
+                    e));
+          }
+
+          @Override
+          public void onResponse(Call call, final Response response) throws IOException {
+            // ignore callback if call was cancelled
+            if (mDownloadBundleFromURLCall == null || mDownloadBundleFromURLCall.isCanceled()) {
+              mDownloadBundleFromURLCall = null;
+              return;
+            }
+            mDownloadBundleFromURLCall = null;
+
+            final String url = response.request().url().toString();
+
+            // Make sure the result is a multipart response and parse the boundary.
+            String contentType = response.header("content-type");
+            Pattern regex = Pattern.compile("multipart/mixed;.*boundary=\"([^\"]+)\"");
+            Matcher match = regex.matcher(contentType);
+            try (Response r = response) {
+              if (match.find()) {
+                processMultipartResponse(
+                  url, r, match.group(1), outputFile, bundleInfo, callback);
               } else {
-                if (!headers.containsKey("Content-Type") || !headers.get("Content-Type").equals("application/json")) {
-                  return;
-                }
+                // In case the server doesn't support multipart/mixed responses, fallback to normal
+                // download.
+                processBundleResult(
+                  url,
+                  r.code(),
+                  r.headers(),
+                  Okio.buffer(r.body().source()),
+                  outputFile,
+                  bundleInfo,
+                  callback);
+              }
+            }
+          }
+        });
+  }
 
-                try {
-                  JSONObject progress = new JSONObject(body.readUtf8());
-                  String status = null;
-                  if (progress.has("status")) {
-                    status = progress.getString("status");
+  private void processMultipartResponse(
+      final String url,
+      final Response response,
+      String boundary,
+      final File outputFile,
+      @Nullable final BundleInfo bundleInfo,
+      final DevBundleDownloadListener callback)
+      throws IOException {
+
+    MultipartStreamReader bodyReader =
+        new MultipartStreamReader(response.body().source(), boundary);
+    boolean completed =
+        bodyReader.readAllParts(
+            new MultipartStreamReader.ChunkListener() {
+              @Override
+              public void onChunkComplete(
+                  Map<String, String> headers, Buffer body, boolean isLastChunk)
+                  throws IOException {
+                // This will get executed for every chunk of the multipart response. The last chunk
+                // (isLastChunk = true) will be the JS bundle, the other ones will be progress
+                // events
+                // encoded as JSON.
+                if (isLastChunk) {
+                  // The http status code for each separate chunk is in the X-Http-Status header.
+                  int status = response.code();
+                  if (headers.containsKey("X-Http-Status")) {
+                    status = Integer.parseInt(headers.get("X-Http-Status"));
                   }
-                  Integer done = null;
-                  if (progress.has("done")) {
-                    done = progress.getInt("done");
+                  processBundleResult(
+                      url, status, Headers.of(headers), body, outputFile, bundleInfo, callback);
+                } else {
+                  if (!headers.containsKey("Content-Type")
+                      || !headers.get("Content-Type").equals("application/json")) {
+                    return;
                   }
-                  Integer total = null;
-                  if (progress.has("total")) {
-                    total = progress.getInt("total");
+
+                  try {
+                    JSONObject progress = new JSONObject(body.readUtf8());
+                    String status = null;
+                    if (progress.has("status")) {
+                      status = progress.getString("status");
+                    }
+                    Integer done = null;
+                    if (progress.has("done")) {
+                      done = progress.getInt("done");
+                    }
+                    Integer total = null;
+                    if (progress.has("total")) {
+                      total = progress.getInt("total");
+                    }
+                    callback.onProgress(status, done, total);
+                  } catch (JSONException e) {
+                    FLog.e(ReactConstants.TAG, "Error parsing progress JSON. " + e.toString());
                   }
-                  callback.onProgress(status, done, total);
-                } catch (JSONException e) {
-                  FLog.e(ReactConstants.TAG, "Error parsing progress JSON. " + e.toString());
                 }
               }
-            }
-            @Override
-            public void onChunkProgress(Map<String, String> headers, long loaded, long total) throws IOException {
-              if ("application/javascript".equals(headers.get("Content-Type"))) {
-                callback.onProgress(
-                  "Downloading JavaScript bundle",
-                  (int) (loaded / 1024),
-                  (int) (total / 1024));
+
+              @Override
+              public void onChunkProgress(Map<String, String> headers, long loaded, long total)
+                  throws IOException {
+                if ("application/javascript".equals(headers.get("Content-Type"))) {
+                  callback.onProgress(
+                      "Downloading JavaScript bundle", (int) (loaded / 1024), (int) (total / 1024));
+                }
               }
-            }
-          });
-          if (!completed) {
-            callback.onFailure(new DebugServerException(
-                "Error while reading multipart response.\n\nResponse code: " + response.code() + "\n\n" +
-                "URL: " + call.request().url().toString() + "\n\n"));
-          }
-        } else {
-          // In case the server doesn't support multipart/mixed responses, fallback to normal download.
-          processBundleResult(url, response.code(), response.headers(), Okio.buffer(response.body().source()), outputFile, bundleInfo, callback);
-        }
-      }
-    });
+            });
+    if (!completed) {
+      callback.onFailure(
+          new DebugServerException(
+              "Error while reading multipart response.\n\nResponse code: "
+                  + response.code()
+                  + "\n\n"
+                  + "URL: "
+                  + url.toString()
+                  + "\n\n"));
+    }
   }
 
   private void processBundleResult(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
index 4d7bd7c84fc207..09d87f28088001 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -629,8 +629,7 @@ public String getJSBundleURLForRemoteDebugging(String mainModuleName) {
         .url(resourceURL)
         .build();
 
-    try {
-      Response response = mClient.newCall(request).execute();
+    try (Response response = mClient.newCall(request).execute()) {
       if (!response.isSuccessful()) {
         return null;
       }

From 446ce49e9b097d2a5e95b0f17aa23756733c27ec Mon Sep 17 00:00:00 2001
From: Reem Helou <helouree@fb.com>
Date: Fri, 23 Feb 2018 10:41:30 -0800
Subject: [PATCH 084/267] Fix Bug with Date Picker IOS

Reviewed By: sahrens

Differential Revision: D7052609

fbshipit-source-id: 740fffa9ad55ccd21347626f9c5dc180fcc4094d
---
 .../DatePicker/DatePickerIOS.ios.js           | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/Libraries/Components/DatePicker/DatePickerIOS.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
index 9d3e1e30e5d5ce..b08bf8f93412bf 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.ios.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
@@ -13,6 +13,7 @@
 
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const React = require('React');
+const invariant = require('fbjs/lib/invariant');
 const PropTypes = require('prop-types');
 const StyleSheet = require('StyleSheet');
 const View = require('View');
@@ -46,7 +47,17 @@ const DatePickerIOS = createReactClass({
     /**
      * The currently selected date.
      */
-    date: PropTypes.instanceOf(Date).isRequired,
+    date: PropTypes.instanceOf(Date),
+
+    /**
+     * Provides an initial value that will change when the user starts selecting
+     * a date. It is useful for simple use-cases where you do not want to deal
+     * with listening to events and updating the date prop to keep the
+     * controlled state in sync. The controlled state has known bugs which
+     * causes it to go out of sync with native. The initialDate prop is intended
+     * to allow you to have native be source of truth.
+     */
+    initialDate: PropTypes.instanceOf(Date),
 
     /**
      * Date change handler.
@@ -102,6 +113,17 @@ const DatePickerIOS = createReactClass({
     };
   },
 
+  componentDidUpdate: function() {
+    if (this.props.date) {
+      const propsTimeStamp = this.props.date.getTime();
+      if (this._picker) {
+        this._picker.setNativeProps({
+          date: propsTimeStamp,
+        });
+      }
+    }
+  },
+
   _onChange: function(event: Event) {
     const nativeTimeStamp = event.nativeEvent.timestamp;
     this.props.onDateChange && this.props.onDateChange(
@@ -109,27 +131,20 @@ const DatePickerIOS = createReactClass({
     );
     // $FlowFixMe(>=0.41.0)
     this.props.onChange && this.props.onChange(event);
-
-    // We expect the onChange* handlers to be in charge of updating our `date`
-    // prop. That way they can also disallow/undo/mutate the selection of
-    // certain values. In other words, the embedder of this component should
-    // be the source of truth, not the native component.
-    const propsTimeStamp = this.props.date.getTime();
-    if (this._picker && nativeTimeStamp !== propsTimeStamp) {
-      this._picker.setNativeProps({
-        date: propsTimeStamp,
-      });
-    }
   },
 
   render: function() {
     const props = this.props;
+    invariant(
+      props.date || props.initialDate,
+      'A selected date or initial date should be specified.',
+    );
     return (
       <View style={props.style}>
         <RCTDatePickerIOS
           ref={ picker => { this._picker = picker; } }
           style={styles.datePickerIOS}
-          date={props.date.getTime()}
+          date={props.date ? props.date.getTime() : props.initialDate ? props.initialDate.getTime() : undefined}
           locale={props.locale ? props.locale : undefined}
           maximumDate={
             props.maximumDate ? props.maximumDate.getTime() : undefined

From b9be28915cf323eb36f1d7c77821cdf994954074 Mon Sep 17 00:00:00 2001
From: Eric Rozell <erozell@outlook.com>
Date: Fri, 23 Feb 2018 11:08:14 -0800
Subject: [PATCH 085/267] Remove Platform check from WebSocket module

Summary:
WebSocket uses the Platform module to check how many arguments for the `close` method should be used. In react-native-windows, we have the same number of arguments for `close` as Android, so we're prevented from using this module as-is because of the platform check (see https://github.com/Microsoft/react-native-windows/blob/master/Libraries/WebSocket/WebSocket.windows.js#L136).

By switching to an argument count check, this module becomes more useful cross-platform. If you'd like to keep the platform check, I'm also open to inverting the conditional, e.g., `if (Platform.OS !== 'ios')`.

<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

I'd like to minimize the amount of code I need to copy over to react-native-windows for platform-specific overrides.

Run jest tests.

N/A

<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
[GENERAL][MINOR][ENHANCEMENT][Libraries/WebSocket/WebSocket.js] - Better enable cross-platform support of WebSocket.js
Closes https://github.com/facebook/react-native/pull/18056

Differential Revision: D7070380

Pulled By: TheSavior

fbshipit-source-id: 9bfd47654d0bf6f0e07fc799853a206721467525
---
 Libraries/WebSocket/WebSocket.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Libraries/WebSocket/WebSocket.js b/Libraries/WebSocket/WebSocket.js
index 13e614557d78b4..daa1ed77ca050d 100644
--- a/Libraries/WebSocket/WebSocket.js
+++ b/Libraries/WebSocket/WebSocket.js
@@ -14,7 +14,6 @@ const EventTarget = require('event-target-shim');
 const NativeEventEmitter = require('NativeEventEmitter');
 const BlobManager = require('BlobManager');
 const NativeModules = require('NativeModules');
-const Platform = require('Platform');
 const WebSocketEvent = require('WebSocketEvent');
 
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
@@ -203,7 +202,7 @@ class WebSocket extends EventTarget(...WEBSOCKET_EVENTS) {
   }
 
   _close(code?: number, reason?: string): void {
-    if (Platform.OS === 'android') {
+    if (WebSocketModule.close.length === 3) {
       // See https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
       const statusCode = typeof code === 'number' ? code : CLOSE_NORMAL;
       const closeReason = typeof reason === 'string' ? reason : '';

From 25b0c374b37fa7cc602515a88e8954b2bc9fa239 Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sema@fb.com>
Date: Fri, 23 Feb 2018 16:01:53 -0800
Subject: [PATCH 086/267] JSC bindings for FabricUIManager - Android

Reviewed By: fkgozali

Differential Revision: D7054214

fbshipit-source-id: 6275a8a3e2a87dfd851a09392f09658538083483
---
 .../react/fabric/FabricUIManagerModule.java         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
index 473eee7f6247e5..dbed0e09d66160 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
@@ -3,7 +3,7 @@
 package com.facebook.react.fabric;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import com.facebook.react.uimanager.MeasureSpecProvider;
 import com.facebook.react.uimanager.ReactRootViewTagGenerator;
@@ -18,7 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
-
 /**
  * This class is responsible to create, clone and update {@link ReactShadowNode} using the
  * Fabric API.
@@ -43,7 +42,7 @@ public FabricUIManagerModule(ReactApplicationContext reactContext,
   public ReactShadowNode createNode(int reactTag,
       String viewName,
       int rootTag,
-      ReadableMap props) {
+      ReadableNativeMap props) {
 
     ViewManager viewManager = mViewManagerRegistry.get(viewName);
     ReactShadowNode node = viewManager.createShadowNodeInstance(mReactApplicationContext);
@@ -58,7 +57,7 @@ private ReactShadowNode getRootNode(int rootTag) {
     return mRootShadowNodeRegistry.getNode(rootTag);
   }
 
-  private ReactStylesDiffMap updateProps(ReadableMap props, ReactShadowNode node) {
+  private ReactStylesDiffMap updateProps(ReadableNativeMap props, ReactShadowNode node) {
     ReactStylesDiffMap styles = null;
     if (props != null) {
       styles = new ReactStylesDiffMap(props);
@@ -95,7 +94,7 @@ public ReactShadowNode cloneNodeWithNewChildren(ReactShadowNode node) {
    * props will be overridden with the {@link ReadableMap} received by parameter.
    */
   @Nullable
-  public ReactShadowNode cloneNodeWithNewProps(ReactShadowNode node, ReadableMap newProps) {
+  public ReactShadowNode cloneNodeWithNewProps(ReactShadowNode node, ReadableNativeMap newProps) {
     ReactShadowNode clone = cloneNode(node);
     updateProps(newProps, clone);
     return clone;
@@ -110,7 +109,7 @@ public ReactShadowNode cloneNodeWithNewProps(ReactShadowNode node, ReadableMap n
   @Nullable
   public ReactShadowNode cloneNodeWithNewChildrenAndProps(
       ReactShadowNode node,
-      ReadableMap newProps) {
+      ReadableNativeMap newProps) {
     ReactShadowNode clone = cloneNodeWithNewChildren(node);
     updateProps(newProps, clone);
     return clone;
@@ -129,7 +128,7 @@ public void appendChild(ReactShadowNode parent, ReactShadowNode child) {
    * @return an empty {@link List<ReactShadowNode>} that will be used to append the
    * {@link ReactShadowNode} elements of the root. Typically this List will contain one element.
    */
-  public List<ReactShadowNode> createChildSet() {
+  public List<ReactShadowNode> createChildSet(int rootTag) {
     return new ArrayList<>(1);
   }
 

From 486ac9dc823c71202a3d92d3718aae85271dcc96 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Fri, 23 Feb 2018 16:46:06 -0800
Subject: [PATCH 087/267] update FabricUIManager to call the right JS object

Reviewed By: sebmarkbage

Differential Revision: D7037275

fbshipit-source-id: 6a1d13227910d0cdb99dde4b6c98ed7a20ef9911
---
 Libraries/Components/View/FabricView.js       | 113 +++++++++
 Libraries/ReactNative/AppContainer.js         |   4 +-
 Libraries/ReactNative/FabricUIManager.js      |  38 +--
 Libraries/ReactNative/renderFabricSurface.js  |   5 +-
 .../ReactNative/requireFabricComponent.js     | 240 ++++++++++++++++++
 Libraries/Renderer/ReactFabric-dev.js         |   3 +-
 Libraries/Renderer/ReactFabric-prod.js        |   3 +-
 .../Renderer/shims/ReactFabricInternals.js    |  32 +++
 React/Fabric/RCTFabricUIManager.mm            |   5 +
 9 files changed, 408 insertions(+), 35 deletions(-)
 create mode 100644 Libraries/Components/View/FabricView.js
 create mode 100644 Libraries/ReactNative/requireFabricComponent.js
 create mode 100644 Libraries/Renderer/shims/ReactFabricInternals.js

diff --git a/Libraries/Components/View/FabricView.js b/Libraries/Components/View/FabricView.js
new file mode 100644
index 00000000000000..4d686f7beb29cb
--- /dev/null
+++ b/Libraries/Components/View/FabricView.js
@@ -0,0 +1,113 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule FabricView
+ * @flow
+ * @format
+ */
+'use strict';
+
+/**
+ * This is a temporary fork of View.js for Fabric purpose.
+ * Do not use outside of Fabric tree.
+ */
+
+const Platform = require('Platform');
+const React = require('React');
+const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
+const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
+const ViewPropTypes = require('ViewPropTypes');
+const {NativeMethodsMixin} = require('ReactFabricInternals');
+const {ViewContextTypes} = require('ViewContext');
+
+const createReactClass = require('create-react-class');
+const invariant = require('fbjs/lib/invariant');
+const requireFabricComponent = require('requireFabricComponent');
+
+import type {ViewProps} from 'ViewPropTypes';
+import type {ViewChildContext} from 'ViewContext';
+
+export type Props = ViewProps;
+
+/**
+ * The most fundamental component for building a UI.
+ *
+ * See http://facebook.github.io/react-native/docs/view.html
+ */
+const View = createReactClass({
+  displayName: 'View',
+  // TODO: We should probably expose the mixins, viewConfig, and statics publicly. For example,
+  // one of the props is of type AccessibilityComponentType. That is defined as a const[] above,
+  // but it is not rendered by the docs, since `statics` below is not rendered. So its Possible
+  // values had to be hardcoded.
+  mixins: [NativeMethodsMixin],
+
+  // `propTypes` should not be accessed directly on View since this wrapper only
+  // exists for DEV mode. However it's important for them to be declared.
+  // If the object passed to `createClass` specifies `propTypes`, Flow will
+  // create a static type from it.
+  propTypes: ViewPropTypes,
+
+  /**
+   * `NativeMethodsMixin` will look for this when invoking `setNativeProps`. We
+   * make `this` look like an actual native component class.
+   */
+  viewConfig: {
+    uiViewClassName: 'RCTView',
+    validAttributes: ReactNativeViewAttributes.RCTView,
+  },
+
+  childContextTypes: ViewContextTypes,
+
+  getChildContext(): ViewChildContext {
+    return {
+      isInAParentText: false,
+    };
+  },
+
+  render() {
+    invariant(
+      !(this.context.isInAParentText && Platform.OS === 'android'),
+      'Nesting of <View> within <Text> is not supported on Android.',
+    );
+
+    // WARNING: This method will not be used in production mode as in that mode we
+    // replace wrapper component View with generated native wrapper RCTView. Avoid
+    // adding functionality this component that you'd want to be available in both
+    // dev and prod modes.
+    return <RCTView {...this.props} />;
+  },
+});
+
+const RCTView = requireFabricComponent('RCTView', View, {
+  nativeOnly: {
+    nativeBackgroundAndroid: true,
+    nativeForegroundAndroid: true,
+  },
+  fabric: true,
+});
+
+if (__DEV__) {
+  const UIManager = require('UIManager');
+  const viewConfig =
+    (UIManager.viewConfigs && UIManager.viewConfigs.RCTView) || {};
+  for (const prop in viewConfig.nativeProps) {
+    const viewAny: any = View; // Appease flow
+    if (!viewAny.propTypes[prop] && !ReactNativeStyleAttributes[prop]) {
+      throw new Error(
+        'View is missing propType for native prop `' + prop + '`',
+      );
+    }
+  }
+}
+
+let ViewToExport = RCTView;
+if (__DEV__) {
+  ViewToExport = View;
+}
+
+// No one should depend on the DEV-mode createClass View wrapper.
+module.exports = ((ViewToExport: any): typeof RCTView);
diff --git a/Libraries/ReactNative/AppContainer.js b/Libraries/ReactNative/AppContainer.js
index cb1ea048e4adbc..3060d6de450049 100644
--- a/Libraries/ReactNative/AppContainer.js
+++ b/Libraries/ReactNative/AppContainer.js
@@ -27,6 +27,7 @@ type Props = {|
    * suppresses an error when upgrading Flow's support for React. To see the
    * error delete this comment and run Flow. */
   children?: React.Children,
+  fabric?: boolean,
   rootTag: number,
   WrapperComponent?: ?React.ComponentType<*>,
 |};
@@ -90,7 +91,8 @@ class AppContainer extends React.Component<Props, State> {
   render(): React.Node {
     let yellowBox = null;
     if (__DEV__) {
-      if (!global.__RCTProfileIsProfiling) {
+      if (!global.__RCTProfileIsProfiling && !this.props.fabric) {
+        // TODO: Fabric doesn't support YellowBox.
         const YellowBox = require('YellowBox');
         yellowBox = <YellowBox />;
       }
diff --git a/Libraries/ReactNative/FabricUIManager.js b/Libraries/ReactNative/FabricUIManager.js
index 641df41755fdc9..602b5459101b7d 100644
--- a/Libraries/ReactNative/FabricUIManager.js
+++ b/Libraries/ReactNative/FabricUIManager.js
@@ -10,53 +10,29 @@
  */
 'use strict';
 
-// TODO: fix the types
-type Node = number;
-type NodeSet = number;
+// TODO: type these properly.
+type Node = {};
+type NodeSet = Array<Node>;
 type NodeProps = {};
+type InstanceHandle = {};
 type Spec = {|
   +createNode: (
     reactTag: number,
     viewName: string,
     rootTag: number,
     props: NodeProps,
-    instanceHandle: number,
+    instanceHandle: InstanceHandle,
   ) => Node,
   +cloneNode: (node: Node) => Node,
   +cloneNodeWithNewChildren: (node: Node) => Node,
   +cloneNodeWithNewProps: (node: Node, newProps: NodeProps) => Node,
   +cloneNodeWithNewChildrenAndProps: (node: Node, newProps: NodeProps) => Node,
+  +createChildSet: (rootTag: number) => NodeSet,
   +appendChild: (parentNode: Node, child: Node) => Node,
   +appendChildToSet: (childSet: NodeSet, child: Node) => void,
   +completeRoot: (rootTag: number, childSet: NodeSet) => void,
 |};
 
-const NativeFabricUIManager: Spec = require('NativeModules').FabricUIManager;
-
-const FabricUIManager: Spec = {
-  createNode(
-    reactTag: number,
-    viewName: string,
-    rootTag: number,
-    props: NodeProps,
-    instanceHandle: number,
-  ): number {
-    return NativeFabricUIManager.createNode(
-      reactTag,
-      viewName,
-      rootTag,
-      props,
-      0, // TODO: instanceHandle is cannot be JSON serialized.
-    );
-  },
-  cloneNode: NativeFabricUIManager.cloneNode,
-  cloneNodeWithNewChildren: NativeFabricUIManager.cloneNodeWithNewChildren,
-  cloneNodeWithNewProps: NativeFabricUIManager.cloneNodeWithNewProps,
-  cloneNodeWithNewChildrenAndProps:
-    NativeFabricUIManager.cloneNodeWithNewChildrenAndProps,
-  appendChild: NativeFabricUIManager.appendChild,
-  appendChildToSet: NativeFabricUIManager.appendChildToSet,
-  completeRoot: NativeFabricUIManager.completeRoot,
-};
+const FabricUIManager: ?Spec = global.nativeFabricUIManager;
 
 module.exports = FabricUIManager;
diff --git a/Libraries/ReactNative/renderFabricSurface.js b/Libraries/ReactNative/renderFabricSurface.js
index f8acdd2c8dcb1f..841a079b1d0675 100644
--- a/Libraries/ReactNative/renderFabricSurface.js
+++ b/Libraries/ReactNative/renderFabricSurface.js
@@ -30,7 +30,10 @@ function renderFabricSurface<Props: Object>(
   invariant(rootTag, 'Expect to have a valid rootTag, instead got ', rootTag);
 
   let renderable = (
-    <AppContainer rootTag={rootTag} WrapperComponent={WrapperComponent}>
+    <AppContainer
+      fabric={true}
+      rootTag={rootTag}
+      WrapperComponent={WrapperComponent}>
       <RootComponent {...initialProps} rootTag={rootTag} />
     </AppContainer>
   );
diff --git a/Libraries/ReactNative/requireFabricComponent.js b/Libraries/ReactNative/requireFabricComponent.js
new file mode 100644
index 00000000000000..1544c6fdff976e
--- /dev/null
+++ b/Libraries/ReactNative/requireFabricComponent.js
@@ -0,0 +1,240 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule requireFabricComponent
+ * @flow
+ * @format
+ */
+'use strict';
+
+const Platform = require('Platform');
+const {
+  ReactNativeBridgeEventPlugin,
+  createReactNativeComponentClass,
+} = require('ReactFabricInternals');
+const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
+const UIManager = require('UIManager');
+
+const insetsDiffer = require('insetsDiffer');
+const matricesDiffer = require('matricesDiffer');
+const pointsDiffer = require('pointsDiffer');
+const processColor = require('processColor');
+const resolveAssetSource = require('resolveAssetSource');
+const sizesDiffer = require('sizesDiffer');
+const verifyPropTypes = require('verifyPropTypes');
+const invariant = require('fbjs/lib/invariant');
+const warning = require('fbjs/lib/warning');
+
+/**
+ * Used to create React components that directly wrap native component
+ * implementations.  Config information is extracted from data exported from the
+ * UIManager module.  You should also wrap the native component in a
+ * hand-written component with full propTypes definitions and other
+ * documentation - pass the hand-written component in as `componentInterface` to
+ * verify all the native props are documented via `propTypes`.
+ *
+ * If some native props shouldn't be exposed in the wrapper interface, you can
+ * pass null for `componentInterface` and call `verifyPropTypes` directly
+ * with `nativePropsToIgnore`;
+ *
+ * Common types are lined up with the appropriate prop differs with
+ * `TypeToDifferMap`.  Non-scalar types not in the map default to `deepDiffer`.
+ */
+import type {ComponentInterface} from 'verifyPropTypes';
+
+let hasAttachedDefaultEventTypes: boolean = false;
+
+function requireNativeComponent(
+  viewName: string,
+  componentInterface?: ?ComponentInterface,
+  extraConfig?: ?{nativeOnly?: Object},
+): React$ComponentType<any> | string {
+  function attachDefaultEventTypes(viewConfig: any) {
+    if (Platform.OS === 'android') {
+      // This is supported on Android platform only,
+      // as lazy view managers discovery is Android-specific.
+      if (UIManager.ViewManagerNames) {
+        // Lazy view managers enabled.
+        viewConfig = merge(viewConfig, UIManager.getDefaultEventTypes());
+      } else {
+        viewConfig.bubblingEventTypes = merge(
+          viewConfig.bubblingEventTypes,
+          UIManager.genericBubblingEventTypes,
+        );
+        viewConfig.directEventTypes = merge(
+          viewConfig.directEventTypes,
+          UIManager.genericDirectEventTypes,
+        );
+      }
+    }
+  }
+
+  function merge(destination: ?Object, source: ?Object): ?Object {
+    if (!source) {
+      return destination;
+    }
+    if (!destination) {
+      return source;
+    }
+
+    for (const key in source) {
+      if (!source.hasOwnProperty(key)) {
+        continue;
+      }
+
+      var sourceValue = source[key];
+      if (destination.hasOwnProperty(key)) {
+        const destinationValue = destination[key];
+        if (
+          typeof sourceValue === 'object' &&
+          typeof destinationValue === 'object'
+        ) {
+          sourceValue = merge(destinationValue, sourceValue);
+        }
+      }
+      destination[key] = sourceValue;
+    }
+    return destination;
+  }
+
+  // Don't load the ViewConfig from UIManager until it's needed for rendering.
+  // Lazy-loading this can help avoid Prepack deopts.
+  function getViewConfig() {
+    const viewConfig = UIManager[viewName];
+
+    invariant(
+      viewConfig != null && !viewConfig.NativeProps != null,
+      'Native component for "%s" does not exist',
+      viewName,
+    );
+
+    viewConfig.uiViewClassName = viewName;
+    viewConfig.validAttributes = {};
+
+    // ReactNative `View.propTypes` have been deprecated in favor of
+    // `ViewPropTypes`. In their place a temporary getter has been added with a
+    // deprecated warning message. Avoid triggering that warning here by using
+    // temporary workaround, __propTypesSecretDontUseThesePlease.
+    // TODO (bvaughn) Revert this particular change any time after April 1
+    if (componentInterface) {
+      viewConfig.propTypes =
+        typeof componentInterface.__propTypesSecretDontUseThesePlease ===
+        'object'
+          ? componentInterface.__propTypesSecretDontUseThesePlease
+          : componentInterface.propTypes;
+    } else {
+      viewConfig.propTypes = null;
+    }
+
+    let baseModuleName = viewConfig.baseModuleName;
+    let bubblingEventTypes = viewConfig.bubblingEventTypes;
+    let directEventTypes = viewConfig.directEventTypes;
+    let nativeProps = viewConfig.NativeProps;
+    while (baseModuleName) {
+      const baseModule = UIManager[baseModuleName];
+      if (!baseModule) {
+        warning(false, 'Base module "%s" does not exist', baseModuleName);
+        baseModuleName = null;
+      } else {
+        bubblingEventTypes = {
+          ...baseModule.bubblingEventTypes,
+          ...bubblingEventTypes,
+        };
+        directEventTypes = {
+          ...baseModule.directEventTypes,
+          ...directEventTypes,
+        };
+        nativeProps = {
+          ...baseModule.NativeProps,
+          ...nativeProps,
+        };
+        baseModuleName = baseModule.baseModuleName;
+      }
+    }
+
+    viewConfig.bubblingEventTypes = bubblingEventTypes;
+    viewConfig.directEventTypes = directEventTypes;
+
+    for (const key in nativeProps) {
+      let useAttribute = false;
+      const attribute = {};
+
+      const differ = TypeToDifferMap[nativeProps[key]];
+      if (differ) {
+        attribute.diff = differ;
+        useAttribute = true;
+      }
+
+      const processor = TypeToProcessorMap[nativeProps[key]];
+      if (processor) {
+        attribute.process = processor;
+        useAttribute = true;
+      }
+
+      viewConfig.validAttributes[key] = useAttribute ? attribute : true;
+    }
+
+    // Unfortunately, the current set up puts the style properties on the top
+    // level props object. We also need to add the nested form for API
+    // compatibility. This allows these props on both the top level and the
+    // nested style level. TODO: Move these to nested declarations on the
+    // native side.
+    viewConfig.validAttributes.style = ReactNativeStyleAttributes;
+
+    if (__DEV__) {
+      componentInterface &&
+        verifyPropTypes(
+          componentInterface,
+          viewConfig,
+          extraConfig && extraConfig.nativeOnly,
+        );
+    }
+
+    if (!hasAttachedDefaultEventTypes) {
+      attachDefaultEventTypes(viewConfig);
+      hasAttachedDefaultEventTypes = true;
+    }
+
+    // Register this view's event types with the ReactNative renderer.
+    // This enables view managers to be initialized lazily, improving perf,
+    // While also enabling 3rd party components to define custom event types.
+    ReactNativeBridgeEventPlugin.processEventTypes(viewConfig);
+
+    return viewConfig;
+  }
+
+  return createReactNativeComponentClass(viewName, getViewConfig);
+}
+
+const TypeToDifferMap = {
+  // iOS Types
+  CATransform3D: matricesDiffer,
+  CGPoint: pointsDiffer,
+  CGSize: sizesDiffer,
+  UIEdgeInsets: insetsDiffer,
+  // Android Types
+  // (not yet implemented)
+};
+
+function processColorArray(colors: ?Array<any>): ?Array<?number> {
+  return colors && colors.map(processColor);
+}
+
+const TypeToProcessorMap = {
+  // iOS Types
+  CGColor: processColor,
+  CGColorArray: processColorArray,
+  UIColor: processColor,
+  UIColorArray: processColorArray,
+  CGImage: resolveAssetSource,
+  UIImage: resolveAssetSource,
+  RCTImageSource: resolveAssetSource,
+  // Android Types
+  Color: processColor,
+  ColorArray: processColorArray,
+};
+
+module.exports = requireNativeComponent;
diff --git a/Libraries/Renderer/ReactFabric-dev.js b/Libraries/Renderer/ReactFabric-dev.js
index f3ef96ccd7f284..81114b8c8f49f1 100644
--- a/Libraries/Renderer/ReactFabric-dev.js
+++ b/Libraries/Renderer/ReactFabric-dev.js
@@ -2760,7 +2760,8 @@ var ReactNativeGlobalResponderHandler = {
 /**
  * Register the event emitter with the native bridge
  */
-RCTEventEmitter.register(ReactNativeEventEmitter);
+// TODO: This event emitter is interfering with the existing ReactNative renderer.
+// RCTEventEmitter.register(ReactNativeEventEmitter);
 
 /**
  * Inject module for resolving DOM hierarchy and plugin ordering.
diff --git a/Libraries/Renderer/ReactFabric-prod.js b/Libraries/Renderer/ReactFabric-prod.js
index d4d20d3ac85504..e25c7162a163f1 100644
--- a/Libraries/Renderer/ReactFabric-prod.js
+++ b/Libraries/Renderer/ReactFabric-prod.js
@@ -1140,7 +1140,8 @@ var ReactNativeEventEmitter = Object.freeze({
     }
   }
 });
-RCTEventEmitter.register(ReactNativeEventEmitter);
+// TODO: This event emitter is interfering with the existing ReactNative renderer.
+// RCTEventEmitter.register(ReactNativeEventEmitter);
 injection.injectEventPluginOrder([
   "ResponderEventPlugin",
   "ReactNativeBridgeEventPlugin"
diff --git a/Libraries/Renderer/shims/ReactFabricInternals.js b/Libraries/Renderer/shims/ReactFabricInternals.js
new file mode 100644
index 00000000000000..d360803412a14a
--- /dev/null
+++ b/Libraries/Renderer/shims/ReactFabricInternals.js
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule ReactFabricInternals
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactFabric');
+
+import type {NativeMethodsMixinType} from 'ReactNativeTypes';
+
+const {
+  NativeMethodsMixin,
+  ReactNativeBridgeEventPlugin,
+  createReactNativeComponentClass,
+} = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+module.exports = {
+  NativeMethodsMixin: ((NativeMethodsMixin: any): $Exact<
+    NativeMethodsMixinType,
+  >),
+  ReactNativeBridgeEventPlugin,
+  createReactNativeComponentClass,
+};
diff --git a/React/Fabric/RCTFabricUIManager.mm b/React/Fabric/RCTFabricUIManager.mm
index 88fb08e6025151..71d2198b8eb657 100644
--- a/React/Fabric/RCTFabricUIManager.mm
+++ b/React/Fabric/RCTFabricUIManager.mm
@@ -60,6 +60,11 @@ - (void)appendChild:(RCTShadowView *)parentNode
 - (void)appendChildToSet:(NSMutableArray<RCTShadowView *> *)childSet
                childNode:(RCTShadowView *)childNode
 {
+  if (!childNode) {
+    // TODO: until this class is fully implemented, we may get nil from JS.
+    return;
+  }
+
   [childSet addObject:childNode];
 }
 

From 1b63da753fa736ddb7fe8f7ede2416388a856622 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Fri, 23 Feb 2018 17:28:32 -0800
Subject: [PATCH 088/267] Implement Cloning for ART Views

Reviewed By: achen1

Differential Revision: D7058410

fbshipit-source-id: 394330654be1ab70853f78580c2543e04a3efb7c
---
 .../com/facebook/react/common/ArrayUtils.java | 11 +++++++
 .../react/uimanager/ReactShadowNodeImpl.java  |  1 +
 .../react/views/art/ARTGroupShadowNode.java   | 13 ++++++++
 .../react/views/art/ARTShapeShadowNode.java   | 30 +++++++++++++++----
 .../react/views/art/ARTTextShadowNode.java    | 13 ++++++++
 .../react/views/art/ARTVirtualNode.java       |  7 +++++
 6 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/common/ArrayUtils.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/ArrayUtils.java b/ReactAndroid/src/main/java/com/facebook/react/common/ArrayUtils.java
new file mode 100644
index 00000000000000..0036e9bac13abb
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/ArrayUtils.java
@@ -0,0 +1,11 @@
+package com.facebook.react.common;
+
+import java.util.Arrays;
+
+public class ArrayUtils {
+
+  public static float[] copyArray(float[] array) {
+    return array == null ? null : Arrays.copyOf(array, array.length);
+  }
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index c12f5fb9ff8a4d..59ab9b69ec3787 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -123,6 +123,7 @@ public ReactShadowNodeImpl(ReactShadowNodeImpl original) {
     }
   }
 
+  @Override
   public ReactShadowNodeImpl mutableCopy() {
     return new ReactShadowNodeImpl(this);
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java
index 780147294f1a44..35cf8169ca18fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTGroupShadowNode.java
@@ -7,6 +7,7 @@
 
 package com.facebook.react.views.art;
 
+import com.facebook.react.uimanager.ReactShadowNodeImpl;
 import javax.annotation.Nullable;
 
 import android.graphics.Canvas;
@@ -25,6 +26,13 @@ public class ARTGroupShadowNode extends ARTVirtualNode {
 
   protected @Nullable RectF mClipping;
 
+  public ARTGroupShadowNode() { }
+
+  public ARTGroupShadowNode(ARTGroupShadowNode node) {
+    super(node);
+    this.mClipping = new RectF(node.mClipping);
+  }
+
   @ReactProp(name = "clipping")
   public void setClipping(@Nullable ReadableArray clippingDims) {
     float[] clippingData = PropHelper.toFloatArray(clippingDims);
@@ -34,6 +42,11 @@ public void setClipping(@Nullable ReadableArray clippingDims) {
     }
   }
 
+  @Override
+  public ReactShadowNodeImpl mutableCopy() {
+    return new ARTGroupShadowNode(this);
+  }
+
   @Override
   public boolean isVirtual() {
     return true;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java
index dc8980ae2ebc06..e60ad880397b89 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java
@@ -7,22 +7,22 @@
 
 package com.facebook.react.views.art;
 
-import javax.annotation.Nullable;
-
 import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.DashPathEffect;
+import android.graphics.LinearGradient;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.RectF;
-import android.graphics.DashPathEffect;
-import android.graphics.LinearGradient;
 import android.graphics.Shader;
-import android.graphics.Color;
-
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import javax.annotation.Nullable;
+
+import static com.facebook.react.common.ArrayUtils.copyArray;
 
 /**
  * Shadow node for virtual ARTShape view
@@ -58,6 +58,24 @@ public class ARTShapeShadowNode extends ARTVirtualNode {
   private int mStrokeCap = CAP_ROUND;
   private int mStrokeJoin = JOIN_ROUND;
 
+  public ARTShapeShadowNode() { }
+
+  public ARTShapeShadowNode(ARTShapeShadowNode node) {
+    super(node);
+    mPath = new Path(node.mPath);
+    mStrokeColor = copyArray(node.mStrokeColor);
+    mBrushData = copyArray(node.mBrushData);
+    mStrokeDash = copyArray(node.mStrokeDash);
+    mStrokeWidth = node.mStrokeWidth;
+    mStrokeCap = node.mStrokeCap;
+    mStrokeJoin = node.mStrokeJoin;
+  }
+
+  @Override
+  public ARTShapeShadowNode mutableCopy() {
+    return new ARTShapeShadowNode(this);
+  }
+
   @ReactProp(name = "d")
   public void setShapePath(@Nullable ReadableArray shapePath) {
     float[] pathData = PropHelper.toFloatArray(shapePath);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java
index b10f59bff8d247..4a52e7a28a06c1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java
@@ -40,6 +40,19 @@ public class ARTTextShadowNode extends ARTShapeShadowNode {
   private @Nullable ReadableMap mFrame;
   private int mTextAlignment = TEXT_ALIGNMENT_LEFT;
 
+  public ARTTextShadowNode() { }
+
+  public ARTTextShadowNode(ARTTextShadowNode node) {
+    super(node);
+    mTextAlignment = node.mTextAlignment;
+    mFrame = node.mFrame; // copy reference as mFrame is already immutable
+  }
+
+  @Override
+  public ARTShapeShadowNode mutableCopy() {
+    return new ARTTextShadowNode(this);
+  }
+
   @ReactProp(name = "frame")
   public void setFrame(@Nullable ReadableMap frame) {
     mFrame = frame;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java
index 5cc9d49f65f984..158afd16eac943 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java
@@ -37,6 +37,13 @@ public ARTVirtualNode() {
     mScale = DisplayMetricsHolder.getWindowDisplayMetrics().density;
   }
 
+  protected ARTVirtualNode(ARTVirtualNode artVirtualNode) {
+    super(artVirtualNode);
+    mScale = artVirtualNode.mScale;
+    mOpacity = artVirtualNode.mOpacity;
+    mMatrix = new Matrix(artVirtualNode.mMatrix);
+  }
+
   @Override
   public boolean isVirtual() {
     return true;

From d8bb990abc226e778e2f32c2de3c6661c0aa64e5 Mon Sep 17 00:00:00 2001
From: Sasha Nikiforov <local@host>
Date: Fri, 23 Feb 2018 19:00:08 -0800
Subject: [PATCH 089/267] Update ReactAndroid build script to support gradle
 2.3.0

Summary:
We updated to Gradle 2.3.0 and our app's build failed. Our app doesn't provide "repositoryUrl" which is intended to be an optional gradle property. However, Gradle 2.3.0 blows up on findProperty('repositoryUrl') when "repositoryUrl" isn't provided:

````
* What went wrong:
A problem occurred configuring project ':ContextMenuAndroid'.
> Could not resolve all dependencies for configuration ':ContextMenuAndroid:_debugPublish'.
   > A problem occurred configuring project ':ReactAndroid'.
      > Could not get unknown property 'repositoryUrl' for project ':ReactAndroid' of type org.gradle.api.Project.
````

To fix this, we now use "project.hasProperty('repositoryUrl')" to safely detect the presence of the optional "repositoryUrl" property.

Since I cannot check it with your build environment, I've created a small demo to show that "project.hasProperty" properly detects the presence of the gradle property "repositoryUrl". I edited "getRepositoryUrl" to throw an exception if "repositoryUrl" is set:

````
def getRepositoryUrl() {
    if (project.hasProperty('repositoryUrl')) throw new GradleException(property('repositoryUrl'))

    return project.hasProperty('repositoryUrl') ? property('repositoryUrl') : 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
}
````
Then I ran gradle with "repositoryUrl" set like this (passing the property):
````
./gradlew -PrepositoryUrl=blah assembleDebug
````

As expected, it detected that "repositoryUrl" was set and threw an exception:
````
* What went wrong:
A problem occurred configuring project ':ContextMenuAndroid'.
> Could not resolve all dependencies for configuration ':ContextMenuAndroid:_debugPublish'.
   > A problem occurred configuring project ':ReactAndroid'.
      > blah
````

The same issue has been reported before - #14811, #14810

Minor changes in the Android build script
Closes https://github.com/facebook/react-native/pull/18075

Differential Revision: D7077788

Pulled By: hramos

fbshipit-source-id: ecfbab29d0632e7eecb3c6a247df39bc7616653e
---
 ReactAndroid/release.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ReactAndroid/release.gradle b/ReactAndroid/release.gradle
index 13cfbaf826ad3f..3e67beb0a3f270 100644
--- a/ReactAndroid/release.gradle
+++ b/ReactAndroid/release.gradle
@@ -12,15 +12,15 @@ def isReleaseBuild() {
 }
 
 def getRepositoryUrl() {
-    return hasProperty('repositoryUrl') ? property('repositoryUrl') : 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+    return project.hasProperty('repositoryUrl') ? property('repositoryUrl') : 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
 }
 
 def getRepositoryUsername() {
-    return hasProperty('repositoryUsername') ? property('repositoryUsername') : ''
+    return project.hasProperty('repositoryUsername') ? property('repositoryUsername') : ''
 }
 
 def getRepositoryPassword() {
-    return hasProperty('repositoryPassword') ? property('repositoryPassword') : ''
+    return project.hasProperty('repositoryPassword') ? property('repositoryPassword') : ''
 }
 
 def configureReactNativePom(def pom) {

From 0ee03178a023a6238510d4a80db7829edf575fca Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Fri, 23 Feb 2018 19:32:36 -0800
Subject: [PATCH 090/267] added C++ setup for FabricUIManager

Reviewed By: shergin

Differential Revision: D7077312

fbshipit-source-id: e284c151438eb4d1f67a8386580ab54e3dce7c17
---
 ReactCommon/fabric/BUCK                | 46 ++++++++++++++++++++++++++
 ReactCommon/fabric/FabricUIManager.cpp | 46 ++++++++++++++++++++++++++
 ReactCommon/fabric/FabricUIManager.h   | 34 +++++++++++++++++++
 ReactCommon/fabric/ShadowNode.cpp      | 15 +++++++++
 ReactCommon/fabric/ShadowNode.h        | 22 ++++++++++++
 5 files changed, 163 insertions(+)
 create mode 100644 ReactCommon/fabric/BUCK
 create mode 100644 ReactCommon/fabric/FabricUIManager.cpp
 create mode 100644 ReactCommon/fabric/FabricUIManager.h
 create mode 100644 ReactCommon/fabric/ShadowNode.cpp
 create mode 100644 ReactCommon/fabric/ShadowNode.h

diff --git a/ReactCommon/fabric/BUCK b/ReactCommon/fabric/BUCK
new file mode 100644
index 00000000000000..4fcbe82b5b40a9
--- /dev/null
+++ b/ReactCommon/fabric/BUCK
@@ -0,0 +1,46 @@
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "DEBUG_PREPROCESSOR_FLAGS")
+load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "rn_xplat_cxx_library", "APPLE_INSPECTOR_FLAGS")
+
+CXX_LIBRARY_COMPILER_FLAGS = [
+    "-std=c++14",
+    "-Wall",
+]
+
+APPLE_COMPILER_FLAGS = []
+
+if not IS_OSS_BUILD:
+    load("@xplat//configurations/buck/apple:flag_defs.bzl", "STATIC_LIBRARY_IOS_FLAGS", "flags")
+    APPLE_COMPILER_FLAGS = flags.get_flag_value(STATIC_LIBRARY_IOS_FLAGS, 'compiler_flags')
+
+rn_xplat_cxx_library(
+    name = "fabric",
+    srcs = glob(["**/*.cpp"]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "**/*.h"),
+        ],
+        prefix = "fabric",
+    ),
+    compiler_flags = CXX_LIBRARY_COMPILER_FLAGS + [
+        "-fexceptions",
+        "-frtti",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = DEBUG_PREPROCESSOR_FLAGS + APPLE_INSPECTOR_FLAGS,
+    force_static = True,
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        "xplat//fbsystrace:fbsystrace",
+        "xplat//folly:headers_only",
+        "xplat//folly:memory",
+        "xplat//folly:molly",
+        "xplat//third-party/glog:glog",
+    ],
+)
diff --git a/ReactCommon/fabric/FabricUIManager.cpp b/ReactCommon/fabric/FabricUIManager.cpp
new file mode 100644
index 00000000000000..c58fd859f141af
--- /dev/null
+++ b/ReactCommon/fabric/FabricUIManager.cpp
@@ -0,0 +1,46 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include "FabricUIManager.h"
+#include "ShadowNode.h"
+
+namespace facebook {
+namespace react {
+
+FabricUIManager::FabricUIManager() {}
+
+ShadowNodeRef FabricUIManager::createNode(int reactTag, std::string viewName, int rootTag, folly::dynamic props, void *instanceHandle) {
+  return std::make_shared<ShadowNode>(reactTag, viewName, rootTag, props, instanceHandle);
+}
+
+ShadowNodeRef FabricUIManager::cloneNode(const ShadowNodeRef &node) {
+  return nullptr;
+}
+
+ShadowNodeRef FabricUIManager::cloneNodeWithNewChildren(const ShadowNodeRef &node) {
+  return nullptr;
+}
+
+ShadowNodeRef FabricUIManager::cloneNodeWithNewProps(const ShadowNodeRef &node, folly::dynamic props) {
+  return nullptr;
+}
+
+ShadowNodeRef FabricUIManager::cloneNodeWithNewChildrenAndProps(const ShadowNodeRef &node, folly::dynamic newProps) {
+  return nullptr;
+}
+
+void FabricUIManager::appendChild(const ShadowNodeRef &parentNode, const ShadowNodeRef &childNode) {
+}
+
+ShadowNodeSetRef FabricUIManager::createChildSet(int rootTag) {
+  return nullptr;
+}
+
+void FabricUIManager::appendChildToSet(const ShadowNodeSetRef &childSet, const ShadowNodeRef &childNode) {
+}
+
+void FabricUIManager::completeRoot(int rootTag) {
+}
+
+}}
+
+
diff --git a/ReactCommon/fabric/FabricUIManager.h b/ReactCommon/fabric/FabricUIManager.h
new file mode 100644
index 00000000000000..118a713962a37a
--- /dev/null
+++ b/ReactCommon/fabric/FabricUIManager.h
@@ -0,0 +1,34 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#pragma once
+
+#include <folly/dynamic.h>
+#include <folly/FBVector.h>
+#include <memory>
+
+namespace facebook {
+namespace react {
+
+class ShadowNode;
+
+typedef std::shared_ptr<const ShadowNode> ShadowNodeRef;
+typedef folly::fbvector<const ShadowNodeRef> ShadowNodeSet;
+typedef std::shared_ptr<const ShadowNodeSet> ShadowNodeSetRef;
+
+class FabricUIManager {
+public:
+  FabricUIManager();
+
+  ShadowNodeRef createNode(int reactTag, std::string viewName, int rootTag, folly::dynamic props, void *instanceHandle);
+  ShadowNodeRef cloneNode(const ShadowNodeRef &node);
+  ShadowNodeRef cloneNodeWithNewChildren(const ShadowNodeRef &node);
+  ShadowNodeRef cloneNodeWithNewProps(const ShadowNodeRef &node, folly::dynamic props);
+  ShadowNodeRef cloneNodeWithNewChildrenAndProps(const ShadowNodeRef &node, folly::dynamic newProps);
+  void appendChild(const ShadowNodeRef &parentNode, const ShadowNodeRef &childNode);
+  ShadowNodeSetRef createChildSet(int rootTag);
+  void appendChildToSet(const ShadowNodeSetRef &childSet, const ShadowNodeRef &childNode);
+  void completeRoot(int rootTag);
+};
+
+}}
+
diff --git a/ReactCommon/fabric/ShadowNode.cpp b/ReactCommon/fabric/ShadowNode.cpp
new file mode 100644
index 00000000000000..39b4d145a798c6
--- /dev/null
+++ b/ReactCommon/fabric/ShadowNode.cpp
@@ -0,0 +1,15 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#include "ShadowNode.h"
+
+namespace facebook {
+namespace react {
+
+ShadowNode::ShadowNode(int reactTag, std::string viewName, int rootTag, folly::dynamic props, void *instanceHandle) :
+  reactTag_(reactTag),
+  viewName_(viewName),
+  rootTag_(rootTag),
+  props_(props),
+  instanceHandle_(instanceHandle) {}
+
+}}
diff --git a/ReactCommon/fabric/ShadowNode.h b/ReactCommon/fabric/ShadowNode.h
new file mode 100644
index 00000000000000..a707f7160970a9
--- /dev/null
+++ b/ReactCommon/fabric/ShadowNode.h
@@ -0,0 +1,22 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#pragma once
+
+#include <folly/dynamic.h>
+#include <memory>
+
+namespace facebook {
+namespace react {
+
+class ShadowNode {
+public:
+  int reactTag_;
+  std::string viewName_;
+  int rootTag_;
+  folly::dynamic props_;
+  void *instanceHandle_;
+
+  ShadowNode(int reactTag, std::string viewName, int rootTag, folly::dynamic props, void *instanceHandle);
+};
+
+}}

From 8a073c1d8b89305a9a2561a7c33740919730f408 Mon Sep 17 00:00:00 2001
From: Eric Rozell <erozell@outlook.com>
Date: Sat, 24 Feb 2018 00:59:22 -0800
Subject: [PATCH 091/267] Fix `onLayout` prop for TextInput on Android

Summary:
When the `autogrow` prop was removed from `TextInput` on Android, the `_onLayout` helper method was removed. This helper method implemented the hook required to make `autogrow` work, then dispatched the `onLayout` event to the handler in `this.props`. This change points passes the `onLayout` handler from `this.props` directly to the inner component.

<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

I was updating copied code in react-native-windows and noticed this bug.

Run jest tests.

N/A

<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
 [ANDROID][MINOR][BUGFIX] [TextInput] - Fix `onLayout` prop for TextInput on Android
Closes https://github.com/facebook/react-native/pull/18040

Differential Revision: D7078736

Pulled By: hramos

fbshipit-source-id: 798530729d7f0ee1ebb59f698af4d4b6ff43928b
---
 Libraries/Components/TextInput/TextInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index b9eb03bd67526e..3ce82932e17b33 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -880,7 +880,7 @@ const TextInput = createReactClass({
 
     return (
       <TouchableWithoutFeedback
-        onLayout={this._onLayout}
+        onLayout={props.onLayout}
         onPress={this._onPress}
         accessible={this.props.accessible}
         accessibilityLabel={this.props.accessibilityLabel}

From a534672e132136e7bbd17c94a7f4e67149bcc67a Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Sun, 25 Feb 2018 09:23:23 -0800
Subject: [PATCH 092/267] Fixed problem in Text measurent on iOS

Summary: See the comment it code.

Reviewed By: mmmulani

Differential Revision: D7074168

fbshipit-source-id: e6eda9a47552142ccb0ba8e7bd9a103b0cb4f9f9
---
 Libraries/Text/Text/RCTTextShadowView.m       |   7 +++++--
 .../testTabBarExample_1-iOS10@2x.png          | Bin 79650 -> 79631 bytes
 .../testTabBarExample_1-iOS11@2x.png          | Bin 79754 -> 79963 bytes
 .../testTabBarExample_1@2x.png                | Bin 79887 -> 79890 bytes
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Libraries/Text/Text/RCTTextShadowView.m b/Libraries/Text/Text/RCTTextShadowView.m
index 574454ac3bd512..1266f8afd74dd9 100644
--- a/Libraries/Text/Text/RCTTextShadowView.m
+++ b/Libraries/Text/Text/RCTTextShadowView.m
@@ -355,9 +355,12 @@ static YGSize RCTTextShadowViewMeasure(YGNodeRef node, float width, YGMeasureMod
     MIN(RCTCeilPixelValue(size.height), maximumSize.height)
   };
 
+  // Adding epsilon value illuminates problems with converting values from
+  // `double` to `float`, and then rounding them to pixel grid in Yoga.
+  CGFloat epsilon = 0.001;
   return (YGSize){
-    RCTYogaFloatFromCoreGraphicsFloat(size.width),
-    RCTYogaFloatFromCoreGraphicsFloat(size.height)
+    RCTYogaFloatFromCoreGraphicsFloat(size.width + epsilon),
+    RCTYogaFloatFromCoreGraphicsFloat(size.height + epsilon)
   };
 }
 
diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS10@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS10@2x.png
index 66c1403e18a001324f517b06350fe1414a6ae698..17e31df9f64946d2560f26e876b6a2ae4d53421b 100644
GIT binary patch
delta 10449
zcmeHt>sylP`Zn6wOqx2g8nZHWwPsDu%1PT}8d#atOr^HdasxKzE>bi@1jI*cl$jj0
zR#RpwWKF5LA#;O@fJJJig5?Gk1<4cz0Ttm95O{Is_j`}y{SV#`^Mw!3@f_Uuecsn~
zUe|S=&tv&#dGgP0M*_u5-kZL93xOPj{BY#ZxfHY6F%qRRlDKbf*}weRaL7;oJ2qLJ
zzPb0|h5vq0R(5>dS4VC=E(>2}7yHwpgBJf;f8?{ztp54WA5Y)9ahxbnItU57qdDCS
z<*YnoB2=hJ4F_jAoNl6#>6H}Lr}h^tgMjA}*J(#9WYyZ0pZ%+A#5-357k*gPA=79@
zkI%xPMY!4bz#ggB%$Uy4P1#ABH6BYUuvl~GMuxZFD)UDU0CdmV@8ibbU>TUDd8}LT
zk`Ux--z5wl^Y+-x;yGl&ob}NsC~{7t*?#d-1j%zWRW@(}nF}&gXqhN!6`hG~!y%E{
z)b&;1ha^r>=v0*lP~|HYNr58h;8aw6NZdil^$FIDLsiw$nZ@KW*Jf(kr<-@vUv?X-
zSs!1Di0(wgH&du@%;u(pSeFZ)_P{s_1(VQ+vV&m5bk+IYQ3GqgNH-sUhOP^g<-f+S
zN4}>)mRj|oE%Jbt$k&5UZ8yV16F&UPwhjubS${hXECjqrdW!P*V{e9znva_q7yCus
zw$6J&79mYn*x4N4xNxgUNYxKjI+`WaFnZ)w6dG;qRrEo~*AOW2$z=W&9rF2kLEd_Z
zLZ?^I<Kcu>uffCP=k3#K38TgJNQX7)jIL{ZcXUx@IXP&^OAy6$flMvC#kK!RnY`?3
z+ALr`?nmFrw|wLm!E1gTvJWyi%G9;>ZOxb|`P_N4K>G&^H&nbPoqpeu)iw31wK{TT
zX=k-VRFFA+@LuZ!+;3~rDQO*K6lm@=zhK{kN&e)DI1qYW@&jAt-I7`+?j5_{Gr;~9
zssE6$EI=0#mS?)O)zR=o5Af$aTOI<?GDKv0npeM1tvF4)B>DwrNI>LWhb;F>k$Xc8
zIklt^Dl5K>a8l7YIVE~{!p+GKFm7QB@{AQt(n7}PbFE|KeYi$VsXah=*-k;K*qv#P
z&AKG9VR_N8w44Wm-Lu_t(T;yYEYstUZ@4hh`T&wL>wsXahe(w(u5|!Db8h1?$9?@t
zYwR7jZD3BW$s3W2M`AZ?-i?vG&<vbBFL20n${V@!z!|dyYKNh%_r~a`RiiB1&JrYQ
zC$JYnbWM1>IXVUW?T45m>?Tm4q>Ij?g-Ij|S~u|o@(Qv_y75cM*b@D#OX0DrBFx8Q
zNesev`sU@9=y<FXpt|vEa^u2s5-G1`#yjgKS+^*9z+<E~E}bZ)p-&;s?IL{JAgrYv
z7{zj7cPGxJ9}rJ;*kI6nk-LspA~>eFFHPHb?qKtj&fY(F_f%YX6c?oxcELZNbD(&}
z%N78IYxG*mh`5LSiVF<R8DI#HCMY#b-Nl7P(_!UG;ELH?evt8Uqy8Dv20NChOVElG
z8*}lKEbC(o$+v9#T#w6*I*u35&v=tM7D4KJ!0d+Gn{NmYzhh?Bo5OPWa`pXvFRnr=
z#mjnaJH`LTj}|Xs&Pp*#d>Tw0@M*v-O+~|-)T$ZRa%$@I+fLAR{CvtogCMgsRc$Mz
zD*)yt1O%@;>kJFk-8`|iqudB9GJ7$I>%#E-4hO?NzoxxL<NELalwRM}z&&eBqfgX9
zE*vY<dnM3-QMnGY$?h4SL8<2?H^ZAtqSG^WuKw&G)DVAg<)-mwFUa{|jZx1P*?Vi=
z2fy8aNl3ej)gpCoj=2cw6H|p*GypzNrRfm#g%MpM(6s)a(yGW29!P9oH|Vsln)C~w
z7wtW$vxP7A`rK9GJXVd*PCft?mKa%p!pnnLGy_?h!Oqr?fzR@wj{owWdziodfMAik
z6zUP4o)P;OWjUEB>ybsP<qo?SQAX6OXT(aD<t}38Sqcx?Q^p3c%!GF~!a{gF!7h;j
zc}&#br1GB>FE*ohjma%W2h7L$<Yg=h<st8(B11x|YAjmu(^xH{ufd?6-<}8b2Y(4y
zy|~%nm6N>Ld2DER>p^ZhWV&6L^ZBY14i9Y7QU8hJxTu~BEK$np)RCl_YWnhr5+_dB
zB9h=U!$)g@wvm}sd8?5Cyiy5*r}(9m15KCn&Ot^M7yU=nqwPGK=*_t40It>YV64k2
zbAdlgS5@yA@->7?|M)oyMW&Hd_3AHmI2R7Ef%u-QX$~+^yNM)BG%B~wakUCs-*eC^
z9TZ{}pM33Aud~%i#_<vuO(9VbqpK^LgMbQweL{Chu8_l$pRV-LXWmiQ`#SR@iH)nm
z8ONW>8L0`sV%#j#^NF%b3@-=`oF#QJ)6~r!VRgrta%^Ens0n4$fp2C!wXO@OpLWkk
z)jarSYsnu5s6+gSbx#;gxNpB7V}vG9pbLy6Trz(8&|OMZ!g)090~4;805mSeJNC=j
z8zIvDIWkS2YHsPCebJwlh#hU4qDxptpdYlvJVm_c+td>Joy-wmKPu&2R1{nw6>IW;
zc*f<5n-0C24N6j*>XT8PQ-)j~SZ)(ehw`k_RWD|XX@XsAwyLfS;kL-4^TRwfX|N++
z>T9WsEToraSSvgP7#9}hTpquxUnE+aPVr7*b>apY_dA&Ldz0LSUKDj>XQBkiHXmPP
z3$oQ^0?9KQRoboW+zDwKu<_3%3@~B+s`bO_L929(?^#6~&!)5mY<2Y0(UAu*3o`uf
zPmE^*r>OV$`WJc9?Exbtf)fc^LLY@!afh#y0W0Z-C<rA9aD#>CXza(33qmTvvXr++
zkAu-(IOg(`boT!}>C6?!FaNb(Z;tV`LxFEhDh#xYEPz}nkxx;=c6Yj{5)`w9F-L>K
z{Q@ETKK?kCTuLM_V134J2HBR9RW%U}UVa3-c{Ez58f85@U5XWTQerhgnM3<jG5DBT
zZ%<uxx&~9c@juC-x$#?q<_87+l$$6L0#ZrJkjfIG-2L?%o21mntJnTP(|>Gl>L}1}
zG;;LCdkMA3%PVCG+n90j=Qdv0o$uE{x_*EOs~nkz&OBLorQz^VN2k>Bj1s|OlVH=+
zwCdNV^u%$sISKCsgfZS;9zhUUj@y18K-$IvAvD9ow{1wn>rZ@E^L$okhk%jTS4tO%
zyFP36Z;=5bzI^rJ+h<8WSYe#(B@6U59#~%D+xr=Q{DH8g+XSEZJU6M56?FyxX|FHq
zu|p@w(Ef^2zG$~jQJbulhNTHXT^D3kpNXi<daZ#kOnG|2RCe#3BvcFapnxuO4?Yk_
zSC&DqSA!smWO>96FBxc)1(?O0ZY>uxPO;vpGvWZd%Ub_Giix8n(p}qO;My76Xh<b1
zahZ)yd$Rq~!hCK>ydZg4{vZ{RKmSWUD@Hc(!4yLl6z@b2Q89s9H7^j3!PeyVxd5SP
z%5DXsea1C~LVsl<P~SfZls~q^{l-UW^^tcg^>Pt~Xucohrjg_)Cj^R~BKC$VqJzN2
zdY{Z!t{k2A6I!SqC8qF&#wyY;AzxNf=<~;dY)To5@lG7<A7(Gy(2Osisml+Cc=ap4
za-AE5rC^HG$@>|Q3mrOONq~MhYBh8tQPx)l4TbjWwy4$Z;4*VpYb$>BXRUETFQsw+
zRq(%Aom`!PCy(EunpWakkzp;SO1(+tbrH>2SSf1#LWtnr)HyC#VPDms<RoTn!gohj
z!3rwpot<h=R3&zA+Kd$&Y=)6KufcT4caY{om(tBvZwOzXp0Q(<dH7Ik$G*=xc-uCH
zuROf~yL)KE*EYeUl6sHbd(WC)OV6meyL02$Hh;hMHxhrx#NXNRH&6V{g@0Ft|3B*^
z@c-8Bl|C!sM2PTDaV5^*K;I7QsVQ>=M(sq21ZG;}^zU5jXeUBl6Q<f$O;Fz@jZ~bq
z^@>><J*3#I#?K<J&ZHGD%84#X9-7;F+T!(ffU{x4sX}9;wCV^igb`)-A}NzKP{?>*
ziha|C+!Kli)InKZ@lCig_Dx&3$LP`%S5lJy($d_Zi$2GpHf(fge}}VI0l$Zbhzqoe
zIxku>5ER9;XLUlj|M1A;q?!HEetz0pN+$CJN7Nx~in*{TJa1p@9Xh93=OS8qB!=t1
zVl6xD)C=qt4GF~T!7(P&Za05G%z92kc1r&N0qjFXE>AYpsw0GR5|OFV8;f6uU0SN`
za&r_IZ1Zq$&|kJ!{zum6&{T7B<cUdks7F-;V4)XDkv3oV!w{}(ol||Cba(E7>mH_V
ze62G<32a|32!lZ?<6e7GMnRp>Uw%rkGA<`ndGWbNPde)*`IWUV+k^)F7#58Os_5Ef
zth&3%zy@r~Oubh8(k-cvQT0xgp_3Pex(b$SQCa>>89>4=PehP>5KBd(>|-o+%3Q|h
zTZOtwf8fBZeu*_Qr)m6Ys3~ae%03@<Vp%DYH;Hz|If5tpY|3)XwN1jM{zNOlHdzJP
zaj~_*7={r+U06bu7a%ZrNh3Pe3caOW{Clqi!Po{$&V%YwYLQ0tWXgc$qJiBP4c0-3
zouIDXwlJ)(8gA^V=5iII()pZO>i=w5a)RmAbf!f)SV&rB&^RZ16my;C)X9ZAi(V)~
zl9voeTeSsMtbYu@&58W5xmy3~+jSk@OCv$ht0}-e^Kkdse&xScM&!GCd<_5Wq1@C-
zxr3m#X9NFAA5Fi|-uY0{^s=xiltHnB&<xF0G$9i#y}7dVw56<fj6z>8hu3op?a4=B
z&@vm$lX3faUds)>#G&hap>mffj<MH0X%ig}iDAu|+GyRJTnvj?I56&M;KApC_s2eg
zX%(le(&<we9-f6|3Mqwu{dM!h1jntm*|2%4J-IzvP2hh@QL)%Yy@gdCRF{qKcQwW>
z&9n)f(ozi2t=>vzJ{%|`{Vr+yR@J-EsTf9+`aBox+@0J!Rey-I&Iova(zW>JDT(O6
z)U;TSGzC<iFgmOR9F&S+LRf=;i;Cr98^?=mnnguhV}-bm05FR~4uma-K_9A)%$wAQ
zNz?kudNLL+OZ3{z(l0M+`gw3BSeS*Tq%9;!t$Eg}&^mltB<ym%fGt(vr`EZ+zim=~
zP*{VbDt?JmyC>M!VS8+L{&6SHJt?B;&fedOMSy{edzWAk!(pRK6BSuPA%>U0lhIDO
zNrT|mKYc2<h(qpMsF@u|8zc`nEt^Cu+k6UvlhA&e)HB9nBh}Qq8+k<|Nuj7@l|rj{
zNu@9nOhTID@^W;QBOr)P)h%+-*iE%&FS>)$pLd0lrR84>J!OBCObv4)-ggww1N7ds
zJErj;QxM-IkG}ha$8PhQ*cG2S<C~8X@H$qv+A<91*^@#KLZeD6&BFU#W*n6Nud<oM
z7{GBj#uZglqjy6`s>MP2glqc1NrE79u|936#@kDt_vdB4`;=8t{UG!e?_Qw7UMlk^
zE{-tFl!y6`0ZNri7q8?->oLKiGg}YF87;f}YzW|pMy{FmE*!n>onX}8r4)cH%d7};
z9c%j908e_W(MI*g(0q*yA0>*5QTY|QggGU-DS3HjqMj?w60I`MEBN}8UW#Nm(&OW8
z(H~e=h5oILGrD=IlnwXS>zYbW+rB#gT`{%{aCjDBP};HaW(iMF8+Nnt{M_aP**12o
zg}TQ8ncm)jRKn$&2j0%i#SAuyoMTy3TN(x(XZVDXabl>x-trE^$D(;=!vFJhHe#Wr
zGsn<EVM%lO_V>$+HS}J$u3cs?4x=0;6N{Uq${s{})eab;U{D9XG<zY~RMt}i$au3I
zmYF)Ze%@>Lgsy4ZEsXmWLQv)~g$0s@))c&s?6tg%N6qOSR|ROvD}sGi_3<>N6nUyT
zf7^jd@I-$uLEQnblPB_H>*oU8ca^&eb@Ha@g>CQfZkNW^1)_(0b3>rVWeJlSv7dPa
z!>(;7m7qzO&-X(MH@N{GGjHlCvEKAMdD|b<6ZT7v$`{$f-75~oR`;J{OE03=E%5ni
zu>D5-KX93Y%|WHFkHWkcI3ehQRO$_Xm>EMKsvF{z9*!E5;^y;NFXG~;#mmdbjA9Hs
zkEtS&c+w*hCx$vn76EgvP*>U5rE@e(H9i)FmRnWi2n?W+wtsr4Kpxo7X`y8dcW=61
zEFvK0W;-X#tWJYx$V=5U8_cjRPUL+`J`+bs(Vb##*w$OG+OC}M>e#&VVu+qf&I%|E
z6G_;7bqS)e_m=M%!ApNdwarcSyjQCT@@A!7+mv6VX{)CWgg94W4QRp#Vf9LG{GK_}
z7Xz4$uPDktJ(2I!zTq39%Lu8@|6PRr=t9CH!W<=tQ5>OWH(<Xt+N7pPO~PnOJq5EQ
z2;vOI=hO>&LRapSA?`|JnnY!SDai*B{(0qu8$woxl?ymkFYIUraq5;*F%sMt)Jv7#
zYj)9>1u-s{{p*57ts{JC1O_B~<P7&MqD!dJE2_{j<ge$t;-E)X^au>VjPI4q74P;7
z0~@VTR<^1nJBW=oU!&L_c&gdSshkb<R(3X(B5k(}mK+WU+elLmO?RyCmh6#Qvf}5a
ziUaA<Rj-9D;88xf(SJjlvLZx!xq(stHkYuQ2*<b&wkTsj;9%hGLdIr$^1^UuY|t-c
zY{cm;rHs~+Tn~3he3W$;=Y>;Nm5*H}4*U>!p@MV}mE)Y!(={b$w=l{{YouaH0JK`^
zw2eyok)LzTq7qkH+pPqr^rMTs`}=d&LnI4<i3P>c#e$$*&CN+q&MabfR+#C@^{ljq
zNOLOrmjHDevXJpx$R#}9%>?5~Naew_zvOhr`QDa3_~h+XBZIRERQ=+z^gouL%hh>a
zMMuXRg!1=P;TTRVLLC;q{Ih9Vymy@Ok>&{3=c=4<nS^fE-u>D<Cg#-#@m@zK3GV0Y
zgS@0aBncfoP-}G9T<9CT_sizPRcs(|MbEhivqw`cz~cjqA7op4&f3CaM3ctR48?=c
zYRmpwuI!5VEEJw?kQ^D44%z6u#YVYrWx}wNx{}1Qmm$ZjRJ}g7r~H1}2Z>K!fo!ad
z2TRQ!Y?@vGnF#RKV2OOPLTvBm8E?Vz>`xnD_Bf#n=Jx4!*BTMP)Sh5S8MFwoINIAB
zRCAB2Mg6-^Tw7}jxxzXbpfn#3aWa;5G8T}=PaT7TP0wHV&MG>h+$I7akOkD86!&$I
z{QZm-jUROLH=Zm6h{is}5Q?ri<&5?`!nvP5GocCnGSsBAe+O}Ed3^EbQn@dRgx~V!
z@kBk9M%o5Qw^XU?Rd7EN2?vtvDOBu7D%&LU{|MGq+~JkTccQ#QoLx5$vWpl-Nqd|&
zI(SC~A@&&yuGcIUzT*&5XpS`U^q5U8*W#-9tox4G4vIcyT28NbcFs-fIl;>XU-4u$
zYSl1lQ?&n+F)I%T2$Y@`8J+TuU>i!WR003GJ^arD1YEuz^fv(W7Zer_s(>V~er6BZ
zU}_!I(NRW5cWfObprcr?nE`@^%h|Ji?)!A~9YiN398EaqT(Re*5vpfsTVAIQlVQbw
z<s<=jUk?Uav}$)3$Pz{ik*qO8ordSbQaTCH`SsO#!A%w3Cx)2vCqOIoPl+v;X<iOx
z$B`lp@v&CBR7Y#N%!_So?Ktc8q4b}a@`V$mW|!FafXvqw!`?#-X4nVS?d1qiLxX35
z;Y-@OXWqtcgYINn3z<%v-ZjAESCmWNs#;o23?r_cE|Gc0k4bqpeWIshwHJgTik@ug
zy*A7P>-0h(jQw(VB_Uoac${2Ds+9gZrz$GNGe0hpf77%Kml2-gy@PD6X@o=3it`ne
zkgY8$KVY~o#_SPef%ralF#DKf2feyMkYjNB-jk(P?V|`fEVm+I>Q#Ig<)uEAINBXK
zYT4J9AK5LIUE?XFyS!<_TJjzoGoBGpN#1$}pbDxr4aa=0*xFmPMhbRSz#i93$69rT
z9_{#QgN11rDR-?KcFo2+{MWNzc)VCIm}N=V^k5!<hckyK8UXioPS3xkk=R?KU%W9&
zmShJc6CBHQr2g&a`Hg${&QIe#O5H=O(ixAMzJrie@4btFo>=W3F;U<qy$ZRC6dHgt
zYU5r;R%FzWn?KCC#ypWg|9vK@+<}fCO6+E{`}RFU?i6s)>IlYjnoYDbC~{OwMK<YD
zeb_M0ECJ8xBk**oYV4(C|0v^_UxoZ>RXALaBvv_2!Gv{wsM`EQ*OT1p*kQok0V4I?
zri$^=!xmLG+2-L2Cu1^B3bdWUTu=yP$*Inn4BVegLUL%q1w^p|6*WO5)uu$)=Vj!+
zbEM{D(dz5#^@QQM-uOnTXb8_@MH&j>Tx}nQr027)8w-hsp<S;kVU-tA$f;ceiIS4H
zGhGecn(r;sRV{4Ke(U%6S2N3Z{T^(_{tr(i;CnCtIvhr=k*g}f)FODl&w$C&)7Fht
zkX$`Z0z|daa;t1hJ?_$c-WJH<!<DF~yVn}yYaf7{Tk#H$@zXC&?y9cE{>4@GO3yaD
zce_pzX&yct7btO>banSYpSdk1>vx5{YFx2|OrrXLQ0K=(g-u0Lf&4JaMC5AVh*<z6
z6nqyYxaY&jIpio2Fnoj5s-!+e={`axRB@fpyKikP)3-}5b*pQ=bQ8N?%??3Zn!~vM
zPS3{PMg~u%uD58-Gk_=_2YByV#*chX<CL?nLPlpzrTh|ovl2cS@@NkVvr+2A$8{8f
z^%VWMPW8>*pni@nO&1Knj@3F!;*v*r{Ep-&2;0eeYL33ql<}l==r!B$Fmkb;-m8u=
z`6@~(?fX~~o?eV2)D?6!+C3A8J&R;EoP;bdztWw$j|3~7bnU$EFo4lm>KH|}<u6B5
zp6yaB47h%j22dYSKq9hh?ez$;o5@^vXf`i*r6!kwWkB#}RKtkr+%i9jg?)A|RHuq$
z`!I+<I!b!ZM<WwG2oFP4ipU$oi`ic5$2L@BargIAd`-=p+hfP|W8pjv&&q9t|EPO)
zYfts1;f>WaTh%+B+7Mj}z@C7$ss<lS8NuA1akwRoDR@`rIF&gW`8q^#tsfkTO;y%X
zf`KKkUh~$YtHwEouoyz!+q1Czg$CrP$NpeDHV!>g`{zk{g?*0|CZ?ATs4)-pu!ry-
z{Ddm`!q*U~4&yIc<emZ$-#&GeSofE*#7VEvznPitbhOv*IPB_R^(?R~vl7Gi1W^O3
zSf5UlR8CoizVxdpW#01x<W?3iEen+R{u|>SH1-9r(8wY4hD=Fq>LGxo9`wmU1T-rf
z@yls67?59K;J@|hF(pnhKxm7!c!UFRk8+btzF0wMyH?oZP~B5$0$>o=pY%|Y^IY8X
zSbixUu)Flz6MSwkAvcDxWwE8Nn${evsA!mOv)|qlH|5ltj0P?<GL$V{r;&V9$PBZr
ztlybjDb$MZLwjPaRHy!#!0sbP0WW_|x+-+cvtJPs=FK4^?E3L8KPOL{9Oexvh)dPC
ziF&*IQ+|)D0kLDWI#nO?U8u=s8%=&%ACr{IU_n*b?feqMkG`-wEZN0OmO9x^m6oFV
zG!3X3k#IK$CrO>e5j4d~V-=KGO$#og^6o`4-lGYxuUoYBv^=j1lSi%^-{PLi`Lt^w
zvcg5q!_i1xu8jk(Wzt<d(XAv_1KaR@65KT3qR^yfvkKO4X9#DcWwgQaf&ozwRIo$y
ze;X=>uYcGt_<>J#Pw<G#0O8)X9x9f5ypX%tk(_t7IGOQ9xw?Xh)CF)mub`-6$Y5|O
z&_HC`nZ1x<EIw#mzwZMue-v}0R)rUHILl#Wuu30y$bE&j505EZfGV~V_a$wly}r&@
z>~vm%EGT58WOM)%?v<yNdY}JYTEY+f(Uh^CRJ=T1pGgMrmPax>wN%56Q;gSiN6C4u
zY>_xC3>>Ctbl*VY=^uWMm>>jzx9WT{3-DGqleytUhQYG^sG#!t@LWJ`1@xCV;HxK`
z+UjuWk9GP2sx~;RB!0kd%EW{P&q)AZiIH6EM{bV=%&QGyq~@UMVt>M{jZOZ3iYcYL
z0=U3e57T^qVzm88@Tlj|5vmcxHFgW+LTSzWz2AGWo3SrBbjK@ccFiNOB$-sTxwe7Y
zl~ySZtp`i4mY#JFjB(eNQ3qV}qK!YbEzY2QA(eA5Vp&0dcIY#1w5$2J380vKmOTUo
z>*G3B1tt4aYv97!m6BMSAImUBIskE9ZXk5?5d$!ujQepw5vE`BN}Zo=g2)OEeEdZ2
zR}(_urBokD9SSKP>uMBurUDZ*OhqHse7wQ+kMo;n*-g)yc~PF{>RegPr>TR@ce-9)
zO^GQD3(8X6KFf$aPB`A^b}aK(yx(~R?v`xNeSPD}9fk0!X8Q_(5e2BX`)wQVr=+03
z3x39vL}s^Ur8T}T@h?CBODy!edKWwR2xUIR9Woeu^|EzD)P+M;PUi7w_x`m5-@A?m
zr9T{_L>j}O-SvZba!eJ&QIfUvJe%VzX^Ld@jodOJiL?cIiX(+S#qvc>ya}K_{zaBm
zoN&c~-#Fp})StJM3aB%f__n`LDF;_7h&~lI@I(NQ)nXash>$EkMr4{}{VEJoxG}4t
zTUYgN{YdBMpwDbrpfIVBS!rgLz;_>cSvZ-J4L*;*EWO37E|P4weLm@ZMt2_lL*ge_
ztg}FQBbrP6m-ZV>)0I4dlFB8ITJ2B(B{jvwCQ0U(s$(;y&ObR4$X*0%JH)pBK_A9s
ztiWnbJ7Q{Pf@ghQc1S_(I_V5Vry{r(6&kJ~v!FN;L6<0AF9t(bB7Si(a`-tH)qeha
z$^N_uL34~i!&9_=0+ad5^J1cqw_fNrTxbxOCg?}5b}KHa$vgdGckMg>KdjdN9<M?C
z@0W$Oi9S>Rsomi@W^QN9(|djgfvi5fVM@5yW=HSwq3yO;YBRFFTetSd#H@4(#IbVa
zTg2K+8J{-a?Zv;g+yQ|=jK+J+U%ssMBey>II?C`NSa02T&h!}agRkF_>cinT{trh@
BG710y

delta 10515
zcmeHt`(M)M`#;*Om8olGrUq{9{a)M5!#bG<aLZZiq_s*i6||<TNYM;L5MS0-ZZ>nh
zU6HAfwWa0(&!`AkEX{c!Lq$bEhf0EoiX7zlLHBt-9-qhePxwCO4?O(kzVGY0?(2SD
z&+B=;^5))oJonBo@c_l%_xp(|5a<igk*~fygSVL#W>aV5)A!FC!!ZxL3WuXE{Pgj*
z+?!?3-A?Q}^3ItvUw!%2d!Ob!zTt4@*9-8IU*_0tvUzU%?vLO6`uKxy0A&ln;wJPJ
z6`)Yv{(F*1Qk6f7J5pR+AZ=j>rpE9z;Rr3=f|~Dy__l-AY_$H=PV8L^;9t2Nh!evd
zT#EEF6P}$OhDVW-Pn8Ff+j^+b*+i#@-MfyzyLn@fZsWUINk-u--<l8C>}0DQIN>bf
z^ReJy-6%PmMtV!){A6GfhP4wwYY9&@=YF?7EGV;#lM6?-%unI@D$PSilc-gWCKs!6
zZ*ozh^FA=SrzBo<2jD$SgTO4~jN1Ks_6U;J*gkT%c!^^Z{f?H>N8#6yrg1|@R^2Nk
zAA#$dpK}R9U+UPu8I(sFQMp8p_DGBqeS!402%F?a6C-msH9N<~<|Jrr(P1cLD*JiB
zR>lR4%{+^!1hbN78EJaeOD)8|DDBTK4i+BWwDp%vivSR0)1jvI$5NUKKspVO@z?x4
zr|o-G+!(e&(OfO}W?z}+ql24dUxT81CL**WT7mSM)kskDlzZip$KwVy9faq4m|r)l
z%IWNMuXhkBW_oL<FoxJ%02*fOq8nxUloRT<7ovrx#eFs>eMfRU#NFJ-Yv1|8CYdh$
z#S6%Jy#R@ZpS!)b{h?gTO4e_C0BN?ECmiw&a%j>CP)72|)tFes###T>Q#&!gnzEEF
z9`nLlzWe$tDqh7xYi%Lw$I`wA+|q5TUv%>5r<}&%)@x<b*TUq%dz?_D>96F!%(Q}Z
zW7j^Wx;ziu2b=kbGw1>U&GI{9z(M_bc7%E$<-lcXFoj>YX54^OznOT0q4<wwDE5U2
zFA@YN{2bvi*CvuXh>q?WU<uh5Enb3Vty8LhTbP)p#^{Pua@oy)9hPK*S=v1bnU+bj
zPW!z9)obj*q`AEZvirhs$HptK+7H=|FVHea&Vwp}a74kN=MTX^&n6%QN=_D)+?bGi
zsA`H?wBn9_pAllSY1$o?iN0ASF-u-@>TJg|^NgwzyOsi%<j$R*TOhj0!^*lQ4N3jk
zcv_I^(~I8~VcpWiYQuyCGnz(LVhoZe^VTGXuA~#-_rd?3K6AM3q8DSkzNd8V8ccoT
zCtR~}45-g`Vrj(LA(Vy5iDo$KyXN`Zs0N>0pU(<d?+3oUl;<(mBClRJ;QRqs|7syb
zD8NnHTjI;K{fwE1R43<Os`bxrN>cVO?)T+M_bppOscUq-dDI%*GTSo6b@B)v$8t)z
z`s@j)AqdsxM~l%M<HFFT&~nvfn|V0gd<|$;-$FX1jp5|U9e0)6@1%FJ9Xs2WmO0Wp
z0auz;8Ua7dLZS_$$h-$_J!Y?WeB0Z1{p}TG#jD3QH58S$P!4>)_TGkX4Y0qsLw%)l
z%g?f}$mgrVGp{IA`S5R$nU;PD-*fyd{-JSnxinLjhh#`8aS<Q_Z!_Qli#Bm?cSr`1
z#ND8w08Hz&?DO9SQ$N`0lV;GCXERBPI`I4-Y~joSFVN7Y%N9qGT$!dP6d$@dgHxia
z>Wi!MlHR(;#-92=RuQaLk+l<+<-7@Uuxa7^EB~2xzVaFbX?dI7K@;L64jgxg0Uk)I
ziUHCUmNND^`(M;UyA`T+u&K|{PVW4WKNKpShupNz13!L!Aw%;msED<_-i$1%2Fpn6
zcINGI1qClmn{fKk$%T(YCW%P%i<ZtpBgC@Raa-&o*Y`j|9b+OkHe{_e*+8dl(E4!u
z{fdjGh+l9wd9Wc&Zy6^oI8Ek_M0Wz^d5W`tsBM4LENhupskk?CR@XI#OY)%YxVwkN
z4~;%Bfu)^~imIx$YbU%-TSV}h%$fytUgq%m_h5=2LvR7Pxa}Uo;XUo`L4QYJ`^vq1
z3yMDW`5yBrnyjj3zx>ZqD0%MTF&~I*Vk{jPbw4U5aD4b-Qr<cXpfuQ5Yln7={U!C1
ze@8`tg5G*S=#rLP+BO)lG!X*znHQ8&cdu=ul9U2;;C>$vB6Y-xKNN&^lBX&@)TD+{
zOuqUyr7FE7%f^Z-erCDoRrBNI(9bVDvTG+QTZkF`q0ITmrgE208>E_;Ws|b6;jH%Z
zpusk2@?<9lAeYRYsthsRx~pkP_YlMjc{VkO-@efzMC|qesa^Xqmbnqjhhu=#*~eHZ
z)2*Gw^usWvwD9_ItGA%Hx4ysb;QC$3Wf8`9`Ay2<+>+nS4;}p!x2EqzVO;Z0(==6D
zL)2urLBw+m{?;hk09WHY6{>m|h4|+YNs9Jc5Kt-I+awJh;z-EUw7&U!k~}a>t?_f%
zIj5B^gnFuTM7Rf{Cz|)>+d$BkJ_7fTfZ0Cr@!jc}=3>_^J*E=>G@IACfOhSGlQ~4S
z4)9Ek@c|8S>geJO-nQei!J7Jmqg<aBypaI?iqYS_SYjc()G^ik4=u*YIW1q%4GhGE
zuWjdUC%nc}u(YWKTKaNNxAy){=;fd=(>@<i7;F}b$&*zj$xbRu4=4}7l&A+bYZI&~
zW`(uYtF|V4^>;F+ZggTG4cyi}11RlFbCK14AtKCQinxTBBPW1rk?rqb8S|Y|w#ba6
z9ZFKt={wiNGIzH)G67YkUwKk?x=jrWq21D?K5h-j)+Ww+!<_Npe`X|lHpq%&yw!_M
z#l$|X)v-N)*<JHBsPbf*giCW%9f6Jonh<G+&4PNq=<)B6H^uSttewW*liKk?PC3#r
zpArZzW#;J8=*EO;46lqAXsM@OSuS($NGR5}aT@^_+7jd{R63b=M;b*=9IC*hF*5%1
z#*mdTwySXmc;wQ|+_6S-%x=mbUhKBa>6EAJPK(L7yS@Fl)nYr<5&!;=0OQ4j{VQfE
z%cYD)jvq`j5mPjXc~!<SX@!0Rg)n~9lL777=5n#q7-IY+_eq6I!EwYLJpl+j^GSsm
z@+Om>WZHk%p1stv(9LF<TNf@WMa^Bj7^V33JMDR_1-2kmuyF7f-Yt$+gjUqC<t>)I
z#>qfw9{cy-nC~SZK$WUzQvV^$o^r7vDz47FeZh!wRLf>?x=DfKxj>WJn@uyMCuChu
z_yV*AB*d@q7;DXK1^#o1t7d5D7-_~sw|6S6b>UW@+MKC4dA;mlIJ31G{28d%{(!oT
z-US~K(Ixa7$IUqnd%|_?^CKM5e#!u4W0pGb4zN^(Y5Moi9vH?<2bipAS`cGh^9cQ^
ze1sR&2Sm{p<Y(uL>MWyfO0%i>VscT?1i?@gsomY=3E=+^cvy;)ewBW?kPhF`yHYJ{
zeSqiZ5iM^kkYg{;-y{<TlbO^QA&>9qyw)dB>Ml{T5~YE1$vT|TEGGQeZ1-Hxk^>pb
z$$Ewpn2UC`sqscJ-+QVlKNuA_pxWd)KLo{Ni!?ZYCg@zJ;gy*NR@z+wo;Pb|rsdVH
zGShn~#ZTPj$oQ=5p;oeIt(=?IM!fg}8b1G)JPU18jfA@+EDy31-|ilaqP3x@(v9lC
zESHwQ1gAU8rG~-V5i<Y0dV~Y>ZucqT?&<|4r1l&1*ekc~aNoFC?BDG1!T&PPFCN&~
z_+A+w<;xoEed>Mf*KUi=x*qSEpAx*;2^qmlW}Ww5C8%pEF6K}8ZE-Z5FV@6wO?bXS
zTWfaZrvz<r?7r;Q2k(xzV&1mcSZw~p-YrgOWCf4a^J15EGn=*d<E<+<J7q+k;4EKm
zSz)_tHdfxrzk6bfqXLZ`B}YE6TREb=Zgr_o#iavCFY?M}S=R?Y&z}g`>{Lyv3N!4s
zuV2}1+qwJJrJJ4R<M%m8E2eg@?B-h&ke}ke#i@}tcnO&hw{`W5?%k_vS(Q&GG8&^-
zwzF9q(V2hu<YuR4O=EzfdsokmRg)uE*OCYK7SZl^uhQ{$**0qcwm7mPN=XGbBUdfn
z)xEk@SNHIiYVfM--==_90^qa~ynkZ%Pwf85yMNy7KX_*a<bP_#|2MS)_<!o`s#+2i
zB^Fo~e&VdOWdg#(YG0hvxnsS7b-8(bAlwP*Z$6hQkM`KU)X?eF2rmVvyqcd05$&GU
zz6ur(nF6N3>+YoLX5%n|A>Ik&a=P!s{T3k+O4g;;h#uOt_c@yhg;F_SybhIxasjY6
zOx4Xv^b;N!m@pfZ9@UnGDbC1F(zkey#5|filH(pI|3lK*BE+ljCG0~*INwn+4Ra~f
zQRKRyIO6TTmnc$v&`fvVa>voWiJf9*>;tVd$G#8TXXxp=cmOu(8jjFUiGQ9+gJNhc
z@<RHYW?AuI<QZ425Qg|X+5lvwR?o*FHyT#-l4Pw?d4>KHBg44-Zx<(wo^g1WY3=hM
zDK~YG-~A(o<>!3Xg<iE1AR6YGK1Hxw#r)vuID3ZK*q`krEi(2`aA*c@i@0896Pvhs
zXt@&#=s0-HqB&20y9F&2X70bJA0|VA;(NW8MUT0*)NXVPpk7wa75JN$`TYzuW<{#v
z!K0NHE_tI?n99Xh;a6G@n5M(xDl%&GwmTC0c-cPN4Rh95&AGER6;#u=!<K%aWkxk(
zRfpz0XvzCiFBUYUi489<J&}ACP{=%NSP=&BZepWueJbD>0R{bRKfJ(qmI7$way39*
z&`8l9uq2(;xrWoOvsKtM!^qDw1pS|ISaMHKaGGh3E?J~8jCBP_8fjSeFoI-`ilHjS
zDjN(F>H@NBKY>h%N$=Noc)k>1SSffzuu14$x}wpQ3llc(1ncxMEEXgTDc%F$R@hQ|
z{9*54aNBp+j2s$(<=p~2j@s0?;AH9l;YVvYDQw8_!kJ&5AnUYGwO2elngmN;?AFZa
z(@;3hlU$)?+Ky9NSn}Qv6zCOUu-vnOqs{C%-)zv?&<cre>aj-w1GxuBo%r9!GX<oJ
z%dwH#$K=$z^G%{lURT{JAfQpF3~RRqYm*d&yHeLhcUl1b;oyc}sRqS<FVF^*-1Kws
zHnultLsntyjp~o1vlrrOJI#Y*Jl*7%nC*FR0KAOhQiyFc9+ZoSMH+|eZS0$WlFIha
z<T8-+l_ijGp1F_*Lb|CW>6eV6p?;rCQS$Rkr5pL?w{J=)`Kg?<a7P!C`nFZVWham&
zVN@}2$c#kOx;6cNM!xPfF6RD<3NX<pz_`mquV;AAvf1)O^^{LC<qmAOJh&JsPw&o$
zG<GitwBeL+(%eS|Hcr>)N(Cpe<{p+%ZbxuwmD!a;M7*ggoHVPuQB>h$HYfAJY<F2)
zWqokUU&#Y7E|^Qa>)zd48TVvQ1|Z;3eTxh;;T!pu$(#wNw6V{}QsiEec+;XG4?;cv
zS`)v=qZ^?>DIyimG1Zor$ulD;2Ws&2j|GOb6@9KKrMDc~*_Z&g(1OVslAe}SG+Fr?
zW#Wu3po%-v`gA>ErJsXA-5GXetvypMl%op@UbyRJiXv#5GzJa^>=o<Mtz8m%<|#T8
z24O<HMPPDD;BhV^x*o>v2kFdk=C$UfLX@K)lGuBa`%|UMs~BwmO^&P5|H@N(0C#5D
zqm7^6K~*kBBmgNd^E%}8&&2iKPq^#L-S>U4dXu|b=5o3_Jaw&aWF<u2W)Bt)(_Z;{
zzmh2LS_H6VAIv}Jn+?fIXdv5Gwe*pw7RNHcjNzT`i-tL7nvoI-ob?@hm9LS;RO>Th
zHt|a+!$^2ves&;+O;TJPOmQMjpXT2QPH)pFTjTIbwnY#o=Jhd(xhuNjfhjO1QC!#E
z>0YfLNp9b4!A)Np2uXH6iUP}S%`{s8{6Y-^G&bwDe>aC9xYHV>vbLOJ^%(H5rK1U1
z51TXm80^l{i9X7v<ZdY9mB#puGecr1ky5|qmJN5AA$F}@lJK=zA5knl3x|LqtvE$c
zmD)WpXN>%g9Df&duB6dXopLo-t*k<HD14!$f+2&&s$`1X%6e-R{H0D{!_9TD<$lKO
zF$3$f9IVe}BK+ozl5MCKJ9z*+79+z#K+j`sQbw~tpMa8NIg@nuvKr4kGZE)DxMUHe
zaE<c@J~YW7+6s|{evF+Wa%0kRX^$(V?+-!a)b||}&Die;9LZFoX4^J-)hBm|Q@3x~
zv+;)vZ<0ly?xc|bt6<feapifXu=|wXRn+$7zKK6f2q^2lr^N}(6R(s>%e{EB`d^D1
zs<5=Mo4JI{Nrj(yZ)VkvaHtKFgftBIl^#qG%F`#vF#5$r+BUW&#A5n$qEl>^aOBt>
z*gS-RrKzRloi#*cZ}<X5n$(rtIANDh;MTSpu@|on0#4rB^Y+LSW1H%3g`#wQsNlr5
z?br`xh(Ghi`dcO5hB)qW=K@94luZ}ScbC}4M2UBJu&<4sl8nk|1h<35xSJJDv%}eh
ziG!Y7u}Z~c#b8DAK*d2hmj<LL@NO=oDSI@vf(|>cG>Uc276#53S$b;g$Kg-xvXC*$
zJfQ!O@ZwUxpILiSt2=Y#fK?rGP`9-P3^1GPH5by%yM9KsNoZ=@Si81SZa{{mn<~DP
z+bF7vUb)Q{>1{KyA9PMDqlZ*6DUj3Jci2|7;Aic0Bek<to33x$DMf1c!(Y?n_gZ(F
z9*|)`*^YB|^<a@UhlKObo#8D3KnV@CqSN?g{QDa(y70YX^IQnuWN!Vk!YbSXqph8Z
z=c4ds$_h~Ot6**>ruOn1_59ahmbxpiH^@YIx7N}5hV0Mg;?9KNrr3zmNVpFBy`Q{c
z6pD5>Coug+uZO4i%nOj>=$-YFs!*J;uuD}=tW79B%ve`<V{B;(IA9qF&n=DlkT8@R
zdb3Dln;r01C8+t{zFh$v!nP*Ivs)5`$D-n@AhuQeSlTI{q86um%~Qz7mCA|`VRIj$
ztPS#6qTip+H3`LiJGkOPH7TDOHM#dZsH{8cWjuj`B_LsQdH3Z9c*I%;uvHc$w?4N@
zzq+LC85bZ?y&JIp)77#|uMD+@c(Jg$g|P9GI^xUvFv9>xBx*_^6BX7NhMzisr?JIT
zdu1XWE-%wG+ZW(O-K^ib3NY@h_sikNCeBV#n>l1tut7xcd}7fFq+S__{D~6E;R8<B
zpogD1(uH`={4IZOXr=a}3eSOnE1k?NuLr<j>Vl>)HSdhDZ~*cqNHHHWjWCCM7^fGm
zo_$2gOo9heTNetnQ9EUbP8?pqvuF{2Y#=M*xC9+hWFBOmbPAep$G^|BNv=SjyLL-)
zh&eY=NbgH0v$e~u@CHY$4-(2w7NvOV21_&*nnXSR_7C(KWr5kUqqN`l3nnnJ)F!<(
z#LTJ67{q*35JVN4>V1>m++io!wey4ZaT4aDST~%_7r8xq@p_5d8R0F#J)n%ya*f2h
zpypRIXUovpt!e3t#8IPMZk>^329gpN@%bNKZGGoBgv+*ju3izi#>YG#rsHLZ23(oT
z!Ja^bA%j>}2YGXu8U-jN-{K!&m5~NBVW&ADLz`NP3um~cgJqC<4O3nFA`aR!VmR%W
zlrQGph!h^%v%K5|gtN+LE3?xCDe|903SU!nI}WC{&BqyM^0JjoxIr^9OlHR_@Jiwo
z3{9nGmZj+Tjxw|U8>3Q|e7v#yypL^x;|m@@PV2W=mMkuLYDCQ`r+xGgg<xsM=Y7#r
zHcD@~U3ADEgdLkvQjNg9;(+79rVACp_W9D!<>JIV*~NRex`OkO6#)E!kAPQNf3Le4
z{It}E``99`2AyMnTn`Sz3oCG=)cqFgJY$GsP}B{nPkE-P(dz|L(iYwR%U^(im6vDt
z4d#}>@wQR)X6v`I+zT#t0j`kGih2z!+{=vK-(8%r;cwc46``J3&ffI%Oc!{=zA!O*
zc<3~HByO?cV~eSa4))C?Lens!_-9-?{51crJpFopX@4I|6e7Tmweo4;k2%K}s9IK&
zsL+M)d0Xxa2GLusfOihijtwzG6(^k{`I{%?{^9D3mtD}2SM0*vR`@e5N&PyR;c`un
zXw<VpUqmUFT%fsIL8G2xsTG~^zd7>cm*v7)?u#}Rnu<})kSb#r2PI+#PxYxl%kTUf
zq|zhzFDh{@aw+z%GSE74@q;1hh)*KIH<!aPd@KKW@?m4P%65DQreF}#|3KStGt~Qu
z<lUcF_}y#g(WQH#Oot<2S=w)5K%(BF{$V<xhfwljDMes$S?@IX9|0#$;<{@d4rUi0
zCXL0|%vX41h;7LU(kBBB(#d$Vm0a$%&Q`2*^E@ds^<hwNq$P=r4FEN9l^LHJEQLTc
zXUCo^<WfrBx$Di$m_H|526AJdv(0z2vv(#QXI*G37B6)Y&SJoQK@)2jvwVtUmfVCG
ziL^<+%FHM74caB{izUi&3%fYNic`-s7Q;!^-~_0+Aq-uy!ehc|m-;O}ZXkK+XX@`l
zOt2-jqslf`39;bP<uAX%o&%I31unzmCNpxi^CG*qMV@>b3|H2|v(;`X&~;@L-kI#y
z!zlf=X%o;t|2nBzJ~2#SvqR0tDJYYy^&_*I$^f2HgPXqgMLVH~MqOHtV~Yr%TwSd5
zx(c%%1y$BKVnZ4b$pPA5^E)JA>)NZT<N960s$1q9Dy92?Atpsl$;;0slo6PX$0-p+
zb+TP{7dPC(xN(H|bz;Q14BvO!&+{UHtxvV_dQ0Ngddiw}n2<A0F+(MDiBz@i{lA$7
z^J%Ds{WWM8qxY!rNyc)z^k=)4xe*_p^Urc;roz`cOta3zaLl22#F9R(U+s@b_+pE-
zc>u7qD+w|F1A=V>C3C{Uw0NZ0Z#nZa500-7qmz=X9*Z!Qkd7;21|!(}{hm93x_eY@
z)cGnBym>pMdwf8dZ`p`ioLPnVQs{k}i46lkT{9lRuX(#sF!exPYn=u~R&<}!4)+C!
zD!C?Oc5oTS6?rO9E?1<gxA)@80Q$%!D#k;QOMw2$htd1<tWTc!E`E;|G&D6L47N|q
zvjSm&h0y&UTp3+Z(0Dki<!3=0VJQCmWU6&svNFwTHnyVFI(}Qmv|j!as_-R|hNpu~
zd+$Y(X^2h8Y=WJsl4gibcqDi`W@qj1PQyRIP7OM$A!k+NgBT#NEQBdM!W_RKT6h}F
z{tjP84=)d4w#b$|9ZSPg8D{p^zJ(bnoo((MwKsRw;~_z41E<Y>)@s%BP@?;<Goa?d
zm2#=plpvNzMV2diI%<hU7vahrvEk!w@E`eFew1q?r?RH)YrH(>j{baLE`}tNqypBN
zEiilqG`8yJbow*tH=@OEdFPX}pBJg`!~XV^>ECP6@32lP6Oq|7)F)lMN<ReVzeBXJ
zOz|YU;<ttn=5_rf-xxJ7_;GbmHQ@X;^vY26EU;LtLc#XJX(y}1lc%!PkXwa^7*-#V
z3xkyQV5K5L288|#>jM|Q%P+KqQTd0gDdbzhGxpP2{?*K+jZ)@&PegMi-f+`MPe`vd
zn~MSB%Xqs-k?izGcT&x$V1Go19zEp1j~KGvxI9Sae?om|us-3G)|W2Mso8W`y}ePh
zy`K>BHnKDZgXM|fiK5#+=kbC+p;-#iE5aHn5J`RlqYr|bt>nP%SL<wWDEUp426Naw
zL9ra+vr_Bm7ADu{eUQAR6<bE7w`LZ>n4guY!`@ZAw$D=g&R4#O{?IVm?d=-=xEer#
zQThxM@{=Mfr5a25eIF(@gT?k!6TJi_na4t*ciD=_n`{lvS)GYjPrlVOhQa`EH;Al3
z2G+_?(weLMNY(W7WnBKfcxFF__~M$~%c{0#4KZ_}YsTZa>3V#DtZs0#R^BGyOgWFq
zoCmN4^5l^bq&Obf>QA-unnrqvFl!KVs2p039f*<-^vLGra+-T^--fKHNY3LuS1|pj
zT^=L$`OlP5Tt*PTN2>t2aL=3RJ<GL1$(hm^pM%d#&uDzuKx*CSsN6rRai~j~Xc653
z4QpC$FPXO9?-B>R=|ff6)P$j|+;jjkRN?~aPBUF*2Ao+g{BO>*Dzt}S-qw)On;Jq|
zD&*}rh*|(V`-C4tullveJ`0Obj|ue-Q1zA{HvswS(#-EqFkdjhva@={5@}W(F+v?N
zd<2?ne)Gdc74f7try=BK0m1%z95<H4%CzrD5LI65pFde&;rC-Ad()G?`s!Hu(FW5)
znm#(FB#G}lz2kXh!Lw{Ypu)<o4q&`4v2Cl($m~}5Td#1!q_?BXYN)zTayLE92n8-M
zUmhhMXzXJk)T5cHoJ!ES(%O-g=hT{3*T(=~&U9`ag{CT0>h1MSwA-1L(&$EQ$(7R6
zJ`vyf=*zf+o_VFf#g~&an8TpTd1!iB!NBe4kGZHo+ws*NjO_wKL-V=dDmX5@y4K7b
z{F@{22o~hOKoPn`K>L8sd`7Gm&|X$h8G7d%3O|=#`z$GGdUAm>ph=B_?WBds8qi3T
zu)A3lkU>(>u}&|Un?Y&OA40dRW9;Og(T*O!m4lmt`^g5+`=v&1b#PKN$p5T?Tzy90
zc*$u!f2z#)6t`Rk4X-Wkc<kY_J|VyKtoFj70XV^ac?7U4(mP`mknS#JIpA{@Cbyzp
zvHt93=L@3_M-@kI=4sHzA?ua76-IInC7k=xO2m^eJ_8#EcX^J%vmT15p%$cHPva1Q
z@?90v+S2M)v^QBxJd-zi#~Mncla|l@sxYK@ZgM%v8X=w_#)_%pl^tD2LmJO+0OTTC
z7dELge$0`_BbRF}Rvu0Qpo33DuuF?5Cgoz(Edh4Iia%i$nbLHj{cz3|)2;!G$1`on
zY)k|)wUAY2W0TzJH2S!33a`>WOZrxx!>TTlc{x3s@<Fp@UZ38{>=JPTsiua4@UM_V
zQ_r9TDLW{!%_Vjy<RZfWTphIkP)2?e4*R3EUo|E~m(71u(gcxth1Vm#uIcX%N;kG%
zuZF%g;R?DW$~yo*_4#Epj~$ngR>Xg1-gUeh>$zIy5%(4PwBF{NP^dKJBTUR*xlxXa
zHMR&BG6o}&+LmSdG0ju9-^zC!M{lmqK5f>%urlMgdef0y`;DhI_6Gd-+r;`!M?e3l
z{!wV@dS{(wnD)IbDE5ON;><A;(3;#Igo}^rC$4YaywTpDehdTxvsb=mtbhJ}vRi!(
r?&zBJ8$lq8rOK)-)(2ABA8a|5^X5EfJ+B>P{W}sG_Eq)4*c<-?rrgJT

diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS11@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS11@2x.png
index 238678f04960a267e6749f202986581d96e861c6..c2a8c38ec4c2c7c462cff1eae9b556aa52994bb8 100644
GIT binary patch
literal 79963
zcmeFacT`hb*FL(b7F6`0q9R~9N6rx`f{1j~V^=^?Is~MNGyy|^K!SP@6$KTgL&QRn
z5_*6@f*?g&R7!vlLPrvk03itwlH7pjyzl${?mNc)^WOW7?HCZV$<A7P?zQH8=JU+8
z_G1gPbDKBr*$4o@<_qWlyaoW`kpLk3X1%oN$nA=P9?^?f(6w`?fWpqb)1o&U?wq#`
z0)U;rt^SBzxc2L;=-^(jKh3X;Ud2T}qJQhYihlk6^L6$AD9xmJy%qp41upz~@_LBa
z3^^LLa3l2i?25U6*wA*@3r|!2l#`RwIV+d{?aybAYu_Dso3ro9%}-CBytOHQuy5y|
z*CiF6NJ|xG9=Jcj4UA*<w`&vHJD2E;(|Sahv2tHTu&3u#8V{>Y)M4u?@y`i8=TSz^
zkz&%jR(}O<T6yR)wTYD9k@EME)=1#TP74g6T?a^P(yTL05);$(8BRe>Hm|)0B*fnU
zIqakV<F9t8UhuE~vK45J{~S4>H9%{K{0QhbL|*iN#az(Lzh`YUInuS{Sre*Hdlm1u
z!`pBf%`7^Bhi0IbbYV3&(mYR|dhR^j>tzbuonT&kc+Xba48AOvr4cc|@=O>p$!Dey
z37;fh&Nk+3>v9z=>UySgPC{OU&vsj8={vB?(ZQ&=DM1%mx6l^@C34k`ry9t3PqG~f
z&cr*WQI;tzCRdiHUjWT!dSg0OZwF~(4!Zoits(Aw;>=&Kd{N<JqXcsPNe>ON+4t)x
zFjC2JgwT`dWZ<n~t<f!IYQ2zmXeIUWLHE^D@o3fjgHm17LxCC#cECy_0cl)Idq1T-
zPr*V~?oZcrnWy4HryC9SPiLD{dxSNS1uGr_6^VcitTuyPB45B~Rx1l{6&LzD1<nmH
ziHMozLLj6Kibqu~+XmJCwr49KRTtstLjL8df%!R3eT7t=0)kWONUxbrHt*kXFA*{G
z4y(jH-{GSnb_c_n=les7Z7hw>`eVlEY`FOFi*hWnYEds}_qRw9cu;zwTCz=OlRr(g
z7Oxd6;?OLaVY~yHd}<;-E#pqKN#&P<4UvVFe6m(uUD#^C4vB~S!E<#GHivlkC+dmK
zvdu%=I}0LJ28Bc31?h{C$dpbbX}U`nH@lRpbQ(6{4oO!Jr(m-!mANhD&5)t&Y+(;Q
zyOc6Zo%WWG2&-nOm}F23`%586>fQRQc!8s?ClEf}pnNPsa8Nm^P|!4CNw!;VU^?hH
z29HQ}C2JV^g$?>5Vf2AsviRbFih#TD1(tR+g84+4j94J&WoxAIUQD;k8+wMdqgHwc
zx@?A&QIu+7Z#!Wn_Pv;x1#tJb`nn?$LE^)I#D&b70r`YPjdtqpdS>{yIZLC2J6)Og
zN5=fQ@aPo>gJ*KeA*kt;JhUC}-Hu8#0e9VH-E%<rj4uLS{o{dWff0lrvtuJFIFY1O
zQP=}4W?JKG_$@BV_=U%DSIlc!zFQ2QRhSrWl-;CRlqx3n^)+5~tF*`NBsqYBSSf|w
zZ!6|5=AA~E8@aqyRM+FqOiu`x{JV}KVTse@(PU)xFxj)hUoGQ$N!b421xKMz^++{s
zXLByF^vN2f)uZO8v6zTVGedH^vX~A6_Vh9hq3_5^mf6{y%+k`#!+S4LjN-&rT4+w?
zK|?0|A($B&{{3CHt8fIJEw2PcH_DwGSQ4!CD;v6*P`O9e)m`c|@C?vL@xSu2tW5-0
zyI2estjjxNHYXQRsEAvhHdhMX(>6t%5*Gy`AFX{r^*l^!)tI7@qr|d?+4p9O_s=^f
zKxx)wcl+o#++4XgQV55HjgInm%pNvXgFK3ud8*4_hU*S$){bYMQ=G5WABtx#Hg^$?
z;Ul9b*!a}LK<^%W&=N7r8(rlwx7a+v8Z<T;tMp`~p;gFpaa;75ZDK{S*9m9+OfV|}
zO9`Jg;@T*zD%Ei5T|bVl^=RUgs7EAmXCrmyYayT6g~6>froUl5%r+7{r_5y%Yi`cf
zDmy_Z7XBg$1^X%9@(yvlE=vD~=j`uVbecJ@jYJ>xb%1TdpwWnY`D=n6G@^XbNcRTd
zU?fWu@bj@0FHZ<nXI)}k>0Utfyn6KH#8{8(dfL$_=wfTOF`~umh%#a7{=ZGM)*&^(
zYB49Wd>IlEv1GyASP~|7otbhqIxMh(%1scGGtR8MmN704s!24Q$w`l=aQt@Dt?KNr
z0pX)4{z&H%vge&LuC&mO8wliM35ndBY!(+kKi)X)0Pm2684XbhOBhp8Xk7C^%+?1Y
zN0}foZ1&QYb-^ePQ$J9xn#!@MZZkoCyAGT3TSnKuS&%JU>Fu1ZS+W)KmhY3C>?Y+r
zanOKHzgWPAN#o56!+$Jv%As_7#>7nooGy9uExGnH11=cAChoBV21fU0Cxp|B!mI-g
zV&e*b>~?mJUmf7WLTjzm;l(gU)J2&{6a2_>W4t=`u{<3wZ}bCa5Jx91NJdrLmpaMc
z>CB9!wD+hzf#$$=c|k}E#p%RUEudHKIyIpU5}Y4^0Tyd`gAqh_?ShF?WoZ;!^2HVS
zFs%xi=i$%6?iP7LQ|rB(+O@u(>dAtMhZ4T1%t*%fM0Tk^Ma(~7YQ$O+I0Zx=Z3)ev
zA!WeYM?F=YdoC50q0zh$#<ai9UT)ULNOnjQr?0u%yC&lcy!Q{4EB;}V@gh&fd(<dr
z<+M<T9I7;FgNdQxfo=19Ags^A0loCF!HIcpIO7RQOu9nU3CAVusIzmzJzudRMndf*
zm3gH8g3${X$Md}9DRsMWJmW1ncz^ja-`bFxY4B+(36F0pG=XSnSVoIRI&Pxxoje}x
zS8O=(Le>^Olo2*%;<z_kfZ6jrQNlT@si#~+h;=$$yoDX8+XmrQsUrSwgWPep+k39O
zVK*V7*Ckt+3#;{=qlcXwZ|)2~7ZYamDL9At%i!IU)|e;d#6fJXXi}(FZNc(!VfU!P
zeQE$=Zfwfe!M<QgK_2NBpk*CC{oOGR<An@&Jny`ZBud{}DX-T_lx|v(tlJ2+j^LM^
zG0nxotx@l1?;~rcIxm%VJ66*QA7v~|Ay4$Eg+LQ;8;wDiPS9;Xn+OElUfjF0id<L!
z2-h}StaQml7nu_ZpKldK`=#fsE(9a3%c*oR9g6F%{p%9_Qmvwc!OTv8b|Tej49zg}
zi{410b9qS-QGS9+lji@?m+Gx{TmDc+&{bu5ifr}W(8UQ2#L=D@V`AI8ZbFauU=L4%
z$m8{9DqXTR*RsVq=P@y-qe{ZK&pCo>w%-BynkmH?e<b&bzq&CaIA(Bu+K(4*4>%wk
zoXD+JD}TmT!!bj+0!E3i`Tc%1pf?n)GEl?TJ7;b#h%vFv7ybdO?pUZ8i%UiXjLA3?
zN2vZoAu`m2=97N*@l2V`o7_Yp+Hpxau#tLyAM3tz=OA3dIo$)EPa&Z3h_GHVGyG9`
z*vYA|2z+pk#dWc~Q|1QUaz;aoPgNA>gXlHAuEPl^FZ;}#p?mKXjb}e5Uhy|#?2bVW
zT^B1FqAbcN^UoW|#Kf`hcd+dupgAm9J)c?2x;#x5cP95lEH$DWR~({-t8WB|{LF*!
z`m0<gtgdfd_yV^bkVxIMK2rS6KS9Vmtc4$})fUBsb6xP+j6(&Un~C;KH(I=+H$IR@
zu|{&8tUS7+MEBiY7q{7td}i>zGk<Ugq{c0b$BJ`Y8N8wh&<uOxoo~k#3a86`^<tV2
zSoIkRa9o=-H0O8-R;n%xTT`u2<8*|#&Kd!qDnkU*%VTQi+9B36SibL~k}^rupTZSb
z?R~Oz3)it_@2h)ZX~U0YYX}Qz@F8f}3LW8}&=$7zdM#SP0p;$ce&%%d7@ulY6IL^J
za`1{h%$G=Rp()u{Qdra}zM}SXPg7t!;OY3S`gsfXxn_{Ir-++q(%uJbj1=FuN<)bJ
z@?WBf+aO)o_>4H(-hFxZDtj@x3ad;D;{K*C>P7u>kwB5Q?uF#JtuY+VhX0kW7z|PC
zyxj3>^)%<gRdmt4yvBy?a^BY-3G6yPTebPqT=~VH6v@wS*eQeEST#9l4RCC%O)YSy
zfPMq?qW>m+!I<(Na)BLa4bU3SAo>Ea=uZp{B6BcL`G3sXCY6NA$e`xw$4E}J`gy-I
zg--0GX!9x5+~jn=rI{9Ha}c~;Sva{M;sg=PeY^cr)b*HY({E)nbc_TQc-R{rbh#8&
zk<?%x2XDHU!5GAkY>P#DYx{EiYO#6(hGgAl`9<AkO}_#>>n|Qf#05(*(-Dj5d0F}^
z^CIHBaB=jvu73Xz_QGEVEB91O?JJ9AGs0SL`dLTN^E}Eutm63bl$2FIRh@Hd32DB}
zdZ4Di<1p>coSri7Oy|fYlp%6pf%0JrWsuHI=*q$<BHQn_Q^*q@CPMg8{vfiN*TnX<
zgYlLTp23$;`~r6Mm!%;i8<|LN_1VmR#g2JF+Wez+=0xGbzyz)Fw6Rb`Mx|t|$Rh(w
zA^VS@JW<N}lv)SdL-Y~*SfjA!yHcMp##29jvd^ymEE2hp5<1Gt3NnLtEVP~zHaDTF
zK14^RU+J6wve|^!KiWIq%%5iZIM7~jO69v$j23bBRuxMm6D(&SqJW)X%sXhLk&XP}
zK7XZLS)>_MPRSG|3YsOdA%k}sMz76%L_?0(avlqfj3&%5$+1`>ISZD)uri&9Uu+zO
zQv|JvS<Pe)jJpE&`)Km8n^Kyn+V;M7xt&MB-dTCabTaC3`~<h<trEM9Ug6_V^uQtu
zv#_<urtX;#yWpzqxDr96gz%Vrv|;G#SwZJ_5Be6s`y2F3MBQc2zAkm*ye$_xa>ta_
z5`-O>)SY<zfoQ!ce|9Bip&y+A5#mC{Nhg_DkwC&&x=+iKN8Ap`4C&~xzCu_b;ZMxm
z9a?Bt!O)&Ij%9DzgYGg&lF3{%Cx2D;h#E7;jXiC6%4Ia17b!4BL2JzY$|ymdL$lU3
z-ah_$-H;~%-iyW1Vqssi@It!kPVbM+t%bY@9zO*L(M)vbrJo)k$V7?{XQ+S8fT8fD
z4X{<_UN_^c(ea!u&=1c!%}{S!=1GX{kX<hsZVay{RdiAHp4o@3zlEF?@h$_=o|G{S
z`8bKfG2{;&bfv9;Av;h8{Qkz5r-0W%KtvP?_pX@ZmC7ybMZC(OfUBF)q!5P~9SvdQ
z<yUA%x=Q}+xT!O;D^t^|^5Hj^>#LM)SK3#_GE4G@>*ngY*aTXDO`b{6sD!{vU+9}{
z4vo2DbZDxz4X5w8h=ZAD8#7)+E5g{GQ!ChBrzyIQc}VwYAzfbs#rw+3_C_y_T*o{t
z%&;Q!9j#N?rgO>;OZ3J$>Xf&UNH#$!1+Q>eZTM^)huX}aT6nBY(Rbu`v}L0NKT>j)
zAhs}DUo4zIjfC<V<pOcR-?Fo5i21QxMw32|oo%MF7s_m8GO9`j+xAR$&hCcsSkr^L
zctrK+r9?9m-WT&M)XFd~hP6DDm{A#W>m(_$Hv9;@998aFzK((&MP?CD{7=*A8u|#j
zpmrD{2sk>HVhMlh-BBoT6h<%_l>1I#f(5bsX#9|#pt@`EbF#nQ_%SO9=VUZ+W2(xK
zc=``x5o4a6;>lA?HCB3zkK#nvtn!G<of8nq-dcvb@h?+z`!4(ILufc-6#%y|BAa3?
zd?9<;8aXzft0Ze{9*do+m&wwGgbdnwvw2pYLXqkaI)`!WZKVkvmZKWo?RPMtQv{-9
zckQlKJ<!PUO*rd&jJ*6T^i#P)jS6Kh4(7MnMt<Np-^a)Xw`GSURgAkv$Ky%Dp;he(
z;cuj#SJ;A_W1%qq%ADd=(F>-jLAom61kG8;AxbUGj|_Mh_Ul2)D_og#)-f{7iLoO{
zC+jU50u0h<+;bqKjKYeQi%nhCpAwNX&k5+78P%?M#^O0|^LLE<c^1_S3u`kKAx|R9
zSL_bjJ4w4CtUp%YBz4OU={5Zo+f)Ie85>VFdCuZ^jT(JDXQeuOx(Ze2$XlR@UOsLD
zedEy}-Qu3#(qh~G;YHq%Yd|BOF@>COQ1&@ud2Zf6Gd(c_u*odn!VU<1#$G}Y#!e<V
z8JUv=WI2F#;iT_FU$m8p)$id0j(+gIj51W-OB>9a3hV1O{3RNiH@#4;Vlr8Tq67;f
zAf^s$ydn3l%ltcL1T3Kc`iP5S{sg*w3^Dv#gB&)<2~socj=xN;=RTwr+8f4{IK>qB
zZOBXXxz${t`aZaFe6UphUa`}Y(SHkfSEkYt1D%926uGT=XZt|GUg&SINtq1o^yR*D
zM>5uTnUy*n8gHfuheo-?2Q8{)y#@L^j#KAe5FPmGjoibF-4b6(gz`8#_j*gdy^%%;
z!NAXfbXwj-_(T}ix6l|TTxPKKUsRt#^Bs6Lam^ni@=iyM$>Nq@<=(#{6(2?}))zvf
z0{cDHZT5PS+v;XKH`i*1cN#IPPbfnVQLS3LG6a9+cJcza%c+fOwZ5{*I}@0!jdy(`
zjFc%s^BZEydxTV%_0WMGg-*d^#@%xAcEvgN{)wmpr^XK%JM4rJTqLge#4{N}7_pN`
z{Sa5d7pM%42pM~kWUp6I6J59V50fDL`TDcu+Y2cw0^)Vd^7RWRrpkzB?8<8W?t)4h
zXY{;4?FeG-nUJ&-P#x|;^p12fBc}Fy=d&48hDv`;PZ%-zH7Y=_+A`gORv6vXT~McC
zNOg*_XAMwplILrd;fbCQ%rWa0bla=y9sD!0)y(U^6}7q>)U2wD!F%$urzxi>$5*M_
z6TJKHQ~a<8R=I2PG7B1I6>W}V`P#>k>MCX}OsvI*lkgDXz|Ed4n)*xq@P%h+NBA;S
z{-)w#$sVado+6yzci%SM!|?}k$53_GZA|`+MSJeRtyR773cLNgemK=Jn%ObW%(XA>
z<;MogxJgy@u&!#@IYe*#Mk~}jJRVLjl~<3o6xz!J+|q|byL$^T(44nL46A{S-cb2l
z1#^wEONr&YB0qnsU;T2Ge)o=<YHTa5@OyBhgP1pYdchFkPbR1#3#N|Qt<PcEH@ZVJ
zpkYj-C1L{YL>@fgy>KTL*6U&q<ja@%MIZKQ;}ua@AzQN&3FgcxkscZ~ClZOv&z$FV
zV}}qeDJ13zk*r$bt2eWgH_=aQkjsE_4MZk`UJA$R;01o9>E+*l(0f*k1Uhm1ay?fn
z8fd5zKI0KOoH`cs4k?n3pu)n5S&O)XgOW8$2X92LimFY`2YP8QdZKPCZW*<z+u2Sn
z4q+eoMC-ICr*t#Ehm%;bw(zv&DqR!WA2F;O_rlo4j&yGKYeE(=Eze$&G$L}=6#H$e
z4i(tXG=|8<72~Whr}$KByj|Mo+rS`mPnc(4VK;3j?h0-2t^mdhBOkVlu6~VHf>cgd
z?pUE(@NV!b!fG;RE0(qMgbclBJH-(QK3hRq!47k{VxB$eni19#YV;i`6LY0{4oMSt
zu2sEAJ}ev|;sU2WWFFpHAc&Y*8+tue3j(-3Fr$~g5lXkf9MKS7PK}5Vis~I^_EYSQ
zhXNltr~z%wtSXB>*Hy_u*Qw7({5s}s`DvqVH@oHrh$P3?&_pZVKt){Jhzq&ElRiaz
zy+|vf|EB-(H8IogsJDr|vg+PmavGM8Sx$hcCG`{>Ys)TQS(=Y&EyThxiWsFC@|L_f
zDIa`xhV%DW{PJ8Vw+hain|>cX=sy*r5!!dv00ODa3t%4`D2U7xyMy=skv_621$KrO
zsNBn!9_e9`cuWnUaI~1dK>=zVWYCQ($UvBf*z=QnkleJhGGfrd9u!0Xd!4SIZ@h97
zkCbV{yOO7T<EXB$A5I7p@YX2nBn?ttb}4FgC|Qe!5?=NI&};8j(U7OapFPdV>cBCU
z9brU-0Sao{{lu}Bc9B;dCr)u%RhoupWL|{9F~L7VDc^UxQKN3cU#Le%Z}dz>6gp}`
z1WPeHnO%06Lj^pvk=KX9qy%$sjEZ%cPT|n)zFte_Oi{R98wx+S+uUv?#3<OGyyOM(
zCS(;JB#wzEn!n>`ToH*s0W>Rou+0_?dP3v!Pz7cz&vPfyMF(KOM9wbX^98Zs4BY}|
zOMEaw3ovJgG)@>LvqDR+VlL7-K~Uly?2fx^tMcV4(Rd+Eb2CH+p(is_%}O&2uSNGj
z%h?RJze^X>8{*IEr@KbQbJOQXPb-=CBXGul`zMyx6e}1<V?s#;MLrQ`V`zoR_|-~w
zTdt=c(T8NTzZ{t=?o4QNFNbR%H*#|!EwLh8idV(!x&rxIo7?7_!*;*aPlL8zut(yQ
zx*ejS=GSeEJ0=M5`qMfS!LYtj`MWFVSo{h+_Bs$wX@h(Z@Y`Z^(J??Bh1m(fWKvSa
zhk1}W8U+$$XWRirVOZ6B01{EwC=o044&7{|?K73F6larJS?ka`@1Lt$Q%wr!Bsa7j
zPe2_VLQts9VOIWY8lz$bL>CGSa&RRy@!|QfM6Mr(U@hEf#dTv-=w(!qkD6=~_7DeL
z$YWP%WgNJYZ2bZ?B}}*)X*V2(nxC$fU#@7#0xC%be367H_kmhOPoM{fD@)<7NK2ZE
z%@(QFT(L>OJE4oMqkW%MDoI?A^ZIz2{I)cF4>n>*L1|zIjI3yn<`P+yd1e8o&_I9^
zB8WmOWs_dH_5pHAIVXd4y*U?qAdz5CVD@hZXaUjC9MyNepQZ=9C`Bh2e|v|@n#pRN
zA|;{?Cal-nSY4S~NcHu$H7?-HjBMP}27&Nv?q9&#`#Rdx=t$Ptbs<)-(Vb24-APlD
zu+cbu9R}&m^z(&qB@_4=%?~tdtFwlX{xXph6?(b$@fxBu@r+)fJ-aO^YBcPuzk!da
zhQO(d)M?3dXI6C0MSQXlc>;{na6a};PNG)MX>v7Yx*mt{TVi)xX)N@n`|<4jLvEpU
ztzfPdD5LMn@caFuDx^Eue8}JxY$B_h1wSrTw^l2FM|NrFkU~EucIGzx<M=w8tK-<e
z{N7=g-dx=nOrGnFpwm$N%lwwn-Q_eK1!ooa%_ll6Ii17i6gw6Z$)R-bAQMj7S*%Qm
z1_tO|(i6Eo-?(0>x@A7Q<Ttv72By?6juW(cFRMjum-~v%sx>Rs+JuomhP574E(xZy
z-!ert9=3fR_~osyp;HAJn<3F*oRw-OFU6VYz3TS3clTeDccxpQEz37J)RImrQYXx)
z8{|`CG0W_sSqlx+wdk;WJw2X#3o|B9^06vOY9>{#U9U$fSY2xu8}{W<aNpf1M?5~`
z&NnA%_rIs^V1+EZoygg9E038`Od|BQZRyGM+b~Ec-==<eI^g1H!`R@DO^;i4GI$n;
zn}#X~rR~=Dc>{)PS9m=1WAinH(BAq;tX1P3@}=dU9^E%+V1X|x)X4CHMEBq`C%W?F
z9sQ%Ph!x==nC<Gq!TG5h76X}1h7n6}WBHXeMOXx^A9a&G==Fk2sKvek>?C#fN4A*~
zv@ck9@bIAM`uyj5l<M%)6IRp<zd}{59XAkTgoT2_Dj{Qo2Q&q;_~YD8Z?tN|74y$I
ziQze{8$$X-;iRZZ1QOolF7*b=G`477>a(X*o`_@Pq1H}3+tbWVG+6go3N`8@vE!|u
ziy!l;X7g2}vjs+H%bd1`k-dnQ$Yn$;(!zMm&LK{aj5AiJ#HlWnyp)5c>jFyC_$X<2
zOCVpTW+XSx`&?=-{U<ISDidNOB1GVzdAc`K&`T`|V3&PN>&@F&*5D_qU6FROPEd75
zipm_-%-*WQiHe?V?lQ)rQdG4z+ayy!KHkDT&NQ#ZxEpk1uXjr<kq|c)Ma7R-(b3kj
z&;2O0r9K5EY8mwgmu5kzERc^VOtjBI6Qw+Azxu<!-j!<P8|IazGlzhX!CFSe33KQW
z^&XFnC6Om~3{rP@Lo-C&N58VZ4>Alv5Ot?_XbV)ziuv>!{2DDMu{SrlX9Q~<9yAx=
z2n-TdA%N4{?9M-pf&%-m8mX5UU8<VIkO~g^8n-Ev)Xbm*>|fsxpqCN!)1nlopjI@m
zy&VPpoTZbJbrr-N=V^{M2^8pieg<E<PCxzN62<~<6D=y9SSrNy=AC|xhiXj!jCLdh
zVX0D-w;5EFoleec!v`<3J56r9q!p5^&Won$vJtzI90tn>TRa{0Wf?tGo0UN(Z((oZ
z2QM4@;bKd4vCL;c$XL{&U*VJo)i>TN9&Yb$+f`;SO{1~ZcfmtHeHV?N(meS`zRX8g
z@uli+wEJbX9o7*A>epqdr%F|lbS$A<e|WoDdR!RsC1>XyHd6$ePpy>|2KBMv!7`Ch
zC2GK_Hp0dHL>n(yb}zHgv$g`}XCn{Lj&Z8jAZEPC$eEMYnR#R_BF-u9s5ftbSF8l<
zaf&WUH#4%$G@5>gvmzKeMKnK|=rVZ(*o?rJEVOe~s*VUV9;}aCOR|I_;}m!<6~AM*
zGbVI;r+7wj>s-RvhQ2&*1z__DL$({@<ocES`9HQs2C+H!=#DWW^RR{j2S%;BIlA`8
z6E#ezW!~mQa%-jUW*nYNtGdcH18U~Py}Cz+uG2o+`zD+|g9Y+c*|!VfddjsUnd!lf
z`+6PC*f00f)kpM|cO0S~y@53{D^5SlY|e152)Bc(TGdMTQ7@%kugk@Rcw=nTg_k3S
zSnvud(LD`QE#G*Qe(?k6ef>GO0$w!b&0IBB^Usa9q4Ia&p_v{z9=0Pm@ouVML4Ykx
z^DbbY_+|$;=zcx7%DMHpwgnp$h^`*G422>2SIYFdr`3f+s|Ui)QT;RNB++G0Ws+~$
ze<<=3vv-<0nYJ1!!ZL!_3}Rw0%gRYKvlAGgn~4dOV7)$3j4Y$_J84#RRyS$PH$$O0
zPBH-))-=43FeOUg{a0L5OI>2I2t4&-h58Sg_(vzs8#_Tqxi$Ocb`|4U<E|h^D6w4j
zPkdFUHT_$VV6HI6Uc8sA6a1cFZM5y}P!eKEy|)U_I*-n*zZ5l4orf_jfFJlY$f^ln
zseV~#)JG?~C&VFtHAXi-=vlF*xJ;g3DYU0j>gVmaYu<l8RPPbN8+YR{buKo@sp1xy
zsV<Dc_bVvpRWo?F3c+#<Zh;;n$^@#NUDhP~$a|U+;?8|_I`42EZm1c#Rf(#uWi`-S
z&|Lq=C(ik4_huFRTmtlUEypf5{>kL;S}&@~dAQj@o9ca*^Tl{=9ne#s)tK^sd?I}O
zxU27g{?DqJi2v3I*p0QiCGe*FmjMWl4RCCTivB>q0eaE3wW>d(4j5B@mZ^f)0PzNh
zzNG&bV$q@8$c2CQ0sv9^YRUn^V-OyLiKHkS0E0dl^ueJ2&pZGLsQ*j_Kx=^35HYPF
zRSOc=|H&JI)&Q*mN<5(8^*_ZuP+R#=uK-#Dv<9d&J=_dxEB~27fYt!5A=+~WtZV`6
zeEvg!25FZ6^a`LgKx=@clc=5&q*?wmg#fJqS_34VK+*{$o!0iP1WQ=K64w7nAwXi`
zKS48S4bU1O%>pi`0vDI9?r;s(Z~VWLO4kXS5sGpE(4e_#j8MHjka)ky?3@qq@t;xo
zXtyTdsw}ATsJZg@n#dy2k<F$(|2*{UsD!lhOvCGMR%aRGW^1SqwRu;h^c(6w7&u8x
zLX$Is@@^t^|GgqIRZQY5a6RJZ*5;a9wVi<`V~5?o?&D^R&#OaWwm(wr7T5*Q3gB1(
zX9VaMK<@~~h&6}=M#@!m09paG0*D<!1TA_t6qrYd;sR)e)kkE3RsgL4@(cfKSeDIJ
zlsy2TG=AaFlh;As31r_u4ssXB#IA1B2U-EN0;o-Z@(3srfl?VL7=p4XC?129I9Nyk
zmQ#QP;MyzzX;6>`1!>U#H8dzleS*{{NPU8&-`XM?kop9vPmuZqsZWsl{NF@<?gaoq
zC~W)s*y^9X?`QgsZUgpjmHfo|Ggf`@bf&9*hy+rxUCR?qW6AzpGbh>_KK5R~OlL89
zpkVh}aBv=0*c$0%S_}Mqa8;dYdnE8wad5tL<?l00fsLklacj%-#iVaaOFGXCTcQ57
zibLE2u={sW-9Er|9cDTIA7`^QQvB<GEawp0Wl-7U$zFT>m1bQeuszaBSwupumZ*N-
zw7#zIQ-Sfn8j^eilr8_=gMA*RK+_gKw(UO+?E|FV{Hq5?CB!v@@8l8wX-G`$cc9>(
z9z5E;HM01DeZ;>ST5l?L>z^L{eW}#ae;NWWb+tlNbU(nm`g7=k19)|Ef^!vgOP~i{
zbBtiH`RN$JxcbvEf)D}(h9Fw{`zf~|S_07$n8fXJ2J_Xw(?}34foKUNTz=AQAh!f^
zOCUKa;-8bmKpuD%CxVpsPsa$NB@iuvn$6!j7>JfYv;^v_t9$i;Qu5k^+(EPi76^c~
z5NkCenqb+-Y8|5}K!O!6Kb-=ImO!)wq9qV5{Zsk}a!X)2r8J0^K(qwb1Fvp)1eQLp
zx<jx;3oOwBOSHfeEpYJ(C^~{mibN3+q|rbc4O|lk0>ghTY62H^{>+#`(ebBa1Zgyo
zMgwWIpAysmpU~1ao!aDo_5xU|DFc_-|4n^>oG{1<gPbtP34=R->~aPdqWoQN4Q_G*
zZgK){NCYlK`Dgbha3Kn~5Ctr){G0j!ODn<BO0cvNEUg4fE5Y6G{v{NFG#W^wfixOO
zqk%LUNTdC0|7DOy18FpnM*IIfjfSq}MaF+L<eu1ad&W`D|K>u|FVD`pUI=tuXi8GG
z?{l)L-u|L`-<gzSVpmPyOBUbTe8zO!RnsSZ-cNT#{eJtv#sk4;B+rc3GFj@LdfEo1
z2HJ3s;D=Kf6rrS{Jz3kclNUi)GReLPNbITu#GV7^d!ofQIj_Ep)RK@ib>D2(bM9Y<
zzz_U14QL0@4&b~1{R8MH!FU12O%NV{FbRZ<AZ!LvF^GymR1Bix|6ifvXDNKnpA8zU
zHU2|dGg55RkE366Y={2OW2V5bfF-bYX@Iomn|46V!uEkBc{-PI%X?tYDhQN*yL%t-
z3y{0K`X#F$wD5=oa`HdDyCH69{`%3+V_#h(f%Cw7YJ=!YRzGH%EGGV@L^`{=%aZ)9
zw@hd4=%3oFtzBcg{N1U)TRWF08Io~$+ge+iZ<_zRyM<<FSHCOp@?Pt~BT*0jOKWjf
z8)gk}9QeBjabn`m5>j<$^0CL{IvLIxyrtcfUHmQDBn76+ae73gZN%c-WUS?rD-%+u
zbDH+#_}TyrW0|@_dR8j!kh;#Low%D$@X&((%8^T@(=;^?QU#r1t<)AYpR(y-L$I$&
zI_?}rbh*KB3CTKXQ{$Dii!9WGxZq5}vD<F-NZ2vInNuULv`I4@V1qr@yzgRS#mtb)
z!(=1Y?oz=6!j-os^G>^?pQ<|I<hxEnJ^|AAkC_6O1Ax8DQ%)YV3|{y8h>`sk0%1Qc
zIweEip>yN!jlSF6*10<5+B-w6LbF3TxjG)rv5Jo;aeJ8Y0bfq=NC905x!#v1by#~O
zzUYd+%%$?jbLa=#pdZNQ?Sfx{)`YrLGqiJKeEsp8nei)8W?xy0qgJ{}&DQxPpU`I!
zGBX=?bI0QHkEh#F&LiKOh`2Lsl*ou1_si;|<N8aiee8ubYWHJe4Um|~oeLLHbM8(S
zm(HeMsR?`0ztYiLci+kJ;7dZvF~6e`T2XBsZj~-+M@%#|zikC9EBB>_SQ(VQyE>MH
z0WPk0K+II-`&{cgdt|$oYvb3qw@Peri{;hxcHf;Kg0B}3c10$(&z>^)X0|KGD-uYm
zzq8+y-y{dP+vpwKRjD(gWxmiEf85=&BToaLSawIA_GqGgq+-Hy8uf?6!|zNs2R>lD
zSfK)B-5KfOt=yYzi`eocROXF?QWg=Sx8bi?<?v=gcj(~}|Bh6Jn;o~VM#pQ1YaGUR
zrcWzC-|TV<;T3HDt8TmcY3&}ht`4muiknxjVD@7Rws$bxPFr4_Ht@^h>&;JG1%1f{
zGJp7>?#{fq+*P<EdM0r5?KVi>=pTjt<wsI}Io+NYv9<q~7RIn6{V&@|DQT?+K&(hi
zys5~9Tb3B2_bWA_j>#D$Ik0%Kf8nKXDeQEZ#tv_sPclIo5S5rW;WuJ8EX2h(PtzV%
zWcq4axJLqg!2Wk<x;8Lkm4}jXBS@lh$gAmYx9zI0R?prvT^0DeG~&U^945$OY+`13
zp=`|GTdC{pu0GMJyG&blv9tZocFrmWn8|kWR!*wdTxf}rEU1b=P<Iz}VBmBGsLb$G
zFwOaGv*61jY5b{930Cj>6l+j@r9GxSNj@+g|3-s7>d$*4K0Mh$2}rL460!vqBLRn(
za~!S5+m`EjR~kLf@}8!5jb^C~Xc{VC$L|BAi|WGWawumv1(m2;GnlIP7-M`{UC2yO
zQGZ3V)3)f%l#P|0eo{5`?qB40dahKo4@LxLBqQsiJf@K-&x{kxvXfEo%(VUY2D}ZO
z`s&*8Py%rq*T;1}h*D|ZiG#NsRhN{G`fIMJ&g;BH;ESm@$Q6o8OMr=s#!kAjZrrrN
zwD+)`rQc~t=!m4H)3G5zZPP3H>%NuGr!4iz43^K2pe_ry>;^OQ<kW<_>px)8F5=FB
z*ev@XLeVluMmF@zvhd?UGtC`WEJ^n)tBQt8gDFziLP)K2^2>l|S>crAZou7v4-X`r
z5UxxF=(C9**{5u$Pgs8UO8R40ck}o&+U*oG#;y6n+Rx*048JGv&Bs0zoMR3i{=F+B
zA9|rDr0r4@$!oXYMta$J9PMWIhxjk4eP6aeEj)HcOU-wtZ2Pa?d%oxTUNcdXtOLZ~
z_(WZ@O1k7$V=f%ce`V!=WZ04tP~IL?CF`$+SYc`Wm^0xn>{*5YZ8wk#b0;F*pOWhj
zeM09@fUbqf;6vU4xG#vZuWkh`=;eq$L4?~>5UcgFK*#a&g=p2mo%L?*!g;Oa1VPsH
zLd@mf@23pZq_A0yW|o{M;<^$2+=P^sIW4t=>+g$kRYg|PzDqx8Vx9*q4$mQ7rM8=5
z54mPGpKyh|fHE~3{P>qTHzWA;t#^S}UW}mt>4@jXNmkMq)%SP>`ulm8C>=f~uil|;
zd;E@$?e$xM3@?vBk8({t7)G=I_@a*O;ger+9>PgO8;_0AY^{zNzne(Zg_UBTFWBB!
z70R|dR(6tr>On+?<hQ8flAQ%bUEjaE5&Zm0CSRu<lD+i%E3YrwRoukX``e7@j1h0~
zl!U&-Gmnv!1;Hj!$7OP#@swX!iQSp}BkJyRU;qlEFC@>`j^FI~vOGt4;1=GLW`N3+
z{l2cNK5{R_I`E5Tymoe#*Ubj2_zzNtriKFJkx*;P>v}D(%J;ao&h%E6loV%mKm1%T
z;9q8Ra}L1+a%CV(uGoREJ1zsSX05tCBfnIjP--K7$>}>4mgk%9>Yg!rnDjlt^>P*Y
zqHXWYZG~UZno$zGltCIPc_#Xz!#>{<L&CWE%uH4fB|0?C=IgJbdG!3HoaQh6H&XMt
z4zRO%Wj3>4|B$1-YR7zBst`q#_!k|6C-|%ryOrlhsx^K*5IbVer+*&%oS^axHIP|6
z;-9=3d1?NNB|O~m0_kdxO8B2C=!r&7WliDf!MTtR$Df|rb7*L)wH19llz6worLfQU
zUc1vZpZS?W#|;rTJoldyAlyHU`C2IYU@Qih&KSw#w%3M(&EYEfpA8f@;k}LJ012D(
zUmOiy?wI^#w+3u$zf@XhMl$QIH+K3<i+j)50yYPsHN1{IU@q&{IE}JW^30lgcw2Wv
zV3lrp!A7$fnaiJYTJ0V{7Vn<bSFp*5FTL9k{cITtpK-a+JaPzjRw2H2(2reezpr$r
z(4)Uv#dF`e2uNRb)#r>&FC)&$D7euX-dK3GbDcZm$fOO0a7Tx?MND&(?Sb>-*EAkW
zmb=w@F6zBL3j6pcPJ@}-{~}4{Q)j#=)Nei!8x`A0amqwXa`9gA3EyNTY;en@C(XrN
z?G3l361jx~(A%fu(`@aX9E4+2Zd@Nrc+;H=&8qp#kFLva%VQjR&vY_6Y%LgB2iv6U
z9N^!hXNI0_SAX}c8IJpm)8IM5)86up^@0vx_L9M}x4Ld1NQeeuNCl(H+)k?Q(-ix{
zF3I#iI8sMgheKJnztmgbzjSk3)3`r&y~euv?(b3P@Bi+RUjIajQCG%gm($jrX@Lp}
z_xoSlYktiB67jyzt$&|YHwM`qujNK8bg(-cY=D)!xbt;VO&+#S`$cna9%TELAD$&M
ze$Gp3dt0gtjU(;@yXwTLv|8EAc|ad`MT|{#W{Wk#T_L90=(mJCqLY)t`Smf!e-YNi
z9lsobf-JS#ExQ11)=2xg6Je+gDBZ^N=#>0*Gs)#`8?Su&dP$=A_h#~rr!!uJU)6(~
zw|kgeA3x>f)p*08*&ilLD!AY17@d-aonhEv^Q>Zx+LKA`+Z}J4pLpz==)cIF6F@vn
z+Mbb|Dh_cck26NU4SBCTBS*KddK#IW*?7}&zrBIhv1)L-Yw$6@wD~)IOb!0K;NU9L
zyKRHZOzAi88j0VMAafn)X9~D{f5AsKU%<(M)`itn&b>pw<(w8yu}&B(w4?hbtux7d
z)kK>wh@$RSW%1<l;#zd!$gh$+oq7rBUsRh}U;1nGFy$4Vdt_mrQ#&1on%z1u_UnC3
z+nlU?0{w1zU!-49fj-lnB+`#Yg%X1U$NX<<C|dRo%Ah`l<CC%vzFF#jjyeZydb5pB
z6k92tQ<_A;+bY@!bYJNVBJr|b>9bJg@H@*r;s@#CjBdAA*!02HgXUV^TX?TS1$cyK
zc7d9UW+cbIWlIef!O22nx(|l+@U4X5dGH^fA1-=y^$uHwop5(*a(QFuf8S_~^NYeu
zA5&~z{loXp!NM^9*^2oKIX;JpJIYY|o5$TXe%IE+RA}{IqW7Mx%2{}DCaccrw1xUn
zxdrl{8>QI=Lz|D-E7VSp`iJjN0(PCte)7<pbK%Ofz3YC*-p@u^IZ3$k@{dmTqfpa~
zuGD-vla;aBNv`7QtdqeTkR=osol`kJ>96+vKB74Q8(Uh`-_BA^S}OM?aXw$Oe#)H3
zSU&ZC3@@UatenShbY7zRt1313;#+0VI#(v_5UMlk!z8=k=+&WthLE8?_29&!&G!QH
zQ4Y7ys_%<1ulj?k_q!L2@th`qyjcE40^u;#=s6<6+2kN_=)~BH%v-Cfv5tN4(KC4b
zCQY@JvqQCES2;KQ+EPt&exuDjXohV4zW>+pFMiXvP~7^f*~!QC*an(J6O)j=q*EzN
z+arv(0q+P3gPQ(St$kRpR5QA>#<&l2AppBMa^j>0C6Cde%ANMrFQ}D4+6IR1?BDY{
zk!o)N9dxmM$r!kLi@9y^&r{iwb(c0oLPH;M^u;tqILmkPp$W1_*&vnvjQe!Y=eJU2
zAt+%mI-(;#p7qQ@c6J()<~TL=W$uZC{=?T7D~S(Rgom)aW4+2%uIEMAasL@}!!9M-
z)Mtae*vM(ixf7cLZTioo>f*e6_;)>ZO0kg-Y8{?941MSusyfJHY>fByS4jL#C9IEx
z(Mi8s{H4N^*IF=HlDH#z<w9bT7Cbj$ex(o1m2V5blZYv{-#c-6_@!CHFAQFBcrU|n
zlbB|dSke6b{gb5;vboyN8x<Ds??QYFKz@+>@U@;%W3gcr+Zgmq%b5vcPn%!OC-vSD
z5rPJG{RugLcdt}n)pmvUlAZFYFJq#Kd2x%`nKf=Te-vT-;@_y)5C8gO;tH<sRjb;>
zjMQ6qu1_bqBiL_q*{82Vo|QSg=flR33O|8kh2H>^V_Lj{YWACenKN-z)FIUfy<R`^
zy>lPjffeq4{HFW|x2Fxm3F8IBV^y1;`iS}1zCzdoRhur)hkxZ#Gcdo&$7$NGrZ1e!
z!{G{jR0D#WYQ~^dVeVimEcEJ)MSF{z8y|8%;_Av^0aGuJzq`!XOrHq|yU{G=p>d>S
z|LlC2`GfFv8&di?)eq-uQ=BM6PSRPoVRs|&s3xu)V7Uv>sJiohX*Loi>e1jzJYRe|
zZI8h=N)_Yv)f(3C{qpx?p{h<1564b@{e*o)d@(s90(Hr0_I5XXrE2h>UzI5*4{PBL
zJMZAo`~#T<cbXT!^kUMIIo~ycx!z@@sxSTcz@2w`N3X>j5QfSd9@g(0I4FFgbORG#
zim6bgHq0T}$)Zsvf`4g?-{}4gmsJ#I$Mxag_Waq|bOjT07LJXZcshKmtAmx_a?RJ-
z?xnw!HOg6@2Cv$&mw%{-e`tmE>pu6Y(jeAl#xqV>IES%sq@kOQ>~Bm#LUk3!XKXPg
zmqM?;sNLb9Vrdt_uf0X9`8X9*y*WVsULh@r8b)?>t`02nx(VY|w{`aM#MdDMW7JDm
zdo*l>?>wr^L{^e&;oL8wR}GRj5x2@e<eYNyMNWKvQLVoZO|v_3%<Y=3=|%w9Re9mh
zlh@%eUlXI=wAU34&{9g~{;B<_E6CRcK}#H^x?hq~4BcSKX2mM**FP(XPxO6qfWPq6
z>pxWw;e^9O69xRId)MvamGgbJmdX2X;r{M<II%InfAl6+##UY9AmumjtC@dLU0{El
z+vUGFH7oqVUrl^~!J7^7CJr4H`@bSFo2x#zc5B;_v?ICecXtXi9wKU%XXS3+wa_<P
zh;693AgHkwewy-9U{F(vWQh?cksF=+FPh{bP2vsQ$J>1-g2}A`L3)_7Vi>&$>v!p3
z^a;IQbbkL0jxm<wr_5>{O#W<pi9X>r?x(DHPIA(&Nuzl~Yw?qbMlCfRe4fl>wVAR$
z`+j#4xsRd$Ao!Bor&(t|U-@Zm9iwx=(@1qEU}WTqdfowIFP5b%HHnieZBLC>obuZ&
zZ|qRL0x8@ULdyMZn}Kr;>;8zh`sXB-#~pHdRR=ARlSAwy{68YyRU=f2adO6#i}nz&
zz-$sWxDWWD-d)q8l<3)zIC#*;tn>L+D<2H!3!A<1taZvvvf7}c(RiS`Z47<Fq3LcA
z*1k60u)bNDDZDfgTQO2HsD!%Ze-M+??pRv%b?B5?#r*5wn)>aeNV{%$B$+)(CUbSY
zzjTrb>MQJV0bY!)wwfATV~D?0cQMO4U2(p(@K)89;Tni1*0C!vrutUbVs7oF^8}gu
zdZ$%~q{JH5l}1t&r(C&PwA*794YbrHT93h)Cmx8fNeL8omux|~5S!ShK<OVJsGCry
z%%9Kv^3r>;-@d}VLn8n$KS2K6A2(3MF4~OXoN8MISuPa8*^19ndgO^<yZL5lG53$c
z>Q_%MM?07oJx))U;a#Lhy{EG{tWxFDuA8UxB<lwC)T(Ib>LQ+qn%u+>L_K)>Fz;5T
zYBHfM-Nfz~xyJ>&LRnu*eI$3l?A=U40=cU^z2+CUW={u6T*xLvUU$k<nMi_3?V+!)
z-3?hWF4K_m-OpXcV+^)vFL4fh(<@b-DPQnu2|Koc`EmfBKm4@fta^pRz;~z5{Z7}b
zD*_HJr(l!H$lnu@&o<u=N~wA?mF4catG(pp^;mYiT4D*bs9On}l<#$6!N6^qw?0x#
zvW_de9Qygr>-Oi?q{@k1pYJ5mX9|8~l)$83$XspPd8ulq4ZcoTfB6LV^fQ+RN}JF&
z_t>j@g4Zw)2VjQ6GF!e5wDmmH!oZP?LQR#C!b+Nj<t=mSbH`6n4|tWNkFW3Ua%r9U
z&F!U$^2e-3M@Z4c>#WM4p0buXgw*L8ud4bM{=;|^HT}dnkqg*)T{X_|j{@;wdiM5n
zGn#=_d-{7+xoQj{p5NZcsqemfBwf)Yet<uB&dT%h`tbR0Jqx)&LT>W7wrlo{&NuAN
zx8=y%0`DP8Hv(Pc)vxEcSz9fvcf;y8Tg3_I<JcP`1H+wsn}76FlxuwVhNWHmeDU|l
z;45@-3&JUtp{0Rb_A?LGB=ftmWb3ikvL+sXmlAJRo$2XaBJN@9_VH!Ji~BZ?gxa7V
z#gk24sj1thuBVJ}V57G5_IXzVR3)IBJv88yC}*-qTn_c+)Dc_hL(d#vam4P-S2iwS
zMGVImt<NF0#xDE10a19D>Mf&`KUD?%NUj>%-1mbysxtjoc#QqcpLNWT`(AC`uwe0{
zJ+2+4+@@@oT(N(4<TusnAh9Etrn8eN=3Wi$UZ+>#Y{3g8Rf(u*Jf8HaSFc>zjU<Ay
zazkn>-w9^!?xIAxWZxyUlx@u0FO%ho#4N}44kF~;RdQ=%M69t$k8^t^V&wqmb)@*i
z<D&#Y!JTrW1ht37f5kx8DeYjL;G?*`F8GaAau<%E8a1bP1mB8lp?|9g{}?LbwY=oS
zDYmQ^FTCE?9>B=6qL%L8ThK8DHthpA#>h8Ihhx3Pw(x=oNmjcQwk&#`60=Yj8P@yq
zWz@;3%aqOwq(A)>HaJWd{bo_IvQ2ORvn@DTW7m14hyn$~ovq=S6LB09t;wR}OYIfV
zhozZF#tzovioI}ru8AL~sdeRU-2yYR?CMS5U$GAq=95hICgaGs$K{HX$^N^}%dUOP
z8wa<g+6Qs5dPTMKU6iEbdfzns`f2C~9m|q1;YDEOHdEq?GWNzxvjnB|r@`l)3@(>=
z4rR^%a&+D{jh<S=d5_lgKl)t%XODv5r1GBVbGRP6#a_K7{2;>jqME(f6sqsnNzL6}
zD}f1f&x1661EjxJ9C>;Tqj~YJQ(HMV<NT+_w-W~l4pSO@qhG0yxZf%UHf;qYHf}KA
z%a5)+MS9}e`FPJ)kMuNUVrBj5;n=2U9g7s$Q+<SQ%Mwn1=S-kX#nenh2yCWrTi=BP
zTIy984GgTy<&nD-J^zbn5WN9Hx~6xW?HqU=e-hE>O0bhilPtT1@s<lG3y!z1&}PTp
z#d@B5*Cc}Rz5_gfH7AJ1k_mxc$?M|qb(i&N2fD`YXJ#F^pgY^!t+!a1T&4A6DBxi-
zoLD;90EPUzS8}3OYs+r=Em~b-^s`u(H^CxfM2f$ekxqcqT6cds*g5U;>sI51Jp8T=
z9tvAdeD@K2K`^Qj_M8D?&7E$qtgfho-j2mBmE+6zG3j<UC)1NA5T2;CsU`!CY<l}v
z_{;OFXq)V7^U8IrYKj%vMq#%6fv4a{iis$<*X=r_rhQ2scY8da{7gB*9oJvh<0Bk7
z$5oA+&<nlt@P*5S(TQ&pe{r&Eb@qs6=ypJ7bi|<a>*t@!fm@cC_&%}c1&XW6!>W|<
zyGS&+-aCB#cCu~mH@`B4wS$r(R`|aN0J0@v&JNe#{XF$vyNFQ#FLHxruDi#Fv)FHb
zYaiSCeyzQavOndANHKTm^^vW63|px80<J#$Sw1SQ)%D*+i4O_MulKB)cva9aeJ(mv
z()6S8-)gD!E0Jz;*n4(g-nynUIw`j$b}Yr)Tqtg@7hTuZNRd2}{#flv;n8%vxcoU1
zZYjy`MeXe1^khd*bMlbmx?X*U66=>cmWaJcob!}yYSq;MbMNYKf*avn6KchjB%;jA
z!`|@<d=W68fLevD8(%1SwL_ZjRsGfOskSS1Z9RmZ<6E3AA>dkZ+TKb$BDCO1GqFET
z{V={djC{)8)5^a2yOX4;0&s3q{;{TGPZqK6ZN`&PQ)V%{=8bs^Te%sZBEpFMFK&80
z{WE%ckn`kGm(sL>?@}<OGF!(H=lPZu&HX^Q@BO(Bo`1u&!e<F*740o#Jyu{;KfaU~
z4Zpjjz^LL1_!rnga}~b4Nn+~JhN;vMiOEBTu^}e$BVElXPQ@&mw$tPeB0XX_U8i}#
z*t*=$=jw^f&XIBg<uXqoX$k=baS^htQ4@qcA3OK%;Kw;6zvo_7+nIx>^i8WJ-^Hq(
zONI6Bm7B*drSb>MkaJ6)_7l)y{J)+vx61V0UCJoFtlIFN+gf2PRus{AOdDGNOIJC6
zp>i`^y@nwC(V!ux6s@Z+$inChWP9)yCEny8v`c&%GaxI?q1x99;<ug$^7Tx#$-Bh9
z$^-7+kdOyke)JH0gf8a9Z5{-lJ@aAu>)uVF1nH@hOF<f&k|$@G@@>MdC3uq-e^b1%
zjJihTZzWQikAfGBQ9zRMq5HS2o3`1*mnGi(RqYjTch=Fwuw=$u(lk{z*wbFJPG9`Z
zF+q?yYDB-jq;V?B`O)^LSq@!I=bLw%RJ*nmX(>(n%n$TfJ6s#n*^m;$5axyQdmyQa
zPA7WWQKZj`@E5=1s>R>z6$bFfcb<J{&zeLJdJe&16_4)@z7xVZRKvcOJLuZ*lF++L
z!X$6>ZO9n*SN)C}f38#Cd0v><kr%*;upbc>!WzGEo4Pxy55fq6=mLamdg$_;t}n#i
z1Jg&@t2HRW5_ri@g*0>AU2)`<bld9L8(h`qUzeMSXx?Sk@QVDZEaRDu){&XQyQ$~Z
zXuFB9_>N1~)r8ls3M$VW-7>=OmWKxQgz5UA{9u*D1e3Dw$24+6=UWSOjVGOyb*c9r
zjd6@0;IT;j`5Ovwu~||FFGbN{52^Na^Vu?D;pkx&xwp1svf~E)<y&8|8Dc~vT~)ph
z7g%Dia-=LyBX0)cnpV;o4@Ko`RKs?8Fp^)p4%vjhO+J3~Sfq5V(&e7;j&8z!pm!TE
zAsNF~-a8>a{3Fxxv@`F)i*=@_-rn80;m%Od5T)6A<y-A>xQA1Vw|1e1w#m$3>+jgi
z3I05<Cvjbh3m^V)6YW`EA--IyE+)m%eF))AELI%a+4+%R*wS(|N-zhfSnB7^Y~*GU
zc-XsFZ)tMyiOu;nE7DXsfSEM+SGi}qWgK7i^OTydAvGfrc^p~V6V4^eGK3_I@K)0^
zI}4*34~69e`~^lBoUN%{i2UqBs;F&pHd!emw@fYKV+;jz&5C|~B!7hAxY4|wH(WeM
z(s60`(H|Mlxfh)mvOLe@`}d=xkkZ0zSt<8AnaIGFudUYRC0Yu*`+F3O1@`_&py)43
zzxwMb<78}l?L`{r4Suz5T7H{fRpt@5v>--1v_TE|!+|wYjk<w9cl=NYD*Y+@jjo^I
zEaUXr{JaelgM9aR&wG9N%*WTw%DEeT3C7T@7n(n!$E6MmFYKF>t}`Y}@7WOX{e=fP
z!ymK!Olv-kTlL+x-XH_H=dDqp8ZZR4zekIt4Vkn?B!r^{uM?AD6yvPw_~m9=1VI@&
z*l@(|4sN;^ktFl@d+vuPuVPKY&fhx0!K0dA7@(S#M*pv#&BdST{g30{t)t7CC|!ss
zoN$iVRAR)WiyVb>PLgJ$=(kfYbIYua>G;v({16V2T&A3Oq+D{DTxP1{vaL+~kjaK^
z#G2JMwz11^&hPj5eg1;?<N1DnKCk!fqvr)LYnRL+A8Q)I<Q=!J=V-snKL={MFnMu`
zl$P|y-=h7)>U-bS=NkI_5R#n4QsP$7Bl9*#ufFw`s|L(y%~{xFn!~rYU1`(p>*lec
z?#Z8FEwKbfQWM6CDMqcnIAMD=fMT#V^$wD5WO{&*a$mGX`ZgVn3o?`{{uQ(=ea#9j
zt}m7F$e!91{CTo(7Kj9t!)h}2d>D)=g=i0lxC~0r;~D5CY2)2Bwgah|^M^qDd`c37
z=onEmI?q%V${FJ)vE68(D4t4NrM(ro7<Wx{QJ%Rqc!mg1ils`k4#Z9%6*Qb-p^^8%
zL&oye`Q70c$$&z(3)5k+%CDvwDszfgM~-o$*<5PzVC*;>Tor0i(>%Jv8VOc&F-vXr
z(+l+RlUgZ9u3~lh+&uw(GuRMb8rIk&D>H3W4!q(Gng>o1zk;jI>>3R~fts2}>tjzC
z*&WhfTd3`}q3uz2%~R#dg5M^N2J{H}+m==gz5A_sL|&VGI*P@<sv^(oc}?#5OyUqu
zNF?~>RC2V+jlXg|J1mjKDpL~&rJQv|*RyvIj9<NjkbojDxe{~tC5qb2oG4>iZ(eCS
zZZ`SmkU!4sK=;Zc1mG!+9J_5l;+u)>PJT?#wggm$c=$tsA7P)_X(=mG4#p<R<5Mn~
zR<M18OJH)QV~B#bjC-nHmmmUO416mR!e|{!u196fXv;Y22C7dYbny>2`GV<FY19j{
z5&WE9C=!t6`B7XM@y5X){GqlT=P)HpEJTjn!&)@n6LGeHz`~ICn@TLS>-ha0(i`Pa
zG*CDrgA$&HwsOUk*p`MR4%klmWxCy^^C~xN{b>PjDblYJAyY22=tzNQ)(q<?ZbOyI
z^V^xtX9CkAnSYXqIv+>uP_qbm*R%N;a%_TF#BEt}^)98b5bOOO6VIeEJGl!~GEG)-
zaJx>Ba&XHi`1n=p#O!H-F!kOyE_nadrE{OMcLUUwON!a^M+`zr=!EepYB0x@3fKuR
zis9NYEb(OH7B%@5?_uiiz$Zw0!4NnW4SQwI|Dj5taM4~m3N;zC1<tx<y%xrC!r+ru
z=<YV%C0Yri++;XqaWD$)SxCC|7F?r~Ip+yDvW52cSxRl;Y*aF18ef^B(}_YaD-pOD
z?>xMmaKF%5g&-4EZIFzZAGH?OM%Gp5K*R2<*vneDrMQ5V&y(?evc9(G83R#W$8yVw
zRtPyqT}}|sc;dRWw3hkm{CMR6GXkZy3KE%H0D=_k<b9!o^tw1ddh2A9rgk~M_E*p_
z5_`t&Z0b3hU%mM3a+8gifCs_Yoo~&^B#+%1S2lsln!&14vw+J!!0wC2?WRGgO~U(c
zIxj+7qaf*W?k`e_eE=ejA~ey|`8JH&4nF}GrtevFDR9sI_g;X?gCLX&SW7rZJIQ<O
z_R=BU<wAYj=$wOow}Bv)Rn{1FNj*)Su*szkQhkQ@N-KF-mHAK16H@Tye9&+it~oPi
zsDkx!x@|SzLoQ`xYq!NOrl$P~DEbzHkb)Yeqo*hr*?_P^9LbTFt8xzkt3szys@#JR
zABAVBI<#?Gny6;LyI*hsnzwk04%?x_aI|s?e;<OsFn*!g^N$D_zwK`bndCluajDy*
zr9i8F{p$v|^t}G|HI=o1<!ep@t>IMvoi`v=y&bL0DwM6eV(6RI-wH^Os`AZHb34@o
zSNQumCe$FIQMqYm$>ko7<+}r7bfXopYX?i}>Mhl`Gl@0r?k-mV)q=D(Qy)5NA5==@
zl4$Ep(?&gIs!1^4p!|lk4-!t_ny$e+eHjUHET_}WH1&y`1*Y#o&8*<X{&ic#EM^}w
zDgke-3{kIj=F9tx0D;;_!>{!jKz<%CW_@hU3`?^i-d1RruX<Ln-y<jJA-$X=`YfVZ
zza&BvS>21{ielKoIq{7?I?4J>?p}C0Fw|g?=i&*kM4^$Qu0<~t2&Q`(u@4ny9nhVC
z==G#<cLBKSpES}5LgyxjS5G6d-;d2$>-8><GNzljB<(KT=KH;csA|r*^P-6c_~ZfQ
zNy0J$mS5Rf{(P_c9AAIxS5Tn8<5x%c(d5Y5C9xGI9?!MC0u%|omC${|!atbLpb%>e
z={?;FcVwQ~pi`YD-5SJ)0?6k>xyN4$*Og+kk5rz1d)IjK*(pQJ#i^p{K8ZDQtKfM!
zX(|+fFD1l`*3>WacZ!|iNc`vo@?+HO#K9bAfP?oN3!&Q=_bm5YPngL1SzMIo17muH
zF{g9r0C2sMFfc=3qtl)_>x_vSWHgl>H=pshld<b1bC#6G{WIvUt3PJn<lWNijjZ3Y
zF~x}t-Vo*@-Ut5c2b{)o%R_@y?&3sAaK_$1bhrcy(iz72-TFumsosqfqb&4$n}YFC
z>N3((i#d{g&HIRbBZ+T!<*8l;U6Yh|+f=~Nz3;(QIRlW^gs^b<OmHm8_R(<H@o-(#
zl)Ro?Ril^JelqeGxYLiNHGhp8tx1ahIBFusT~iEJxE9X)4TAzHk5g9!?c<N)k&}Br
z@I-ulBz$vV8v6Du*V1vSIH11gI63s_mp)Q=R43(GXIpuBxutP@G1-BeCiZ?3>Uzb|
z)B%BQ&@}ba553sz)xpn+&XuJ_mL%A;nT<YFrUtNKR{&YVx-C<Br)0IBvd;lvSUA9)
ze$Fac8HBJZ<|zkn3wvCG4=miXlzsg79-y$zLYI%z3e-kGYK1p!og^r_waq1Ae&h@2
z{#eE9H@m+F7*Wl>D9%Ezu-Y&$38&4suVE%?0J}F#-+c*A*C)Y?RG;H-n9h1?+lmyj
z8I!A1+h|eYsNzr+V}UOCM<kmc9j+wl5RFwNMM6#del5aVV~hrlT+rXuvFqkT=*cZ!
zrMQHF?eK9{Nn><;^Scu%+-wSLo5!}(StagR;>+diC9mWgB`C}s<%i0-W$+y8&&lMi
z#(-expyWylvd<I{q}qpt*jFbS*A*W$^>ow(XwOmZ=z`dBll1_Y5d>3>?$CjNCAfSa
zf>nt3T7d#93nx^(r}hA&iGJB|t@h4<^SUu;__g0&{f@!w3Y7EB^}|o=ZYS+uN)ueB
zva`0&IWNXdix%j*!rxOF+w2bK$eoCi?i=Lx1oK`FDi+s8w4T20K-3KCRSROxXITVo
zNyL_}$uO~YMQx9?7Wmw=eJ*~Pf>7I4=nuB3`I|u}&;L?4k#X{TV$Hn_;K5(OgQs>6
zVlO$GY#mDfd}Vdn%L+71s@*Z47$+^o)4TujB5u^wy<T<4-OxnyJmr&!G`a(qfBBSn
zVWY8zJ)G#2ey0`Y1$=Yuir05L7Pp>evqSFTi~M>Iqhxg+28uL-cko#1-L`jIdZ22v
zO^cX~zQK3E|LXex?>lBb3EOkFY}n@SmO%bZ-3L+d!Jq^GT_glHG4xf4W4!OD#^TBh
Q0p0OE<A1urJN&o*0LpBp4FCWD

literal 79754
zcmeFacU)81*Drji7DRL`peX3**pMQKh*WhH3xbN$As`~sYbXg2)B#i!bWl3P3L+)c
z1QJ3}1Vow|AV3JAM-r0Ik^mve4Kg#od!J|idjELed*6Hfd;mElXYakv+G~B+cdfnh
z;If68{Mzkn0RWIcfA06I03aCy017Ww%Zjgfp^Li2KO};$nw<iQ+jmTee_0c7&Mp`L
zw*I#KC2{`h-YN0L9iG2iUK9V66n}~Tt@<kdc3|b_^8a%nj<F%80ALE7|NZ2(aEVFE
z17zX#2#v{ElPHfb`ViUIM~-~kn~|3G?#R9mN{{ztq#f^gcmKfp`>&1<-hcS&`0%>B
z$9KK@_4ej7_wF8l`Rm<!{`4~{y|dV<>pGi0u$oajKvlqo@o-+S;$kd&yNJ98F(OJ|
zqG`LtNXRNJe+yc-q*vd*4Q-dHE45Cm4v<>+OhV$T(F>Nut(BMD(UOvM>8aB-X-oR+
zEz+hEml<yV%U>&vi@?9S#QY^IP#Qlq1(XK3Q|iFI@c+BL;9@I<itMb<O=yoMhOj2`
z1~l47rV){}hKVBL(ws?k3v>9W+%I>fr7)IKk}s4IdfMw+wFAbjRP~~!H!1oqv59PW
z$6ReHA^gP1HwB~$CsP#F?W)R^Z(h}YJnB8O4;2|fBTi2eu(ZZmG<Bhv>J%!B4>it#
z(m1_50Z}}T$cX1J95#)wWK9Vsxe=#*{l-HNuUj4Cw?z4@rPWdghj54SPs*5?C?{?&
z#Pi9-nwUJ}A3}0_cOz9a8mD~ADW$-ME}q=t^-aRIPo>(s0PM8MSNZPJyAuKaI2)Kc
zAe_uI$sUNH2Pe(5oit$sAwzZ^77)U48UD%Kh^nKB5mSZ0Qw!|g1TbEbf+33^D@By~
zdey`2B$6h<hskEl9KY`*F@<IbcLi5=JNhTcimkzvsh%z7Os5606kp~mF*S}{x(PAx
zk6cXVo*LYuD)?N>S1Cy6NY@E0TEYksoMFSR;5jZC#S4=hEUhFPC^A~ze;3OX2siip
ze0Iq#Fef@<Pl-2B*uqF=N0NWl5)9K!kSbv`5xl@*6F>>z<J@EJaDI+#O}N5ssuCtm
zbAzf|*TkUU-(PcCGLavoSh()Kg9wog@r=Kb_hKK-M6WCOM{)H`3-LF06e*<9P3X=P
zwxklRL_flEXPrgwC)84-y|B|}CRy~Cy|d0?jdOQLq9Ys$Ux4{P;|29|)d~azmgQ}8
z3F<$=BS4uUW4|d{(hNm!CXR$HQN26JSU3Qgokt*zr@7^MY)1i-s8Ab4nOl%EHq4%_
z@wk+<SR^XtYNcqZQmM6~?$(Z_#J3U>mw}KyAL|ZF1xpT2C?LK%1BL8VR4aYUM|Sv7
zvz1Y50MYuxRB6~^<(}@!`r~7Fc$vinR$t{swSa7{CBj5-NOJHsd&(s5qDcU&kJuG$
z`*P}F7;fYW&080Up1Q8-eKB!yu^|Z&0-JGS2Xwktv^3ca-I0*x>MScqnABfmlP#jh
zodfizoe?3QraR^K^@T3T&@O56Nr)_q`EuN)Jfk@YVgvg`p1^DR)t_Bzr6X)1j@YI*
zP}P$sIl9Ujx_FIOWyJOu1)X4|Tc+1SyKM3@{g$Rf#_}|sCv|APF4jrj3sjups;PQZ
z)YyQhs1rVL1kYWQlx4A$V3L!A=#Sc}xx+J$A54oHyx;OV(L*0_jviV_s9$JZMK!?F
zOOw)af(a&>&Vnj4^U7jhh_G{i;)zFNL<U?!jM|QE+W=7JaT2aBDR-QtT#RTa6?9>d
zWbe%B6e!!q=%xeNY+x#*vPqPanpHL*B~!EZa*NFkRU`gm!V;xT&r&n`bD-H$F&94U
z6dk<y#Y4kx(n^G@lyu2%@^|7qpNM0iAcmsAg`*gDhw;P&Jdd#^Y~k@93w{t#m`(5c
z>`R#;jlpHr<~2m^Jin=JE-s2IW<o`5CQ8(S?%5gVX}0KS)QCxKiDHPe=vk9W;11PD
zPKzReFRUb)C-JjI!JpWDTS#uvd<0YGGt4`kJDayOl+9H+Rvdqy++joLRz4^iRwUT&
z=qTC(*jUzM5hf!!h?21CPWXBacKHrK?VLvZ_?UpM{|6`QV_)rDbJEU0r565z^9C`D
zyCmK*dO|-#r8M^!GIeWJx0G0m3Xq!qocvt{Hm02XZIxXK%GL<X5}SKySkq}~8ZU5O
z`Z~g0A5G44uYgPVUzC`dCh!^XJkj%{$ew|P_p|sN0Apx&tmOuW&%+N_Gz|3z2zWe-
zKQtR5C%sPV@_$Bj(Fa(+rR!2V3t(!6MYvMWj<+~^aH<6-fR!uiQ@(&;XZTO<Y|qS@
zhOjlOm__c!(d`af^CoRJ0*v4&2p6T0J`ngNI2YzT*fbE@J>0Mxn&d?0%EfT9K0{NT
z_;yiyA!KXS3x520dR)%m`oM<oDPNO_q&eqT0Q1C5fBTvrubjib3E@K~{Rnn-RHpNb
z%L?Aze987+FVU@H)|J8{W7jtVA0jE#-oFj7)x4Y!*Fe<PNAzm~#<XZ&KW_;?id3x%
z+t@Al`!Ofk=o~)Ai+hWJ{JD|qKZrN7`ZeFhy-&iB+`D*}vh4wV&%Y(r@+b|)94{)2
zKyVUzds7#)Hf{A*bLny@u0W#run%@9$RylbrVeK824}e$9d$;H8u8|=^7M=a4~W~6
zqUVQY)HEXpA^tUyDXNmryy29w*?D@Ch&(XVIjfP1puzQ))@hZr#Q;AVsq(9&%Gddb
z<x(=qAw_v_w4leXW1Q-<F@aAE^EexrXtn$<Dq(4(La&_h{-p&9*9qdUX+;(*6g6^q
zI$@*$e%Ml!x(a3FYgx<i*W~7lieyK}0Na;=oEl9LZs2q&8ivapL-GgYO{CUM-Y^A1
zM%az_?%2tqW$LiQ`MhCoa&Jd;<CS<(b672OngKgKYSyvzdjibl1G)>o#t-|d0N&6C
zXHo1WN}QiNlB1h!{4Z0`0?9!|<IthTS!>#YcWP8<pq33{`e7809I`N9{iMzmEe_xw
z6O<KXZ*A-O4X}QP;}+OxNM11N$1VOEOA}D=yn$D5RlYlgou2!H%ID;>J`}`XV{AdS
z@GERKil%T>JN|?1m25NWOk7GiSN>*8JdVld4nJS^_Z#!_iVQ@pHkyg$79=btAiw3U
z@%mz4zD!-82NAy1Rp0DeP(n$hk|vcyX7xn+|C3s$0=71%T6T|}MnyDSX}W^^^9s2G
z!7a}pn5!O8dE4Cu@9&~Xk!bvG>yEbtis^?TrCn^Y^~*wIqc>5teo+~p8`#nOVG^}=
zk&%GnQ}$pYtH`y~tw1U=)rJ?OL3r|7WuPd@zaZX+oZuo>cW56Y_LzS}_cU=6LWJ2$
z6P-r{#7`9MM`{TsQ}pVJnOGDxNP(V0JLzX&8LfF#>xt*`6GD8FFHpPNs&-dDn5qkO
zyP|1}g1OwxT#x?QVl&$Uy^vxa&)XsP)mqyvus&<ex$t^oPQWK@s69hJpaoS?bom;x
z?i-p%n0ZTduz>XqBQe%MVTYb@$;`Ol;^VM4-ZdC+1M!6}I#0#$S@^3k0${5Eg+O~f
zwlWS$lkg8)9HQ3G$R*;~eJ#08XKNSXw^j_2#8>&%Vucm^?mXjpf39}RvU|SLWTlYY
zT@c6EGjeFOqUhtGI}LIBJ?43D$k=rg#Du!)J!^%Hm|eDvV&TUzA~^>>e1lT76JQ+e
zN^qfTV<(#QD$2{lHEzUGlGzAU!-SXWJq!dWOlm2J|G;P~BZRf-@zyi;>-CpZ`P9si
z<oVGE<>;oSW6Ks>6y@)Nk(hzoXve$1$k`wMMT)Iw#25%es=)IgnPX)G(PIlu6p!g`
zb@5Qxdf0JJBmt|4%3+5qDG<9)lQ~*5SlU*Vxe9wWJME6)GORhyi0gj-`@r)*(lhnN
zY=l<Mva#3<Y+GR~cD2R;O2-1!{c5&)<lg!srYf|wNHJnM#VcxsxzO5h%M@6rJl`MZ
zf++fP1$R%2QK96E?xy8ei`flVS?RixJKljKmB)2-t(GZ}JJrkZ=)V#gv}4kI@8>JG
zedJ*(o<ybb3SpwOT8szc<Q)@~Q4Q(&>DtSbNvrNIU~P=O>R$}XA7T$%FKdk1-2*AO
z`I9Gc`MJDzoFmJx)~Yj2laSEz8MN;YS8q3Od$v4Nm*VBMb}s%TWt3c2);d)!|3PT~
z+sbW6#CMf3{fB4yC|;PW6lu88JMflQ?$4P9%m2$-JA7AjNrzTMsMPT<;;P!J=bWHp
zrQ^Ol(=_jYS!<-<=@No<^UtZ*h5wtlDyydLv(hsTF3+^iarsgH*R=*K-xX9|SP@~P
zSc3meT*VEKNyDw3=09gTzWra;iX?BCL|y+W@V`{!zlaM|jTQNVs`1};5~v!WYW(d`
zK&t^dl%LKMbSOW;35YfRJFWs%15^zOSrCT)zZ9Vu@l6DlENvrU7=rS=nfbX}O_ftJ
z@v5A9G#kE{KaO_wOImCb8RLZqld_FrT;;qLO+y5BPKsucgdaieq>n+nb&zFg^~(|W
zOBKHk>NGQ|joDVwi(AF+7G`b&^c;JsefO&Hs#H0Z0P4hd9>HT#h$+tY;xBX{jGY9r
zEqOnw?Z7Z0!LQYCq}@26aU!AGiT_+Pvn#{SXb~f9nj5o>x)HcdUBq5P2&+1icgo#2
zHCyzOJi4QH{y{?SC6QC$HyL8Azi}{((Y)V$|57g{dMuC7G*>R7=O}kjb7v{h(O=Uk
z-5v-y;c?Jn()u3B!3;I{<;1u$s(a94z3NfQ+=z0Dzhct7umFh<feo`o-KZs5SHkQQ
zAudO`<xR_E+kO>-2lnouLk@Ilt_&e)n)ntrk2JtVHy!LqZ#S9kBC4q@bSRVhyHD2*
z#FmU@W+G;i8}Q9Z3rtbvbd8F)iBYa))K>u}tGtaMY?jyC@uOxyJflL|*c6SzQfVCf
zO&pu8!hVM}o0tSF_O|J17H>fb=+BAXDk3&9Sva_!c%E0?G}ms0G!QI#m^du4G9in@
zb7=-bw$x6NYfP9D19cPTcQ{$2#gf1_l4~-V=R&QFHunb)5T;cjwmTZ*A^b0o8UBpj
zE`hRs3)JPr$1ocwY$PMt@CHv}9+k)1^JOraR!P&&D$i{SF^U@NPpu7LBJ_k)s}jmZ
zoEA+7J|DYdJgc@V%AZjVF~SS+LhKwjq*@#R58f%RsEusiuW0j-1PNo#&6x-Uuh%mk
zTOw}Y+H4IGbnaZ!(-3?3@(huvC}FT%6Ed9NYqpKb2~s);uoOcR34FGNjT1M$VT_aD
zkh3;O%xsXN(wVT{Vlunr5`vd$quFj{WD`o6-Z|$XImk4*ytA{e2=6SW32>;^W%8XY
z7lw-ZxJOUL!btBO8hfRx@{U0*rTCfxzcHwyB`S3a%`{{ODPcGpz6u9<VzNr#aMl@7
z6|NG%6n(HEEZNM2A$oFU>L|q*(Sn`x0$*CtW<aKnrAG7mSlKlzQsEhhJVu6UhUS|z
zxdkF4Hk*YHBy_38DH>0q@|G#-iCM+S@Y3;W#H^x~(VJ_U8u{@lj0oETZ;J&!AwvVk
zu(P7LS#>m5kAKm$Os(NLiTTro)Yn`mCj%N4I>4yFF9s&r8df;vjg_lLQbX!FR3v@i
zYghgIcmm^WdCmbL-n+KC2h~klh?sFg@ZSl@i(@1CNId<B=tR^~7RH<uC3rv4WKtFV
zo@Ud1+M2B5jG(Iu+J|NIA=PtM#K$I!L)R4CvUymYT*Vz>)P_KIkXvuC%6R*fCvP4<
zaaRxThh0ptF*jNGmXxa+#l|HN7ngGq;a(?kj<DJkJl2q*UC=UUU?ZZ<RnHo0;YVWk
zqwq^PJPe{bEwC-$sHyUnji^{;%zw%A&vGz`+AnNSWitsZEiq-DnRNV77hpTCX4>Vc
z(ZRX)FbU5r%pdPfbR&}7rZHcIPcSldCoWO3^nwHmV`$hdaJxeNTrRPaMH6SBE~;=9
zh&1CR;RF`tq}w&So6!(x;~X>{(mrcx?_HGW59M}L(VP?!WcQ*PA#Dp1;)uCE?Hsna
zG>P6+=%-mO<~PJoGZ_U5>>XZPTU^DJ5`DrgjSt`@7^ld&m7JRkeTP<eZek%|vzHPO
z7!jU1>cQISZ=_k^_Zh(@BGC|4PUYPpH+INzfASTZ#>%cue8yT>1a4@N!LzW*#%yA9
z%o5btV^JvtlybbHV1&A}G}mb#GkidJH#xUFXQ6Y<-7FH(_8gLt6Oc-^g)4D3IL3a5
zI#7=P%$NDf#o%eK?dur62J|_fzC-Jb`Lzfv*AU&}O(B_4X4Vdb;eSN%``*=6!+M~5
zYN^(F9+YWyQQ@i4Xa^bWm>~6ZT{DkB8jeFy7FDA}aOIZH(j|x6dG2B&_+=$}5gVz(
z;NQz>tk=TBGSC9J__F3&FCCxME;?y#tYtNMXA;)D4}0hVRKW{w7Td+qqs)&?R9Z%M
zUSVLeqX~)|Y?k>h7v7d;h1ywW1Jo)u{<>{}$d6wu+M?Nu^>-kDJdOYSra02ScDk{l
z-~a>PL(eIJwZx(QDZ46}Gji<?(v2{+heVadn2F)AY+|&oQ+Rhe+`F$Y2c@1?3D>8e
zWo6NfyqD9|keUs-J8$7HeO4gwvm2&K$)D9Ky74Er9HTEhB|&&a4eUenotwUrvE0g?
zma(l^((G^;L69=bebTU)Dk7iG(~O)<RX~yMbQ-~Yo%r@0P48QZ&}*Ai!@DM|WHQ(8
z<J7uA7a6i+Uo0UtJsuQt-HuVi$rJS+6h13~cxC@9)?35b{G?2J1u_I_V%JY3Yt*xy
zW*_HEIvF5vkx@KPP1`KYBE(4k<$B!5u8aQFJLs`;MYf%IObf~yHGCDdwn$VfKtddL
zH2y}b4Q6|Ay3NRmqUkUpg2#n~DY?5YXxXoxA5RszxxQxU!Z;%$-}msS_j|Jt<KE(A
zl9Mk~lZ9;=wiT)$PMl8>iS=X46n&<UX~m9c+DI#HXP>kfaZPisZ4DDdi=QR$2d1b!
z%t$wvB@-<S<k|ISl7w3sIkc`3r<^DX(Q!AS*oy8vrzor!<Q=+mU4zUWj^7d1=~}3g
zi;#=rFO!{h#cEHzu*|q0z8yw^4A)M1dtYRDlLLlDu0u~<W*h>trf3YRLt$Tt(eGDR
zvX=1>h27oOyWbT*AqUPy`+g`~UtT=NkoBjyR>HdvEfvB2E0z<5xiEK6Ut}chTWZ_P
zbSK`Hk@%V-Wp~n#6VjQvm1MmeMv*@on}v!T|5KcfB0wdkcF|l(+q&_X%IjBb!!&(k
zD`BfE+D8&pmN4F$@zB&uM&`B*uL9*BsKRs7>9@?dYRPVFeec);oYAc=@=2|~z59iQ
z|CZFQi0&agtpZ|S9A&MU;3mLaZn7hz0bBo@6!amVmel%_mdi3UHo`>{)B$THQTKI-
z-5(W}wX?ovS+vj{9>}@5(9#{yB*DxiV`7ci#Hj9oDnTtHae4%yA9-l;&<~E%Uy_40
z_>-M^Z<q>ZkrT<P4wJ&zB&Vv`Y4!Mcn99(;LC%i+zFGuRR~eaL%QmyNd0)A+5g((T
z))hQWzjT+BjmGNb8@*ZRre&3cBJFv(9)_NQ*h805#+ZVgmXvuPSVuLMRO)MqYeG;G
zY=_E>_BtydPzH}V<yb|!B4NH^c$c-*;K`2qVjUknI#fXnf2t?u*t}V+O$8d8ipqgh
zc~aL#S9XnEPbJf%aerXCbPGfSW6Mf7aY@fN((g8<pyvxI(;|FkV;;v=q<&cAje`)Q
z0d(iR>cr2e!rIih1KZzAexp;HR#Y#$rC2nu6$sPMS_}0pfTyIADtbw52=9%V>NIXl
zkaBv|OTu=bgLi6ZIe!6EO+UP4VhGi=C(~m$@R<$-Z-wjKr|rpHUjk&k0)u7b&F?ap
zCZU<?C*D6NS@Y5=D>;=PU5#3+sfYsAg|54Hl#At&wk=dmLjEK+K8#$;xyeQs87r3T
zw8YoFVG<TO`aGP6gK_raAfcDcZcs4tW77&0bc<Ea;uHgP0hPJs9bS$UJi-(0H6`uj
zKNjSLkr1LL5yTLUcX_Si<>%n!R}fFQ81CRyzQ}f3|2j6NFAOS}Arwq@q8H~9?uj>}
zY7>@CcE1KGIC@xwS;8&WevIsOHp;q}_0zJ#LIpfm>AJ=Ht!VtrQw4+JGS6~Ud^E|Z
zf@<O6q*!^w28sP1%_^wV`<Y4!b-L5pgsb#T?NIkUnLBVG)aFgg(94g#xlrcAh4&p!
z*!iq(tez(Y!91e|t*?l*<>RYfWjA%f<;e^AmZ7%Bg=1{$RK@<oDWqUtcXkf9oa;sJ
ztIkoZid15TA2X_O;&<bteI3?oGIJUhDd?n;0-LQQ^maf2rV^U%iho$cQulH&y6I#Y
zhoTvE&2CB6OxCCBDML}6(G2>_p-{~qbi7xkpBO+<huAPBb?FM5TK^NRu<3KY1+;=}
z>Hs13QWGh9V7#14TDzZZBsgPch%75Yp;qZXj(3GERJ1PCX0sOI6f|qzq;__=8q4{$
z6!!2OJ_vV<tg<G*#or3(A7hsFz226YQ&z&9TfmptijzhT8q$b$QK={K^5=bNInng)
zmXe%KM>1CNkPmh#Y>h(KGjhFa!k(TXM5SmZP^AEvA4tWA$6E!DYC!9&Bm3-ue$Cr{
zYh&2(1<fSFctvCyqt-tUstcfzsu72HBGODmk9!<*u5)&y+GY&qqMdOHR-BjJNi#I8
z@o`(&GQym<CUh6Tyx}4>2&{7q>b<JY7paER05p))u@*l9+eWn2S~Ix|fvJBF_f$*M
z6xo<~ld-hSZr7c2M^)k`x@IdFgs?R+9LeXfH!qFlqR415+70tZ7!+|%<@cc}<rFTj
zl6}l?uH}*#$R=S+$y=iEP0qgL?SV$C-sKRlIZ$4gGltmPRr=(^jCMG%d6*VNOWsRk
zENhe?oQ)DWL<xH|J`@@i+R>s?iP!j@r=Pau`KFHaZUz_;@s(YVzo7?1e&+CTe?9P_
znTTSz6eHp>6y<@Zjm%gpT=zH7Y>Dr3Hgf#nx<D(S+Gu$y6couNVB!H=+QbWlTtR9J
zoj^X^ZM3RnAnu(?ZDA417s8WF`3p(pi1l4;Q2jEKv3d(LavhLoBUl@Pq0NC}n>n<v
zl{gifF%X&&if2(mk4GbSu9Gp92w*&K%T;>-Q@htkAHZL-;Z}w&2s*7%bH{du3L;5U
zUkCgPRT}%*Q|o8LaMI;ORpE<JCqj4{nl>M%pL0oKYAh-I^T4z}Oa^LjiPNoLStMI`
zFDKr~qsO8Ni{flO&}N_Ah;0g`L^GnfT^*6wl*7(fa4a6vgR`Rz-9?_PKw?nLIJ`=`
zw@D@+Ds~nM61;vX+dP`s=vB1bb^;1VP#ASj2Rx-6+wx;q-n5oE%HR@i$;SbRoPE%w
z*$$%=z!nLH;min>UX(wX4t32G(5<d@XQN@dk-i-I0+hfjpLD@6mSpP0r4*s~lF6`9
z_v<z;z6HGezL15^yq%ra{$W=&t9mM^^o}rj1rGOMWtVbcaqVybM@xZ06|Z|tG0X>h
zq(2lEy1eL;0qs}5nSLdVd4`N4)A#b<w!S}9zf%oDhQBC^hBZceGkoK{3gD7FenkdM
z?KQecu0?F<1r}z4;+>6V1M_{45mM^XbFy_}SNK)q^`#to^)srVu`7Y{Ua1&<5xHW-
zd@VAU-C?&H)7wFyY;RlxBXZEbYhyTkY+gVFWrlbCa-X$-PVJHbRW(9+Y^FyvvjVT5
zz<LUudJ)qjs!sf`j`&lR#?7zMz6$k4!cx|D75bjqzD@Ibc*+I*{Wq+!_sT=CS!&lv
z2A}P8*KX%H&17b%Ap)gbe@XMxJ51y|;&l<nu(ReM&^?W@akK{Pc@t8V9m`b`4W5Of
zBHZ+e&k;S)IOq;eO)l&;9a{blo<`okr#0|e#})66jYWEYIEVFcto4}qu4DN5SFxCT
z{Zc)w$Ax+U&S59$9;@VInil<Eo?PB6hBd<GBv0HWhQ{oQT2IVS*)+1Gi;*P;z35QD
zXcUKGLH6vsU&X~BE=KEWiVxe=3H#iUPCI^g;uVuUIN<`gXv4F}h1D?_N7vt^j{k^2
zb)bD5qAr{<dP>-NE0(|w-NK0u=SWX*aZa_%!YH9T@w^Lc`nxlYNo4iT4#wK@fgczn
zPwd^{lg`)sEO^BdQ*ZeFZh;x}impvOMise!Y)e0VOD8nL8#h^_paNZ(3^EiKf}CLc
z7ATi2-h75Nr$=@=Fgjbk_}nfCB+^L{PzYMK^6-S56B{{Sn%&JfHJ`bM#xkhUyu^xy
z!w6sA@h(?V!V~(;dn#${az~374WA=rOM^!E@`YNGF1SLqC*64^hY|F1208a+>rQ03
zEnqIEx-QqB%s8nQ**H8Wh>H$`pAf^9a>-*xG=|s|AbY-}wQWcU<`g3t@qRDqG^Xf@
z&)OKMA*Y727?J~9JRRG-h%(0KI#VcUSZuUGB!rU46Qd~q>W`DvgM|yImLk>`Plwoa
znDV{Q4i`a<vCM0l{6+CD(M^Ee>)}37f@VQ~bFg{CbgQL%K;Ob_Z8F6B<<=V&p>IcT
zKJg0D{=2bcvCzqZqBb{*8yGr}fZNd#Em2}|+Q{<u!u1E7t!m7n&J!$Hmp6Yj4k}Ty
z{xxqI8DPW85^=t|gtbo0oNDeYEYS|<7$&gqz<IGx_pZ-#F8t~|cg3W@Mg<jpqhV%9
z^(;_0g|F!{r=QViX$n@7m=a_43L-&V&oNuR)c+0U&YOuSWGldy16jIfAD8VbQF7NG
zhpBP0fTE!Mb2W>Z1xX4%Nc)O|fb;ygjw0_Bn$TNT9VxgH@02=$g>S=TuOf(0WcAco
z%pHCD!!-|UO`c#$xAd=7sMTSwpvL=xtHrw1=Stdg!)WxH|F-WczZ4U%xW3A<s-(_t
zCc929LQ`GPk+x7xYy7Gnx<l5ry8NVYZ=S6NDxWPjrs4^$&ojPIbjloeCBNm(M>D<>
zVfor?nqh0YtBe?RSK;xOb*_~c20$ddI5WK*Ds;q=R++Qko`&~@x<xjeQ8efDmkHK0
z#Oks$+Nd9b*yOt&TGi47R}$ZcZ7UF4R9^?6koZ;QebH50UW_`jqyG3ZG~gU%@|Gpi
z-Ay#47bT~N+8GO#V;Cm|)-M2~gg)EOaIUky!C=2Ij(9g97f2vZghgRoAEai&0sn>5
z7k4a`9`Ateaj=<#%3Sw{Use~1iw`y8?flON{#_UY;r~A8w0^{P(kk^^xp0P+0GI4G
zIvRR7F?d0X5xar&VXj4?R6`V<%1+`$yqmiE60Jg4w`4e<D`}bNudt+?Be|DQ^IClD
z;kG6y+P$tN8xz;@lJ$s%0KWo+Ts(C7xz2d%KVo~=UOz-%NDLl8-=+kniW;bs>K)ge
zcyN<o<$<3C9!~i`kNW&miGsiM;e>kfO2tgzzgEonk5uTDAHBGoMZV+wZv`IUE&fy3
z1IhxF1-M5*d+}GbA!s}QQ+Wx>0+hwSRH=G{dI9Ri|LuAq2L#sr-3tK3<9}DlgJ2p2
z(;%1z!88b_|JyMp5Hx|H>Hl`n1Og=xDE;^2h9GDJK_dtnLC^?-Mi4aq%vpk2O%N!7
zKnVm&U<t#|1}GqN05S(4a{!h+tu!J6qh&B!2BT##S_Y$KFj@wqWpQUd&>?~j5p;;4
zLj)Zn=nz4N2s%VDSp+&n&>?~j@&7}IC{pD^&BY&|_ED>q;B7ehW@Fu%#4h04KfS+o
zT!2QE;sIf&xE<Ngmf3Y)b-+>J`rlo-Kdn=WDUC<H9kg&?=^;JU6eDpPc>i}_@B7=d
z05=62e+0cvQ}DBUxQng}us!De-=A!DLv~$VPd({sK%VwWJMDS5e;J?vW5O9vjsDp!
zyJWi-AaC0Bck}ThQnD_SL*56gtkT8SL~K%)j{M62U1TI|_9EeD<8WJfr5M>4^uIrB
zElom7i#t`hxj)~0*(*uN3YGq406NnWzwj3FbCHFz>rACC|I>H8HAX@SK5xI4b#32D
z4_Jg)DF1bU01h{AVClQ&&qZ2G$-a<y_fK2$TXn!Aqeyj`utR^H7B%^o0jgkpEC1+;
z)SrtikdXTNU!PKK%3Xu!fAter{g(k8@q&Ck!raPf)2@GcN|1{mvcIgfRv%3ImjOUE
zm>dGt0JH{Ta|5aYs0N@KfY@LKe1O&fv<9Fx0IdON4YW3Z0izVC2A~><i3m^){<l+u
z`yK2<0HCtz{O>2PEtAh6l>|tER1&BLVrvDe0jLI`8h}m#%rAgxCNRweW*fn5V?3C2
zhJ#7xQcw+)Ks6B8xPaCGR0B{AmP?&LrvO?5Pz`<-K7vjGv<9G40G+~088m1OKx+V6
zgZ~q)L7fBuh(xIm<vjmx6+hW?WFxS9gY<{l-xD?ZPrr0K5iW(;*{bb<V$3T1JSMRG
zp-qW*0w>!`DSbsNXBS)sl{dsVo8keT<%0;~4}xlq0Uqt_pDADZ>m8=RTGN969DR^>
znH;o6{&SQ;@-krmpOY860Jl|`#lpW&Qf!Ek{Q5tgS&&dNsOs|g`wT)1usO#1KW8#l
z*Y$iTGX7^E=@&r7e-0a%0*&kaICg&zv<r}V@y`s7NJ(mi1{8GsJ&=UN0ifvb8QkBt
zA*S@6L)1S5tu~do{r3$1S}MK#?}5Oj{!{@#3Vf<7$`2~=ictXf>d%kFlaK|?(#q!r
zf)-eO=x*6YfX-&+1S9BImycm8xquJ?gb*MG7Ka()hJqm67w?5n>%hon*)Z<91qN|H
zT_qT=uEbVgX#T$tE+7kWLl)$gmci2o9gs#_j;%llvC^6agb*tZ1B4L&=^q4A-pkQ8
z2q8cS0TM1C;Q|saAX@q-!wV8FD@-&<xcp@pLBa(jT)^}cn4SXbmOyUl?;<gfTLQTy
zu$X71bVCa)<^hX&z#`dyN}s_@9GHn)sd5A}aVv%qL`xuA0?`tPmcVm1VA2shJq1>I
zgUA2C60PN$Ua&+9JiiK_i33k1gVkvNTU4WM)WxU&-3#Dn?i)O|`_oH-CJHoBpo#k5
z!bE{)32br#*71XN{9xmRzavMmG7YRu11r<O$~3StO{)%!SHXA{Z1g8S(+3_|0FNwy
zzz_t6ATR`hAqWgXU<kHF2AhY0&BMUH-apII|DORv6rLZG{N9jve7)DC(<c8LbB(_|
zKI?Wq$Zf7MP0gXl*%rI`DR$SHjH41)Oy5YC-jP3Jy77wX!yfNPTVfA*{krzo&@<9!
zM)B-f4G(=CgK`5M_^r@58V1=>R^OVg<I&EK>R2$zy8%ck)d3PufOB2(66;)+e~ZzU
zk~Vdhx9Bqa=MwmW714ll0ObJg3(!7*b`ta#px*@H0SJ>oxCp{#5EX-{7(~S&D*itT
z6+g}paDT7Yoc+mv$ZEw%tow1~>pQ!F|9Z_7*b7(zKbHo`YQ1O$Bre<Cv!YDovu=C$
zZC?g~vah!70)7GV7ng6c{KCt(Vt{vrA6{RVG_-tvf92X&w;13Y@P=M5zRB{-Ow%PK
zUzEw_VTo3hZ`~ETKd=6-vpm{Wj_Y5O`fD_^0_pIaLmPjNrS+oe-_0#FFAw{=$kY4h
z4DO3(@Gqk!S+AKgy#DK7Gf0w<bdi#&vrtStx~ZMzlEYuvHck|**C8vjU5_!NV(g;k
zr^gem9$p%gIsLA2`#WD-fMqOKSIo@KWbD(>y|}gZhBG{(sJCk9V)+C^{T3O`WZ9^+
z1kYrw+fyIvYm!}SMinnN6fPxQCu?fFlyzYic`qsSWyevkn;#KjNBt&G4L#E#PjZ1Z
z4miu63#sVI0oS;6quFic!h0Q;UYX1|Z;OAV=2WXlJPG*#$lg6_3YZ51I~Hlqw-`D6
z&ec&vyDtkxy|wWfIf{<$YY#N|Zoaw7%`xA>1!5hM7s1Wfz15Vs^TBxSc6M@L^Km{o
zkeHJ1eQ{iOcDq!wp7>_2RX?6U-`WNLKs0R@?ghT2)MZ+rTpE%;9=q`}c`4T7>+Jln
zwO(42O<~yw)Y)jc$u-+}BT0qFvhAto5N}Mx+!-!bEX1|D6;7a%ddqBl97HwhcM}o~
z5SW;)a~F`)?#`Dlp3S^e1AE%L)Ye^h*V$>$pB))T{f<Ow$F{WHta8mdY@((0Z3AFc
zwJS5++MxXPm60?IaACD$^kj9R&()r@hc|1xHGF+_yUeb3z7jiQ|J@lP{CZ&zF($Qj
z>XgAZ3#E6SF+keKfZZN~#!Y~`t^OXRD%~M%%enUCWA0XM1)7A^iU38%{jt^|^qAEI
z@}OhfcQ%I$?=zl9?+0=NhPwDmcg9<y)<2Apd*P^(OM>XH`6E#^vZ<pp;?R(PTc+}j
zw%b?YlXW6B4-wk4CzPQtl$^u)Me={tZPqxg)1^*q(>}aYet88`??2<Z`y=gj6eSsb
zzsx_Ef9NLcNiUK+=z|QId|^&3-V#3<B=6M%DHuLj>|c2}<CoK|1yLJ%fBDQBbYlKt
zH!dTqT@Of<NJuu8nD8o6!}a&lQ|j2<ezM~%Kk*NO>}}<(juW`SwKHiZ2m_J|`v&}a
z;+nan<faM6ee_FTt;_B)Ko79{^%>$CR-)=adhHN`q#FKgqVwivwP(xkUN=!4^rSrM
z-qJKC`0~iu<ltPzh`+ZA@vKsh_^nE&pOrXyerMaKb_QA~5cx|dHEPa(PLM9Dj*6yl
zD{8~QnaWVPL0Txo<yDigd7eD_NVg29|D875ud&pc(3++gludY{$r<+NzmOapZ=(ig
z*8wScLiAAJp~ZJjHlr<zANiLWJkIhTWfO;U_xEWTs$L`P0%S|-VAJoYXV(RnsoAjD
zYIj&80tG$DWN=9@y2*KCygYSnRlA=|4YTtX#jPGo=+^$IpqzBX$JkpF2&6~O@kNF4
z*w+?1{yPF+MbN&wwZ%zAd)4;vT=pRMH*Kwje?FoiEgSpCbV;4(IjNwhv=@ja>i*Ax
zCa#)WnW}n869yCBgZ5T_ry&tT(pJt#2ZZ>>XNuQ+tDexT^eL=apC7@*%Qy4tEiBVB
zQ$kk1#i3j!T>yzG&YtL<R`28#BAORP@Ap_}ZMkGczGGEgGFTo;mAM*D{=%gE85pl1
zqDgN9+#Ln*Ao6k1(pcaL4(UDTl-<N}tM8s^2bDUTMjtc0GAvlPXNvKkMw3{658?7h
z-xis%`wtx;<`hEDcZIiHY$SVb^IOZT7)@f_$a|aIoY~X7`BCxFGurCDlNFoydT;-p
z?|aomUAhjCeBl#&(K_wo%^FM5aN#p+|HFe;)WFKt;A#bb?dYXh%^%Yyyt(a*5TNBc
zLV5aljQb<X$9*4A@2CKAZaj3KcVKOEbj8=3MW0cNQ9Z(_o3!BBFXlpBC-d|1YW-V3
z-fR`kXs4$Lb0_8!%)7szGEkSn<u+JYaUV+RMfLJhGM1*b)%UEvE5TC}OGzh$dD6tP
z0GJ<~M!3mrHpT68d)ai{4e}Jq)~fdtTx^$*7BDx20M9&G1A($pPmI&7WiM!K_YCs)
z^Da|4bW~BJO~>w7fUe!O+d(YPTS2!fwe-U<TD`~Sb?pwF{91cUG;U~nYi&G7yKU0%
z1_F70snn+#*ZmBwYPV%+D;dD{N9Ra?i#;aYUQ|N-{{3c$pI_Pd^Nf887Y{u1Y}Tpf
zrDopUXvAa<c}r%b^rW77fS}F^*NG=Cm;acr`qWw?VEkZg$P=Is8pfPUpTUpbXlq`a
z?znd|vN6j5`BLHgD&ohO9T1zKX02qMylT%I_14L6W%khqf|3zX8>?&jpPyB3cl$Eg
zT~$_An%f!o>7!6!&g$gug9qlzK^EL_eP6ej1J9<cJ3V5W(MY8FkY9TCR^`Q+#t^+T
zMsaE1Q{2p}DHrUzC%u$^L21QG@iY1v<n+n-3y!;d%M3e4Ehi^)yQuLIS+-yIiuciz
zKR0Rp(tAC#kmne7wxGgx>g&NxjAyNw_X}vTM@fF#)_+_udwiSf%n(-d$32O|4g%(<
zkxwc6f1wAlONac^<q;QWE?L1Noz9c5bnTD)Jp(n?z^$q&KHWbZ{`T0TGu!tK(7t>@
z9g84^pk0f5eDAb6U-g-pEOuHGb=_mPnK0V@?TGK?oj#b$eQXzu^f9}ugQ1r2{e_<l
zcCI6M8*c)nY|k}28T`3r{FiN-VH<j7vf6XfXJ2{aCYnFHca6;9-bHH<uA=l=D%@<C
zKw7JK<kI52^wtDb>s1!5wMdXN|M2dM{XNKh$k`LhwmHe=A@%W(7ZLDD*Yiz7`@+sD
zC*%A5IOPtz$|s9&^<wvX>@tgj^kAz$<*fTN%1loACX?ljgJWIl+*yamZK)jry8QJL
zTI=k7JvVw)^MQ2bO}xjv{_`VY?|-k=WasxjP22yWJz4DP<&P)ECbm<ZU!tUW1kdD@
zZwgYjwTtA3O{F}YHC{5Qyy8Bn*XiUeI|pY+(FpA(&&LYh7;wHxt&siRZShrQf@AlY
zc2=9+WmfK<7TG#S`1kn9fybLQUO#Sv*M6$i<U7N&UI~o#gAbW|%HcR0+}3nRiIp%M
z&8oJvm#O<e<D6HL&OXSMIXrtPV%Dqqqs`rmH#Rno`r}q>uA1rm9*g?^pBd@*j%64T
zbIe^&+q7o|DW}}+eeR(3KCe0IP0!8VUDll#L}#-0O;WL={n=0h+@=d#pQqIn;CghP
zHgy+3Hn0ETQ8wx4vY@`>Gq%_`>Mo#ECrM}E70e5O9^R4!hwj3WXn?yxOm$GNItob6
z&dTRjCmj1lRFibfJPHX}_+r243bfcD9Hx)MkZX{74cYM-g{vmhD_hoH`tbFlROx{x
z%9clyo*jENLYp?<GPyQ-%GtBwx<QkFm;$-zZi7>NMiy?8WsfVcPBdywC%0~P^0GYs
zz%A8(o;NLo+%jo-Om;@^<BcC<4SyT(UV2Q4Z(X)Da_^>+O-KE91lc62!<lZONBy#9
z0(#h*g4dy;)utgW{flhb7q1&g-_jt{ZK%h}wT1q|_Z)$c`wm(MtErlPje5mBEuzgH
zH&$*%^^DuRqzKefZJVP@I-gY}Qz}dGsN$i$(p#OoJF=VAnr54OYxFUdXpij*VIH)t
zjss0M+b|BReN9`Ot$l+0ZhK!~p5G6BtT#?#9*K=0g$9lI-_YD?)!i?L{18b<%iHr}
zq4x>W3|RMKqktr_R64CP9u03nw{$RlWphX*bN%wi5$wU&R@)`_FeO=?H=p6M`@ih5
z)b?J_e;y$uM0?~Fsk>^$aQ#28ufaugb5WSiJ+Ll;wJ5Rx{^L{J{4HYlpf&8cyK|%K
z3q$|AMkCx`l>hWG#T9&vd*c!+f(g!|XU@O#IYio0f!y6R>aKY}M<0XM?!CzDK3V;4
z?%tW)I_J}uHI8hWqx`;BmQyq!f7n48KQZhdxjPL|GRu1y=gmET>G6(L2XJ@ukk-yp
zZv4U{<Go1a1dEtixXEN`1V7H(c{=xG=o&;B)m8V@JD==lyABL#^@WWr%%9jitCqG<
z=}YE*x@z-?J%h1&<o^I(!ZcYrM_B8!K=)TuY3e3?kwfWT8ncg9o75O2+yBPIMg$o`
z26{9?Q%mIU1QjA3z0PXvin6ReNY_8$8OD0TP&`(u_%x;C5Z&lWbc&0~9$??`ktMlT
z*3~0zyWqoT2!wT7>KSJT@USb~>wYbnChvY@Oy6sQZ1}!=?`X5%#BC(+<CVPhWBMEe
zEs}{z_zv=^jD^in#v6gx9m@S${&ekKIL}NAri<pN4|^^UCm%C*Qj=Q1YE$D)_?{@j
z%OUK7BDVH!KR}{8T!!|$+WpDuyK<YovH$l|dD3+k*Tg_0?sHE_Xo+!_?|7UEqD$2v
zllhqUX#1yEG8N%SQ79^^tuT4^v7^G&1SHFeMr)pa=y)RT`GqP{+>&S?j(@aUwc72R
z7(4DhV`)fKVbDGq?7+oLSWO>a7i8OeCR4B0yGsz_p<9lNxrcXr=s57UXP|lypS3pG
z*IzmHxBajlGDbH$q_i3B!T(Y;UY5Eged&B^nl?N?WoD@d#ZzpF3`oV4I_wxTAN<pz
z{udU%G_spzxK2VVR-$C)?(XsOD205TCk@K;ca@^Q1tQ*Vdi(VwtLE~WVO&G-FQ3nh
zk-A#^YCdRm4~Y>pp!7TBT*wZYpz6)atz}ykGyhD8Clw^k=e?}CS#z)i<Cpwmzr*0(
zA7htld!Bt!ADfhU<<9eIr?iFo$ya>%I^a?Dj{juP7=rc_I-&jg*j&@nHFS&LgzR@?
zN5m6Si_-7*queoj>kcgOb`#bW-t(F;jO-XK8XT!!_sB=W$L?9Q15mxrd?xZMkDi11
zO)*K!ZaIA6nh!=Q_s|VGZmQ+<TNmf|XNE;wxjyf3`NrBf-uv3Rim*W1pT}OCv*ekR
zfw1dMGPg7jm+hXKfmz;*T(u^nmy3;?!Dl#A2b^Vdy~0AG2*^g>CcsJw(5w!4voIBd
z6wj!CDOn&nk+t1mBek0K{7TL2fnLSCiBL7?sJM|+Uq9gPlb((bi9ua@mV^CuUzr-h
zr)L$a>4Vy}hg`OB8U8`+qJXCP=59<@I`_L~D9^isT;1GD2-+IZJ$yCUpktu2KJMeL
zzCEIcD%UZ|<ruUYy?z?ONf&FG82)9=e`EUBo9|bi8a)C3w*B|^#!Hxlvv6F}*rUPQ
z#J1VO&sTk2?Emzau|c{hGT_x)b_n)$3HB|`?%m~HT^>AZ&U(y+MRHlYhUz;xh~9<_
z1XNFXbkYt}b}{10Q~Vak{Z{r-0{m@8&3jq`Rz6ViPB9~x4x>1^V1r6LZ-nu&E$uyg
z$yJD;1da0L84Vf{+K;HR5mjV7oYx$2#UO1RX@g=M_ms0QV(imX?1^0{hW+uQH?P{6
zt_1+4s`I~}yao^RH8JYWdXBD#mQ!EurtL;vLOd@DUf`<K{gRepcrz^BqIAFewNEON
zV?7@n;ZHsEdry6Ya3kRnsY1b{9jlc1l>(m)6^j1rc?UcWr8Wfm58uGa*=cC*q5kH5
z<>f)TYuG_ECI5Nal<0?GIq(7cZ`3E7IJTj8e??&At3Q3|)UhY)#PC*cYZv9jMb|7&
zZSo4ae8OTbvA*WKu*OdGf##{qqGyySkfKf^*1GgwFeyNoBpbMow)%{PQoaNR>tiZP
z!<Z#Fzl(d~kL!1%3VW|}jd5H*)!8ro>7VQ_GRJO?`l;?TlODHk)NESwrS#!ggSNUZ
zp+N3|`ea3qL$5oT(!)A&FZANg4^u9FzKRn%x<+QeqZkcmU})%)M!~P7ZrrS%%y{jl
z^484woismrMPo<o5~O%zI642fjRr0?vv-HQH9n>7f6%r`zj}`qVtjyeSa2}LT`g*V
zY3(Ls>IDagXHXs)7uo~-(CDoBtdi<cpW462)}sB%25TP-x0%CPd)6jnGF`oYr_pGT
zhFt=4%&{>f80UabHvHJ6$`)PhOGFQq^{XIn`|rWLYjr9w`8sgQ0zLCQwC3Yxa*TZ^
zJch#Qr%-r$-p%cl4vi(wsE{DRQC|)XuCgTm)Nr-PJ&iv1rTBLB`oS8A2hNEYlz_cW
zoX^K!Jl7$2SO2uyfQ&@_s`41>PMRBUy-sW5P6KTXsV_&v*vIdQu}K*;EQE5IdOk6=
zMVZ<=+E+KGL7h4GviVQ%`CbRKdz)q;L9vhWsW+*wgi|6P%{|q!46<CQ!n5d4GWwLU
zQ2UuCXesYtG4|Ob^LR(gk_Xu-ll%+J*f-2s?rgbgIq}Bn0_nPbef4UFSzXja@sR5T
zLCAZr;tFoRR7>w@$u_Y+O6hXNEm2pO)9-Kk)#CMJN(zNonO*bC%_a{=>DushhWyTq
zM{+S8Cis0{pSv5*Cb&*ODz`mxlT0vJud~4Y^_zaV+GORN&u7@tIZX4f@WR1I=(8GV
z$G-2*pL(6IVbOv67Bg^Z6_oF(h{y7GgEOjM&~n{9lv>M9UQ6U8tEZMhOFC6>X@#EW
z=L~Kx@>j=5NZ0Wc79&0dJa2tsL#`TA`V^4HoGkj0Qx+!kRPIX4){E7XE$~&MkLJg5
zrysl4Q(HuK`A47K5k3#Q<p@ktXDt@50WDo|+88*3RjjptsJM!8+3L0>{fX0u*n9jc
z^84o@O0Hiff4ljoiR$~@1}8|#*z??~;I4|#)6p`gYdotzeip<fo2Z{iofeybt=H6&
z3=bAb4l?sLn@ws3Rd4U@Qsb$!L<B)=1NUQR$l>grCdqw*X)|jN^VN|v-@4}Vft398
zQ60Cu>+LT%?XM~k_#*ECYG*X6#Isl5NnS@C*1cx=&elnynIz8In4m~!-=-g3=t|A+
z-eFl+KV3Kw6MBg$dAZ}%{(*(Qe9q%rv*YaV#?oJoeyM2W3zSs&N_D2EmBie`hRvgk
z(NFK%I(6WKf0T|l5;HS5(ynC;al?k~n5{Ez9nk%Oot%L_=hRIm+a)(4n@=6Klil~&
z=^0ldV5X{J4ku<fnzcWL+Zns=>IB5@U8cK&TKPx~@FTlv>hRw5zf+Uzy~JnjZu+Ea
zf!OtI!<xCvKU$Mok*Y1K_UY)|Q$xS0O$19EzBrMWPPO!`Z}mLA3}=g;BIqiloyMbS
zAG-A`Rd15TP<GRR`qK9f3wL*MAYHcWB1*<C;Z^f^WhyDxX|<ymc@xWSuZ>DH7U$z`
zJ`=NYfXga!@}be;4q;J1rBRA{T<ISP&{Zm1W{(Syylz**+UiZ`4<j42Cbop$PWsIJ
zhK_t6A?CF_H%U_MW}iOwe1-oNqc|J8aQDuft|_o?7r-?}yjVDt=q<6HAKZ~<t)#qu
z-t&~iWeu@lz0J*$Cu!!?_VeW5{gl@@PL%w18NIYo_$y{(Xu77-IfR%31teW;;4jCL
zxF*`;CC3(8(a^Z^mk8FD+4&_0(dcxeAW2L6Qb^q#JEr2w4d1=Ed&)CuruySal-dWC
zJIB-gmCh;ryvqy6n+y1RNs0O;_!%NK?U?>IO}}0S>R#KTbeQM@u;j&-x}=J`{-;HX
zO7^4BbIu0lWgY{$Grt^}vCCp+)^OjTwET}eIk7UMU^uz5E8eWO%YMFFe}T{+?R!Dp
zL4t<t**mVa&2uRzW%^05=5K)PSM=dWS20=_LY!MFc{%4kG`t%7wZoC7DKOegzt8)I
z?pwD3kXpOOa)%(k>J<5*Tl<6UUvFh+sgkNbo*qnWeB3rq4SRGV+V}H9?TM|EL2_u?
zWK?+AWY5N)^S^3qRAV$TVMN#a?lR26X0Z~z0K$nATh6xkJx@Lv-Q(6_FO?--aU0{k
zDUu>Q*1E))8hM@QVfMOF4C8(K_`vM6Fdj$g2=Yu{l|-mBKf(BwICA%8?yu+drn)=z
z=Zn*;wSNo*#-+na<>U2G$le{&V|eZL+Z5Mp6D62uajq{y#lnb@d@(7T0%v^L_F+%^
zgzMf7#&ZP(r8T#d*B}4xBW#XlVWS<meWaRzPS0Fo>>h8Y($7_+i+3^E_BY0})5fAb
zkXf`w1Fk}L>jwCr=a$hn#n<+k+Xl4^Yl^M%ROLMn;g1Xxacr+g+^4Q{QL)x*w2<;x
zHOjrVx1!5OG-Sq8OB&OUxD@x)b<F7ax3NFCxp>{};vKpf&>bE!DF6CtC3A2yS3+`^
z#FL_(%bADeRKfvq(%@S6;5DywyZmo{70N#^N{d<He@Or+l)+pauf1M*>z!6Hq5d!F
z2CIDcTW`<ezWM!p*@ibi$9u1^l75JhaF<;j^JTl?XZoGME00&oM`g8%|DKe1o09%~
z`?83a6B?#Z#P5_geQ*3%wp8|+IB#;udums~s>U<A8D3Ib7Lskxm$rTsuWLh$I6ad6
zK>cCyk!<^<!fA5tLYn<k{8azMcw1Lf`he4_?h}q>Hh*qeAa$p4&r$Q})mH*7y|IxU
zH#^K4kxQmzF=bu}d(AKMjSlk(#4G1sZ>ARD2ejO)d$I1Bc1v|FT^(J=);nK}hHEG3
zc&qS9(4vP;q~0WrLj)|0a>~KO+M(&Yv$Ux)V79LCXyeg`^Emew<MCLUMS{|dF@J6Y
zFXuxPjMV$|hUcT-<0tyL5APFICJcNRLa9}Gx=ytouV&+UZ#(XKf2xBQUUx(LEYw=Z
zdy8ftD6_B+E*8YYLl%@-)jXl#JSTV>?aLo0Wge-gWe!P=?=wscH%T5MHX*s_DHLO?
zNkDXV)L^!5Q=hR-rJv80<1gEXDm$p=e4(@{1n94gQkWe!iFOd+reE)QKaCJ{-N|h^
zv**+aQ>^ssM0K;wu<jk3W^fCcg8mA`^umYT9VnRKk0<O6ay=mnIi==m^>27z(8dxa
zQ4L3RpdWuBRtn~-<l!1M9ikugnwwPO^)!UJ7~Q_STl{&c7lnK5Qy(StDadl^4tQbm
zhI2rnzKIS+N#d&_;O-3xzqkHJSBH<t)snRFR)^2_8Q6(cuW3kOcINm(u;#k-@hP@q
zi-@=YZ`2m7OE#9%(2V)5Oh)T|=$tVUNHgAd_qI*rMhEz!)Qdl`p2_xSolFeNCM~5+
zGZjKT9Hi?`NWM5K47NlLo%mSRK#O&`zxh$FBeC&Z(>4>V+vgH(l?k7jzAhWbt0TH=
zG7?y#f(StuBs10dcvmZu{Anlr>493T<cl4mK*8wNvvCfy<EVa*0eBetK}i2=5u8gm
z?D-sk!bg@xge-{Cyis0|5!~JrZ8iQp=bm$Xn8e|yz;W1*D72`?Z`8IfK<yr^BM4O#
z?Uo&}IIZUkakz!)q3+P`mzouND$v54xbAMXl%;Gt?9_FhTGQUeCK8HoK0COixSW>p
z$VTbP(Fiv+3Tkw2im~{Xi#FJf=WfdTA3NR5i43WX2=0RE`5^tmsz@m&72l6)zKfXo
zQlw`*?yRauzjJ?tYkZG@LlDkgSB6VWk=ytgI}Nsz@u!>4R*;H^56x1#@onR6*WrJ@
z@|Bn*Ma3}H6nkoe${h9|u1L}>n1r}xm9-~Bk%gMrFr{0p^yh8^wh^z=j~zK0Ba2rt
z?}}{e?AQ%-Zv@7q6F90n#v})SymUJ4!oT-)mFcNhAzRl33<M8Qn{1Z8;g7*@Ie+%n
zDc006`5!%-i96fr7RP@{hqe=?yP_zjm{Ah#*q5kIi_v24)F=^j%A~C&wNykB(dnhn
zTohw(5pAbDsHGIOM6{-4QBf|6N-PN_B-11$k?p2)?{nY3;5?sm-uHX9cjE)yy7v)R
zDU?r^?S61oiObgE<ux`_I<y9I9w1{_8L`vPjaf%W8<_4?s(qH~6OR3(Yvab3l3J#`
zH|2-xux(1&@UuRJ_WB_}Q2yzk9jK8X^OZJ#uG%`euUD559f|Fec*(pTUp?2QzCM%}
z7UZ$<i_wm`Qp``sZNbho6aS2x>m(0F!4<9Z)Kw`Z$6fVl*f`<+96H0D;~@--#es9a
zK*|j4KUNn=zK;^uqI@YcW-VDnZFQZVR?Gk-Gl@Dz4+(5LZDcSrY2>LwpikXyp_zPz
zb}{XTT$w^>W}Lyw9;eD@jD+q-r=ly9`6IUnZHXVlMT<S8V2Y2UWg4j}cdN!JL3M$D
z?(h3~69bAI|K$&P$v5X4N`_7Azl>*k-mWc#eZ0rfvQYb-_@q7HIj?QFmoQ%V%X~Gu
zYbWotuu{@J9{Sp?nrQggquCZ<-A3HuW%5{XI-wNbqADq?z_2}Qdy003c?6~@@x$P$
zuv`6WQyJxu-^S~o{;T*tJl*%Y^EQPvT<As`k}YX@xjgI=E+HPPnj<CMw_|eEUlsU*
zS})C9o+D<Y3<j8Vz2AQ4xBW~-TNy==QkXK#R>b&<<(aD^-V(*I5v45~ol3F&(yBLO
zzDsVL5bl<`0c%gd(NkJc<_rOH`?<T-)xb{Oow>J=%!7uexU`bZ-J+4q2u!e^Ncyi}
zzUVbGytJu8xJ>d?r(rLW{IWqrpb}Pl_sDx{d<8^(D%6Q8jF`F`(JE@Ww=-)?Y-9b-
zRX>{(#>2bEmGqwT)kPBe)LC?21W=qvrfgG2Hl6f)r+YgaU7I~ad1nP8nNc_V06+kZ
z-8E53`dvaN3zP+YQI|=8RD1~4t-H;6LeZ1umTr%K%Z{66lS`=yQ?uZjaNXLriTxG`
zu#$~h?`WD|rA?hxi&zo`v)AXIJ9LoR990q7(l35!*diN#wM;b*n!|qr*PK5z5r_n}
zwoNo8xF57Wsk5_M*JnvNBI{itOJs$=PM-<v=MHtOZ|QjtSuEq1J0$b5%-O37(xR5v
z%#jTu3+FBrV)+D8oWhl}6_XR0%w#@P;;AB*T-w|Cwp{<!TL=*-_L9g@_g*5&ZH(!M
zObhL;R!5_m!IJ?PBh$XEM{vMX6g`=4Gwzp#?n`})Q@00Jhk67+f$w1(vl(eyA{NRr
z*5hLyiBh=lGnb&$EW1!Cg^#IM%7yU2=fhua@?ezib>}nUwg|IZ<j<%+Zbp=TbCbiJ
zKbJwiBp$~uX@w&IalU`2Gd)p1<b43ts@oS;w$6m-N<1t!r~0p5D8w;Qq~nG{6SW+B
zyjygm5*h&%Er_AGXW=i{g3g5Y=5-d>TJ+a^ms8JGcBH(%aCtr2zZx!<t+s1Offsi4
z8aiD^t7RAWG1|@tWkfUnAmTMXzP4Y<#O252a8RU#B*7-Tecjo+qLT@i4|z;CisBEj
zSIH!bxa!0{jUeS>_(+$js}{*Q^IRU`{ufTzfbDhPk2!|{^43q%#fztPL(6EmsX1~8
z%b5&V^DYZq)RAcX*_Pc((yQeMgx`RVkj%nSa6$y^l`-d=8m`ny{nHufu}Lf7f@}6`
z-Yr(7%ZzzMUx(%rZAEt8q}yk+P*U{;NT$VZOpCoS>nS+8oifsxR#&tbn@XR@R;Oun
zqR7j96I_aQ7~?0E6gep1B)p;nayR~awaL%pa)mEw%xxQeMeSlHC}b8ai#a~opStq(
zf!N+}^D6P?a0yFUi4!b%VtUn-_LV0EiLznFHKfu!c+=Pf;HIHxN_e)S7(qeYo|#rv
z9lxONI%o`mKJR*g;7jpu5?tW7S_*Jj5Nx(*#E3-nIIMD>#gUl{Xayk~xZ(pGzO3J6
z7))s8l??V=hQ5e}WJ=gSii9?S@QhC0F;#<K^MuvdQ*cq{ku|46x4eHJ1<1<~xJ(Lb
zk7B83mLI#mw9Rz7)O2fN$yTRNmrGziY>E9zIZvLp%p+6DKBGrP)yrsw@ed4l5%@|0
zXzU@TEh~PsiurQBW4pjZBBJN0_a?3pGX4OhZ&rg5+*+BP=Vl(F8Ey?fohzwS<edbz
zdG-@zi3ct*7Ryw0t8b|(o3+E<LtIm6{@OVjY`+G>nd&)g2?Tp->QbBM@7Khfj=v#f
zk>1z{DqJ6}2bmiT$#rjQdHwBcGIJHpQGExzh$06ZxB;md=zhVdL0Y*<N59zqwU7v@
zsnmuVTPw<)UEVD*pt?ydvRw=7PWLfPzx|MdH(mhNU0`8DlbJF-3t!vi<`f1fRz-DL
zI?xH5;0ipONRcxPTeM_^V<8;f${V6LkSN-oOcmDtukld3N*c{b)s)OyW%!*?Epne9
zms`OXQ3j0IB&@zHRJqerAbE2T;3^NQICVb5h>fXI=7$$qkr|fwbg7zu)w62$9b%dm
zI>1VyEyCM$%C4!RpA2BwoAI+Dxrr@48p+xq^{v(qk2ag+J9)ZPBO?%-y=z`b5KQwj
zq8~_&x}gVv&DS%$!-e3Qe^Q9<xSn0Muj;SmyqjFG&>C2qpwG9miRwcb?UI2a<P+AE
z!`d+w@X-UhER4Jx$bV&R_K*8dd^tLE*Fix6cAxBA&ZI`ytqaUiiCDH(7*NdfmO%~1
zc)v3mp%4oc@g2<^b9#l*tWlj-%^Jk}LdeF+Jja(jxlCa6fxN8K)jO4XVNMTqd9HZ=
zjnD$Ihx;swI2R7bR^Z|%YMc0+0|EyZ1a@K?@ga6``b4e+z{2`ZhSF?G`}so_)5pX^
zOg7T9T%T5@&*~X91!Agk!wa+>8l}-eV@xcS-ulqdcp<=AJliB(GV5$Pz7WxS_4}Ng
z%eS=#qMLSqp5jD@d=}>7<@cP|<*b%Uvy)UZdu_Tb<nGa+h$tZ%q%n;3o5ksVVv{Q?
zURLBkl7{k;X)@AtYq>&$HUs>d@#K+1`HEM;KMO1SEURD<1Mk2!xx<hbNs&=53n2+a
zt4CwKj!~MZDSJJ$t&HIB{BSUU>qh%FqwUkJiQ1I74->}(n4hK8D(9jV|1nTd=VQVa
zw`=NAB4Xy~`{hlJ4#Gt{C?g_$k!@x-R~p#V???(i^Vb_<Uu;ijV^2qAWu=*ZVkya%
zogwgk8txosXJ`vYH>+BQXeXa*dv$Yi<MPBA(Pc@N9YzxmWQ4$3SQsE~mRm7IcgnV#
zIt^?Ax{0le{XeqHwx|$h)k^1ybY8zxi0SHmGx3Li9|4LwOf>m8rBHbgAXIt7<V0@q
z?Y&M(E8~BGN+zpb4<7y+pvSiPAz7<=yeE43DHwHuO)Vo?1y~O<{0x%pV`ji>WFN;t
zhJ%*Usw$0S#9(XGHg2<MLVB`>zDnc%5<Sa_i;@vFh$gF2qM^t9uNPx2PzQ%kU(z|$
zedy)`=-J&~6_}*qeJ)eXvX;2SwzuwS?3_;6UXQ)sWtX|3@h|x~>t3lh%8;m~&Tp!h
z_~0evA2X?Y^a1YZ31L_o;*BA|CD=rU+B`|tZzw%s=xL`4RQq<`(FC#GE{kC>Js75#
z*slQrOLF=;6fG4TH3tP%7fmac>umsfEA5KjPTieh2f03I?6v<<oo;H36zOnNeyYA9
zJ>~d%2KNeiHhbTa!`iL+%~hJF@b{D@w7I#kB=&e=-wje%lJNiwnSklVTg<21;#E|w
zC)@<%MJ7&Nc5Qd>Or$`)rL;j<aDDDuJrlf4gDb78bf_IljyCA*#UC4{@1DJwTzmg6
zQ2r-SUT<BV@RQxKJ)@Z$VcUE!bI=&EZvRU1El~xQ*7v6u{&P(|;ML&h8i6;?mp#3f
zL9=CZuACFBer~LxPbJ%D-gyD@0>1b;%<HTDYkR(%oejN@E%qNcg%me<=t?ti-XW8O
zdmV3g_d}INyVg*j`vzYD|Euf&zwem!H1f!Whhvt1w*(4qYCed9PXwF(caad-Mb}Zl
YPq}?PH|Uco0W`<&e86|j-ci5)2P0Bu-~a#s

diff --git a/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1@2x.png b/RNTester/RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1@2x.png
index 7c79f2bcf1f8eee9dfc4f01ca9dc7de872bca5e3..94e0a287d297db25cfea38498f1b8eddb24c6926 100644
GIT binary patch
delta 19332
zcmeI4dtB0Y`~T6hHZ9#|&dQXXy6c`>c37DQq_WnU^U$oYRM0guHN_-6fbg+axz@pz
zD=Q6h9ne6rRPY2?R#c``2&f2X9!L;T5s>rugYEv^zdwJ!zrXs2j|V>Z;QMf0*ZX=s
zUvDj%n15+v{-1|{z})X&2_cXzkX_ri?#Xo+lbj*b_U5e_)4*?FvYz@qef)U4`@vuS
zKJ)a?$J+;=-#jBb^Y*0s+k(G8dwVXl?1ZE9*KZ3pIDg@~y7TYNe?N6_+B$8~MITbp
zvsJienU5~(Awi&Kj^1r*!U=HI)lKT_MmX#(!loG_!x9P{7A)Ol|DLtTysE8p8DoFx
z#(9g@wnFAD`pd!L73}7?!y)^75(<v5o#&X)-MSIpQ8fG7p*V5L66gAms=1fo>ddXi
z|AJru{u}KJ=5KL`QXcGgP3gbm20WX7=)x<N62~=Y{}Ocz--mfXbBY(N%C0@Mb=#i_
z{koJbkYj`D)2EL=S%9>h+!;=0y`Aa-paj!O{vE%NWZdYNK20;hkzMDxVjkh)o<cM*
z-1H<Z?<rZ5rhA||)~HMqv28HmEYR7PWPK-=J~*JMhvuq}^U}tXH(Pai2h%e~vb(`S
z`CBs%FO50UU*(rS{`Jjo3_L`L;mqjEg?%}bc~ISDG10NV$1O1B`3^DedMuEoIqpY=
zy!+l-1GtqzqcO7|u#o-wdfV_!kklj6r2yWnVvKh12*PzX=@ihif#TL;-N@I9h*O8R
zG>txmMntkjYV*(MRI4B)<HDR9iuD;L{U9_Sz&0wT(oMK{>u=XRA?jSthJ_mkOxHH=
zwlCa7tN(#j&J>Ne`VYEOtC(oydrQpXO3F`g8#v(Oqx=#Mn#(6u1gKX*#_O)A<7}4&
z!-iL001uv6vJ<j`XO8$+en(3NZ}!7ZO0G&sz&aYi<Y9UPi8192Kk=+~<nsVs?dUp=
zfzuS^4q@{COgBA(%uCt=SpsR6t!<uav>***D<SNu`)(+wR%0ZLnIZ1u8I`7R=w@3z
zzl3h+o-T&k4jV^2;c&uG75X~T3Op-Jhgpny!IOI8L7d2!cY{4~(U*d&Fc{P5*Q6Fj
zNhB|?--3{t+Fc9$a-aQnw+N+UjGk7qzmwoJ9eh1{W+b)BldL^Ax|?H_F_7#IJS5U|
zs~MWtU>F<4K&`KiY0mps`ye@HGf>*Oc~lz90SG`o(PV*b2&x5?iT3eJ{#;wr-HLSV
zcYzvj-g1~&Y12b5n3j2*%xKmMZ&7;8Lw}rIbCo5p*(TL<wC6j}`z^LewBh;mqe83d
zA`|E_Q44aK-ozU}nt0C9p(s?_pr9qzGk54&Abpi|a1B@W90$o)uz(z+)SroZ>iicS
z*Y})DumKTD{l@YW4hw{fKPbpBOMd@n9H)|lhYwo=ENme2C9h#7fER46$6e@ev`rQ9
zqtzOGv?MKixKx@somPU%l&+H@5XeZQMOK#4IC@u*Ld+INBJ_^zcVrt+;lZT?z3xTQ
zLERH7yd|&$DP3^L^5UpQbH`!g2H*$0eyv4(lrQ*q(Nz*rhL1?LbdbZ*_~)9txcW@*
z5G^~$JE!LWgofW{vnWxeM6*R5UXS1rCQvl1K(2bS8tYS!DpgL~GKQ8VB%A?HxbqyZ
zj~0CD6|)=yC6w42n@XtLesrP~tEW*Htmn8gOD8`ZZr(~r!P%5ZfG|Cy^`+r<q<eqe
zpMILFC+iggk>b>9vE!?Mb1c+o7XbT6>M&7?n(6!cwji`eSyD+rqNn;?i<-qZE(C<T
z6lk^11z5iX6I*xxL{_t2(-fIM-9TsZ4Xfv`ZEcNspTS$e3{GG|V)UH?RvyYUMu~lT
z4T)DA1d0M|x>sXv88gDM(3YYW4SmJpKec7d?3KEiW=rohKQ?3k4ZVjaDsy^9r`1iK
z<23MIBR<!=7Njr6K*{Dp4&fM@q}Kz4mq{^h1*Ikiktl~-cBRQD3l4T3v>XfZge*-+
z=q!M|dn!A>aNgO)b&#0RThfsvjqLTFDJVd08BFpE9&b_7<GKd!G2@Q)iG=iuUh414
z9X_fV-0C`Sh0|B6nRKX_RdCCxwJE308#!4~=#5zh?ulo87v@7|e05+oa{HST6JDLU
zim}lVwrp~n!@Nba@sw+iCmiI+=ZC~xT<wsjd2k++q-N4>Q;Jx2eg_wz;4aAeIJmuN
zZ-t;%^;A(GiF>JN0F$>%d_kt03`OT!6m=XLxN@i2Gl>8b=PGMP8s1b2HTQFnO~z=9
zYTHYvRyxrb9fV{wwWLF3IZ|piOvSJqErYafVZ4tAH!vO!JJgU$5x_{gMb-o0-zZcu
zU-#t$leZ8Zq-0nQ+OM#w<i5m9NVG;0j}49)m|peSz2MI8(wnOU_|Jr>upZS~PY6Aa
zm(+}8^HA7f#aKxhLv^O8$A4x7ZB@>0bhGpo?YGH1oyQL@dojR=Lml#9)8Ub8cs~v_
z-*j4#5|Z`&2~}^R@>M!|V~}kch(^d_%O`eoCS^HwvHEj@@?=Q<bi9?jM=uqWOChFc
zHC}&g^lay~PW;rr`Rx%_`KZA*;lEQ#ncyK%bQ?H%Kf;*8+b>qd^}o>4ecKhw`$Y_e
z)&lSjnOXnKY;~F4g$#!p$0*pZv4yzbr!MA%SQi(GF&ZGmJmSB`+Nk=mN-Cp!E2{SP
zPKrZ>Vp<nCkYIHkw~Bb^6z71FfxR&mlyl(5UF!x<i0@ZulT<sXIA5!b0*do2xnviI
zMQdvw|2N3SK7}ZMq@23xyb7JK;}->~-Pi+I?VZtPRI~MmE#}LEY&PFRl%j6}#0tC;
zUJ`7h^{5GtE^<D3BlWFGhR`^vKNlL6P)x}!l2?x_#-WBy?38tInwX^6Zg7Tg`*>L`
zpMfpy`|~X$*q&ayAT+(1>c74^lyz}(1TTRp{cOK#Ck_(`v0G@qRIXGD(0xKIMtR5v
zftN2GbzI=J6A%sT+}YV|UD0P0^~$x@6RKAmAV?iuUQIj_Kdx(e!nkXU!D|fE>ce5B
ztc5iZQM_Ay*>0&U#|G;$q&HiCp3bxGZ`6{Nn9sqcdedwbWl9S&woTfqgI}~>g2Yhp
zqixU!&a1U#qp78os2Gq1cDbxvLzoQMiFysh4&1fAjKv=hg^AD_6;fdnms|Jrp0$oX
z+(~weL0{_YGzFnpMC=2SL#8DQg?+w*YwnOH_t}vA<d7MwK<1R;_tCZHg*DRoO%WIg
zmrnY6Eh3W!X!BSGOi&lAsuZuZS*q8!wth0t@h0Tmf|Fpwa%Dkl(^MtCMiB+55r~IJ
zEY6iae_O^pN|-BZaqx%EFcnLsaM1=gH5NnzI~z__1g5iACs`tI$Lszm`AM5Rpa54%
zm}Gw3EM*%TRdDTTQF^-8N=$~oyM4<B_k<`Dr;P4d+Eis=UlzZpDCD-JlNnK~LO#_J
zbdCSrH*O!Wmbdk2i|@ttH6@T3v<u%Ais!~M1F4>C_iUl!jlJb3WUFNOo{JoUsU(&|
z*-wMdL(m)2(Z10#y?_@N6n|`Fl&Ur*Ikn<$$#KJI{KfC%t7FmZJS=^r)~1L=q@^9t
zq(EXyYDqGL-}RJ-4Z2DaYNm-2Oysgs@I$~YS?q$PS2uhHaW2UCVd=~ruL`+YAimWl
zvq)5`_)YYeip$*OkbWW;Cd$+tW7#-94+y=4@%snF4EdBQ35H#!ELY>4Cc%=BBAMCH
z+FJI$;w-TXEKpT_0Dko8#rf4AZbpXvIxD+A;}$?xLsAK|lC1dr#t#=}m+;45_R@-p
zAA2p{=)g@o^IokDEiL|dnfnK#@vPn(poS}c__5cbfA!~nd-1(^TT#4w#gc`+@e$1%
z(rSy3`>a?re+7Nzdb`eB`{%*p<DTvx#5K34<Qz&D7H59ywdi`mVEy*@qsl6NxZGo5
zPJpVD)^WX<w8U$XduGd(XZ9ysw_GTm^l<+mQ?-U7xmLfwxPQqC7sm^tPnOM2=UK5s
zpvOYVa9vRCrnF*Lcdtd^t&<17c&{%5?D}zGeRElMvhYxGl=}*o|7+I8$2WS+&2(;0
z=c0EmPyg3fB;cRgYp>+?=6p58Csm1`f?9Rc-OW~YD2x}-asgiE%P0vkf6ia%7mUW4
z8hQRq?`pRQ%WusQenAE@#f6vqV!AgP8U&l_w5g)>N;{>v-e#v1Q9S=i{gCc(uh~s*
z{N}ZZ=vNDAX!EcV{Wq#io%yYR<u28apqXZ&i3jhs@iLmzo2<Q&5o)5K{Vvxmv}GOK
z)Nr3kHk}aku`QRCFH;ZgD{1Ku;M+B4D!CW%$zcY0D~N>YboBlkT06HWC#e(Tp@fm&
z)Z`HSli^q!!8oN4hvr(+?z)hU_D=r=XPf*87SlS*Ie4=O5Vmj1xh5*&=q&1hi6kF_
zwQ%^E;hg(1r`Bt}`9G9=P8bM<erFlt!c&=NxCHamMrf%Iz(fU2T)vg}O(~bCOM&}e
zF&P4wB6Z$Cs7+U)EX^<v922bc42R;{loYOcWGV|Yxu17cs=1E%$&c_jG#T*x-VL&M
z?8=G^3-G+-J*DZQL&ssa@sqVszP))_>4{dRDAuc!2;zt!qnTONb9B`>u8}KsE^zE;
z(;G-OHvlt)ycoL=@w<P%A&gIr$a_3J(=5viv=D*KEJImxB-1iYq0$M1F62@lt(T1;
zgHyPE+opKkyz@zKh=h0N<@6PR41@<JBCZVq$EXy+U(fGUN!~f!1ohRbiT7ycMN}2Q
zTEsR9{KzaC2A>(jRdbKQ9@~VTAvsD8)YfmJ8U$Z@i6b;u<TvvA+XIbex3o>2$z`ur
zgRP8-{npr52(N4U+5C`+?l#u&(#X?SN97=mQGBN@`!~Ru88pA8^L_zWQ7Hp<+RSGW
zKyK2EyPC*lFP2?&On|Kj@z+GF^F)>7T6)_oc^TutQgn3~`O&3ZC}VUM;UwK#pSe^i
z&h~NazbYycAHwbohyZbh9(zi6&Lm62o{F*MX$PSJcpoxO){LN-UQj~T;jae)FZ}o_
zZPp6i`C%0nIwE9!)zU#g2N9p=o%4b8!U}@Gm1v1%@zmaVJ`;Z9762qOmOExCl#${P
zwK<K`o^!hh>}DJ2zVGy$aRD^};dWLvy{$+TJg}R}7XY0g_4(Gi-;Qo5pj3O(Mf%7_
z<Cu#_<LUXM(}G9<NNrLHV=3wMzi1j;tAQRbnYY_*2SIa|Ob(e6`iJ`gLv5eh`c`uK
zv>Q^>>A}MTRKy9kH6^kv#M;RWha0W>yHKKB%(c*P^@m{#Y2#Z#vce9r%sd+n$r)Z)
z6i32PR+-1?&>SP<w3Zyr6%1G4KT|we?r)h`$Oo|GnRlS9%Lb|i?tt2VA6)4IZOpnS
zuZag#8>3;t2z;EpdFW{tyd;snA^!~wNW-bqY*?-1-=*l5qsG^IE8*VTD7QxM>Ac%K
zD-|Bk`e7gp+KjuWv5t$XQ5}Qf$>jUm##Em1tci9g4wK=QCOliFuqkC5)s088fsAxw
zWHS$TfkYJN#pO+&;+Am_L1-J}?ESrnU{(m0vnLI_Y7&0tw#?RXkWII=Xp2_8%}Gpw
z(6IT+FjS01Dr$S8R35OIKT8W<#8;;Es5Gnvt)9U{Tlri+y!cof7Ij?_IA!wB$J~=~
zntZO}GloXYvux}>0O<A<)&13jn=wpjZ0Ui6xADC3(TtKdky8)Wu2aCBE!M5&Ww@P%
z>8fqK*Z6sBHd~&b1%zQ%HJp~QMe(8*dH8|B`Q_QpV9Qm_Jzt^oX-uK-nx=%v$X=9f
zWskXK+b(ZK-UaQCt=iD|-E=a0+ZLzl#x^@?nLYsk`Tgr;e75Z!FJLO4DuNA9Vv_GW
zH&M);I>haLADFC6;-q4%V?zb3%5yWQX7%`Gy7g@s+wkX9uNNH~88&*R<)z8?T1ZGW
z)vE@d=NSE{@_VXZ2bE;g%juVJ+u*^@W|FLlUrusosN_{pghK`;^we!FpT4l5=^{X{
zVXLB?-qJXR+Jo#IOMXO``Vol#N<wrO1#jfz2Kck(Zf(;>;<twU6iBc^WK|y10xj3^
z;xR?TKS-|wO|V9?^lBdh;#7yGQu!DG8y^~E1J8#umpf!i?1##@@{il6{#fZYx#wAB
zTM)|n_Y*kvR3UD4B`{u9iRfXeTM*&&ytlU~h+st`x32#zS@ZIi=%O}ziQL)_ul6~8
z?^EJ`Dc@T%#~Sv)kmqtp`=}%^f4G=@HFdGp=O~t*5JZq{IH3PPSbie$lyCzyQ&#B{
z0#`q${FIJTocd0n6YJ}XRPuc5Jzs=hMJ2Nrs3cUX=|yC=nMKu9+m7ImZk0qIYY+FY
ziikGF)Z$*lZDhf61+qO`y&Zo+%wQf5c$O3s*oJ#nBMIH7&lYHQC>wv(GFHgRM8&be
z98PW1BCI+^(#o*xpSq8vy>j(<Y*Teb-)-_Y?66Ju@102Z`{f>fkJ9NURdA$11)y$_
zO#PfVOBx1b?|uQeK8(+dd}pMXovb;?`Z1THS?!{f@g28FF!B1O0%Vs9wR7_)Uy=2C
zw-`y9cw3Cb9XXI~F)20fhUQm9U51;3C{Q642X-X|zTD_@dbC6Pjlp)up{9Bel&}dM
z>QOyQ{&fvUwUQSbUnCF#a68vz`YAOwJsn8b{;;(})97YBE8rMgSWEA8-l~>ep-ECs
zvIFKh_Fwd+Hg+5}>sXauB;5*f)6c!>WVWs+Qlu435BPJAiuepo>OeW0K5ohDC7Z26
zb(NQ@X|g&L_Kk!MSPrtb(Ov6D_-fO_*vML<Q4)fF2+%q)u@k8>6q*)S=nP=}4g|3Y
zv_c^E1M{<$o>09OtXOVN_3Bt#_xSNX-KHgKxZ2Z=FQVRON@DgrOBtXG8^4A446Xm>
z#()>uGHsls2EdJLY?_Al9%*XDqcM%uN-r`QjYJxNbaNL<MFZ|?oJm+HRgmgFy_5!U
zgd7fmJ!HVE>M+ofvYjrFda1KX?1+>o`&>PoMS%2-H6A3m)VR7()<<J&MY&7wibS>3
zc4+($i;a$C+{l4p?|5&L?aU%rJs?VCYlo)dLD!2MnA5Ksr4=xxUm^6c{p{sL?t8H*
z=dQQHr%^&|Jn#chDQBs&dv#jv#6%M%BvEJTZ7cD(Jt8epUCgmw7PPIYAHlhXo0gd@
z-6wi-I99=zJO}gTDmemJe8=gmKglp%MX4mC^gjs7k?R@_ebqXQLVB~26Sy0gyy-1e
z@1V(F*5jGg4KpWtz_+cbN2H<`wEl)XeP;vB|D$RkR8rHSk`oVUJ4-mZShjXTU98py
z)#9Ugg|twoVdwLu@U&gIVl%13hRX8!7Se@dR^95Xb<FZb+3_xyrrmB^GqwbxOeZNm
zH{v>f!8fpi(>pb@wYU_s-)IY)*Pj6n_urM?o7#UW1qcL6PIyHlv+dA_-6}a?GU`72
ztI57Jxi8N@yM#KKdRG<Yc63Y!)2=aKD+=qfgVIe#TyCzBoWar4BVzqNschSeZamD@
zRIln2m6Lv#5WgqT687?<`$lCW_@#`5efl>vvdAdM@_r6Fk~XEPqezq)s$ZjFYMM6+
zD&`r6@N!gUlv^>Q%?K?15q6}@wV5?@SK`vJ4C01ccBQk1<kjoyu|WCcGo`6U#uJAQ
z1*uTr7H=21ib+L{U$v+hPglxcgGqU|j&BgKLa_~Fs3O8C)mFeW+jvb|4?@ReL`sYe
z!L5RR{Zho*TPn}{^Pg<A*xH;6Jo?4uq!$mY8bEATHj;y2;O=dI^Fm?=*X!i>iNp|3
zT{Z}8d>Vfdrx)j2x?%TxZ)Ve9U-G?)yAbCcqU#LvRBLg$-J>2iWo&CZRbvG^Q?ep}
zh_Us$tW!wqw0T0AtWQ;A=zI9-%MqXTGz|dOZDV7`cXDCZ1vI`fFH-)RyaCX>%C?j>
ziE6wR<!`ck6y?n9ib9;&j$Tpq6>Wzg!SC$lZl`P*SV0gRuDUgThARI-z;{vb7G=b0
zE)Djc*F}K&XxQ`N;ekUMWWCXNX@VifU9o49M_f)Ihfc^gmHr5w&Pk+@_oLGAdp2AL
zX<)H7j@eP@F9!0Uzn(8lY^pj)hnC*Cqn;PTDe)tA%c>TMnmxPJG4ZzgouR3=5wH*B
zV3^u^0!_X{oqYfW*Xi1cW}E4A`x4FjMU8(&8nRp{VP}dg)WRQ?QRvD0$LJ-e3!Po?
z0eiX+phc^`h6ph_9j?2t{gy-KNMlNU2?%qgK;Ru$xZ(Br=JC8B)qiH&w8G<O-;ZQ=
zU?^rZajD4MwfeO)WtE3+A&&;;T+hzO-;aQu?75HzEjh`|?rkgz>jWJMop2{czR?pR
z9)@MiOTN%;j=yTkQ_X;}fb7LNv>Q1_Nk*aei#Kd0A^6$yQvPpOGnCzck_#5+aaQ$C
zuU=$5tVefr4P;H;*>YTBjQ5qYY<h`cR8Pd`;w2j#q9DQJ3(y~qWPe%5*R(706=%k@
z3@2=bJ}x#(ioJekpxo*Vb{adDXhZVCtX1^#@pzj2p=z3L-QH!?fAirX)tL!xenr#Y
zs0Y<JtQrY)#zANRf+sA`81jccLfV#T^CV}Z3OgXVui9&lomMI<3!fpgr{GmDwn^OI
zjC)sU1+i|bmGd`wg&_%2pP$9~`0@i{aJz}i7+?tvc3lq6U7}V$Vqob|(Y6i-!a=0j
zfi~;a!mD?iGP-q+R|4t3(I(gaL`RWW`RuPCLKx7K#BkM?NpbFG9Jv$s1Ym`3fjzl}
zgh}nJT}sVj)(glYTBxM9L7YN>t$L-x3hf8c9ahG5zD+J@TZVPo<Hzn!fhz*`s-h4l
zf^KA6(!$z8@z!1>GO@*q(P<2qAPvMu@)VcLdD4D~+&m-)y$T$_$*zz$0IF$?Vn7&p
z<e!?@mjdGBe66!IyP<y>MU}f>$fJ_f`wMT7sQW1>V0Sd@)GK3Nmptr|ctn51YP+P_
zd>9h^n&UDn6g)|je{H%eI9s|&f75E4ErDWT-B80yhZ@-RDDbRmQspZxf#Sq9kbOT$
zbu1+psAq=XV+I_6OXV3nyGat9b*HXmF{T$aCJM94IB3y9s(y8;xC9qNchw>@FzN!1
z3J(Uh-N&G6=z8bA{3inp4eZ?DmHD;WsNMdHOoqlVBDlA4z|rR`dGIuy96s=jiWE~X
z`_Jp&>eu#W**L==Y?W9ZQQiuG;GGjhFc}y6nNP8d(i_$T9k|RMT{bN2QLO121}e_$
zYNKE%0q-Z-Z1>%Cb{k+Lr4cbao4U9Rbxsfwv^+R{(S<mmqfry<w-?;I&cQNHknUTe
zkVm&$CHQ{}l=1-#)0AX4f|BX9?B+{{5q|($${!5acL=u>hCUI`Z3lHozmXTa+(!{k
zpdJ;KOCvKZ!Jr>9u?Myy8kkIc-gaDN8VOnR;UO(cMWW&cp2tBd{V!Bw1^AU2?7hz~
zkwIHXDHoOgA}V)$)hGU=4nB&Yh!+(sWGxCy&h2QH1qe_Vy7TucjaCskkqU&e&Ob9w
z1`&|JnOi*-@}l&hbjg=|DWXc3CQdn!D^@-EO3Y?@>z@=M>kk01;NA;jbM7lh?%!ak
zcPYT;y}$$=5o>;{2BR81Zn|Vci?Bhg4{n=<<<_6ujhb^}gQ)GTHhI1{5rqFpMm%NT
znGE1mrF1F5?@m)y8?bYLzU(7NQCv!W$HY-Iem5PGQHZ;mZn+F-U&S}Su7(FNmStp%
zm0)^zQhcmcp^`1}#<!S#eyb}6l`keefg+u!o0CxUJR2YOmqfT1h5F>B;+R&qQMF60
z75XRvHkE{k;oVO|(F>XkwI$}V8;%L_!t9FuT`10B9<Y$ce0SI+9Ix;B6yla;Km1tE
zjlu&w_jp@vHbtg(L+~*7=mK*m@zpM_ia)}xvH_9=W+*GFe0;|}x+tVeJW_{<7E%%Z
z<llNa<!c=iSmC?973;fv&x-&=FAoeInkHof>|>5gm}5d!x%E&w=;Xr0(l>H2L7<EH
z=^Xvk(OqD;Ms`xyG`_pa*|&$GP=6uPl#4?;i;3$#1&Gl7-R;BKy)4PUq*7fNm?NjK
zc(2|cl<8<jEaFG(oxNzo&u&~ssAOJ))p{&U#QrY0%OGgGszlSH{2yRf_L90$X_fdB
zu1aUjuC-|;wbCDxESIaa&QEnBc(0GZovWmus8gpv-!IRNNR}f*(%;3Swl-Sjw*kdo
zy6TCK*fHS-muSx)A*$wZWGa25kfuPs?jRhPN|iElR0nV5G>a-an_aPP;Vx3GP5V(U
z>+>8FsiUayV~8>*!4kEhvc1Jx>-r^x^h|bY<gobc7NOrxmUDwQLvk?tmAyaEf=y38
zm`j=zy^-0DIxSYmvN!<B<EqXErj*aW=z2stdL~{3Ri!KkOUZZQ@uaw{{bf(niS}l}
za3{TVV9=`j+Xt7<d!34i(%!e;O{o`J#*}X+YKT(p$#>4{JRsuoN84E+XIjFATE5Sa
zW+iC5nUy=13aq~7DyZV=z_+}hH0{5-loT}C&k)e;1hfXyjT<sO*2li9gjGiIk&{ia
z;1IicN!{&>d@BU}`Cpe+K~t-=H9ZV?l1P{GoQosLnAN7Y>k=C>{`6fjuKVIz+Xn^p
zPwm3+pfHL9Ri?quLApED+s$jfSzJ(mdJ0)+ByEUj(yuGgtQCSSwm9%ge%x}1(r{1v
z0+8vxIN$qQlZY;54EKN)gGz|`1d<l6HM4QAfAW2RW$okn<x8S{I9PZ|oGYbAmfq)$
zmCbMcl5;qxYe2`2(`Lp?+V>&i1XFmMS*KA10NQL9Z4Mv~C8^RlV?|p3^UB0g`~4J&
zo+7>bw=^bC+*X9|DRCz(Q#=7yVIy~0E*H0vP?9a8w%<*JBpp(hGG2$}g~L|Wa$%dl
zw5_SL1b|Ap{a9>!BB)=ED4lj_O$=3IKHd<3UDiHkjQ&zLWr<L3BF;kAY_~5kOTjBj
zf4q0lLhP4~q9E^Wx&Lz;k{Z(SB1D|LVD^UO#l^)J;qI<Qec#i<W8Yt!yjf&7$lNkJ
z?nTx<;OVZ-GTdM7W}NGn%#YLfSKd2i?`ADHx42pbpEg!Yn0<C>Pw{}ayW7mO^vAt*
zN$<Tl<E+c)CZZX?^EDkI&p!P9rs9u-++9PmyzXyGpZx^|$3yJqn%l<zjLv?2b8c{;
zKRUN^b1`R6*SUmPFjq?EitzvA3E`F5@l(W#L;v{;g}I|_?wp<LP?jdl^>%ZO=UmG^
zCwAtP*z9f3ISo6f{^tbt9MqZRVRHg|PGHYb&N&1-2e0R_|C}cQx;}Gm&YTZ6XVT5t
zn{&qSoNK*c=^QKh|6nD{zGPms6<Go|J3vk+e#Wo~dmhb?@cL^{QElz<Gh07dRH(ZC
z69nQjZvXFDwV$7i@TyJ7yEe~d6$JdU*-lDbXtg-<@vBQphaWo~Y(IC-{_|ZsBDPm=
HOE~dA`_$Fv

delta 19279
zcmeHvdtB1z-}l$dPF8L!wKB1--MP)mPG+e<%UU~m*fQ~m+Cei9Xa*_>U#k_{EUme;
zGGVS?9zsR)EFzjSYot^PsGK~LAfh55AaH~G{qE;}{(Sy^{D;?z^Y^+wr}yE4-)2_k
z%&fc<4Z5#Vm&XCXG2ojMUk0REObLkOsSD|cXBPdw`5u4n*0#_?c_+?UZ^M<pb^js0
z{{!n^ul?-!UHNAx{XewEY(BC3Gt3X={U^WtKu;G#@I9U}Jt#~JGd*KS+apftzktE0
z9*7OouhBj{csgICpBy7YBQq^lZ86_mUcdND)E@DAUU~P!e?RnhCh#8OuLcgb0ha6c
zwH>=}VX-fM=plKcYw13ayWe*6x)3sF`L1bqmUrX-gJb~zPqtgG_yZ_a?oWE`HY4eR
zUDhr<DDja)l~3I7Gt&l>{esIiuf<NO*Mn>Jef<5tq>h6-faclMogHo2>sw}H{qDDB
z3|qw+@mjjrS4^M#eUhDn>&xy@f6dQqQTOHhpcjT4_KMQ>uxQ+H4zj*tZz^8)EQbJI
z93|IG&k?jxc}ThDSq?spC9a!}Ibyh(dM+V4x?Z$u<uP|d;`uH8cdw>07CW;tpS=QG
zl^T|hvrrE4^f2mMe&hK7UYajYC0u?R?Uy2;QU??lYyrU=xmcd57>O;kuy}LZNJ3R{
zhA%JPR{UCG)h0rM`uQGv#?T!Qlw)80(%U6e6;J-kgn|2ZgyY$+#WBM1!{Fu^+S<%6
z;bh?H@E1)WL#tug<x}>G_+06noJ|MPMi=P=6l)Qyli=_HVATc{Mata26}zi!!>u#9
z#tHY(!E|PI*Y^yaKyG(+GRr>WJhK;4_CUT1NUY0q3ZJd$9M}8>^8Dau^G^ZWdB#9k
zM)y?W*QNzq%=|34Be+BOupF&$nf9@alue!#KWbWI`Yai$#91(hY7X55xRWU&3tZ>1
zJPQkdV2bc~>f4E%`2VWO1s1f<aLk8*6t3hqHw}=l7;(N%p8D=ycUS%Ed1-|Hvev+5
zc;F=h`F$j)Tj+XCB51rw1YLojQ<}c4mkUF`4X|;GNFI37yIQm`IC;{hMLmKu_FK$c
z$jNv!KcEmD3{Tg%7fUOfqO}9}L=ol6N4X?-=&+OFtZJ@8Xqm=m@Tc24x}E(ZG-J-i
zah1)NW@ofkC5#Im!=<zyf^p8Uuy|8XizZBfsh@6Gleyv#hYwd_&PO_1%#7z?-?Re@
zPmP3yD0s=WH%e}J>dYYuIV?@JHBNrC{EoWDDFdYpwKEzE;y@^U@dq2&jLOv$w4Dh=
zG#0>CX3UF>nk%oIklmiNHp^3-bf|t~!;yHuJj<aPxz?}Oj{yg_y7;#ae}2kIr3XVR
zMBJ6@R&BZXPof<&CtBgkwu63Yoc6_(Md<XEm#m}WlPvf`9X5NY%&7Qzav+ta4^Tf0
zpU<w@NRVAS=<7MAll(2+YRq6x4pOMdM-vTPV|23XkPAdl&O&Tw$d3BK({gxRSIyYS
zA<uM&`<U?~>f~Nv!N3JuM~1X6Yg&izclogBU5+KWkR<9Pl!|>7K((vvu!qfE?bsV?
zor(5)@7Jm;oJ7ENlL0v82$3H%ONF6azbaFd>K}$uM)_|JwzUQRvj{KqB77`|Hlb#@
zS-7Sz{uPkqp)Ce6Gh#0##=W4@(8-d1*LzB&eQ_P^a*YUPyIhj`TcF&$2=le>ds_ot
zPdu<b*2UM#i|q`OpXioDYKH3G$*(EIXZfzDbuGfNCP&g`UIFCtLpwk!wFRWeHWglW
z&T1SZ7mt&5^HC9~62%WdWad@$|GFUAib#PcLOp>OGb7@+#$XlIey}kxrj{5D62@&f
zu)lN*1%k22%yMx{olA9zP$e%Bh2dl)Ev{bTTi3f9s0}&Jd~xFHh#P!Qpx&)qxA59i
zq#Y8rj76#8V+VGxZe!y^VT@j~?$#4Uqv&ICb%qDo8d$$?U(7M!%BcM2^{b9sFIrT+
zJ4NqiN*LG6#%#zfpxn(BKD8*NhV>1Pq!!})xp~ymLCVk4lMvYg_On_?iPfjFg{B-C
zvhA(;`Uf{sanH|fY+Anu;ADkJntn>jr({#?@7C_f;H+gKam{FvJgq46YP_kNI)Lum
z*H67{y9~sC96f!G9z4f{%(e|E48yjfuneZD9H#<6)@-Pnie!fpvC4Q_HCAzuRC}b-
zaN0&$KPrY1M#>xZ`0BdWWuj5<U7QqeI#U*4Gg^dS9f{RqZ0RIFjI%!*4lJtd8CByK
zC`_Jec4rAair3pC%Nc!UnW>3kMf~rjlL`>vM1n^2$_9367PH$nu@y8-W^qX<Xe!E?
z*qmQ2aNrOOR4|=As6e^L%W6%rKRCURlchdZ&d7TvhzbW<=Do!zoTe2!dors=G*+A7
zm+`vwtvjedErpsVe0gX$ta;=!%RK=Vy6<+#y~b~>KFDfT&*?Na)UZbrr^Te2GzP;%
zfH6K~^yYwY%q-n@9XUzC;J-r&4h9lQ7BjyzEKtg(=@f6eh00U`?UOBtM+XX3ug?{8
zx9i_eKCuDYuBty@RCjWvaOsL6cUa1+y!;B)C~h?}{zqbSOtma0hv2t0GIEo7roCSZ
zeE(h`5O_+Am-^fM05e1r8N<oAM4>Y%(x@EuQ_Vk8)ap1QHtt?U<$Fm&pybU#fP~?n
zwu9F^kElQ=;=A}0#aX?5Ajhh0-K!K4EhCJcjB%8p4!AnWQ!Gqqv;LoX*wJp9hw=7+
z^xKjff2?yxfx{^_p2i%qlB0b$KPnGP-mybCRz*djJJI~`MA`x<)Uujfp|LVGOx6~$
zHdb!ie-PkAxRrV9l{x7A$0Ub=jnWm7c>V9hN)U~LHdHxENS$anbM~4EvcBH>0U%hQ
z4M#?vT6K7Brji6Izj}c#bw7Z_Q)%{mwaCsUhr<=GI2#@e)dYgHw1s(EgyvlUs=Ot`
zDiF0joCrohj>xqsNz8~iGFN9^@67_z3`SD(LN&UHr?BHal$?`wBV1dn_9V!lndoa+
z$T%Nbs$4gu?M+87OsZRHD%Rh7jA3MJi}m}e;?0Ey$Bj1K`b%7SC~rgjM}TymN|@Sd
zZ}G%%8YHJ`yd(<jLc>Po@n00k^uOB?;Cx_X8C=0Z4*9c`p?F%p)`%&E-&6f+#J+47
zTXG6MZBQ8AHc*2emB#>Kt$cejPW3TZqfS@1GUuP<fLCTyukx%<a0He?s1@NQO^Y@8
z-`n1IIl^IRTZD^EjuIh<O;;KTF{W(rT*`(Q<~GoO2;kiF6I?$760wZtb<s@3*UArM
z`K~R0jNk9ntqpu1D^EZ~l#1V0SRYZQ{uKK2(_T*2k9o!ugBmK19RS)@ZiHG!hQDCp
zhv->kp5ZhqO~471%TwpBXL~FdO%a2Bj|7ibA``-iaa04lomk7$aAGH>FN6tW$kr?V
z)09B)<?XrcA9Xd&1s$%+1%go4y&K8tB3euZ+j`3vf3Tr=nSZ-n;RG|biCXFMDRr%~
zk9?Ja;MX_YE0gO~`Fjg`V6zLIYJK&JNc!6p`dkD3>&JV!Xl__dBSLY*n5^y`4B5f|
z0^p37i`DF`=#YJt_@`p~R%NiC;4*3uglOKY^DS0QtpE2EzPZnzrJ*#ODr4wq0v@d#
z`GD<`<JTgB+TbdOC6ibq2tBWRL=!|+*EfmhWapvit<oYn)@s(bl@%*kFb$zcX28X8
z*z^wz+p@+~7&kX$R9YSJ^*q1C&2}&|fzN<T_$7|Pv|GET@n$}I<~6S+x60OGLmki+
zOEf=ax&Hjt+%MfWubz3fjg(&Co-5qsu-<Oyi0sZ1o4dN(%+^+KLk4ynL@9E2Y~H?p
z#r6`%154EI&V}4+$mZ1@%u8t#3Bp|8j~v#AWRBK)|8q^xa*H-?UK5uVyn)ryU66a%
z^sIH#Bh1TxNMT;?$Bvs<Z*ZjyKWIqL)!S`fZ;{=*aqAMVe0d=Ehb^1dR1RNo^HLl}
z<sP$lSih$&dGKR1odhg{bE}Wou4*a286%v?ZFk(h{(mnzx7}{j@=}+hx}3nvwYuDv
zOdS~fPX{*l^T;0aP?(OB;wB1F&?U4&6(3#AP1dE}Q2k$e#6*3kvb{RBnLYpTu@kf~
z{drBXyOVBga@Jj!g%?nJvvGf)-53KiHsYb8zeM*O{)|<K7}DAk3R=_a6+?E21=_%y
zzvM?}384DX-lOtD6C*Uz%QiCT2CZ2Gfa7O2P#=)ybHLFT@k!@Q3dn`5CjCrkegXSo
zaG~y*y$_>F#m&NBGN%8XfNG}dl#}X~xMWT~eyT%<ZPlR*mvD)8?uPwqgKosi=>bet
z@9q=hC2yPzHezXTtv2<XHeKD!1g9>9ras8eVN5-C8dO|>;0?O*mzrCfu2{9XAr|f=
z-kdj+VKZZYCfEg0%@*VnqOp<$BY}m;o~R!1!qoWDnyUHTtfnFYi|M2sx?V|bmDu-o
zib+tsi8=WAHIGk>Pnfwm{=E;i0I6?0RiO{x0tEu9d1FZekV<{fgB$<6catFslz%Mv
zg)F!aTM|-cqy0|jr#njvJZ0|{<j|VYY`*ex4&BxybA(4E)8~h6jwDfE)@8Z;<-*Y1
zp4`yom57zd5)V6qEKff(<nL87G~FX{BHbXO*qOiRnyOF1E`IW<@s@xev`fZy78112
zXF)Sck(Rh;=)TL})ARWFP&3^D3e*BY>XogEPS+!25nG=sUGv**T4(FxT&2y>e(GrI
zxn{@+sAfiZ>EsBwao{XL`SJxnR;c`KlR6{#6xm4Veqq|eZC1xDlDLR4v;JU*_!Vv(
zzE@+TYtd}=dq_~zM0<QsvmVTWS@0fL!`yC6%DJXRy}OFVAiQ$6zX?~jt7U^Tw?79s
z9mCRS!jvP*jZHV87X&EKvv6_fF^7Z^q)&Ct>Jqf45E*gF51y`{>e5d1cmvxN+T_GQ
z_q<V)hLeOqTx8MI;dY3hm1K9AayE`NYVD*M8o46UJ{NOH6EDCy<`r-Hb{+m)y0?Ic
zmI^;@sn7{Ai@U`8vA{(&kZ5Aob1+?E1ANA7NF>r3uX4%SQyRJm)w|-4Bn}}T^}UmM
zoe0DmC%n|bzP%D+$CKQEps<6R>`ExcM<(Sbaj^zD--h#xpf5ZxgMMtVQtKNgEvcY#
zUgioCqM8lO(&8q>w;T;PHSg{^eYKSMXRA?3^(AA~p2b|4VZVcs??Y&k#`Fy$!Pn>P
zsVnik6cP-t(#szZG&N*j#==`08(pyS(p&7tAi?$dUO7Hh%f8x+AOADQsnM&%*H2dh
z9+{d?*uaFBWK)<wsE_q!xtS%15|9a3Pnx)0yfKVYA~H;5k(G6R;fL5M{gsVV@5&$~
z3baxo7<+NqJwK}CV8#naW3qOpz?eF_;!m@rq#gGI51dIZCGu5TuXpx_E`h!4j|(qi
z_CAobfQyALc8avFSI)0t2$_|-iFfven^;v9O@CQtU>L%+MG9^YSkWy%no8?v?`0Ks
znFO}<m+9rJ+Cn<a5dVrM#x=Nn7#E?R8)+i47Q~^DIlN4~2lV=gVO?N)RhKy{JLPz2
zSW8RgI7|KPg?=BsB~Jzu#R3@vJDm>URg3EH5lF-BvdWzxW?WsO)l;Nb(X88Hg~nv#
zWtyc5^dm{`<{b#Nfkz~1LyI?MH%kYhg6Yc(%{yo&CbbzzMPGOanHZRks&*DhjN4n>
zhi;9Mn`T*9HVDs1w)_!6QXbD`BO*!oky+v+M0j=JzOdBBnW=-A`G4uhBYtDETz>B>
zB8h{jE5l%Yw#vClmz4oSA*l<Rd+_^675MXN$Q)FrvoSofWHn%=HKgY0-F9E9@AF<W
zKB+t2&mzp|5HVEJm$F!TTNDjw<T0yqx01B*oG`wBWo5M<ydf2fbP>_&G8vcO^%$j%
z$r3+JxG-wwnDdLEk?Y+<BZ->XMWjuK)r!0v3ednVI{t2MGT-u;;3WbKB6|j0Ju+#b
z_87zEv&3KP_fCBZ5JnG@Lw4f@P$MpQlyDy@r24=_hX9CP4Z_0bh=>$ccV#w3fz>)D
zCigGqiH%b<LvMTPnII^+**Bx(bT({C=iap4cPFrSNtX=|zgz2H{mR?R_OfKgz->J{
zN@hRzhW;L)2049{DcI#fhhlfA{+C`UY39Cn$jnh!tf5`{66^WvX`}eVEMn2q8xjAb
z^zjzNuEyWW3Bqf^^qD6cMcPGiafmnlRG7e}-#0>iivzueE{zN-QvRhAoO?=S`Qaw^
zpXTLbKlZ89n<X;cQBxuQ*=c=AQh~VyMo4thQG3^gnUNMLJjHcyDel)wx>nK|d&wy-
zkeW6R?&bKaL+WwPgDLz8;i_oY{HWfo9PgVl$g}1K3duEu^<R{R@gw?$b0rkQ;^WQ>
zr8qz7s(Kk~my@(}oy`Bs#XVh+gKYXM>H?Lx`x*-O;c3C+5ZA~{;`G-Q#zYW1>pe|d
z;7%+~s!6z+MtkUt$c9vpXGyxS_htgcKiK6lN~|)Q#m&?EpVCY10}GROeBEkN+d}zq
zyyHQFO~_%4MkiJ5)X?4#R2Ulzu7^a(^XR)U$a0$|PO_Epb4F9CG-t;V*IjdCh=rrs
zS#1Uqf_^?38W>@G4xWM~^|$V38J$J?o{_uP9*VP^E|WV=%$>gFNzda-(cxfP?;5<+
zL`_#$mU9xaN5$&m#I(Vb49T~#G`zMapAp1G^g5d)oCH5!59J0?+uE!aA2q62HKI`W
zLG)-i5gXKuH_mloZy+5nb$5wIeQQdBVR{U?Au>=59<^^7RC66%xJAz+1X-MHl#_H=
zWVZs2o<2&%<2B+w?=NM#Ja|2Bhgf)X<Z+4K5T(Vssra`~-gsnZxKx;8k+c+&R{afD
zg%jhx!YsHF!+TVL-nP*Zb5%Mgm2zAkWN3lxDyLIB#IPCR08uC*)!O|Q$H-%V41DV=
zg?ccSi|3Ddg_z8jz<#oI8k(Bo8Sq({A^ns#HL4c~8voN#awAgLwA5foK5$bp5R7pV
z!9UevC9nAD+|!7`C?)>Wd~t+D)wER@H0O)&Dl)jIj|DQOjbc>I6mzlF#O;T&sV5}D
z2bfaaSiNri(#KCoYOr1q%j4#EbcB-iwRIvcq_uoU-86mx0@f7lhG5FvxG5J0S^csu
zyVrz80m><D<B(4@i)z^Rt+gErKHF4NQbvwYf6XpJ?r+laD^)2H;U8!a{ik8%OV8b+
ztRU8dICWxpTF=%vkRYJ-A<O9705x{&;le2T)g(vBO)x<~n2rvVgEAL;aj1<Err6sM
zOk1tYc<B+~U-_m{TXT3ViXy7f8VeqsvIgpeP3XS#z+;Ky(s?m#^iCaQQgoxjBztt9
zhMtIE1;^Vo<d?A1r!U;rMPbo<3k=3$izJ$Y!uY*!BjrMIH>0(cP21JS=S9`6j8`l0
zco4Sc$#j+pbwV!heD=!qxLYr#lz60GN5bYWdh~gR@Cxhk_@iE4>S=}Az>bxk`~=;&
z5FUd{7b<_!dGu|n=CMk1Y|AC-zlQ2V@irZHuO-Nb<BAYN%XIK1V$&{>FV3X#@q7=n
z6+MHq%4+>17MP~D-YAKBhY4!^vJ52N9*m;di)wKe2+JX)Ye(_Ha`DZ2?;Gvd{V(TW
zQ!0h(15Ka~Ar7~BTi3x?>~~*_;#DN)DlS_5F@17SvM3Q2c|0;Qh^@~tREBk^{<Sv5
zI#XFgIkekI8O^h?osbHjvK4&hHg(6m1bbL-)UV659pV*{{(iQo;4OmECUPj$6uuMh
z{uTr~d+F{df?#m6HI8SJ6>Y+*6B@p0CA^2QZT)H7i@7d;V6(#<VG4uduuwWaQ^j^U
z2Bvko+l%$x-@!fEDT^F^oa<kuxZXT*FbJm5IwUEpL-&QM??e?E9gH&)ar4`-hGI+x
zkIBY)m`0A94Vb`XmEkt<iXdMk<X1qjCjGUv!4a;mHatD)82IlU$r#yVkPK12igQH!
zg+Wg}B_aL6=%mE%g6-VI+6L_X)}E4Yk6F7@)KA&mrTvLn+MjFEK(V^emBlEVM}qeC
z+6T(I`crO?(ZuG|XC!I8b|%_W4${k$;omo)r{>Sq)K2OEj(ps#vELZRs;_AsDN=^&
z;@2`!GZ4g*^Aqt2PSW(Zyh0AwhOU3+WCY<W+bj|B$EGrD26J0PYDqqd1}gny9VL5U
zhXqof4(}T`3b%g|zo$XE(}d%W;yj_{)8p+x<3v+zUA{>mq@%%a9SM3SrCy-G46=bn
zF0*QKz4UUx*A>SyWNd~<JWm3lVu#zCiS676mkvv8OQgQN*(g^|8F3#kSvI<BxS|jv
z=<?}#Y}KaXoRap$g#+>V>Z%Q4DSt`i&zs5IY?P@ZJgKm+GUbCvh6&pHi44c<qL)`6
z6=Y4;XM=?VzDWnAbCnmpd6atR6eq4#n~(5pDRN67(Z`q8%aqJ}GN3I*(+|u=g1O$X
zb^^1rmaSk)G9<rDDeJA!rRp%=Sc~*f!A+vp<x_O2{SSS*v4lBP`UbT8EYv2E0xF&V
z%wxplMsi4NB3Q(yE?OVX8S1oPk`-(Z0#bGjy3|3#CRXKxU*VDJPx_+VfNAA{c#n>8
zWuNzX>QODj?n2S@+E{fqM=PlyVm?|?aN7ro7eamv#p8-Xc)NxZGzVUr`e^!;8&J=r
z@kBS8(5_D0<K28prd0DMLO<5!R$Nx;FoA6QQCydA9!%rRnp~Fq+Ds7bhj~!p4J~O9
zu4D*HYLK%L@(=v|W=jz{4IQSi%g;0k1|_UGPSJEQf4a7nwCO#@BhF%`?cO_I_wGsK
zmD!}P!Y$ZYuJwaCSl=_AefNd}OTrC<#luBVFu|F+4{10`(`4iVjTud3C6&nNWbT5e
z=8|jn0vw&L&KrbwB~Zu+n+DGRth&M^BC`<Gp#<VVQYt?$|AMAPq9LLCB~1^}+Hrd~
zcIcWt<Wu<8Z_+~bB(_mB=B3&O<jl*T2U=9^l|OLyqTG(19Vuo*OO2wXvgbcMd^9l^
z=!f`}&LH9nJw;eX4<^VSaQT#l2jz3gvV>eoLUvw`2_Y*Ax0uWRbJ_WhM=G^W`P8VZ
z!a(cOa-N}eKiWvyMM7qRz;lR&mlqEYkH*l^$p$6zDusIFk*7$1Br!L#e)|`an^Ern
zUgBOx;}}1mRI3uhWo;BBk8<xnO^%<4k|5i$F5n*?eL9cCRIN&xL)PGMN_wci?&0{*
z0W}6%@Kb~8AQvAm{=tS^>Di669J*@=H+eW5dJSBwvdubLfjeVBavGhAxiUSb3uQ7I
zT-AL=!iW@sW>5Z8v_)0V=<h^`)(*}TBUpRliG{yQ#uYP7JpF+kz`D#hYI!{k{Ouy*
zS7phs6Oe}#;vt@{iY|BK!4XLsal$r;#0O7F<`xP45;b0fV&zN#bo*&=HY%5B$x~P8
z8o${`kte9b*w%g=t2@}y_aO*6Vnh;pFMck?WD#jK%Hn=>DNs9|aB`45PwA~#)ka6&
z^odEETrGmLBeH|=XQXqWflH1unOwJD&drA6k>D?n2TH{`-G%kjcVp$0K%HCaLpxzT
zZvQL3x_-3PWYpP9sl-#fWQvpepP*w*LHA2fBsM`s(xo2XikdUZniDDZSAQ3I^hI0>
zCXkXnjo6?T!>vfqcw2zU<fAX$d#^&=m)w4v3jX+%=aI45@X*4X(}BG8PO0_wCTqtu
z1qbpXGzc3(or6r9dyX<3O`{7BdG%@fIvA#UEj3#=BUV=EjPRodgZ!<*P}GKn4Pa2e
zJQFlaqy;N$Ji_UCAKW_}y{>DHEPpDt<)lmva$WwYG)(yrdd#^R=h?R#lu#pTO&(9^
zm0En9dhoSX8$HalNBzhfVR04WU-lY<X`}LVai`*uB+iYI>vW|rN>|&AVj3gd`(^&F
z0j0RR5^0^uDLpD<|E`p<+2Y80#Xye9ML8WnY+kSYc63~HPnBY-5NXEX_c?#bpYO7$
z;`oC#^&6GfNKFlX^8@A@xx$kdX7E1+_A;EsCg}wKGQ#DHP-W^}spd_Bxg%oVo-QmF
z9;U2FvFg$y$lL;WLr0=haQ~}u%wVBlm++11JHRXH2HHEfV!u7OXt+{PiSM297b9%W
z?Pbu93tn>WUBsOQE1pcR9i+Ov_PG{Jd!!8ff=P|9K<uk$7~ZN%Nk@>N?Z5DTy2e+m
z0h3pw>2rzXZSd8%tb4=+eV-zggUG4<CR5Q1gEPY?y;YX#U#gIE-A|`&!v!Ti$Znph
z5?`)JRBr>>>D;2}qS$ttfdN@TbstMK;iqKyib(y&-A<Qwp&#Uf9Ky;rGi2Z1O<!|f
zbGeU_$%~qX)X*zU!_bwQy3`ucFd5Q_(J+&Ac#|<oS<!0%!+~<*E2;hr&w;>Ip29u+
z%2VXg&8Ocg2(v3mE)bbPIw6(^MlUqd=%qv?FQs<SHUMAFhz+SgyX%@`(}G}f?C~o%
z?yt*~`A7XJT+?XSC7p{^&uMnG$7>d)C%3Q-E{l7dBrk@;U601j?&@Qfpvb7XlzP+Y
z2c$A)=!^69Z%*TWEGnjtplLvmxVpehM+5ySC2IqYgu?nlq)|0ZAp8PX6`Px*^kO)L
z8I<17lLR{uNBGkx59mGw;%=kT{(eg=FCxJ6xUEhWRfVFv3*lxjaNFNFM+wgNh@_Gj
z)}s$H@y<kP|JZ1;MHPt}LS0O7eOC%C#pxvpp~wZN)QG7Lb0!6_<P`hv+D}5camvN#
z4KQh0jSg&jHJ<cPAb24NQk#w?&17NDIVQ@PXKc7^dOW)G%pQiCg@RK_3IwXbA5=F$
z#|BzeU4|gAw-J&@Fmc+qcu<n?h2-`<F@(T>)w+F>>F)|F!+k5EKAKW5N>(*PzT(SV
zYEqy1Nqs}r{JxX}IR5p6bMoUnvI)*GLcVXPo8oq1U)Cf20~n|j);RAKtBe^Golo9Y
zohwfbX_z(hsTGmx9nUsC9u5Ct|B_$!rpv6puFL$#ciZ<t^f6$)Lt`|%BzPc3_uA}>
z?R#dj#WvZ@+~xgT7t8$Tb@ThpZkSDFurfAKH2_;WRe3Ak<h*U#m@#(vY{KAye{3<l
z*>AIn3&cOXhp%TXy?3XB$=chr(W&WnP(l6D7qlI7G8=juAD$scUm(j4n%~;?GPl}d
z^Ttz&J2}OB{yDVyrpxT3*(_h%^1dzS+j1=|_mJh@`|k<%|1uXG%rlGC?A7<5UnVTi
zFVnnTo~_H6WEsmX<4jXSUB>6jyk?nmEpyfN%N&1Me^}OSmi4Y>EpA!ET-JV<b!qd@
zT$c6xWgleOqgnR0mOa5`zjE2<UG~RK|D?3+-EZ1vI`c4R?5AGe1VnCGbykNe-1GfV
z?U&yukKk&ee)9fkeFE_Aa{z!y&Hsc|^WoJfNba#K*R7LQ003Y#QvGk8sKJx3-rsyT
X>MtwFx1w6p!@xHueNR*#kG%HZR62Px


From d2817f48a1146b469d544ee78015251551d358c3 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Sun, 25 Feb 2018 21:40:17 -0800
Subject: [PATCH 093/267] Use sync fs.mkdir

Summary:
<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

This ensures that errors are actually noticed in case it is not
possible to create the directory. This will also throw an error when used with the upcoming Node.js 10.x because there is no callback.

Refs: https://github.com/nodejs/node/pull/18668

[CLI][MINOR][local-cli/library/library.js] - Use sync fs.mkdir for error handling
<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
Closes https://github.com/facebook/react-native/pull/18084

Differential Revision: D7083122

Pulled By: shergin

fbshipit-source-id: a13b64e57860e1ab2c15e0c008211dc0dca3b2d2
---
 local-cli/library/library.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/local-cli/library/library.js b/local-cli/library/library.js
index e8246ff7a106fd..14afd6a4059b7f 100644
--- a/local-cli/library/library.js
+++ b/local-cli/library/library.js
@@ -29,7 +29,7 @@ function library(argv, config, args) {
   const source = path.resolve('node_modules', 'react-native', 'Libraries', 'Sample');
 
   if (!fs.existsSync(libraries)) {
-    fs.mkdir(libraries);
+    fs.mkdirSync(libraries);
   }
 
   if (fs.existsSync(libraryDest)) {

From 59c7b2cfac534a79ff2461af5fd2034b280812a3 Mon Sep 17 00:00:00 2001
From: Maxime Thirouin <157534+moox@users.noreply.github.com>
Date: Sun, 25 Feb 2018 21:55:18 -0800
Subject: [PATCH 094/267] Add missing mock for AppState (removeEventListener)

Summary:
I am testing with Jest a component that use [AppState.removeEventListener](https://facebook.github.io/react-native/docs/appstate.html#removeeventlistener) and I am currently facing a fatal error saying that `AppState.removeEventListener` is `undefined`.

Create a component that uses `AppState`, e.g.

```jsx
import React, { Component } from 'react';
import { AppState } from 'react-native';

class TestComponent extends Component {
  componentDidMount() {
    AppState.addEventListener('change', this.stateChangeListener);
  }
  componentWillUnmount() {
    AppState.removeEventListener('change', this.stateChangeListener);
  }
}
```

It should pass test using Jest (snapshots)

It's the continuation of #11199. This PR finish the mock for the native module `AppState`.

[ GENERAL  ]   [ BUGFIX      ]   [AppState] Add missing mock for Jest for `removeEventListener` method.
Closes https://github.com/facebook/react-native/pull/17908

Differential Revision: D7083144

Pulled By: shergin

fbshipit-source-id: eafa07f064f971c3d657f2ffc9c00766c0925bac
---
 jest/setup.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jest/setup.js b/jest/setup.js
index 6285550434e491..680e391ba78bd2 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -113,6 +113,7 @@ const mockNativeModules = {
   },
   AppState: {
     addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
   },
   AsyncLocalStorage: {
     multiGet: jest.fn((keys, callback) => process.nextTick(() => callback(null, []))),

From 16c9e5b71500135a631480035af6cd2de3dafdc9 Mon Sep 17 00:00:00 2001
From: siddhantsoni <soni.siddhant@flipkart.com>
Date: Sun, 25 Feb 2018 22:00:52 -0800
Subject: [PATCH 095/267] Fix: Added scroll Bounds check in scrollToOffset
 method in RCTScrollView on iOS

Summary:
<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

The scrollToOffset method of RCTScrollView for iOS does not include bound check for the scroll offset provided to the method. This can cause the whole view to scroll out of screen if the offset provided is greater than the bounds of the View.
The same does not happen on Android, where the scroll halts once the last item of the scrollView is in the viewport.
I have added bounds check so the offset resets to the MaxOffset which makes sure the view does not scroll out of the viewport.

The issue can be observed in the following snack:
https://snack.expo.io/H1363Uo8f

![ezgif com-optimize 1](https://user-images.githubusercontent.com/16662518/36068270-2437ae88-0ef7-11e8-96dd-819b4ae0fd67.gif)

To test my changes I ran the code provided in the snack above with the react-native dependency pointing to my branch. As can be see in the video attached below, the scroll halts once it hits the end of the ScrollView even if the scroll offset provided is higher than the bounds of the ScrollView. It also does not scroll up for negative scroll offset.

![ezgif com-optimize](https://user-images.githubusercontent.com/16662518/36068130-9ae4f918-0ef3-11e8-8728-af7b2888bdb8.gif)

[IOS] [BUGFIX] [ScrollView] - Added bounds check to prevent ScrollView from scrolling to an offset which is out of bounds of the ScrollView for iOS.
Closes https://github.com/facebook/react-native/pull/17927

Differential Revision: D7014466

Pulled By: shergin

fbshipit-source-id: a817738d08e1057a4c70f43373132f88fa1461c4
---
 React/Views/ScrollView/RCTScrollView.m | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m
index f146ba0d2369a0..6a8f3353942625 100644
--- a/React/Views/ScrollView/RCTScrollView.m
+++ b/React/Views/ScrollView/RCTScrollView.m
@@ -575,6 +575,9 @@ - (void)scrollToOffset:(CGPoint)offset
 - (void)scrollToOffset:(CGPoint)offset animated:(BOOL)animated
 {
   if (!CGPointEqualToPoint(_scrollView.contentOffset, offset)) {
+    CGFloat maxOffsetX = _scrollView.contentSize.width - _scrollView.bounds.size.width + _scrollView.contentInset.right;
+    CGFloat maxOffsetY = _scrollView.contentSize.height - _scrollView.bounds.size.height + _scrollView.contentInset.bottom;
+    offset = CGPointMake(MAX(0, MIN(maxOffsetX, offset.x)), MAX(0, MIN(maxOffsetY, offset.y)));
     // Ensure at least one scroll event will fire
     _allowNextScrollNoMatterWhat = YES;
     [_scrollView setContentOffset:offset animated:animated];

From a817c6404338b7b15aaeac5693ae3635a0a3dde0 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Sun, 25 Feb 2018 23:13:35 -0800
Subject: [PATCH 096/267] RN: Use `$ReadOnly` in CoreEventTypes

Reviewed By: sahrens

Differential Revision: D7082715

fbshipit-source-id: d2f7e280d02bbd8e7dcba2d38b719fa4f82ecb8b
---
 Libraries/Types/CoreEventTypes.js | 99 ++++++++++++++++---------------
 1 file changed, 52 insertions(+), 47 deletions(-)

diff --git a/Libraries/Types/CoreEventTypes.js b/Libraries/Types/CoreEventTypes.js
index d0839cf46f84ea..012deaf6bf082f 100644
--- a/Libraries/Types/CoreEventTypes.js
+++ b/Libraries/Types/CoreEventTypes.js
@@ -11,55 +11,60 @@
 
 'use strict';
 
-export type Layout = {|
-  +x: number,
-  +y: number,
-  +width: number,
-  +height: number,
-|};
-export type LayoutEvent = SyntheticEvent<{|
-  +layout: Layout,
+export type SyntheticEvent<T> = $ReadOnly<{|
+  bubbles: ?boolean,
+  cancelable: ?boolean,
+  currentTarget: number,
+  defaultPrevented: ?boolean,
+  dispatchConfig: $ReadOnly<{|
+    registrationName: string,
+  |}>,
+  eventPhase: ?number,
+  isDefaultPrevented: () => boolean,
+  isPropagationStopped: () => boolean,
+  isTrusted: ?boolean,
+  nativeEvent: T,
+  persist: () => void,
+  target: ?number,
+  timeStamp: number,
+  type: ?string,
 |}>;
 
-export type SyntheticEvent<T> = {|
-  +bubbles: ?boolean,
-  +cancelable: ?boolean,
-  +currentTarget: number,
-  +defaultPrevented: ?boolean,
-  +dispatchConfig: {|
-    +registrationName: string,
-  |},
-  +eventPhase: ?number,
-  +isDefaultPrevented: () => boolean,
-  +isPropagationStopped: () => boolean,
-  +isTrusted: ?boolean,
-  +nativeEvent: T,
-  +persist: () => void,
-  +target: ?number,
-  +timeStamp: number,
-  +type: ?string,
-|};
+export type Layout = $ReadOnly<{|
+  x: number,
+  y: number,
+  width: number,
+  height: number,
+|}>;
+
+export type LayoutEvent = SyntheticEvent<
+  $ReadOnly<{|
+    layout: Layout,
+  |}>,
+>;
 
 export type PressEvent = SyntheticEvent<Object>;
 
-export type ScrollEvent = SyntheticEvent<{|
-  +contentInset: {|
-    +bottom: number,
-    +left: number,
-    +right: number,
-    +top: number,
-  |},
-  +contentOffset: {|
-    +y: number,
-    +x: number,
-  |},
-  +contentSize: {|
-    +height: number,
-    +width: number,
-  |},
-  +layoutMeasurement: {|
-    +height: number,
-    +width: number,
-  |},
-  +zoomScale: number,
-|}>;
+export type ScrollEvent = SyntheticEvent<
+  $ReadOnly<{|
+    contentInset: $ReadOnly<{|
+      bottom: number,
+      left: number,
+      right: number,
+      top: number,
+    |}>,
+    contentOffset: $ReadOnly<{|
+      y: number,
+      x: number,
+    |}>,
+    contentSize: $ReadOnly<{|
+      height: number,
+      width: number,
+    |}>,
+    layoutMeasurement: $ReadOnly<{|
+      height: number,
+      width: number,
+    |}>,
+    zoomScale: number,
+  |}>,
+>;

From 80c18395e24760cd12b69592a10037f071255437 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Sun, 25 Feb 2018 23:13:36 -0800
Subject: [PATCH 097/267] RN: Flow Type for `PressEvent`

Reviewed By: sahrens

Differential Revision: D7082716

fbshipit-source-id: 13e1730b0b2380ae6be63e2b36bb40b9a44a99f4
---
 Libraries/Types/CoreEventTypes.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Libraries/Types/CoreEventTypes.js b/Libraries/Types/CoreEventTypes.js
index 012deaf6bf082f..56d4eecf8c348b 100644
--- a/Libraries/Types/CoreEventTypes.js
+++ b/Libraries/Types/CoreEventTypes.js
@@ -43,7 +43,20 @@ export type LayoutEvent = SyntheticEvent<
   |}>,
 >;
 
-export type PressEvent = SyntheticEvent<Object>;
+export type PressEvent = SyntheticEvent<
+  $ReadOnly<{|
+    changedTouches: $ReadOnlyArray<$PropertyType<PressEvent, 'nativeEvent'>>,
+    force: number,
+    identifier: number,
+    locationX: number,
+    locationY: number,
+    pageX: number,
+    pageY: number,
+    target: ?number,
+    timestamp: number,
+    touches: $ReadOnlyArray<$PropertyType<PressEvent, 'nativeEvent'>>,
+  |}>,
+>;
 
 export type ScrollEvent = SyntheticEvent<
   $ReadOnly<{|

From dabe8e0d019e03611bc937a63a456d8ce9a2ebd0 Mon Sep 17 00:00:00 2001
From: Miguel Jimenez Esun <mjimenez@fb.com>
Date: Mon, 26 Feb 2018 03:21:11 -0800
Subject: [PATCH 098/267] Allow passing custom configs through the CLI ("js1
 run")

Reviewed By: jeanlauliac

Differential Revision: D7081913

fbshipit-source-id: f5952599c840f2c65213bd2928b21f0c1d84f510
---
 local-cli/bundle/buildBundle.js | 1 +
 local-cli/server/runServer.js   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js
index 36081a6052cb8a..10d1ecc6b78ba3 100644
--- a/local-cli/bundle/buildBundle.js
+++ b/local-cli/bundle/buildBundle.js
@@ -82,6 +82,7 @@ async function buildBundle(
     assetExts: defaultAssetExts.concat(assetExts),
     assetRegistryPath: ASSET_REGISTRY_PATH,
     blacklistRE: config.getBlacklistRE(),
+    cacheStores: config.cacheStores,
     cacheVersion: config.cacheVersion,
     dynamicDepsInPackages: config.dynamicDepsInPackages,
     enableBabelRCLookup: config.getEnableBabelRCLookup(),
diff --git a/local-cli/server/runServer.js b/local-cli/server/runServer.js
index 8054190e1b85b7..371f43a39af560 100644
--- a/local-cli/server/runServer.js
+++ b/local-cli/server/runServer.js
@@ -168,6 +168,7 @@ function getPackagerServer(args, config, reporter) {
     assetExts: defaultAssetExts.concat(args.assetExts),
     assetRegistryPath: ASSET_REGISTRY_PATH,
     blacklistRE: config.getBlacklistRE(),
+    cacheStores: config.cacheStores,
     cacheVersion: '3',
     enableBabelRCLookup: config.getEnableBabelRCLookup(),
     extraNodeModules: config.extraNodeModules,

From 62efff8ab8e05d27da24e50d1751660138a8ac76 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Mon, 26 Feb 2018 09:03:55 -0800
Subject: [PATCH 099/267] Implement cloning for all ReactShadowNodes

Reviewed By: achen1

Differential Revision: D7063509

fbshipit-source-id: 90df8a3d2e6f2a4efa13f5eb0337b191b690bf8f
---
 .../react/uimanager/LayoutShadowNode.java     | 23 ++++++++++++-
 .../views/modal/ModalHostShadowNode.java      | 11 +++++++
 .../progressbar/ProgressBarShadowNode.java    | 22 +++++++++++--
 .../views/slider/ReactSliderManager.java      | 17 ++++++++++
 .../views/switchview/ReactSwitchManager.java  | 17 ++++++++++
 .../views/text/ReactBaseTextShadowNode.java   | 33 +++++++++++++++++++
 .../views/text/ReactRawTextShadowNode.java    | 14 ++++++++
 .../text/ReactTextInlineImageShadowNode.java  |  7 ++++
 .../react/views/text/ReactTextShadowNode.java | 16 +++++++++
 .../text/ReactVirtualTextShadowNode.java      | 11 +++++++
 ...coBasedReactTextInlineImageShadowNode.java | 16 +++++++++
 .../textinput/ReactTextInputShadowNode.java   | 18 ++++++++++
 12 files changed, 201 insertions(+), 4 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
index ea83f81abc5134..b941c21672a4ae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
@@ -37,6 +37,13 @@ private static class MutableYogaValue {
     float value;
     YogaUnit unit;
 
+    private MutableYogaValue() { }
+
+    private MutableYogaValue(MutableYogaValue mutableYogaValue) {
+      this.value = mutableYogaValue.value;
+      this.unit = mutableYogaValue.unit;
+    }
+
     void setFromDynamic(Dynamic dynamic) {
       if (dynamic.isNull()) {
         unit = YogaUnit.UNDEFINED;
@@ -59,7 +66,21 @@ void setFromDynamic(Dynamic dynamic) {
     }
   }
 
-  private final MutableYogaValue mTempYogaValue = new MutableYogaValue();
+  private final MutableYogaValue mTempYogaValue;
+
+  public LayoutShadowNode() {
+    mTempYogaValue = new MutableYogaValue();
+  }
+
+  protected LayoutShadowNode(LayoutShadowNode node) {
+    super(node);
+    mTempYogaValue = new MutableYogaValue(node.mTempYogaValue);
+  }
+
+  @Override
+  public LayoutShadowNode mutableCopy() {
+    return new LayoutShadowNode(this);
+  }
 
   @ReactProp(name = ViewProps.WIDTH)
   public void setWidth(Dynamic width) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
index 98c5f0db69aaa9..5e429ac67bb2c6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
@@ -21,6 +21,17 @@
  */
 class ModalHostShadowNode extends LayoutShadowNode {
 
+  public ModalHostShadowNode() {}
+
+  private ModalHostShadowNode(ModalHostShadowNode node) {
+    super(node);
+  }
+
+  @Override
+  public ModalHostShadowNode mutableCopy() {
+    return new ModalHostShadowNode(this);
+  }
+
   /**
    * We need to set the styleWidth and styleHeight of the one child (represented by the <View/>
    * within the <RCTModalHostView/> in Modal.js. This needs to fill the entire window.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
index 7975f67fbd9cd3..5e44b62135e278 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.java
@@ -33,14 +33,30 @@ public class ProgressBarShadowNode extends LayoutShadowNode implements YogaMeasu
 
   private String mStyle = ReactProgressBarViewManager.DEFAULT_STYLE;
 
-  private final SparseIntArray mHeight = new SparseIntArray();
-  private final SparseIntArray mWidth = new SparseIntArray();
-  private final Set<Integer> mMeasured = new HashSet<>();
+  private final SparseIntArray mHeight;
+  private final SparseIntArray mWidth;
+  private final Set<Integer> mMeasured;
 
   public ProgressBarShadowNode() {
+    mHeight = new SparseIntArray();
+    mWidth = new SparseIntArray();
+    mMeasured = new HashSet<>();
     setMeasureFunction(this);
   }
 
+  public ProgressBarShadowNode(ProgressBarShadowNode node) {
+    super(node);
+    mWidth = node.mWidth.clone();
+    mHeight = node.mHeight.clone();
+    mMeasured = new HashSet<>(node.mMeasured);
+    setMeasureFunction(this);
+  }
+
+  @Override
+  public ProgressBarShadowNode mutableCopy() {
+    return new ProgressBarShadowNode(this);
+  }
+
   public @Nullable String getStyle() {
     return mStyle;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
index 3c5547606dd8a6..9ab464ad0e19d6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
@@ -48,9 +48,26 @@ static class ReactSliderShadowNode extends LayoutShadowNode implements
     private boolean mMeasured;
 
     private ReactSliderShadowNode() {
+      initMeasureFunction();
+    }
+
+    private ReactSliderShadowNode(ReactSliderShadowNode node) {
+      super(node);
+      mWidth = node.mWidth;
+      mHeight = node.mHeight;
+      mMeasured = node.mMeasured;
+      initMeasureFunction();
+    }
+
+    private void initMeasureFunction() {
       setMeasureFunction(this);
     }
 
+    @Override
+    public ReactSliderShadowNode mutableCopy() {
+      return new ReactSliderShadowNode(this);
+    }
+
     @Override
     public long measure(
         YogaNode node,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
index 1bec8c42841ce9..62a3ad3f41fac3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.java
@@ -40,9 +40,26 @@ static class ReactSwitchShadowNode extends LayoutShadowNode implements
     private boolean mMeasured;
 
     private ReactSwitchShadowNode() {
+      initMeasureFunction();
+    }
+
+    private ReactSwitchShadowNode(ReactSwitchShadowNode node) {
+      super(node);
+      mWidth = node.mWidth;
+      mHeight = node.mHeight;
+      mMeasured = node.mMeasured;
+      initMeasureFunction();
+    }
+
+    private void initMeasureFunction() {
       setMeasureFunction(this);
     }
 
+    @Override
+    public ReactSwitchShadowNode mutableCopy() {
+      return new ReactSwitchShadowNode(this);
+    }
+
     @Override
     public long measure(
         YogaNode node,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
index 0be8fa6265512e..9b73869b1b9b69 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
@@ -280,6 +280,39 @@ private static int parseNumericFontWeight(String fontWeightString) {
   protected boolean mContainsImages = false;
   protected float mHeightOfTallestInlineImage = Float.NaN;
 
+  public ReactBaseTextShadowNode() {}
+
+  public ReactBaseTextShadowNode(ReactBaseTextShadowNode node) {
+    super(node);
+    mLineHeight = node.mLineHeight;
+    mIsColorSet = node.mIsColorSet;
+    mAllowFontScaling = node.mAllowFontScaling;
+    mColor = node.mColor;
+    mIsBackgroundColorSet = node.mIsBackgroundColorSet;
+    mBackgroundColor = node.mBackgroundColor;
+
+    mNumberOfLines = node.mNumberOfLines;
+    mFontSize = node.mFontSize;
+    mFontSizeInput = node.mFontSizeInput;
+    mLineHeightInput = node.mLineHeightInput;
+    mTextAlign = node.mTextAlign;
+    mTextBreakStrategy = node.mTextBreakStrategy;
+
+    mTextShadowOffsetDx = node.mTextShadowOffsetDx;
+    mTextShadowOffsetDy = node.mTextShadowOffsetDy;
+    mTextShadowRadius = node.mTextShadowRadius;
+    mTextShadowColor = node.mTextShadowColor;
+
+    mIsUnderlineTextDecorationSet = node.mIsUnderlineTextDecorationSet;
+    mIsLineThroughTextDecorationSet = node.mIsLineThroughTextDecorationSet;
+    mIncludeFontPadding = node.mIncludeFontPadding;
+    mFontStyle = node.mFontStyle;
+    mFontWeight = node.mFontWeight;
+    mFontFamily = node.mFontFamily;
+    mContainsImages = node.mContainsImages;
+    mHeightOfTallestInlineImage = node.mHeightOfTallestInlineImage;
+  }
+
   // Returns a line height which takes into account the requested line height
   // and the height of the inline images.
   public float getEffectiveLineHeight() {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
index 6bc7cc93d0f4f3..a37fab61a27d22 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
@@ -22,6 +22,18 @@ public class ReactRawTextShadowNode extends ReactShadowNodeImpl {
 
   private @Nullable String mText = null;
 
+  public ReactRawTextShadowNode() { }
+
+  private ReactRawTextShadowNode(ReactRawTextShadowNode node) {
+    super(node);
+    this.mText = node.mText;
+  }
+
+  @Override
+  public ReactShadowNodeImpl mutableCopy() {
+    return new ReactRawTextShadowNode(this);
+  }
+
   @ReactProp(name = PROP_TEXT)
   public void setText(@Nullable String text) {
     mText = text;
@@ -36,4 +48,6 @@ public void setText(@Nullable String text) {
   public boolean isVirtual() {
     return true;
   }
+
+
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
index 7f63093b3778bf..637767cb8d5311 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextInlineImageShadowNode.java
@@ -20,4 +20,11 @@ public abstract class ReactTextInlineImageShadowNode extends LayoutShadowNode {
    * place of this node.
    */
   public abstract TextInlineImageSpan buildInlineImageSpan();
+
+  public ReactTextInlineImageShadowNode() {}
+
+  protected ReactTextInlineImageShadowNode(ReactTextInlineImageShadowNode node) {
+    super(node);
+  }
+
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
index 35e1824894dd52..72e044ee8b047a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
@@ -17,6 +17,7 @@
 import android.view.Gravity;
 import android.widget.TextView;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.Spacing;
 import com.facebook.react.uimanager.UIViewOperationQueue;
 import com.facebook.yoga.YogaConstants;
@@ -137,11 +138,26 @@ public long measure(
       };
 
   public ReactTextShadowNode() {
+    initMeasureFunction();
+  }
+
+  private ReactTextShadowNode(ReactTextShadowNode node) {
+    super(node);
+    this.mPreparedSpannableText = node.mPreparedSpannableText;
+    initMeasureFunction();
+  }
+
+  private void initMeasureFunction() {
     if (!isVirtual()) {
       setMeasureFunction(mTextMeasureFunction);
     }
   }
 
+  @Override
+  public LayoutShadowNode mutableCopy() {
+    return new ReactTextShadowNode(this);
+  }
+
   // Return text alignment according to LTR or RTL style
   private int getTextAlign() {
     int textAlign = mTextAlign;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.java
index 734549aebb81cd..6506e9697abb4a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.java
@@ -11,4 +11,15 @@ public class ReactVirtualTextShadowNode extends ReactBaseTextShadowNode {
   public boolean isVirtual() {
     return true;
   }
+
+  public ReactVirtualTextShadowNode() { }
+
+  private ReactVirtualTextShadowNode(ReactVirtualTextShadowNode node) {
+    super(node);
+  }
+
+  @Override
+  public ReactVirtualTextShadowNode mutableCopy() {
+    return new ReactVirtualTextShadowNode(this);
+  }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
index e069c8f5cab4cc..56298de90205f3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
@@ -7,6 +7,7 @@
 
 package com.facebook.react.views.text.frescosupport;
 
+import com.facebook.react.uimanager.LayoutShadowNode;
 import javax.annotation.Nullable;
 
 import java.util.Locale;
@@ -48,6 +49,21 @@ public FrescoBasedReactTextInlineImageShadowNode(
     mCallerContext = callerContext;
   }
 
+  private FrescoBasedReactTextInlineImageShadowNode(FrescoBasedReactTextInlineImageShadowNode node) {
+    super(node);
+    mHeaders = node.mHeaders; // mHeaders is immutable
+    mWidth = node.mWidth;
+    mHeight = node.mHeight;
+    mDraweeControllerBuilder = node.mDraweeControllerBuilder;
+    mCallerContext = node.mCallerContext;
+    mUri = node.mUri;
+  }
+
+  @Override
+  public FrescoBasedReactTextInlineImageShadowNode mutableCopy() {
+    return new FrescoBasedReactTextInlineImageShadowNode(this);
+  }
+
   @ReactProp(name = "src")
   public void setSource(@Nullable ReadableArray sources) {
     final String source =
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
index cdc1d1196fb4f5..375c02a6285711 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
@@ -14,6 +14,7 @@
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.Spacing;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIViewOperationQueue;
@@ -47,6 +48,23 @@ public ReactTextInputShadowNode() {
     setMeasureFunction(this);
   }
 
+  private ReactTextInputShadowNode(ReactTextInputShadowNode node) {
+    super(node);
+    mMostRecentEventCount = node.mMostRecentEventCount;
+    mText = node.mText;
+    mLocalData = node.mLocalData;
+    setMeasureFunction(this);
+    ThemedReactContext themedContext = getThemedContext();
+    if (themedContext != null) {
+      setThemedContext(themedContext);
+    }
+  }
+
+  @Override
+  public ReactTextInputShadowNode mutableCopy() {
+    return new ReactTextInputShadowNode(this);
+  }
+
   @Override
   public void setThemedContext(ThemedReactContext themedContext) {
     super.setThemedContext(themedContext);

From bd30336d868958453d70609ab902cfea4e7d4ea4 Mon Sep 17 00:00:00 2001
From: Rafael Oleza <rafeca@fb.com>
Date: Mon, 26 Feb 2018 09:56:21 -0800
Subject: [PATCH 100/267] Bump metro@0.28.0

Reviewed By: davidaurelio

Differential Revision: D7085296

fbshipit-source-id: 76032af022d37a28976b33176f9a573e39861a39
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 9b8c58cb290d45..7afce5a614ec5a 100644
--- a/package.json
+++ b/package.json
@@ -174,8 +174,8 @@
     "graceful-fs": "^4.1.3",
     "inquirer": "^3.0.6",
     "lodash": "^4.17.5",
-    "metro": "^0.27.0",
-    "metro-core": "^0.27.0",
+    "metro": "^0.28.0",
+    "metro-core": "^0.28.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",

From 3eee96ab864d843ff6ff3f0437231425ed46cff7 Mon Sep 17 00:00:00 2001
From: Ken Woo <kenwoo@fb.com>
Date: Mon, 26 Feb 2018 11:35:51 -0800
Subject: [PATCH 101/267] Change React Native application layout check

Reviewed By: shergin

Differential Revision: D7076910

fbshipit-source-id: dc6df2dee886bbdf139d6e50192d621efad6d57e
---
 React/Modules/RCTI18nUtil.m | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/React/Modules/RCTI18nUtil.m b/React/Modules/RCTI18nUtil.m
index 183b4c4987d7c3..804154e2af8251 100644
--- a/React/Modules/RCTI18nUtil.m
+++ b/React/Modules/RCTI18nUtil.m
@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <Foundation/Foundation.h>
-
 #import "RCTI18nUtil.h"
 
+#import <UIKit/UIKit.h>
+
 @implementation RCTI18nUtil
 
 + (instancetype)sharedInstance
@@ -98,9 +98,8 @@ - (BOOL)isDevicePreferredLanguageRTL
 // Check if the current application language is RTL
 - (BOOL)isApplicationPreferredLanguageRTL
 {
-  NSString *preferredAppLanguage = [[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0];
-  NSLocaleLanguageDirection direction = [NSLocale characterDirectionForLanguage:preferredAppLanguage];
-  return direction == NSLocaleLanguageDirectionRightToLeft;
+  NSWritingDirection direction = [NSParagraphStyle defaultWritingDirectionForLanguage:nil];
+  return direction == NSWritingDirectionRightToLeft;
 }
 
 @end

From ebbd4371c9853fd63b365fc56147b2e293a793e4 Mon Sep 17 00:00:00 2001
From: Manman Ren <mren@fb.com>
Date: Mon, 26 Feb 2018 12:22:30 -0800
Subject: [PATCH 102/267] Mark ObjC methods that are called from React Native
 as dynamic.

Reviewed By: mmmulani

Differential Revision: D7087100

fbshipit-source-id: 18e5726e5b48e7b71fcaab19f6fe73be0cad6233
---
 React/Base/RCTBridgeModule.h |  2 +-
 React/Base/RCTConvert.h      |  8 ++++----
 React/Base/RCTDefines.h      | 11 +++++++++++
 React/Views/RCTViewManager.h | 12 ++++++------
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/React/Base/RCTBridgeModule.h b/React/Base/RCTBridgeModule.h
index 2f8887a58de644..f138868eb3062b 100644
--- a/React/Base/RCTBridgeModule.h
+++ b/React/Base/RCTBridgeModule.h
@@ -185,7 +185,7 @@ RCT_EXTERN void RCTRegisterModule(Class); \
  */
 #define RCT_REMAP_METHOD(js_name, method) \
   _RCT_EXTERN_REMAP_METHOD(js_name, method, NO) \
-  - (void)method;
+  - (void)method RCT_DYNAMIC;
 
 /**
  * Similar to RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD but lets you set
diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h
index a92927a68d013c..5780c5f5f676a8 100644
--- a/React/Base/RCTConvert.h
+++ b/React/Base/RCTConvert.h
@@ -177,7 +177,7 @@ RCT_CUSTOM_CONVERTER(type, name, [json getter])
  * This macro is used for creating converter functions with arbitrary logic.
  */
 #define RCT_CUSTOM_CONVERTER(type, name, code) \
-+ (type)name:(id)json                          \
++ (type)name:(id)json RCT_DYNAMIC              \
 {                                              \
   if (!RCT_DEBUG) {                            \
     return code;                               \
@@ -216,7 +216,7 @@ RCT_CUSTOM_CONVERTER(type, type, [RCT_DEBUG ? [self NSNumber:json] : json getter
  * This macro is used for creating converters for enum types.
  */
 #define RCT_ENUM_CONVERTER(type, values, default, getter) \
-+ (type)type:(id)json                                     \
++ (type)type:(id)json RCT_DYNAMIC                         \
 {                                                         \
   static NSDictionary *mapping;                           \
   static dispatch_once_t onceToken;                       \
@@ -231,7 +231,7 @@ RCT_CUSTOM_CONVERTER(type, type, [RCT_DEBUG ? [self NSNumber:json] : json getter
  * multiple enum values combined with | operator
  */
 #define RCT_MULTI_ENUM_CONVERTER(type, values, default, getter) \
-+ (type)type:(id)json                                     \
++ (type)type:(id)json RCT_DYNAMIC                         \
 {                                                         \
   static NSDictionary *mapping;                           \
   static dispatch_once_t onceToken;                       \
@@ -246,7 +246,7 @@ RCT_CUSTOM_CONVERTER(type, type, [RCT_DEBUG ? [self NSNumber:json] : json getter
  * for typed arrays.
  */
 #define RCT_ARRAY_CONVERTER_NAMED(type, name)          \
-+ (NSArray<type *> *)name##Array:(id)json              \
++ (NSArray<type *> *)name##Array:(id)json RCT_DYNAMIC  \
 {                                                      \
   return RCTConvertArrayValue(@selector(name:), json); \
 }
diff --git a/React/Base/RCTDefines.h b/React/Base/RCTDefines.h
index 6956ec4df761b7..881af139d85c92 100644
--- a/React/Base/RCTDefines.h
+++ b/React/Base/RCTDefines.h
@@ -104,6 +104,17 @@
 #define RCT_CONCAT2(A, B) A ## B
 #define RCT_CONCAT(A, B) RCT_CONCAT2(A, B)
 
+/**
+  * This attribute is used for static analysis.
+  */
+#if !defined RCT_DYNAMIC
+#if __has_attribute(objc_dynamic)
+#define RCT_DYNAMIC __attribute__((objc_dynamic))
+#else
+#define RCT_DYNAMIC
+#endif
+#endif
+
 /**
  * Throw an assertion for unimplemented methods.
  */
diff --git a/React/Views/RCTViewManager.h b/React/Views/RCTViewManager.h
index 7be342a8e25b62..2edadcc775e117 100644
--- a/React/Views/RCTViewManager.h
+++ b/React/Views/RCTViewManager.h
@@ -65,13 +65,13 @@ typedef void (^RCTViewManagerUIBlock)(RCTUIManager *uiManager, NSDictionary<NSNu
  * This handles the simple case, where JS and native property names match.
  */
 #define RCT_EXPORT_VIEW_PROPERTY(name, type) \
-+ (NSArray<NSString *> *)propConfig_##name { return @[@#type]; }
++ (NSArray<NSString *> *)propConfig_##name RCT_DYNAMIC { return @[@#type]; }
 
 /**
  * This macro maps a named property to an arbitrary key path in the view.
  */
 #define RCT_REMAP_VIEW_PROPERTY(name, keyPath, type) \
-+ (NSArray<NSString *> *)propConfig_##name { return @[@#type, @#keyPath]; }
++ (NSArray<NSString *> *)propConfig_##name RCT_DYNAMIC { return @[@#type, @#keyPath]; }
 
 /**
  * This macro can be used when you need to provide custom logic for setting
@@ -80,19 +80,19 @@ typedef void (^RCTViewManagerUIBlock)(RCTUIManager *uiManager, NSDictionary<NSNu
  */
 #define RCT_CUSTOM_VIEW_PROPERTY(name, type, viewClass) \
 RCT_REMAP_VIEW_PROPERTY(name, __custom__, type)         \
-- (void)set_##name:(id)json forView:(viewClass *)view withDefaultView:(viewClass *)defaultView
+- (void)set_##name:(id)json forView:(viewClass *)view withDefaultView:(viewClass *)defaultView RCT_DYNAMIC
 
 /**
  * This macro is used to map properties to the shadow view, instead of the view.
  */
 #define RCT_EXPORT_SHADOW_PROPERTY(name, type) \
-+ (NSArray<NSString *> *)propConfigShadow_##name { return @[@#type]; }
++ (NSArray<NSString *> *)propConfigShadow_##name RCT_DYNAMIC { return @[@#type]; }
 
 /**
  * This macro maps a named property to an arbitrary key path in the shadow view.
  */
 #define RCT_REMAP_SHADOW_PROPERTY(name, keyPath, type) \
-+ (NSArray<NSString *> *)propConfigShadow_##name { return @[@#type, @#keyPath]; }
++ (NSArray<NSString *> *)propConfigShadow_##name RCT_DYNAMIC { return @[@#type, @#keyPath]; }
 
 /**
  * This macro can be used when you need to provide custom logic for setting
@@ -101,6 +101,6 @@ RCT_REMAP_VIEW_PROPERTY(name, __custom__, type)         \
  */
 #define RCT_CUSTOM_SHADOW_PROPERTY(name, type, viewClass) \
 RCT_REMAP_SHADOW_PROPERTY(name, __custom__, type)         \
-- (void)set_##name:(id)json forShadowView:(viewClass *)view
+- (void)set_##name:(id)json forShadowView:(viewClass *)view RCT_DYNAMIC
 
 @end

From 3756d41de1feb167482f01b26f9a5f2563ef8bff Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Mon, 26 Feb 2018 13:41:48 -0800
Subject: [PATCH 103/267] Add testOnly_pressed to TouchableHighlight

Reviewed By: yungsters

Differential Revision: D7043098

fbshipit-source-id: 1df06df6820d81b37dc9a167a7931ed20df44f0f
---
 .../Touchable/TouchableHighlight.js           | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
index 823bd63edaf65f..6493a5147b67b4 100644
--- a/Libraries/Components/Touchable/TouchableHighlight.js
+++ b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -176,6 +176,10 @@ const TouchableHighlight = createReactClass({
      * @platform ios
      */
     tvParallaxProperties: PropTypes.object,
+    /**
+     * Handy for snapshot tests.
+     */
+    testOnly_pressed: PropTypes.bool,
   },
 
   mixins: [NativeMethodsMixin, Touchable.Mixin],
@@ -184,11 +188,23 @@ const TouchableHighlight = createReactClass({
 
   getInitialState: function() {
     this._isMounted = false;
-    return {
-      ...this.touchableGetInitialState(),
-      extraChildStyle: null,
-      extraUnderlayStyle: null,
-    };
+    if (this.props.testOnly_pressed) {
+      return {
+        ...this.touchableGetInitialState(),
+        extraChildStyle: {
+          opacity: this.props.activeOpacity,
+        },
+        extraUnderlayStyle: {
+          backgroundColor: this.props.underlayColor,
+        },
+      };
+    } else {
+      return {
+        ...this.touchableGetInitialState(),
+        extraChildStyle: null,
+        extraUnderlayStyle: null,
+      };
+    }
   },
 
   componentDidMount: function() {
@@ -280,6 +296,9 @@ const TouchableHighlight = createReactClass({
   _hideUnderlay: function() {
     clearTimeout(this._hideTimeout);
     this._hideTimeout = null;
+    if (this.props.testOnly_pressed) {
+      return;
+    }
     if (this._hasPressHandler()) {
       this.setState({
         extraChildStyle: null,

From 84ad5d3d3c797f7003f97a3c1e267e7b6056d34e Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sema@fb.com>
Date: Mon, 26 Feb 2018 19:42:07 -0800
Subject: [PATCH 104/267] Explicitly handle null props in bindings

Reviewed By: fkgozali, mdvacca

Differential Revision: D7080813

fbshipit-source-id: 7c9706df719a39e11a3d99c2de38af992b62dabf
---
 ReactCommon/jschelpers/JSCWrapper.h         | 1 +
 ReactCommon/jschelpers/JavaScriptCore.h     | 1 +
 ReactCommon/jschelpers/systemJSCWrapper.cpp | 1 +
 3 files changed, 3 insertions(+)

diff --git a/ReactCommon/jschelpers/JSCWrapper.h b/ReactCommon/jschelpers/JSCWrapper.h
index 19cc720f96b317..cc2bc1ee107b4e 100644
--- a/ReactCommon/jschelpers/JSCWrapper.h
+++ b/ReactCommon/jschelpers/JSCWrapper.h
@@ -139,6 +139,7 @@ struct JSCWrapper {
   JSC_WRAPPER_METHOD(JSValueToObject);
   JSC_WRAPPER_METHOD(JSValueToStringCopy);
   JSC_WRAPPER_METHOD(JSValueUnprotect);
+  JSC_WRAPPER_METHOD(JSValueIsNull);
 
   // Sampling profiler
   JSC_WRAPPER_METHOD(JSSamplingProfilerEnabled);
diff --git a/ReactCommon/jschelpers/JavaScriptCore.h b/ReactCommon/jschelpers/JavaScriptCore.h
index 056da7167fb875..ff3dfd3b5dd072 100644
--- a/ReactCommon/jschelpers/JavaScriptCore.h
+++ b/ReactCommon/jschelpers/JavaScriptCore.h
@@ -122,6 +122,7 @@ jsc_poison(JSStringCopyCFString JSStringCreateWithCharacters JSStringCreateWithC
 #define JSC_JSValueToObject(...) __jsc_wrapper(JSValueToObject, __VA_ARGS__)
 #define JSC_JSValueToStringCopy(...) __jsc_wrapper(JSValueToStringCopy, __VA_ARGS__)
 #define JSC_JSValueUnprotect(...) __jsc_wrapper(JSValueUnprotect, __VA_ARGS__)
+#define JSC_JSValueIsNull(...) __jsc_wrapper(JSValueIsNull, __VA_ARGS__)
 
 jsc_poison(JSValueCreateJSONString JSValueGetType JSValueGetTypedArrayType JSValueIsArray
            JSValueIsBoolean JSValueIsDate JSValueIsEqual JSValueIsInstanceOfConstructor
diff --git a/ReactCommon/jschelpers/systemJSCWrapper.cpp b/ReactCommon/jschelpers/systemJSCWrapper.cpp
index b2720923301309..45e0597efe8173 100644
--- a/ReactCommon/jschelpers/systemJSCWrapper.cpp
+++ b/ReactCommon/jschelpers/systemJSCWrapper.cpp
@@ -119,6 +119,7 @@ const JSCWrapper* systemJSCWrapper() {
       .JSValueToObject = JSValueToObject,
       .JSValueToStringCopy = JSValueToStringCopy,
       .JSValueUnprotect = JSValueUnprotect,
+      .JSValueIsNull = JSValueIsNull,
 
       .JSSamplingProfilerEnabled = JSSamplingProfilerEnabled,
       .JSPokeSamplingProfiler =

From 07334cb47b96df2f50eea4af4b709ff34e6d1834 Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sema@fb.com>
Date: Mon, 26 Feb 2018 19:51:02 -0800
Subject: [PATCH 105/267] Clean up unused modules

Reviewed By: fkgozali

Differential Revision: D7092777

fbshipit-source-id: 619a78911f2857f1183597143aec86957f277f9e
---
 .../Renderer/shims/ReactGlobalSharedState.js    | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 Libraries/Renderer/shims/ReactGlobalSharedState.js

diff --git a/Libraries/Renderer/shims/ReactGlobalSharedState.js b/Libraries/Renderer/shims/ReactGlobalSharedState.js
deleted file mode 100644
index 089449a9491972..00000000000000
--- a/Libraries/Renderer/shims/ReactGlobalSharedState.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @providesModule ReactGlobalSharedState
- */
-
-'use strict';
-
-const {
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-} = require('ReactNative');
-
-module.exports =
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactGlobalSharedState;

From da84eba318ae69fea28f40418178bdeb35c4a99b Mon Sep 17 00:00:00 2001
From: Jamie Curtis <jamocurtis@gmail.com>
Date: Tue, 27 Feb 2018 04:16:01 -0800
Subject: [PATCH 106/267] Catch exception and report it when making a network
 request with invalid URL on Android

Summary:
Currently if you invoke `fetch()` with an invalid URL ("aaa" for
example) you cannot catch the error in javascript since it's not
reported. Instead the entire app crashes.

Fixes #7436 and #18087

Hopefully.

<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

Fix using fetch on Android with user generated input.

Added relevant unit test

`./scripts/run-android-local-unit-tests.sh` all pass

[ANDROID] [BUGFIX] [fetch] - Allow "unexpected url" exception to be caught on Android when using fetch
<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
Closes https://github.com/facebook/react-native/pull/18103

Differential Revision: D7097110

Pulled By: hramos

fbshipit-source-id: 69144e8a0f7404d9bcc7c71a94650de36a48c84a
---
 .../modules/network/NetworkingModule.java     |  8 +++++-
 .../modules/network/NetworkingModuleTest.java | 28 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
index 2635157116643c..cc9c6349053047 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
@@ -264,7 +264,13 @@ public void sendRequest(
       return;
     }
 
-    Request.Builder requestBuilder = new Request.Builder().url(url);
+    Request.Builder requestBuilder;
+    try {
+      requestBuilder = new Request.Builder().url(url);
+    } catch (Exception e) {
+      ResponseUtil.onRequestError(eventEmitter, requestId, e.getMessage(), null);
+      return;
+    }
 
     if (requestId != 0) {
       requestBuilder.tag(requestId);
diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
index 29e3e6a27d9757..456a108f346922 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
+++ b/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
@@ -168,6 +168,34 @@ public void testFailPostWithoutContentType() throws Exception {
     verifyErrorEmit(emitter, 0);
   }
 
+  @Test
+  public void testFailInvalidUrl() throws Exception {
+    RCTDeviceEventEmitter emitter = mock(RCTDeviceEventEmitter.class);
+    ReactApplicationContext context = mock(ReactApplicationContext.class);
+    when(context.getJSModule(any(Class.class))).thenReturn(emitter);
+
+    OkHttpClient httpClient = mock(OkHttpClient.class);
+    OkHttpClient.Builder clientBuilder = mock(OkHttpClient.Builder.class);
+    when(clientBuilder.build()).thenReturn(httpClient);
+    when(httpClient.newBuilder()).thenReturn(clientBuilder);
+    NetworkingModule networkingModule = new NetworkingModule(context, "", httpClient);
+
+    mockEvents();
+
+    networkingModule.sendRequest(
+      "GET",
+      "aaa",
+      /* requestId */ 0,
+      /* headers */ JavaOnlyArray.of(),
+      /* body */ null,
+      /* responseType */ "text",
+      /* useIncrementalUpdates*/ true,
+      /* timeout */ 0,
+      /* withCredentials */ false);
+
+    verifyErrorEmit(emitter, 0);
+  }
+
   private static void verifyErrorEmit(RCTDeviceEventEmitter emitter, int requestId) {
     ArgumentCaptor<WritableArray> captor = ArgumentCaptor.forClass(WritableArray.class);
     verify(emitter).emit(eq("didCompleteNetworkResponse"), captor.capture());

From 52acbbdd62fb8c329f323793f98d009420458f7c Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Tue, 27 Feb 2018 08:10:25 -0800
Subject: [PATCH 107/267] iOS: adjusted JSI binding for C++ FabricUIManager

Reviewed By: sebmarkbage, shergin

Differential Revision: D7078631

fbshipit-source-id: 6df21e52d3941372a9845fdcf2aed777de7cb359
---
 ReactCommon/fabric/FabricUIManager.cpp | 4 +---
 ReactCommon/fabric/FabricUIManager.h   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ReactCommon/fabric/FabricUIManager.cpp b/ReactCommon/fabric/FabricUIManager.cpp
index c58fd859f141af..1a383519a83924 100644
--- a/ReactCommon/fabric/FabricUIManager.cpp
+++ b/ReactCommon/fabric/FabricUIManager.cpp
@@ -38,9 +38,7 @@ ShadowNodeSetRef FabricUIManager::createChildSet(int rootTag) {
 void FabricUIManager::appendChildToSet(const ShadowNodeSetRef &childSet, const ShadowNodeRef &childNode) {
 }
 
-void FabricUIManager::completeRoot(int rootTag) {
+void FabricUIManager::completeRoot(int rootTag, const ShadowNodeSetRef &childSet) {
 }
 
 }}
-
-
diff --git a/ReactCommon/fabric/FabricUIManager.h b/ReactCommon/fabric/FabricUIManager.h
index 118a713962a37a..7362c54dfa30cf 100644
--- a/ReactCommon/fabric/FabricUIManager.h
+++ b/ReactCommon/fabric/FabricUIManager.h
@@ -27,7 +27,7 @@ class FabricUIManager {
   void appendChild(const ShadowNodeRef &parentNode, const ShadowNodeRef &childNode);
   ShadowNodeSetRef createChildSet(int rootTag);
   void appendChildToSet(const ShadowNodeSetRef &childSet, const ShadowNodeRef &childNode);
-  void completeRoot(int rootTag);
+  void completeRoot(int rootTag, const ShadowNodeSetRef &childSet);
 };
 
 }}

From 28c694f25ad3a8934afacbd4e23fa511bab44c09 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Tue, 27 Feb 2018 08:10:30 -0800
Subject: [PATCH 108/267] iOS - expose C++ FabricUIManager to the bridge via a
 wrapper class

Reviewed By: shergin

Differential Revision: D7093253

fbshipit-source-id: 7317144ad2cb5b8903227c779798e1576f8de2c2
---
 React/Fabric/RCTFabricUIManager.h         | 48 -------------
 React/Fabric/RCTFabricUIManager.mm        | 86 -----------------------
 React/Fabric/RCTFabricUIManagerWrapper.h  | 45 ++++++++++++
 React/Fabric/RCTFabricUIManagerWrapper.mm | 49 +++++++++++++
 4 files changed, 94 insertions(+), 134 deletions(-)
 delete mode 100644 React/Fabric/RCTFabricUIManager.h
 delete mode 100644 React/Fabric/RCTFabricUIManager.mm
 create mode 100644 React/Fabric/RCTFabricUIManagerWrapper.h
 create mode 100644 React/Fabric/RCTFabricUIManagerWrapper.mm

diff --git a/React/Fabric/RCTFabricUIManager.h b/React/Fabric/RCTFabricUIManager.h
deleted file mode 100644
index 371ac19ba6984c..00000000000000
--- a/React/Fabric/RCTFabricUIManager.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <UIKit/UIKit.h>
-
-#import <React/RCTBridge.h>
-#import <React/RCTInvalidating.h>
-#import <React/RCTShadowView.h>
-
-@class RCTShadowView;
-
-/**
- * The RCTFabricUIManager is the module responsible for updating the view hierarchy.
- */
-@interface RCTFabricUIManager : NSObject <RCTInvalidating>
-
-- (RCTShadowView *)createNode:(nonnull NSNumber *)reactTag
-                      viewName:(NSString *)viewName
-                      rootTag:(nonnull NSNumber *)rootTag
-                        props:(NSDictionary *)props
-                instanceHandle:(void *)instanceHandle;
-
-- (RCTShadowView *)cloneNode:(RCTShadowView *)node;
-- (RCTShadowView *)cloneNodeWithNewChildren:(RCTShadowView *)node;
-- (RCTShadowView *)cloneNodeWithNewProps:(RCTShadowView *)node
-                                newProps:(NSDictionary *)props;
-- (RCTShadowView *)cloneNodeWithNewChildrenAndProps:(RCTShadowView *)node
-                                            newProps:(NSDictionary *)props;
-- (void)appendChild:(RCTShadowView *)parentNode
-          childNode:(RCTShadowView *)childNode;
-
-- (NSMutableArray<RCTShadowView *> *)createChildSet:(nonnull NSNumber *)rootTag;
-- (void)appendChildToSet:(NSMutableArray<RCTShadowView *> *)childSet
-               childNode:(RCTShadowView *)childNode;
-- (void)completeRoot:(nonnull NSNumber *)rootTag
-            childSet:(NSArray<RCTShadowView *> *)childSet;
-
-@end
-
-@interface RCTBridge (RCTFabricUIManager)
-
-@property (nonatomic, readonly) RCTFabricUIManager *fabricUIManager;
-
-@end
diff --git a/React/Fabric/RCTFabricUIManager.mm b/React/Fabric/RCTFabricUIManager.mm
deleted file mode 100644
index 71d2198b8eb657..00000000000000
--- a/React/Fabric/RCTFabricUIManager.mm
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTFabricUIManager.h"
-
-// This file contains experimental placeholders, nothing is finalized.
-@implementation RCTFabricUIManager
-
-- (void)dealloc
-{
-}
-
-- (void)invalidate
-{
-}
-
-- (RCTShadowView *)createNode:(nonnull NSNumber *)reactTag
-                      viewName:(NSString *)viewName
-                      rootTag:(nonnull NSNumber *)rootTag
-                        props:(NSDictionary *)props
-                instanceHandle:(void *)instanceHandle
-{
-  return nil;
-}
-
-- (RCTShadowView *)cloneNode:(RCTShadowView *)node
-{
-  return nil;
-}
-- (RCTShadowView *)cloneNodeWithNewChildren:(RCTShadowView *)node
-{
-  return nil;
-}
-
-- (RCTShadowView *)cloneNodeWithNewProps:(RCTShadowView *)node
-                                newProps:(NSDictionary *)props
-{
-  return nil;
-}
-- (RCTShadowView *)cloneNodeWithNewChildrenAndProps:(RCTShadowView *)node
-                                            newProps:(NSDictionary *)props
-{
-  return nil;
-}
-- (void)appendChild:(RCTShadowView *)parentNode
-          childNode:(RCTShadowView *)childNode
-{
-
-}
-
-- (NSMutableArray<RCTShadowView *> *)createChildSet:(nonnull NSNumber *)rootTag
-{
-  return [NSMutableArray array];
-}
-
-- (void)appendChildToSet:(NSMutableArray<RCTShadowView *> *)childSet
-               childNode:(RCTShadowView *)childNode
-{
-  if (!childNode) {
-    // TODO: until this class is fully implemented, we may get nil from JS.
-    return;
-  }
-
-  [childSet addObject:childNode];
-}
-
-- (void)completeRoot:(nonnull NSNumber *)rootTag
-            childSet:(NSArray<RCTShadowView *> *)childSet
-{
-
-}
-
-@end
-
-@implementation RCTBridge (RCTFabricUIManager)
-
-- (RCTFabricUIManager *)fabricUIManager
-{
-  return [self jsBoundExtraModuleForClass:[RCTFabricUIManager class]];
-}
-
-@end
diff --git a/React/Fabric/RCTFabricUIManagerWrapper.h b/React/Fabric/RCTFabricUIManagerWrapper.h
new file mode 100644
index 00000000000000..1db660fcf380a4
--- /dev/null
+++ b/React/Fabric/RCTFabricUIManagerWrapper.h
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+#import <memory>
+
+#import <React/RCTBridge.h>
+#import <React/RCTInvalidating.h>
+#import <React/RCTShadowView.h>
+
+namespace facebook {
+namespace react {
+
+class FabricUIManager;
+
+}
+}
+
+using namespace facebook::react;
+
+/**
+ * An ObjC++ wrapper around the C++ FabricUIManager instance, so that the RCTCxxBridge can access it as needed.
+ */
+@interface RCTFabricUIManagerWrapper : NSObject <RCTInvalidating>
+
+- (instancetype)initWithManager:(std::shared_ptr<FabricUIManager>)manager;
+- (std::shared_ptr<FabricUIManager>)manager;
+
+@end
+
+@interface RCTBridge (RCTFabricUIManagerWrapper)
+
+/**
+ * To access via the bridge:
+ *
+ *   std::shared_ptr<FabricUIManager> fabricUIManager = [_bridge fabricUIManager];
+ */
+- (std::shared_ptr<FabricUIManager>)fabricUIManager;
+
+@end
diff --git a/React/Fabric/RCTFabricUIManagerWrapper.mm b/React/Fabric/RCTFabricUIManagerWrapper.mm
new file mode 100644
index 00000000000000..e1fc129d8a7bac
--- /dev/null
+++ b/React/Fabric/RCTFabricUIManagerWrapper.mm
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTFabricUIManagerWrapper.h"
+
+#include <fabric/FabricUIManager.h>
+
+// This file contains experimental placeholders, nothing is finalized.
+@implementation RCTFabricUIManagerWrapper
+{
+  std::shared_ptr<FabricUIManager> _manager;
+}
+
+- (instancetype)initWithManager:(std::shared_ptr<FabricUIManager>)manager
+{
+  self = [super init];
+  if (self) {
+    _manager = manager;
+  }
+  return self;
+}
+
+- (std::shared_ptr<FabricUIManager>)manager
+{
+  return _manager;
+}
+
+- (void)invalidate
+{
+}
+
+@end
+
+@implementation RCTBridge (RCTFabricUIManagerWrapper)
+
+- (std::shared_ptr<FabricUIManager>)fabricUIManager
+{
+  RCTFabricUIManagerWrapper *wrapper = [self jsBoundExtraModuleForClass:[RCTFabricUIManagerWrapper class]];
+  if (wrapper) {
+    return [wrapper manager];
+  }
+  return nullptr;
+}
+
+@end

From a759a44358711180b37cf4ad25f28af47e3de298 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Tue, 27 Feb 2018 08:28:13 -0800
Subject: [PATCH 109/267] npmignore: ignore tests and fixtures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
This try to address #17672 and https://github.com/facebook/metro/issues/139. We should probably not include these folders in the released version of React Native, as they are used only for testing—am I incorrect?

cc MoOx, t4deu.

I ran:

```
npm pack
tar -t -f react-native-1000.0.0.tgz | less
```

Then verified that `__fixture__` was not part of the package.

https://github.com/facebook/react-native/pull/17672

[GENERAL] [BUGFIX] [.npmignore] - Do not publish test-specific files
Closes https://github.com/facebook/react-native/pull/18019

Differential Revision: D7098211

Pulled By: jeanlauliac

fbshipit-source-id: 0748ad8c064450bd2a9f4d6f49675a7f74fb300f
---
 Libraries/.npmignore | 1 +
 local-cli/.npmignore | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 Libraries/.npmignore
 create mode 100644 local-cli/.npmignore

diff --git a/Libraries/.npmignore b/Libraries/.npmignore
new file mode 100644
index 00000000000000..c912533dd7d2dd
--- /dev/null
+++ b/Libraries/.npmignore
@@ -0,0 +1 @@
+__tests__
diff --git a/local-cli/.npmignore b/local-cli/.npmignore
new file mode 100644
index 00000000000000..e40506d719b298
--- /dev/null
+++ b/local-cli/.npmignore
@@ -0,0 +1,2 @@
+__fixtures__
+__tests__

From b60a727adbcfa785e3d1b13bf069b766216e60f8 Mon Sep 17 00:00:00 2001
From: Josh Hargreaves <joshyhargreaves@gmail.com>
Date: Tue, 27 Feb 2018 09:59:34 -0800
Subject: [PATCH 110/267] Fix crashes onKeyPress Android

Summary:
There appear to be two different types of crashes related to the recent addition of `onKeyPress` on Android introduce in `0.53`. This PR addresses the cause of both of them.

Firstly, it seems possible to get an `indexOutOfBoundsException` with some 3rd-party keyboards as observed in https://github.com/facebook/react-native/issues/17974 & https://github.com/facebook/react-native/issues/17922. I have simplified the backspace determining logic slightly, and also put in an explicit check for zero case so it is not possible to get an indexOutOfBoundsException & it should make sense in the context of the onKeyPress logic.

Secondly, it appears that `EditText#onCreateInputConnection` can return null. In this case, if we set `null` to be the target of our subclass of `ReactEditTextInputConnectionWrapper`, we will see the crashes as seen [here](https://github.com/facebook/react-native/issues/17974#issuecomment-368471737), whereby any of methods executed in the `InputConnection` interface can result in a crash. It's hard to reason about the state when `null` is returned from `onCreateInputConnection`, however I would might reason that any soft keyboard input cannot update the `EditText` with a `null` `input connection`, as there is no way of interfacing with the `EditText`. I'm am not sure, if there is a later point where we might return/set this input connection at a later point? As without the `InputConnection` onKeyPress will not work. But for now, this will fix this crash at least.

I have not managed to reproduce these crashes myself yet, but users have confirmed that the `indexOutOfBounds` exception is fixed with the 'zero' case and has been confirmed on the respective issues https://github.com/facebook/react-native/issues/17974#issuecomment-368471737.

For the `null` inputConnection target case, I have verified that explicitly setting the target as null in the constructor of `onCreateInputConnection` results in the same stack trace as the one linked. Here is also a [reference](https://github.com/stripe/stripe-android/pull/392/files#diff-6cc1685c98457d07fd4e2dd83f54d5bb) to the same issue closed with the same fix for another project on github.

It is also important to verify that the behavior of `onKeyPress` still functions the same after this change, which can be verified by running the RNTesterProject and the `KeyboardEvents` section in `InputText`.
The cases to check that I think are important to check are:
- Cursor at beginning of input & backspace
- Return key & return key at beginning of input
- Select text then press delete
- Selection then press a key
- Space key
- Different keyboard types

This should not be a breaking change.

 [ANDROID] [BUGFIX] [TextInput] - Fixes crashes with TextInput introduced in 0.53.
Closes https://github.com/facebook/react-native/pull/18114

Differential Revision: D7099570

Pulled By: hramos

fbshipit-source-id: 75b2dc468c1ed398a33eb00487c6aa14ae04e5c2
---
 .../facebook/react/views/textinput/ReactEditText.java |  8 +++++---
 .../ReactEditTextInputConnectionWrapper.java          | 11 ++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index 0dde905faed0ee..e15dd5a7969cda 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -172,14 +172,16 @@ protected void onScrollChanged(int horiz, int vert, int oldHoriz, int oldVert) {
   @Override
   public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
     ReactContext reactContext = (ReactContext) getContext();
-    ReactEditTextInputConnectionWrapper inputConnectionWrapper =
-        new ReactEditTextInputConnectionWrapper(super.onCreateInputConnection(outAttrs), reactContext, this);
+    InputConnection inputConnection = super.onCreateInputConnection(outAttrs);
+    if (inputConnection != null) {
+      inputConnection = new ReactEditTextInputConnectionWrapper(inputConnection, reactContext, this);
+    }
 
     if (isMultiline() && getBlurOnSubmit()) {
       // Remove IME_FLAG_NO_ENTER_ACTION to keep the original IME_OPTION
       outAttrs.imeOptions &= ~EditorInfo.IME_FLAG_NO_ENTER_ACTION;
     }
-    return inputConnectionWrapper;
+    return inputConnection;
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
index f0e12e61f340e5..cc2976efdf8679 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.java
@@ -92,14 +92,15 @@ public boolean setComposingText(CharSequence text, int newCursorPosition) {
     int previousSelectionEnd = mEditText.getSelectionEnd();
     String key;
     boolean consumed = super.setComposingText(text, newCursorPosition);
+    int currentSelectionStart = mEditText.getSelectionStart();
     boolean noPreviousSelection = previousSelectionStart == previousSelectionEnd;
-    boolean cursorDidNotMove = mEditText.getSelectionStart() == previousSelectionStart;
-    boolean cursorMovedBackwards = mEditText.getSelectionStart() < previousSelectionStart;
-    if ((noPreviousSelection && cursorMovedBackwards)
-            || !noPreviousSelection && cursorDidNotMove) {
+    boolean cursorDidNotMove = currentSelectionStart == previousSelectionStart;
+    boolean cursorMovedBackwardsOrAtBeginningOfInput =
+        (currentSelectionStart < previousSelectionStart) || currentSelectionStart <= 0;
+    if (cursorMovedBackwardsOrAtBeginningOfInput || (!noPreviousSelection && cursorDidNotMove)) {
       key = BACKSPACE_KEY_VALUE;
     } else {
-      key = String.valueOf(mEditText.getText().charAt(mEditText.getSelectionStart() - 1));
+      key = String.valueOf(mEditText.getText().charAt(currentSelectionStart - 1));
     }
     dispatchKeyEventOrEnqueue(key);
     return consumed;

From c87d03a8b21180fa110b7ee849e51bd0388760d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Tue, 27 Feb 2018 10:00:50 -0800
Subject: [PATCH 111/267] Update danger token

Summary: Closes https://github.com/facebook/react-native/pull/18111

Differential Revision: D7099636

Pulled By: hramos

fbshipit-source-id: fc95ba83c34e0061c13fb831ea3496d7e8f3793a
---
 .circleci/config.yml |  4 +++-
 bots/README.md       |  4 ++--
 bots/dangerfile.js   | 14 ++------------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cc86a51c4688e8..7ef8e3be5f9972 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -547,8 +547,9 @@ jobs:
       - run:
           name: Analyze Pull Request
           command: |
+            # DANGER_GITHUB_API_TOKEN=Facebook-Open-Source-Bot public_repo access token
             if [ -n "$CIRCLE_PR_NUMBER" ]; then
-              cd bots && DANGER_GITHUB_API_TOKEN="e622517d9f1136ea8900""07c6373666312cdfaa69" yarn danger
+              cd bots && DANGER_GITHUB_API_TOKEN="b186c9a82bab3b08ec80""c0818117619eec6f281a" yarn danger
             else
               echo "Skipping pull request analysis."            
             fi
@@ -556,6 +557,7 @@ jobs:
       - run:
           name: Analyze Code
           command: |
+            # GITHUB_TOKEN=eslint-bot public_repo access token
             if [ -n "$CIRCLE_PR_NUMBER" ]; then
               cat <(echo eslint; yarn --silent lint --format=json; echo flow; yarn --silent flow check --json) | GITHUB_TOKEN="af6ef0d15709bc91d""06a6217a5a826a226fb57b7" CI_USER=$CIRCLE_PROJECT_USERNAME CI_REPO=$CIRCLE_PROJECT_REPONAME PULL_REQUEST_NUMBER=$CIRCLE_PR_NUMBER node bots/code-analysis-bot.js
             else
diff --git a/bots/README.md b/bots/README.md
index 58cf901f82062c..985687f387b207 100644
--- a/bots/README.md
+++ b/bots/README.md
@@ -9,10 +9,10 @@ If you'd like to make changes to the Dangerfile, find an existing PR on the Reac
 Then, run from the React Native root directory:
 
 ```
-cd .circleci
+cd bots
 npm install
 ..
-node .circleci/node_modules/.bin/danger pr https://github.com/facebook/react-native/pull/1		
+node bots/node_modules/.bin/danger pr https://github.com/facebook/react-native/pull/1		
 ```
 
 And you will get the responses from parsing the Dangerfile.
diff --git a/bots/dangerfile.js b/bots/dangerfile.js
index fc727e2f0a1b9f..bd625afb3ce388 100644
--- a/bots/dangerfile.js
+++ b/bots/dangerfile.js
@@ -45,7 +45,7 @@ if (!includesTestPlan) {
 
 // Regex looks for given categories, types, a file/framework/component, and a message - broken into 4 capture groups
 const releaseNotesRegex = /\[(ANDROID|CLI|DOCS|GENERAL|INTERNAL|IOS|TVOS|WINDOWS)\]\s*?\[(BREAKING|BUGFIX|ENHANCEMENT|FEATURE|MINOR)\]\s*?\[(.*)\]\s*?\-\s*?(.*)/ig;
-const includesReleaseNotes = danger.github.pr.body.toLowerCase().includes('release notes');
+const includesReleaseNotes = danger.github.pr.body && danger.github.pr.body.toLowerCase().includes('release notes');
 const correctlyFormattedReleaseNotes = releaseNotesRegex.test(danger.github.pr.body);
 const releaseNotesCaptureGroups = releaseNotesRegex.exec(danger.github.pr.body);
 
@@ -86,8 +86,7 @@ if (danger.github.pr.additions + danger.github.pr.deletions > bigPRThreshold) {
   warn(`${title} - <i>${idea}</i>`);
 
   // markdown('@facebook-github-bot large-pr');
-}
-if (danger.git.modified_files + danger.git.added_files + danger.git.deleted_files > bigPRThreshold) {
+} else if (danger.git.modified_files + danger.git.added_files + danger.git.deleted_files > bigPRThreshold) {
   const title = ':exclamation: Big PR';
   const idea = `This PR is extremely unlikely to get reviewed because it touches ${danger.git.modified_files + danger.git.added_files + danger.git.deleted_files} files.`;
   warn(`${title} - <i>${idea}</i>`);
@@ -95,15 +94,6 @@ if (danger.git.modified_files + danger.git.added_files + danger.git.deleted_file
   // markdown('@facebook-github-bot large-pr');
 }
 
-// Warns if the bots whitelist file is updated.
-const issueCommandsFileModified = includes(danger.git.modified_files, 'bots/IssueCommands.txt');
-if (issueCommandsFileModified) {
-  const title = ':exclamation: Bots';
-  const idea = 'This PR appears to modify the list of people that may issue ' +
-  'commands to the GitHub bot.';
-  warn(`${title} - <i>${idea}</i>`);
-}
-
 // Warns if the PR is opened against stable, as commits need to be cherry picked and tagged by a release maintainer.
 // Fails if the PR is opened against anything other than `master` or `-stable`.
 const isMergeRefMaster = danger.github.pr.base.ref === 'master';

From 38197c8230657d567170cdaf8ff4bbb4aee732b8 Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Tue, 27 Feb 2018 10:42:44 -0800
Subject: [PATCH 112/267] Support Input Accessory View (iOS Only) [1/N]

Reviewed By: mmmulani

Differential Revision: D6886573

fbshipit-source-id: 71e1f812b1cc1698e4380211a6cedd59011b5495
---
 .../TextInput/InputAccessoryView.js           | 114 ++++++++++++++++++
 Libraries/Components/TextInput/TextInput.js   |   7 ++
 .../Text/RCTText.xcodeproj/project.pbxproj    |  18 +++
 .../Text/TextInput/RCTBaseTextInputView.h     |   1 +
 .../Text/TextInput/RCTBaseTextInputView.m     |  38 +++++-
 .../TextInput/RCTBaseTextInputViewManager.m   |   1 +
 .../Text/TextInput/RCTInputAccessoryView.h    |  19 +++
 .../Text/TextInput/RCTInputAccessoryView.m    |  69 +++++++++++
 .../TextInput/RCTInputAccessoryViewContent.h  |  14 +++
 .../TextInput/RCTInputAccessoryViewContent.m  |  75 ++++++++++++
 .../TextInput/RCTInputAccessoryViewManager.h  |  12 ++
 .../TextInput/RCTInputAccessoryViewManager.m  |  28 +++++
 RNTester/js/TextInputExample.ios.js           |  37 ++++++
 13 files changed, 427 insertions(+), 6 deletions(-)
 create mode 100644 Libraries/Components/TextInput/InputAccessoryView.js
 create mode 100644 Libraries/Text/TextInput/RCTInputAccessoryView.h
 create mode 100644 Libraries/Text/TextInput/RCTInputAccessoryView.m
 create mode 100644 Libraries/Text/TextInput/RCTInputAccessoryViewContent.h
 create mode 100644 Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
 create mode 100644 Libraries/Text/TextInput/RCTInputAccessoryViewManager.h
 create mode 100644 Libraries/Text/TextInput/RCTInputAccessoryViewManager.m

diff --git a/Libraries/Components/TextInput/InputAccessoryView.js b/Libraries/Components/TextInput/InputAccessoryView.js
new file mode 100644
index 00000000000000..cd12758435ff96
--- /dev/null
+++ b/Libraries/Components/TextInput/InputAccessoryView.js
@@ -0,0 +1,114 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule InputAccessoryView
+ * @flow
+ * @format
+ */
+'use strict';
+
+const ColorPropType = require('ColorPropType');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const ViewPropTypes = require('ViewPropTypes');
+
+const requireNativeComponent = require('requireNativeComponent');
+
+const RCTInputAccessoryView = requireNativeComponent('RCTInputAccessoryView');
+
+/**
+ * Note: iOS only
+ *
+ * A component which enables customization of the keyboard input accessory view.
+ * The input accessory view is displayed above the keyboard whenever a TextInput
+ * has focus. This component can be used to create custom toolbars.
+ *
+ * To use this component wrap your custom toolbar with the
+ * InputAccessoryView component, and set a nativeID. Then, pass that nativeID
+ * as the inputAccessoryViewID of whatever TextInput you desire. A simple
+ * example:
+ *
+ * ```ReactNativeWebPlayer
+ * import React, { Component } from 'react';
+ * import { AppRegistry, TextInput, InputAccessoryView, Button } from 'react-native';
+ *
+ * export default class UselessTextInput extends Component {
+ *   constructor(props) {
+ *     super(props);
+ *     this.state = {text: 'Placeholder Text'};
+ *   }
+ *
+ *   render() {
+ *     const inputAccessoryViewID = "uniqueID";
+ *     return (
+ *       <View>
+ *         <ScrollView keyboardDismissMode="interactive">
+ *           <TextInput
+ *             style={{
+ *               padding: 10,
+ *               paddingTop: 50,
+ *             }}
+ *             inputAccessoryViewID=inputAccessoryViewID
+ *             onChangeText={text => this.setState({text})}
+ *             value={this.state.text}
+ *           />
+ *         </ScrollView>
+ *         <InputAccessoryView nativeID=inputAccessoryViewID>
+ *           <Button
+ *             onPress={() => this.setState({text: 'Placeholder Text'})}
+ *             title="Reset Text"
+ *           />
+ *         </InputAccessoryView>
+ *       </View>
+ *     );
+ *   }
+ * }
+ *
+ * // skip this line if using Create React Native App
+ * AppRegistry.registerComponent('AwesomeProject', () => UselessTextInput);
+ * ```
+ *
+ * This component can also be used to create sticky text inputs (text inputs
+ * which are anchored to the top of the keyboard). To do this, wrap a
+ * TextInput with the InputAccessoryView component, and don't set a nativeID.
+ * For an example, look at InputAccessoryViewExample.js in RNTester.
+ */
+
+type Props = {
+  +children: React.Node,
+  /**
+   * An ID which is used to associate this `InputAccessoryView` to
+   * specified TextInput(s).
+   */
+  nativeID?: string,
+  style?: ViewPropTypes.style,
+  backgroundColor?: ColorPropType,
+};
+
+class InputAccessoryView extends React.Component<Props> {
+  render(): React.Node {
+    if (React.Children.count(this.props.children) === 0) {
+      return null;
+    }
+
+    return (
+      <RCTInputAccessoryView
+        style={[this.props.style, styles.container]}
+        nativeID={this.props.nativeID}
+        backgroundColor={this.props.backgroundColor}>
+        {this.props.children}
+      </RCTInputAccessoryView>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    position: 'absolute',
+  },
+});
+
+module.exports = InputAccessoryView;
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 3ce82932e17b33..57dc866b9dc44a 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -590,6 +590,13 @@ const TextInput = createReactClass({
      * This property is supported only for single-line TextInput component on iOS.
      */
     caretHidden: PropTypes.bool,
+    /**
+     * An optional identifier which links a custom InputAccessoryView to
+     * this text input. The InputAccessoryView is rendered above the
+     * keyboard when this text input is focused.
+     * @platform ios
+     */
+    inputAccessoryViewID: PropTypes.string,
   },
   getDefaultProps(): Object {
     return {
diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj
index a79fd942326734..da27ece2a1b138 100644
--- a/Libraries/Text/RCTText.xcodeproj/project.pbxproj
+++ b/Libraries/Text/RCTText.xcodeproj/project.pbxproj
@@ -103,6 +103,9 @@
 		5956B1A6200FF35C008D9D16 /* RCTUITextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B103200FEBA9008D9D16 /* RCTUITextField.m */; };
 		5956B1A7200FF35C008D9D16 /* RCTVirtualTextShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B12E200FEBAA008D9D16 /* RCTVirtualTextShadowView.m */; };
 		5956B1A8200FF35C008D9D16 /* RCTVirtualTextViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B12B200FEBAA008D9D16 /* RCTVirtualTextViewManager.m */; };
+		8F2807C7202D2B6B005D65E6 /* RCTInputAccessoryViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C1202D2B6A005D65E6 /* RCTInputAccessoryViewManager.m */; };
+		8F2807C8202D2B6B005D65E6 /* RCTInputAccessoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C3202D2B6A005D65E6 /* RCTInputAccessoryView.m */; };
+		8F2807C9202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C5202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -229,6 +232,12 @@
 		5956B12D200FEBAA008D9D16 /* RCTVirtualTextViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTVirtualTextViewManager.h; sourceTree = "<group>"; };
 		5956B12E200FEBAA008D9D16 /* RCTVirtualTextShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTVirtualTextShadowView.m; sourceTree = "<group>"; };
 		5956B12F200FEBAA008D9D16 /* RCTConvert+Text.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+Text.m"; sourceTree = "<group>"; };
+		8F2807C1202D2B6A005D65E6 /* RCTInputAccessoryViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTInputAccessoryViewManager.m; sourceTree = "<group>"; };
+		8F2807C2202D2B6A005D65E6 /* RCTInputAccessoryViewContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTInputAccessoryViewContent.h; sourceTree = "<group>"; };
+		8F2807C3202D2B6A005D65E6 /* RCTInputAccessoryView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTInputAccessoryView.m; sourceTree = "<group>"; };
+		8F2807C4202D2B6A005D65E6 /* RCTInputAccessoryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTInputAccessoryView.h; sourceTree = "<group>"; };
+		8F2807C5202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTInputAccessoryViewContent.m; sourceTree = "<group>"; };
+		8F2807C6202D2B6B005D65E6 /* RCTInputAccessoryViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTInputAccessoryViewManager.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXGroup section */
@@ -274,6 +283,12 @@
 		5956B0FF200FEBA9008D9D16 /* TextInput */ = {
 			isa = PBXGroup;
 			children = (
+				8F2807C4202D2B6A005D65E6 /* RCTInputAccessoryView.h */,
+				8F2807C3202D2B6A005D65E6 /* RCTInputAccessoryView.m */,
+				8F2807C2202D2B6A005D65E6 /* RCTInputAccessoryViewContent.h */,
+				8F2807C5202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m */,
+				8F2807C6202D2B6B005D65E6 /* RCTInputAccessoryViewManager.h */,
+				8F2807C1202D2B6A005D65E6 /* RCTInputAccessoryViewManager.m */,
 				5956B113200FEBA9008D9D16 /* Multiline */,
 				5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */,
 				5956B107200FEBA9008D9D16 /* RCTBackedTextInputDelegateAdapter.h */,
@@ -465,8 +480,11 @@
 				5956B140200FEBAA008D9D16 /* RCTTextShadowView.m in Sources */,
 				5956B131200FEBAA008D9D16 /* RCTRawTextViewManager.m in Sources */,
 				5956B137200FEBAA008D9D16 /* RCTBaseTextInputShadowView.m in Sources */,
+				8F2807C7202D2B6B005D65E6 /* RCTInputAccessoryViewManager.m in Sources */,
 				5956B146200FEBAA008D9D16 /* RCTConvert+Text.m in Sources */,
+				8F2807C9202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m in Sources */,
 				5956B13F200FEBAA008D9D16 /* RCTTextAttributes.m in Sources */,
+				8F2807C8202D2B6B005D65E6 /* RCTInputAccessoryView.m in Sources */,
 				5956B143200FEBAA008D9D16 /* RCTTextView.m in Sources */,
 				5956B13C200FEBAA008D9D16 /* RCTUITextView.m in Sources */,
 				5956B136200FEBAA008D9D16 /* RCTBackedTextInputDelegateAdapter.m in Sources */,
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.h b/Libraries/Text/TextInput/RCTBaseTextInputView.h
index fe86b334ba8a3a..6de343f2fa06d2 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.h
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.h
@@ -46,6 +46,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) RCTTextSelection *selection;
 @property (nonatomic, strong, nullable) NSNumber *maxLength;
 @property (nonatomic, copy) NSAttributedString *attributedText;
+@property (nonatomic, copy) NSString *inputAccessoryViewID;
 
 @end
 
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index 2d8bb0035fbdd5..025fb0e4168c8f 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -15,6 +15,8 @@
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
 
+#import "RCTInputAccessoryView.h"
+#import "RCTInputAccessoryViewContent.h"
 #import "RCTTextAttributes.h"
 #import "RCTTextSelection.h"
 
@@ -400,12 +402,33 @@ - (void)didMoveToWindow
 
 - (void)didSetProps:(NSArray<NSString *> *)changedProps
 {
-  [self invalidateInputAccessoryView];
+  #if !TARGET_OS_TV
+  if ([changedProps containsObject:@"inputAccessoryViewID"] && self.inputAccessoryViewID) {
+    [self setCustomInputAccessoryViewWithNativeID:self.inputAccessoryViewID];
+  } else if (!self.inputAccessoryViewID) {
+    [self setDefaultInputAccessoryView];
+  }
+  #endif
+}
+
+- (void)setCustomInputAccessoryViewWithNativeID:(NSString *)nativeID
+{
+  __weak RCTBaseTextInputView *weakSelf = self;
+  [_bridge.uiManager rootViewForReactTag:self.reactTag withCompletion:^(UIView *rootView) {
+    RCTBaseTextInputView *strongSelf = weakSelf;
+    if (rootView) {
+      UIView *accessoryView = [strongSelf->_bridge.uiManager viewForNativeID:nativeID
+                                                                 withRootTag:rootView.reactTag];
+      if (accessoryView && [accessoryView isKindOfClass:[RCTInputAccessoryView class]]) {
+        strongSelf.backedTextInputView.inputAccessoryView = ((RCTInputAccessoryView *)accessoryView).content.inputAccessoryView;
+        [strongSelf reloadInputViewsIfNecessary];
+      }
+    }
+  }];
 }
 
-- (void)invalidateInputAccessoryView
+- (void)setDefaultInputAccessoryView
 {
-#if !TARGET_OS_TV
   UIView<RCTBackedTextInputViewProtocol> *textInputView = self.backedTextInputView;
   UIKeyboardType keyboardType = textInputView.keyboardType;
 
@@ -443,12 +466,15 @@ - (void)invalidateInputAccessoryView
   else {
     textInputView.inputAccessoryView = nil;
   }
+  [self reloadInputViewsIfNecessary];
+}
 
+- (void)reloadInputViewsIfNecessary
+{
   // We have to call `reloadInputViews` for focused text inputs to update an accessory view.
-  if (textInputView.isFirstResponder) {
-    [textInputView reloadInputViews];
+  if (self.backedTextInputView.isFirstResponder) {
+    [self.backedTextInputView reloadInputViews];
   }
-#endif
 }
 
 - (void)handleInputAccessoryDoneButton
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
index e9b53769690b71..745fd83cb60967 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
@@ -53,6 +53,7 @@ @implementation RCTBaseTextInputViewManager
 RCT_EXPORT_VIEW_PROPERTY(maxLength, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(selectTextOnFocus, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(selection, RCTTextSelection)
+RCT_EXPORT_VIEW_PROPERTY(inputAccessoryViewID, NSString)
 
 RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onSelectionChange, RCTDirectEventBlock)
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryView.h b/Libraries/Text/TextInput/RCTInputAccessoryView.h
new file mode 100644
index 00000000000000..b2517534baf3bb
--- /dev/null
+++ b/Libraries/Text/TextInput/RCTInputAccessoryView.h
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+@class RCTBridge;
+@class RCTInputAccessoryViewContent;
+
+@interface RCTInputAccessoryView : UIView
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge;
+
+@property (nonatomic, readonly, strong) RCTInputAccessoryViewContent *content;
+
+@end
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryView.m b/Libraries/Text/TextInput/RCTInputAccessoryView.m
new file mode 100644
index 00000000000000..a1902a80ea5fd4
--- /dev/null
+++ b/Libraries/Text/TextInput/RCTInputAccessoryView.m
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTInputAccessoryView.h"
+
+#import <React/RCTBridge.h>
+#import <React/RCTTouchHandler.h>
+#import <React/UIView+React.h>
+
+#import "RCTInputAccessoryViewContent.h"
+
+@implementation RCTInputAccessoryView
+{
+  BOOL _contentShouldBeFirstResponder;
+}
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+{
+  if (self = [super init]) {
+    _content = [RCTInputAccessoryViewContent new];
+    RCTTouchHandler *const touchHandler = [[RCTTouchHandler alloc] initWithBridge:bridge];
+    [touchHandler attachToView:_content.inputAccessoryView];
+    [self addSubview:_content];
+  }
+  return self;
+}
+
+- (void)reactSetFrame:(CGRect)frame
+{
+  [_content.inputAccessoryView setFrame:frame];
+  [_content.contentView setFrame:frame];
+
+  if (_contentShouldBeFirstResponder) {
+    _contentShouldBeFirstResponder = NO;
+    [_content becomeFirstResponder];
+  }
+}
+
+- (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)index
+{
+  [super insertReactSubview:subview atIndex:index];
+  [_content insertReactSubview:subview atIndex:index];
+}
+
+- (void)removeReactSubview:(UIView *)subview
+{
+  [super removeReactSubview:subview];
+  [_content removeReactSubview:subview];
+}
+
+- (void)didUpdateReactSubviews
+{
+  // Do nothing, as subviews are managed by `insertReactSubview:atIndex:`
+}
+
+- (void)didSetProps:(NSArray<NSString *> *)changedProps
+{
+  // If the accessory view is not linked to a text input via nativeID, assume it is
+  // a standalone component that should get focus whenever it is rendered
+  if (![changedProps containsObject:@"nativeID"] && !self.nativeID) {
+    _contentShouldBeFirstResponder = YES;
+  }
+}
+
+@end
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h
new file mode 100644
index 00000000000000..7c24d010e2d270
--- /dev/null
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface RCTInputAccessoryViewContent : UIView
+
+@property (nonatomic, readwrite, retain) UIView *contentView;
+
+@end
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
new file mode 100644
index 00000000000000..3fb7fca715c608
--- /dev/null
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTInputAccessoryViewContent.h"
+
+#import <React/UIView+React.h>
+
+@interface RCTInputAccessoryViewContent()
+
+// Overriding `inputAccessoryView` to `readwrite`.
+@property (nonatomic, readwrite, retain) UIView *inputAccessoryView;
+
+@end
+
+@implementation RCTInputAccessoryViewContent
+
+- (BOOL)canBecomeFirstResponder
+{
+  return true;
+}
+
+- (BOOL)becomeFirstResponder
+{
+  const BOOL becameFirstResponder = [super becomeFirstResponder];
+
+  #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
+  // Avoiding the home pill and notch (landscape mode) on iphoneX.
+  if (becameFirstResponder) {
+    if (@available(iOS 11.0, *)) {
+      [_contentView.bottomAnchor
+       constraintLessThanOrEqualToSystemSpacingBelowAnchor:_contentView.window.safeAreaLayoutGuide.bottomAnchor
+       multiplier:1.0f].active = YES;
+      [_contentView.leftAnchor
+       constraintLessThanOrEqualToSystemSpacingAfterAnchor:_contentView.window.safeAreaLayoutGuide.leftAnchor
+       multiplier:1.0f].active = YES;
+      [_contentView.rightAnchor
+       constraintLessThanOrEqualToSystemSpacingAfterAnchor:_contentView.window.safeAreaLayoutGuide.rightAnchor
+       multiplier:1.0f].active = YES;
+    }
+  }
+  #endif
+
+  return becameFirstResponder;
+}
+
+- (UIView *)inputAccessoryView
+{
+  if (!_inputAccessoryView) {
+    _inputAccessoryView = [UIView new];
+    _contentView = [UIView new];
+    [_inputAccessoryView addSubview:_contentView];
+  }
+  return _inputAccessoryView;
+}
+
+- (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)index
+{
+  [super insertReactSubview:subview atIndex:index];
+  [_contentView insertSubview:subview atIndex:index];
+}
+
+- (void)removeReactSubview:(UIView *)subview
+{
+  [super removeReactSubview:subview];
+  [subview removeFromSuperview];
+  if ([[_inputAccessoryView subviews] count] == 0 && [self isFirstResponder]) {
+    [self resignFirstResponder];
+  }
+}
+
+@end
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h
new file mode 100644
index 00000000000000..590723a5631716
--- /dev/null
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTViewManager.h>
+
+@interface RCTInputAccessoryViewManager : RCTViewManager
+
+@end
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m
new file mode 100644
index 00000000000000..b293889eb6de84
--- /dev/null
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTInputAccessoryViewManager.h"
+
+#import "RCTInputAccessoryView.h"
+
+@implementation RCTInputAccessoryViewManager
+
+RCT_EXPORT_MODULE()
+
++ (BOOL)requiresMainQueueSetup
+{
+  return NO;
+}
+
+- (UIView *)view
+{
+  return [[RCTInputAccessoryView alloc] initWithBridge:self.bridge];
+}
+
+RCT_REMAP_VIEW_PROPERTY(backgroundColor, content.inputAccessoryView.backgroundColor, UIColor)
+
+@end
diff --git a/RNTester/js/TextInputExample.ios.js b/RNTester/js/TextInputExample.ios.js
index a55206355046da..9ace0a94ae6fab 100644
--- a/RNTester/js/TextInputExample.ios.js
+++ b/RNTester/js/TextInputExample.ios.js
@@ -9,6 +9,8 @@
  */
 'use strict';
 
+const Button = require('Button');
+const InputAccessoryView = require('InputAccessoryView');
 var React = require('react');
 var ReactNative = require('react-native');
 var {
@@ -91,6 +93,35 @@ class TextEventsExample extends React.Component<{}, $FlowFixMeState> {
   }
 }
 
+class TextInputAccessoryViewExample extends React.Component<{}, *> {
+  constructor(props) {
+    super(props);
+    this.state = {text: 'Placeholder Text'};
+  }
+
+  render() {
+    const inputAccessoryViewID = 'inputAccessoryView1';
+    return (
+      <View>
+        <TextInput
+          style={styles.default}
+          inputAccessoryViewID={inputAccessoryViewID}
+          onChangeText={text => this.setState({text})}
+          value={this.state.text}
+        />
+        <InputAccessoryView nativeID={inputAccessoryViewID}>
+          <View style={{backgroundColor: 'white'}}>
+            <Button
+              onPress={() => this.setState({text: 'Placeholder Text'})}
+              title="Reset Text"
+            />
+          </View>
+        </InputAccessoryView>
+      </View>
+    );
+  }
+}
+
 class RewriteExample extends React.Component<$FlowFixMeProps, any> {
   constructor(props) {
     super(props);
@@ -485,6 +516,12 @@ exports.examples = [
       return <RewriteExampleInvalidCharacters />;
     }
   },
+  {
+    title: 'Keyboard Accessory View',
+    render: function() {
+      return <TextInputAccessoryViewExample />;
+    }
+  },
   {
     title: 'Auto-capitalize',
     render: function() {

From 1346bf840505743acdecc4a8580f7d6e73e09e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Tue, 27 Feb 2018 12:40:13 -0800
Subject: [PATCH 113/267] Timeout Android instrumentation steps

Summary:
Sporadically, the instrumentation tests step will timeout while waiting for the apk to install on the emulator. By adding a 5 minute timeout, the command will be retried in these cases, where hopefully the install will go through.

Test Plan

Tested on Circle.
Closes https://github.com/facebook/react-native/pull/18127

Differential Revision: D7101890

Pulled By: hramos

fbshipit-source-id: 4dcc77153d794e9747df58ea40c011bc316b6c83
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7ef8e3be5f9972..12a44b30ae5856 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -190,7 +190,7 @@ aliases:
       if [[ ! -e ReactAndroid/src/androidTest/assets/AndroidTestBundle.js ]]; then	
         echo "JavaScript bundle missing, cannot run instrumentation tests. Verify build-js-bundle step completed successfully."; exit 1;
       fi
-      source scripts/circle-ci-android-setup.sh && NO_BUCKD=1 retry3 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
+      source scripts/circle-ci-android-setup.sh && NO_BUCKD=1 retry3 timeout 300 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=$BUILD_THREADS
   
   - &collect-android-test-results
     name: Collect Test Results

From 6c353fd7e9fd324717951ad62754d817537d7339 Mon Sep 17 00:00:00 2001
From: Julien K <julienkode@users.noreply.github.com>
Date: Tue, 27 Feb 2018 12:52:21 -0800
Subject: [PATCH 114/267] onPress animation with magnification

Summary:
Related to: #15454

Motivation: Improve tvOS feeling for TouchableHighlight

![changewithaniamtion](https://user-images.githubusercontent.com/7658664/29193477-b99b4a10-7e25-11e7-8b31-e0e4ca9d7720.gif)

- When you select the button he is focus and the underlay is show
- When you press the button, there is an animation, but after the animation, the focus is on the button and the underlay is show

Play with tvParallaxProperties on tvOS, test with and without patch just to see the actual behaviour
```
			<TouchableHighlight
						tvParallaxProperties={{
							enabled: true,
							shiftDistanceX: 0,
							shiftDistanceY: 0,
							tiltAngle: 0,
							magnification: 1.1,
                                                        pressMagnification: 1.0,
							pressDuration: 0.3,
						}}
						underlayColor="black"
						onShowUnderlay={() => (console.log("onShowUnderlay")}
						onHideUnderlay={() =>  (console.log("onHideUnderlay")}
						onPress={() =>  (console.log("onPress")}
					>
						<Image
							style={styles.image}
							source={ uri: 'https://www.facebook.com/images/fb_icon_325x325.png' }
						/>
					</TouchableHighlight>
```
Closes https://github.com/facebook/react-native/pull/15455

Differential Revision: D6887437

Pulled By: hramos

fbshipit-source-id: e18b695068bc99643ba4006fb3f39215b38a74c1
---
 .../Components/AppleTV/TVViewPropTypes.js     |  3 +
 .../Touchable/TouchableHighlight.js           | 16 +++-
 RNTester/js/ListExampleShared.js              |  3 +
 RNTester/js/RNTesterList.ios.js               |  2 +-
 RNTester/js/TouchableExample.js               |  1 +
 React/Views/RCTTVView.m                       | 93 +++++++++++++++----
 6 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/Libraries/Components/AppleTV/TVViewPropTypes.js b/Libraries/Components/AppleTV/TVViewPropTypes.js
index cf5f5b03b7679e..fab7a30b84d40f 100644
--- a/Libraries/Components/AppleTV/TVViewPropTypes.js
+++ b/Libraries/Components/AppleTV/TVViewPropTypes.js
@@ -37,6 +37,9 @@ var TVViewPropTypes = {
      * shiftDistanceY: Defaults to 2.0.
      * tiltAngle: Defaults to 0.05.
      * magnification: Defaults to 1.0.
+     * pressMagnification: Defaults to 1.0.
+     * pressDuration: Defaults to 0.3.
+     * pressDelay: Defaults to 0.0.
      *
      * @platform ios
      */
diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
index 6493a5147b67b4..19680b236528c0 100644
--- a/Libraries/Components/Touchable/TouchableHighlight.js
+++ b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -13,6 +13,7 @@
 const ColorPropType = require('ColorPropType');
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const PropTypes = require('prop-types');
+const Platform = require('Platform');
 const React = require('React');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 const StyleSheet = require('StyleSheet');
@@ -172,6 +173,9 @@ const TouchableHighlight = createReactClass({
      * shiftDistanceY: Defaults to 2.0.
      * tiltAngle: Defaults to 0.05.
      * magnification: Defaults to 1.0.
+     * pressMagnification: Defaults to 1.0.
+     * pressDuration: Defaults to 0.3.
+     * pressDelay: Defaults to 0.0.
      *
      * @platform ios
      */
@@ -246,11 +250,13 @@ const TouchableHighlight = createReactClass({
 
   touchableHandlePress: function(e: PressEvent) {
     clearTimeout(this._hideTimeout);
-    this._showUnderlay();
-    this._hideTimeout = setTimeout(
-      this._hideUnderlay,
-      this.props.delayPressOut,
-    );
+    if (!Platform.isTVOS) {
+      this._showUnderlay();
+      this._hideTimeout = setTimeout(
+        this._hideUnderlay,
+        this.props.delayPressOut,
+      );
+    }
     this.props.onPress && this.props.onPress(e);
   },
 
diff --git a/RNTester/js/ListExampleShared.js b/RNTester/js/ListExampleShared.js
index 96ace615655be1..c5eef14dbac902 100644
--- a/RNTester/js/ListExampleShared.js
+++ b/RNTester/js/ListExampleShared.js
@@ -62,6 +62,9 @@ class ItemComponent extends React.PureComponent<{
         onPress={this._onPress}
         onShowUnderlay={this.props.onShowUnderlay}
         onHideUnderlay={this.props.onHideUnderlay}
+        tvParallaxProperties={{
+          pressMagnification: 1.1,
+        }}
         style={horizontal ? styles.horizItem : styles.item}>
         <View style={[
           styles.row, horizontal && {width: HORIZ_WIDTH}, fixedHeight && {height: ITEM_HEIGHT}]}>
diff --git a/RNTester/js/RNTesterList.ios.js b/RNTester/js/RNTesterList.ios.js
index 1542a4e4ac80ad..d45e42fa596077 100644
--- a/RNTester/js/RNTesterList.ios.js
+++ b/RNTester/js/RNTesterList.ios.js
@@ -189,7 +189,7 @@ const ComponentExamples: Array<RNTesterExample> = [
   {
     key: 'TouchableExample',
     module: require('./TouchableExample'),
-    supportsTVOS: false,
+    supportsTVOS: true,
   },
   {
     key: 'TransparentHitTestExample',
diff --git a/RNTester/js/TouchableExample.js b/RNTester/js/TouchableExample.js
index f505891177d571..e0c227d9ca3f7f 100644
--- a/RNTester/js/TouchableExample.js
+++ b/RNTester/js/TouchableExample.js
@@ -55,6 +55,7 @@ exports.examples = [
             style={styles.wrapper}
             activeOpacity={1}
             animationVelocity={0}
+            tvParallaxProperties={{pressMagnification: 1.3, pressDuration: 0.6}}
             underlayColor="rgb(210, 230, 255)"
             onPress={() => console.log('custom THW text - highlight')}>
             <View style={styles.wrapperCustom}>
diff --git a/React/Views/RCTTVView.m b/React/Views/RCTTVView.m
index dcd086499c1f54..4351978629a807 100644
--- a/React/Views/RCTTVView.m
+++ b/React/Views/RCTTVView.m
@@ -27,24 +27,50 @@ @implementation RCTTVView
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
-    self.tvParallaxProperties = @{
-      @"enabled": @YES,
-      @"shiftDistanceX": @2.0f,
-      @"shiftDistanceY": @2.0f,
-      @"tiltAngle": @0.05f,
-      @"magnification": @1.0f
-    };
+    dispatch_once(&onceToken, ^{
+      defaultTVParallaxProperties = @{
+        @"enabled": @YES,
+        @"shiftDistanceX": @2.0f,
+        @"shiftDistanceY": @2.0f,
+        @"tiltAngle": @0.05f,
+        @"magnification": @1.0f,
+        @"pressMagnification": @1.0f,
+        @"pressDuration": @0.3f,
+        @"pressDelay": @0.0f
+      };
+    });
+    self.tvParallaxProperties = defaultTVParallaxProperties;
   }
 
   return self;
 }
 
+static NSDictionary* defaultTVParallaxProperties = nil;
+static dispatch_once_t onceToken;
+
+- (void)setTvParallaxProperties:(NSDictionary *)tvParallaxProperties {
+  if (_tvParallaxProperties == nil) {
+    _tvParallaxProperties = [defaultTVParallaxProperties copy];
+    return;
+  }
+
+  NSMutableDictionary *newParallaxProperties = [NSMutableDictionary dictionaryWithDictionary:_tvParallaxProperties];
+  for (NSString *k in [defaultTVParallaxProperties allKeys]) {
+    if (tvParallaxProperties[k]) {
+      newParallaxProperties[k] = tvParallaxProperties[k];
+    }
+  }
+  _tvParallaxProperties = [newParallaxProperties copy];
+}
+
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:unused)
 
 - (void)setIsTVSelectable:(BOOL)isTVSelectable {
   self->_isTVSelectable = isTVSelectable;
-  if(isTVSelectable) {
-    UITapGestureRecognizer *recognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleSelect:)];
+  if (isTVSelectable) {
+    UITapGestureRecognizer *recognizer = [[UITapGestureRecognizer alloc] 
+                                           initWithTarget:self 
+                                                   action:@selector(handleSelect:)];
     recognizer.allowedPressTypes = @[@(UIPressTypeSelect)];
     _selectRecognizer = recognizer;
     [self addGestureRecognizer:_selectRecognizer];
@@ -57,8 +83,37 @@ - (void)setIsTVSelectable:(BOOL)isTVSelectable {
 
 - (void)handleSelect:(__unused UIGestureRecognizer *)r
 {
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVNavigationEventNotification
-                                                      object:@{@"eventType":@"select",@"tag":self.reactTag}];
+	if ([self.tvParallaxProperties[@"enabled"] boolValue] == YES) {
+    float magnification = [self.tvParallaxProperties[@"magnification"] floatValue];
+    float pressMagnification = [self.tvParallaxProperties[@"pressMagnification"] floatValue];
+		
+		// Duration of press animation
+		float pressDuration = [self.tvParallaxProperties[@"pressDuration"] floatValue];
+		
+		// Delay of press animation
+		float pressDelay = [self.tvParallaxProperties[@"pressDelay"] floatValue];
+		
+    [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:pressDelay]];
+    
+    [UIView animateWithDuration:(pressDuration/2)
+      animations:^{
+        self.transform = CGAffineTransformMakeScale(pressMagnification, pressMagnification);
+      }
+      completion:^(__unused BOOL finished1){
+        [UIView animateWithDuration:(pressDuration/2)
+          animations:^{
+            self.transform = CGAffineTransformMakeScale(magnification, magnification);
+          }
+          completion:^(__unused BOOL finished2) {
+            [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVNavigationEventNotification 
+              object:@{@"eventType":@"select",@"tag":self.reactTag}];
+          }];
+       }];
+    
+	} else {
+		[[NSNotificationCenter defaultCenter] postNotificationName:RCTTVNavigationEventNotification
+															                          object:@{@"eventType":@"select",@"tag":self.reactTag}];
+	}
 }
 
 - (BOOL)isUserInteractionEnabled
@@ -79,15 +134,15 @@ - (void)addParallaxMotionEffects
 
   // Make horizontal movements shift the centre left and right
   UIInterpolatingMotionEffect *xShift = [[UIInterpolatingMotionEffect alloc]
-                                         initWithKeyPath:@"center.x"
-                                         type:UIInterpolatingMotionEffectTypeTiltAlongHorizontalAxis];
+                                          initWithKeyPath:@"center.x"
+                                                     type:UIInterpolatingMotionEffectTypeTiltAlongHorizontalAxis];
   xShift.minimumRelativeValue = @( shiftDistanceX * -1.0f);
   xShift.maximumRelativeValue = @( shiftDistanceX);
 
   // Make vertical movements shift the centre up and down
   UIInterpolatingMotionEffect *yShift = [[UIInterpolatingMotionEffect alloc]
-                                         initWithKeyPath:@"center.y"
-                                         type:UIInterpolatingMotionEffectTypeTiltAlongVerticalAxis];
+                                          initWithKeyPath:@"center.y"
+                                                     type:UIInterpolatingMotionEffectTypeTiltAlongVerticalAxis];
   yShift.minimumRelativeValue = @( shiftDistanceY * -1.0f);
   yShift.maximumRelativeValue = @( shiftDistanceY);
 
@@ -95,7 +150,9 @@ - (void)addParallaxMotionEffects
   CGFloat const tiltAngle = [self.tvParallaxProperties[@"tiltAngle"] floatValue];
 
   // Now make horizontal movements effect a rotation about the Y axis for side-to-side rotation.
-  UIInterpolatingMotionEffect *xTilt = [[UIInterpolatingMotionEffect alloc] initWithKeyPath:@"layer.transform" type:UIInterpolatingMotionEffectTypeTiltAlongHorizontalAxis];
+  UIInterpolatingMotionEffect *xTilt = [[UIInterpolatingMotionEffect alloc] 
+                                         initWithKeyPath:@"layer.transform"
+                                                    type:UIInterpolatingMotionEffectTypeTiltAlongHorizontalAxis];
 
   // CATransform3D value for minimumRelativeValue
   CATransform3D transMinimumTiltAboutY = CATransform3DIdentity;
@@ -112,7 +169,9 @@ - (void)addParallaxMotionEffects
   xTilt.maximumRelativeValue = [NSValue valueWithCATransform3D: transMaximumTiltAboutY];
 
   // Now make vertical movements effect a rotation about the X axis for up and down rotation.
-  UIInterpolatingMotionEffect *yTilt = [[UIInterpolatingMotionEffect alloc] initWithKeyPath:@"layer.transform" type:UIInterpolatingMotionEffectTypeTiltAlongVerticalAxis];
+  UIInterpolatingMotionEffect *yTilt = [[UIInterpolatingMotionEffect alloc] 
+                                         initWithKeyPath:@"layer.transform" 
+                                                    type:UIInterpolatingMotionEffectTypeTiltAlongVerticalAxis];
 
   // CATransform3D value for minimumRelativeValue
   CATransform3D transMinimumTiltAboutX = CATransform3DIdentity;

From 2dc559d1fbab7434d61df62936be11434d6f7f91 Mon Sep 17 00:00:00 2001
From: Peter van der Zee <kuvos@fb.com>
Date: Tue, 27 Feb 2018 13:14:34 -0800
Subject: [PATCH 115/267] Add possibility to add custom plugin prefix

Summary: The problem with a fixed prefix is that babel 7 uses a scoped packages and every (standard) plugin is now part of that scope so the prefix is no longer `babel-plugin-` but instead `babel/plugin-`. There are more changes. This one will at least fix most of them.

Reviewed By: davidaurelio

Differential Revision: D7085102

fbshipit-source-id: b927998c611b71b3265e1cb3f6df537b14f9cb25
---
 babel-preset/lib/resolvePlugins.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/babel-preset/lib/resolvePlugins.js b/babel-preset/lib/resolvePlugins.js
index 05476f1a4d33ce..ebbe5ddacfc559 100644
--- a/babel-preset/lib/resolvePlugins.js
+++ b/babel-preset/lib/resolvePlugins.js
@@ -3,6 +3,8 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @format
  */
 'use strict';
 
@@ -12,21 +14,21 @@
  * the file it's compiling. This makes sure that we're using the plugins
  * installed in the react-native package.
  */
-function resolvePlugins(plugins) {
-  return plugins.map(resolvePlugin);
+function resolvePlugins(plugins, prefix) {
+  return plugins.map(plugin => resolvePlugin(plugin, prefix));
 }
 
 /**
  * Manually resolve a single Babel plugin.
  */
-function resolvePlugin(plugin) {
+function resolvePlugin(plugin, prefix = 'babel-plugin-') {
   // Normalise plugin to an array.
   if (!Array.isArray(plugin)) {
     plugin = [plugin];
   }
   // Only resolve the plugin if it's a string reference.
   if (typeof plugin[0] === 'string') {
-    plugin[0] = require('babel-plugin-' + plugin[0]);
+    plugin[0] = require(prefix + plugin[0]);
     plugin[0] = plugin[0].__esModule ? plugin[0].default : plugin[0];
   }
   return plugin;
@@ -34,3 +36,7 @@ function resolvePlugin(plugin) {
 
 module.exports = resolvePlugins;
 module.exports.resolvePlugin = resolvePlugin;
+module.exports.resolvePluginAs = (prefix, plugin) =>
+  resolvePlugin(plugin, prefix);
+module.exports.resolvePluginsAs = (prefix, plugins) =>
+  resolvePlugins(plugins, prefix);

From 2ad34075f1d048bebb08ef30799ac0d081073150 Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Tue, 27 Feb 2018 14:03:50 -0800
Subject: [PATCH 116/267] Xcode 9 supports running multiple simulators

Summary:
Since Xcode 9 you can run multiple simultaneously. And since I believe React Native advocates using the latest version of Xcode, we can safely remove this constraint.

Updated the unit tests. Furthermore it can be found in the [Xcode release notes](https://developer.apple.com/library/content/documentation/DeveloperTools/Conceptual/WhatsNewXcode/xcode_9/xcode_9.html#//apple_ref/doc/uid/TP40004626-CH8-SW12) that multiple simulators are now supported.

This can be tested with the CLI by running `react-native run-ios` twice, but with a different `--simulator` flag, e.g.;

    react-native run-ios --simulator "iPhone SE"
    react-native run-ios --simulator "iPhone X"

[IOS] [ENHANCEMENT] [local-cli/runIOS/findMatchingSimulator.js] - Allow running multiple simulators
Closes https://github.com/facebook/react-native/pull/17284

Differential Revision: D7102790

Pulled By: hramos

fbshipit-source-id: 750e7039201e28a1feda2bec1e78144fd9deff98
---
 .../__tests__/findMatchingSimulator-test.js   | 22 +++++++++-----
 local-cli/runIOS/findMatchingSimulator.js     | 10 +++----
 local-cli/runIOS/runIOS.js                    | 30 +++++++++++--------
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/local-cli/runIOS/__tests__/findMatchingSimulator-test.js b/local-cli/runIOS/__tests__/findMatchingSimulator-test.js
index 6433605beb9017..fb3ffddcbe8d4c 100644
--- a/local-cli/runIOS/__tests__/findMatchingSimulator-test.js
+++ b/local-cli/runIOS/__tests__/findMatchingSimulator-test.js
@@ -55,6 +55,7 @@ describe('findMatchingSimulator', () => {
     )).toEqual({
       udid: 'BA0D93BD-07E6-4182-9B0A-F60A2474139C',
       name: 'iPhone 6',
+      booted: false,
       version: 'iOS 9.2'
     });
   });
@@ -145,6 +146,7 @@ describe('findMatchingSimulator', () => {
     )).toEqual({
       udid: '1CCBBF8B-5773-4EA6-BD6F-C308C87A1ADB',
       name: 'iPhone 5',
+      booted: false,
       version: 'iOS 9.2'
     });
   });
@@ -216,6 +218,7 @@ describe('findMatchingSimulator', () => {
     )).toEqual({
       udid: '1CCBBF8B-5773-4EA6-BD6F-C308C87A1ADB',
       name: 'iPhone 5',
+      booted: false,
       version: 'iOS 9.2'
     });
   });
@@ -261,11 +264,12 @@ describe('findMatchingSimulator', () => {
     )).toEqual({
       udid: 'D0F29BE7-CC3C-4976-888D-C739B4F50508',
       name: 'iPhone 6s',
+      booted: true,
       version: 'iOS 9.2'
     });
   });
 
-  it('should return the booted simulator in list even if another device is defined', () => {
+  it('should return the defined simulator in list even if another device is booted', () => {
     expect(findMatchingSimulator({
         'devices': {
           'iOS 9.2': [
@@ -304,8 +308,9 @@ describe('findMatchingSimulator', () => {
       },
       'iPhone 6'
     )).toEqual({
-      udid: 'D0F29BE7-CC3C-4976-888D-C739B4F50508',
-      name: 'iPhone 6s',
+      udid: 'BA0D93BD-07E6-4182-9B0A-F60A2474139C',
+      name: 'iPhone 6',
+      booted: false,
       version: 'iOS 9.2'
     });
   });
@@ -377,11 +382,12 @@ describe('findMatchingSimulator', () => {
     )).toEqual({
       udid: '3A409DC5-5188-42A6-8598-3AA6F34607A5',
       name: 'iPhone 7',
+      booted: true,
       version: 'iOS 10.0'
     });
   });
 
-  it('should return the booted simulator in list even if another device is defined (multi ios versions)', () => {
+  it('should return the defined simulator in list even if another device is booted (multi ios versions)', () => {
     expect(findMatchingSimulator({
         'devices': {
           'iOS 9.2': [
@@ -446,9 +452,10 @@ describe('findMatchingSimulator', () => {
       },
       'iPhone 6s'
     )).toEqual({
-      udid: '3A409DC5-5188-42A6-8598-3AA6F34607A5',
-      name: 'iPhone 7',
-      version: 'iOS 10.0'
+      udid: 'D0F29BE7-CC3C-4976-888D-C739B4F50508',
+      name: 'iPhone 6s',
+      booted: false,
+      version: 'iOS 9.2'
     });
   });
 
@@ -481,6 +488,7 @@ describe('findMatchingSimulator', () => {
   )).toEqual({
     udid: '816C30EA-38EA-41AC-BFDA-96FB632D522E',
     name: 'Apple TV',
+    booted: true,
     version: 'tvOS 11.2'
   });
   });
diff --git a/local-cli/runIOS/findMatchingSimulator.js b/local-cli/runIOS/findMatchingSimulator.js
index ceef5c669ee337..8b964ec7dba6ba 100644
--- a/local-cli/runIOS/findMatchingSimulator.js
+++ b/local-cli/runIOS/findMatchingSimulator.js
@@ -34,14 +34,12 @@ function findMatchingSimulator(simulators, simulatorName) {
       if (simulator.availability !== '(available)') {
         continue;
       }
-      // If there is a booted simulator, we'll use that as instruments will not boot a second simulator
-      if (simulator.state === 'Booted') {
-        if (simulatorName !== null) {
-          console.warn("We couldn't boot your defined simulator due to an already booted simulator. We are limited to one simulator launched at a time.");
-        }
+      let booted = simulator.state === 'Booted';
+      if (booted && simulatorName === null) {
         return {
           udid: simulator.udid,
           name: simulator.name,
+          booted,
           version
         };
       }
@@ -49,6 +47,7 @@ function findMatchingSimulator(simulators, simulatorName) {
         match = {
           udid: simulator.udid,
           name: simulator.name,
+          booted,
           version
         };
       }
@@ -57,6 +56,7 @@ function findMatchingSimulator(simulators, simulatorName) {
         match = {
           udid: simulator.udid,
           name: simulator.name,
+          booted,
           version
         };
       }
diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js
index 22fbf6ef5f183e..8927be98d80226 100644
--- a/local-cli/runIOS/runIOS.js
+++ b/local-cli/runIOS/runIOS.js
@@ -113,24 +113,30 @@ function runOnSimulator(xcodeProject, args, scheme) {
       throw new Error(`Could not find ${args.simulator} simulator`);
     }
 
-    const simulatorFullName = formattedDeviceName(selectedSimulator);
-    console.log(`Launching ${simulatorFullName}...`);
-    try {
-      child_process.spawnSync('xcrun', ['instruments', '-w', selectedSimulator.udid]);
-    } catch (e) {
-      // instruments always fail with 255 because it expects more arguments,
-      // but we want it to only launch the simulator
+    if (!selectedSimulator.booted) {
+      const simulatorFullName = formattedDeviceName(selectedSimulator);
+      console.log(`Booting ${simulatorFullName}...`);
+      try {
+        child_process.execFileSync('xcrun', ['simctl', 'boot', selectedSimulator.udid]);
+      } catch (e) {
+        throw new Error(
+`Could not boot ${args.simulator} simulator. Is there already a simulator running?
+Running multiple simulators is only supported from Xcode 9 and up.
+Try closing the simulator or run the command again without specifying a simulator.`
+        );
+      }
     }
-    resolve(selectedSimulator.udid);
+
+    buildProject(xcodeProject, selectedSimulator.udid, scheme, args.configuration, args.packager, args.verbose)
+      .then((appName) => resolve(selectedSimulator.udid, appName));
   })
-  .then((udid) => buildProject(xcodeProject, udid, scheme, args.configuration, args.packager, args.verbose, args.port))
-  .then((appName) => {
+  .then((udid, appName) => {
     if (!appName) {
       appName = scheme;
     }
     let appPath = getBuildPath(args.configuration, appName);
     console.log(`Installing ${appPath}`);
-    child_process.spawnSync('xcrun', ['simctl', 'install', 'booted', appPath], {stdio: 'inherit'});
+    child_process.spawnSync('xcrun', ['simctl', 'install', udid, appPath], {stdio: 'inherit'});
 
     const bundleID = child_process.execFileSync(
       '/usr/libexec/PlistBuddy',
@@ -139,7 +145,7 @@ function runOnSimulator(xcodeProject, args, scheme) {
     ).trim();
 
     console.log(`Launching ${bundleID}`);
-    child_process.spawnSync('xcrun', ['simctl', 'launch', 'booted', bundleID], {stdio: 'inherit'});
+    child_process.spawnSync('xcrun', ['simctl', 'launch', udid, bundleID], {stdio: 'inherit'});
   });
 }
 

From dbafc29e60aba1d5b24c2b0d321834c40e0b9bca Mon Sep 17 00:00:00 2001
From: Adam Burdette <alburdet619@gmail.com>
Date: Tue, 27 Feb 2018 14:11:51 -0800
Subject: [PATCH 117/267] Fix #8615: NetInfo.isConnected for iOS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
This is fixing #8615. The problem was that, on initialization, the `_connectionType` variable was still set to its default value of `RCTConnectionTypeUnknown`. The exposed API method did nothing to determine this unless a subscription had be established and then the method would simply return the last reported value. Instead, the exposed oneshot API call now actually checks the connection status through the same methods as the subscription and updates RCTNetInfo’s values before returning.

In order to avoid reporting events without a subscription, a flag is set and unset on calls to start/stopObserving.

- start app
- observe the (in)correct reporting of the manual status
- change network status to offline
- press refresh
- observe the manual fetch
- start subscription
- change network status to online
- press refresh to show that the manual refresh works (only now working for current RN version)
- change network status to offline
- stop subscription
- change network status to online
- press refresh to show manual refresh does(n't) work without subscription
- start subscription to show it updates to current

Current Behavior: https://drive.google.com/file/d/1Ods6HORgp_vfm1mQVjGwhtH1D7issxjo/view?usp=sharing
Fixed Behavior: https://drive.google.com/file/d/11H1UOF33LeMGvXEOoapU62ARDSb7qoYv/view?usp=sharing

[IOS] [BUGFIX] [Libraries\Network\RCTNetInfo.m] - Fixed #8615, `iOS: NetInfo.isConnected returns always false`, by decoupling the fetch from the status of the subscription.
Closes https://github.com/facebook/react-native/pull/17397

Differential Revision: D7102771

Pulled By: hramos

fbshipit-source-id: ea11eb0b1a7ca641fc43da2fe172cf7b2597de4a
---
 Libraries/Network/RCTNetInfo.m | 101 ++++++++++++++++++++-------------
 1 file changed, 61 insertions(+), 40 deletions(-)

diff --git a/Libraries/Network/RCTNetInfo.m b/Libraries/Network/RCTNetInfo.m
index e41079b89699cd..afc3d1db33334c 100644
--- a/Libraries/Network/RCTNetInfo.m
+++ b/Libraries/Network/RCTNetInfo.m
@@ -41,6 +41,7 @@ @implementation RCTNetInfo
   NSString *_effectiveConnectionType;
   NSString *_statusDeprecated;
   NSString *_host;
+  BOOL _isObserving;
 }
 
 RCT_EXPORT_MODULE()
@@ -48,6 +49,61 @@ @implementation RCTNetInfo
 static void RCTReachabilityCallback(__unused SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags, void *info)
 {
   RCTNetInfo *self = (__bridge id)info;
+  if ([self setReachabilityStatus:flags] && self->_isObserving) {
+    [self sendEventWithName:@"networkStatusDidChange" body:@{@"connectionType": self->_connectionType,
+                                                             @"effectiveConnectionType": self->_effectiveConnectionType,
+                                                             @"network_info": self->_statusDeprecated}];
+  }
+}
+
+#pragma mark - Lifecycle
+
+- (instancetype)initWithHost:(NSString *)host
+{
+  RCTAssertParam(host);
+  RCTAssert(![host hasPrefix:@"http"], @"Host value should just contain the domain, not the URL scheme.");
+
+  if ((self = [self init])) {
+    _host = [host copy];
+  }
+  return self;
+}
+
+- (NSArray<NSString *> *)supportedEvents
+{
+  return @[@"networkStatusDidChange"];
+}
+
+- (void)startObserving
+{
+  _isObserving = YES;
+  _connectionType = RCTConnectionTypeUnknown;
+  _effectiveConnectionType = RCTEffectiveConnectionTypeUnknown;
+  _statusDeprecated = RCTReachabilityStateUnknown;
+  _reachability = [self getReachabilityRef];
+}
+
+- (void)stopObserving
+{
+  _isObserving = NO;
+  if (_reachability) {
+    SCNetworkReachabilityUnscheduleFromRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
+    CFRelease(_reachability);
+  }
+}
+
+- (SCNetworkReachabilityRef)getReachabilityRef
+{
+  SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, _host.UTF8String ?: "apple.com");
+  SCNetworkReachabilityContext context = { 0, ( __bridge void *)self, NULL, NULL, NULL };
+  SCNetworkReachabilitySetCallback(reachability, RCTReachabilityCallback, &context);
+  SCNetworkReachabilityScheduleWithRunLoop(reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
+    
+  return reachability;
+}
+
+- (BOOL)setReachabilityStatus:(SCNetworkReachabilityFlags)flags
+{
   NSString *connectionType = RCTConnectionTypeUnknown;
   NSString *effectiveConnectionType = RCTEffectiveConnectionTypeUnknown;
   NSString *status = RCTReachabilityStateUnknown;
@@ -96,47 +152,10 @@ static void RCTReachabilityCallback(__unused SCNetworkReachabilityRef target, SC
     self->_connectionType = connectionType;
     self->_effectiveConnectionType = effectiveConnectionType;
     self->_statusDeprecated = status;
-    [self sendEventWithName:@"networkStatusDidChange" body:@{@"connectionType": connectionType,
-                                                             @"effectiveConnectionType": effectiveConnectionType,
-                                                             @"network_info": status}];
-  }
-}
-
-#pragma mark - Lifecycle
-
-- (instancetype)initWithHost:(NSString *)host
-{
-  RCTAssertParam(host);
-  RCTAssert(![host hasPrefix:@"http"], @"Host value should just contain the domain, not the URL scheme.");
-
-  if ((self = [self init])) {
-    _host = [host copy];
-  }
-  return self;
-}
-
-- (NSArray<NSString *> *)supportedEvents
-{
-  return @[@"networkStatusDidChange"];
-}
-
-- (void)startObserving
-{
-  _connectionType = RCTConnectionTypeUnknown;
-  _effectiveConnectionType = RCTEffectiveConnectionTypeUnknown;
-  _statusDeprecated = RCTReachabilityStateUnknown;
-  _reachability = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, _host.UTF8String ?: "apple.com");
-  SCNetworkReachabilityContext context = { 0, ( __bridge void *)self, NULL, NULL, NULL };
-  SCNetworkReachabilitySetCallback(_reachability, RCTReachabilityCallback, &context);
-  SCNetworkReachabilityScheduleWithRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
-}
-
-- (void)stopObserving
-{
-  if (_reachability) {
-    SCNetworkReachabilityUnscheduleFromRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
-    CFRelease(_reachability);
+    return YES;
   }
+  
+  return NO;
 }
 
 #pragma mark - Public API
@@ -144,6 +163,8 @@ - (void)stopObserving
 RCT_EXPORT_METHOD(getCurrentConnectivity:(RCTPromiseResolveBlock)resolve
                   reject:(__unused RCTPromiseRejectBlock)reject)
 {
+  SCNetworkReachabilityRef reachability = [self getReachabilityRef];
+  CFRelease(reachability);
   resolve(@{@"connectionType": _connectionType ?: RCTConnectionTypeUnknown,
             @"effectiveConnectionType": _effectiveConnectionType ?: RCTEffectiveConnectionTypeUnknown,
             @"network_info": _statusDeprecated ?: RCTReachabilityStateUnknown});

From 5898817fc1a66bd317d65ce96520159df2f96045 Mon Sep 17 00:00:00 2001
From: Moti Zilberman <motiz88@gmail.com>
Date: Tue, 27 Feb 2018 14:26:20 -0800
Subject: [PATCH 118/267] Implement letterSpacing on Android >= 5.0

Summary:
`letterSpacing` is completely missing from RN Android at the moment.

I've reviewed the `letterSpacing` implementations in #13199, #13877 and #16801 (that all seem to have stalled) and managed to put together an improved one based on #13199, updated to merge cleanly post https://github.com/facebook/react-native/commit/6114f863c3aed826355530bcf404ee5aed2f927b, that resolves the [issues](https://github.com/facebook/react-native/pull/13199#issuecomment-354568863) I've identified with that code.

I believe this is the closest PR yet to a correct implementation of this feature, with a few caveats:

- As with the other PRs, this only works on Android >= 5.0 (silently falling back to no letter spacing on older versions). Is this acceptable for a RN feature, in general? Would a dev mode warning be desirable?
- The other PRs seem to have explored the space of potential solutions to the layout issue ([Android renders space _around_ glyphs](https://issuetracker.google.com/issues/37079859), iOS to the _right_ of each one) and come up empty, so I've opted to merely document the difference.
- I have neither updated nor tested the "Flat" UI implementation - everything compiles but I've taken [this comment](https://github.com/facebook/react-native/issues/12770#issuecomment-294052694) to mean there's no point in trying to wade through it on my own right now; I'm happy to tackle it if given some pointers.
- The implementation in `ReactEditText` is only there to handle the placeholder text, as `ReactBaseTextShadowNode` already affects the input control's contents correctly.
  - I'm not sure whether `<TextInput>` is meant to respect `allowFontScaling`; I've taken my cue here from `ReactTextInputManager.setFontSize()`, and used the same units (SP) to interpret the value in `ReactEditText.setLetterSpacingPt()`.
  - I'm not sure whether `<TextInput>` is even meant to support `letterSpacing` - it doesn't actually work on iOS. I'm not going to be able to handle the Objective-C side of this, not as part of this PR at least.
- I have not added unit tests to `ReactTextTest` - is this desirable? I see that some other props such as `lineHeight` aren't covered there (unless I'm not looking in the right place).
- Overall, I'm new to this codebase, so it's likely I've missed something not mentioned here.

Note comment re: unit tests above; RNTester screenshots follow.

| iOS (existing functionality, amended test) | Android (new functionality & test) |
| - | - |
| <img src=https://user-images.githubusercontent.com/2246565/34458459-c8d59498-edcb-11e7-8c8f-e7426f723886.png width=300> | <img src=https://user-images.githubusercontent.com/2246565/34458473-2a1ca368-edcc-11e7-9ce6-30c6d3a48660.png width=300> |

| iOS _(not implemented, test not in this branch)_ | Android (new functionality & test) |
| - | - |
| <img src=https://user-images.githubusercontent.com/2246565/34458481-6c60a36e-edcc-11e7-9af5-9734dd722ced.png width=300> | <img src=https://user-images.githubusercontent.com/2246565/34458486-8b3cdcf8-edcc-11e7-974b-25c6085fa674.png width=300> |

| iOS _(not implemented, test not in this branch)_ | Android (new functionality & test) |
| - | - |
| <img src=https://user-images.githubusercontent.com/2246565/34458492-d69a77be-edcc-11e7-896f-21212621dbee.png width=300> | <img src=https://user-images.githubusercontent.com/2246565/34458490-b3a1139e-edcc-11e7-88c8-79d4430d1514.png width=300> |

https://github.com/facebook/react-native-website/pull/105 - this docs PR is edited slightly from what's in `TextStylePropTypes` here; happy to align either one to the other after a review.

[ANDROID] [FEATURE] [Text] - Implemented letterSpacing
Closes https://github.com/facebook/react-native/pull/17398

Reviewed By: mdvacca

Differential Revision: D6837718

Pulled By: hramos

fbshipit-source-id: 5c9d49e9cf4af6457b636416ce5fe15315aab72c
---
 RNTester/js/TextExample.android.js            | 30 +++++++++++
 RNTester/js/TextExample.ios.js                | 14 +++++
 RNTester/js/TextInputExample.android.js       | 25 +++++++++
 .../facebook/react/uimanager/ViewProps.java   |  1 +
 .../views/text/CustomLetterSpacingSpan.java   | 53 +++++++++++++++++++
 .../views/text/ReactBaseTextShadowNode.java   | 20 +++++++
 .../react/views/textinput/ReactEditText.java  | 25 +++++++++
 .../textinput/ReactTextInputManager.java      |  8 +++
 8 files changed, 176 insertions(+)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java

diff --git a/RNTester/js/TextExample.android.js b/RNTester/js/TextExample.android.js
index a4579d9d931cce..0b0bf195f68fb7 100644
--- a/RNTester/js/TextExample.android.js
+++ b/RNTester/js/TextExample.android.js
@@ -341,6 +341,36 @@ class TextExample extends React.Component<{}> {
             Holisticly formulate inexpensive ideas before best-of-breed benefits. <Text style={{fontSize: 20}}>Continually</Text> expedite magnetic potentialities rather than client-focused interfaces.
           </Text>
         </RNTesterBlock>
+        <RNTesterBlock title="Letter Spacing">
+          <View>
+            <Text style={{letterSpacing: 0}}>
+              letterSpacing = 0
+            </Text>
+            <Text style={{letterSpacing: 2, marginTop: 5}}>
+              letterSpacing = 2
+            </Text>
+            <Text style={{letterSpacing: 9, marginTop: 5}}>
+              letterSpacing = 9
+            </Text>
+            <View style={{flexDirection: 'row'}}>
+              <Text style={{fontSize: 12, letterSpacing: 2, backgroundColor: 'fuchsia', marginTop: 5}}>
+                With size and background color
+              </Text>
+            </View>
+            <Text style={{letterSpacing: -1, marginTop: 5}}>
+              letterSpacing = -1
+            </Text>
+            <Text style={{letterSpacing: 3, backgroundColor: '#dddddd', marginTop: 5}}>
+              [letterSpacing = 3]
+              <Text style={{letterSpacing: 0, backgroundColor: '#bbbbbb'}}>
+                [Nested letterSpacing = 0]
+              </Text>
+              <Text style={{letterSpacing: 6, backgroundColor: '#eeeeee'}}>
+                [Nested letterSpacing = 6]
+              </Text>
+            </Text>
+          </View>
+        </RNTesterBlock>
         <RNTesterBlock title="Empty Text">
           <Text />
         </RNTesterBlock>
diff --git a/RNTester/js/TextExample.ios.js b/RNTester/js/TextExample.ios.js
index 4afcc78668e5ea..e5510390d0a353 100644
--- a/RNTester/js/TextExample.ios.js
+++ b/RNTester/js/TextExample.ios.js
@@ -575,9 +575,23 @@ exports.examples = [
           <Text style={{letterSpacing: 9, marginTop: 5}}>
             letterSpacing = 9
           </Text>
+          <View style={{flexDirection: 'row'}}>
+            <Text style={{fontSize: 12, letterSpacing: 2, backgroundColor: 'fuchsia', marginTop: 5}}>
+              With size and background color
+            </Text>
+          </View>
           <Text style={{letterSpacing: -1, marginTop: 5}}>
             letterSpacing = -1
           </Text>
+          <Text style={{letterSpacing: 3, backgroundColor: '#dddddd', marginTop: 5}}>
+            [letterSpacing = 3]
+            <Text style={{letterSpacing: 0, backgroundColor: '#bbbbbb'}}>
+              [Nested letterSpacing = 0]
+            </Text>
+            <Text style={{letterSpacing: 6, backgroundColor: '#eeeeee'}}>
+              [Nested letterSpacing = 6]
+            </Text>
+          </Text>
         </View>
       );
     },
diff --git a/RNTester/js/TextInputExample.android.js b/RNTester/js/TextInputExample.android.js
index 92843e3459f7fe..358d3fd043b02d 100644
--- a/RNTester/js/TextInputExample.android.js
+++ b/RNTester/js/TextInputExample.android.js
@@ -567,6 +567,31 @@ exports.examples = [
       );
     }
   },
+  {
+    title: 'letterSpacing',
+    render: function() {
+      return (
+        <View>
+          <TextInput
+            style={[styles.singleLine, {letterSpacing: 0}]}
+            placeholder="letterSpacing = 0"
+          />
+          <TextInput
+            style={[styles.singleLine, {letterSpacing: 2}]}
+            placeholder="letterSpacing = 2"
+          />
+          <TextInput
+            style={[styles.singleLine, {letterSpacing: 9}]}
+            placeholder="letterSpacing = 9"
+          />
+          <TextInput
+            style={[styles.singleLine, {letterSpacing: -1}]}
+            placeholder="letterSpacing = -1"
+          />
+        </View>
+      );
+    }
+  },
   {
     title: 'Passwords',
     render: function() {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
index ec703e8cf9e317..aee1a0c7d9a7ab 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.java
@@ -88,6 +88,7 @@ public class ViewProps {
   public static final String FONT_STYLE = "fontStyle";
   public static final String FONT_FAMILY = "fontFamily";
   public static final String LINE_HEIGHT = "lineHeight";
+  public static final String LETTER_SPACING = "letterSpacing";
   public static final String NEEDS_OFFSCREEN_ALPHA_COMPOSITING = "needsOffscreenAlphaCompositing";
   public static final String NUMBER_OF_LINES = "numberOfLines";
   public static final String ELLIPSIZE_MODE = "ellipsizeMode";
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java
new file mode 100644
index 00000000000000..004d26138694e5
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+package com.facebook.react.views.text;
+
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.text.TextPaint;
+import android.text.style.MetricAffectingSpan;
+
+import com.facebook.infer.annotation.Assertions;
+
+/**
+ * A {@link MetricAffectingSpan} that allows to set the letter spacing
+ * on the selected text span.
+ * 
+ * The letter spacing is specified in pixels, which are converted to
+ * ems at paint time; this span must therefore be applied after any
+ * spans affecting font size.
+ */
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+public class CustomLetterSpacingSpan extends MetricAffectingSpan {
+
+  private final float mLetterSpacing;
+
+  public CustomLetterSpacingSpan(float letterSpacing) {
+    mLetterSpacing = letterSpacing;
+  }
+
+  @Override
+  public void updateDrawState(TextPaint paint) {
+    apply(paint);
+  }
+
+  @Override
+  public void updateMeasureState(TextPaint paint) {
+    apply(paint);
+  }
+
+  private void apply(TextPaint paint) {
+    // mLetterSpacing and paint.getTextSize() are both in pixels,
+    // yielding an accurate em value.
+    if (!Float.isNaN(mLetterSpacing)) {
+      paint.setLetterSpacing(mLetterSpacing / paint.getTextSize());
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
index 9b73869b1b9b69..075c5be23edf3c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
@@ -118,6 +118,14 @@ private static void buildSpannedFromShadowNode(
             new SetSpanOperation(
                 start, end, new BackgroundColorSpan(textShadowNode.mBackgroundColor)));
       }
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (textShadowNode.mLetterSpacing != Float.NaN) {
+          ops.add(new SetSpanOperation(
+            start,
+            end,
+            new CustomLetterSpacingSpan(textShadowNode.mLetterSpacing)));
+        }
+      }
       if (textShadowNode.mFontSize != UNSET) {
         ops.add(new SetSpanOperation(start, end, new AbsoluteSizeSpan(textShadowNode.mFontSize)));
       }
@@ -228,6 +236,7 @@ private static int parseNumericFontWeight(String fontWeightString) {
   }
 
   protected float mLineHeight = Float.NaN;
+  protected float mLetterSpacing = Float.NaN;
   protected boolean mIsColorSet = false;
   protected boolean mAllowFontScaling = true;
   protected int mColor;
@@ -238,6 +247,7 @@ private static int parseNumericFontWeight(String fontWeightString) {
   protected int mFontSize = UNSET;
   protected float mFontSizeInput = UNSET;
   protected float mLineHeightInput = UNSET;
+  protected float mLetterSpacingInput = Float.NaN;
   protected int mTextAlign = Gravity.NO_GRAVITY;
   protected int mTextBreakStrategy =
       (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) ? 0 : Layout.BREAK_STRATEGY_HIGH_QUALITY;
@@ -356,12 +366,22 @@ public void setLineHeight(float lineHeight) {
     markUpdated();
   }
 
+  @ReactProp(name = ViewProps.LETTER_SPACING, defaultFloat = Float.NaN)
+  public void setLetterSpacing(float letterSpacing) {
+    mLetterSpacingInput = letterSpacing;
+    mLetterSpacing = mAllowFontScaling
+      ? PixelUtil.toPixelFromSP(mLetterSpacingInput)
+      : PixelUtil.toPixelFromDIP(mLetterSpacingInput);
+    markUpdated();
+  }
+
   @ReactProp(name = ViewProps.ALLOW_FONT_SCALING, defaultBoolean = true)
   public void setAllowFontScaling(boolean allowFontScaling) {
     if (allowFontScaling != mAllowFontScaling) {
       mAllowFontScaling = allowFontScaling;
       setFontSize(mFontSizeInput);
       setLineHeight(mLineHeightInput);
+      setLetterSpacing(mLetterSpacingInput);
       markUpdated();
     }
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index e15dd5a7969cda..7a9f34e2a6a0dd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -33,6 +33,7 @@
 import android.widget.EditText;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.views.text.CustomStyleSpan;
 import com.facebook.react.views.text.ReactTagSpan;
@@ -80,6 +81,7 @@ public class ReactEditText extends EditText {
   private @Nullable ScrollWatcher mScrollWatcher;
   private final InternalKeyListener mKeyListener;
   private boolean mDetectScrollMovement = false;
+  private float mLetterSpacingPt = 0;
 
   private ReactViewBackgroundManager mReactBackgroundManager;
 
@@ -627,6 +629,29 @@ public void setBorderStyle(@Nullable String style) {
     mReactBackgroundManager.setBorderStyle(style);
   }
 
+  public void setLetterSpacingPt(float letterSpacingPt) {
+    mLetterSpacingPt = letterSpacingPt;
+    updateLetterSpacing();
+  }
+
+  @Override
+  public void setTextSize (float size) {
+    super.setTextSize(size);
+    updateLetterSpacing();
+  }
+
+  @Override
+  public void setTextSize (int unit, float size) {
+    super.setTextSize(unit, size);
+    updateLetterSpacing();
+  }
+
+  protected void updateLetterSpacing() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      setLetterSpacing(PixelUtil.toPixelFromSP(mLetterSpacingPt) / getTextSize());
+    }
+  }
+
   /**
    * This class will redirect *TextChanged calls to the listeners only in the case where the text
    * is changed by the user, and not explicitly set by JS.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index bf27f485dca392..e4224eaac01016 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -306,6 +306,14 @@ public void setOnScroll(final ReactEditText view, boolean onScroll) {
     }
   }
 
+  // Sets the letter spacing as an absolute point size.
+  // This extra handling, on top of what ReactBaseTextShadowNode already does, is required for the
+  // correct display of spacing in placeholder (hint) text.
+  @ReactProp(name = ViewProps.LETTER_SPACING, defaultFloat = 0)
+  public void setLetterSpacing(ReactEditText view, float letterSpacing) {
+    view.setLetterSpacingPt(letterSpacing);
+  }
+
   @ReactProp(name = "placeholder")
   public void setPlaceholder(ReactEditText view, @Nullable String placeholder) {
     view.setHint(placeholder);

From 247f32ff12f4b9d4d5aceff1267d3862abf83df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Tue, 27 Feb 2018 16:39:47 -0800
Subject: [PATCH 119/267] Increase n days before issue considered stale

Summary:
This repository has Probot's [Stale workflow](https://github.com/probot/stale) enabled. It is configured via the `.github/stale.yml` file.

In this PR, we increase number of days before an issue becomes stale to ~six months, and increase days until the same issue is closed after inactivity to ~2 months.

It also limits the stale bot to issues only.
Closes https://github.com/facebook/react-native/pull/18108

Differential Revision: D7105801

Pulled By: hramos

fbshipit-source-id: 23efd41f88c03cb6c0be3820a3b3ac67b3e4a6fe
---
 .github/stale.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/stale.yml b/.github/stale.yml
index dc018b58604d55..a738daf3783295 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 180
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
+daysUntilClose: 60
 # Issues with these labels will never be considered stale
 exemptLabels:
   - Good first issue
@@ -11,10 +11,10 @@ exemptLabels:
 staleLabel: Stale 
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs.
-  Maybe the issue has been fixed in a recent release, or perhaps it is not affecting a lot of people.
-  If you think this issue should definitely remain open, please let us know why.
+  Hey there, it looks like there has been no activity on this issue recently. Has the issue been fixed, or does it still require the community's attention? This issue may be closed if no further activity occurs.
+  You may also label this issue as "For Discussion" or "Good first issue" and I will leave it open.
   Thank you for your contributions.
 # Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+closeComment: >
+  Closing this issue after a prolonged period of inactivity. If this issue is still present in the latest release, please feel free to create a new issue with up-to-date information.
+only: issues
\ No newline at end of file

From 2dd2529b3ab3ace39136a6e24c09f80ae421a17e Mon Sep 17 00:00:00 2001
From: Alex Hinson <alexmhinson@gmail.com>
Date: Tue, 27 Feb 2018 17:29:40 -0800
Subject: [PATCH 120/267] Add option to hide context menu for TextInput #17335

Summary:
<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

There is currently no way to disable to context menu that automatically appears over a TextInput. This is especially troublesome if you would like to disable the user from pasting text into certain fields. This PR adds a `contextMenuHidden` property to TextInput that will hide it.

I'm not sure if testing is necessary here. I would be happy to investigate further on how this would be tested, if deemed necessary!

https://github.com/facebook/react-native-website/pull/95

<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->

[FEATURE][TextInput] - Added `contextMenuHidden` property
Closes https://github.com/facebook/react-native/pull/18125

Differential Revision: D7101888

Pulled By: hramos

fbshipit-source-id: fe36603a3fbdcefbd644251a7ea894ac7e23e5b8
---
 Libraries/Components/TextInput/TextInput.js     |  4 ++++
 .../Text/TextInput/Multiline/RCTUITextView.h    |  1 +
 .../Text/TextInput/Multiline/RCTUITextView.m    | 17 ++++++++++++++---
 .../TextInput/RCTBaseTextInputViewManager.m     |  1 +
 .../Text/TextInput/Singleline/RCTUITextField.h  |  1 +
 .../Text/TextInput/Singleline/RCTUITextField.m  | 11 +++++++++++
 .../views/textinput/ReactTextInputManager.java  | 10 ++++++++++
 7 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 57dc866b9dc44a..383e7e6ac35027 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -590,6 +590,10 @@ const TextInput = createReactClass({
      * This property is supported only for single-line TextInput component on iOS.
      */
     caretHidden: PropTypes.bool,
+    /*
+     * If `true`, contextMenuHidden is hidden. The default value is `false`.
+     */
+    contextMenuHidden: PropTypes.bool,
     /**
      * An optional identifier which links a custom InputAccessoryView to
      * this text input. The InputAccessoryView is rendered above the
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.h b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
index c460d7f1e47b0f..cb817cba754039 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.h
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.h
@@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, weak) id<RCTBackedTextInputDelegate> textInputDelegate;
 
+@property (nonatomic, assign) BOOL contextMenuHidden;
 @property (nonatomic, assign, readonly) BOOL textWasPasted;
 @property (nonatomic, copy, nullable) NSString *placeholder;
 @property (nonatomic, strong, nullable) UIColor *placeholderColor;
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
index 80d49a5f5aef7d..992a1a8abfc602 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.m
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
@@ -58,19 +58,19 @@ - (void)dealloc
 - (NSString *)accessibilityLabel
 {
   NSMutableString *accessibilityLabel = [NSMutableString new];
-  
+
   NSString *superAccessibilityLabel = [super accessibilityLabel];
   if (superAccessibilityLabel.length > 0) {
     [accessibilityLabel appendString:superAccessibilityLabel];
   }
-  
+
   if (self.placeholder.length > 0 && self.attributedText.string.length == 0) {
     if (accessibilityLabel.length > 0) {
       [accessibilityLabel appendString:@" "];
     }
     [accessibilityLabel appendString:self.placeholder];
   }
-  
+
   return accessibilityLabel;
 }
 
@@ -228,6 +228,17 @@ - (CGSize)fixedSizeThatFits:(CGSize)size
   return [_detachedTextView sizeThatFits:size];
 }
 
+#pragma mark - Context Menu
+
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+  if (_contextMenuHidden) {
+    return NO;
+  }
+
+  return [super canPerformAction:action withSender:sender];
+}
+
 #pragma mark - Placeholder
 
 - (void)invalidatePlaceholderVisibility
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
index 745fd83cb60967..aaead20b0b9c1c 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
@@ -36,6 +36,7 @@ @implementation RCTBaseTextInputViewManager
 
 RCT_REMAP_VIEW_PROPERTY(autoCapitalize, backedTextInputView.autocapitalizationType, UITextAutocapitalizationType)
 RCT_REMAP_VIEW_PROPERTY(autoCorrect, backedTextInputView.autocorrectionType, UITextAutocorrectionType)
+RCT_REMAP_VIEW_PROPERTY(contextMenuHidden, backedTextInputView.contextMenuHidden, BOOL)
 RCT_REMAP_VIEW_PROPERTY(editable, backedTextInputView.editable, BOOL)
 RCT_REMAP_VIEW_PROPERTY(enablesReturnKeyAutomatically, backedTextInputView.enablesReturnKeyAutomatically, BOOL)
 RCT_REMAP_VIEW_PROPERTY(keyboardAppearance, backedTextInputView.keyboardAppearance, UIKeyboardAppearance)
diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.h b/Libraries/Text/TextInput/Singleline/RCTUITextField.h
index b56d6a81df6317..a2e7a0e0c61bd6 100644
--- a/Libraries/Text/TextInput/Singleline/RCTUITextField.h
+++ b/Libraries/Text/TextInput/Singleline/RCTUITextField.h
@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, weak) id<RCTBackedTextInputDelegate> textInputDelegate;
 
 @property (nonatomic, assign) BOOL caretHidden;
+@property (nonatomic, assign) BOOL contextMenuHidden;
 @property (nonatomic, assign, readonly) BOOL textWasPasted;
 @property (nonatomic, strong, nullable) UIColor *placeholderColor;
 @property (nonatomic, assign) UIEdgeInsets textContainerInset;
diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.m b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
index 281bd63945deeb..83e7603ae83506 100644
--- a/Libraries/Text/TextInput/Singleline/RCTUITextField.m
+++ b/Libraries/Text/TextInput/Singleline/RCTUITextField.m
@@ -85,6 +85,17 @@ - (void)setEditable:(BOOL)editable
   self.enabled = editable;
 }
 
+#pragma mark - Context Menu
+
+- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+{
+  if (_contextMenuHidden) {
+    return NO;
+  }
+
+  return [super canPerformAction:action withSender:sender];
+}
+
 #pragma mark - Caret Manipulation
 
 - (CGRect)caretRectForPosition:(UITextPosition *)position
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index e4224eaac01016..637027140ec010 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -378,6 +378,16 @@ public void setCaretHidden(ReactEditText view, boolean caretHidden) {
     view.setCursorVisible(!caretHidden);
   }
 
+  @ReactProp(name = "contextMenuHidden", defaultBoolean = false)
+  public void setContextMenuHidden(ReactEditText view, boolean contextMenuHidden) {
+    final boolean _contextMenuHidden = contextMenuHidden;
+    view.setOnLongClickListener(new View.OnLongClickListener() {
+      public boolean onLongClick(View v) {
+        return _contextMenuHidden;
+      };
+    });
+  }
+
   @ReactProp(name = "selectTextOnFocus", defaultBoolean = false)
   public void setSelectTextOnFocus(ReactEditText view, boolean selectTextOnFocus) {
     view.setSelectAllOnFocus(selectTextOnFocus);

From 6d9fe455dc815cdce86c00f81c71c9ca0c724964 Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Tue, 27 Feb 2018 17:39:46 -0800
Subject: [PATCH 121/267] Fixed TVOS test failure caused by input accessory
 view change

Reviewed By: mmmulani

Differential Revision: D7103353

fbshipit-source-id: 7a1575eff0296017521fc8ca6fe384301849a73e
---
 Libraries/Text/TextInput/RCTBaseTextInputView.m | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index 025fb0e4168c8f..d9c47ff16311d4 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -402,17 +402,16 @@ - (void)didMoveToWindow
 
 - (void)didSetProps:(NSArray<NSString *> *)changedProps
 {
-  #if !TARGET_OS_TV
   if ([changedProps containsObject:@"inputAccessoryViewID"] && self.inputAccessoryViewID) {
     [self setCustomInputAccessoryViewWithNativeID:self.inputAccessoryViewID];
   } else if (!self.inputAccessoryViewID) {
     [self setDefaultInputAccessoryView];
   }
-  #endif
 }
 
 - (void)setCustomInputAccessoryViewWithNativeID:(NSString *)nativeID
 {
+  #if !TARGET_OS_TV
   __weak RCTBaseTextInputView *weakSelf = self;
   [_bridge.uiManager rootViewForReactTag:self.reactTag withCompletion:^(UIView *rootView) {
     RCTBaseTextInputView *strongSelf = weakSelf;
@@ -425,10 +424,12 @@ - (void)setCustomInputAccessoryViewWithNativeID:(NSString *)nativeID
       }
     }
   }];
+  #endif /* !TARGET_OS_TV */
 }
 
 - (void)setDefaultInputAccessoryView
 {
+  #if !TARGET_OS_TV
   UIView<RCTBackedTextInputViewProtocol> *textInputView = self.backedTextInputView;
   UIKeyboardType keyboardType = textInputView.keyboardType;
 
@@ -467,6 +468,7 @@ - (void)setDefaultInputAccessoryView
     textInputView.inputAccessoryView = nil;
   }
   [self reloadInputViewsIfNecessary];
+  #endif /* !TARGET_OS_TV */
 }
 
 - (void)reloadInputViewsIfNecessary

From 84ef7bc372ad870127b3e1fb8c13399fe09ecd4d Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Tue, 27 Feb 2018 17:45:15 -0800
Subject: [PATCH 122/267] Added InputAccessoryView demo to RNTester [2/N]

Summary:
This is an example showing how to use an InputAccessoryView to build an iMessage-like sticky text input

https://youtu.be/89PGsSqtmQU

Reviewed By: sahrens

Differential Revision: D7048456

fbshipit-source-id: 90314a85f3662c2b21aababe2dd46ea5e406604a
---
 RNTester/js/InputAccessoryViewExample.js | 101 +++++++++++++++++++++++
 RNTester/js/RNTesterList.ios.js          |   5 ++
 2 files changed, 106 insertions(+)
 create mode 100644 RNTester/js/InputAccessoryViewExample.js

diff --git a/RNTester/js/InputAccessoryViewExample.js b/RNTester/js/InputAccessoryViewExample.js
new file mode 100644
index 00000000000000..13b5885789b967
--- /dev/null
+++ b/RNTester/js/InputAccessoryViewExample.js
@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule InputAccessoryViewExample
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+const Alert = require('Alert');
+const Button = require('Button');
+const Dimensions = require('Dimensions');
+const InputAccessoryView = require('InputAccessoryView');
+const React = require('React');
+const ScrollView = require('ScrollView');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const TextInput = require('TextInput');
+const View = require('View');
+
+class Message extends React.PureComponent<*> {
+  render() {
+    return (
+      <View style={styles.textBubbleBackground}>
+        <Text style={styles.text}>Text Message</Text>
+      </View>
+    );
+  }
+}
+
+class TextInputBar extends React.PureComponent<*, *> {
+  state = {text: ''};
+
+  render() {
+    const {width} = Dimensions.get('window');
+    return (
+      <View style={[styles.textInputContainer, {width}]}>
+        <TextInput
+          style={styles.textInput}
+          onChangeText={text => {
+            this.setState({text});
+          }}
+          value={this.state.text}
+          placeholder={'Type a message...'}
+        />
+        <Button
+          onPress={() => {
+            Alert.alert('You tapped the button!');
+          }}
+          title="Send"
+        />
+      </View>
+    );
+  }
+}
+
+class InputAccessoryViewExample extends React.Component<*> {
+  static title = '<InputAccessoryView>';
+  static description = 'Example showing how to use an InputAccessoryView to build an iMessage-like sticky text input';
+
+  render() {
+    return (
+      <View>
+        <ScrollView keyboardDismissMode="interactive">
+          {Array(15)
+            .fill()
+            .map((_, i) => <Message key={i} />)}
+        </ScrollView>
+        <InputAccessoryView backgroundColor="#fffffff7">
+          <TextInputBar />
+        </InputAccessoryView>
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  textInputContainer: {
+    flexDirection: 'row',
+  },
+  textInput: {
+    flex: 1,
+    paddingLeft: 10,
+  },
+  text: {
+    padding: 10,
+    color: 'white',
+  },
+  textBubbleBackground: {
+    backgroundColor: '#2f7bf6',
+    borderRadius: 20,
+    width: 110,
+    margin: 20,
+  },
+});
+
+module.exports = InputAccessoryViewExample;
diff --git a/RNTester/js/RNTesterList.ios.js b/RNTester/js/RNTesterList.ios.js
index d45e42fa596077..fa95044d77dd49 100644
--- a/RNTester/js/RNTesterList.ios.js
+++ b/RNTester/js/RNTesterList.ios.js
@@ -46,6 +46,11 @@ const ComponentExamples: Array<RNTesterExample> = [
     module: require('./ImageExample'),
     supportsTVOS: true,
   },
+  {
+    key: 'InputAccessoryViewExample',
+    module: require('./InputAccessoryViewExample'),
+    supportsTVOS: true,
+  },
   {
     key: 'KeyboardAvoidingViewExample',
     module: require('./KeyboardAvoidingViewExample'),

From ddcd609a867bae5abb46c9f61af27917b0ddb168 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Tue, 27 Feb 2018 18:22:44 -0800
Subject: [PATCH 123/267] Refactor cloneWithNewChildren method

Reviewed By: achen1

Differential Revision: D7064266

fbshipit-source-id: 71ef5651893359a257c39a5943812853f8d0dbcd
---
 .../react/fabric/FabricUIManagerModule.java   | 33 +++++++++++++------
 .../react/uimanager/ReactShadowNode.java      |  4 +--
 .../react/uimanager/ReactShadowNodeImpl.java  | 17 +++++-----
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
index dbed0e09d66160..c920f3d3742e6e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
@@ -2,6 +2,7 @@
 
 package com.facebook.react.fabric;
 
+import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
@@ -48,7 +49,7 @@ public ReactShadowNode createNode(int reactTag,
     ReactShadowNode node = viewManager.createShadowNodeInstance(mReactApplicationContext);
     node.setRootNode(getRootNode(rootTag));
     node.setReactTag(reactTag);
-    ReactStylesDiffMap styles = updateProps(props, node);
+    ReactStylesDiffMap styles = updateProps(node, props);
 
     return node;
   }
@@ -57,7 +58,7 @@ private ReactShadowNode getRootNode(int rootTag) {
     return mRootShadowNodeRegistry.getNode(rootTag);
   }
 
-  private ReactStylesDiffMap updateProps(ReadableNativeMap props, ReactShadowNode node) {
+  private ReactStylesDiffMap updateProps(ReactShadowNode node, @Nullable ReadableNativeMap props) {
     ReactStylesDiffMap styles = null;
     if (props != null) {
       styles = new ReactStylesDiffMap(props);
@@ -73,7 +74,9 @@ private ReactStylesDiffMap updateProps(ReadableNativeMap props, ReactShadowNode
    */
   @Nullable
   public ReactShadowNode cloneNode(ReactShadowNode node) {
-    return node.mutableCopy();
+    ReactShadowNode clone = node.mutableCopy();
+    assertReactShadowNodeCopy(node, clone);
+    return clone;
   }
 
   /**
@@ -83,8 +86,8 @@ public ReactShadowNode cloneNode(ReactShadowNode node) {
    */
   @Nullable
   public ReactShadowNode cloneNodeWithNewChildren(ReactShadowNode node) {
-    ReactShadowNode clone = cloneNode(node);
-    clone.removeAllChildren();
+    ReactShadowNode clone = node.mutableCopyWithNewChildren();
+    assertReactShadowNodeCopy(node, clone);
     return clone;
   }
 
@@ -94,9 +97,12 @@ public ReactShadowNode cloneNodeWithNewChildren(ReactShadowNode node) {
    * props will be overridden with the {@link ReadableMap} received by parameter.
    */
   @Nullable
-  public ReactShadowNode cloneNodeWithNewProps(ReactShadowNode node, ReadableNativeMap newProps) {
-    ReactShadowNode clone = cloneNode(node);
-    updateProps(newProps, clone);
+  public ReactShadowNode cloneNodeWithNewProps(
+      ReactShadowNode node,
+      @Nullable ReadableNativeMap newProps) {
+    ReactShadowNode clone = node.mutableCopy();
+    updateProps(clone, newProps);
+    assertReactShadowNodeCopy(node, clone);
     return clone;
   }
 
@@ -110,11 +116,18 @@ public ReactShadowNode cloneNodeWithNewProps(ReactShadowNode node, ReadableNativ
   public ReactShadowNode cloneNodeWithNewChildrenAndProps(
       ReactShadowNode node,
       ReadableNativeMap newProps) {
-    ReactShadowNode clone = cloneNodeWithNewChildren(node);
-    updateProps(newProps, clone);
+    ReactShadowNode clone = node.mutableCopyWithNewChildren();
+    updateProps(clone, newProps);
+    assertReactShadowNodeCopy(node, clone);
     return clone;
   }
 
+  private void assertReactShadowNodeCopy(ReactShadowNode source, ReactShadowNode target) {
+    Assertions.assertCondition(source.getClass().equals(target.getClass()),
+      "Found " + target.getClass() + " class when expecting: " +   source.getClass() +
+        ". Check that " + source.getClass() + " implements the mutableCopy() method correctly.");
+  }
+
   /**
    * Appends the child {@link ReactShadowNode} to the children set of the parent
    * {@link ReactShadowNode}.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
index 69c130aa80b79e..af0841a487c9fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
@@ -72,6 +72,8 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
    */
   T mutableCopy();
 
+  T mutableCopyWithNewChildren();
+
   String getViewClass();
 
   boolean hasUpdates();
@@ -164,8 +166,6 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   T removeNativeChildAt(int i);
 
-  void removeAllChildren();
-
   void removeAllNativeChildren();
 
   int getNativeChildCount();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index 59ab9b69ec3787..92a4d57fe192c8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -9,6 +9,7 @@
 import static java.lang.System.arraycopy;
 
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.annotations.ReactPropertyHolder;
 import com.facebook.yoga.YogaAlign;
 import com.facebook.yoga.YogaBaselineFunction;
@@ -128,6 +129,14 @@ public ReactShadowNodeImpl mutableCopy() {
     return new ReactShadowNodeImpl(this);
   }
 
+  @Override
+  public ReactShadowNodeImpl mutableCopyWithNewChildren() {
+    ReactShadowNodeImpl copy = mutableCopy();
+    copy.mNativeChildren = null;
+    copy.mChildren = null;
+    return copy;
+  }
+
   /**
    * Nodes that return {@code true} will be treated as "virtual" nodes. That is, nodes that are not
    * mapped into native views (e.g. nested text node). By default this method returns {@code false}.
@@ -484,14 +493,6 @@ public final ReactShadowNodeImpl removeNativeChildAt(int i) {
     return removed;
   }
 
-  @Override
-  public final void removeAllChildren() {
-    removeAllNativeChildren();
-    if (mChildren != null) {
-      mChildren.clear();
-    }
-  }
-
   @Override
   public final void removeAllNativeChildren() {
     if (mNativeChildren != null) {

From 35583e52f492edbcde72c8e9c3a219ced1bd9d68 Mon Sep 17 00:00:00 2001
From: Michael Lee <mzlee@fb.com>
Date: Wed, 28 Feb 2018 11:58:26 -0800
Subject: [PATCH 124/267] Add header_namespace to handle cross-platform uses

Differential Revision: D7101683

fbshipit-source-id: 2a95cd1447d4cc5d796556e3281d08136cd130ff
---
 ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
index 6309cea5c405c7..fc54ae9909d289 100644
--- a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
@@ -5,6 +5,7 @@ cxx_library(
     srcs = [
         "glog_init.cpp",
     ],
+    header_namespace = "",
     exported_headers = ["fb/glog_init.h"],
     compiler_flags = [
         "-fexceptions",

From 0d03fddecad7af0bb7d7a1dc1846c91f12c195cd Mon Sep 17 00:00:00 2001
From: Shoaib Meenai <smeenai@fb.com>
Date: Wed, 28 Feb 2018 15:01:19 -0800
Subject: [PATCH 125/267] Use complete type with unique_ptr

Reviewed By: fromcelticpark

Differential Revision: D7114324

fbshipit-source-id: c9305c478ebe31ea35b590b861919fd42f56662d
---
 React/CxxBridge/RCTObjcExecutor.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/React/CxxBridge/RCTObjcExecutor.mm b/React/CxxBridge/RCTObjcExecutor.mm
index d6445e9c27dc6a..2f861ffc983ec8 100644
--- a/React/CxxBridge/RCTObjcExecutor.mm
+++ b/React/CxxBridge/RCTObjcExecutor.mm
@@ -17,6 +17,7 @@
 #import <cxxreact/JSExecutor.h>
 #import <cxxreact/MessageQueueThread.h>
 #import <cxxreact/ModuleRegistry.h>
+#import <cxxreact/RAMBundleRegistry.h>
 #import <folly/json.h>
 
 namespace facebook {

From 0bc80e9a726a5ec2029b8135ddd8967b88563394 Mon Sep 17 00:00:00 2001
From: Shoaib Meenai <smeenai@fb.com>
Date: Wed, 28 Feb 2018 15:09:33 -0800
Subject: [PATCH 126/267] Use #include instead of #import

Reviewed By: compnerd

Differential Revision: D7114385

fbshipit-source-id: a443770910714aab1af3f3ac5e932f6aaf1afe99
---
 ReactCommon/jschelpers/JSCWrapper.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ReactCommon/jschelpers/JSCWrapper.h b/ReactCommon/jschelpers/JSCWrapper.h
index cc2bc1ee107b4e..d221ea7eb410e6 100644
--- a/ReactCommon/jschelpers/JSCWrapper.h
+++ b/ReactCommon/jschelpers/JSCWrapper.h
@@ -52,9 +52,9 @@ JSC_IMPORT void FBJSContextStartGCTimers(JSContextRef);
 #endif
 
 #if defined(__APPLE__)
-#import <objc/objc.h>
-#import <JavaScriptCore/JSStringRefCF.h>
-#import <string>
+#include <objc/objc.h>
+#include <JavaScriptCore/JSStringRefCF.h>
+#include <string>
 
 /**
  * JSNoBytecodeFileFormatVersion

From dd187a27648cf3cf71c836ea2515cc5695b6d199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Wed, 28 Feb 2018 16:23:22 -0800
Subject: [PATCH 127/267] Simplify issue template

Summary:
Reduce the amount of text people have to read through when opening a new issue.
Closes https://github.com/facebook/react-native/pull/18140

Differential Revision: D7117467

Pulled By: hramos

fbshipit-source-id: 4e976adc44a283ab6d5729e5dd2eaa095871c009
---
 .github/ISSUE_TEMPLATE.md | 111 ++++----------------------------------
 1 file changed, 9 insertions(+), 102 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 1f642ca4fb1b84..bbe1d31e0b8f46 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,122 +1,29 @@
 <!--
-  PLEASE DON'T DELETE THIS TEMPLATE UNTIL YOU HAVE READ THE FIRST SECTION.
+  We use GitHub Issues exclusively for tracking bugs in React Native.
+  Please follow this template when preparing your bug report.
 -->
 
-### Is this a bug report?
-
-(write your answer here)
-
-<!--
-  If you answered "Yes":
-
-    We expect that it will take you about 30 minutes to produce a high-quality bug report.
-    While this may seem like a lot, putting care into issues helps us fix them faster.
-    For bug reports, it is REQUIRED to fill the rest of this template, or the issue will be closed.
-
-  If you answered "No":
-
-    We use GitHub Issues exclusively for tracking bugs in React Native. If you're looking for help,
-    the Community page at http://facebook.github.io/react-native/help.html list various resources 
-    that should help you get started.
-
-  Now scroll below!
--->
-
-### Have you read the [Contributing Guidelines](https://facebook.github.io/react-native/docs/contributing.html)?
-
-(Write your answer here.)
+(Describe your issue in detail.)
 
 ### Environment
 
-<!--
-  In your terminal run `react-native info` and paste its contents here. Next, specify your target platform, like this:
-
-  Environment:
-    OS:  macOS Sierra 10.12.6
-    Node:  8.4.0
-    Yarn:  0.27.5
-    npm:  5.4.0
-    Watchman:  4.7.0
-    Xcode:  Xcode 8.3.3 Build version 8E3004b
-    Android Studio:  2.3 AI-162.4069837
-
-  Packages: (wanted => installed)
-    react-native: 0.48.1 => 0.48.1
-    react: 16.0.0-alpha.12 => 16.0.0-alpha.12
-
-  Target Platform: iOS (10.3)
-
-  ***Make sure you are on v0.48.0 or greater of react-native, otherwise you may get this error:
-
-  Unrecognized command 'info'
-  Run react-native --help to see list of all available commands
--->
-
-### Steps to Reproduce
-
-<!--
-  How would you describe your issue to someone who doesn’t know you or your project?
-  Try to write a sequence of steps that anybody can repeat to see the issue.
-  Be specific! If the bug cannot be reproduced, your issue may be closed.
--->
-
-(Write your steps here:)
-
-1.
-2.
-3.
+(Run `react-native info` in your terminal and paste its contents here.)
 
 ### Expected Behavior
 
-<!--
-  How did you expect your project to behave?
-  It’s fine if you’re not sure your understanding is correct.
-  Just write down what you thought would happen.
--->
-
 (Write what you thought would happen.)
 
 ### Actual Behavior
 
-<!--
-  Did something go wrong?
-  Is something broken, or not behaving as you expected?
-  Describe this section in detail, and attach screenshots if possible.
-  Don't just say "it doesn't work"!
--->
+(Write what happened. Include screenshots if needed.)
 
-(Write what happened. Add screenshots!)
+### Steps to Reproduce
 
-### Reproducible Demo
+(Link to Snack, or steps to reproduce.)
 
 <!--
-  Please share a project that reproduces the issue.
-  There are two ways to do it:
-
-    * Create a new app using https://snack.expo.io/ and try to reproduce the issue in it.
-      This is useful if you roughly know where the problem is, or can’t share the real code.
-
-    * Or, copy your app and remove things until you’re left with the minimal reproducible demo.
-      This is useful for finding the root cause. You may then optionally create a Snack.
+  Please share a project that reproduces the issue. 
+  Ideally, create a new app using https://snack.expo.io/ and try to reproduce the issue in it.
 
   This is a good guide to creating bug demos: https://stackoverflow.com/help/mcve
-  Once you’re done, copy and paste the link to the Snack or a public GitHub repository below:
--->
-
-(Paste the link to an example project and exact instructions to reproduce the issue.)
-
-<!--
-  What happens if you skip this step?
-
-  Someone will read your bug report, and maybe will be able to help you,
-  but it’s unlikely that it will get much attention from the team. Eventually,
-  the issue will likely get closed in favor of issues that have reproducible demos.
-
-  Please remember that:
-
-    * Issues without reproducible demos have a very low priority.
-    * The person fixing the bug would have to do that anyway. Please be respectful of their time.
-    * You might figure out the issues yourself as you work on extracting it.
-
-  Thanks for helping us help you!
 -->

From 4c82ce42eff2a038254ca44a379d0ae731ecc96e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Wed, 28 Feb 2018 16:38:02 -0800
Subject: [PATCH 128/267] Do not mention people, suggest labels

Summary:
GitHub notifications have been made noisier with these automatic mentions. We can rely on the automatic reviewer tags instead.

Also: suggest labels that may be used, based on release notes (the danger bot cannot add labels itself).
Closes https://github.com/facebook/react-native/pull/18138

Differential Revision: D7114654

Pulled By: hramos

fbshipit-source-id: 0d85879f937921543935d090c792ea09f53cb84a
---
 bots/dangerfile.js | 48 ++++++++++------------------------------------
 1 file changed, 10 insertions(+), 38 deletions(-)

diff --git a/bots/dangerfile.js b/bots/dangerfile.js
index bd625afb3ce388..9c9218b34d36b6 100644
--- a/bots/dangerfile.js
+++ b/bots/dangerfile.js
@@ -61,22 +61,18 @@ if (!includesReleaseNotes) {
   const category = releaseNotesCaptureGroups[1].toLowerCase();
 
   // Use Release Notes to Tag PRs appropriately
-  // if (category === 'ios' ){
-  //   markdown('@facebook-github-bot label iOS');
-  // }
+  if (category === 'ios' || category === 'tvos') {
+    message('Suggested label: iOS');
+  }
 
-  // if (category === 'android' ){
-  //   markdown('@facebook-github-bot label Android');
-  // }
-}
+  if (category === 'android') {
+    message('Suggested label: Android');
+  }
 
-// Tags PRs that have been submitted by a core contributor.
-// TODO: Switch to using an actual MAINTAINERS file.
-const taskforce = fs.readFileSync('./IssueCommands.txt', 'utf8').split('\n')[0].split(':')[1];
-const isSubmittedByTaskforce = includes(taskforce, danger.github.pr.user.login);
-// if (isSubmittedByTaskforce) {
-//   markdown('@facebook-github-bot label Core Team');
-// }
+  if (category === 'cli') {
+    message('Suggested label: Tooling');
+  }
+}
 
 // Tags big PRs
 var bigPRThreshold = 600;
@@ -84,14 +80,10 @@ if (danger.github.pr.additions + danger.github.pr.deletions > bigPRThreshold) {
   const title = ':exclamation: Big PR';
   const idea = `This PR is extremely unlikely to get reviewed because it touches ${danger.github.pr.additions + danger.github.pr.deletions} lines.`;
   warn(`${title} - <i>${idea}</i>`);
-
-  // markdown('@facebook-github-bot large-pr');
 } else if (danger.git.modified_files + danger.git.added_files + danger.git.deleted_files > bigPRThreshold) {
   const title = ':exclamation: Big PR';
   const idea = `This PR is extremely unlikely to get reviewed because it touches ${danger.git.modified_files + danger.git.added_files + danger.git.deleted_files} files.`;
   warn(`${title} - <i>${idea}</i>`);
-
-  // markdown('@facebook-github-bot large-pr');
 }
 
 // Warns if the PR is opened against stable, as commits need to be cherry picked and tagged by a release maintainer.
@@ -107,23 +99,3 @@ if (!isMergeRefMaster && isMergeRefStable) {
   const idea = 'The base branch for this PR is something other than `master`. [Are you sure you want to target something other than the `master` branch?](http://facebook.github.io/react-native/docs/contributing.html#pull-requests)';
   fail(`${title} - <i>${idea}</i>`);
 }
-
-// People can add themselves to CODEOWNERS in order to be automatically added as reviewers when a file matching a glob pattern is modified. The following will have the bot add a mention in that case.
-const codeowners = fs.readFileSync('../.github/CODEOWNERS', 'utf8').split('\n');
-let mentions = [];
-codeowners.forEach((codeowner) => {
-  const pattern = codeowner.split(' ')[0];
-  const owners = codeowner.substring(pattern.length).trim().split(' ');
-
-  const modifiedFileHasOwner = path => minimatch(path, pattern);
-  const modifiesOwnedCode = danger.git.modified_files.filter(modifiedFileHasOwner).length > 0;
-
-  if (modifiesOwnedCode) {
-    mentions = mentions.concat(owners);
-  }
-});
-const isOwnedCodeModified = mentions.length > 0;
-if (isOwnedCodeModified) {
-  const uniqueMentions = new Set(mentions);
-  markdown('Attention: ' + [...uniqueMentions].join(', '));
-}

From 160578624a7bb1715e86aa4bf77a986125cf90c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Wed, 28 Feb 2018 19:16:47 -0800
Subject: [PATCH 129/267] React sync for revisions a634e53...ab4280b

Reviewed By: bvaughn

Differential Revision: D7077686

fbshipit-source-id: de39027bef1f9d48802202555a5c765999d7bfe7
---
 Libraries/Renderer/REVISION                   |    2 +-
 Libraries/Renderer/ReactFabric-dev.js         | 2862 ++++++++---------
 Libraries/Renderer/ReactFabric-prod.js        | 1924 +++++------
 Libraries/Renderer/ReactNativeRenderer-dev.js | 2480 +++++++-------
 .../Renderer/ReactNativeRenderer-prod.js      | 1763 +++++-----
 5 files changed, 4838 insertions(+), 4193 deletions(-)

diff --git a/Libraries/Renderer/REVISION b/Libraries/Renderer/REVISION
index fe141ab8098dae..bb434f321ae390 100644
--- a/Libraries/Renderer/REVISION
+++ b/Libraries/Renderer/REVISION
@@ -1 +1 @@
-a634e53d2ff376366aa87815ad4de064494cd05e
\ No newline at end of file
+ab4280b3e98dbb97d3e753083dab19879167c3f5
\ No newline at end of file
diff --git a/Libraries/Renderer/ReactFabric-dev.js b/Libraries/Renderer/ReactFabric-dev.js
index 81114b8c8f49f1..9a30ceeda7036a 100644
--- a/Libraries/Renderer/ReactFabric-dev.js
+++ b/Libraries/Renderer/ReactFabric-dev.js
@@ -19,12 +19,11 @@ require("InitializeCore");
 var invariant = require("fbjs/lib/invariant");
 var warning = require("fbjs/lib/warning");
 var emptyFunction = require("fbjs/lib/emptyFunction");
-var RCTEventEmitter = require("RCTEventEmitter");
 var UIManager = require("UIManager");
-var React = require("react");
 var TextInputState = require("TextInputState");
 var deepDiffer = require("deepDiffer");
 var flattenStyle = require("flattenStyle");
+var React = require("react");
 var emptyObject = require("fbjs/lib/emptyObject");
 var checkPropTypes = require("prop-types/checkPropTypes");
 var shallowEqual = require("fbjs/lib/shallowEqual");
@@ -557,53 +556,9 @@ var validateEventDispatches = void 0;
   };
 }
 
-/**
- * Dispatch the event to the listener.
- * @param {SyntheticEvent} event SyntheticEvent to handle
- * @param {boolean} simulated If the event is simulated (changes exn behavior)
- * @param {function} listener Application-level callback
- * @param {*} inst Internal component instance
- */
-function executeDispatch(event, simulated, listener, inst) {
-  var type = event.type || "unknown-event";
-  event.currentTarget = getNodeFromInstance(inst);
-  ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
-    type,
-    listener,
-    undefined,
-    event
-  );
-  event.currentTarget = null;
-}
-
 /**
  * Standard/simple iteration through an event's collected dispatches.
  */
-function executeDispatchesInOrder(event, simulated) {
-  var dispatchListeners = event._dispatchListeners;
-  var dispatchInstances = event._dispatchInstances;
-  {
-    validateEventDispatches(event);
-  }
-  if (Array.isArray(dispatchListeners)) {
-    for (var i = 0; i < dispatchListeners.length; i++) {
-      if (event.isPropagationStopped()) {
-        break;
-      }
-      // Listeners and Instances are two parallel arrays that are always in sync.
-      executeDispatch(
-        event,
-        simulated,
-        dispatchListeners[i],
-        dispatchInstances[i]
-      );
-    }
-  } else if (dispatchListeners) {
-    executeDispatch(event, simulated, dispatchListeners, dispatchInstances);
-  }
-  event._dispatchListeners = null;
-  event._dispatchInstances = null;
-}
 
 /**
  * Standard/simple iteration through an event's collected dispatches, but stops
@@ -742,35 +697,6 @@ function forEachAccumulated(arr, cb, scope) {
   }
 }
 
-/**
- * Internal queue of events that have accumulated their dispatches and are
- * waiting to have their dispatches executed.
- */
-var eventQueue = null;
-
-/**
- * Dispatches an event and releases it back into the pool, unless persistent.
- *
- * @param {?object} event Synthetic event to be dispatched.
- * @param {boolean} simulated If the event is simulated (changes exn behavior)
- * @private
- */
-var executeDispatchesAndRelease = function(event, simulated) {
-  if (event) {
-    executeDispatchesInOrder(event, simulated);
-
-    if (!event.isPersistent()) {
-      event.constructor.release(event);
-    }
-  }
-};
-var executeDispatchesAndReleaseSimulated = function(e) {
-  return executeDispatchesAndRelease(e, true);
-};
-var executeDispatchesAndReleaseTopLevel = function(e) {
-  return executeDispatchesAndRelease(e, false);
-};
-
 function isInteractive(tag) {
   return (
     tag === "button" ||
@@ -870,87 +796,6 @@ function getListener(inst, registrationName) {
   return listener;
 }
 
-/**
- * Allows registered plugins an opportunity to extract events from top-level
- * native browser events.
- *
- * @return {*} An accumulation of synthetic events.
- * @internal
- */
-function extractEvents(
-  topLevelType,
-  targetInst,
-  nativeEvent,
-  nativeEventTarget
-) {
-  var events = null;
-  for (var i = 0; i < plugins.length; i++) {
-    // Not every plugin in the ordering may be loaded at runtime.
-    var possiblePlugin = plugins[i];
-    if (possiblePlugin) {
-      var extractedEvents = possiblePlugin.extractEvents(
-        topLevelType,
-        targetInst,
-        nativeEvent,
-        nativeEventTarget
-      );
-      if (extractedEvents) {
-        events = accumulateInto(events, extractedEvents);
-      }
-    }
-  }
-  return events;
-}
-
-function runEventsInBatch(events, simulated) {
-  if (events !== null) {
-    eventQueue = accumulateInto(eventQueue, events);
-  }
-
-  // Set `eventQueue` to null before processing it so that we can tell if more
-  // events get enqueued while processing.
-  var processingEventQueue = eventQueue;
-  eventQueue = null;
-
-  if (!processingEventQueue) {
-    return;
-  }
-
-  if (simulated) {
-    forEachAccumulated(
-      processingEventQueue,
-      executeDispatchesAndReleaseSimulated
-    );
-  } else {
-    forEachAccumulated(
-      processingEventQueue,
-      executeDispatchesAndReleaseTopLevel
-    );
-  }
-  invariant(
-    !eventQueue,
-    "processEventQueue(): Additional events were enqueued while processing " +
-      "an event queue. Support for this has not yet been implemented."
-  );
-  // This would be a good time to rethrow if any of the event handlers threw.
-  ReactErrorUtils.rethrowCaughtError();
-}
-
-function runExtractedEventsInBatch(
-  topLevelType,
-  targetInst,
-  nativeEvent,
-  nativeEventTarget
-) {
-  var events = extractEvents(
-    topLevelType,
-    targetInst,
-    nativeEvent,
-    nativeEventTarget
-  );
-  runEventsInBatch(events, false);
-}
-
 var IndeterminateComponent = 0; // Before we know whether it is functional or class
 var FunctionalComponent = 1;
 var ClassComponent = 2;
@@ -2323,6 +2168,10 @@ var ReactNativeBridgeEventPlugin = {
     nativeEvent,
     nativeEventTarget
   ) {
+    if (targetInst == null) {
+      // Probably a node belonging to another renderer's tree.
+      return null;
+    }
     var bubbleDispatchConfig = customBubblingEventTypes[topLevelType];
     var directDispatchConfig = customDirectEventTypes[topLevelType];
     invariant(
@@ -2434,6 +2283,115 @@ var ReactNativeComponentTree = Object.freeze({
   updateFiberProps: updateFiberProps
 });
 
+var ReactNativeEventPluginOrder = [
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+];
+
+// Module provided by RN:
+var ReactNativeGlobalResponderHandler = {
+  onChange: function(from, to, blockNativeResponder) {
+    if (to !== null) {
+      var tag = to.stateNode._nativeTag;
+      UIManager.setJSResponder(tag, blockNativeResponder);
+    } else {
+      UIManager.clearJSResponder();
+    }
+  }
+};
+
+/**
+ * Make sure essential globals are available and are patched correctly. Please don't remove this
+ * line. Bundles created by react-packager `require` it before executing any application code. This
+ * ensures it exists in the dependency graph and can be `require`d.
+ * TODO: require this in packager, not in React #10932517
+ */
+// Module provided by RN:
+/**
+ * Inject module for resolving DOM hierarchy and plugin ordering.
+ */
+injection.injectEventPluginOrder(ReactNativeEventPluginOrder);
+injection$1.injectComponentTree(ReactNativeComponentTree);
+
+ResponderEventPlugin.injection.injectGlobalResponderHandler(
+  ReactNativeGlobalResponderHandler
+);
+
+/**
+ * Some important event plugins included by default (without having to require
+ * them).
+ */
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+});
+
+// TODO: The event emitter registration is interfering with the existing
+// ReactNative renderer. So disable it for Fabric for now.
+
+// import * as ReactNativeEventEmitter from './ReactNativeEventEmitter';
+
+// Module provided by RN:
+// import RCTEventEmitter from 'RCTEventEmitter';
+
+/**
+ * Register the event emitter with the native bridge
+ */
+// RCTEventEmitter.register(ReactNativeEventEmitter);
+
+// The Symbol used to tag the ReactElement-like types. If there is no native Symbol
+// nor polyfill, then a plain number is used for performance.
+var hasSymbol = typeof Symbol === "function" && Symbol["for"];
+
+var REACT_ELEMENT_TYPE = hasSymbol ? Symbol["for"]("react.element") : 0xeac7;
+var REACT_CALL_TYPE = hasSymbol ? Symbol["for"]("react.call") : 0xeac8;
+var REACT_RETURN_TYPE = hasSymbol ? Symbol["for"]("react.return") : 0xeac9;
+var REACT_PORTAL_TYPE = hasSymbol ? Symbol["for"]("react.portal") : 0xeaca;
+var REACT_FRAGMENT_TYPE = hasSymbol ? Symbol["for"]("react.fragment") : 0xeacb;
+var REACT_STRICT_MODE_TYPE = hasSymbol
+  ? Symbol["for"]("react.strict_mode")
+  : 0xeacc;
+var REACT_PROVIDER_TYPE = hasSymbol ? Symbol["for"]("react.provider") : 0xeacd;
+var REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 0xeace;
+var REACT_ASYNC_MODE_TYPE = hasSymbol
+  ? Symbol["for"]("react.async_mode")
+  : 0xeacf;
+
+var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
+var FAUX_ITERATOR_SYMBOL = "@@iterator";
+
+function getIteratorFn(maybeIterable) {
+  if (maybeIterable === null || typeof maybeIterable === "undefined") {
+    return null;
+  }
+  var maybeIterator =
+    (MAYBE_ITERATOR_SYMBOL && maybeIterable[MAYBE_ITERATOR_SYMBOL]) ||
+    maybeIterable[FAUX_ITERATOR_SYMBOL];
+  if (typeof maybeIterator === "function") {
+    return maybeIterator;
+  }
+  return null;
+}
+
+function createPortal(
+  children,
+  containerInfo,
+  // TODO: figure out the API for cross-renderer implementation.
+  implementation
+) {
+  var key =
+    arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+
+  return {
+    // This tag allow us to uniquely identify this as a React Portal
+    $$typeof: REACT_PORTAL_TYPE,
+    key: key == null ? null : "" + key,
+    children: children,
+    containerInfo: containerInfo,
+    implementation: implementation
+  };
+}
+
 // Use to restore controlled state after a change event has fired.
 
 var fiberHostComponent = null;
@@ -2534,338 +2492,37 @@ var injection$2 = {
   }
 };
 
-/**
- * Keeps track of allocating and associating native "tags" which are numeric,
- * unique view IDs. All the native tags are negative numbers, to avoid
- * collisions, but in the JS we keep track of them as positive integers to store
- * them effectively in Arrays. So we must refer to them as "inverses" of the
- * native tags (that are * normally negative).
- *
- * It *must* be the case that every `rootNodeID` always maps to the exact same
- * `tag` forever. The easiest way to accomplish this is to never delete
- * anything from this table.
- * Why: Because `dangerouslyReplaceNodeWithMarkupByID` relies on being able to
- * unmount a component with a `rootNodeID`, then mount a new one in its place,
- */
-var INITIAL_TAG_COUNT = 1;
-var ReactNativeTagHandles = {
-  tagsStartAt: INITIAL_TAG_COUNT,
-  tagCount: INITIAL_TAG_COUNT,
-
-  allocateTag: function() {
-    // Skip over root IDs as those are reserved for native
-    while (this.reactTagIsNativeTopRootID(ReactNativeTagHandles.tagCount)) {
-      ReactNativeTagHandles.tagCount++;
-    }
-    var tag = ReactNativeTagHandles.tagCount;
-    ReactNativeTagHandles.tagCount++;
-    return tag;
-  },
+var TouchHistoryMath = {
+  /**
+   * This code is optimized and not intended to look beautiful. This allows
+   * computing of touch centroids that have moved after `touchesChangedAfter`
+   * timeStamp. You can compute the current centroid involving all touches
+   * moves after `touchesChangedAfter`, or you can compute the previous
+   * centroid of all touches that were moved after `touchesChangedAfter`.
+   *
+   * @param {TouchHistoryMath} touchHistory Standard Responder touch track
+   * data.
+   * @param {number} touchesChangedAfter timeStamp after which moved touches
+   * are considered "actively moving" - not just "active".
+   * @param {boolean} isXAxis Consider `x` dimension vs. `y` dimension.
+   * @param {boolean} ofCurrent Compute current centroid for actively moving
+   * touches vs. previous centroid of now actively moving touches.
+   * @return {number} value of centroid in specified dimension.
+   */
+  centroidDimension: function(
+    touchHistory,
+    touchesChangedAfter,
+    isXAxis,
+    ofCurrent
+  ) {
+    var touchBank = touchHistory.touchBank;
+    var total = 0;
+    var count = 0;
 
-  assertRootTag: function(tag) {
-    invariant(
-      this.reactTagIsNativeTopRootID(tag),
-      "Expect a native root tag, instead got %s",
-      tag
-    );
-  },
-
-  reactTagIsNativeTopRootID: function(reactTag) {
-    // We reserve all tags that are 1 mod 10 for native root views
-    return reactTag % 10 === 1;
-  }
-};
-
-/**
- * Version of `ReactBrowserEventEmitter` that works on the receiving side of a
- * serialized worker boundary.
- */
-
-// Shared default empty native event - conserve memory.
-var EMPTY_NATIVE_EVENT = {};
-
-/**
- * Selects a subsequence of `Touch`es, without destroying `touches`.
- *
- * @param {Array<Touch>} touches Deserialized touch objects.
- * @param {Array<number>} indices Indices by which to pull subsequence.
- * @return {Array<Touch>} Subsequence of touch objects.
- */
-var touchSubsequence = function(touches, indices) {
-  var ret = [];
-  for (var i = 0; i < indices.length; i++) {
-    ret.push(touches[indices[i]]);
-  }
-  return ret;
-};
-
-/**
- * TODO: Pool all of this.
- *
- * Destroys `touches` by removing touch objects at indices `indices`. This is
- * to maintain compatibility with W3C touch "end" events, where the active
- * touches don't include the set that has just been "ended".
- *
- * @param {Array<Touch>} touches Deserialized touch objects.
- * @param {Array<number>} indices Indices to remove from `touches`.
- * @return {Array<Touch>} Subsequence of removed touch objects.
- */
-var removeTouchesAtIndices = function(touches, indices) {
-  var rippedOut = [];
-  // use an unsafe downcast to alias to nullable elements,
-  // so we can delete and then compact.
-  var temp = touches;
-  for (var i = 0; i < indices.length; i++) {
-    var index = indices[i];
-    rippedOut.push(touches[index]);
-    temp[index] = null;
-  }
-  var fillAt = 0;
-  for (var j = 0; j < temp.length; j++) {
-    var cur = temp[j];
-    if (cur !== null) {
-      temp[fillAt++] = cur;
-    }
-  }
-  temp.length = fillAt;
-  return rippedOut;
-};
-
-/**
- * Internal version of `receiveEvent` in terms of normalized (non-tag)
- * `rootNodeID`.
- *
- * @see receiveEvent.
- *
- * @param {rootNodeID} rootNodeID React root node ID that event occurred on.
- * @param {TopLevelType} topLevelType Top level type of event.
- * @param {?object} nativeEventParam Object passed from native.
- */
-function _receiveRootNodeIDEvent(rootNodeID, topLevelType, nativeEventParam) {
-  var nativeEvent = nativeEventParam || EMPTY_NATIVE_EVENT;
-  var inst = getInstanceFromTag(rootNodeID);
-  batchedUpdates(function() {
-    runExtractedEventsInBatch(
-      topLevelType,
-      inst,
-      nativeEvent,
-      nativeEvent.target
-    );
-  });
-  // React Native doesn't use ReactControlledComponent but if it did, here's
-  // where it would do it.
-}
-
-/**
- * Publicly exposed method on module for native objc to invoke when a top
- * level event is extracted.
- * @param {rootNodeID} rootNodeID React root node ID that event occurred on.
- * @param {TopLevelType} topLevelType Top level type of event.
- * @param {object} nativeEventParam Object passed from native.
- */
-function receiveEvent(rootNodeID, topLevelType, nativeEventParam) {
-  _receiveRootNodeIDEvent(rootNodeID, topLevelType, nativeEventParam);
-}
-
-/**
- * Simple multi-wrapper around `receiveEvent` that is intended to receive an
- * efficient representation of `Touch` objects, and other information that
- * can be used to construct W3C compliant `Event` and `Touch` lists.
- *
- * This may create dispatch behavior that differs than web touch handling. We
- * loop through each of the changed touches and receive it as a single event.
- * So two `touchStart`/`touchMove`s that occur simultaneously are received as
- * two separate touch event dispatches - when they arguably should be one.
- *
- * This implementation reuses the `Touch` objects themselves as the `Event`s
- * since we dispatch an event for each touch (though that might not be spec
- * compliant). The main purpose of reusing them is to save allocations.
- *
- * TODO: Dispatch multiple changed touches in one event. The bubble path
- * could be the first common ancestor of all the `changedTouches`.
- *
- * One difference between this behavior and W3C spec: cancelled touches will
- * not appear in `.touches`, or in any future `.touches`, though they may
- * still be "actively touching the surface".
- *
- * Web desktop polyfills only need to construct a fake touch event with
- * identifier 0, also abandoning traditional click handlers.
- */
-function receiveTouches(eventTopLevelType, touches, changedIndices) {
-  var changedTouches =
-    eventTopLevelType === "topTouchEnd" ||
-    eventTopLevelType === "topTouchCancel"
-      ? removeTouchesAtIndices(touches, changedIndices)
-      : touchSubsequence(touches, changedIndices);
-
-  for (var jj = 0; jj < changedTouches.length; jj++) {
-    var touch = changedTouches[jj];
-    // Touch objects can fulfill the role of `DOM` `Event` objects if we set
-    // the `changedTouches`/`touches`. This saves allocations.
-    touch.changedTouches = changedTouches;
-    touch.touches = touches;
-    var nativeEvent = touch;
-    var rootNodeID = null;
-    var target = nativeEvent.target;
-    if (target !== null && target !== undefined) {
-      if (target < ReactNativeTagHandles.tagsStartAt) {
-        {
-          warning(
-            false,
-            "A view is reporting that a touch occurred on tag zero."
-          );
-        }
-      } else {
-        rootNodeID = target;
-      }
-    }
-    // $FlowFixMe Shouldn't we *not* call it if rootNodeID is null?
-    _receiveRootNodeIDEvent(rootNodeID, eventTopLevelType, nativeEvent);
-  }
-}
-
-var ReactNativeEventEmitter = Object.freeze({
-  getListener: getListener,
-  registrationNames: registrationNameModules,
-  _receiveRootNodeIDEvent: _receiveRootNodeIDEvent,
-  receiveEvent: receiveEvent,
-  receiveTouches: receiveTouches
-});
-
-var ReactNativeEventPluginOrder = [
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-];
-
-// Module provided by RN:
-var ReactNativeGlobalResponderHandler = {
-  onChange: function(from, to, blockNativeResponder) {
-    if (to !== null) {
-      var tag = to.stateNode._nativeTag;
-      UIManager.setJSResponder(tag, blockNativeResponder);
-    } else {
-      UIManager.clearJSResponder();
-    }
-  }
-};
-
-/**
- * Make sure essential globals are available and are patched correctly. Please don't remove this
- * line. Bundles created by react-packager `require` it before executing any application code. This
- * ensures it exists in the dependency graph and can be `require`d.
- * TODO: require this in packager, not in React #10932517
- */
-// Module provided by RN:
-// Module provided by RN:
-/**
- * Register the event emitter with the native bridge
- */
-// TODO: This event emitter is interfering with the existing ReactNative renderer.
-// RCTEventEmitter.register(ReactNativeEventEmitter);
-
-/**
- * Inject module for resolving DOM hierarchy and plugin ordering.
- */
-injection.injectEventPluginOrder(ReactNativeEventPluginOrder);
-injection$1.injectComponentTree(ReactNativeComponentTree);
-
-ResponderEventPlugin.injection.injectGlobalResponderHandler(
-  ReactNativeGlobalResponderHandler
-);
-
-/**
- * Some important event plugins included by default (without having to require
- * them).
- */
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
-});
-
-// The Symbol used to tag the ReactElement-like types. If there is no native Symbol
-// nor polyfill, then a plain number is used for performance.
-var hasSymbol = typeof Symbol === "function" && Symbol["for"];
-
-var REACT_ELEMENT_TYPE = hasSymbol ? Symbol["for"]("react.element") : 0xeac7;
-var REACT_CALL_TYPE = hasSymbol ? Symbol["for"]("react.call") : 0xeac8;
-var REACT_RETURN_TYPE = hasSymbol ? Symbol["for"]("react.return") : 0xeac9;
-var REACT_PORTAL_TYPE = hasSymbol ? Symbol["for"]("react.portal") : 0xeaca;
-var REACT_FRAGMENT_TYPE = hasSymbol ? Symbol["for"]("react.fragment") : 0xeacb;
-var REACT_STRICT_MODE_TYPE = hasSymbol
-  ? Symbol["for"]("react.strict_mode")
-  : 0xeacc;
-var REACT_PROVIDER_TYPE = hasSymbol ? Symbol["for"]("react.provider") : 0xeacd;
-var REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 0xeace;
-var REACT_ASYNC_MODE_TYPE = hasSymbol
-  ? Symbol["for"]("react.async_mode")
-  : 0xeacf;
-
-var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
-var FAUX_ITERATOR_SYMBOL = "@@iterator";
-
-function getIteratorFn(maybeIterable) {
-  if (maybeIterable === null || typeof maybeIterable === "undefined") {
-    return null;
-  }
-  var maybeIterator =
-    (MAYBE_ITERATOR_SYMBOL && maybeIterable[MAYBE_ITERATOR_SYMBOL]) ||
-    maybeIterable[FAUX_ITERATOR_SYMBOL];
-  if (typeof maybeIterator === "function") {
-    return maybeIterator;
-  }
-  return null;
-}
-
-function createPortal(
-  children,
-  containerInfo,
-  // TODO: figure out the API for cross-renderer implementation.
-  implementation
-) {
-  var key =
-    arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-
-  return {
-    // This tag allow us to uniquely identify this as a React Portal
-    $$typeof: REACT_PORTAL_TYPE,
-    key: key == null ? null : "" + key,
-    children: children,
-    containerInfo: containerInfo,
-    implementation: implementation
-  };
-}
-
-var TouchHistoryMath = {
-  /**
-   * This code is optimized and not intended to look beautiful. This allows
-   * computing of touch centroids that have moved after `touchesChangedAfter`
-   * timeStamp. You can compute the current centroid involving all touches
-   * moves after `touchesChangedAfter`, or you can compute the previous
-   * centroid of all touches that were moved after `touchesChangedAfter`.
-   *
-   * @param {TouchHistoryMath} touchHistory Standard Responder touch track
-   * data.
-   * @param {number} touchesChangedAfter timeStamp after which moved touches
-   * are considered "actively moving" - not just "active".
-   * @param {boolean} isXAxis Consider `x` dimension vs. `y` dimension.
-   * @param {boolean} ofCurrent Compute current centroid for actively moving
-   * touches vs. previous centroid of now actively moving touches.
-   * @return {number} value of centroid in specified dimension.
-   */
-  centroidDimension: function(
-    touchHistory,
-    touchesChangedAfter,
-    isXAxis,
-    ofCurrent
-  ) {
-    var touchBank = touchHistory.touchBank;
-    var total = 0;
-    var count = 0;
-
-    var oneTouchData =
-      touchHistory.numberActiveTouches === 1
-        ? touchHistory.touchBank[touchHistory.indexOfSingleActiveTouch]
-        : null;
+    var oneTouchData =
+      touchHistory.numberActiveTouches === 1
+        ? touchHistory.touchBank[touchHistory.indexOfSingleActiveTouch]
+        : null;
 
     if (oneTouchData !== null) {
       if (
@@ -2978,19 +2635,9 @@ var TouchHistoryMath = {
   noCentroid: -1
 };
 
-var ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-
-var ReactCurrentOwner = ReactInternals.ReactCurrentOwner;
-var ReactDebugCurrentFrame = ReactInternals.ReactDebugCurrentFrame;
-
-var ReactGlobalSharedState = Object.freeze({
-  ReactCurrentOwner: ReactCurrentOwner,
-  ReactDebugCurrentFrame: ReactDebugCurrentFrame
-});
-
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.3.0-alpha.0";
+var ReactVersion = "16.3.0-alpha.1";
 
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -3581,6 +3228,11 @@ function set(key, value) {
   key._reactInternalFiber = value;
 }
 
+var ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+var ReactCurrentOwner = ReactInternals.ReactCurrentOwner;
+var ReactDebugCurrentFrame = ReactInternals.ReactDebugCurrentFrame;
+
 function getComponentName(fiber) {
   var type = fiber.type;
 
@@ -4190,19 +3842,26 @@ function get$1(name) {
   return viewConfig;
 }
 
-// Don't change these two values:
-var NoEffect = 0;
-var PerformedWork = 1;
+// Don't change these two values. They're used by React Dev Tools.
+var NoEffect = /*              */ 0;
+var PerformedWork = /*         */ 1;
 
 // You can change the rest (and add more).
-var Placement = 2;
-var Update = 4;
-var PlacementAndUpdate = 6;
-var Deletion = 8;
-var ContentReset = 16;
-var Callback = 32;
-var Err = 64;
-var Ref = 128;
+var Placement = /*             */ 2;
+var Update = /*                */ 4;
+var PlacementAndUpdate = /*    */ 6;
+var Deletion = /*              */ 8;
+var ContentReset = /*          */ 16;
+var Callback = /*              */ 32;
+var DidCapture = /*            */ 64;
+var Ref = /*                   */ 128;
+var ErrLog = /*                */ 256;
+
+// Union of all host effects
+var HostEffectMask = /*        */ 511;
+
+var Incomplete = /*            */ 512;
+var ShouldCapture = /*         */ 1024;
 
 var MOUNTING = 1;
 var MOUNTED = 2;
@@ -4635,7 +4294,9 @@ var debugRenderPhaseSideEffects = false;
 var debugRenderPhaseSideEffectsForStrictMode = false;
 
 var enableUserTimingAPI = true;
+var enableGetDerivedStateFromCatch = false;
 var warnAboutDeprecatedLifecycles = false;
+var replayFailedUnitOfWorkWithInvokeGuardedCallback = true;
 
 // React Fabric uses persistent reconciler.
 var enableMutatingReconciler = false;
@@ -4772,6 +4433,8 @@ var shouldIgnoreFiber = function(fiber) {
     case CallComponent:
     case ReturnComponent:
     case Fragment:
+    case ContextProvider:
+    case ContextConsumer:
       return true;
     default:
       return false;
@@ -5681,12 +5344,12 @@ function createFiberRoot(containerInfo, isAsync, hydrate) {
     current: uninitializedFiber,
     containerInfo: containerInfo,
     pendingChildren: null,
-    remainingExpirationTime: NoWork,
-    isReadyForCommit: false,
+    pendingCommitExpirationTime: NoWork,
     finishedWork: null,
     context: null,
     pendingContext: null,
     hydrate: hydrate,
+    remainingExpirationTime: NoWork,
     firstBatch: null,
     nextScheduledRoot: null
   };
@@ -6128,7 +5791,8 @@ function createUpdateQueue(baseState) {
     last: null,
     callbackList: null,
     hasForceUpdate: false,
-    isInitialized: false
+    isInitialized: false,
+    capturedValues: null
   };
   {
     queue.isProcessing = false;
@@ -6153,7 +5817,10 @@ function insertUpdateIntoQueue(queue, update) {
   }
 }
 
-function insertUpdateIntoFiber(fiber, update) {
+var q1 = void 0;
+var q2 = void 0;
+function ensureUpdateQueues(fiber) {
+  q1 = q2 = null;
   // We'll have at least one and at most two distinct update queues.
   var alternateFiber = fiber.alternate;
   var queue1 = fiber.updateQueue;
@@ -6176,6 +5843,16 @@ function insertUpdateIntoFiber(fiber, update) {
   }
   queue2 = queue2 !== queue1 ? queue2 : null;
 
+  // Use module variables instead of returning a tuple
+  q1 = queue1;
+  q2 = queue2;
+}
+
+function insertUpdateIntoFiber(fiber, update) {
+  ensureUpdateQueues(fiber);
+  var queue1 = q1;
+  var queue2 = q2;
+
   // Warn if an update is scheduled from inside an updater function.
   {
     if (
@@ -6215,14 +5892,17 @@ function insertUpdateIntoFiber(fiber, update) {
 }
 
 function getUpdateExpirationTime(fiber) {
-  if (fiber.tag !== ClassComponent && fiber.tag !== HostRoot) {
-    return NoWork;
-  }
-  var updateQueue = fiber.updateQueue;
-  if (updateQueue === null) {
-    return NoWork;
+  switch (fiber.tag) {
+    case HostRoot:
+    case ClassComponent:
+      var updateQueue = fiber.updateQueue;
+      if (updateQueue === null) {
+        return NoWork;
+      }
+      return updateQueue.expirationTime;
+    default:
+      return NoWork;
   }
-  return updateQueue.expirationTime;
 }
 
 function getStateFromUpdate(update, instance, prevState, props) {
@@ -6251,6 +5931,7 @@ function processUpdateQueue(
       first: currentQueue.first,
       last: currentQueue.last,
       isInitialized: currentQueue.isInitialized,
+      capturedValues: currentQueue.capturedValues,
       // These fields are no longer valid because they were already committed.
       // Reset them.
       callbackList: null,
@@ -6352,12 +6033,24 @@ function processUpdateQueue(
       }
       _callbackList.push(update);
     }
+    if (update.capturedValue !== null) {
+      var _capturedValues = queue.capturedValues;
+      if (_capturedValues === null) {
+        queue.capturedValues = [update.capturedValue];
+      } else {
+        _capturedValues.push(update.capturedValue);
+      }
+    }
     update = update.next;
   }
 
   if (queue.callbackList !== null) {
     workInProgress.effectTag |= Callback;
-  } else if (queue.first === null && !queue.hasForceUpdate) {
+  } else if (
+    queue.first === null &&
+    !queue.hasForceUpdate &&
+    queue.capturedValues === null
+  ) {
     // The queue is empty. We can reset it.
     workInProgress.updateQueue = null;
   }
@@ -6453,6 +6146,18 @@ var warnOnInvalidCallback = void 0;
   });
   Object.freeze(fakeInternalInstance);
 }
+function callGetDerivedStateFromCatch(ctor, capturedValues) {
+  var resultState = {};
+  for (var i = 0; i < capturedValues.length; i++) {
+    var capturedValue = capturedValues[i];
+    var error = capturedValue.value;
+    var partialState = ctor.getDerivedStateFromCatch.call(null, error);
+    if (partialState !== null && partialState !== undefined) {
+      Object.assign(resultState, partialState);
+    }
+  }
+  return resultState;
+}
 
 var ReactFiberClassComponent = function(
   scheduleWork,
@@ -6476,7 +6181,7 @@ var ReactFiberClassComponent = function(
         callback: callback,
         isReplace: false,
         isForced: false,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       };
       insertUpdateIntoFiber(fiber, update);
@@ -6495,7 +6200,7 @@ var ReactFiberClassComponent = function(
         callback: callback,
         isReplace: true,
         isForced: false,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       };
       insertUpdateIntoFiber(fiber, update);
@@ -6514,7 +6219,7 @@ var ReactFiberClassComponent = function(
         callback: callback,
         isReplace: false,
         isForced: true,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       };
       insertUpdateIntoFiber(fiber, update);
@@ -6540,7 +6245,7 @@ var ReactFiberClassComponent = function(
     }
 
     var instance = workInProgress.stateNode;
-    var type = workInProgress.type;
+    var ctor = workInProgress.type;
     if (typeof instance.shouldComponentUpdate === "function") {
       startPhaseTimer(workInProgress, "shouldComponentUpdate");
       var shouldUpdate = instance.shouldComponentUpdate(
@@ -6562,7 +6267,7 @@ var ReactFiberClassComponent = function(
       return shouldUpdate;
     }
 
-    if (type.prototype && type.prototype.isPureReactComponent) {
+    if (ctor.prototype && ctor.prototype.isPureReactComponent) {
       return (
         !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
       );
@@ -6718,7 +6423,7 @@ var ReactFiberClassComponent = function(
     }
     if (typeof instance.getChildContext === "function") {
       warning(
-        typeof workInProgress.type.childContextTypes === "object",
+        typeof type.childContextTypes === "object",
         "%s.getChildContext(): childContextTypes must be defined in order to " +
           "use getChildContext().",
         getComponentName(workInProgress)
@@ -6939,6 +6644,7 @@ var ReactFiberClassComponent = function(
 
   // Invokes the mount life-cycles on a previously never rendered instance.
   function mountClassInstance(workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
     var current = workInProgress.alternate;
 
     {
@@ -6975,7 +6681,7 @@ var ReactFiberClassComponent = function(
     if (
       (typeof instance.UNSAFE_componentWillMount === "function" ||
         typeof instance.componentWillMount === "function") &&
-      typeof workInProgress.type.getDerivedStateFromProps !== "function"
+      typeof ctor.getDerivedStateFromProps !== "function"
     ) {
       callComponentWillMount(workInProgress, instance);
       // If we had additional state updates during this life-cycle, let's
@@ -6997,113 +6703,8 @@ var ReactFiberClassComponent = function(
     }
   }
 
-  // Called on a preexisting class instance. Returns false if a resumed render
-  // could be reused.
-  // function resumeMountClassInstance(
-  //   workInProgress: Fiber,
-  //   priorityLevel: PriorityLevel,
-  // ): boolean {
-  //   const instance = workInProgress.stateNode;
-  //   resetInputPointers(workInProgress, instance);
-
-  //   let newState = workInProgress.memoizedState;
-  //   let newProps = workInProgress.pendingProps;
-  //   if (!newProps) {
-  //     // If there isn't any new props, then we'll reuse the memoized props.
-  //     // This could be from already completed work.
-  //     newProps = workInProgress.memoizedProps;
-  //     invariant(
-  //       newProps != null,
-  //       'There should always be pending or memoized props. This error is ' +
-  //         'likely caused by a bug in React. Please file an issue.',
-  //     );
-  //   }
-  //   const newUnmaskedContext = getUnmaskedContext(workInProgress);
-  //   const newContext = getMaskedContext(workInProgress, newUnmaskedContext);
-
-  //   const oldContext = instance.context;
-  //   const oldProps = workInProgress.memoizedProps;
-
-  //   if (
-  //     typeof instance.componentWillReceiveProps === 'function' &&
-  //     (oldProps !== newProps || oldContext !== newContext)
-  //   ) {
-  //     callComponentWillReceiveProps(
-  //       workInProgress,
-  //       instance,
-  //       newProps,
-  //       newContext,
-  //     );
-  //   }
-
-  //   // Process the update queue before calling shouldComponentUpdate
-  //   const updateQueue = workInProgress.updateQueue;
-  //   if (updateQueue !== null) {
-  //     newState = processUpdateQueue(
-  //       workInProgress,
-  //       updateQueue,
-  //       instance,
-  //       newState,
-  //       newProps,
-  //       priorityLevel,
-  //     );
-  //   }
-
-  //   // TODO: Should we deal with a setState that happened after the last
-  //   // componentWillMount and before this componentWillMount? Probably
-  //   // unsupported anyway.
-
-  //   if (
-  //     !checkShouldComponentUpdate(
-  //       workInProgress,
-  //       workInProgress.memoizedProps,
-  //       newProps,
-  //       workInProgress.memoizedState,
-  //       newState,
-  //       newContext,
-  //     )
-  //   ) {
-  //     // Update the existing instance's state, props, and context pointers even
-  //     // though we're bailing out.
-  //     instance.props = newProps;
-  //     instance.state = newState;
-  //     instance.context = newContext;
-  //     return false;
-  //   }
-
-  //   // Update the input pointers now so that they are correct when we call
-  //   // componentWillMount
-  //   instance.props = newProps;
-  //   instance.state = newState;
-  //   instance.context = newContext;
-
-  //   if (typeof instance.componentWillMount === 'function') {
-  //     callComponentWillMount(workInProgress, instance);
-  //     // componentWillMount may have called setState. Process the update queue.
-  //     const newUpdateQueue = workInProgress.updateQueue;
-  //     if (newUpdateQueue !== null) {
-  //       newState = processUpdateQueue(
-  //         workInProgress,
-  //         newUpdateQueue,
-  //         instance,
-  //         newState,
-  //         newProps,
-  //         priorityLevel,
-  //       );
-  //     }
-  //   }
-
-  //   if (typeof instance.componentDidMount === 'function') {
-  //     workInProgress.effectTag |= Update;
-  //   }
-
-  //   instance.state = newState;
-
-  //   return true;
-  // }
-
-  // Invokes the update life-cycles and returns false if it shouldn't rerender.
-  function updateClassInstance(current, workInProgress, renderExpirationTime) {
+  function resumeMountClassInstance(workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
     var instance = workInProgress.stateNode;
     resetInputPointers(workInProgress, instance);
 
@@ -7122,7 +6723,7 @@ var ReactFiberClassComponent = function(
     if (
       (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
         typeof instance.componentWillReceiveProps === "function") &&
-      typeof workInProgress.type.getDerivedStateFromProps !== "function"
+      typeof ctor.getDerivedStateFromProps !== "function"
     ) {
       if (oldProps !== newProps || oldContext !== newContext) {
         callComponentWillReceiveProps(
@@ -7134,9 +6735,9 @@ var ReactFiberClassComponent = function(
       }
     }
 
-    var partialState = void 0;
+    var derivedStateFromProps = void 0;
     if (oldProps !== newProps) {
-      partialState = callGetDerivedStateFromProps(
+      derivedStateFromProps = callGetDerivedStateFromProps(
         workInProgress,
         instance,
         newProps
@@ -7147,27 +6748,55 @@ var ReactFiberClassComponent = function(
     var oldState = workInProgress.memoizedState;
     // TODO: Previous state can be null.
     var newState = void 0;
+    var derivedStateFromCatch = void 0;
     if (workInProgress.updateQueue !== null) {
       newState = processUpdateQueue(
-        current,
+        null,
         workInProgress,
         workInProgress.updateQueue,
         instance,
         newProps,
         renderExpirationTime
       );
+
+      var updateQueue = workInProgress.updateQueue;
+      if (
+        updateQueue !== null &&
+        updateQueue.capturedValues !== null &&
+        enableGetDerivedStateFromCatch &&
+        typeof ctor.getDerivedStateFromCatch === "function"
+      ) {
+        var capturedValues = updateQueue.capturedValues;
+        // Don't remove these from the update queue yet. We need them in
+        // finishClassComponent. Do the reset there.
+        // TODO: This is awkward. Refactor class components.
+        // updateQueue.capturedValues = null;
+        derivedStateFromCatch = callGetDerivedStateFromCatch(
+          ctor,
+          capturedValues
+        );
+      }
     } else {
       newState = oldState;
     }
 
-    if (partialState !== null && partialState !== undefined) {
+    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromProps
+          : Object.assign({}, newState, derivedStateFromProps);
+    }
+    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
       // So that multiple render passes do not enqueue multiple updates.
       // Instead, just synchronously merge the returned state into the instance.
       newState =
         newState === null || newState === undefined
-          ? partialState
-          : Object.assign({}, newState, partialState);
+          ? derivedStateFromCatch
+          : Object.assign({}, newState, derivedStateFromCatch);
     }
 
     if (
@@ -7181,13 +6810,8 @@ var ReactFiberClassComponent = function(
     ) {
       // If an update was already in progress, we should schedule an Update
       // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidUpdate === "function") {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Update;
-        }
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
       }
       return false;
     }
@@ -7207,7 +6831,7 @@ var ReactFiberClassComponent = function(
       if (
         (typeof instance.UNSAFE_componentWillUpdate === "function" ||
           typeof instance.componentWillUpdate === "function") &&
-        typeof workInProgress.type.getDerivedStateFromProps !== "function"
+        typeof ctor.getDerivedStateFromProps !== "function"
       ) {
         startPhaseTimer(workInProgress, "componentWillUpdate");
         if (typeof instance.componentWillUpdate === "function") {
@@ -7224,10 +6848,180 @@ var ReactFiberClassComponent = function(
     } else {
       // If an update was already in progress, we should schedule an Update
       // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidUpdate === "function") {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
+      }
+
+      // If shouldComponentUpdate returned false, we should still update the
+      // memoized props/state to indicate that this work can be reused.
+      memoizeProps(workInProgress, newProps);
+      memoizeState(workInProgress, newState);
+    }
+
+    // Update the existing instance's state, props, and context pointers even
+    // if shouldComponentUpdate returns false.
+    instance.props = newProps;
+    instance.state = newState;
+    instance.context = newContext;
+
+    return shouldUpdate;
+  }
+
+  // Invokes the update life-cycles and returns false if it shouldn't rerender.
+  function updateClassInstance(current, workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
+    var instance = workInProgress.stateNode;
+    resetInputPointers(workInProgress, instance);
+
+    var oldProps = workInProgress.memoizedProps;
+    var newProps = workInProgress.pendingProps;
+    var oldContext = instance.context;
+    var newUnmaskedContext = getUnmaskedContext(workInProgress);
+    var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+
+    // Note: During these life-cycles, instance.props/instance.state are what
+    // ever the previously attempted to render - not the "current". However,
+    // during componentDidUpdate we pass the "current" props.
+
+    // In order to support react-lifecycles-compat polyfilled components,
+    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    if (
+      (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
+        typeof instance.componentWillReceiveProps === "function") &&
+      typeof ctor.getDerivedStateFromProps !== "function"
+    ) {
+      if (oldProps !== newProps || oldContext !== newContext) {
+        callComponentWillReceiveProps(
+          workInProgress,
+          instance,
+          newProps,
+          newContext
+        );
+      }
+    }
+
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps
+      );
+    }
+
+    // Compute the next state using the memoized state and the update queue.
+    var oldState = workInProgress.memoizedState;
+    // TODO: Previous state can be null.
+    var newState = void 0;
+    var derivedStateFromCatch = void 0;
+    if (workInProgress.updateQueue !== null) {
+      newState = processUpdateQueue(
+        current,
+        workInProgress,
+        workInProgress.updateQueue,
+        instance,
+        newProps,
+        renderExpirationTime
+      );
+
+      var updateQueue = workInProgress.updateQueue;
+      if (
+        updateQueue !== null &&
+        updateQueue.capturedValues !== null &&
+        enableGetDerivedStateFromCatch &&
+        typeof ctor.getDerivedStateFromCatch === "function"
+      ) {
+        var capturedValues = updateQueue.capturedValues;
+        // Don't remove these from the update queue yet. We need them in
+        // finishClassComponent. Do the reset there.
+        // TODO: This is awkward. Refactor class components.
+        // updateQueue.capturedValues = null;
+        derivedStateFromCatch = callGetDerivedStateFromCatch(
+          ctor,
+          capturedValues
+        );
+      }
+    } else {
+      newState = oldState;
+    }
+
+    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromProps
+          : Object.assign({}, newState, derivedStateFromProps);
+    }
+    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromCatch
+          : Object.assign({}, newState, derivedStateFromCatch);
+    }
+
+    if (
+      oldProps === newProps &&
+      oldState === newState &&
+      !hasContextChanged() &&
+      !(
+        workInProgress.updateQueue !== null &&
+        workInProgress.updateQueue.hasForceUpdate
+      )
+    ) {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Update;
+        }
+      }
+      return false;
+    }
+
+    var shouldUpdate = checkShouldComponentUpdate(
+      workInProgress,
+      oldProps,
+      newProps,
+      oldState,
+      newState,
+      newContext
+    );
+
+    if (shouldUpdate) {
+      // In order to support react-lifecycles-compat polyfilled components,
+      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      if (
+        (typeof instance.UNSAFE_componentWillUpdate === "function" ||
+          typeof instance.componentWillUpdate === "function") &&
+        typeof ctor.getDerivedStateFromProps !== "function"
+      ) {
+        startPhaseTimer(workInProgress, "componentWillUpdate");
+        if (typeof instance.componentWillUpdate === "function") {
+          instance.componentWillUpdate(newProps, newState, newContext);
+        }
+        if (typeof instance.UNSAFE_componentWillUpdate === "function") {
+          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
+        }
+        stopPhaseTimer();
+      }
+      if (typeof instance.componentDidUpdate === "function") {
+        workInProgress.effectTag |= Update;
+      }
+    } else {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
         ) {
           workInProgress.effectTag |= Update;
         }
@@ -7253,7 +7047,7 @@ var ReactFiberClassComponent = function(
     callGetDerivedStateFromProps: callGetDerivedStateFromProps,
     constructClassInstance: constructClassInstance,
     mountClassInstance: mountClassInstance,
-    // resumeMountClassInstance,
+    resumeMountClassInstance: resumeMountClassInstance,
     updateClassInstance: updateClassInstance
   };
 };
@@ -8621,6 +8415,7 @@ var ReactFiberBeginWork = function(
       _ReactFiberClassCompo.callGetDerivedStateFromProps,
     constructClassInstance = _ReactFiberClassCompo.constructClassInstance,
     mountClassInstance = _ReactFiberClassCompo.mountClassInstance,
+    resumeMountClassInstance = _ReactFiberClassCompo.resumeMountClassInstance,
     updateClassInstance = _ReactFiberClassCompo.updateClassInstance;
 
   // TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
@@ -8745,19 +8540,20 @@ var ReactFiberBeginWork = function(
     // During mounting we don't know the child context yet as the instance doesn't exist.
     // We will invalidate the child context in finishClassComponent() right after rendering.
     var hasContext = pushContextProvider(workInProgress);
-
     var shouldUpdate = void 0;
     if (current === null) {
-      if (!workInProgress.stateNode) {
+      if (workInProgress.stateNode === null) {
         // In the initial pass we might need to construct the instance.
         constructClassInstance(workInProgress, workInProgress.pendingProps);
         mountClassInstance(workInProgress, renderExpirationTime);
 
         shouldUpdate = true;
       } else {
-        invariant(false, "Resuming work not yet implemented.");
         // In a resume, we'll already have an instance we can reuse.
-        // shouldUpdate = resumeMountClassInstance(workInProgress, renderExpirationTime);
+        shouldUpdate = resumeMountClassInstance(
+          workInProgress,
+          renderExpirationTime
+        );
       }
     } else {
       shouldUpdate = updateClassInstance(
@@ -8766,11 +8562,23 @@ var ReactFiberBeginWork = function(
         renderExpirationTime
       );
     }
+
+    // We processed the update queue inside updateClassInstance. It may have
+    // included some errors that were dispatched during the commit phase.
+    // TODO: Refactor class components so this is less awkward.
+    var didCaptureError = false;
+    var updateQueue = workInProgress.updateQueue;
+    if (updateQueue !== null && updateQueue.capturedValues !== null) {
+      shouldUpdate = true;
+      didCaptureError = true;
+    }
     return finishClassComponent(
       current,
       workInProgress,
       shouldUpdate,
-      hasContext
+      hasContext,
+      didCaptureError,
+      renderExpirationTime
     );
   }
 
@@ -8778,12 +8586,14 @@ var ReactFiberBeginWork = function(
     current,
     workInProgress,
     shouldUpdate,
-    hasContext
+    hasContext,
+    didCaptureError,
+    renderExpirationTime
   ) {
     // Refs should update even if shouldComponentUpdate returns false
     markRef(current, workInProgress);
 
-    if (!shouldUpdate) {
+    if (!shouldUpdate && !didCaptureError) {
       // Context providers should defer to sCU for rendering
       if (hasContext) {
         invalidateContextProvider(workInProgress, false);
@@ -8792,26 +8602,60 @@ var ReactFiberBeginWork = function(
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
 
+    var ctor = workInProgress.type;
     var instance = workInProgress.stateNode;
 
     // Rerender
     ReactCurrentOwner.current = workInProgress;
     var nextChildren = void 0;
-    {
-      ReactDebugCurrentFiber.setCurrentPhase("render");
-      nextChildren = instance.render();
-      if (
-        debugRenderPhaseSideEffects ||
-        (debugRenderPhaseSideEffectsForStrictMode &&
-          workInProgress.mode & StrictMode)
-      ) {
-        instance.render();
+    if (
+      didCaptureError &&
+      (!enableGetDerivedStateFromCatch ||
+        typeof ctor.getDerivedStateFromCatch !== "function")
+    ) {
+      // If we captured an error, but getDerivedStateFrom catch is not defined,
+      // unmount all the children. componentDidCatch will schedule an update to
+      // re-render a fallback. This is temporary until we migrate everyone to
+      // the new API.
+      // TODO: Warn in a future release.
+      nextChildren = null;
+    } else {
+      {
+        ReactDebugCurrentFiber.setCurrentPhase("render");
+        nextChildren = instance.render();
+        if (
+          debugRenderPhaseSideEffects ||
+          (debugRenderPhaseSideEffectsForStrictMode &&
+            workInProgress.mode & StrictMode)
+        ) {
+          instance.render();
+        }
+        ReactDebugCurrentFiber.setCurrentPhase(null);
       }
-      ReactDebugCurrentFiber.setCurrentPhase(null);
     }
+
     // React DevTools reads this flag.
     workInProgress.effectTag |= PerformedWork;
-    reconcileChildren(current, workInProgress, nextChildren);
+    if (didCaptureError) {
+      // If we're recovering from an error, reconcile twice: first to delete
+      // all the existing children.
+      reconcileChildrenAtExpirationTime(
+        current,
+        workInProgress,
+        null,
+        renderExpirationTime
+      );
+      workInProgress.child = null;
+      // Now we can continue reconciling like normal. This has the effect of
+      // remounting all children regardless of whether their their
+      // identity matches.
+    }
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
     // Memoize props and state using the values we just used to render.
     // TODO: Restructure so we never read values from the instance.
     memoizeState(workInProgress, instance.state);
@@ -8853,13 +8697,21 @@ var ReactFiberBeginWork = function(
         null,
         renderExpirationTime
       );
-      if (prevState === state) {
+      memoizeState(workInProgress, state);
+      updateQueue = workInProgress.updateQueue;
+
+      var element = void 0;
+      if (updateQueue !== null && updateQueue.capturedValues !== null) {
+        // There's an uncaught error. Unmount the whole root.
+        element = null;
+      } else if (prevState === state) {
         // If the state is the same as before, that's a bailout because we had
         // no work that expires at this time.
         resetHydrationState();
         return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      } else {
+        element = state.element;
       }
-      var element = state.element;
       var root = workInProgress.stateNode;
       if (
         (current === null || current.child === null) &&
@@ -8916,7 +8768,18 @@ var ReactFiberBeginWork = function(
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (memoizedProps === nextProps) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      var isHidden =
+        workInProgress.mode & AsyncMode &&
+        shouldDeprioritizeSubtree(type, nextProps);
+      if (isHidden) {
+        // Before bailing out, make sure we've deprioritized a hidden component.
+        workInProgress.expirationTime = Never;
+      }
+      if (!isHidden || renderExpirationTime !== Never) {
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      }
+      // If we're rendering a hidden node at hidden priority, don't bailout. The
+      // parent is complete, but the children may not be.
     }
 
     var nextChildren = nextProps.children;
@@ -8945,6 +8808,7 @@ var ReactFiberBeginWork = function(
       // Down-prioritize the children.
       workInProgress.expirationTime = Never;
       // Bailout and come back to this fiber later.
+      workInProgress.memoizedProps = nextProps;
       return null;
     }
 
@@ -9038,7 +8902,14 @@ var ReactFiberBeginWork = function(
       var hasContext = pushContextProvider(workInProgress);
       adoptClassInstance(workInProgress, value);
       mountClassInstance(workInProgress, renderExpirationTime);
-      return finishClassComponent(current, workInProgress, true, hasContext);
+      return finishClassComponent(
+        current,
+        workInProgress,
+        true,
+        hasContext,
+        false,
+        renderExpirationTime
+      );
     } else {
       // Proceed under the assumption that this is a functional component
       workInProgress.tag = FunctionalComponent;
@@ -9366,6 +9237,16 @@ var ReactFiberBeginWork = function(
     workInProgress.stateNode = observedBits;
 
     var render = newProps.children;
+
+    if (typeof render !== "function") {
+      invariant(
+        false,
+        "A context consumer was rendered with multiple children, or a child that isn't a function. " +
+          "A context consumer expects a single child that is a function. " +
+          "If you did pass a function, make sure there is no trailing or leading whitespace around it."
+      );
+    }
+
     var newChildren = render(newValue);
     reconcileChildren(current, workInProgress, newChildren);
     return workInProgress.child;
@@ -9527,70 +9408,8 @@ var ReactFiberBeginWork = function(
     }
   }
 
-  function beginFailedWork(current, workInProgress, renderExpirationTime) {
-    // Push context providers here to avoid a push/pop context mismatch.
-    switch (workInProgress.tag) {
-      case ClassComponent:
-        pushContextProvider(workInProgress);
-        break;
-      case HostRoot:
-        pushHostRootContext(workInProgress);
-        break;
-      default:
-        invariant(
-          false,
-          "Invalid type of work. This error is likely caused by a bug in React. " +
-            "Please file an issue."
-        );
-    }
-
-    // Add an error effect so we can handle the error during the commit phase
-    workInProgress.effectTag |= Err;
-
-    // This is a weird case where we do "resume" work — work that failed on
-    // our first attempt. Because we no longer have a notion of "progressed
-    // deletions," reset the child to the current child to make sure we delete
-    // it again. TODO: Find a better way to handle this, perhaps during a more
-    // general overhaul of error handling.
-    if (current === null) {
-      workInProgress.child = null;
-    } else if (workInProgress.child !== current.child) {
-      workInProgress.child = current.child;
-    }
-
-    if (
-      workInProgress.expirationTime === NoWork ||
-      workInProgress.expirationTime > renderExpirationTime
-    ) {
-      return bailoutOnLowPriority(current, workInProgress);
-    }
-
-    // If we don't bail out, we're going be recomputing our children so we need
-    // to drop our effect list.
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
-
-    // Unmount the current children as if the component rendered null
-    var nextChildren = null;
-    reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      nextChildren,
-      renderExpirationTime
-    );
-
-    if (workInProgress.tag === ClassComponent) {
-      var instance = workInProgress.stateNode;
-      workInProgress.memoizedProps = instance.props;
-      workInProgress.memoizedState = instance.state;
-    }
-
-    return workInProgress.child;
-  }
-
   return {
-    beginWork: beginWork,
-    beginFailedWork: beginFailedWork
+    beginWork: beginWork
   };
 };
 
@@ -9808,14 +9627,12 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
         } else {
           var container = portalOrRoot.containerInfo;
           var newChildSet = createContainerChildSet(container);
-          if (finalizeContainerChildren(container, newChildSet)) {
-            markUpdate(workInProgress);
-          }
-          portalOrRoot.pendingChildren = newChildSet;
           // If children might have changed, we have to add them all to the set.
           appendAllChildrenToContainer(newChildSet, workInProgress);
+          portalOrRoot.pendingChildren = newChildSet;
           // Schedule an update on the container to swap out the container.
           markUpdate(workInProgress);
+          finalizeContainerChildren(container, newChildSet);
         }
       };
       updateHostComponent = function(
@@ -9924,9 +9741,23 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
       case ClassComponent: {
         // We are leaving this subtree, so pop context if any.
         popContextProvider(workInProgress);
-        return null;
-      }
-      case HostRoot: {
+
+        // If this component caught an error, schedule an error log effect.
+        var instance = workInProgress.stateNode;
+        var updateQueue = workInProgress.updateQueue;
+        if (updateQueue !== null && updateQueue.capturedValues !== null) {
+          workInProgress.effectTag &= ~DidCapture;
+          if (typeof instance.componentDidCatch === "function") {
+            workInProgress.effectTag |= ErrLog;
+          } else {
+            // Normally we clear this in the commit phase, but since we did not
+            // schedule an effect, we need to reset it here.
+            updateQueue.capturedValues = null;
+          }
+        }
+        return null;
+      }
+      case HostRoot: {
         popHostContainer(workInProgress);
         popTopLevelContextObject(workInProgress);
         var fiberRoot = workInProgress.stateNode;
@@ -9934,7 +9765,6 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
           fiberRoot.context = fiberRoot.pendingContext;
           fiberRoot.pendingContext = null;
         }
-
         if (current === null || current.child === null) {
           // If we hydrated, pop so that we can delete any remaining children
           // that weren't hydrated.
@@ -9944,6 +9774,11 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
           workInProgress.effectTag &= ~Placement;
         }
         updateHostContainer(workInProgress);
+
+        var _updateQueue = workInProgress.updateQueue;
+        if (_updateQueue !== null && _updateQueue.capturedValues !== null) {
+          workInProgress.effectTag |= ErrLog;
+        }
         return null;
       }
       case HostComponent: {
@@ -9958,10 +9793,13 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
           // have newProps so we'll have to reuse them.
           // TODO: Split the update API as separate for the props vs. children.
           // Even better would be if children weren't special cased at all tho.
-          var instance = workInProgress.stateNode;
+          var _instance = workInProgress.stateNode;
           var currentHostContext = getHostContext();
+          // TODO: Experiencing an error where oldProps is null. Suggests a host
+          // component is hitting the resume path. Figure out why. Possibly
+          // related to `hidden`.
           var updatePayload = prepareUpdate(
-            instance,
+            _instance,
             type,
             oldProps,
             newProps,
@@ -10015,7 +9853,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
               markUpdate(workInProgress);
             }
           } else {
-            var _instance = createInstance(
+            var _instance2 = createInstance(
               type,
               newProps,
               rootContainerInstance,
@@ -10023,14 +9861,14 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
               workInProgress
             );
 
-            appendAllChildren(_instance, workInProgress);
+            appendAllChildren(_instance2, workInProgress);
 
             // Certain renderers require commit-time effects for initial mount.
             // (eg DOM renderer supports auto-focus for certain elements).
             // Make sure such renderers get scheduled for later work.
             if (
               finalizeInitialChildren(
-                _instance,
+                _instance2,
                 type,
                 newProps,
                 rootContainerInstance,
@@ -10039,7 +9877,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
             ) {
               markUpdate(workInProgress);
             }
-            workInProgress.stateNode = _instance;
+            workInProgress.stateNode = _instance2;
           }
 
           if (workInProgress.ref !== null) {
@@ -10134,11 +9972,233 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
   };
 };
 
+function createCapturedValue(value, source) {
+  // If the value is an error, call this function immediately after it is thrown
+  // so the stack is accurate.
+  return {
+    value: value,
+    source: source,
+    stack: getStackAddendumByWorkInProgressFiber(source)
+  };
+}
+
+var ReactFiberUnwindWork = function(
+  hostContext,
+  scheduleWork,
+  isAlreadyFailedLegacyErrorBoundary
+) {
+  var popHostContainer = hostContext.popHostContainer,
+    popHostContext = hostContext.popHostContext;
+
+  function throwException(returnFiber, sourceFiber, rawValue) {
+    // The source fiber did not complete.
+    sourceFiber.effectTag |= Incomplete;
+    // Its effect list is no longer valid.
+    sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+
+    var value = createCapturedValue(rawValue, sourceFiber);
+
+    var workInProgress = returnFiber;
+    do {
+      switch (workInProgress.tag) {
+        case HostRoot: {
+          // Uncaught error
+          var errorInfo = value;
+          ensureUpdateQueues(workInProgress);
+          var updateQueue = workInProgress.updateQueue;
+          updateQueue.capturedValues = [errorInfo];
+          workInProgress.effectTag |= ShouldCapture;
+          return;
+        }
+        case ClassComponent:
+          // Capture and retry
+          var ctor = workInProgress.type;
+          var _instance = workInProgress.stateNode;
+          if (
+            (workInProgress.effectTag & DidCapture) === NoEffect &&
+            ((typeof ctor.getDerivedStateFromCatch === "function" &&
+              enableGetDerivedStateFromCatch) ||
+              (_instance !== null &&
+                typeof _instance.componentDidCatch === "function" &&
+                !isAlreadyFailedLegacyErrorBoundary(_instance)))
+          ) {
+            ensureUpdateQueues(workInProgress);
+            var _updateQueue = workInProgress.updateQueue;
+            var capturedValues = _updateQueue.capturedValues;
+            if (capturedValues === null) {
+              _updateQueue.capturedValues = [value];
+            } else {
+              capturedValues.push(value);
+            }
+            workInProgress.effectTag |= ShouldCapture;
+            return;
+          }
+          break;
+        default:
+          break;
+      }
+      workInProgress = workInProgress["return"];
+    } while (workInProgress !== null);
+  }
+
+  function unwindWork(workInProgress) {
+    switch (workInProgress.tag) {
+      case ClassComponent: {
+        popContextProvider(workInProgress);
+        var effectTag = workInProgress.effectTag;
+        if (effectTag & ShouldCapture) {
+          workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
+        }
+        return null;
+      }
+      case HostRoot: {
+        popHostContainer(workInProgress);
+        popTopLevelContextObject(workInProgress);
+        var _effectTag = workInProgress.effectTag;
+        if (_effectTag & ShouldCapture) {
+          workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
+        }
+        return null;
+      }
+      case HostComponent: {
+        popHostContext(workInProgress);
+        return null;
+      }
+      case HostPortal:
+        popHostContainer(workInProgress);
+        return null;
+      case ContextProvider:
+        popProvider(workInProgress);
+        return null;
+      default:
+        return null;
+    }
+  }
+  return {
+    throwException: throwException,
+    unwindWork: unwindWork
+  };
+};
+
+// This module is forked in different environments.
+// By default, return `true` to log errors to the console.
+// Forks can return `false` if this isn't desirable.
+function showErrorDialog(capturedError) {
+  return true;
+}
+
+function logCapturedError(capturedError) {
+  var logError = showErrorDialog(capturedError);
+
+  // Allow injected showErrorDialog() to prevent default console.error logging.
+  // This enables renderers like ReactNative to better manage redbox behavior.
+  if (logError === false) {
+    return;
+  }
+
+  var error = capturedError.error;
+  var suppressLogging = error && error.suppressReactErrorLogging;
+  if (suppressLogging) {
+    return;
+  }
+
+  {
+    var componentName = capturedError.componentName,
+      componentStack = capturedError.componentStack,
+      errorBoundaryName = capturedError.errorBoundaryName,
+      errorBoundaryFound = capturedError.errorBoundaryFound,
+      willRetry = capturedError.willRetry;
+
+    var componentNameMessage = componentName
+      ? "The above error occurred in the <" + componentName + "> component:"
+      : "The above error occurred in one of your React components:";
+
+    var errorBoundaryMessage = void 0;
+    // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
+    if (errorBoundaryFound && errorBoundaryName) {
+      if (willRetry) {
+        errorBoundaryMessage =
+          "React will try to recreate this component tree from scratch " +
+          ("using the error boundary you provided, " + errorBoundaryName + ".");
+      } else {
+        errorBoundaryMessage =
+          "This error was initially handled by the error boundary " +
+          errorBoundaryName +
+          ".\n" +
+          "Recreating the tree from scratch failed so React will unmount the tree.";
+      }
+    } else {
+      errorBoundaryMessage =
+        "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
+        "Visit https://fb.me/react-error-boundaries to learn more about error boundaries.";
+    }
+    var combinedMessage =
+      "" +
+      componentNameMessage +
+      componentStack +
+      "\n\n" +
+      ("" + errorBoundaryMessage);
+
+    // In development, we provide our own message with just the component stack.
+    // We don't include the original error message and JS stack because the browser
+    // has already printed it. Even if the application swallows the error, it is still
+    // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+    console.error(combinedMessage);
+  }
+}
+
 var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
 var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
 
-var ReactFiberCommitWork = function(config, captureError) {
+function logError(boundary, errorInfo) {
+  var source = errorInfo.source;
+  var stack = errorInfo.stack;
+  if (stack === null) {
+    stack = getStackAddendumByWorkInProgressFiber(source);
+  }
+
+  var capturedError = {
+    componentName: source !== null ? getComponentName(source) : null,
+    error: errorInfo.value,
+    errorBoundary: boundary,
+    componentStack: stack !== null ? stack : "",
+    errorBoundaryName: null,
+    errorBoundaryFound: false,
+    willRetry: false
+  };
+
+  if (boundary !== null) {
+    capturedError.errorBoundaryName = getComponentName(boundary);
+    capturedError.errorBoundaryFound = capturedError.willRetry =
+      boundary.tag === ClassComponent;
+  } else {
+    capturedError.errorBoundaryName = null;
+    capturedError.errorBoundaryFound = capturedError.willRetry = false;
+  }
+
+  try {
+    logCapturedError(capturedError);
+  } catch (e) {
+    // Prevent cycle if logCapturedError() throws.
+    // A cycle may still occur if logCapturedError renders a component that throws.
+    var suppressLogging = e && e.suppressReactErrorLogging;
+    if (!suppressLogging) {
+      console.error(e);
+    }
+  }
+}
+
+var ReactFiberCommitWork = function(
+  config,
+  captureError,
+  scheduleWork,
+  computeExpirationForFiber,
+  markLegacyErrorBoundaryAsFailed,
+  recalculateCurrentTime
+) {
   var getPublicInstance = config.getPublicInstance,
     mutation = config.mutation,
     persistence = config.persistence;
@@ -10185,53 +10245,59 @@ var ReactFiberCommitWork = function(config, captureError) {
     }
   }
 
-  function commitLifeCycles(current, finishedWork) {
+  function commitLifeCycles(
+    finishedRoot,
+    current,
+    finishedWork,
+    currentTime,
+    committedExpirationTime
+  ) {
     switch (finishedWork.tag) {
       case ClassComponent: {
-        var instance = finishedWork.stateNode;
+        var _instance = finishedWork.stateNode;
         if (finishedWork.effectTag & Update) {
           if (current === null) {
             startPhaseTimer(finishedWork, "componentDidMount");
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            instance.componentDidMount();
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            _instance.componentDidMount();
             stopPhaseTimer();
           } else {
             var prevProps = current.memoizedProps;
             var prevState = current.memoizedState;
             startPhaseTimer(finishedWork, "componentDidUpdate");
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            instance.componentDidUpdate(prevProps, prevState);
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            _instance.componentDidUpdate(prevProps, prevState);
             stopPhaseTimer();
           }
         }
         var updateQueue = finishedWork.updateQueue;
         if (updateQueue !== null) {
-          commitCallbacks(updateQueue, instance);
+          commitCallbacks(updateQueue, _instance);
         }
         return;
       }
       case HostRoot: {
         var _updateQueue = finishedWork.updateQueue;
         if (_updateQueue !== null) {
-          var _instance = null;
+          var _instance2 = null;
           if (finishedWork.child !== null) {
             switch (finishedWork.child.tag) {
               case HostComponent:
-                _instance = getPublicInstance(finishedWork.child.stateNode);
+                _instance2 = getPublicInstance(finishedWork.child.stateNode);
                 break;
               case ClassComponent:
-                _instance = finishedWork.child.stateNode;
+                _instance2 = finishedWork.child.stateNode;
                 break;
             }
           }
-          commitCallbacks(_updateQueue, _instance);
+          commitCallbacks(_updateQueue, _instance2);
         }
         return;
       }
       case HostComponent: {
-        var _instance2 = finishedWork.stateNode;
+        var _instance3 = finishedWork.stateNode;
 
         // Renderers may schedule work to be done after host components are mounted
         // (eg DOM renderer may schedule auto-focus for inputs and form controls).
@@ -10240,7 +10306,7 @@ var ReactFiberCommitWork = function(config, captureError) {
         if (current === null && finishedWork.effectTag & Update) {
           var type = finishedWork.type;
           var props = finishedWork.memoizedProps;
-          commitMount(_instance2, type, props, finishedWork);
+          commitMount(_instance3, type, props, finishedWork);
         }
 
         return;
@@ -10263,17 +10329,78 @@ var ReactFiberCommitWork = function(config, captureError) {
     }
   }
 
+  function commitErrorLogging(finishedWork, onUncaughtError) {
+    switch (finishedWork.tag) {
+      case ClassComponent:
+        {
+          var ctor = finishedWork.type;
+          var _instance4 = finishedWork.stateNode;
+          var updateQueue = finishedWork.updateQueue;
+          invariant(
+            updateQueue !== null && updateQueue.capturedValues !== null,
+            "An error logging effect should not have been scheduled if no errors " +
+              "were captured. This error is likely caused by a bug in React. " +
+              "Please file an issue."
+          );
+          var capturedErrors = updateQueue.capturedValues;
+          updateQueue.capturedValues = null;
+
+          if (typeof ctor.getDerivedStateFromCatch !== "function") {
+            // To preserve the preexisting retry behavior of error boundaries,
+            // we keep track of which ones already failed during this batch.
+            // This gets reset before we yield back to the browser.
+            // TODO: Warn in strict mode if getDerivedStateFromCatch is
+            // not defined.
+            markLegacyErrorBoundaryAsFailed(_instance4);
+          }
+
+          _instance4.props = finishedWork.memoizedProps;
+          _instance4.state = finishedWork.memoizedState;
+          for (var i = 0; i < capturedErrors.length; i++) {
+            var errorInfo = capturedErrors[i];
+            var _error = errorInfo.value;
+            logError(finishedWork, errorInfo);
+            _instance4.componentDidCatch(_error);
+          }
+        }
+        break;
+      case HostRoot: {
+        var _updateQueue2 = finishedWork.updateQueue;
+        invariant(
+          _updateQueue2 !== null && _updateQueue2.capturedValues !== null,
+          "An error logging effect should not have been scheduled if no errors " +
+            "were captured. This error is likely caused by a bug in React. " +
+            "Please file an issue."
+        );
+        var _capturedErrors = _updateQueue2.capturedValues;
+        _updateQueue2.capturedValues = null;
+        for (var _i = 0; _i < _capturedErrors.length; _i++) {
+          var _errorInfo = _capturedErrors[_i];
+          logError(finishedWork, _errorInfo);
+          onUncaughtError(_errorInfo.value);
+        }
+        break;
+      }
+      default:
+        invariant(
+          false,
+          "This unit of work tag cannot capture errors.  This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
+    }
+  }
+
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (ref !== null) {
-      var instance = finishedWork.stateNode;
+      var _instance5 = finishedWork.stateNode;
       var instanceToUse = void 0;
       switch (finishedWork.tag) {
         case HostComponent:
-          instanceToUse = getPublicInstance(instance);
+          instanceToUse = getPublicInstance(_instance5);
           break;
         default:
-          instanceToUse = instance;
+          instanceToUse = _instance5;
       }
       if (typeof ref === "function") {
         ref(instanceToUse);
@@ -10305,9 +10432,9 @@ var ReactFiberCommitWork = function(config, captureError) {
     switch (current.tag) {
       case ClassComponent: {
         safelyDetachRef(current);
-        var instance = current.stateNode;
-        if (typeof instance.componentWillUnmount === "function") {
-          safelyCallComponentWillUnmount(current, instance);
+        var _instance6 = current.stateNode;
+        if (typeof _instance6.componentWillUnmount === "function") {
+          safelyCallComponentWillUnmount(current, _instance6);
         }
         return;
       }
@@ -10444,6 +10571,7 @@ var ReactFiberCommitWork = function(config, captureError) {
         },
 
         commitLifeCycles: commitLifeCycles,
+        commitErrorLogging: commitErrorLogging,
         commitAttachRef: commitAttachRef,
         commitDetachRef: commitDetachRef
       };
@@ -10701,8 +10829,8 @@ var ReactFiberCommitWork = function(config, captureError) {
         return;
       }
       case HostComponent: {
-        var instance = finishedWork.stateNode;
-        if (instance != null) {
+        var _instance7 = finishedWork.stateNode;
+        if (_instance7 != null) {
           // Commit the work prepared earlier.
           var newProps = finishedWork.memoizedProps;
           // For hydration we reuse the update path but we treat the oldProps
@@ -10715,7 +10843,7 @@ var ReactFiberCommitWork = function(config, captureError) {
           finishedWork.updateQueue = null;
           if (updatePayload !== null) {
             commitUpdate(
-              instance,
+              _instance7,
               updatePayload,
               type,
               oldProps,
@@ -10765,6 +10893,7 @@ var ReactFiberCommitWork = function(config, captureError) {
       commitDeletion: commitDeletion,
       commitWork: commitWork,
       commitLifeCycles: commitLifeCycles,
+      commitErrorLogging: commitErrorLogging,
       commitAttachRef: commitAttachRef,
       commitDetachRef: commitDetachRef
     };
@@ -11230,73 +11359,6 @@ var ReactFiberInstrumentation = {
 
 var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
 
-// This module is forked in different environments.
-// By default, return `true` to log errors to the console.
-// Forks can return `false` if this isn't desirable.
-function showErrorDialog(capturedError) {
-  return true;
-}
-
-function logCapturedError(capturedError) {
-  var logError = showErrorDialog(capturedError);
-
-  // Allow injected showErrorDialog() to prevent default console.error logging.
-  // This enables renderers like ReactNative to better manage redbox behavior.
-  if (logError === false) {
-    return;
-  }
-
-  var error = capturedError.error;
-  var suppressLogging = error && error.suppressReactErrorLogging;
-  if (suppressLogging) {
-    return;
-  }
-
-  {
-    var componentName = capturedError.componentName,
-      componentStack = capturedError.componentStack,
-      errorBoundaryName = capturedError.errorBoundaryName,
-      errorBoundaryFound = capturedError.errorBoundaryFound,
-      willRetry = capturedError.willRetry;
-
-    var componentNameMessage = componentName
-      ? "The above error occurred in the <" + componentName + "> component:"
-      : "The above error occurred in one of your React components:";
-
-    var errorBoundaryMessage = void 0;
-    // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
-    if (errorBoundaryFound && errorBoundaryName) {
-      if (willRetry) {
-        errorBoundaryMessage =
-          "React will try to recreate this component tree from scratch " +
-          ("using the error boundary you provided, " + errorBoundaryName + ".");
-      } else {
-        errorBoundaryMessage =
-          "This error was initially handled by the error boundary " +
-          errorBoundaryName +
-          ".\n" +
-          "Recreating the tree from scratch failed so React will unmount the tree.";
-      }
-    } else {
-      errorBoundaryMessage =
-        "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
-        "Visit https://fb.me/react-error-boundaries to learn more about error boundaries.";
-    }
-    var combinedMessage =
-      "" +
-      componentNameMessage +
-      componentStack +
-      "\n\n" +
-      ("" + errorBoundaryMessage);
-
-    // In development, we provide our own message with just the component stack.
-    // We don't include the original error message and JS stack because the browser
-    // has already printed it. Even if the application swallows the error, it is still
-    // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
-    console.error(combinedMessage);
-  }
-}
-
 var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError = ReactErrorUtils.hasCaughtError;
 var clearCaughtError = ReactErrorUtils.clearCaughtError;
@@ -11358,10 +11420,11 @@ var warnAboutInvalidUpdates = void 0;
 
 var ReactFiberScheduler = function(config) {
   var hostContext = ReactFiberHostContext(config);
+  var popHostContext = hostContext.popHostContext,
+    popHostContainer = hostContext.popHostContainer;
+
   var hydrationContext = ReactFiberHydrationContext(config);
-  var popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext,
-    resetHostContainer = hostContext.resetHostContainer;
+  var resetHostContainer = hostContext.resetHostContainer;
 
   var _ReactFiberBeginWork = ReactFiberBeginWork(
       config,
@@ -11370,8 +11433,7 @@ var ReactFiberScheduler = function(config) {
       scheduleWork,
       computeExpirationForFiber
     ),
-    beginWork = _ReactFiberBeginWork.beginWork,
-    beginFailedWork = _ReactFiberBeginWork.beginFailedWork;
+    beginWork = _ReactFiberBeginWork.beginWork;
 
   var _ReactFiberCompleteWo = ReactFiberCompleteWork(
       config,
@@ -11380,14 +11442,30 @@ var ReactFiberScheduler = function(config) {
     ),
     completeWork = _ReactFiberCompleteWo.completeWork;
 
-  var _ReactFiberCommitWork = ReactFiberCommitWork(config, captureError),
-    commitResetTextContent = _ReactFiberCommitWork.commitResetTextContent,
-    commitPlacement = _ReactFiberCommitWork.commitPlacement,
-    commitDeletion = _ReactFiberCommitWork.commitDeletion,
-    commitWork = _ReactFiberCommitWork.commitWork,
-    commitLifeCycles = _ReactFiberCommitWork.commitLifeCycles,
-    commitAttachRef = _ReactFiberCommitWork.commitAttachRef,
-    commitDetachRef = _ReactFiberCommitWork.commitDetachRef;
+  var _ReactFiberUnwindWork = ReactFiberUnwindWork(
+      hostContext,
+      scheduleWork,
+      isAlreadyFailedLegacyErrorBoundary
+    ),
+    throwException = _ReactFiberUnwindWork.throwException,
+    unwindWork = _ReactFiberUnwindWork.unwindWork;
+
+  var _ReactFiberCommitWork = ReactFiberCommitWork(
+      config,
+      onCommitPhaseError,
+      scheduleWork,
+      computeExpirationForFiber,
+      markLegacyErrorBoundaryAsFailed,
+      recalculateCurrentTime
+    ),
+    commitResetTextContent = _ReactFiberCommitWork.commitResetTextContent,
+    commitPlacement = _ReactFiberCommitWork.commitPlacement,
+    commitDeletion = _ReactFiberCommitWork.commitDeletion,
+    commitWork = _ReactFiberCommitWork.commitWork,
+    commitLifeCycles = _ReactFiberCommitWork.commitLifeCycles,
+    commitErrorLogging = _ReactFiberCommitWork.commitErrorLogging,
+    commitAttachRef = _ReactFiberCommitWork.commitAttachRef,
+    commitDetachRef = _ReactFiberCommitWork.commitDetachRef;
 
   var now = config.now,
     scheduleDeferredCallback = config.scheduleDeferredCallback,
@@ -11397,8 +11475,9 @@ var ReactFiberScheduler = function(config) {
 
   // Represents the current time in ms.
 
-  var startTime = now();
+  var originalStartTimeMs = now();
   var mostRecentCurrentTime = msToExpirationTime(0);
+  var mostRecentCurrentTimeMs = originalStartTimeMs;
 
   // Used to ensure computeUniqueAsyncExpiration is monotonically increases.
   var lastUniqueAsyncExpiration = 0;
@@ -11419,32 +11498,70 @@ var ReactFiberScheduler = function(config) {
   // The next fiber with an effect that we're currently committing.
   var nextEffect = null;
 
-  // Keep track of which fibers have captured an error that need to be handled.
-  // Work is removed from this collection after componentDidCatch is called.
-  var capturedErrors = null;
-  // Keep track of which fibers have failed during the current batch of work.
-  // This is a different set than capturedErrors, because it is not reset until
-  // the end of the batch. This is needed to propagate errors correctly if a
-  // subtree fails more than once.
-  var failedBoundaries = null;
-  // Error boundaries that captured an error during the current commit.
-  var commitPhaseBoundaries = null;
-  var firstUncaughtError = null;
-  var didFatal = false;
-
   var isCommitting = false;
-  var isUnmounting = false;
+
+  var isRootReadyForCommit = false;
+
+  var legacyErrorBoundariesThatAlreadyFailed = null;
 
   // Used for performance tracking.
   var interruptedBy = null;
 
+  var stashedWorkInProgressProperties = void 0;
+  var replayUnitOfWork = void 0;
+  if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+    stashedWorkInProgressProperties = null;
+    replayUnitOfWork = function(failedUnitOfWork, isAsync) {
+      // Retore the original state of the work-in-progress
+      Object.assign(failedUnitOfWork, stashedWorkInProgressProperties);
+      switch (failedUnitOfWork.tag) {
+        case HostRoot:
+          popHostContainer(failedUnitOfWork);
+          popTopLevelContextObject(failedUnitOfWork);
+          break;
+        case HostComponent:
+          popHostContext(failedUnitOfWork);
+          break;
+        case ClassComponent:
+          popContextProvider(failedUnitOfWork);
+          break;
+        case HostPortal:
+          popHostContainer(failedUnitOfWork);
+          break;
+        case ContextProvider:
+          popProvider(failedUnitOfWork);
+          break;
+      }
+      // Replay the begin phase.
+      invokeGuardedCallback$2(null, workLoop, null, isAsync);
+      if (hasCaughtError()) {
+        clearCaughtError();
+      } else {
+        // This should be unreachable because the render phase is
+        // idempotent
+      }
+    };
+  }
+
   function resetContextStack() {
     // Reset the stack
     reset();
     // Reset the cursors
     resetContext();
-    resetProviderStack();
     resetHostContainer();
+
+    // TODO: Unify new context implementation with other stacks
+    resetProviderStack();
+
+    {
+      ReactStrictModeWarnings.discardPendingWarnings();
+    }
+
+    nextRoot = null;
+    nextRenderExpirationTime = NoWork;
+    nextUnitOfWork = null;
+
+    isRootReadyForCommit = false;
   }
 
   function commitAllHostEffects() {
@@ -11470,8 +11587,7 @@ var ReactFiberScheduler = function(config) {
       // updates, and deletions. To avoid needing to add a case for every
       // possible bitmap value, we remove the secondary effects from the
       // effect tag and switch on that value.
-      var primaryEffectTag =
-        effectTag & ~(Callback | Err | ContentReset | Ref | PerformedWork);
+      var primaryEffectTag = effectTag & (Placement | Update | Deletion);
       switch (primaryEffectTag) {
         case Placement: {
           commitPlacement(nextEffect);
@@ -11501,9 +11617,7 @@ var ReactFiberScheduler = function(config) {
           break;
         }
         case Deletion: {
-          isUnmounting = true;
           commitDeletion(nextEffect);
-          isUnmounting = false;
           break;
         }
       }
@@ -11515,7 +11629,11 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
-  function commitAllLifeCycles() {
+  function commitAllLifeCycles(
+    finishedRoot,
+    currentTime,
+    committedExpirationTime
+  ) {
     {
       ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings();
 
@@ -11523,24 +11641,28 @@ var ReactFiberScheduler = function(config) {
         ReactStrictModeWarnings.flushPendingDeprecationWarnings();
       }
     }
-
     while (nextEffect !== null) {
       var effectTag = nextEffect.effectTag;
 
       if (effectTag & (Update | Callback)) {
         recordEffect();
         var current = nextEffect.alternate;
-        commitLifeCycles(current, nextEffect);
+        commitLifeCycles(
+          finishedRoot,
+          current,
+          nextEffect,
+          currentTime,
+          committedExpirationTime
+        );
       }
 
-      if (effectTag & Ref) {
-        recordEffect();
-        commitAttachRef(nextEffect);
+      if (effectTag & ErrLog) {
+        commitErrorLogging(nextEffect, onUncaughtError);
       }
 
-      if (effectTag & Err) {
+      if (effectTag & Ref) {
         recordEffect();
-        commitErrorHandling(nextEffect);
+        commitAttachRef(nextEffect);
       }
 
       var next = nextEffect.nextEffect;
@@ -11555,11 +11677,22 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
+  function isAlreadyFailedLegacyErrorBoundary(instance) {
+    return (
+      legacyErrorBoundariesThatAlreadyFailed !== null &&
+      legacyErrorBoundariesThatAlreadyFailed.has(instance)
+    );
+  }
+
+  function markLegacyErrorBoundaryAsFailed(instance) {
+    if (legacyErrorBoundariesThatAlreadyFailed === null) {
+      legacyErrorBoundariesThatAlreadyFailed = new Set([instance]);
+    } else {
+      legacyErrorBoundariesThatAlreadyFailed.add(instance);
+    }
+  }
+
   function commitRoot(finishedWork) {
-    // We keep track of this so that captureError can collect any boundaries
-    // that capture an error during the commit phase. The reason these aren't
-    // local to this function is because errors that occur during cWU are
-    // captured elsewhere, to prevent the unmount from being interrupted.
     isWorking = true;
     isCommitting = true;
     startCommitTimer();
@@ -11571,7 +11704,15 @@ var ReactFiberScheduler = function(config) {
         "related to the return field. This error is likely caused by a bug " +
         "in React. Please file an issue."
     );
-    root.isReadyForCommit = false;
+    var committedExpirationTime = root.pendingCommitExpirationTime;
+    invariant(
+      committedExpirationTime !== NoWork,
+      "Cannot commit an incomplete root. This error is likely caused by a " +
+        "bug in React. Please file an issue."
+    );
+    root.pendingCommitExpirationTime = NoWork;
+
+    var currentTime = recalculateCurrentTime();
 
     // Reset this to null before calling lifecycles
     ReactCurrentOwner.current = null;
@@ -11602,12 +11743,12 @@ var ReactFiberScheduler = function(config) {
     startCommitHostEffectsTimer();
     while (nextEffect !== null) {
       var didError = false;
-      var _error = void 0;
+      var error = void 0;
       {
         invokeGuardedCallback$2(null, commitAllHostEffects, null);
         if (hasCaughtError()) {
           didError = true;
-          _error = clearCaughtError();
+          error = clearCaughtError();
         }
       }
       if (didError) {
@@ -11616,7 +11757,7 @@ var ReactFiberScheduler = function(config) {
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        captureError(nextEffect, _error);
+        onCommitPhaseError(nextEffect, error);
         // Clean-up
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
@@ -11641,12 +11782,19 @@ var ReactFiberScheduler = function(config) {
     startCommitLifeCyclesTimer();
     while (nextEffect !== null) {
       var _didError = false;
-      var _error2 = void 0;
+      var _error = void 0;
       {
-        invokeGuardedCallback$2(null, commitAllLifeCycles, null);
+        invokeGuardedCallback$2(
+          null,
+          commitAllLifeCycles,
+          null,
+          root,
+          currentTime,
+          committedExpirationTime
+        );
         if (hasCaughtError()) {
           _didError = true;
-          _error2 = clearCaughtError();
+          _error = clearCaughtError();
         }
       }
       if (_didError) {
@@ -11655,7 +11803,7 @@ var ReactFiberScheduler = function(config) {
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        captureError(nextEffect, _error2);
+        onCommitPhaseError(nextEffect, _error);
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
         }
@@ -11673,26 +11821,12 @@ var ReactFiberScheduler = function(config) {
       ReactFiberInstrumentation_1.debugTool.onCommitWork(finishedWork);
     }
 
-    // If we caught any errors during this commit, schedule their boundaries
-    // to update.
-    if (commitPhaseBoundaries) {
-      commitPhaseBoundaries.forEach(scheduleErrorRecovery);
-      commitPhaseBoundaries = null;
-    }
-
-    if (firstUncaughtError !== null) {
-      var _error3 = firstUncaughtError;
-      firstUncaughtError = null;
-      onUncaughtError(_error3);
-    }
-
     var remainingTime = root.current.expirationTime;
-
     if (remainingTime === NoWork) {
-      capturedErrors = null;
-      failedBoundaries = null;
+      // If there's no remaining work, we can clear the set of already failed
+      // error boundaries.
+      legacyErrorBoundariesThatAlreadyFailed = null;
     }
-
     return remainingTime;
   }
 
@@ -11724,6 +11858,9 @@ var ReactFiberScheduler = function(config) {
   }
 
   function completeUnitOfWork(workInProgress) {
+    // Attempt to complete the current unit of work, then move to the
+    // next sibling. If there are no more siblings, return to the
+    // parent fiber.
     while (true) {
       // The current, flushed, state of this fiber is the alternate.
       // Ideally nothing should rely on this, but relying on it here
@@ -11733,80 +11870,140 @@ var ReactFiberScheduler = function(config) {
       {
         ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
       }
-      var next = completeWork(
-        current,
-        workInProgress,
-        nextRenderExpirationTime
-      );
-      {
-        ReactDebugCurrentFiber.resetCurrentFiber();
-      }
 
       var returnFiber = workInProgress["return"];
       var siblingFiber = workInProgress.sibling;
 
-      resetExpirationTime(workInProgress, nextRenderExpirationTime);
-
-      if (next !== null) {
+      if ((workInProgress.effectTag & Incomplete) === NoEffect) {
+        // This fiber completed.
+        var next = completeWork(
+          current,
+          workInProgress,
+          nextRenderExpirationTime
+        );
         stopWorkTimer(workInProgress);
+        resetExpirationTime(workInProgress, nextRenderExpirationTime);
+        {
+          ReactDebugCurrentFiber.resetCurrentFiber();
+        }
+
+        if (next !== null) {
+          stopWorkTimer(workInProgress);
+          if (true && ReactFiberInstrumentation_1.debugTool) {
+            ReactFiberInstrumentation_1.debugTool.onCompleteWork(
+              workInProgress
+            );
+          }
+          // If completing this work spawned new work, do that next. We'll come
+          // back here again.
+          return next;
+        }
+
+        if (
+          returnFiber !== null &&
+          // Do not append effects to parents if a sibling failed to complete
+          (returnFiber.effectTag & Incomplete) === NoEffect
+        ) {
+          // Append all the effects of the subtree and this fiber onto the effect
+          // list of the parent. The completion order of the children affects the
+          // side-effect order.
+          if (returnFiber.firstEffect === null) {
+            returnFiber.firstEffect = workInProgress.firstEffect;
+          }
+          if (workInProgress.lastEffect !== null) {
+            if (returnFiber.lastEffect !== null) {
+              returnFiber.lastEffect.nextEffect = workInProgress.firstEffect;
+            }
+            returnFiber.lastEffect = workInProgress.lastEffect;
+          }
+
+          // If this fiber had side-effects, we append it AFTER the children's
+          // side-effects. We can perform certain side-effects earlier if
+          // needed, by doing multiple passes over the effect list. We don't want
+          // to schedule our own side-effect on our own list because if end up
+          // reusing children we'll schedule this effect onto itself since we're
+          // at the end.
+          var effectTag = workInProgress.effectTag;
+          // Skip both NoWork and PerformedWork tags when creating the effect list.
+          // PerformedWork effect is read by React DevTools but shouldn't be committed.
+          if (effectTag > PerformedWork) {
+            if (returnFiber.lastEffect !== null) {
+              returnFiber.lastEffect.nextEffect = workInProgress;
+            } else {
+              returnFiber.firstEffect = workInProgress;
+            }
+            returnFiber.lastEffect = workInProgress;
+          }
+        }
+
         if (true && ReactFiberInstrumentation_1.debugTool) {
           ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
         }
-        // If completing this work spawned new work, do that next. We'll come
-        // back here again.
-        return next;
-      }
 
-      if (returnFiber !== null) {
-        // Append all the effects of the subtree and this fiber onto the effect
-        // list of the parent. The completion order of the children affects the
-        // side-effect order.
-        if (returnFiber.firstEffect === null) {
-          returnFiber.firstEffect = workInProgress.firstEffect;
+        if (siblingFiber !== null) {
+          // If there is more work to do in this returnFiber, do that next.
+          return siblingFiber;
+        } else if (returnFiber !== null) {
+          // If there's no more work in this returnFiber. Complete the returnFiber.
+          workInProgress = returnFiber;
+          continue;
+        } else {
+          // We've reached the root.
+          isRootReadyForCommit = true;
+          return null;
         }
-        if (workInProgress.lastEffect !== null) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = workInProgress.firstEffect;
-          }
-          returnFiber.lastEffect = workInProgress.lastEffect;
+      } else {
+        // This fiber did not complete because something threw. Pop values off
+        // the stack without entering the complete phase. If this is a boundary,
+        // capture values if possible.
+        var _next = unwindWork(workInProgress);
+        // Because this fiber did not complete, don't reset its expiration time.
+        if (workInProgress.effectTag & DidCapture) {
+          // Restarting an error boundary
+          stopFailedWorkTimer(workInProgress);
+        } else {
+          stopWorkTimer(workInProgress);
         }
 
-        // If this fiber had side-effects, we append it AFTER the children's
-        // side-effects. We can perform certain side-effects earlier if
-        // needed, by doing multiple passes over the effect list. We don't want
-        // to schedule our own side-effect on our own list because if end up
-        // reusing children we'll schedule this effect onto itself since we're
-        // at the end.
-        var effectTag = workInProgress.effectTag;
-        // Skip both NoWork and PerformedWork tags when creating the effect list.
-        // PerformedWork effect is read by React DevTools but shouldn't be committed.
-        if (effectTag > PerformedWork) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = workInProgress;
-          } else {
-            returnFiber.firstEffect = workInProgress;
+        {
+          ReactDebugCurrentFiber.resetCurrentFiber();
+        }
+
+        if (_next !== null) {
+          stopWorkTimer(workInProgress);
+          if (true && ReactFiberInstrumentation_1.debugTool) {
+            ReactFiberInstrumentation_1.debugTool.onCompleteWork(
+              workInProgress
+            );
           }
-          returnFiber.lastEffect = workInProgress;
+          // If completing this work spawned new work, do that next. We'll come
+          // back here again.
+          // Since we're restarting, remove anything that is not a host effect
+          // from the effect tag.
+          _next.effectTag &= HostEffectMask;
+          return _next;
         }
-      }
 
-      stopWorkTimer(workInProgress);
-      if (true && ReactFiberInstrumentation_1.debugTool) {
-        ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
-      }
+        if (returnFiber !== null) {
+          // Mark the parent fiber as incomplete and clear its effect list.
+          returnFiber.firstEffect = returnFiber.lastEffect = null;
+          returnFiber.effectTag |= Incomplete;
+        }
 
-      if (siblingFiber !== null) {
-        // If there is more work to do in this returnFiber, do that next.
-        return siblingFiber;
-      } else if (returnFiber !== null) {
-        // If there's no more work in this returnFiber. Complete the returnFiber.
-        workInProgress = returnFiber;
-        continue;
-      } else {
-        // We've reached the root.
-        var root = workInProgress.stateNode;
-        root.isReadyForCommit = true;
-        return null;
+        if (true && ReactFiberInstrumentation_1.debugTool) {
+          ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
+        }
+
+        if (siblingFiber !== null) {
+          // If there is more work to do in this returnFiber, do that next.
+          return siblingFiber;
+        } else if (returnFiber !== null) {
+          // If there's no more work in this returnFiber. Complete the returnFiber.
+          workInProgress = returnFiber;
+          continue;
+        } else {
+          return null;
+        }
       }
     }
 
@@ -11829,45 +12026,11 @@ var ReactFiberScheduler = function(config) {
       ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
     }
 
-    var next = beginWork(current, workInProgress, nextRenderExpirationTime);
-    {
-      ReactDebugCurrentFiber.resetCurrentFiber();
-    }
-    if (true && ReactFiberInstrumentation_1.debugTool) {
-      ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
-    }
-
-    if (next === null) {
-      // If this doesn't spawn new work, complete the current work.
-      next = completeUnitOfWork(workInProgress);
+    if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+      stashedWorkInProgressProperties = Object.assign({}, workInProgress);
     }
+    var next = beginWork(current, workInProgress, nextRenderExpirationTime);
 
-    ReactCurrentOwner.current = null;
-
-    return next;
-  }
-
-  function performFailedUnitOfWork(workInProgress) {
-    {
-      ReactStrictModeWarnings.discardPendingWarnings();
-    }
-
-    // The current, flushed, state of this fiber is the alternate.
-    // Ideally nothing should rely on this, but relying on it here
-    // means that we don't need an additional field on the work in
-    // progress.
-    var current = workInProgress.alternate;
-
-    // See if beginning this work spawns more work.
-    startWorkTimer(workInProgress);
-    {
-      ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
-    }
-    var next = beginFailedWork(
-      current,
-      workInProgress,
-      nextRenderExpirationTime
-    );
     {
       ReactDebugCurrentFiber.resetCurrentFiber();
     }
@@ -11886,14 +12049,6 @@ var ReactFiberScheduler = function(config) {
   }
 
   function workLoop(isAsync) {
-    if (capturedErrors !== null) {
-      // If there are unhandled errors, switch to the slow work loop.
-      // TODO: How to avoid this check in the fast path? Maybe the renderer
-      // could keep track of which roots have unhandled errors and call a
-      // forked version of renderRoot.
-      slowWorkLoopThatChecksForFailedWork(isAsync);
-      return;
-    }
     if (!isAsync) {
       // Flush all expired work.
       while (nextUnitOfWork !== null) {
@@ -11907,47 +12062,6 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
-  function slowWorkLoopThatChecksForFailedWork(isAsync) {
-    if (!isAsync) {
-      // Flush all expired work.
-      while (nextUnitOfWork !== null) {
-        if (hasCapturedError(nextUnitOfWork)) {
-          // Use a forked version of performUnitOfWork
-          nextUnitOfWork = performFailedUnitOfWork(nextUnitOfWork);
-        } else {
-          nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-        }
-      }
-    } else {
-      // Flush asynchronous work until the deadline runs out of time.
-      while (nextUnitOfWork !== null && !shouldYield()) {
-        if (hasCapturedError(nextUnitOfWork)) {
-          // Use a forked version of performUnitOfWork
-          nextUnitOfWork = performFailedUnitOfWork(nextUnitOfWork);
-        } else {
-          nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-        }
-      }
-    }
-  }
-
-  function renderRootCatchBlock(root, failedWork, boundary, isAsync) {
-    // We're going to restart the error boundary that captured the error.
-    // Conceptually, we're unwinding the stack. We need to unwind the
-    // context stack, too.
-    unwindContexts(failedWork, boundary);
-
-    // Restart the error boundary using a forked version of
-    // performUnitOfWork that deletes the boundary's children. The entire
-    // failed subree will be unmounted. During the commit phase, a special
-    // lifecycle method is called on the error boundary, which triggers
-    // a re-render.
-    nextUnitOfWork = performFailedUnitOfWork(boundary);
-
-    // Continue working.
-    workLoop(isAsync);
-  }
-
   function renderRoot(root, expirationTime, isAsync) {
     invariant(
       !isWorking,
@@ -11956,15 +12070,11 @@ var ReactFiberScheduler = function(config) {
     );
     isWorking = true;
 
-    // We're about to mutate the work-in-progress tree. If the root was pending
-    // commit, it no longer is: we'll need to complete it again.
-    root.isReadyForCommit = false;
-
     // Check if we're starting from a fresh stack, or if we're resuming from
     // previously yielded work.
     if (
-      root !== nextRoot ||
       expirationTime !== nextRenderExpirationTime ||
+      root !== nextRoot ||
       nextUnitOfWork === null
     ) {
       // Reset the stack and start working from the root.
@@ -11974,347 +12084,145 @@ var ReactFiberScheduler = function(config) {
       nextUnitOfWork = createWorkInProgress(
         nextRoot.current,
         null,
-        expirationTime
+        nextRenderExpirationTime
       );
+      root.pendingCommitExpirationTime = NoWork;
     }
 
-    startWorkLoopTimer(nextUnitOfWork);
-
-    var didError = false;
-    var error = null;
-    {
-      invokeGuardedCallback$2(null, workLoop, null, isAsync);
-      if (hasCaughtError()) {
-        didError = true;
-        error = clearCaughtError();
-      }
-    }
-
-    // An error was thrown during the render phase.
-    while (didError) {
-      if (didFatal) {
-        // This was a fatal error. Don't attempt to recover from it.
-        firstUncaughtError = error;
-        break;
-      }
+    var didFatal = false;
 
-      var failedWork = nextUnitOfWork;
-      if (failedWork === null) {
-        // An error was thrown but there's no current unit of work. This can
-        // happen during the commit phase if there's a bug in the renderer.
-        didFatal = true;
-        continue;
-      }
+    startWorkLoopTimer(nextUnitOfWork);
 
-      // "Capture" the error by finding the nearest boundary. If there is no
-      // error boundary, we use the root.
-      var boundary = captureError(failedWork, error);
-      invariant(
-        boundary !== null,
-        "Should have found an error boundary. This error is likely " +
-          "caused by a bug in React. Please file an issue."
-      );
+    do {
+      try {
+        workLoop(isAsync);
+      } catch (thrownValue) {
+        if (nextUnitOfWork === null) {
+          // This is a fatal error.
+          didFatal = true;
+          onUncaughtError(thrownValue);
+          break;
+        }
 
-      if (didFatal) {
-        // The error we just captured was a fatal error. This happens
-        // when the error propagates to the root more than once.
-        continue;
-      }
+        if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+          var failedUnitOfWork = nextUnitOfWork;
+          replayUnitOfWork(failedUnitOfWork, isAsync);
+        }
 
-      didError = false;
-      error = null;
-      {
-        invokeGuardedCallback$2(
-          null,
-          renderRootCatchBlock,
-          null,
-          root,
-          failedWork,
-          boundary,
-          isAsync
-        );
-        if (hasCaughtError()) {
-          didError = true;
-          error = clearCaughtError();
-          continue;
+        var sourceFiber = nextUnitOfWork;
+        var returnFiber = sourceFiber["return"];
+        if (returnFiber === null) {
+          // This is a fatal error.
+          didFatal = true;
+          onUncaughtError(thrownValue);
+          break;
         }
+        throwException(returnFiber, sourceFiber, thrownValue);
+        nextUnitOfWork = completeUnitOfWork(sourceFiber);
       }
-      // We're finished working. Exit the error loop.
       break;
-    }
-
-    var uncaughtError = firstUncaughtError;
+    } while (true);
 
     // We're done performing work. Time to clean up.
     stopWorkLoopTimer(interruptedBy);
     interruptedBy = null;
     isWorking = false;
-    didFatal = false;
-    firstUncaughtError = null;
-
-    if (uncaughtError !== null) {
-      onUncaughtError(uncaughtError);
-    }
 
-    return root.isReadyForCommit ? root.current.alternate : null;
-  }
-
-  // Returns the boundary that captured the error, or null if the error is ignored
-  function captureError(failedWork, error) {
-    // It is no longer valid because we exited the user code.
-    ReactCurrentOwner.current = null;
-    {
-      ReactDebugCurrentFiber.resetCurrentFiber();
-    }
-
-    // Search for the nearest error boundary.
-    var boundary = null;
-
-    // Passed to logCapturedError()
-    var errorBoundaryFound = false;
-    var willRetry = false;
-    var errorBoundaryName = null;
-
-    // Host containers are a special case. If the failed work itself is a host
-    // container, then it acts as its own boundary. In all other cases, we
-    // ignore the work itself and only search through the parents.
-    if (failedWork.tag === HostRoot) {
-      boundary = failedWork;
-
-      if (isFailedBoundary(failedWork)) {
-        // If this root already failed, there must have been an error when
-        // attempting to unmount it. This is a worst-case scenario and
-        // should only be possible if there's a bug in the renderer.
-        didFatal = true;
-      }
-    } else {
-      var node = failedWork["return"];
-      while (node !== null && boundary === null) {
-        if (node.tag === ClassComponent) {
-          var instance = node.stateNode;
-          if (typeof instance.componentDidCatch === "function") {
-            errorBoundaryFound = true;
-            errorBoundaryName = getComponentName(node);
-
-            // Found an error boundary!
-            boundary = node;
-            willRetry = true;
-          }
-        } else if (node.tag === HostRoot) {
-          // Treat the root like a no-op error boundary
-          boundary = node;
-        }
-
-        if (isFailedBoundary(node)) {
-          // This boundary is already in a failed state.
-
-          // If we're currently unmounting, that means this error was
-          // thrown while unmounting a failed subtree. We should ignore
-          // the error.
-          if (isUnmounting) {
-            return null;
-          }
-
-          // If we're in the commit phase, we should check to see if
-          // this boundary already captured an error during this commit.
-          // This case exists because multiple errors can be thrown during
-          // a single commit without interruption.
-          if (
-            commitPhaseBoundaries !== null &&
-            (commitPhaseBoundaries.has(node) ||
-              (node.alternate !== null &&
-                commitPhaseBoundaries.has(node.alternate)))
-          ) {
-            // If so, we should ignore this error.
-            return null;
-          }
-
-          // The error should propagate to the next boundary -— we keep looking.
-          boundary = null;
-          willRetry = false;
-        }
-
-        node = node["return"];
-      }
-    }
-
-    if (boundary !== null) {
-      // Add to the collection of failed boundaries. This lets us know that
-      // subsequent errors in this subtree should propagate to the next boundary.
-      if (failedBoundaries === null) {
-        failedBoundaries = new Set();
-      }
-      failedBoundaries.add(boundary);
-
-      // This method is unsafe outside of the begin and complete phases.
-      // We might be in the commit phase when an error is captured.
-      // The risk is that the return path from this Fiber may not be accurate.
-      // That risk is acceptable given the benefit of providing users more context.
-      var _componentStack = getStackAddendumByWorkInProgressFiber(failedWork);
-      var _componentName = getComponentName(failedWork);
-
-      // Add to the collection of captured errors. This is stored as a global
-      // map of errors and their component stack location keyed by the boundaries
-      // that capture them. We mostly use this Map as a Set; it's a Map only to
-      // avoid adding a field to Fiber to store the error.
-      if (capturedErrors === null) {
-        capturedErrors = new Map();
-      }
-
-      var capturedError = {
-        componentName: _componentName,
-        componentStack: _componentStack,
-        error: error,
-        errorBoundary: errorBoundaryFound ? boundary.stateNode : null,
-        errorBoundaryFound: errorBoundaryFound,
-        errorBoundaryName: errorBoundaryName,
-        willRetry: willRetry
-      };
-
-      capturedErrors.set(boundary, capturedError);
-
-      try {
-        logCapturedError(capturedError);
-      } catch (e) {
-        // Prevent cycle if logCapturedError() throws.
-        // A cycle may still occur if logCapturedError renders a component that throws.
-        var suppressLogging = e && e.suppressReactErrorLogging;
-        if (!suppressLogging) {
-          console.error(e);
-        }
-      }
-
-      // If we're in the commit phase, defer scheduling an update on the
-      // boundary until after the commit is complete
-      if (isCommitting) {
-        if (commitPhaseBoundaries === null) {
-          commitPhaseBoundaries = new Set();
-        }
-        commitPhaseBoundaries.add(boundary);
+    // Yield back to main thread.
+    if (didFatal) {
+      // There was a fatal error.
+      return null;
+    } else if (nextUnitOfWork === null) {
+      // We reached the root.
+      if (isRootReadyForCommit) {
+        // The root successfully completed. It's ready for commit.
+        root.pendingCommitExpirationTime = expirationTime;
+        var finishedWork = root.current.alternate;
+        return finishedWork;
       } else {
-        // Otherwise, schedule an update now.
-        // TODO: Is this actually necessary during the render phase? Is it
-        // possible to unwind and continue rendering at the same priority,
-        // without corrupting internal state?
-        scheduleErrorRecovery(boundary);
+        // The root did not complete.
+        invariant(
+          false,
+          "Expired work should have completed. This error is likely caused " +
+            "by a bug in React. Please file an issue."
+        );
       }
-      return boundary;
-    } else if (firstUncaughtError === null) {
-      // If no boundary is found, we'll need to throw the error
-      firstUncaughtError = error;
+    } else {
+      // There's more work to do, but we ran out of time. Yield back to
+      // the renderer.
+      return null;
     }
-    return null;
-  }
-
-  function hasCapturedError(fiber) {
-    // TODO: capturedErrors should store the boundary instance, to avoid needing
-    // to check the alternate.
-    return (
-      capturedErrors !== null &&
-      (capturedErrors.has(fiber) ||
-        (fiber.alternate !== null && capturedErrors.has(fiber.alternate)))
-    );
   }
 
-  function isFailedBoundary(fiber) {
-    // TODO: failedBoundaries should store the boundary instance, to avoid
-    // needing to check the alternate.
-    return (
-      failedBoundaries !== null &&
-      (failedBoundaries.has(fiber) ||
-        (fiber.alternate !== null && failedBoundaries.has(fiber.alternate)))
-    );
+  function scheduleCapture(sourceFiber, boundaryFiber, value, expirationTime) {
+    // TODO: We only support dispatching errors.
+    var capturedValue = createCapturedValue(value, sourceFiber);
+    var update = {
+      expirationTime: expirationTime,
+      partialState: null,
+      callback: null,
+      isReplace: false,
+      isForced: false,
+      capturedValue: capturedValue,
+      next: null
+    };
+    insertUpdateIntoFiber(boundaryFiber, update);
+    scheduleWork(boundaryFiber, expirationTime);
   }
 
-  function commitErrorHandling(effectfulFiber) {
-    var capturedError = void 0;
-    if (capturedErrors !== null) {
-      capturedError = capturedErrors.get(effectfulFiber);
-      capturedErrors["delete"](effectfulFiber);
-      if (capturedError == null) {
-        if (effectfulFiber.alternate !== null) {
-          effectfulFiber = effectfulFiber.alternate;
-          capturedError = capturedErrors.get(effectfulFiber);
-          capturedErrors["delete"](effectfulFiber);
-        }
-      }
-    }
-
+  function dispatch(sourceFiber, value, expirationTime) {
     invariant(
-      capturedError != null,
-      "No error for given unit of work. This error is likely caused by a " +
-        "bug in React. Please file an issue."
+      !isWorking || isCommitting,
+      "dispatch: Cannot dispatch during the render phase."
     );
 
-    switch (effectfulFiber.tag) {
-      case ClassComponent:
-        var instance = effectfulFiber.stateNode;
-
-        var info = {
-          componentStack: capturedError.componentStack
-        };
-
-        // Allow the boundary to handle the error, usually by scheduling
-        // an update to itself
-        instance.componentDidCatch(capturedError.error, info);
-        return;
-      case HostRoot:
-        if (firstUncaughtError === null) {
-          firstUncaughtError = capturedError.error;
-        }
-        return;
-      default:
-        invariant(
-          false,
-          "Invalid type of work. This error is likely caused by a bug in " +
-            "React. Please file an issue."
-        );
-    }
-  }
+    // TODO: Handle arrays
 
-  function unwindContexts(from, to) {
-    var node = from;
-    while (node !== null) {
-      switch (node.tag) {
+    var fiber = sourceFiber["return"];
+    while (fiber !== null) {
+      switch (fiber.tag) {
         case ClassComponent:
-          popContextProvider(node);
-          break;
-        case HostComponent:
-          popHostContext(node);
+          var ctor = fiber.type;
+          var instance = fiber.stateNode;
+          if (
+            typeof ctor.getDerivedStateFromCatch === "function" ||
+            (typeof instance.componentDidCatch === "function" &&
+              !isAlreadyFailedLegacyErrorBoundary(instance))
+          ) {
+            scheduleCapture(sourceFiber, fiber, value, expirationTime);
+            return;
+          }
           break;
+        // TODO: Handle async boundaries
         case HostRoot:
-          popHostContainer(node);
-          break;
-        case HostPortal:
-          popHostContainer(node);
-          break;
-        case ContextProvider:
-          popProvider(node);
-          break;
-      }
-      if (node === to || node.alternate === to) {
-        stopFailedWorkTimer(node);
-        break;
-      } else {
-        stopWorkTimer(node);
+          scheduleCapture(sourceFiber, fiber, value, expirationTime);
+          return;
       }
-      node = node["return"];
+      fiber = fiber["return"];
+    }
+
+    if (sourceFiber.tag === HostRoot) {
+      // Error was thrown at the root. There is no parent, so the root
+      // itself should capture it.
+      scheduleCapture(sourceFiber, sourceFiber, value, expirationTime);
     }
   }
 
-  function computeAsyncExpiration() {
+  function onCommitPhaseError(fiber, error) {
+    return dispatch(fiber, error, Sync);
+  }
+
+  function computeAsyncExpiration(currentTime) {
     // Given the current clock time, returns an expiration time. We use rounding
     // to batch like updates together.
     // Should complete within ~1000ms. 1200ms max.
-    var currentTime = recalculateCurrentTime();
-    var expirationMs = 1000;
-    var bucketSizeMs = 200;
+    var expirationMs = 5000;
+    var bucketSizeMs = 250;
     return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
   }
 
-  function computeInteractiveExpiration() {
+  function computeInteractiveExpiration(currentTime) {
     // Should complete within ~500ms. 600ms max.
-    var currentTime = recalculateCurrentTime();
     var expirationMs = 500;
     var bucketSizeMs = 100;
     return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
@@ -12322,7 +12230,8 @@ var ReactFiberScheduler = function(config) {
 
   // Creates a unique async expiration time.
   function computeUniqueAsyncExpiration() {
-    var result = computeAsyncExpiration();
+    var currentTime = recalculateCurrentTime();
+    var result = computeAsyncExpiration(currentTime);
     if (result <= lastUniqueAsyncExpiration) {
       // Since we assume the current time monotonically increases, we only hit
       // this branch when computeUniqueAsyncExpiration is fired multiple times
@@ -12354,10 +12263,12 @@ var ReactFiberScheduler = function(config) {
       if (fiber.mode & AsyncMode) {
         if (isBatchingInteractiveUpdates) {
           // This is an interactive update
-          expirationTime = computeInteractiveExpiration();
+          var currentTime = recalculateCurrentTime();
+          expirationTime = computeInteractiveExpiration(currentTime);
         } else {
           // This is an async update
-          expirationTime = computeAsyncExpiration();
+          var _currentTime = recalculateCurrentTime();
+          expirationTime = computeAsyncExpiration(_currentTime);
         }
       } else {
         // This is a sync update
@@ -12382,23 +12293,6 @@ var ReactFiberScheduler = function(config) {
     return scheduleWorkImpl(fiber, expirationTime, false);
   }
 
-  function checkRootNeedsClearing(root, fiber, expirationTime) {
-    if (
-      !isWorking &&
-      root === nextRoot &&
-      expirationTime < nextRenderExpirationTime
-    ) {
-      // Restart the root from the top.
-      if (nextUnitOfWork !== null) {
-        // This is an interruption. (Used for performance tracking.)
-        interruptedBy = fiber;
-      }
-      nextRoot = null;
-      nextUnitOfWork = null;
-      nextRenderExpirationTime = NoWork;
-    }
-  }
-
   function scheduleWorkImpl(fiber, expirationTime, isErrorRecovery) {
     recordScheduleUpdate();
 
@@ -12430,10 +12324,27 @@ var ReactFiberScheduler = function(config) {
       if (node["return"] === null) {
         if (node.tag === HostRoot) {
           var root = node.stateNode;
-
-          checkRootNeedsClearing(root, fiber, expirationTime);
-          requestWork(root, expirationTime);
-          checkRootNeedsClearing(root, fiber, expirationTime);
+          if (
+            !isWorking &&
+            nextRenderExpirationTime !== NoWork &&
+            expirationTime < nextRenderExpirationTime
+          ) {
+            // This is an interruption. (Used for performance tracking.)
+            interruptedBy = fiber;
+            resetContextStack();
+          }
+          if (nextRoot !== root || !isWorking) {
+            requestWork(root, expirationTime);
+          }
+          if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
+            invariant(
+              false,
+              "Maximum update depth exceeded. This can happen when a " +
+                "component repeatedly calls setState inside " +
+                "componentWillUpdate or componentDidUpdate. React limits " +
+                "the number of nested updates to prevent infinite loops."
+            );
+          }
         } else {
           {
             if (!isErrorRecovery && fiber.tag === ClassComponent) {
@@ -12447,27 +12358,23 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
-  function scheduleErrorRecovery(fiber) {
-    scheduleWorkImpl(fiber, Sync, true);
-  }
-
   function recalculateCurrentTime() {
     // Subtract initial time so it fits inside 32bits
-    var ms = now() - startTime;
-    mostRecentCurrentTime = msToExpirationTime(ms);
+    mostRecentCurrentTimeMs = now() - originalStartTimeMs;
+    mostRecentCurrentTime = msToExpirationTime(mostRecentCurrentTimeMs);
     return mostRecentCurrentTime;
   }
 
   function deferredUpdates(fn) {
     var previousExpirationContext = expirationContext;
-    expirationContext = computeAsyncExpiration();
+    var currentTime = recalculateCurrentTime();
+    expirationContext = computeAsyncExpiration(currentTime);
     try {
       return fn();
     } finally {
       expirationContext = previousExpirationContext;
     }
   }
-
   function syncUpdates(fn, a, b, c, d) {
     var previousExpirationContext = expirationContext;
     expirationContext = Sync;
@@ -12525,7 +12432,7 @@ var ReactFiberScheduler = function(config) {
     }
 
     // Compute a timeout for the given expiration time.
-    var currentMs = now() - startTime;
+    var currentMs = now() - originalStartTimeMs;
     var expirationMs = expirationTimeToMs(expirationTime);
     var timeout = expirationMs - currentMs;
 
@@ -12538,16 +12445,35 @@ var ReactFiberScheduler = function(config) {
   // requestWork is called by the scheduler whenever a root receives an update.
   // It's up to the renderer to call renderRoot at some point in the future.
   function requestWork(root, expirationTime) {
-    if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
-      invariant(
-        false,
-        "Maximum update depth exceeded. This can happen when a " +
-          "component repeatedly calls setState inside componentWillUpdate or " +
-          "componentDidUpdate. React limits the number of nested updates to " +
-          "prevent infinite loops."
-      );
+    addRootToSchedule(root, expirationTime);
+
+    if (isRendering) {
+      // Prevent reentrancy. Remaining work will be scheduled at the end of
+      // the currently rendering batch.
+      return;
+    }
+
+    if (isBatchingUpdates) {
+      // Flush work at the end of the batch.
+      if (isUnbatchingUpdates) {
+        // ...unless we're inside unbatchedUpdates, in which case we should
+        // flush it now.
+        nextFlushedRoot = root;
+        nextFlushedExpirationTime = Sync;
+        performWorkOnRoot(root, Sync, false);
+      }
+      return;
+    }
+
+    // TODO: Get rid of Sync and use current time?
+    if (expirationTime === Sync) {
+      performSyncWork();
+    } else {
+      scheduleCallbackWithExpiration(expirationTime);
     }
+  }
 
+  function addRootToSchedule(root, expirationTime) {
     // Add the root to the schedule.
     // Check if this root is already part of the schedule.
     if (root.nextScheduledRoot === null) {
@@ -12572,37 +12498,11 @@ var ReactFiberScheduler = function(config) {
         root.remainingExpirationTime = expirationTime;
       }
     }
-
-    if (isRendering) {
-      // Prevent reentrancy. Remaining work will be scheduled at the end of
-      // the currently rendering batch.
-      return;
-    }
-
-    if (isBatchingUpdates) {
-      if (isUnbatchingUpdates) {
-        // Flush work at the end of the batch.
-        // ...unless we're inside unbatchedUpdates, in which case we should
-        // flush it now.
-        nextFlushedRoot = root;
-        nextFlushedExpirationTime = Sync;
-        performWorkOnRoot(root, Sync, false);
-      }
-      return;
-    }
-
-    // TODO: Get rid of Sync and use current time?
-    if (expirationTime === Sync) {
-      performSyncWork();
-    } else {
-      scheduleCallbackWithExpiration(expirationTime);
-    }
   }
 
   function findHighestPriorityRoot() {
     var highestPriorityWork = NoWork;
     var highestPriorityRoot = null;
-
     if (lastScheduledRoot !== null) {
       var previousScheduledRoot = lastScheduledRoot;
       var root = firstScheduledRoot;
@@ -12664,7 +12564,8 @@ var ReactFiberScheduler = function(config) {
     var previousFlushedRoot = nextFlushedRoot;
     if (
       previousFlushedRoot !== null &&
-      previousFlushedRoot === highestPriorityRoot
+      previousFlushedRoot === highestPriorityRoot &&
+      highestPriorityWork === Sync
     ) {
       nestedUpdateCount++;
     } else {
@@ -12739,7 +12640,6 @@ var ReactFiberScheduler = function(config) {
     // Clean-up.
     deadline = null;
     deadlineDidExpire = false;
-    nestedUpdateCount = 0;
 
     finishRendering();
   }
@@ -12758,6 +12658,8 @@ var ReactFiberScheduler = function(config) {
   }
 
   function finishRendering() {
+    nestedUpdateCount = 0;
+
     if (completedBatches !== null) {
       var batches = completedBatches;
       completedBatches = null;
@@ -12775,10 +12677,10 @@ var ReactFiberScheduler = function(config) {
     }
 
     if (hasUnhandledError) {
-      var _error4 = unhandledError;
+      var error = unhandledError;
       unhandledError = null;
       hasUnhandledError = false;
-      throw _error4;
+      throw error;
     }
   }
 
@@ -12871,8 +12773,6 @@ var ReactFiberScheduler = function(config) {
     return true;
   }
 
-  // TODO: Not happy about this hook. Conceptually, renderRoot should return a
-  // tuple of (isReadyForCommit, didError, error)
   function onUncaughtError(error) {
     invariant(
       nextFlushedRoot !== null,
@@ -12989,6 +12889,7 @@ var ReactFiberScheduler = function(config) {
   }
 
   return {
+    recalculateCurrentTime: recalculateCurrentTime,
     computeExpirationForFiber: computeExpirationForFiber,
     scheduleWork: scheduleWork,
     requestWork: requestWork,
@@ -13032,6 +12933,7 @@ var ReactFiberReconciler$1 = function(config) {
   var _ReactFiberScheduler = ReactFiberScheduler(config),
     computeUniqueAsyncExpiration =
       _ReactFiberScheduler.computeUniqueAsyncExpiration,
+    recalculateCurrentTime = _ReactFiberScheduler.recalculateCurrentTime,
     computeExpirationForFiber = _ReactFiberScheduler.computeExpirationForFiber,
     scheduleWork = _ReactFiberScheduler.scheduleWork,
     requestWork = _ReactFiberScheduler.requestWork,
@@ -13045,7 +12947,13 @@ var ReactFiberReconciler$1 = function(config) {
     interactiveUpdates = _ReactFiberScheduler.interactiveUpdates,
     flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates;
 
-  function scheduleRootUpdate(current, element, expirationTime, callback) {
+  function scheduleRootUpdate(
+    current,
+    element,
+    currentTime,
+    expirationTime,
+    callback
+  ) {
     {
       if (
         ReactDebugCurrentFiber.phase === "render" &&
@@ -13080,6 +12988,7 @@ var ReactFiberReconciler$1 = function(config) {
       callback: callback,
       isReplace: false,
       isForced: false,
+      capturedValue: null,
       next: null
     };
     insertUpdateIntoFiber(current, update);
@@ -13092,6 +13001,7 @@ var ReactFiberReconciler$1 = function(config) {
     element,
     container,
     parentComponent,
+    currentTime,
     expirationTime,
     callback
   ) {
@@ -13117,7 +13027,13 @@ var ReactFiberReconciler$1 = function(config) {
       container.pendingContext = context;
     }
 
-    return scheduleRootUpdate(current, element, expirationTime, callback);
+    return scheduleRootUpdate(
+      current,
+      element,
+      currentTime,
+      expirationTime,
+      callback
+    );
   }
 
   function findHostInstance(fiber) {
@@ -13134,17 +13050,34 @@ var ReactFiberReconciler$1 = function(config) {
     },
     updateContainer: function(element, container, parentComponent, callback) {
       var current = container.current;
+      var currentTime = recalculateCurrentTime();
       var expirationTime = computeExpirationForFiber(current);
       return updateContainerAtExpirationTime(
         element,
         container,
         parentComponent,
+        currentTime,
+        expirationTime,
+        callback
+      );
+    },
+    updateContainerAtExpirationTime: function(
+      element,
+      container,
+      parentComponent,
+      expirationTime,
+      callback
+    ) {
+      var currentTime = recalculateCurrentTime();
+      return updateContainerAtExpirationTime(
+        element,
+        container,
+        parentComponent,
+        currentTime,
         expirationTime,
         callback
       );
     },
-
-    updateContainerAtExpirationTime: updateContainerAtExpirationTime,
 
     flushRoot: flushRoot,
 
@@ -13226,6 +13159,48 @@ var reactReconciler = ReactFiberReconciler$3["default"]
   ? ReactFiberReconciler$3["default"]
   : ReactFiberReconciler$3;
 
+/**
+ * Keeps track of allocating and associating native "tags" which are numeric,
+ * unique view IDs. All the native tags are negative numbers, to avoid
+ * collisions, but in the JS we keep track of them as positive integers to store
+ * them effectively in Arrays. So we must refer to them as "inverses" of the
+ * native tags (that are * normally negative).
+ *
+ * It *must* be the case that every `rootNodeID` always maps to the exact same
+ * `tag` forever. The easiest way to accomplish this is to never delete
+ * anything from this table.
+ * Why: Because `dangerouslyReplaceNodeWithMarkupByID` relies on being able to
+ * unmount a component with a `rootNodeID`, then mount a new one in its place,
+ */
+var INITIAL_TAG_COUNT = 1;
+var ReactNativeTagHandles = {
+  tagsStartAt: INITIAL_TAG_COUNT,
+  tagCount: INITIAL_TAG_COUNT,
+
+  allocateTag: function() {
+    // Skip over root IDs as those are reserved for native
+    while (this.reactTagIsNativeTopRootID(ReactNativeTagHandles.tagCount)) {
+      ReactNativeTagHandles.tagCount++;
+    }
+    var tag = ReactNativeTagHandles.tagCount;
+    ReactNativeTagHandles.tagCount++;
+    return tag;
+  },
+
+  assertRootTag: function(tag) {
+    invariant(
+      this.reactTagIsNativeTopRootID(tag),
+      "Expect a native root tag, instead got %s",
+      tag
+    );
+  },
+
+  reactTagIsNativeTopRootID: function(reactTag) {
+    // We reserve all tags that are 1 mod 10 for native root views
+    return reactTag % 10 === 1;
+  }
+};
+
 function _classCallCheck$2(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
     throw new TypeError("Cannot call a class as a function");
@@ -13661,8 +13636,7 @@ var ReactFabric = {
     NativeMethodsMixin: NativeMethodsMixin,
     // Used by react-native-github/Libraries/ components
     ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin, // requireNativeComponent
-    ReactGlobalSharedState: ReactGlobalSharedState, // Systrace
-    ReactNativeComponentTree: ReactNativeComponentTree, // InspectorUtils, ScrollResponder
+    ReactNativeComponentTree: ReactNativeComponentTree, // ScrollResponder
     ReactNativePropRegistry: ReactNativePropRegistry, // flattenStyle, Stylesheet
     TouchHistoryMath: TouchHistoryMath, // PanResponder
     createReactNativeComponentClass: createReactNativeComponentClass, // RCTText, RCTView, ReactNativeART
diff --git a/Libraries/Renderer/ReactFabric-prod.js b/Libraries/Renderer/ReactFabric-prod.js
index e25c7162a163f1..9605c98520cda9 100644
--- a/Libraries/Renderer/ReactFabric-prod.js
+++ b/Libraries/Renderer/ReactFabric-prod.js
@@ -13,80 +13,15 @@
 require("InitializeCore");
 var invariant = require("fbjs/lib/invariant"),
   emptyFunction = require("fbjs/lib/emptyFunction"),
-  RCTEventEmitter = require("RCTEventEmitter"),
   UIManager = require("UIManager"),
-  React = require("react"),
   TextInputState = require("TextInputState"),
   deepDiffer = require("deepDiffer"),
   flattenStyle = require("flattenStyle"),
+  React = require("react"),
   emptyObject = require("fbjs/lib/emptyObject"),
   shallowEqual = require("fbjs/lib/shallowEqual"),
-  FabricUIManager = require("FabricUIManager");
-function invokeGuardedCallback(name, func, context, a, b, c, d, e, f) {
-  this._hasCaughtError = !1;
-  this._caughtError = null;
-  var funcArgs = Array.prototype.slice.call(arguments, 3);
-  try {
-    func.apply(context, funcArgs);
-  } catch (error) {
-    (this._caughtError = error), (this._hasCaughtError = !0);
-  }
-}
-var ReactErrorUtils = {
-  _caughtError: null,
-  _hasCaughtError: !1,
-  _rethrowError: null,
-  _hasRethrowError: !1,
-  invokeGuardedCallback: function(name, func, context, a, b, c, d, e, f) {
-    invokeGuardedCallback.apply(ReactErrorUtils, arguments);
-  },
-  invokeGuardedCallbackAndCatchFirstError: function(
-    name,
-    func,
-    context,
-    a,
-    b,
-    c,
-    d,
-    e,
-    f
-  ) {
-    ReactErrorUtils.invokeGuardedCallback.apply(this, arguments);
-    if (ReactErrorUtils.hasCaughtError()) {
-      var error = ReactErrorUtils.clearCaughtError();
-      ReactErrorUtils._hasRethrowError ||
-        ((ReactErrorUtils._hasRethrowError = !0),
-        (ReactErrorUtils._rethrowError = error));
-    }
-  },
-  rethrowCaughtError: function() {
-    return rethrowCaughtError.apply(ReactErrorUtils, arguments);
-  },
-  hasCaughtError: function() {
-    return ReactErrorUtils._hasCaughtError;
-  },
-  clearCaughtError: function() {
-    if (ReactErrorUtils._hasCaughtError) {
-      var error = ReactErrorUtils._caughtError;
-      ReactErrorUtils._caughtError = null;
-      ReactErrorUtils._hasCaughtError = !1;
-      return error;
-    }
-    invariant(
-      !1,
-      "clearCaughtError was called but no error was captured. This error is likely caused by a bug in React. Please file an issue."
-    );
-  }
-};
-function rethrowCaughtError() {
-  if (ReactErrorUtils._hasRethrowError) {
-    var error = ReactErrorUtils._rethrowError;
-    ReactErrorUtils._rethrowError = null;
-    ReactErrorUtils._hasRethrowError = !1;
-    throw error;
-  }
-}
-var eventPluginOrder = null,
+  FabricUIManager = require("FabricUIManager"),
+  eventPluginOrder = null,
   namesToPlugins = {};
 function recomputePluginOrdering() {
   if (eventPluginOrder)
@@ -175,17 +110,6 @@ function isMoveish(topLevelType) {
 function isStartish(topLevelType) {
   return "topMouseDown" === topLevelType || "topTouchStart" === topLevelType;
 }
-function executeDispatch(event, simulated, listener, inst) {
-  simulated = event.type || "unknown-event";
-  event.currentTarget = getNodeFromInstance(inst);
-  ReactErrorUtils.invokeGuardedCallbackAndCatchFirstError(
-    simulated,
-    listener,
-    void 0,
-    event
-  );
-  event.currentTarget = null;
-}
 function executeDirectDispatch(event) {
   var dispatchListener = event._dispatchListeners,
     dispatchInstance = event._dispatchInstances;
@@ -218,26 +142,6 @@ function accumulateInto(current, next) {
 function forEachAccumulated(arr, cb, scope) {
   Array.isArray(arr) ? arr.forEach(cb, scope) : arr && cb.call(scope, arr);
 }
-var eventQueue = null;
-function executeDispatchesAndReleaseTopLevel(e) {
-  if (e) {
-    var dispatchListeners = e._dispatchListeners,
-      dispatchInstances = e._dispatchInstances;
-    if (Array.isArray(dispatchListeners))
-      for (
-        var i = 0;
-        i < dispatchListeners.length && !e.isPropagationStopped();
-        i++
-      )
-        executeDispatch(e, !1, dispatchListeners[i], dispatchInstances[i]);
-    else
-      dispatchListeners &&
-        executeDispatch(e, !1, dispatchListeners, dispatchInstances);
-    e._dispatchListeners = null;
-    e._dispatchInstances = null;
-    e.isPersistent() || e.constructor.release(e);
-  }
-}
 var injection = {
   injectEventPluginOrder: function(injectedEventPluginOrder) {
     invariant(
@@ -942,6 +846,7 @@ var eventTypes = {
       nativeEvent,
       nativeEventTarget
     ) {
+      if (null == targetInst) return null;
       var bubbleDispatchConfig = customBubblingEventTypes[topLevelType],
         directDispatchConfig = customDirectEventTypes[topLevelType];
       invariant(
@@ -987,161 +892,28 @@ function getInstanceFromTag(tag) {
   return "number" === typeof tag ? instanceCache[tag] || null : tag;
 }
 var ReactNativeComponentTree = Object.freeze({
-    precacheFiberNode: function(hostInst, tag) {
-      instanceCache[tag] = hostInst;
-    },
-    uncacheFiberNode: function(tag) {
-      delete instanceCache[tag];
-      delete instanceProps[tag];
-    },
-    getClosestInstanceFromNode: getInstanceFromTag,
-    getInstanceFromNode: getInstanceFromTag,
-    getNodeFromInstance: function(inst) {
-      var tag = inst.stateNode._nativeTag;
-      void 0 === tag && (tag = inst.stateNode.canonical._nativeTag);
-      invariant(tag, "All native instances should have a tag.");
-      return tag;
-    },
-    getFiberCurrentPropsFromNode: function(stateNode) {
-      return instanceProps[stateNode._nativeTag] || null;
-    },
-    updateFiberProps: function(tag, props) {
-      instanceProps[tag] = props;
-    }
-  }),
-  restoreTarget = null,
-  restoreQueue = null;
-function restoreStateOfTarget(target) {
-  if ((target = getInstanceFromNode(target))) {
-    invariant(
-      null,
-      "Fiber needs to be injected to handle a fiber target for controlled events. This error is likely caused by a bug in React. Please file an issue."
-    );
-    var props = getFiberCurrentPropsFromNode(target.stateNode);
-    null.restoreControlledState(target.stateNode, target.type, props);
-  }
-}
-function _batchedUpdates(fn, bookkeeping) {
-  return fn(bookkeeping);
-}
-function _flushInteractiveUpdates() {}
-var isBatching = !1;
-function batchedUpdates(fn, bookkeeping) {
-  if (isBatching) return fn(bookkeeping);
-  isBatching = !0;
-  try {
-    return _batchedUpdates(fn, bookkeeping);
-  } finally {
-    if (((isBatching = !1), null !== restoreTarget || null !== restoreQueue))
-      if (
-        (_flushInteractiveUpdates(),
-        restoreTarget &&
-          ((bookkeeping = restoreTarget),
-          (fn = restoreQueue),
-          (restoreQueue = restoreTarget = null),
-          restoreStateOfTarget(bookkeeping),
-          fn))
-      )
-        for (bookkeeping = 0; bookkeeping < fn.length; bookkeeping++)
-          restoreStateOfTarget(fn[bookkeeping]);
-  }
-}
-var ReactNativeTagHandles = {
-    tagsStartAt: 1,
-    tagCount: 1,
-    allocateTag: function() {
-      for (; this.reactTagIsNativeTopRootID(ReactNativeTagHandles.tagCount); )
-        ReactNativeTagHandles.tagCount++;
-      var tag = ReactNativeTagHandles.tagCount;
-      ReactNativeTagHandles.tagCount++;
-      return tag;
-    },
-    assertRootTag: function(tag) {
-      invariant(
-        this.reactTagIsNativeTopRootID(tag),
-        "Expect a native root tag, instead got %s",
-        tag
-      );
-    },
-    reactTagIsNativeTopRootID: function(reactTag) {
-      return 1 === reactTag % 10;
-    }
+  precacheFiberNode: function(hostInst, tag) {
+    instanceCache[tag] = hostInst;
   },
-  EMPTY_NATIVE_EVENT = {};
-function _receiveRootNodeIDEvent(rootNodeID, topLevelType, nativeEventParam) {
-  var nativeEvent = nativeEventParam || EMPTY_NATIVE_EVENT,
-    inst = getInstanceFromTag(rootNodeID);
-  batchedUpdates(function() {
-    var events = nativeEvent.target;
-    for (var events$jscomp$0 = null, i = 0; i < plugins.length; i++) {
-      var possiblePlugin = plugins[i];
-      possiblePlugin &&
-        (possiblePlugin = possiblePlugin.extractEvents(
-          topLevelType,
-          inst,
-          nativeEvent,
-          events
-        )) &&
-        (events$jscomp$0 = accumulateInto(events$jscomp$0, possiblePlugin));
-    }
-    events = events$jscomp$0;
-    null !== events && (eventQueue = accumulateInto(eventQueue, events));
-    events = eventQueue;
-    eventQueue = null;
-    events &&
-      (forEachAccumulated(events, executeDispatchesAndReleaseTopLevel),
-      invariant(
-        !eventQueue,
-        "processEventQueue(): Additional events were enqueued while processing an event queue. Support for this has not yet been implemented."
-      ),
-      ReactErrorUtils.rethrowCaughtError());
-  });
-}
-var ReactNativeEventEmitter = Object.freeze({
-  getListener: getListener,
-  registrationNames: registrationNameModules,
-  _receiveRootNodeIDEvent: _receiveRootNodeIDEvent,
-  receiveEvent: function(rootNodeID, topLevelType, nativeEventParam) {
-    _receiveRootNodeIDEvent(rootNodeID, topLevelType, nativeEventParam);
+  uncacheFiberNode: function(tag) {
+    delete instanceCache[tag];
+    delete instanceProps[tag];
   },
-  receiveTouches: function(eventTopLevelType, touches, changedIndices) {
-    if (
-      "topTouchEnd" === eventTopLevelType ||
-      "topTouchCancel" === eventTopLevelType
-    ) {
-      var JSCompiler_temp = [];
-      for (var i = 0; i < changedIndices.length; i++) {
-        var index = changedIndices[i];
-        JSCompiler_temp.push(touches[index]);
-        touches[index] = null;
-      }
-      for (i = changedIndices = 0; i < touches.length; i++)
-        (index = touches[i]),
-          null !== index && (touches[changedIndices++] = index);
-      touches.length = changedIndices;
-    } else
-      for (JSCompiler_temp = [], i = 0; i < changedIndices.length; i++)
-        JSCompiler_temp.push(touches[changedIndices[i]]);
-    for (
-      changedIndices = 0;
-      changedIndices < JSCompiler_temp.length;
-      changedIndices++
-    ) {
-      i = JSCompiler_temp[changedIndices];
-      i.changedTouches = JSCompiler_temp;
-      i.touches = touches;
-      index = null;
-      var target = i.target;
-      null === target ||
-        void 0 === target ||
-        target < ReactNativeTagHandles.tagsStartAt ||
-        (index = target);
-      _receiveRootNodeIDEvent(index, eventTopLevelType, i);
-    }
+  getClosestInstanceFromNode: getInstanceFromTag,
+  getInstanceFromNode: getInstanceFromTag,
+  getNodeFromInstance: function(inst) {
+    var tag = inst.stateNode._nativeTag;
+    void 0 === tag && (tag = inst.stateNode.canonical._nativeTag);
+    invariant(tag, "All native instances should have a tag.");
+    return tag;
+  },
+  getFiberCurrentPropsFromNode: function(stateNode) {
+    return instanceProps[stateNode._nativeTag] || null;
+  },
+  updateFiberProps: function(tag, props) {
+    instanceProps[tag] = props;
   }
 });
-// TODO: This event emitter is interfering with the existing ReactNative renderer.
-// RCTEventEmitter.register(ReactNativeEventEmitter);
 injection.injectEventPluginOrder([
   "ResponderEventPlugin",
   "ReactNativeBridgeEventPlugin"
@@ -1193,7 +965,24 @@ function createPortal(children, containerInfo, implementation) {
     implementation: implementation
   };
 }
-var TouchHistoryMath = {
+var restoreTarget = null,
+  restoreQueue = null;
+function restoreStateOfTarget(target) {
+  if ((target = getInstanceFromNode(target))) {
+    invariant(
+      null,
+      "Fiber needs to be injected to handle a fiber target for controlled events. This error is likely caused by a bug in React. Please file an issue."
+    );
+    var props = getFiberCurrentPropsFromNode(target.stateNode);
+    null.restoreControlledState(target.stateNode, target.type, props);
+  }
+}
+function _batchedUpdates(fn, bookkeeping) {
+  return fn(bookkeeping);
+}
+function _flushInteractiveUpdates() {}
+var isBatching = !1,
+  TouchHistoryMath = {
     centroidDimension: function(
       touchHistory,
       touchesChangedAfter,
@@ -1294,12 +1083,6 @@ var TouchHistoryMath = {
     },
     noCentroid: -1
   },
-  ReactCurrentOwner =
-    React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,
-  ReactGlobalSharedState = Object.freeze({
-    ReactCurrentOwner: ReactCurrentOwner,
-    ReactDebugCurrentFrame: null
-  }),
   objects = {},
   uniqueID = 1,
   emptyObject$2 = {},
@@ -1561,6 +1344,8 @@ function mountSafeCallback(context, callback) {
     }
   };
 }
+var ReactCurrentOwner =
+  React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner;
 function getComponentName(fiber) {
   fiber = fiber.type;
   if ("function" === typeof fiber) return fiber.displayName || fiber.name;
@@ -1856,6 +1641,39 @@ function push(cursor, value) {
   valueStack[index] = cursor.current;
   cursor.current = value;
 }
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  do {
+    a: switch (workInProgress.tag) {
+      case 0:
+      case 1:
+      case 2:
+      case 5:
+        var owner = workInProgress._debugOwner,
+          source = workInProgress._debugSource;
+        var JSCompiler_inline_result = getComponentName(workInProgress);
+        var ownerName = null;
+        owner && (ownerName = getComponentName(owner));
+        owner = source;
+        JSCompiler_inline_result =
+          "\n    in " +
+          (JSCompiler_inline_result || "Unknown") +
+          (owner
+            ? " (at " +
+              owner.fileName.replace(/^.*[\\\/]/, "") +
+              ":" +
+              owner.lineNumber +
+              ")"
+            : ownerName ? " (created by " + ownerName + ")" : "");
+        break a;
+      default:
+        JSCompiler_inline_result = "";
+    }
+    info += JSCompiler_inline_result;
+    workInProgress = workInProgress["return"];
+  } while (workInProgress);
+  return info;
+}
 new Set();
 var contextStackCursor = { current: emptyObject },
   didPerformWorkStackCursor = { current: !1 },
@@ -2113,7 +1931,8 @@ function createUpdateQueue(baseState) {
     last: null,
     callbackList: null,
     hasForceUpdate: !1,
-    isInitialized: !1
+    isInitialized: !1,
+    capturedValues: null
   };
 }
 function insertUpdateIntoQueue(queue, update) {
@@ -2126,7 +1945,10 @@ function insertUpdateIntoQueue(queue, update) {
   )
     queue.expirationTime = update.expirationTime;
 }
-function insertUpdateIntoFiber(fiber, update) {
+var q1 = void 0,
+  q2 = void 0;
+function ensureUpdateQueues(fiber) {
+  q1 = q2 = null;
   var alternateFiber = fiber.alternate,
     queue1 = fiber.updateQueue;
   null === queue1 && (queue1 = fiber.updateQueue = createUpdateQueue(null));
@@ -2135,13 +1957,19 @@ function insertUpdateIntoFiber(fiber, update) {
       null === fiber &&
         (fiber = alternateFiber.updateQueue = createUpdateQueue(null)))
     : (fiber = null);
-  fiber = fiber !== queue1 ? fiber : null;
-  null === fiber
-    ? insertUpdateIntoQueue(queue1, update)
-    : null === queue1.last || null === fiber.last
-      ? (insertUpdateIntoQueue(queue1, update),
-        insertUpdateIntoQueue(fiber, update))
-      : (insertUpdateIntoQueue(queue1, update), (fiber.last = update));
+  q1 = queue1;
+  q2 = fiber !== queue1 ? fiber : null;
+}
+function insertUpdateIntoFiber(fiber, update) {
+  ensureUpdateQueues(fiber);
+  fiber = q1;
+  var queue2 = q2;
+  null === queue2
+    ? insertUpdateIntoQueue(fiber, update)
+    : null === fiber.last || null === queue2.last
+      ? (insertUpdateIntoQueue(fiber, update),
+        insertUpdateIntoQueue(queue2, update))
+      : (insertUpdateIntoQueue(fiber, update), (queue2.last = update));
 }
 function getStateFromUpdate(update, instance, prevState, props) {
   update = update.partialState;
@@ -2165,6 +1993,7 @@ function processUpdateQueue(
       first: queue.first,
       last: queue.last,
       isInitialized: queue.isInitialized,
+      capturedValues: queue.capturedValues,
       callbackList: null,
       hasForceUpdate: !1
     });
@@ -2212,6 +2041,11 @@ function processUpdateQueue(
         null === updateExpirationTime &&
           (updateExpirationTime = queue.callbackList = []),
         updateExpirationTime.push(update));
+      null !== update.capturedValue &&
+        ((updateExpirationTime = queue.capturedValues),
+        null === updateExpirationTime
+          ? (queue.capturedValues = [update.capturedValue])
+          : updateExpirationTime.push(update.capturedValue));
     }
     update = update.next;
   }
@@ -2219,6 +2053,7 @@ function processUpdateQueue(
     ? (workInProgress.effectTag |= 32)
     : null !== queue.first ||
       queue.hasForceUpdate ||
+      null !== queue.capturedValues ||
       (workInProgress.updateQueue = null);
   didSkip || (queue.baseState = current);
   return current;
@@ -2248,11 +2083,48 @@ function ReactFiberClassComponent(
   memoizeProps,
   memoizeState
 ) {
+  function checkShouldComponentUpdate(
+    workInProgress,
+    oldProps,
+    newProps,
+    oldState,
+    newState,
+    newContext
+  ) {
+    if (
+      null === oldProps ||
+      (null !== workInProgress.updateQueue &&
+        workInProgress.updateQueue.hasForceUpdate)
+    )
+      return !0;
+    var instance = workInProgress.stateNode;
+    workInProgress = workInProgress.type;
+    return "function" === typeof instance.shouldComponentUpdate
+      ? instance.shouldComponentUpdate(newProps, newState, newContext)
+      : workInProgress.prototype &&
+        workInProgress.prototype.isPureReactComponent
+        ? !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
+        : !0;
+  }
   function adoptClassInstance(workInProgress, instance) {
     instance.updater = updater;
     workInProgress.stateNode = instance;
     instance._reactInternalFiber = workInProgress;
   }
+  function callComponentWillReceiveProps(
+    workInProgress,
+    instance,
+    newProps,
+    newContext
+  ) {
+    workInProgress = instance.state;
+    "function" === typeof instance.componentWillReceiveProps &&
+      instance.componentWillReceiveProps(newProps, newContext);
+    "function" === typeof instance.UNSAFE_componentWillReceiveProps &&
+      instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    instance.state !== workInProgress &&
+      updater.enqueueReplaceState(instance, instance.state, null);
+  }
   function callGetDerivedStateFromProps(workInProgress, instance, props) {
     instance = workInProgress.type;
     if ("function" === typeof instance.getDerivedStateFromProps)
@@ -2274,7 +2146,7 @@ function ReactFiberClassComponent(
         callback: callback,
         isReplace: !1,
         isForced: !1,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       });
       scheduleWork(instance, expirationTime);
@@ -2289,7 +2161,7 @@ function ReactFiberClassComponent(
         callback: callback,
         isReplace: !0,
         isForced: !1,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       });
       scheduleWork(instance, expirationTime);
@@ -2304,7 +2176,7 @@ function ReactFiberClassComponent(
         callback: callback,
         isReplace: !1,
         isForced: !0,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       });
       scheduleWork(instance, expirationTime);
@@ -2341,7 +2213,8 @@ function ReactFiberClassComponent(
       return ctor;
     },
     mountClassInstance: function(workInProgress, renderExpirationTime) {
-      var current = workInProgress.alternate,
+      var ctor = workInProgress.type,
+        current = workInProgress.alternate,
         instance = workInProgress.stateNode,
         props = workInProgress.pendingProps,
         unmaskedContext = getUnmaskedContext(workInProgress);
@@ -2351,20 +2224,20 @@ function ReactFiberClassComponent(
       instance.context = getMaskedContext(workInProgress, unmaskedContext);
       ("function" !== typeof instance.UNSAFE_componentWillMount &&
         "function" !== typeof instance.componentWillMount) ||
-        "function" === typeof workInProgress.type.getDerivedStateFromProps ||
-        ((unmaskedContext = instance.state),
+        "function" === typeof ctor.getDerivedStateFromProps ||
+        ((ctor = instance.state),
         "function" === typeof instance.componentWillMount &&
           instance.componentWillMount(),
         "function" === typeof instance.UNSAFE_componentWillMount &&
           instance.UNSAFE_componentWillMount(),
-        unmaskedContext !== instance.state &&
+        ctor !== instance.state &&
           updater.enqueueReplaceState(instance, instance.state, null),
-        (unmaskedContext = workInProgress.updateQueue),
-        null !== unmaskedContext &&
+        (ctor = workInProgress.updateQueue),
+        null !== ctor &&
           (instance.state = processUpdateQueue(
             current,
             workInProgress,
-            unmaskedContext,
+            ctor,
             instance,
             props,
             renderExpirationTime
@@ -2372,12 +2245,106 @@ function ReactFiberClassComponent(
       "function" === typeof instance.componentDidMount &&
         (workInProgress.effectTag |= 4);
     },
+    resumeMountClassInstance: function(workInProgress, renderExpirationTime) {
+      var ctor = workInProgress.type,
+        instance = workInProgress.stateNode;
+      instance.props = workInProgress.memoizedProps;
+      instance.state = workInProgress.memoizedState;
+      var oldProps = workInProgress.memoizedProps,
+        newProps = workInProgress.pendingProps,
+        oldContext = instance.context,
+        newUnmaskedContext = getUnmaskedContext(workInProgress);
+      newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
+      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+        "function" !== typeof instance.componentWillReceiveProps) ||
+        "function" === typeof ctor.getDerivedStateFromProps ||
+        ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            instance,
+            newProps,
+            newUnmaskedContext
+          ));
+      oldContext = void 0;
+      oldProps !== newProps &&
+        (oldContext = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps
+        ));
+      var oldState = workInProgress.memoizedState;
+      renderExpirationTime =
+        null !== workInProgress.updateQueue
+          ? processUpdateQueue(
+              null,
+              workInProgress,
+              workInProgress.updateQueue,
+              instance,
+              newProps,
+              renderExpirationTime
+            )
+          : oldState;
+      null !== oldContext &&
+        void 0 !== oldContext &&
+        (renderExpirationTime =
+          null === renderExpirationTime || void 0 === renderExpirationTime
+            ? oldContext
+            : Object.assign({}, renderExpirationTime, oldContext));
+      if (
+        !(
+          oldProps !== newProps ||
+          oldState !== renderExpirationTime ||
+          didPerformWorkStackCursor.current ||
+          (null !== workInProgress.updateQueue &&
+            workInProgress.updateQueue.hasForceUpdate)
+        )
+      )
+        return (
+          "function" === typeof instance.componentDidMount &&
+            (workInProgress.effectTag |= 4),
+          !1
+        );
+      (oldProps = checkShouldComponentUpdate(
+        workInProgress,
+        oldProps,
+        newProps,
+        oldState,
+        renderExpirationTime,
+        newUnmaskedContext
+      ))
+        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
+            "function" !== typeof instance.componentWillUpdate) ||
+            "function" === typeof ctor.getDerivedStateFromProps ||
+            ("function" === typeof instance.componentWillUpdate &&
+              instance.componentWillUpdate(
+                newProps,
+                renderExpirationTime,
+                newUnmaskedContext
+              ),
+            "function" === typeof instance.UNSAFE_componentWillUpdate &&
+              instance.UNSAFE_componentWillUpdate(
+                newProps,
+                renderExpirationTime,
+                newUnmaskedContext
+              )),
+          "function" === typeof instance.componentDidUpdate &&
+            (workInProgress.effectTag |= 4))
+        : ("function" === typeof instance.componentDidMount &&
+            (workInProgress.effectTag |= 4),
+          memoizeProps(workInProgress, newProps),
+          memoizeState(workInProgress, renderExpirationTime));
+      instance.props = newProps;
+      instance.state = renderExpirationTime;
+      instance.context = newUnmaskedContext;
+      return oldProps;
+    },
     updateClassInstance: function(
       current,
       workInProgress,
       renderExpirationTime
     ) {
-      var instance = workInProgress.stateNode;
+      var ctor = workInProgress.type,
+        instance = workInProgress.stateNode;
       instance.props = workInProgress.memoizedProps;
       instance.state = workInProgress.memoizedState;
       var oldProps = workInProgress.memoizedProps,
@@ -2387,21 +2354,17 @@ function ReactFiberClassComponent(
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
       ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
         "function" !== typeof instance.componentWillReceiveProps) ||
-        "function" === typeof workInProgress.type.getDerivedStateFromProps ||
-        (oldProps === newProps && oldContext === newUnmaskedContext) ||
-        ((oldContext = instance.state),
-        "function" === typeof instance.componentWillReceiveProps &&
-          instance.componentWillReceiveProps(newProps, newUnmaskedContext),
-        "function" === typeof instance.UNSAFE_componentWillReceiveProps &&
-          instance.UNSAFE_componentWillReceiveProps(
+        "function" === typeof ctor.getDerivedStateFromProps ||
+        ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            instance,
             newProps,
             newUnmaskedContext
-          ),
-        instance.state !== oldContext &&
-          updater.enqueueReplaceState(instance, instance.state, null));
-      var partialState = void 0;
+          ));
+      var derivedStateFromProps = void 0;
       oldProps !== newProps &&
-        (partialState = callGetDerivedStateFromProps(
+        (derivedStateFromProps = callGetDerivedStateFromProps(
           workInProgress,
           instance,
           newProps
@@ -2418,12 +2381,12 @@ function ReactFiberClassComponent(
               renderExpirationTime
             )
           : oldContext;
-      null !== partialState &&
-        void 0 !== partialState &&
+      null !== derivedStateFromProps &&
+        void 0 !== derivedStateFromProps &&
         (renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? partialState
-            : Object.assign({}, renderExpirationTime, partialState));
+            ? derivedStateFromProps
+            : Object.assign({}, renderExpirationTime, derivedStateFromProps));
       if (
         !(
           oldProps !== newProps ||
@@ -2440,33 +2403,17 @@ function ReactFiberClassComponent(
             (workInProgress.effectTag |= 4),
           !1
         );
-      partialState = renderExpirationTime;
-      if (
-        null === oldProps ||
-        (null !== workInProgress.updateQueue &&
-          workInProgress.updateQueue.hasForceUpdate)
-      )
-        partialState = !0;
-      else {
-        var instance$jscomp$0 = workInProgress.stateNode,
-          type = workInProgress.type;
-        partialState =
-          "function" === typeof instance$jscomp$0.shouldComponentUpdate
-            ? instance$jscomp$0.shouldComponentUpdate(
-                newProps,
-                partialState,
-                newUnmaskedContext
-              )
-            : type.prototype && type.prototype.isPureReactComponent
-              ? !shallowEqual(oldProps, newProps) ||
-                !shallowEqual(oldContext, partialState)
-              : !0;
-      }
-      partialState
+      (derivedStateFromProps = checkShouldComponentUpdate(
+        workInProgress,
+        oldProps,
+        newProps,
+        oldContext,
+        renderExpirationTime,
+        newUnmaskedContext
+      ))
         ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
             "function" !== typeof instance.componentWillUpdate) ||
-            "function" ===
-              typeof workInProgress.type.getDerivedStateFromProps ||
+            "function" === typeof ctor.getDerivedStateFromProps ||
             ("function" === typeof instance.componentWillUpdate &&
               instance.componentWillUpdate(
                 newProps,
@@ -2490,7 +2437,7 @@ function ReactFiberClassComponent(
       instance.props = newProps;
       instance.state = renderExpirationTime;
       instance.context = newUnmaskedContext;
-      return partialState;
+      return derivedStateFromProps;
     }
   };
 }
@@ -3200,7 +3147,19 @@ function ReactFiberBeginWork(
   computeExpirationForFiber
 ) {
   function reconcileChildren(current, workInProgress, nextChildren) {
-    var renderExpirationTime = workInProgress.expirationTime;
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      workInProgress.expirationTime
+    );
+  }
+  function reconcileChildrenAtExpirationTime(
+    current,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  ) {
     workInProgress.child =
       null === current
         ? mountChildFibers(
@@ -3228,19 +3187,34 @@ function ReactFiberBeginWork(
     current,
     workInProgress,
     shouldUpdate,
-    hasContext
+    hasContext,
+    didCaptureError,
+    renderExpirationTime
   ) {
     markRef(current, workInProgress);
-    if (!shouldUpdate)
+    if (!shouldUpdate && !didCaptureError)
       return (
         hasContext && invalidateContextProvider(workInProgress, !1),
         bailoutOnAlreadyFinishedWork(current, workInProgress)
       );
     shouldUpdate = workInProgress.stateNode;
     ReactCurrentOwner.current = workInProgress;
-    var nextChildren = shouldUpdate.render();
+    var nextChildren = didCaptureError ? null : shouldUpdate.render();
     workInProgress.effectTag |= 1;
-    reconcileChildren(current, workInProgress, nextChildren);
+    didCaptureError &&
+      (reconcileChildrenAtExpirationTime(
+        current,
+        workInProgress,
+        null,
+        renderExpirationTime
+      ),
+      (workInProgress.child = null));
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
     workInProgress.memoizedState = shouldUpdate.state;
     workInProgress.memoizedProps = shouldUpdate.props;
     hasContext && invalidateContextProvider(workInProgress, !0);
@@ -3340,25 +3314,6 @@ function ReactFiberBeginWork(
     }
     return workInProgress.child;
   }
-  function bailoutOnLowPriority(current, workInProgress) {
-    switch (workInProgress.tag) {
-      case 3:
-        pushHostRootContext(workInProgress);
-        break;
-      case 2:
-        pushContextProvider(workInProgress);
-        break;
-      case 4:
-        pushHostContainer(
-          workInProgress,
-          workInProgress.stateNode.containerInfo
-        );
-        break;
-      case 13:
-        pushProvider(workInProgress);
-    }
-    return null;
-  }
   var shouldSetTextContent = config.shouldSetTextContent,
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree,
     pushHostContext = hostContext.pushHostContext,
@@ -3381,14 +3336,32 @@ function ReactFiberBeginWork(
     callGetDerivedStateFromProps = config.callGetDerivedStateFromProps,
     constructClassInstance = config.constructClassInstance,
     mountClassInstance = config.mountClassInstance,
+    resumeMountClassInstance = config.resumeMountClassInstance,
     updateClassInstance = config.updateClassInstance;
   return {
     beginWork: function(current, workInProgress, renderExpirationTime) {
       if (
         0 === workInProgress.expirationTime ||
         workInProgress.expirationTime > renderExpirationTime
-      )
-        return bailoutOnLowPriority(current, workInProgress);
+      ) {
+        switch (workInProgress.tag) {
+          case 3:
+            pushHostRootContext(workInProgress);
+            break;
+          case 2:
+            pushContextProvider(workInProgress);
+            break;
+          case 4:
+            pushHostContainer(
+              workInProgress,
+              workInProgress.stateNode.containerInfo
+            );
+            break;
+          case 13:
+            pushProvider(workInProgress);
+        }
+        return null;
+      }
       switch (workInProgress.tag) {
         case 0:
           invariant(
@@ -3429,7 +3402,9 @@ function ReactFiberBeginWork(
                 current,
                 workInProgress,
                 !0,
-                props
+                props,
+                !1,
+                renderExpirationTime
               )))
             : ((workInProgress.tag = 1),
               reconcileChildren(current, workInProgress, fn),
@@ -3456,92 +3431,117 @@ function ReactFiberBeginWork(
             current
           );
         case 2:
-          return (
-            (props = pushContextProvider(workInProgress)),
-            (fn = void 0),
-            null === current
-              ? workInProgress.stateNode
-                ? invariant(!1, "Resuming work not yet implemented.")
-                : (constructClassInstance(
-                    workInProgress,
-                    workInProgress.pendingProps
-                  ),
-                  mountClassInstance(workInProgress, renderExpirationTime),
-                  (fn = !0))
-              : (fn = updateClassInstance(
-                  current,
+          props = pushContextProvider(workInProgress);
+          null === current
+            ? null === workInProgress.stateNode
+              ? (constructClassInstance(
+                  workInProgress,
+                  workInProgress.pendingProps
+                ),
+                mountClassInstance(workInProgress, renderExpirationTime),
+                (fn = !0))
+              : (fn = resumeMountClassInstance(
                   workInProgress,
                   renderExpirationTime
-                )),
-            finishClassComponent(current, workInProgress, fn, props)
-          );
+                ))
+            : (fn = updateClassInstance(
+                current,
+                workInProgress,
+                renderExpirationTime
+              ));
+          unmaskedContext = !1;
+          var updateQueue = workInProgress.updateQueue;
+          null !== updateQueue &&
+            null !== updateQueue.capturedValues &&
+            (unmaskedContext = fn = !0);
+          return finishClassComponent(
+            current,
+            workInProgress,
+            fn,
+            props,
+            unmaskedContext,
+            renderExpirationTime
+          );
         case 3:
-          return (
-            pushHostRootContext(workInProgress),
-            (props = workInProgress.updateQueue),
-            null !== props
-              ? ((fn = workInProgress.memoizedState),
-                (props = processUpdateQueue(
-                  current,
+          a: if (
+            (pushHostRootContext(workInProgress),
+            (fn = workInProgress.updateQueue),
+            null !== fn)
+          ) {
+            unmaskedContext = workInProgress.memoizedState;
+            props = processUpdateQueue(
+              current,
+              workInProgress,
+              fn,
+              null,
+              null,
+              renderExpirationTime
+            );
+            workInProgress.memoizedState = props;
+            fn = workInProgress.updateQueue;
+            if (null !== fn && null !== fn.capturedValues) fn = null;
+            else if (unmaskedContext === props) {
+              resetHydrationState();
+              current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+              break a;
+            } else fn = props.element;
+            unmaskedContext = workInProgress.stateNode;
+            (null === current || null === current.child) &&
+            unmaskedContext.hydrate &&
+            enterHydrationState(workInProgress)
+              ? ((workInProgress.effectTag |= 2),
+                (workInProgress.child = mountChildFibers(
                   workInProgress,
-                  props,
-                  null,
                   null,
+                  fn,
                   renderExpirationTime
-                )),
-                fn === props
-                  ? (resetHydrationState(),
-                    (current = bailoutOnAlreadyFinishedWork(
-                      current,
-                      workInProgress
-                    )))
-                  : ((fn = props.element),
-                    (unmaskedContext = workInProgress.stateNode),
-                    (null === current || null === current.child) &&
-                    unmaskedContext.hydrate &&
-                    enterHydrationState(workInProgress)
-                      ? ((workInProgress.effectTag |= 2),
-                        (workInProgress.child = mountChildFibers(
-                          workInProgress,
-                          null,
-                          fn,
-                          renderExpirationTime
-                        )))
-                      : (resetHydrationState(),
-                        reconcileChildren(current, workInProgress, fn)),
-                    (workInProgress.memoizedState = props),
-                    (current = workInProgress.child)))
+                )))
               : (resetHydrationState(),
-                (current = bailoutOnAlreadyFinishedWork(
-                  current,
-                  workInProgress
-                ))),
-            current
-          );
+                reconcileChildren(current, workInProgress, fn));
+            workInProgress.memoizedState = props;
+            current = workInProgress.child;
+          } else
+            resetHydrationState(),
+              (current = bailoutOnAlreadyFinishedWork(current, workInProgress));
+          return current;
         case 5:
-          pushHostContext(workInProgress);
-          null === current && tryToClaimNextHydratableInstance(workInProgress);
-          props = workInProgress.type;
-          var memoizedProps = workInProgress.memoizedProps;
-          fn = workInProgress.pendingProps;
-          unmaskedContext = null !== current ? current.memoizedProps : null;
-          didPerformWorkStackCursor.current || memoizedProps !== fn
-            ? ((memoizedProps = fn.children),
-              shouldSetTextContent(props, fn)
-                ? (memoizedProps = null)
-                : unmaskedContext &&
-                  shouldSetTextContent(props, unmaskedContext) &&
-                  (workInProgress.effectTag |= 16),
-              markRef(current, workInProgress),
-              1073741823 !== renderExpirationTime &&
-              workInProgress.mode & 1 &&
-              shouldDeprioritizeSubtree(props, fn)
-                ? ((workInProgress.expirationTime = 1073741823),
-                  (current = null))
-                : (reconcileChildren(current, workInProgress, memoizedProps),
-                  (workInProgress.memoizedProps = fn),
-                  (current = workInProgress.child)))
-            : (current = bailoutOnAlreadyFinishedWork(current, workInProgress));
+          a: {
+            pushHostContext(workInProgress);
+            null === current &&
+              tryToClaimNextHydratableInstance(workInProgress);
+            props = workInProgress.type;
+            updateQueue = workInProgress.memoizedProps;
+            fn = workInProgress.pendingProps;
+            unmaskedContext = null !== current ? current.memoizedProps : null;
+            if (!didPerformWorkStackCursor.current && updateQueue === fn) {
+              if (
+                (updateQueue =
+                  workInProgress.mode & 1 &&
+                  shouldDeprioritizeSubtree(props, fn))
+              )
+                workInProgress.expirationTime = 1073741823;
+              if (!updateQueue || 1073741823 !== renderExpirationTime) {
+                current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+                break a;
+              }
+            }
+            updateQueue = fn.children;
+            shouldSetTextContent(props, fn)
+              ? (updateQueue = null)
+              : unmaskedContext &&
+                shouldSetTextContent(props, unmaskedContext) &&
+                (workInProgress.effectTag |= 16);
+            markRef(current, workInProgress);
+            1073741823 !== renderExpirationTime &&
+            workInProgress.mode & 1 &&
+            shouldDeprioritizeSubtree(props, fn)
+              ? ((workInProgress.expirationTime = 1073741823),
+                (workInProgress.memoizedProps = fn),
+                (current = null))
+              : (reconcileChildren(current, workInProgress, updateQueue),
+                (workInProgress.memoizedProps = fn),
+                (current = workInProgress.child));
+          }
           return current;
         case 6:
           return (
@@ -3646,28 +3646,28 @@ function ReactFiberBeginWork(
           unmaskedContext = workInProgress.memoizedProps;
           if (didPerformWorkStackCursor.current || unmaskedContext !== fn) {
             workInProgress.memoizedProps = fn;
-            memoizedProps = fn.value;
-            if (null === unmaskedContext) memoizedProps = 1073741823;
+            updateQueue = fn.value;
+            if (null === unmaskedContext) updateQueue = 1073741823;
             else {
               var oldValue = unmaskedContext.value;
-              (oldValue === memoizedProps &&
-                (0 !== oldValue || 1 / oldValue === 1 / memoizedProps)) ||
-              (oldValue !== oldValue && memoizedProps !== memoizedProps)
-                ? (memoizedProps = 0)
-                : ((memoizedProps =
+              (oldValue === updateQueue &&
+                (0 !== oldValue || 1 / oldValue === 1 / updateQueue)) ||
+              (oldValue !== oldValue && updateQueue !== updateQueue)
+                ? (updateQueue = 0)
+                : ((updateQueue =
                     "function" === typeof props.calculateChangedBits
-                      ? props.calculateChangedBits(oldValue, memoizedProps)
+                      ? props.calculateChangedBits(oldValue, updateQueue)
                       : 1073741823),
-                  (memoizedProps |= 0),
-                  0 !== memoizedProps &&
+                  (updateQueue |= 0),
+                  0 !== updateQueue &&
                     propagateContextChange(
                       workInProgress,
                       props,
-                      memoizedProps,
+                      updateQueue,
                       renderExpirationTime
                     ));
             }
-            workInProgress.stateNode = memoizedProps;
+            workInProgress.stateNode = updateQueue;
             pushProvider(workInProgress);
             null !== unmaskedContext && unmaskedContext.children === fn.children
               ? (current = bailoutOnAlreadyFinishedWork(
@@ -3685,12 +3685,12 @@ function ReactFiberBeginWork(
           unmaskedContext = workInProgress.type;
           fn = workInProgress.pendingProps;
           props = unmaskedContext.currentValue;
-          memoizedProps = unmaskedContext.changedBits;
-          0 !== memoizedProps &&
+          updateQueue = unmaskedContext.changedBits;
+          0 !== updateQueue &&
             propagateContextChange(
               workInProgress,
               unmaskedContext,
-              memoizedProps,
+              updateQueue,
               renderExpirationTime
             );
           renderExpirationTime = fn.observedBits;
@@ -3698,6 +3698,11 @@ function ReactFiberBeginWork(
             renderExpirationTime = 1073741823;
           workInProgress.stateNode = renderExpirationTime;
           renderExpirationTime = fn.children;
+          "function" !== typeof renderExpirationTime &&
+            invariant(
+              !1,
+              "A context consumer was rendered with multiple children, or a child that isn't a function. A context consumer expects a single child that is a function. If you did pass a function, make sure there is no trailing or leading whitespace around it."
+            );
           renderExpirationTime = renderExpirationTime(props);
           reconcileChildren(current, workInProgress, renderExpirationTime);
           return workInProgress.child;
@@ -3707,47 +3712,6 @@ function ReactFiberBeginWork(
             "Unknown unit of work tag. This error is likely caused by a bug in React. Please file an issue."
           );
       }
-    },
-    beginFailedWork: function(current, workInProgress, renderExpirationTime) {
-      switch (workInProgress.tag) {
-        case 2:
-          pushContextProvider(workInProgress);
-          break;
-        case 3:
-          pushHostRootContext(workInProgress);
-          break;
-        default:
-          invariant(
-            !1,
-            "Invalid type of work. This error is likely caused by a bug in React. Please file an issue."
-          );
-      }
-      workInProgress.effectTag |= 64;
-      null === current
-        ? (workInProgress.child = null)
-        : workInProgress.child !== current.child &&
-          (workInProgress.child = current.child);
-      if (
-        0 === workInProgress.expirationTime ||
-        workInProgress.expirationTime > renderExpirationTime
-      )
-        return bailoutOnLowPriority(current, workInProgress);
-      workInProgress.firstEffect = null;
-      workInProgress.lastEffect = null;
-      workInProgress.child =
-        null === current
-          ? mountChildFibers(workInProgress, null, null, renderExpirationTime)
-          : reconcileChildFibers(
-              workInProgress,
-              current.child,
-              null,
-              renderExpirationTime
-            );
-      2 === workInProgress.tag &&
-        ((current = workInProgress.stateNode),
-        (workInProgress.memoizedProps = current.props),
-        (workInProgress.memoizedState = current.state));
-      return workInProgress.child;
     }
   };
 }
@@ -3804,30 +3768,26 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
       if (null !== workInProgress.firstEffect) {
         var container = portalOrRoot.containerInfo,
           newChildSet = createContainerChildSet(container);
-        finalizeContainerChildren(container, newChildSet) &&
-          markUpdate(workInProgress);
-        portalOrRoot.pendingChildren = newChildSet;
-        a: for (portalOrRoot = workInProgress.child; null !== portalOrRoot; ) {
-          if (5 === portalOrRoot.tag || 6 === portalOrRoot.tag)
-            appendChildToContainerChildSet(newChildSet, portalOrRoot.stateNode);
-          else if (4 !== portalOrRoot.tag && null !== portalOrRoot.child) {
-            portalOrRoot.child["return"] = portalOrRoot;
-            portalOrRoot = portalOrRoot.child;
+        a: for (var node = workInProgress.child; null !== node; ) {
+          if (5 === node.tag || 6 === node.tag)
+            appendChildToContainerChildSet(newChildSet, node.stateNode);
+          else if (4 !== node.tag && null !== node.child) {
+            node.child["return"] = node;
+            node = node.child;
             continue;
           }
-          if (portalOrRoot === workInProgress) break a;
-          for (; null === portalOrRoot.sibling; ) {
-            if (
-              null === portalOrRoot["return"] ||
-              portalOrRoot["return"] === workInProgress
-            )
+          if (node === workInProgress) break a;
+          for (; null === node.sibling; ) {
+            if (null === node["return"] || node["return"] === workInProgress)
               break a;
-            portalOrRoot = portalOrRoot["return"];
+            node = node["return"];
           }
-          portalOrRoot.sibling["return"] = portalOrRoot["return"];
-          portalOrRoot = portalOrRoot.sibling;
+          node.sibling["return"] = node["return"];
+          node = node.sibling;
         }
+        portalOrRoot.pendingChildren = newChildSet;
         markUpdate(workInProgress);
+        finalizeContainerChildren(container, newChildSet);
       }
     };
     updateHostComponent = function(
@@ -3886,7 +3846,18 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
         case 1:
           return null;
         case 2:
-          return popContextProvider(workInProgress), null;
+          return (
+            popContextProvider(workInProgress),
+            (current = workInProgress.stateNode),
+            (newProps = workInProgress.updateQueue),
+            null !== newProps &&
+              null !== newProps.capturedValues &&
+              ((workInProgress.effectTag &= -65),
+              "function" === typeof current.componentDidCatch
+                ? (workInProgress.effectTag |= 256)
+                : (newProps.capturedValues = null)),
+            null
+          );
         case 3:
           popHostContainer(workInProgress);
           pop(didPerformWorkStackCursor, workInProgress);
@@ -3898,6 +3869,10 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           if (null === current || null === current.child)
             popHydrationState(workInProgress), (workInProgress.effectTag &= -3);
           updateHostContainer(workInProgress);
+          current = workInProgress.updateQueue;
+          null !== current &&
+            null !== current.capturedValues &&
+            (workInProgress.effectTag |= 256);
           return null;
         case 5:
           popHostContext(workInProgress);
@@ -3905,10 +3880,10 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           var type = workInProgress.type;
           if (null !== current && null != workInProgress.stateNode) {
             var oldProps = current.memoizedProps,
-              instance = workInProgress.stateNode,
+              _instance = workInProgress.stateNode,
               currentHostContext = getHostContext();
-            instance = prepareUpdate(
-              instance,
+            _instance = prepareUpdate(
+              _instance,
               type,
               oldProps,
               newProps,
@@ -3918,7 +3893,7 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
             updateHostComponent(
               current,
               workInProgress,
-              instance,
+              _instance,
               type,
               oldProps,
               newProps,
@@ -4066,7 +4041,102 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
     }
   };
 }
-function ReactFiberCommitWork(config, captureError) {
+function ReactFiberUnwindWork(
+  hostContext,
+  scheduleWork,
+  isAlreadyFailedLegacyErrorBoundary
+) {
+  var popHostContainer = hostContext.popHostContainer,
+    popHostContext = hostContext.popHostContext;
+  return {
+    throwException: function(returnFiber, sourceFiber, rawValue) {
+      sourceFiber.effectTag |= 512;
+      sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+      sourceFiber = {
+        value: rawValue,
+        source: sourceFiber,
+        stack: getStackAddendumByWorkInProgressFiber(sourceFiber)
+      };
+      do {
+        switch (returnFiber.tag) {
+          case 3:
+            ensureUpdateQueues(returnFiber);
+            returnFiber.updateQueue.capturedValues = [sourceFiber];
+            returnFiber.effectTag |= 1024;
+            return;
+          case 2:
+            if (
+              ((rawValue = returnFiber.stateNode),
+              0 === (returnFiber.effectTag & 64) &&
+                null !== rawValue &&
+                "function" === typeof rawValue.componentDidCatch &&
+                !isAlreadyFailedLegacyErrorBoundary(rawValue))
+            ) {
+              ensureUpdateQueues(returnFiber);
+              rawValue = returnFiber.updateQueue;
+              var capturedValues = rawValue.capturedValues;
+              null === capturedValues
+                ? (rawValue.capturedValues = [sourceFiber])
+                : capturedValues.push(sourceFiber);
+              returnFiber.effectTag |= 1024;
+              return;
+            }
+        }
+        returnFiber = returnFiber["return"];
+      } while (null !== returnFiber);
+    },
+    unwindWork: function(workInProgress) {
+      switch (workInProgress.tag) {
+        case 2:
+          popContextProvider(workInProgress);
+          var effectTag = workInProgress.effectTag;
+          return effectTag & 1024
+            ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
+              workInProgress)
+            : null;
+        case 3:
+          return (
+            popHostContainer(workInProgress),
+            pop(didPerformWorkStackCursor, workInProgress),
+            pop(contextStackCursor, workInProgress),
+            (effectTag = workInProgress.effectTag),
+            effectTag & 1024
+              ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
+                workInProgress)
+              : null
+          );
+        case 5:
+          return popHostContext(workInProgress), null;
+        case 4:
+          return popHostContainer(workInProgress), null;
+        case 13:
+          return popProvider(workInProgress), null;
+        default:
+          return null;
+      }
+    }
+  };
+}
+function logError(boundary, errorInfo) {
+  var source = errorInfo.source;
+  null === errorInfo.stack && getStackAddendumByWorkInProgressFiber(source);
+  null !== source && getComponentName(source);
+  errorInfo = errorInfo.value;
+  null !== boundary && getComponentName(boundary);
+  try {
+    (errorInfo && errorInfo.suppressReactErrorLogging) ||
+      console.error(errorInfo);
+  } catch (e) {
+    (e && e.suppressReactErrorLogging) || console.error(e);
+  }
+}
+function ReactFiberCommitWork(
+  config,
+  captureError,
+  scheduleWork,
+  computeExpirationForFiber,
+  markLegacyErrorBoundaryAsFailed
+) {
   function safelyDetachRef(current) {
     var ref = current.ref;
     if (null !== ref)
@@ -4078,46 +4148,46 @@ function ReactFiberCommitWork(config, captureError) {
         }
       else ref.value = null;
   }
-  function commitLifeCycles(current, finishedWork) {
+  function commitLifeCycles(finishedRoot, current, finishedWork) {
     switch (finishedWork.tag) {
       case 2:
-        var instance = finishedWork.stateNode;
+        finishedRoot = finishedWork.stateNode;
         if (finishedWork.effectTag & 4)
           if (null === current)
-            (instance.props = finishedWork.memoizedProps),
-              (instance.state = finishedWork.memoizedState),
-              instance.componentDidMount();
+            (finishedRoot.props = finishedWork.memoizedProps),
+              (finishedRoot.state = finishedWork.memoizedState),
+              finishedRoot.componentDidMount();
           else {
             var prevProps = current.memoizedProps;
             current = current.memoizedState;
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            instance.componentDidUpdate(prevProps, current);
+            finishedRoot.props = finishedWork.memoizedProps;
+            finishedRoot.state = finishedWork.memoizedState;
+            finishedRoot.componentDidUpdate(prevProps, current);
           }
         finishedWork = finishedWork.updateQueue;
-        null !== finishedWork && commitCallbacks(finishedWork, instance);
+        null !== finishedWork && commitCallbacks(finishedWork, finishedRoot);
         break;
       case 3:
-        instance = finishedWork.updateQueue;
-        if (null !== instance) {
-          current = null;
+        current = finishedWork.updateQueue;
+        if (null !== current) {
+          finishedRoot = null;
           if (null !== finishedWork.child)
             switch (finishedWork.child.tag) {
               case 5:
-                current = getPublicInstance(finishedWork.child.stateNode);
+                finishedRoot = getPublicInstance(finishedWork.child.stateNode);
                 break;
               case 2:
-                current = finishedWork.child.stateNode;
+                finishedRoot = finishedWork.child.stateNode;
             }
-          commitCallbacks(instance, current);
+          commitCallbacks(current, finishedRoot);
         }
         break;
       case 5:
-        instance = finishedWork.stateNode;
+        finishedRoot = finishedWork.stateNode;
         null === current &&
           finishedWork.effectTag & 4 &&
           commitMount(
-            instance,
+            finishedRoot,
             finishedWork.type,
             finishedWork.memoizedProps,
             finishedWork
@@ -4134,16 +4204,59 @@ function ReactFiberCommitWork(config, captureError) {
         );
     }
   }
+  function commitErrorLogging(finishedWork, onUncaughtError) {
+    switch (finishedWork.tag) {
+      case 2:
+        var ctor = finishedWork.type;
+        onUncaughtError = finishedWork.stateNode;
+        var updateQueue = finishedWork.updateQueue;
+        invariant(
+          null !== updateQueue && null !== updateQueue.capturedValues,
+          "An error logging effect should not have been scheduled if no errors were captured. This error is likely caused by a bug in React. Please file an issue."
+        );
+        var capturedErrors = updateQueue.capturedValues;
+        updateQueue.capturedValues = null;
+        "function" !== typeof ctor.getDerivedStateFromCatch &&
+          markLegacyErrorBoundaryAsFailed(onUncaughtError);
+        onUncaughtError.props = finishedWork.memoizedProps;
+        onUncaughtError.state = finishedWork.memoizedState;
+        for (ctor = 0; ctor < capturedErrors.length; ctor++) {
+          updateQueue = capturedErrors[ctor];
+          var _error = updateQueue.value;
+          logError(finishedWork, updateQueue);
+          onUncaughtError.componentDidCatch(_error);
+        }
+        break;
+      case 3:
+        ctor = finishedWork.updateQueue;
+        invariant(
+          null !== ctor && null !== ctor.capturedValues,
+          "An error logging effect should not have been scheduled if no errors were captured. This error is likely caused by a bug in React. Please file an issue."
+        );
+        capturedErrors = ctor.capturedValues;
+        ctor.capturedValues = null;
+        for (ctor = 0; ctor < capturedErrors.length; ctor++)
+          (updateQueue = capturedErrors[ctor]),
+            logError(finishedWork, updateQueue),
+            onUncaughtError(updateQueue.value);
+        break;
+      default:
+        invariant(
+          !1,
+          "This unit of work tag cannot capture errors.  This error is likely caused by a bug in React. Please file an issue."
+        );
+    }
+  }
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (null !== ref) {
-      var instance = finishedWork.stateNode;
+      var _instance5 = finishedWork.stateNode;
       switch (finishedWork.tag) {
         case 5:
-          finishedWork = getPublicInstance(instance);
+          finishedWork = getPublicInstance(_instance5);
           break;
         default:
-          finishedWork = instance;
+          finishedWork = _instance5;
       }
       "function" === typeof ref
         ? ref(finishedWork)
@@ -4162,12 +4275,12 @@ function ReactFiberCommitWork(config, captureError) {
       switch (current.tag) {
         case 2:
           safelyDetachRef(current);
-          var instance = current.stateNode;
-          if ("function" === typeof instance.componentWillUnmount)
+          var _instance6 = current.stateNode;
+          if ("function" === typeof _instance6.componentWillUnmount)
             try {
-              (instance.props = current.memoizedProps),
-                (instance.state = current.memoizedState),
-                instance.componentWillUnmount();
+              (_instance6.props = current.memoizedProps),
+                (_instance6.state = current.memoizedState),
+                _instance6.componentWillUnmount();
             } catch (unmountError) {
               captureError(current, unmountError);
             }
@@ -4245,6 +4358,7 @@ function ReactFiberCommitWork(config, captureError) {
         commitContainer(finishedWork);
       },
       commitLifeCycles: commitLifeCycles,
+      commitErrorLogging: commitErrorLogging,
       commitAttachRef: commitAttachRef,
       commitDetachRef: commitDetachRef
     };
@@ -4459,55 +4573,101 @@ function ReactFiberHydrationContext(config) {
   };
 }
 function ReactFiberScheduler(config) {
+  function resetContextStack() {
+    for (; -1 < index; ) (valueStack[index] = null), index--;
+    previousContext = emptyObject;
+    contextStackCursor.current = emptyObject;
+    didPerformWorkStackCursor.current = !1;
+    resetHostContainer();
+    for (var i = index$1; -1 < i; i--) {
+      var context = stack[i].type.context;
+      context.currentValue = context.defaultValue;
+      context.changedBits = 0;
+      changedBitsStack[i] = null;
+      currentValueStack[i] = null;
+      stack[i] = null;
+    }
+    index$1 = -1;
+    nextRoot = null;
+    nextRenderExpirationTime = 0;
+    nextUnitOfWork = null;
+    isRootReadyForCommit = !1;
+  }
+  function isAlreadyFailedLegacyErrorBoundary(instance) {
+    return (
+      null !== legacyErrorBoundariesThatAlreadyFailed &&
+      legacyErrorBoundariesThatAlreadyFailed.has(instance)
+    );
+  }
   function completeUnitOfWork(workInProgress$jscomp$0) {
     for (;;) {
-      var next = completeWork(
-          workInProgress$jscomp$0.alternate,
-          workInProgress$jscomp$0,
-          nextRenderExpirationTime
-        ),
+      var current = workInProgress$jscomp$0.alternate,
         returnFiber = workInProgress$jscomp$0["return"],
         siblingFiber = workInProgress$jscomp$0.sibling;
-      var workInProgress = workInProgress$jscomp$0;
-      if (
-        1073741823 === nextRenderExpirationTime ||
-        1073741823 !== workInProgress.expirationTime
-      ) {
-        if (2 !== workInProgress.tag && 3 !== workInProgress.tag)
-          var newExpirationTime = 0;
-        else
-          (newExpirationTime = workInProgress.updateQueue),
-            (newExpirationTime =
-              null === newExpirationTime
-                ? 0
-                : newExpirationTime.expirationTime);
-        for (var child = workInProgress.child; null !== child; )
-          0 !== child.expirationTime &&
-            (0 === newExpirationTime ||
-              newExpirationTime > child.expirationTime) &&
-            (newExpirationTime = child.expirationTime),
-            (child = child.sibling);
-        workInProgress.expirationTime = newExpirationTime;
-      }
-      if (null !== next) return next;
-      null !== returnFiber &&
-        (null === returnFiber.firstEffect &&
-          (returnFiber.firstEffect = workInProgress$jscomp$0.firstEffect),
-        null !== workInProgress$jscomp$0.lastEffect &&
-          (null !== returnFiber.lastEffect &&
-            (returnFiber.lastEffect.nextEffect =
-              workInProgress$jscomp$0.firstEffect),
-          (returnFiber.lastEffect = workInProgress$jscomp$0.lastEffect)),
-        1 < workInProgress$jscomp$0.effectTag &&
-          (null !== returnFiber.lastEffect
-            ? (returnFiber.lastEffect.nextEffect = workInProgress$jscomp$0)
-            : (returnFiber.firstEffect = workInProgress$jscomp$0),
-          (returnFiber.lastEffect = workInProgress$jscomp$0)));
-      if (null !== siblingFiber) return siblingFiber;
-      if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
-      else {
-        workInProgress$jscomp$0.stateNode.isReadyForCommit = !0;
-        break;
+      if (0 === (workInProgress$jscomp$0.effectTag & 512)) {
+        current = completeWork(
+          current,
+          workInProgress$jscomp$0,
+          nextRenderExpirationTime
+        );
+        var workInProgress = workInProgress$jscomp$0;
+        if (
+          1073741823 === nextRenderExpirationTime ||
+          1073741823 !== workInProgress.expirationTime
+        ) {
+          b: switch (workInProgress.tag) {
+            case 3:
+            case 2:
+              var newExpirationTime = workInProgress.updateQueue;
+              newExpirationTime =
+                null === newExpirationTime
+                  ? 0
+                  : newExpirationTime.expirationTime;
+              break b;
+            default:
+              newExpirationTime = 0;
+          }
+          for (var child = workInProgress.child; null !== child; )
+            0 !== child.expirationTime &&
+              (0 === newExpirationTime ||
+                newExpirationTime > child.expirationTime) &&
+              (newExpirationTime = child.expirationTime),
+              (child = child.sibling);
+          workInProgress.expirationTime = newExpirationTime;
+        }
+        if (null !== current) return current;
+        null !== returnFiber &&
+          0 === (returnFiber.effectTag & 512) &&
+          (null === returnFiber.firstEffect &&
+            (returnFiber.firstEffect = workInProgress$jscomp$0.firstEffect),
+          null !== workInProgress$jscomp$0.lastEffect &&
+            (null !== returnFiber.lastEffect &&
+              (returnFiber.lastEffect.nextEffect =
+                workInProgress$jscomp$0.firstEffect),
+            (returnFiber.lastEffect = workInProgress$jscomp$0.lastEffect)),
+          1 < workInProgress$jscomp$0.effectTag &&
+            (null !== returnFiber.lastEffect
+              ? (returnFiber.lastEffect.nextEffect = workInProgress$jscomp$0)
+              : (returnFiber.firstEffect = workInProgress$jscomp$0),
+            (returnFiber.lastEffect = workInProgress$jscomp$0)));
+        if (null !== siblingFiber) return siblingFiber;
+        if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
+        else {
+          isRootReadyForCommit = !0;
+          break;
+        }
+      } else {
+        workInProgress$jscomp$0 = unwindWork(workInProgress$jscomp$0);
+        if (null !== workInProgress$jscomp$0)
+          return (
+            (workInProgress$jscomp$0.effectTag &= 511), workInProgress$jscomp$0
+          );
+        null !== returnFiber &&
+          ((returnFiber.firstEffect = returnFiber.lastEffect = null),
+          (returnFiber.effectTag |= 512));
+        if (null !== siblingFiber) return siblingFiber;
+        if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
+        else break;
       }
     }
     return null;
@@ -4522,247 +4682,114 @@ function ReactFiberScheduler(config) {
     ReactCurrentOwner.current = null;
     return next;
   }
-  function performFailedUnitOfWork(workInProgress) {
-    var next = beginFailedWork(
-      workInProgress.alternate,
-      workInProgress,
-      nextRenderExpirationTime
-    );
-    null === next && (next = completeUnitOfWork(workInProgress));
-    ReactCurrentOwner.current = null;
-    return next;
-  }
-  function workLoop(isAsync) {
-    if (null !== capturedErrors)
-      if (isAsync)
-        for (; null !== nextUnitOfWork && !shouldYield(); )
-          nextUnitOfWork = hasCapturedError(nextUnitOfWork)
-            ? performFailedUnitOfWork(nextUnitOfWork)
-            : performUnitOfWork(nextUnitOfWork);
-      else
-        for (; null !== nextUnitOfWork; )
-          nextUnitOfWork = hasCapturedError(nextUnitOfWork)
-            ? performFailedUnitOfWork(nextUnitOfWork)
-            : performUnitOfWork(nextUnitOfWork);
-    else if (isAsync)
-      for (; null !== nextUnitOfWork && !shouldYield(); )
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-    else
-      for (; null !== nextUnitOfWork; )
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-  }
   function renderRoot(root, expirationTime, isAsync) {
     invariant(
       !isWorking,
       "renderRoot was called recursively. This error is likely caused by a bug in React. Please file an issue."
     );
     isWorking = !0;
-    root.isReadyForCommit = !1;
     if (
-      root !== nextRoot ||
       expirationTime !== nextRenderExpirationTime ||
+      root !== nextRoot ||
       null === nextUnitOfWork
-    ) {
-      for (; -1 < index; ) (valueStack[index] = null), index--;
-      previousContext = emptyObject;
-      contextStackCursor.current = emptyObject;
-      didPerformWorkStackCursor.current = !1;
-      for (var i = index$1; -1 < i; i--) {
-        var context = stack[i].type.context;
-        context.currentValue = context.defaultValue;
-        context.changedBits = 0;
-        changedBitsStack[i] = null;
-        currentValueStack[i] = null;
-        stack[i] = null;
-      }
-      index$1 = -1;
-      resetHostContainer();
-      nextRoot = root;
-      nextRenderExpirationTime = expirationTime;
-      nextUnitOfWork = createWorkInProgress(
-        nextRoot.current,
-        null,
-        expirationTime
-      );
-    }
-    i = !1;
-    context = null;
-    try {
-      workLoop(isAsync);
-    } catch (e) {
-      (i = !0), (context = e);
-    }
-    for (; i; ) {
-      if (didFatal) {
-        firstUncaughtError = context;
-        break;
-      }
-      expirationTime = nextUnitOfWork;
-      if (null === expirationTime) didFatal = !0;
-      else {
-        var boundary = captureError(expirationTime, context);
-        invariant(
-          null !== boundary,
-          "Should have found an error boundary. This error is likely caused by a bug in React. Please file an issue."
-        );
-        if (!didFatal) {
-          try {
-            i = boundary;
-            context = isAsync;
-            for (boundary = i; null !== expirationTime; ) {
-              switch (expirationTime.tag) {
-                case 2:
-                  popContextProvider(expirationTime);
-                  break;
-                case 5:
-                  popHostContext(expirationTime);
-                  break;
-                case 3:
-                  popHostContainer(expirationTime);
-                  break;
-                case 4:
-                  popHostContainer(expirationTime);
-                  break;
-                case 13:
-                  popProvider(expirationTime);
-              }
-              if (
-                expirationTime === boundary ||
-                expirationTime.alternate === boundary
-              )
-                break;
-              expirationTime = expirationTime["return"];
-            }
-            nextUnitOfWork = performFailedUnitOfWork(i);
-            workLoop(context);
-          } catch (e) {
-            i = !0;
-            context = e;
-            continue;
-          }
+    )
+      resetContextStack(),
+        (nextRoot = root),
+        (nextRenderExpirationTime = expirationTime),
+        (nextUnitOfWork = createWorkInProgress(
+          nextRoot.current,
+          null,
+          nextRenderExpirationTime
+        )),
+        (root.pendingCommitExpirationTime = 0);
+    var didFatal = !1;
+    do {
+      try {
+        if (isAsync)
+          for (; null !== nextUnitOfWork && !shouldYield(); )
+            nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
+        else
+          for (; null !== nextUnitOfWork; )
+            nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
+      } catch (thrownValue) {
+        if (null === nextUnitOfWork) {
+          didFatal = !0;
+          onUncaughtError(thrownValue);
           break;
         }
-      }
-    }
-    isAsync = firstUncaughtError;
-    didFatal = isWorking = !1;
-    firstUncaughtError = null;
-    null !== isAsync && onUncaughtError(isAsync);
-    return root.isReadyForCommit ? root.current.alternate : null;
-  }
-  function captureError(failedWork, error$jscomp$0) {
-    var boundary = (ReactCurrentOwner.current = null),
-      errorBoundaryFound = !1,
-      willRetry = !1,
-      errorBoundaryName = null;
-    if (3 === failedWork.tag)
-      (boundary = failedWork), isFailedBoundary(failedWork) && (didFatal = !0);
-    else
-      for (
-        var node = failedWork["return"];
-        null !== node && null === boundary;
-
-      ) {
-        2 === node.tag
-          ? "function" === typeof node.stateNode.componentDidCatch &&
-            ((errorBoundaryFound = !0),
-            (errorBoundaryName = getComponentName(node)),
-            (boundary = node),
-            (willRetry = !0))
-          : 3 === node.tag && (boundary = node);
-        if (isFailedBoundary(node)) {
-          if (
-            isUnmounting ||
-            (null !== commitPhaseBoundaries &&
-              (commitPhaseBoundaries.has(node) ||
-                (null !== node.alternate &&
-                  commitPhaseBoundaries.has(node.alternate))))
-          )
-            return null;
-          boundary = null;
-          willRetry = !1;
+        isAsync = nextUnitOfWork;
+        var returnFiber = isAsync["return"];
+        if (null === returnFiber) {
+          didFatal = !0;
+          onUncaughtError(thrownValue);
+          break;
         }
-        node = node["return"];
+        throwException(returnFiber, isAsync, thrownValue);
+        nextUnitOfWork = completeUnitOfWork(isAsync);
       }
-    if (null !== boundary) {
-      null === failedBoundaries && (failedBoundaries = new Set());
-      failedBoundaries.add(boundary);
-      var info = "";
-      node = failedWork;
-      do {
-        a: switch (node.tag) {
-          case 0:
-          case 1:
+      break;
+    } while (1);
+    isWorking = !1;
+    if (didFatal || null !== nextUnitOfWork) return null;
+    if (isRootReadyForCommit)
+      return (
+        (root.pendingCommitExpirationTime = expirationTime),
+        root.current.alternate
+      );
+    invariant(
+      !1,
+      "Expired work should have completed. This error is likely caused by a bug in React. Please file an issue."
+    );
+  }
+  function scheduleCapture(sourceFiber, boundaryFiber, value, expirationTime) {
+    sourceFiber = {
+      value: value,
+      source: sourceFiber,
+      stack: getStackAddendumByWorkInProgressFiber(sourceFiber)
+    };
+    insertUpdateIntoFiber(boundaryFiber, {
+      expirationTime: expirationTime,
+      partialState: null,
+      callback: null,
+      isReplace: !1,
+      isForced: !1,
+      capturedValue: sourceFiber,
+      next: null
+    });
+    scheduleWork(boundaryFiber, expirationTime);
+  }
+  function onCommitPhaseError(fiber$jscomp$0, error) {
+    a: {
+      invariant(
+        !isWorking || isCommitting,
+        "dispatch: Cannot dispatch during the render phase."
+      );
+      for (var fiber = fiber$jscomp$0["return"]; null !== fiber; ) {
+        switch (fiber.tag) {
           case 2:
-          case 5:
-            var owner = node._debugOwner,
-              source = node._debugSource;
-            var JSCompiler_inline_result = getComponentName(node);
-            var ownerName = null;
-            owner && (ownerName = getComponentName(owner));
-            owner = source;
-            JSCompiler_inline_result =
-              "\n    in " +
-              (JSCompiler_inline_result || "Unknown") +
-              (owner
-                ? " (at " +
-                  owner.fileName.replace(/^.*[\\\/]/, "") +
-                  ":" +
-                  owner.lineNumber +
-                  ")"
-                : ownerName ? " (created by " + ownerName + ")" : "");
+            var instance = fiber.stateNode;
+            if (
+              "function" === typeof fiber.type.getDerivedStateFromCatch ||
+              ("function" === typeof instance.componentDidCatch &&
+                !isAlreadyFailedLegacyErrorBoundary(instance))
+            ) {
+              scheduleCapture(fiber$jscomp$0, fiber, error, 1);
+              fiber$jscomp$0 = void 0;
+              break a;
+            }
+            break;
+          case 3:
+            scheduleCapture(fiber$jscomp$0, fiber, error, 1);
+            fiber$jscomp$0 = void 0;
             break a;
-          default:
-            JSCompiler_inline_result = "";
         }
-        info += JSCompiler_inline_result;
-        node = node["return"];
-      } while (node);
-      node = info;
-      failedWork = getComponentName(failedWork);
-      null === capturedErrors && (capturedErrors = new Map());
-      error$jscomp$0 = {
-        componentName: failedWork,
-        componentStack: node,
-        error: error$jscomp$0,
-        errorBoundary: errorBoundaryFound ? boundary.stateNode : null,
-        errorBoundaryFound: errorBoundaryFound,
-        errorBoundaryName: errorBoundaryName,
-        willRetry: willRetry
-      };
-      capturedErrors.set(boundary, error$jscomp$0);
-      try {
-        var error = error$jscomp$0.error;
-        (error && error.suppressReactErrorLogging) || console.error(error);
-      } catch (e) {
-        (e && e.suppressReactErrorLogging) || console.error(e);
+        fiber = fiber["return"];
       }
-      isCommitting
-        ? (null === commitPhaseBoundaries &&
-            (commitPhaseBoundaries = new Set()),
-          commitPhaseBoundaries.add(boundary))
-        : scheduleErrorRecovery(boundary);
-      return boundary;
+      3 === fiber$jscomp$0.tag &&
+        scheduleCapture(fiber$jscomp$0, fiber$jscomp$0, error, 1);
+      fiber$jscomp$0 = void 0;
     }
-    null === firstUncaughtError && (firstUncaughtError = error$jscomp$0);
-    return null;
-  }
-  function hasCapturedError(fiber) {
-    return (
-      null !== capturedErrors &&
-      (capturedErrors.has(fiber) ||
-        (null !== fiber.alternate && capturedErrors.has(fiber.alternate)))
-    );
-  }
-  function isFailedBoundary(fiber) {
-    return (
-      null !== failedBoundaries &&
-      (failedBoundaries.has(fiber) ||
-        (null !== fiber.alternate && failedBoundaries.has(fiber.alternate)))
-    );
-  }
-  function computeAsyncExpiration() {
-    return 20 * ((((recalculateCurrentTime() + 100) / 20) | 0) + 1);
+    return fiber$jscomp$0;
   }
   function computeExpirationForFiber(fiber) {
     fiber =
@@ -4773,7 +4800,7 @@ function ReactFiberScheduler(config) {
           : fiber.mode & 1
             ? isBatchingInteractiveUpdates
               ? 10 * ((((recalculateCurrentTime() + 50) / 10) | 0) + 1)
-              : computeAsyncExpiration()
+              : 25 * ((((recalculateCurrentTime() + 500) / 25) | 0) + 1)
             : 1;
     isBatchingInteractiveUpdates &&
       (0 === lowestPendingInteractiveExpirationTime ||
@@ -4782,39 +4809,41 @@ function ReactFiberScheduler(config) {
     return fiber;
   }
   function scheduleWork(fiber, expirationTime) {
-    return scheduleWorkImpl(fiber, expirationTime, !1);
-  }
-  function scheduleWorkImpl(fiber, expirationTime) {
-    for (; null !== fiber; ) {
-      if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
-        fiber.expirationTime = expirationTime;
-      null !== fiber.alternate &&
-        (0 === fiber.alternate.expirationTime ||
-          fiber.alternate.expirationTime > expirationTime) &&
-        (fiber.alternate.expirationTime = expirationTime);
-      if (null === fiber["return"])
-        if (3 === fiber.tag) {
-          var root = fiber.stateNode;
-          !isWorking &&
-            root === nextRoot &&
-            expirationTime < nextRenderExpirationTime &&
-            ((nextUnitOfWork = nextRoot = null),
-            (nextRenderExpirationTime = 0));
-          requestWork(root, expirationTime);
-          !isWorking &&
-            root === nextRoot &&
-            expirationTime < nextRenderExpirationTime &&
-            ((nextUnitOfWork = nextRoot = null),
-            (nextRenderExpirationTime = 0));
-        } else break;
-      fiber = fiber["return"];
+    a: {
+      for (; null !== fiber; ) {
+        if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
+          fiber.expirationTime = expirationTime;
+        null !== fiber.alternate &&
+          (0 === fiber.alternate.expirationTime ||
+            fiber.alternate.expirationTime > expirationTime) &&
+          (fiber.alternate.expirationTime = expirationTime);
+        if (null === fiber["return"])
+          if (3 === fiber.tag) {
+            var root = fiber.stateNode;
+            !isWorking &&
+              0 !== nextRenderExpirationTime &&
+              expirationTime < nextRenderExpirationTime &&
+              resetContextStack();
+            (nextRoot === root && isWorking) ||
+              requestWork(root, expirationTime);
+            nestedUpdateCount > NESTED_UPDATE_LIMIT &&
+              invariant(
+                !1,
+                "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
+              );
+          } else {
+            expirationTime = void 0;
+            break a;
+          }
+        fiber = fiber["return"];
+      }
+      expirationTime = void 0;
     }
-  }
-  function scheduleErrorRecovery(fiber) {
-    scheduleWorkImpl(fiber, 1, !0);
+    return expirationTime;
   }
   function recalculateCurrentTime() {
-    return (mostRecentCurrentTime = (((now() - startTime) / 10) | 0) + 2);
+    mostRecentCurrentTimeMs = now() - originalStartTimeMs;
+    return (mostRecentCurrentTime = ((mostRecentCurrentTimeMs / 10) | 0) + 2);
   }
   function syncUpdates(fn, a, b, c, d) {
     var previousExpirationContext = expirationContext;
@@ -4830,18 +4859,13 @@ function ReactFiberScheduler(config) {
       if (expirationTime > callbackExpirationTime) return;
       cancelDeferredCallback(callbackID);
     }
-    var currentMs = now() - startTime;
+    var currentMs = now() - originalStartTimeMs;
     callbackExpirationTime = expirationTime;
     callbackID = scheduleDeferredCallback(performAsyncWork, {
       timeout: 10 * (expirationTime - 2) - currentMs
     });
   }
   function requestWork(root, expirationTime) {
-    nestedUpdateCount > NESTED_UPDATE_LIMIT &&
-      invariant(
-        !1,
-        "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
-      );
     if (null === root.nextScheduledRoot)
       (root.remainingExpirationTime = expirationTime),
         null === lastScheduledRoot
@@ -4914,7 +4938,8 @@ function ReactFiberScheduler(config) {
       }
     previousScheduledRoot = nextFlushedRoot;
     null !== previousScheduledRoot &&
-    previousScheduledRoot === highestPriorityRoot
+    previousScheduledRoot === highestPriorityRoot &&
+    1 === highestPriorityWork
       ? nestedUpdateCount++
       : (nestedUpdateCount = 0);
     nextFlushedRoot = highestPriorityRoot;
@@ -4959,10 +4984,10 @@ function ReactFiberScheduler(config) {
       scheduleCallbackWithExpiration(nextFlushedExpirationTime);
     deadline = null;
     deadlineDidExpire = !1;
-    nestedUpdateCount = 0;
     finishRendering();
   }
   function finishRendering() {
+    nestedUpdateCount = 0;
     if (null !== completedBatches) {
       var batches = completedBatches;
       completedBatches = null;
@@ -5027,18 +5052,24 @@ function ReactFiberScheduler(config) {
       expirationTime.current !== finishedWork,
       "Cannot commit the same tree as before. This is probably a bug related to the return field. This error is likely caused by a bug in React. Please file an issue."
     );
-    expirationTime.isReadyForCommit = !1;
+    firstBatch = expirationTime.pendingCommitExpirationTime;
+    invariant(
+      0 !== firstBatch,
+      "Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue."
+    );
+    expirationTime.pendingCommitExpirationTime = 0;
+    var currentTime = recalculateCurrentTime();
     ReactCurrentOwner.current = null;
-    1 < finishedWork.effectTag
-      ? null !== finishedWork.lastEffect
-        ? ((finishedWork.lastEffect.nextEffect = finishedWork),
-          (firstBatch = finishedWork.firstEffect))
-        : (firstBatch = finishedWork)
-      : (firstBatch = finishedWork.firstEffect);
+    if (1 < finishedWork.effectTag)
+      if (null !== finishedWork.lastEffect) {
+        finishedWork.lastEffect.nextEffect = finishedWork;
+        var firstEffect = finishedWork.firstEffect;
+      } else firstEffect = finishedWork;
+    else firstEffect = finishedWork.firstEffect;
     prepareForCommit(expirationTime.containerInfo);
-    for (nextEffect = firstBatch; null !== nextEffect; ) {
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
       var didError = !1,
-        _error = void 0;
+        error = void 0;
       try {
         for (; null !== nextEffect; ) {
           var effectTag = nextEffect.effectTag;
@@ -5047,7 +5078,7 @@ function ReactFiberScheduler(config) {
             var current = nextEffect.alternate;
             null !== current && commitDetachRef(current);
           }
-          switch (effectTag & -242) {
+          switch (effectTag & 14) {
             case 2:
               commitPlacement(nextEffect);
               nextEffect.effectTag &= -3;
@@ -5061,65 +5092,46 @@ function ReactFiberScheduler(config) {
               commitWork(nextEffect.alternate, nextEffect);
               break;
             case 8:
-              (isUnmounting = !0),
-                commitDeletion(nextEffect),
-                (isUnmounting = !1);
+              commitDeletion(nextEffect);
           }
           nextEffect = nextEffect.nextEffect;
         }
       } catch (e) {
-        (didError = !0), (_error = e);
+        (didError = !0), (error = e);
       }
       didError &&
         (invariant(
           null !== nextEffect,
           "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
         ),
-        captureError(nextEffect, _error),
+        onCommitPhaseError(nextEffect, error),
         null !== nextEffect && (nextEffect = nextEffect.nextEffect));
     }
     resetAfterCommit(expirationTime.containerInfo);
     expirationTime.current = finishedWork;
-    for (nextEffect = firstBatch; null !== nextEffect; ) {
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
       effectTag = !1;
       current = void 0;
       try {
-        for (; null !== nextEffect; ) {
+        for (
+          firstEffect = expirationTime,
+            didError = currentTime,
+            error = firstBatch;
+          null !== nextEffect;
+
+        ) {
           var effectTag$jscomp$0 = nextEffect.effectTag;
           effectTag$jscomp$0 & 36 &&
-            commitLifeCycles(nextEffect.alternate, nextEffect);
+            commitLifeCycles(
+              firstEffect,
+              nextEffect.alternate,
+              nextEffect,
+              didError,
+              error
+            );
+          effectTag$jscomp$0 & 256 &&
+            commitErrorLogging(nextEffect, onUncaughtError);
           effectTag$jscomp$0 & 128 && commitAttachRef(nextEffect);
-          if (effectTag$jscomp$0 & 64)
-            switch (((firstBatch = nextEffect),
-            (didError = void 0),
-            null !== capturedErrors &&
-              ((didError = capturedErrors.get(firstBatch)),
-              capturedErrors["delete"](firstBatch),
-              null == didError &&
-                null !== firstBatch.alternate &&
-                ((firstBatch = firstBatch.alternate),
-                (didError = capturedErrors.get(firstBatch)),
-                capturedErrors["delete"](firstBatch))),
-            invariant(
-              null != didError,
-              "No error for given unit of work. This error is likely caused by a bug in React. Please file an issue."
-            ),
-            firstBatch.tag)) {
-              case 2:
-                firstBatch.stateNode.componentDidCatch(didError.error, {
-                  componentStack: didError.componentStack
-                });
-                break;
-              case 3:
-                null === firstUncaughtError &&
-                  (firstUncaughtError = didError.error);
-                break;
-              default:
-                invariant(
-                  !1,
-                  "Invalid type of work. This error is likely caused by a bug in React. Please file an issue."
-                );
-            }
           var next = nextEffect.nextEffect;
           nextEffect.nextEffect = null;
           nextEffect = next;
@@ -5132,20 +5144,13 @@ function ReactFiberScheduler(config) {
           null !== nextEffect,
           "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
         ),
-        captureError(nextEffect, current),
+        onCommitPhaseError(nextEffect, current),
         null !== nextEffect && (nextEffect = nextEffect.nextEffect));
     }
     isWorking = isCommitting = !1;
     "function" === typeof onCommitRoot && onCommitRoot(finishedWork.stateNode);
-    commitPhaseBoundaries &&
-      (commitPhaseBoundaries.forEach(scheduleErrorRecovery),
-      (commitPhaseBoundaries = null));
-    null !== firstUncaughtError &&
-      ((finishedWork = firstUncaughtError),
-      (firstUncaughtError = null),
-      onUncaughtError(finishedWork));
     finishedWork = expirationTime.current.expirationTime;
-    0 === finishedWork && (failedBoundaries = capturedErrors = null);
+    0 === finishedWork && (legacyErrorBoundariesThatAlreadyFailed = null);
     root.remainingExpirationTime = finishedWork;
   }
   function shouldYield() {
@@ -5164,26 +5169,41 @@ function ReactFiberScheduler(config) {
   }
   var hostContext = ReactFiberHostContext(config),
     hydrationContext = ReactFiberHydrationContext(config),
-    popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext,
     resetHostContainer = hostContext.resetHostContainer,
-    _ReactFiberBeginWork = ReactFiberBeginWork(
+    beginWork = ReactFiberBeginWork(
       config,
       hostContext,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
-    ),
-    beginWork = _ReactFiberBeginWork.beginWork,
-    beginFailedWork = _ReactFiberBeginWork.beginFailedWork,
+    ).beginWork,
     completeWork = ReactFiberCompleteWork(config, hostContext, hydrationContext)
       .completeWork;
-  hostContext = ReactFiberCommitWork(config, captureError);
+  hostContext = ReactFiberUnwindWork(
+    hostContext,
+    scheduleWork,
+    isAlreadyFailedLegacyErrorBoundary
+  );
+  var throwException = hostContext.throwException,
+    unwindWork = hostContext.unwindWork;
+  hostContext = ReactFiberCommitWork(
+    config,
+    onCommitPhaseError,
+    scheduleWork,
+    computeExpirationForFiber,
+    function(instance) {
+      null === legacyErrorBoundariesThatAlreadyFailed
+        ? (legacyErrorBoundariesThatAlreadyFailed = new Set([instance]))
+        : legacyErrorBoundariesThatAlreadyFailed.add(instance);
+    },
+    recalculateCurrentTime
+  );
   var commitResetTextContent = hostContext.commitResetTextContent,
     commitPlacement = hostContext.commitPlacement,
     commitDeletion = hostContext.commitDeletion,
     commitWork = hostContext.commitWork,
     commitLifeCycles = hostContext.commitLifeCycles,
+    commitErrorLogging = hostContext.commitErrorLogging,
     commitAttachRef = hostContext.commitAttachRef,
     commitDetachRef = hostContext.commitDetachRef,
     now = config.now,
@@ -5191,8 +5211,9 @@ function ReactFiberScheduler(config) {
     cancelDeferredCallback = config.cancelDeferredCallback,
     prepareForCommit = config.prepareForCommit,
     resetAfterCommit = config.resetAfterCommit,
-    startTime = now(),
+    originalStartTimeMs = now(),
     mostRecentCurrentTime = 2,
+    mostRecentCurrentTimeMs = originalStartTimeMs,
     lastUniqueAsyncExpiration = 0,
     expirationContext = 0,
     isWorking = !1,
@@ -5200,13 +5221,9 @@ function ReactFiberScheduler(config) {
     nextRoot = null,
     nextRenderExpirationTime = 0,
     nextEffect = null,
-    capturedErrors = null,
-    failedBoundaries = null,
-    commitPhaseBoundaries = null,
-    firstUncaughtError = null,
-    didFatal = !1,
     isCommitting = !1,
-    isUnmounting = !1,
+    isRootReadyForCommit = !1,
+    legacyErrorBoundariesThatAlreadyFailed = null,
     firstScheduledRoot = null,
     lastScheduledRoot = null,
     callbackExpirationTime = 0,
@@ -5227,6 +5244,7 @@ function ReactFiberScheduler(config) {
     nestedUpdateCount = 0,
     timeHeuristicForUnitOfWork = 1;
   return {
+    recalculateCurrentTime: recalculateCurrentTime,
     computeExpirationForFiber: computeExpirationForFiber,
     scheduleWork: scheduleWork,
     requestWork: requestWork,
@@ -5287,7 +5305,8 @@ function ReactFiberScheduler(config) {
     },
     deferredUpdates: function(fn) {
       var previousExpirationContext = expirationContext;
-      expirationContext = computeAsyncExpiration();
+      expirationContext =
+        25 * ((((recalculateCurrentTime() + 500) / 25) | 0) + 1);
       try {
         return fn();
       } finally {
@@ -5321,7 +5340,7 @@ function ReactFiberScheduler(config) {
         (lowestPendingInteractiveExpirationTime = 0));
     },
     computeUniqueAsyncExpiration: function() {
-      var result = computeAsyncExpiration();
+      var result = 25 * ((((recalculateCurrentTime() + 500) / 25) | 0) + 1);
       result <= lastUniqueAsyncExpiration &&
         (result = lastUniqueAsyncExpiration + 1);
       return (lastUniqueAsyncExpiration = result);
@@ -5333,10 +5352,11 @@ function ReactFiberReconciler$1(config) {
     element,
     container,
     parentComponent,
+    currentTime,
     expirationTime,
     callback
   ) {
-    var current = container.current;
+    currentTime = container.current;
     if (parentComponent) {
       parentComponent = parentComponent._reactInternalFiber;
       var parentContext;
@@ -5368,15 +5388,16 @@ function ReactFiberReconciler$1(config) {
       ? (container.context = parentComponent)
       : (container.pendingContext = parentComponent);
     container = callback;
-    insertUpdateIntoFiber(current, {
+    insertUpdateIntoFiber(currentTime, {
       expirationTime: expirationTime,
       partialState: { element: element },
       callback: void 0 === container ? null : container,
       isReplace: !1,
       isForced: !1,
+      capturedValue: null,
       next: null
     });
-    scheduleWork(current, expirationTime);
+    scheduleWork(currentTime, expirationTime);
     return expirationTime;
   }
   function findHostInstance(fiber) {
@@ -5385,7 +5406,8 @@ function ReactFiberReconciler$1(config) {
   }
   var getPublicInstance = config.getPublicInstance;
   config = ReactFiberScheduler(config);
-  var computeExpirationForFiber = config.computeExpirationForFiber,
+  var recalculateCurrentTime = config.recalculateCurrentTime,
+    computeExpirationForFiber = config.computeExpirationForFiber,
     scheduleWork = config.scheduleWork;
   return {
     createContainer: function(containerInfo, isAsync, hydrate) {
@@ -5394,28 +5416,47 @@ function ReactFiberReconciler$1(config) {
         current: isAsync,
         containerInfo: containerInfo,
         pendingChildren: null,
-        remainingExpirationTime: 0,
-        isReadyForCommit: !1,
+        pendingCommitExpirationTime: 0,
         finishedWork: null,
         context: null,
         pendingContext: null,
         hydrate: hydrate,
+        remainingExpirationTime: 0,
         firstBatch: null,
         nextScheduledRoot: null
       };
       return (isAsync.stateNode = containerInfo);
     },
     updateContainer: function(element, container, parentComponent, callback) {
-      var expirationTime = computeExpirationForFiber(container.current);
+      var current = container.current,
+        currentTime = recalculateCurrentTime();
+      current = computeExpirationForFiber(current);
+      return updateContainerAtExpirationTime(
+        element,
+        container,
+        parentComponent,
+        currentTime,
+        current,
+        callback
+      );
+    },
+    updateContainerAtExpirationTime: function(
+      element,
+      container,
+      parentComponent,
+      expirationTime,
+      callback
+    ) {
+      var currentTime = recalculateCurrentTime();
       return updateContainerAtExpirationTime(
         element,
         container,
         parentComponent,
+        currentTime,
         expirationTime,
         callback
       );
     },
-    updateContainerAtExpirationTime: updateContainerAtExpirationTime,
     flushRoot: config.flushRoot,
     requestWork: config.requestWork,
     computeUniqueAsyncExpiration: config.computeUniqueAsyncExpiration,
@@ -5466,6 +5507,27 @@ var ReactFiberReconciler$2 = Object.freeze({ default: ReactFiberReconciler$1 }),
   reactReconciler = ReactFiberReconciler$3["default"]
     ? ReactFiberReconciler$3["default"]
     : ReactFiberReconciler$3,
+  ReactNativeTagHandles = {
+    tagsStartAt: 1,
+    tagCount: 1,
+    allocateTag: function() {
+      for (; this.reactTagIsNativeTopRootID(ReactNativeTagHandles.tagCount); )
+        ReactNativeTagHandles.tagCount++;
+      var tag = ReactNativeTagHandles.tagCount;
+      ReactNativeTagHandles.tagCount++;
+      return tag;
+    },
+    assertRootTag: function(tag) {
+      invariant(
+        this.reactTagIsNativeTopRootID(tag),
+        "Expect a native root tag, instead got %s",
+        tag
+      );
+    },
+    reactTagIsNativeTopRootID: function(reactTag) {
+      return 1 === reactTag % 10;
+    }
+  },
   ReactFabricHostComponent = (function() {
     function ReactFabricHostComponent(tag, viewConfig, props) {
       if (!(this instanceof ReactFabricHostComponent))
@@ -5686,7 +5748,28 @@ var roots = new Map(),
         2 < arguments.length && void 0 !== arguments[2] ? arguments[2] : null
       );
     },
-    unstable_batchedUpdates: batchedUpdates,
+    unstable_batchedUpdates: function(fn, bookkeeping) {
+      if (isBatching) return fn(bookkeeping);
+      isBatching = !0;
+      try {
+        return _batchedUpdates(fn, bookkeeping);
+      } finally {
+        if (
+          ((isBatching = !1), null !== restoreTarget || null !== restoreQueue)
+        )
+          if (
+            (_flushInteractiveUpdates(),
+            restoreTarget &&
+              ((bookkeeping = restoreTarget),
+              (fn = restoreQueue),
+              (restoreQueue = restoreTarget = null),
+              restoreStateOfTarget(bookkeeping),
+              fn))
+          )
+            for (bookkeeping = 0; bookkeeping < fn.length; bookkeeping++)
+              restoreStateOfTarget(fn[bookkeeping]);
+      }
+    },
     flushSync: ReactFabricRenderer.flushSync,
     __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
       NativeMethodsMixin: {
@@ -5739,7 +5822,6 @@ var roots = new Map(),
         }
       },
       ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin,
-      ReactGlobalSharedState: ReactGlobalSharedState,
       ReactNativeComponentTree: ReactNativeComponentTree,
       ReactNativePropRegistry: ReactNativePropRegistry,
       TouchHistoryMath: TouchHistoryMath,
@@ -5764,7 +5846,7 @@ ReactFabricRenderer.injectIntoDevTools({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.3.0-alpha.0",
+  version: "16.3.0-alpha.1",
   rendererPackageName: "react-native-renderer"
 });
 var ReactFabric$2 = Object.freeze({ default: ReactFabric }),
diff --git a/Libraries/Renderer/ReactNativeRenderer-dev.js b/Libraries/Renderer/ReactNativeRenderer-dev.js
index e562e89af0489d..fc98f17e176f8b 100644
--- a/Libraries/Renderer/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/ReactNativeRenderer-dev.js
@@ -19,12 +19,12 @@ require("InitializeCore");
 var invariant = require("fbjs/lib/invariant");
 var warning = require("fbjs/lib/warning");
 var emptyFunction = require("fbjs/lib/emptyFunction");
-var RCTEventEmitter = require("RCTEventEmitter");
 var UIManager = require("UIManager");
-var React = require("react");
+var RCTEventEmitter = require("RCTEventEmitter");
 var TextInputState = require("TextInputState");
 var deepDiffer = require("deepDiffer");
 var flattenStyle = require("flattenStyle");
+var React = require("react");
 var emptyObject = require("fbjs/lib/emptyObject");
 var checkPropTypes = require("prop-types/checkPropTypes");
 var shallowEqual = require("fbjs/lib/shallowEqual");
@@ -2323,6 +2323,10 @@ var ReactNativeBridgeEventPlugin = {
     nativeEvent,
     nativeEventTarget
   ) {
+    if (targetInst == null) {
+      // Probably a node belonging to another renderer's tree.
+      return null;
+    }
     var bubbleDispatchConfig = customBubblingEventTypes[topLevelType];
     var directDispatchConfig = customDirectEventTypes[topLevelType];
     invariant(
@@ -2434,6 +2438,49 @@ var ReactNativeComponentTree = Object.freeze({
   updateFiberProps: updateFiberProps
 });
 
+var ReactNativeEventPluginOrder = [
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+];
+
+// Module provided by RN:
+var ReactNativeGlobalResponderHandler = {
+  onChange: function(from, to, blockNativeResponder) {
+    if (to !== null) {
+      var tag = to.stateNode._nativeTag;
+      UIManager.setJSResponder(tag, blockNativeResponder);
+    } else {
+      UIManager.clearJSResponder();
+    }
+  }
+};
+
+/**
+ * Make sure essential globals are available and are patched correctly. Please don't remove this
+ * line. Bundles created by react-packager `require` it before executing any application code. This
+ * ensures it exists in the dependency graph and can be `require`d.
+ * TODO: require this in packager, not in React #10932517
+ */
+// Module provided by RN:
+/**
+ * Inject module for resolving DOM hierarchy and plugin ordering.
+ */
+injection.injectEventPluginOrder(ReactNativeEventPluginOrder);
+injection$1.injectComponentTree(ReactNativeComponentTree);
+
+ResponderEventPlugin.injection.injectGlobalResponderHandler(
+  ReactNativeGlobalResponderHandler
+);
+
+/**
+ * Some important event plugins included by default (without having to require
+ * them).
+ */
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+});
+
 // Use to restore controlled state after a change event has fired.
 
 var fiberHostComponent = null;
@@ -2732,55 +2779,12 @@ var ReactNativeEventEmitter = Object.freeze({
   receiveTouches: receiveTouches
 });
 
-var ReactNativeEventPluginOrder = [
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-];
-
-// Module provided by RN:
-var ReactNativeGlobalResponderHandler = {
-  onChange: function(from, to, blockNativeResponder) {
-    if (to !== null) {
-      var tag = to.stateNode._nativeTag;
-      UIManager.setJSResponder(tag, blockNativeResponder);
-    } else {
-      UIManager.clearJSResponder();
-    }
-  }
-};
-
-/**
- * Make sure essential globals are available and are patched correctly. Please don't remove this
- * line. Bundles created by react-packager `require` it before executing any application code. This
- * ensures it exists in the dependency graph and can be `require`d.
- * TODO: require this in packager, not in React #10932517
- */
-// Module provided by RN:
 // Module provided by RN:
 /**
  * Register the event emitter with the native bridge
  */
 RCTEventEmitter.register(ReactNativeEventEmitter);
 
-/**
- * Inject module for resolving DOM hierarchy and plugin ordering.
- */
-injection.injectEventPluginOrder(ReactNativeEventPluginOrder);
-injection$1.injectComponentTree(ReactNativeComponentTree);
-
-ResponderEventPlugin.injection.injectGlobalResponderHandler(
-  ReactNativeGlobalResponderHandler
-);
-
-/**
- * Some important event plugins included by default (without having to require
- * them).
- */
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
-});
-
 // The Symbol used to tag the ReactElement-like types. If there is no native Symbol
 // nor polyfill, then a plain number is used for performance.
 var hasSymbol = typeof Symbol === "function" && Symbol["for"];
@@ -2977,19 +2981,9 @@ var TouchHistoryMath = {
   noCentroid: -1
 };
 
-var ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-
-var ReactCurrentOwner = ReactInternals.ReactCurrentOwner;
-var ReactDebugCurrentFrame = ReactInternals.ReactDebugCurrentFrame;
-
-var ReactGlobalSharedState = Object.freeze({
-  ReactCurrentOwner: ReactCurrentOwner,
-  ReactDebugCurrentFrame: ReactDebugCurrentFrame
-});
-
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.3.0-alpha.0";
+var ReactVersion = "16.3.0-alpha.1";
 
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -3580,6 +3574,11 @@ function set(key, value) {
   key._reactInternalFiber = value;
 }
 
+var ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+var ReactCurrentOwner = ReactInternals.ReactCurrentOwner;
+var ReactDebugCurrentFrame = ReactInternals.ReactDebugCurrentFrame;
+
 function getComponentName(fiber) {
   var type = fiber.type;
 
@@ -4098,19 +4097,26 @@ var ReactNativeComponent = (function(_React$Component) {
   return ReactNativeComponent;
 })(React.Component);
 
-// Don't change these two values:
-var NoEffect = 0;
-var PerformedWork = 1;
+// Don't change these two values. They're used by React Dev Tools.
+var NoEffect = /*              */ 0;
+var PerformedWork = /*         */ 1;
 
 // You can change the rest (and add more).
-var Placement = 2;
-var Update = 4;
-var PlacementAndUpdate = 6;
-var Deletion = 8;
-var ContentReset = 16;
-var Callback = 32;
-var Err = 64;
-var Ref = 128;
+var Placement = /*             */ 2;
+var Update = /*                */ 4;
+var PlacementAndUpdate = /*    */ 6;
+var Deletion = /*              */ 8;
+var ContentReset = /*          */ 16;
+var Callback = /*              */ 32;
+var DidCapture = /*            */ 64;
+var Ref = /*                   */ 128;
+var ErrLog = /*                */ 256;
+
+// Union of all host effects
+var HostEffectMask = /*        */ 511;
+
+var Incomplete = /*            */ 512;
+var ShouldCapture = /*         */ 1024;
 
 var MOUNTING = 1;
 var MOUNTED = 2;
@@ -4542,10 +4548,13 @@ var ReactDebugCurrentFiber = {
 // Re-export dynamic flags from the fbsource version.
 var _require = require("ReactFeatureFlags");
 
+var enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch;
 var debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects;
 var debugRenderPhaseSideEffectsForStrictMode =
   _require.debugRenderPhaseSideEffectsForStrictMode;
 var warnAboutDeprecatedLifecycles = _require.warnAboutDeprecatedLifecycles;
+var replayFailedUnitOfWorkWithInvokeGuardedCallback =
+  _require.replayFailedUnitOfWorkWithInvokeGuardedCallback;
 
 var enableUserTimingAPI = true;
 var enableMutatingReconciler = true;
@@ -4682,6 +4691,8 @@ var shouldIgnoreFiber = function(fiber) {
     case CallComponent:
     case ReturnComponent:
     case Fragment:
+    case ContextProvider:
+    case ContextConsumer:
       return true;
     default:
       return false;
@@ -5591,12 +5602,12 @@ function createFiberRoot(containerInfo, isAsync, hydrate) {
     current: uninitializedFiber,
     containerInfo: containerInfo,
     pendingChildren: null,
-    remainingExpirationTime: NoWork,
-    isReadyForCommit: false,
+    pendingCommitExpirationTime: NoWork,
     finishedWork: null,
     context: null,
     pendingContext: null,
     hydrate: hydrate,
+    remainingExpirationTime: NoWork,
     firstBatch: null,
     nextScheduledRoot: null
   };
@@ -6038,7 +6049,8 @@ function createUpdateQueue(baseState) {
     last: null,
     callbackList: null,
     hasForceUpdate: false,
-    isInitialized: false
+    isInitialized: false,
+    capturedValues: null
   };
   {
     queue.isProcessing = false;
@@ -6063,7 +6075,10 @@ function insertUpdateIntoQueue(queue, update) {
   }
 }
 
-function insertUpdateIntoFiber(fiber, update) {
+var q1 = void 0;
+var q2 = void 0;
+function ensureUpdateQueues(fiber) {
+  q1 = q2 = null;
   // We'll have at least one and at most two distinct update queues.
   var alternateFiber = fiber.alternate;
   var queue1 = fiber.updateQueue;
@@ -6086,6 +6101,16 @@ function insertUpdateIntoFiber(fiber, update) {
   }
   queue2 = queue2 !== queue1 ? queue2 : null;
 
+  // Use module variables instead of returning a tuple
+  q1 = queue1;
+  q2 = queue2;
+}
+
+function insertUpdateIntoFiber(fiber, update) {
+  ensureUpdateQueues(fiber);
+  var queue1 = q1;
+  var queue2 = q2;
+
   // Warn if an update is scheduled from inside an updater function.
   {
     if (
@@ -6125,14 +6150,17 @@ function insertUpdateIntoFiber(fiber, update) {
 }
 
 function getUpdateExpirationTime(fiber) {
-  if (fiber.tag !== ClassComponent && fiber.tag !== HostRoot) {
-    return NoWork;
-  }
-  var updateQueue = fiber.updateQueue;
-  if (updateQueue === null) {
-    return NoWork;
+  switch (fiber.tag) {
+    case HostRoot:
+    case ClassComponent:
+      var updateQueue = fiber.updateQueue;
+      if (updateQueue === null) {
+        return NoWork;
+      }
+      return updateQueue.expirationTime;
+    default:
+      return NoWork;
   }
-  return updateQueue.expirationTime;
 }
 
 function getStateFromUpdate(update, instance, prevState, props) {
@@ -6161,6 +6189,7 @@ function processUpdateQueue(
       first: currentQueue.first,
       last: currentQueue.last,
       isInitialized: currentQueue.isInitialized,
+      capturedValues: currentQueue.capturedValues,
       // These fields are no longer valid because they were already committed.
       // Reset them.
       callbackList: null,
@@ -6262,12 +6291,24 @@ function processUpdateQueue(
       }
       _callbackList.push(update);
     }
+    if (update.capturedValue !== null) {
+      var _capturedValues = queue.capturedValues;
+      if (_capturedValues === null) {
+        queue.capturedValues = [update.capturedValue];
+      } else {
+        _capturedValues.push(update.capturedValue);
+      }
+    }
     update = update.next;
   }
 
   if (queue.callbackList !== null) {
     workInProgress.effectTag |= Callback;
-  } else if (queue.first === null && !queue.hasForceUpdate) {
+  } else if (
+    queue.first === null &&
+    !queue.hasForceUpdate &&
+    queue.capturedValues === null
+  ) {
     // The queue is empty. We can reset it.
     workInProgress.updateQueue = null;
   }
@@ -6363,6 +6404,18 @@ var warnOnInvalidCallback = void 0;
   });
   Object.freeze(fakeInternalInstance);
 }
+function callGetDerivedStateFromCatch(ctor, capturedValues) {
+  var resultState = {};
+  for (var i = 0; i < capturedValues.length; i++) {
+    var capturedValue = capturedValues[i];
+    var error = capturedValue.value;
+    var partialState = ctor.getDerivedStateFromCatch.call(null, error);
+    if (partialState !== null && partialState !== undefined) {
+      Object.assign(resultState, partialState);
+    }
+  }
+  return resultState;
+}
 
 var ReactFiberClassComponent = function(
   scheduleWork,
@@ -6386,7 +6439,7 @@ var ReactFiberClassComponent = function(
         callback: callback,
         isReplace: false,
         isForced: false,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       };
       insertUpdateIntoFiber(fiber, update);
@@ -6405,7 +6458,7 @@ var ReactFiberClassComponent = function(
         callback: callback,
         isReplace: true,
         isForced: false,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       };
       insertUpdateIntoFiber(fiber, update);
@@ -6424,7 +6477,7 @@ var ReactFiberClassComponent = function(
         callback: callback,
         isReplace: false,
         isForced: true,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       };
       insertUpdateIntoFiber(fiber, update);
@@ -6450,7 +6503,7 @@ var ReactFiberClassComponent = function(
     }
 
     var instance = workInProgress.stateNode;
-    var type = workInProgress.type;
+    var ctor = workInProgress.type;
     if (typeof instance.shouldComponentUpdate === "function") {
       startPhaseTimer(workInProgress, "shouldComponentUpdate");
       var shouldUpdate = instance.shouldComponentUpdate(
@@ -6472,7 +6525,7 @@ var ReactFiberClassComponent = function(
       return shouldUpdate;
     }
 
-    if (type.prototype && type.prototype.isPureReactComponent) {
+    if (ctor.prototype && ctor.prototype.isPureReactComponent) {
       return (
         !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
       );
@@ -6628,7 +6681,7 @@ var ReactFiberClassComponent = function(
     }
     if (typeof instance.getChildContext === "function") {
       warning(
-        typeof workInProgress.type.childContextTypes === "object",
+        typeof type.childContextTypes === "object",
         "%s.getChildContext(): childContextTypes must be defined in order to " +
           "use getChildContext().",
         getComponentName(workInProgress)
@@ -6849,6 +6902,7 @@ var ReactFiberClassComponent = function(
 
   // Invokes the mount life-cycles on a previously never rendered instance.
   function mountClassInstance(workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
     var current = workInProgress.alternate;
 
     {
@@ -6885,7 +6939,7 @@ var ReactFiberClassComponent = function(
     if (
       (typeof instance.UNSAFE_componentWillMount === "function" ||
         typeof instance.componentWillMount === "function") &&
-      typeof workInProgress.type.getDerivedStateFromProps !== "function"
+      typeof ctor.getDerivedStateFromProps !== "function"
     ) {
       callComponentWillMount(workInProgress, instance);
       // If we had additional state updates during this life-cycle, let's
@@ -6907,113 +6961,8 @@ var ReactFiberClassComponent = function(
     }
   }
 
-  // Called on a preexisting class instance. Returns false if a resumed render
-  // could be reused.
-  // function resumeMountClassInstance(
-  //   workInProgress: Fiber,
-  //   priorityLevel: PriorityLevel,
-  // ): boolean {
-  //   const instance = workInProgress.stateNode;
-  //   resetInputPointers(workInProgress, instance);
-
-  //   let newState = workInProgress.memoizedState;
-  //   let newProps = workInProgress.pendingProps;
-  //   if (!newProps) {
-  //     // If there isn't any new props, then we'll reuse the memoized props.
-  //     // This could be from already completed work.
-  //     newProps = workInProgress.memoizedProps;
-  //     invariant(
-  //       newProps != null,
-  //       'There should always be pending or memoized props. This error is ' +
-  //         'likely caused by a bug in React. Please file an issue.',
-  //     );
-  //   }
-  //   const newUnmaskedContext = getUnmaskedContext(workInProgress);
-  //   const newContext = getMaskedContext(workInProgress, newUnmaskedContext);
-
-  //   const oldContext = instance.context;
-  //   const oldProps = workInProgress.memoizedProps;
-
-  //   if (
-  //     typeof instance.componentWillReceiveProps === 'function' &&
-  //     (oldProps !== newProps || oldContext !== newContext)
-  //   ) {
-  //     callComponentWillReceiveProps(
-  //       workInProgress,
-  //       instance,
-  //       newProps,
-  //       newContext,
-  //     );
-  //   }
-
-  //   // Process the update queue before calling shouldComponentUpdate
-  //   const updateQueue = workInProgress.updateQueue;
-  //   if (updateQueue !== null) {
-  //     newState = processUpdateQueue(
-  //       workInProgress,
-  //       updateQueue,
-  //       instance,
-  //       newState,
-  //       newProps,
-  //       priorityLevel,
-  //     );
-  //   }
-
-  //   // TODO: Should we deal with a setState that happened after the last
-  //   // componentWillMount and before this componentWillMount? Probably
-  //   // unsupported anyway.
-
-  //   if (
-  //     !checkShouldComponentUpdate(
-  //       workInProgress,
-  //       workInProgress.memoizedProps,
-  //       newProps,
-  //       workInProgress.memoizedState,
-  //       newState,
-  //       newContext,
-  //     )
-  //   ) {
-  //     // Update the existing instance's state, props, and context pointers even
-  //     // though we're bailing out.
-  //     instance.props = newProps;
-  //     instance.state = newState;
-  //     instance.context = newContext;
-  //     return false;
-  //   }
-
-  //   // Update the input pointers now so that they are correct when we call
-  //   // componentWillMount
-  //   instance.props = newProps;
-  //   instance.state = newState;
-  //   instance.context = newContext;
-
-  //   if (typeof instance.componentWillMount === 'function') {
-  //     callComponentWillMount(workInProgress, instance);
-  //     // componentWillMount may have called setState. Process the update queue.
-  //     const newUpdateQueue = workInProgress.updateQueue;
-  //     if (newUpdateQueue !== null) {
-  //       newState = processUpdateQueue(
-  //         workInProgress,
-  //         newUpdateQueue,
-  //         instance,
-  //         newState,
-  //         newProps,
-  //         priorityLevel,
-  //       );
-  //     }
-  //   }
-
-  //   if (typeof instance.componentDidMount === 'function') {
-  //     workInProgress.effectTag |= Update;
-  //   }
-
-  //   instance.state = newState;
-
-  //   return true;
-  // }
-
-  // Invokes the update life-cycles and returns false if it shouldn't rerender.
-  function updateClassInstance(current, workInProgress, renderExpirationTime) {
+  function resumeMountClassInstance(workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
     var instance = workInProgress.stateNode;
     resetInputPointers(workInProgress, instance);
 
@@ -7032,7 +6981,7 @@ var ReactFiberClassComponent = function(
     if (
       (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
         typeof instance.componentWillReceiveProps === "function") &&
-      typeof workInProgress.type.getDerivedStateFromProps !== "function"
+      typeof ctor.getDerivedStateFromProps !== "function"
     ) {
       if (oldProps !== newProps || oldContext !== newContext) {
         callComponentWillReceiveProps(
@@ -7044,9 +6993,9 @@ var ReactFiberClassComponent = function(
       }
     }
 
-    var partialState = void 0;
+    var derivedStateFromProps = void 0;
     if (oldProps !== newProps) {
-      partialState = callGetDerivedStateFromProps(
+      derivedStateFromProps = callGetDerivedStateFromProps(
         workInProgress,
         instance,
         newProps
@@ -7057,27 +7006,55 @@ var ReactFiberClassComponent = function(
     var oldState = workInProgress.memoizedState;
     // TODO: Previous state can be null.
     var newState = void 0;
+    var derivedStateFromCatch = void 0;
     if (workInProgress.updateQueue !== null) {
       newState = processUpdateQueue(
-        current,
+        null,
         workInProgress,
         workInProgress.updateQueue,
         instance,
         newProps,
         renderExpirationTime
       );
+
+      var updateQueue = workInProgress.updateQueue;
+      if (
+        updateQueue !== null &&
+        updateQueue.capturedValues !== null &&
+        enableGetDerivedStateFromCatch &&
+        typeof ctor.getDerivedStateFromCatch === "function"
+      ) {
+        var capturedValues = updateQueue.capturedValues;
+        // Don't remove these from the update queue yet. We need them in
+        // finishClassComponent. Do the reset there.
+        // TODO: This is awkward. Refactor class components.
+        // updateQueue.capturedValues = null;
+        derivedStateFromCatch = callGetDerivedStateFromCatch(
+          ctor,
+          capturedValues
+        );
+      }
     } else {
       newState = oldState;
     }
 
-    if (partialState !== null && partialState !== undefined) {
+    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromProps
+          : Object.assign({}, newState, derivedStateFromProps);
+    }
+    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
       // So that multiple render passes do not enqueue multiple updates.
       // Instead, just synchronously merge the returned state into the instance.
       newState =
         newState === null || newState === undefined
-          ? partialState
-          : Object.assign({}, newState, partialState);
+          ? derivedStateFromCatch
+          : Object.assign({}, newState, derivedStateFromCatch);
     }
 
     if (
@@ -7091,13 +7068,8 @@ var ReactFiberClassComponent = function(
     ) {
       // If an update was already in progress, we should schedule an Update
       // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidUpdate === "function") {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Update;
-        }
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
       }
       return false;
     }
@@ -7117,7 +7089,7 @@ var ReactFiberClassComponent = function(
       if (
         (typeof instance.UNSAFE_componentWillUpdate === "function" ||
           typeof instance.componentWillUpdate === "function") &&
-        typeof workInProgress.type.getDerivedStateFromProps !== "function"
+        typeof ctor.getDerivedStateFromProps !== "function"
       ) {
         startPhaseTimer(workInProgress, "componentWillUpdate");
         if (typeof instance.componentWillUpdate === "function") {
@@ -7134,13 +7106,8 @@ var ReactFiberClassComponent = function(
     } else {
       // If an update was already in progress, we should schedule an Update
       // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidUpdate === "function") {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Update;
-        }
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
       }
 
       // If shouldComponentUpdate returned false, we should still update the
@@ -7158,75 +7125,250 @@ var ReactFiberClassComponent = function(
     return shouldUpdate;
   }
 
-  return {
-    adoptClassInstance: adoptClassInstance,
-    callGetDerivedStateFromProps: callGetDerivedStateFromProps,
-    constructClassInstance: constructClassInstance,
-    mountClassInstance: mountClassInstance,
-    // resumeMountClassInstance,
-    updateClassInstance: updateClassInstance
-  };
-};
-
-var getCurrentFiberStackAddendum$1 =
-  ReactDebugCurrentFiber.getCurrentFiberStackAddendum;
-
-var didWarnAboutMaps = void 0;
-var didWarnAboutStringRefInStrictMode = void 0;
-var ownerHasKeyUseWarning = void 0;
-var ownerHasFunctionTypeWarning = void 0;
-var warnForMissingKey = function(child) {};
+  // Invokes the update life-cycles and returns false if it shouldn't rerender.
+  function updateClassInstance(current, workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
+    var instance = workInProgress.stateNode;
+    resetInputPointers(workInProgress, instance);
 
-{
-  didWarnAboutMaps = false;
-  didWarnAboutStringRefInStrictMode = {};
+    var oldProps = workInProgress.memoizedProps;
+    var newProps = workInProgress.pendingProps;
+    var oldContext = instance.context;
+    var newUnmaskedContext = getUnmaskedContext(workInProgress);
+    var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
-  /**
-   * Warn if there's no key explicitly set on dynamic arrays of children or
-   * object keys are not valid. This allows us to keep track of children between
-   * updates.
-   */
-  ownerHasKeyUseWarning = {};
-  ownerHasFunctionTypeWarning = {};
+    // Note: During these life-cycles, instance.props/instance.state are what
+    // ever the previously attempted to render - not the "current". However,
+    // during componentDidUpdate we pass the "current" props.
 
-  warnForMissingKey = function(child) {
-    if (child === null || typeof child !== "object") {
-      return;
-    }
-    if (!child._store || child._store.validated || child.key != null) {
-      return;
+    // In order to support react-lifecycles-compat polyfilled components,
+    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    if (
+      (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
+        typeof instance.componentWillReceiveProps === "function") &&
+      typeof ctor.getDerivedStateFromProps !== "function"
+    ) {
+      if (oldProps !== newProps || oldContext !== newContext) {
+        callComponentWillReceiveProps(
+          workInProgress,
+          instance,
+          newProps,
+          newContext
+        );
+      }
     }
-    invariant(
-      typeof child._store === "object",
-      "React Component in warnForMissingKey should have a _store. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
-    child._store.validated = true;
 
-    var currentComponentErrorInfo =
-      "Each child in an array or iterator should have a unique " +
-      '"key" prop. See https://fb.me/react-warning-keys for ' +
-      "more information." +
-      (getCurrentFiberStackAddendum$1() || "");
-    if (ownerHasKeyUseWarning[currentComponentErrorInfo]) {
-      return;
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps
+      );
     }
-    ownerHasKeyUseWarning[currentComponentErrorInfo] = true;
-
-    warning(
-      false,
-      "Each child in an array or iterator should have a unique " +
-        '"key" prop. See https://fb.me/react-warning-keys for ' +
-        "more information.%s",
-      getCurrentFiberStackAddendum$1()
-    );
-  };
-}
 
-var isArray$1 = Array.isArray;
-
-function coerceRef(returnFiber, current, element) {
-  var mixedRef = element.ref;
+    // Compute the next state using the memoized state and the update queue.
+    var oldState = workInProgress.memoizedState;
+    // TODO: Previous state can be null.
+    var newState = void 0;
+    var derivedStateFromCatch = void 0;
+    if (workInProgress.updateQueue !== null) {
+      newState = processUpdateQueue(
+        current,
+        workInProgress,
+        workInProgress.updateQueue,
+        instance,
+        newProps,
+        renderExpirationTime
+      );
+
+      var updateQueue = workInProgress.updateQueue;
+      if (
+        updateQueue !== null &&
+        updateQueue.capturedValues !== null &&
+        enableGetDerivedStateFromCatch &&
+        typeof ctor.getDerivedStateFromCatch === "function"
+      ) {
+        var capturedValues = updateQueue.capturedValues;
+        // Don't remove these from the update queue yet. We need them in
+        // finishClassComponent. Do the reset there.
+        // TODO: This is awkward. Refactor class components.
+        // updateQueue.capturedValues = null;
+        derivedStateFromCatch = callGetDerivedStateFromCatch(
+          ctor,
+          capturedValues
+        );
+      }
+    } else {
+      newState = oldState;
+    }
+
+    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromProps
+          : Object.assign({}, newState, derivedStateFromProps);
+    }
+    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromCatch
+          : Object.assign({}, newState, derivedStateFromCatch);
+    }
+
+    if (
+      oldProps === newProps &&
+      oldState === newState &&
+      !hasContextChanged() &&
+      !(
+        workInProgress.updateQueue !== null &&
+        workInProgress.updateQueue.hasForceUpdate
+      )
+    ) {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Update;
+        }
+      }
+      return false;
+    }
+
+    var shouldUpdate = checkShouldComponentUpdate(
+      workInProgress,
+      oldProps,
+      newProps,
+      oldState,
+      newState,
+      newContext
+    );
+
+    if (shouldUpdate) {
+      // In order to support react-lifecycles-compat polyfilled components,
+      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      if (
+        (typeof instance.UNSAFE_componentWillUpdate === "function" ||
+          typeof instance.componentWillUpdate === "function") &&
+        typeof ctor.getDerivedStateFromProps !== "function"
+      ) {
+        startPhaseTimer(workInProgress, "componentWillUpdate");
+        if (typeof instance.componentWillUpdate === "function") {
+          instance.componentWillUpdate(newProps, newState, newContext);
+        }
+        if (typeof instance.UNSAFE_componentWillUpdate === "function") {
+          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
+        }
+        stopPhaseTimer();
+      }
+      if (typeof instance.componentDidUpdate === "function") {
+        workInProgress.effectTag |= Update;
+      }
+    } else {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Update;
+        }
+      }
+
+      // If shouldComponentUpdate returned false, we should still update the
+      // memoized props/state to indicate that this work can be reused.
+      memoizeProps(workInProgress, newProps);
+      memoizeState(workInProgress, newState);
+    }
+
+    // Update the existing instance's state, props, and context pointers even
+    // if shouldComponentUpdate returns false.
+    instance.props = newProps;
+    instance.state = newState;
+    instance.context = newContext;
+
+    return shouldUpdate;
+  }
+
+  return {
+    adoptClassInstance: adoptClassInstance,
+    callGetDerivedStateFromProps: callGetDerivedStateFromProps,
+    constructClassInstance: constructClassInstance,
+    mountClassInstance: mountClassInstance,
+    resumeMountClassInstance: resumeMountClassInstance,
+    updateClassInstance: updateClassInstance
+  };
+};
+
+var getCurrentFiberStackAddendum$1 =
+  ReactDebugCurrentFiber.getCurrentFiberStackAddendum;
+
+var didWarnAboutMaps = void 0;
+var didWarnAboutStringRefInStrictMode = void 0;
+var ownerHasKeyUseWarning = void 0;
+var ownerHasFunctionTypeWarning = void 0;
+var warnForMissingKey = function(child) {};
+
+{
+  didWarnAboutMaps = false;
+  didWarnAboutStringRefInStrictMode = {};
+
+  /**
+   * Warn if there's no key explicitly set on dynamic arrays of children or
+   * object keys are not valid. This allows us to keep track of children between
+   * updates.
+   */
+  ownerHasKeyUseWarning = {};
+  ownerHasFunctionTypeWarning = {};
+
+  warnForMissingKey = function(child) {
+    if (child === null || typeof child !== "object") {
+      return;
+    }
+    if (!child._store || child._store.validated || child.key != null) {
+      return;
+    }
+    invariant(
+      typeof child._store === "object",
+      "React Component in warnForMissingKey should have a _store. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+    child._store.validated = true;
+
+    var currentComponentErrorInfo =
+      "Each child in an array or iterator should have a unique " +
+      '"key" prop. See https://fb.me/react-warning-keys for ' +
+      "more information." +
+      (getCurrentFiberStackAddendum$1() || "");
+    if (ownerHasKeyUseWarning[currentComponentErrorInfo]) {
+      return;
+    }
+    ownerHasKeyUseWarning[currentComponentErrorInfo] = true;
+
+    warning(
+      false,
+      "Each child in an array or iterator should have a unique " +
+        '"key" prop. See https://fb.me/react-warning-keys for ' +
+        "more information.%s",
+      getCurrentFiberStackAddendum$1()
+    );
+  };
+}
+
+var isArray$1 = Array.isArray;
+
+function coerceRef(returnFiber, current, element) {
+  var mixedRef = element.ref;
   if (
     mixedRef !== null &&
     typeof mixedRef !== "function" &&
@@ -8531,6 +8673,7 @@ var ReactFiberBeginWork = function(
       _ReactFiberClassCompo.callGetDerivedStateFromProps,
     constructClassInstance = _ReactFiberClassCompo.constructClassInstance,
     mountClassInstance = _ReactFiberClassCompo.mountClassInstance,
+    resumeMountClassInstance = _ReactFiberClassCompo.resumeMountClassInstance,
     updateClassInstance = _ReactFiberClassCompo.updateClassInstance;
 
   // TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
@@ -8655,19 +8798,20 @@ var ReactFiberBeginWork = function(
     // During mounting we don't know the child context yet as the instance doesn't exist.
     // We will invalidate the child context in finishClassComponent() right after rendering.
     var hasContext = pushContextProvider(workInProgress);
-
     var shouldUpdate = void 0;
     if (current === null) {
-      if (!workInProgress.stateNode) {
+      if (workInProgress.stateNode === null) {
         // In the initial pass we might need to construct the instance.
         constructClassInstance(workInProgress, workInProgress.pendingProps);
         mountClassInstance(workInProgress, renderExpirationTime);
 
         shouldUpdate = true;
       } else {
-        invariant(false, "Resuming work not yet implemented.");
         // In a resume, we'll already have an instance we can reuse.
-        // shouldUpdate = resumeMountClassInstance(workInProgress, renderExpirationTime);
+        shouldUpdate = resumeMountClassInstance(
+          workInProgress,
+          renderExpirationTime
+        );
       }
     } else {
       shouldUpdate = updateClassInstance(
@@ -8676,11 +8820,23 @@ var ReactFiberBeginWork = function(
         renderExpirationTime
       );
     }
+
+    // We processed the update queue inside updateClassInstance. It may have
+    // included some errors that were dispatched during the commit phase.
+    // TODO: Refactor class components so this is less awkward.
+    var didCaptureError = false;
+    var updateQueue = workInProgress.updateQueue;
+    if (updateQueue !== null && updateQueue.capturedValues !== null) {
+      shouldUpdate = true;
+      didCaptureError = true;
+    }
     return finishClassComponent(
       current,
       workInProgress,
       shouldUpdate,
-      hasContext
+      hasContext,
+      didCaptureError,
+      renderExpirationTime
     );
   }
 
@@ -8688,12 +8844,14 @@ var ReactFiberBeginWork = function(
     current,
     workInProgress,
     shouldUpdate,
-    hasContext
+    hasContext,
+    didCaptureError,
+    renderExpirationTime
   ) {
     // Refs should update even if shouldComponentUpdate returns false
     markRef(current, workInProgress);
 
-    if (!shouldUpdate) {
+    if (!shouldUpdate && !didCaptureError) {
       // Context providers should defer to sCU for rendering
       if (hasContext) {
         invalidateContextProvider(workInProgress, false);
@@ -8702,26 +8860,60 @@ var ReactFiberBeginWork = function(
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
 
+    var ctor = workInProgress.type;
     var instance = workInProgress.stateNode;
 
     // Rerender
     ReactCurrentOwner.current = workInProgress;
     var nextChildren = void 0;
-    {
-      ReactDebugCurrentFiber.setCurrentPhase("render");
-      nextChildren = instance.render();
-      if (
-        debugRenderPhaseSideEffects ||
-        (debugRenderPhaseSideEffectsForStrictMode &&
-          workInProgress.mode & StrictMode)
-      ) {
-        instance.render();
+    if (
+      didCaptureError &&
+      (!enableGetDerivedStateFromCatch ||
+        typeof ctor.getDerivedStateFromCatch !== "function")
+    ) {
+      // If we captured an error, but getDerivedStateFrom catch is not defined,
+      // unmount all the children. componentDidCatch will schedule an update to
+      // re-render a fallback. This is temporary until we migrate everyone to
+      // the new API.
+      // TODO: Warn in a future release.
+      nextChildren = null;
+    } else {
+      {
+        ReactDebugCurrentFiber.setCurrentPhase("render");
+        nextChildren = instance.render();
+        if (
+          debugRenderPhaseSideEffects ||
+          (debugRenderPhaseSideEffectsForStrictMode &&
+            workInProgress.mode & StrictMode)
+        ) {
+          instance.render();
+        }
+        ReactDebugCurrentFiber.setCurrentPhase(null);
       }
-      ReactDebugCurrentFiber.setCurrentPhase(null);
     }
+
     // React DevTools reads this flag.
     workInProgress.effectTag |= PerformedWork;
-    reconcileChildren(current, workInProgress, nextChildren);
+    if (didCaptureError) {
+      // If we're recovering from an error, reconcile twice: first to delete
+      // all the existing children.
+      reconcileChildrenAtExpirationTime(
+        current,
+        workInProgress,
+        null,
+        renderExpirationTime
+      );
+      workInProgress.child = null;
+      // Now we can continue reconciling like normal. This has the effect of
+      // remounting all children regardless of whether their their
+      // identity matches.
+    }
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
     // Memoize props and state using the values we just used to render.
     // TODO: Restructure so we never read values from the instance.
     memoizeState(workInProgress, instance.state);
@@ -8763,13 +8955,21 @@ var ReactFiberBeginWork = function(
         null,
         renderExpirationTime
       );
-      if (prevState === state) {
+      memoizeState(workInProgress, state);
+      updateQueue = workInProgress.updateQueue;
+
+      var element = void 0;
+      if (updateQueue !== null && updateQueue.capturedValues !== null) {
+        // There's an uncaught error. Unmount the whole root.
+        element = null;
+      } else if (prevState === state) {
         // If the state is the same as before, that's a bailout because we had
         // no work that expires at this time.
         resetHydrationState();
         return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      } else {
+        element = state.element;
       }
-      var element = state.element;
       var root = workInProgress.stateNode;
       if (
         (current === null || current.child === null) &&
@@ -8826,7 +9026,18 @@ var ReactFiberBeginWork = function(
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (memoizedProps === nextProps) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      var isHidden =
+        workInProgress.mode & AsyncMode &&
+        shouldDeprioritizeSubtree(type, nextProps);
+      if (isHidden) {
+        // Before bailing out, make sure we've deprioritized a hidden component.
+        workInProgress.expirationTime = Never;
+      }
+      if (!isHidden || renderExpirationTime !== Never) {
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      }
+      // If we're rendering a hidden node at hidden priority, don't bailout. The
+      // parent is complete, but the children may not be.
     }
 
     var nextChildren = nextProps.children;
@@ -8855,6 +9066,7 @@ var ReactFiberBeginWork = function(
       // Down-prioritize the children.
       workInProgress.expirationTime = Never;
       // Bailout and come back to this fiber later.
+      workInProgress.memoizedProps = nextProps;
       return null;
     }
 
@@ -8948,7 +9160,14 @@ var ReactFiberBeginWork = function(
       var hasContext = pushContextProvider(workInProgress);
       adoptClassInstance(workInProgress, value);
       mountClassInstance(workInProgress, renderExpirationTime);
-      return finishClassComponent(current, workInProgress, true, hasContext);
+      return finishClassComponent(
+        current,
+        workInProgress,
+        true,
+        hasContext,
+        false,
+        renderExpirationTime
+      );
     } else {
       // Proceed under the assumption that this is a functional component
       workInProgress.tag = FunctionalComponent;
@@ -9276,6 +9495,16 @@ var ReactFiberBeginWork = function(
     workInProgress.stateNode = observedBits;
 
     var render = newProps.children;
+
+    if (typeof render !== "function") {
+      invariant(
+        false,
+        "A context consumer was rendered with multiple children, or a child that isn't a function. " +
+          "A context consumer expects a single child that is a function. " +
+          "If you did pass a function, make sure there is no trailing or leading whitespace around it."
+      );
+    }
+
     var newChildren = render(newValue);
     reconcileChildren(current, workInProgress, newChildren);
     return workInProgress.child;
@@ -9437,72 +9666,10 @@ var ReactFiberBeginWork = function(
     }
   }
 
-  function beginFailedWork(current, workInProgress, renderExpirationTime) {
-    // Push context providers here to avoid a push/pop context mismatch.
-    switch (workInProgress.tag) {
-      case ClassComponent:
-        pushContextProvider(workInProgress);
-        break;
-      case HostRoot:
-        pushHostRootContext(workInProgress);
-        break;
-      default:
-        invariant(
-          false,
-          "Invalid type of work. This error is likely caused by a bug in React. " +
-            "Please file an issue."
-        );
-    }
-
-    // Add an error effect so we can handle the error during the commit phase
-    workInProgress.effectTag |= Err;
-
-    // This is a weird case where we do "resume" work — work that failed on
-    // our first attempt. Because we no longer have a notion of "progressed
-    // deletions," reset the child to the current child to make sure we delete
-    // it again. TODO: Find a better way to handle this, perhaps during a more
-    // general overhaul of error handling.
-    if (current === null) {
-      workInProgress.child = null;
-    } else if (workInProgress.child !== current.child) {
-      workInProgress.child = current.child;
-    }
-
-    if (
-      workInProgress.expirationTime === NoWork ||
-      workInProgress.expirationTime > renderExpirationTime
-    ) {
-      return bailoutOnLowPriority(current, workInProgress);
-    }
-
-    // If we don't bail out, we're going be recomputing our children so we need
-    // to drop our effect list.
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
-
-    // Unmount the current children as if the component rendered null
-    var nextChildren = null;
-    reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      nextChildren,
-      renderExpirationTime
-    );
-
-    if (workInProgress.tag === ClassComponent) {
-      var instance = workInProgress.stateNode;
-      workInProgress.memoizedProps = instance.props;
-      workInProgress.memoizedState = instance.state;
-    }
-
-    return workInProgress.child;
-  }
-
-  return {
-    beginWork: beginWork,
-    beginFailedWork: beginFailedWork
-  };
-};
+  return {
+    beginWork: beginWork
+  };
+};
 
 var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
   var createInstance = config.createInstance,
@@ -9718,14 +9885,12 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
         } else {
           var container = portalOrRoot.containerInfo;
           var newChildSet = createContainerChildSet(container);
-          if (finalizeContainerChildren(container, newChildSet)) {
-            markUpdate(workInProgress);
-          }
-          portalOrRoot.pendingChildren = newChildSet;
           // If children might have changed, we have to add them all to the set.
           appendAllChildrenToContainer(newChildSet, workInProgress);
+          portalOrRoot.pendingChildren = newChildSet;
           // Schedule an update on the container to swap out the container.
           markUpdate(workInProgress);
+          finalizeContainerChildren(container, newChildSet);
         }
       };
       updateHostComponent = function(
@@ -9834,6 +9999,20 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
       case ClassComponent: {
         // We are leaving this subtree, so pop context if any.
         popContextProvider(workInProgress);
+
+        // If this component caught an error, schedule an error log effect.
+        var instance = workInProgress.stateNode;
+        var updateQueue = workInProgress.updateQueue;
+        if (updateQueue !== null && updateQueue.capturedValues !== null) {
+          workInProgress.effectTag &= ~DidCapture;
+          if (typeof instance.componentDidCatch === "function") {
+            workInProgress.effectTag |= ErrLog;
+          } else {
+            // Normally we clear this in the commit phase, but since we did not
+            // schedule an effect, we need to reset it here.
+            updateQueue.capturedValues = null;
+          }
+        }
         return null;
       }
       case HostRoot: {
@@ -9844,7 +10023,6 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
           fiberRoot.context = fiberRoot.pendingContext;
           fiberRoot.pendingContext = null;
         }
-
         if (current === null || current.child === null) {
           // If we hydrated, pop so that we can delete any remaining children
           // that weren't hydrated.
@@ -9854,6 +10032,11 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
           workInProgress.effectTag &= ~Placement;
         }
         updateHostContainer(workInProgress);
+
+        var _updateQueue = workInProgress.updateQueue;
+        if (_updateQueue !== null && _updateQueue.capturedValues !== null) {
+          workInProgress.effectTag |= ErrLog;
+        }
         return null;
       }
       case HostComponent: {
@@ -9868,10 +10051,13 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
           // have newProps so we'll have to reuse them.
           // TODO: Split the update API as separate for the props vs. children.
           // Even better would be if children weren't special cased at all tho.
-          var instance = workInProgress.stateNode;
+          var _instance = workInProgress.stateNode;
           var currentHostContext = getHostContext();
+          // TODO: Experiencing an error where oldProps is null. Suggests a host
+          // component is hitting the resume path. Figure out why. Possibly
+          // related to `hidden`.
           var updatePayload = prepareUpdate(
-            instance,
+            _instance,
             type,
             oldProps,
             newProps,
@@ -9925,7 +10111,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
               markUpdate(workInProgress);
             }
           } else {
-            var _instance = createInstance(
+            var _instance2 = createInstance(
               type,
               newProps,
               rootContainerInstance,
@@ -9933,14 +10119,14 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
               workInProgress
             );
 
-            appendAllChildren(_instance, workInProgress);
+            appendAllChildren(_instance2, workInProgress);
 
             // Certain renderers require commit-time effects for initial mount.
             // (eg DOM renderer supports auto-focus for certain elements).
             // Make sure such renderers get scheduled for later work.
             if (
               finalizeInitialChildren(
-                _instance,
+                _instance2,
                 type,
                 newProps,
                 rootContainerInstance,
@@ -9949,7 +10135,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
             ) {
               markUpdate(workInProgress);
             }
-            workInProgress.stateNode = _instance;
+            workInProgress.stateNode = _instance2;
           }
 
           if (workInProgress.ref !== null) {
@@ -10044,11 +10230,267 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
   };
 };
 
+function createCapturedValue(value, source) {
+  // If the value is an error, call this function immediately after it is thrown
+  // so the stack is accurate.
+  return {
+    value: value,
+    source: source,
+    stack: getStackAddendumByWorkInProgressFiber(source)
+  };
+}
+
+var ReactFiberUnwindWork = function(
+  hostContext,
+  scheduleWork,
+  isAlreadyFailedLegacyErrorBoundary
+) {
+  var popHostContainer = hostContext.popHostContainer,
+    popHostContext = hostContext.popHostContext;
+
+  function throwException(returnFiber, sourceFiber, rawValue) {
+    // The source fiber did not complete.
+    sourceFiber.effectTag |= Incomplete;
+    // Its effect list is no longer valid.
+    sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+
+    var value = createCapturedValue(rawValue, sourceFiber);
+
+    var workInProgress = returnFiber;
+    do {
+      switch (workInProgress.tag) {
+        case HostRoot: {
+          // Uncaught error
+          var errorInfo = value;
+          ensureUpdateQueues(workInProgress);
+          var updateQueue = workInProgress.updateQueue;
+          updateQueue.capturedValues = [errorInfo];
+          workInProgress.effectTag |= ShouldCapture;
+          return;
+        }
+        case ClassComponent:
+          // Capture and retry
+          var ctor = workInProgress.type;
+          var _instance = workInProgress.stateNode;
+          if (
+            (workInProgress.effectTag & DidCapture) === NoEffect &&
+            ((typeof ctor.getDerivedStateFromCatch === "function" &&
+              enableGetDerivedStateFromCatch) ||
+              (_instance !== null &&
+                typeof _instance.componentDidCatch === "function" &&
+                !isAlreadyFailedLegacyErrorBoundary(_instance)))
+          ) {
+            ensureUpdateQueues(workInProgress);
+            var _updateQueue = workInProgress.updateQueue;
+            var capturedValues = _updateQueue.capturedValues;
+            if (capturedValues === null) {
+              _updateQueue.capturedValues = [value];
+            } else {
+              capturedValues.push(value);
+            }
+            workInProgress.effectTag |= ShouldCapture;
+            return;
+          }
+          break;
+        default:
+          break;
+      }
+      workInProgress = workInProgress["return"];
+    } while (workInProgress !== null);
+  }
+
+  function unwindWork(workInProgress) {
+    switch (workInProgress.tag) {
+      case ClassComponent: {
+        popContextProvider(workInProgress);
+        var effectTag = workInProgress.effectTag;
+        if (effectTag & ShouldCapture) {
+          workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
+        }
+        return null;
+      }
+      case HostRoot: {
+        popHostContainer(workInProgress);
+        popTopLevelContextObject(workInProgress);
+        var _effectTag = workInProgress.effectTag;
+        if (_effectTag & ShouldCapture) {
+          workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
+        }
+        return null;
+      }
+      case HostComponent: {
+        popHostContext(workInProgress);
+        return null;
+      }
+      case HostPortal:
+        popHostContainer(workInProgress);
+        return null;
+      case ContextProvider:
+        popProvider(workInProgress);
+        return null;
+      default:
+        return null;
+    }
+  }
+  return {
+    throwException: throwException,
+    unwindWork: unwindWork
+  };
+};
+
+// Module provided by RN:
+/**
+ * Intercept lifecycle errors and ensure they are shown with the correct stack
+ * trace within the native redbox component.
+ */
+function showErrorDialog(capturedError) {
+  var componentStack = capturedError.componentStack,
+    error = capturedError.error;
+
+  var errorToHandle = void 0;
+
+  // Typically Errors are thrown but eg strings or null can be thrown as well.
+  if (error instanceof Error) {
+    var message = error.message,
+      name = error.name;
+
+    var summary = message ? name + ": " + message : name;
+
+    errorToHandle = error;
+
+    try {
+      errorToHandle.message =
+        summary + "\n\nThis error is located at:" + componentStack;
+    } catch (e) {}
+  } else if (typeof error === "string") {
+    errorToHandle = new Error(
+      error + "\n\nThis error is located at:" + componentStack
+    );
+  } else {
+    errorToHandle = new Error("Unspecified error at:" + componentStack);
+  }
+
+  ExceptionsManager.handleException(errorToHandle, false);
+
+  // Return false here to prevent ReactFiberErrorLogger default behavior of
+  // logging error details to console.error. Calls to console.error are
+  // automatically routed to the native redbox controller, which we've already
+  // done above by calling ExceptionsManager.
+  return false;
+}
+
+function logCapturedError(capturedError) {
+  var logError = showErrorDialog(capturedError);
+
+  // Allow injected showErrorDialog() to prevent default console.error logging.
+  // This enables renderers like ReactNative to better manage redbox behavior.
+  if (logError === false) {
+    return;
+  }
+
+  var error = capturedError.error;
+  var suppressLogging = error && error.suppressReactErrorLogging;
+  if (suppressLogging) {
+    return;
+  }
+
+  {
+    var componentName = capturedError.componentName,
+      componentStack = capturedError.componentStack,
+      errorBoundaryName = capturedError.errorBoundaryName,
+      errorBoundaryFound = capturedError.errorBoundaryFound,
+      willRetry = capturedError.willRetry;
+
+    var componentNameMessage = componentName
+      ? "The above error occurred in the <" + componentName + "> component:"
+      : "The above error occurred in one of your React components:";
+
+    var errorBoundaryMessage = void 0;
+    // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
+    if (errorBoundaryFound && errorBoundaryName) {
+      if (willRetry) {
+        errorBoundaryMessage =
+          "React will try to recreate this component tree from scratch " +
+          ("using the error boundary you provided, " + errorBoundaryName + ".");
+      } else {
+        errorBoundaryMessage =
+          "This error was initially handled by the error boundary " +
+          errorBoundaryName +
+          ".\n" +
+          "Recreating the tree from scratch failed so React will unmount the tree.";
+      }
+    } else {
+      errorBoundaryMessage =
+        "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
+        "Visit https://fb.me/react-error-boundaries to learn more about error boundaries.";
+    }
+    var combinedMessage =
+      "" +
+      componentNameMessage +
+      componentStack +
+      "\n\n" +
+      ("" + errorBoundaryMessage);
+
+    // In development, we provide our own message with just the component stack.
+    // We don't include the original error message and JS stack because the browser
+    // has already printed it. Even if the application swallows the error, it is still
+    // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+    console.error(combinedMessage);
+  }
+}
+
 var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
 var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
 
-var ReactFiberCommitWork = function(config, captureError) {
+function logError(boundary, errorInfo) {
+  var source = errorInfo.source;
+  var stack = errorInfo.stack;
+  if (stack === null) {
+    stack = getStackAddendumByWorkInProgressFiber(source);
+  }
+
+  var capturedError = {
+    componentName: source !== null ? getComponentName(source) : null,
+    error: errorInfo.value,
+    errorBoundary: boundary,
+    componentStack: stack !== null ? stack : "",
+    errorBoundaryName: null,
+    errorBoundaryFound: false,
+    willRetry: false
+  };
+
+  if (boundary !== null) {
+    capturedError.errorBoundaryName = getComponentName(boundary);
+    capturedError.errorBoundaryFound = capturedError.willRetry =
+      boundary.tag === ClassComponent;
+  } else {
+    capturedError.errorBoundaryName = null;
+    capturedError.errorBoundaryFound = capturedError.willRetry = false;
+  }
+
+  try {
+    logCapturedError(capturedError);
+  } catch (e) {
+    // Prevent cycle if logCapturedError() throws.
+    // A cycle may still occur if logCapturedError renders a component that throws.
+    var suppressLogging = e && e.suppressReactErrorLogging;
+    if (!suppressLogging) {
+      console.error(e);
+    }
+  }
+}
+
+var ReactFiberCommitWork = function(
+  config,
+  captureError,
+  scheduleWork,
+  computeExpirationForFiber,
+  markLegacyErrorBoundaryAsFailed,
+  recalculateCurrentTime
+) {
   var getPublicInstance = config.getPublicInstance,
     mutation = config.mutation,
     persistence = config.persistence;
@@ -10095,53 +10537,59 @@ var ReactFiberCommitWork = function(config, captureError) {
     }
   }
 
-  function commitLifeCycles(current, finishedWork) {
+  function commitLifeCycles(
+    finishedRoot,
+    current,
+    finishedWork,
+    currentTime,
+    committedExpirationTime
+  ) {
     switch (finishedWork.tag) {
       case ClassComponent: {
-        var instance = finishedWork.stateNode;
+        var _instance = finishedWork.stateNode;
         if (finishedWork.effectTag & Update) {
           if (current === null) {
             startPhaseTimer(finishedWork, "componentDidMount");
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            instance.componentDidMount();
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            _instance.componentDidMount();
             stopPhaseTimer();
           } else {
             var prevProps = current.memoizedProps;
             var prevState = current.memoizedState;
             startPhaseTimer(finishedWork, "componentDidUpdate");
-            instance.props = finishedWork.memoizedProps;
-            instance.state = finishedWork.memoizedState;
-            instance.componentDidUpdate(prevProps, prevState);
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            _instance.componentDidUpdate(prevProps, prevState);
             stopPhaseTimer();
           }
         }
         var updateQueue = finishedWork.updateQueue;
         if (updateQueue !== null) {
-          commitCallbacks(updateQueue, instance);
+          commitCallbacks(updateQueue, _instance);
         }
         return;
       }
       case HostRoot: {
         var _updateQueue = finishedWork.updateQueue;
         if (_updateQueue !== null) {
-          var _instance = null;
+          var _instance2 = null;
           if (finishedWork.child !== null) {
             switch (finishedWork.child.tag) {
               case HostComponent:
-                _instance = getPublicInstance(finishedWork.child.stateNode);
+                _instance2 = getPublicInstance(finishedWork.child.stateNode);
                 break;
               case ClassComponent:
-                _instance = finishedWork.child.stateNode;
+                _instance2 = finishedWork.child.stateNode;
                 break;
             }
           }
-          commitCallbacks(_updateQueue, _instance);
+          commitCallbacks(_updateQueue, _instance2);
         }
         return;
       }
       case HostComponent: {
-        var _instance2 = finishedWork.stateNode;
+        var _instance3 = finishedWork.stateNode;
 
         // Renderers may schedule work to be done after host components are mounted
         // (eg DOM renderer may schedule auto-focus for inputs and form controls).
@@ -10150,7 +10598,7 @@ var ReactFiberCommitWork = function(config, captureError) {
         if (current === null && finishedWork.effectTag & Update) {
           var type = finishedWork.type;
           var props = finishedWork.memoizedProps;
-          commitMount(_instance2, type, props, finishedWork);
+          commitMount(_instance3, type, props, finishedWork);
         }
 
         return;
@@ -10173,17 +10621,78 @@ var ReactFiberCommitWork = function(config, captureError) {
     }
   }
 
+  function commitErrorLogging(finishedWork, onUncaughtError) {
+    switch (finishedWork.tag) {
+      case ClassComponent:
+        {
+          var ctor = finishedWork.type;
+          var _instance4 = finishedWork.stateNode;
+          var updateQueue = finishedWork.updateQueue;
+          invariant(
+            updateQueue !== null && updateQueue.capturedValues !== null,
+            "An error logging effect should not have been scheduled if no errors " +
+              "were captured. This error is likely caused by a bug in React. " +
+              "Please file an issue."
+          );
+          var capturedErrors = updateQueue.capturedValues;
+          updateQueue.capturedValues = null;
+
+          if (typeof ctor.getDerivedStateFromCatch !== "function") {
+            // To preserve the preexisting retry behavior of error boundaries,
+            // we keep track of which ones already failed during this batch.
+            // This gets reset before we yield back to the browser.
+            // TODO: Warn in strict mode if getDerivedStateFromCatch is
+            // not defined.
+            markLegacyErrorBoundaryAsFailed(_instance4);
+          }
+
+          _instance4.props = finishedWork.memoizedProps;
+          _instance4.state = finishedWork.memoizedState;
+          for (var i = 0; i < capturedErrors.length; i++) {
+            var errorInfo = capturedErrors[i];
+            var _error = errorInfo.value;
+            logError(finishedWork, errorInfo);
+            _instance4.componentDidCatch(_error);
+          }
+        }
+        break;
+      case HostRoot: {
+        var _updateQueue2 = finishedWork.updateQueue;
+        invariant(
+          _updateQueue2 !== null && _updateQueue2.capturedValues !== null,
+          "An error logging effect should not have been scheduled if no errors " +
+            "were captured. This error is likely caused by a bug in React. " +
+            "Please file an issue."
+        );
+        var _capturedErrors = _updateQueue2.capturedValues;
+        _updateQueue2.capturedValues = null;
+        for (var _i = 0; _i < _capturedErrors.length; _i++) {
+          var _errorInfo = _capturedErrors[_i];
+          logError(finishedWork, _errorInfo);
+          onUncaughtError(_errorInfo.value);
+        }
+        break;
+      }
+      default:
+        invariant(
+          false,
+          "This unit of work tag cannot capture errors.  This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
+    }
+  }
+
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (ref !== null) {
-      var instance = finishedWork.stateNode;
+      var _instance5 = finishedWork.stateNode;
       var instanceToUse = void 0;
       switch (finishedWork.tag) {
         case HostComponent:
-          instanceToUse = getPublicInstance(instance);
+          instanceToUse = getPublicInstance(_instance5);
           break;
         default:
-          instanceToUse = instance;
+          instanceToUse = _instance5;
       }
       if (typeof ref === "function") {
         ref(instanceToUse);
@@ -10215,9 +10724,9 @@ var ReactFiberCommitWork = function(config, captureError) {
     switch (current.tag) {
       case ClassComponent: {
         safelyDetachRef(current);
-        var instance = current.stateNode;
-        if (typeof instance.componentWillUnmount === "function") {
-          safelyCallComponentWillUnmount(current, instance);
+        var _instance6 = current.stateNode;
+        if (typeof _instance6.componentWillUnmount === "function") {
+          safelyCallComponentWillUnmount(current, _instance6);
         }
         return;
       }
@@ -10354,6 +10863,7 @@ var ReactFiberCommitWork = function(config, captureError) {
         },
 
         commitLifeCycles: commitLifeCycles,
+        commitErrorLogging: commitErrorLogging,
         commitAttachRef: commitAttachRef,
         commitDetachRef: commitDetachRef
       };
@@ -10611,8 +11121,8 @@ var ReactFiberCommitWork = function(config, captureError) {
         return;
       }
       case HostComponent: {
-        var instance = finishedWork.stateNode;
-        if (instance != null) {
+        var _instance7 = finishedWork.stateNode;
+        if (_instance7 != null) {
           // Commit the work prepared earlier.
           var newProps = finishedWork.memoizedProps;
           // For hydration we reuse the update path but we treat the oldProps
@@ -10625,7 +11135,7 @@ var ReactFiberCommitWork = function(config, captureError) {
           finishedWork.updateQueue = null;
           if (updatePayload !== null) {
             commitUpdate(
-              instance,
+              _instance7,
               updatePayload,
               type,
               oldProps,
@@ -10675,6 +11185,7 @@ var ReactFiberCommitWork = function(config, captureError) {
       commitDeletion: commitDeletion,
       commitWork: commitWork,
       commitLifeCycles: commitLifeCycles,
+      commitErrorLogging: commitErrorLogging,
       commitAttachRef: commitAttachRef,
       commitDetachRef: commitDetachRef
     };
@@ -11140,110 +11651,9 @@ var ReactFiberInstrumentation = {
 
 var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
 
-// Module provided by RN:
-/**
- * Intercept lifecycle errors and ensure they are shown with the correct stack
- * trace within the native redbox component.
- */
-function showErrorDialog(capturedError) {
-  var componentStack = capturedError.componentStack,
-    error = capturedError.error;
-
-  var errorToHandle = void 0;
-
-  // Typically Errors are thrown but eg strings or null can be thrown as well.
-  if (error instanceof Error) {
-    var message = error.message,
-      name = error.name;
-
-    var summary = message ? name + ": " + message : name;
-
-    errorToHandle = error;
-
-    try {
-      errorToHandle.message =
-        summary + "\n\nThis error is located at:" + componentStack;
-    } catch (e) {}
-  } else if (typeof error === "string") {
-    errorToHandle = new Error(
-      error + "\n\nThis error is located at:" + componentStack
-    );
-  } else {
-    errorToHandle = new Error("Unspecified error at:" + componentStack);
-  }
-
-  ExceptionsManager.handleException(errorToHandle, false);
-
-  // Return false here to prevent ReactFiberErrorLogger default behavior of
-  // logging error details to console.error. Calls to console.error are
-  // automatically routed to the native redbox controller, which we've already
-  // done above by calling ExceptionsManager.
-  return false;
-}
-
-function logCapturedError(capturedError) {
-  var logError = showErrorDialog(capturedError);
-
-  // Allow injected showErrorDialog() to prevent default console.error logging.
-  // This enables renderers like ReactNative to better manage redbox behavior.
-  if (logError === false) {
-    return;
-  }
-
-  var error = capturedError.error;
-  var suppressLogging = error && error.suppressReactErrorLogging;
-  if (suppressLogging) {
-    return;
-  }
-
-  {
-    var componentName = capturedError.componentName,
-      componentStack = capturedError.componentStack,
-      errorBoundaryName = capturedError.errorBoundaryName,
-      errorBoundaryFound = capturedError.errorBoundaryFound,
-      willRetry = capturedError.willRetry;
-
-    var componentNameMessage = componentName
-      ? "The above error occurred in the <" + componentName + "> component:"
-      : "The above error occurred in one of your React components:";
-
-    var errorBoundaryMessage = void 0;
-    // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
-    if (errorBoundaryFound && errorBoundaryName) {
-      if (willRetry) {
-        errorBoundaryMessage =
-          "React will try to recreate this component tree from scratch " +
-          ("using the error boundary you provided, " + errorBoundaryName + ".");
-      } else {
-        errorBoundaryMessage =
-          "This error was initially handled by the error boundary " +
-          errorBoundaryName +
-          ".\n" +
-          "Recreating the tree from scratch failed so React will unmount the tree.";
-      }
-    } else {
-      errorBoundaryMessage =
-        "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
-        "Visit https://fb.me/react-error-boundaries to learn more about error boundaries.";
-    }
-    var combinedMessage =
-      "" +
-      componentNameMessage +
-      componentStack +
-      "\n\n" +
-      ("" + errorBoundaryMessage);
-
-    // In development, we provide our own message with just the component stack.
-    // We don't include the original error message and JS stack because the browser
-    // has already printed it. Even if the application swallows the error, it is still
-    // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
-    console.error(combinedMessage);
-  }
-}
-
-var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
-var hasCaughtError = ReactErrorUtils.hasCaughtError;
-var clearCaughtError = ReactErrorUtils.clearCaughtError;
+var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
+var hasCaughtError = ReactErrorUtils.hasCaughtError;
+var clearCaughtError = ReactErrorUtils.clearCaughtError;
 
 var didWarnAboutStateTransition = void 0;
 var didWarnSetStateChildContext = void 0;
@@ -11302,10 +11712,11 @@ var warnAboutInvalidUpdates = void 0;
 
 var ReactFiberScheduler = function(config) {
   var hostContext = ReactFiberHostContext(config);
+  var popHostContext = hostContext.popHostContext,
+    popHostContainer = hostContext.popHostContainer;
+
   var hydrationContext = ReactFiberHydrationContext(config);
-  var popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext,
-    resetHostContainer = hostContext.resetHostContainer;
+  var resetHostContainer = hostContext.resetHostContainer;
 
   var _ReactFiberBeginWork = ReactFiberBeginWork(
       config,
@@ -11314,8 +11725,7 @@ var ReactFiberScheduler = function(config) {
       scheduleWork,
       computeExpirationForFiber
     ),
-    beginWork = _ReactFiberBeginWork.beginWork,
-    beginFailedWork = _ReactFiberBeginWork.beginFailedWork;
+    beginWork = _ReactFiberBeginWork.beginWork;
 
   var _ReactFiberCompleteWo = ReactFiberCompleteWork(
       config,
@@ -11324,12 +11734,28 @@ var ReactFiberScheduler = function(config) {
     ),
     completeWork = _ReactFiberCompleteWo.completeWork;
 
-  var _ReactFiberCommitWork = ReactFiberCommitWork(config, captureError),
+  var _ReactFiberUnwindWork = ReactFiberUnwindWork(
+      hostContext,
+      scheduleWork,
+      isAlreadyFailedLegacyErrorBoundary
+    ),
+    throwException = _ReactFiberUnwindWork.throwException,
+    unwindWork = _ReactFiberUnwindWork.unwindWork;
+
+  var _ReactFiberCommitWork = ReactFiberCommitWork(
+      config,
+      onCommitPhaseError,
+      scheduleWork,
+      computeExpirationForFiber,
+      markLegacyErrorBoundaryAsFailed,
+      recalculateCurrentTime
+    ),
     commitResetTextContent = _ReactFiberCommitWork.commitResetTextContent,
     commitPlacement = _ReactFiberCommitWork.commitPlacement,
     commitDeletion = _ReactFiberCommitWork.commitDeletion,
     commitWork = _ReactFiberCommitWork.commitWork,
     commitLifeCycles = _ReactFiberCommitWork.commitLifeCycles,
+    commitErrorLogging = _ReactFiberCommitWork.commitErrorLogging,
     commitAttachRef = _ReactFiberCommitWork.commitAttachRef,
     commitDetachRef = _ReactFiberCommitWork.commitDetachRef;
 
@@ -11341,8 +11767,9 @@ var ReactFiberScheduler = function(config) {
 
   // Represents the current time in ms.
 
-  var startTime = now();
+  var originalStartTimeMs = now();
   var mostRecentCurrentTime = msToExpirationTime(0);
+  var mostRecentCurrentTimeMs = originalStartTimeMs;
 
   // Used to ensure computeUniqueAsyncExpiration is monotonically increases.
   var lastUniqueAsyncExpiration = 0;
@@ -11363,32 +11790,70 @@ var ReactFiberScheduler = function(config) {
   // The next fiber with an effect that we're currently committing.
   var nextEffect = null;
 
-  // Keep track of which fibers have captured an error that need to be handled.
-  // Work is removed from this collection after componentDidCatch is called.
-  var capturedErrors = null;
-  // Keep track of which fibers have failed during the current batch of work.
-  // This is a different set than capturedErrors, because it is not reset until
-  // the end of the batch. This is needed to propagate errors correctly if a
-  // subtree fails more than once.
-  var failedBoundaries = null;
-  // Error boundaries that captured an error during the current commit.
-  var commitPhaseBoundaries = null;
-  var firstUncaughtError = null;
-  var didFatal = false;
-
   var isCommitting = false;
-  var isUnmounting = false;
+
+  var isRootReadyForCommit = false;
+
+  var legacyErrorBoundariesThatAlreadyFailed = null;
 
   // Used for performance tracking.
   var interruptedBy = null;
 
+  var stashedWorkInProgressProperties = void 0;
+  var replayUnitOfWork = void 0;
+  if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+    stashedWorkInProgressProperties = null;
+    replayUnitOfWork = function(failedUnitOfWork, isAsync) {
+      // Retore the original state of the work-in-progress
+      Object.assign(failedUnitOfWork, stashedWorkInProgressProperties);
+      switch (failedUnitOfWork.tag) {
+        case HostRoot:
+          popHostContainer(failedUnitOfWork);
+          popTopLevelContextObject(failedUnitOfWork);
+          break;
+        case HostComponent:
+          popHostContext(failedUnitOfWork);
+          break;
+        case ClassComponent:
+          popContextProvider(failedUnitOfWork);
+          break;
+        case HostPortal:
+          popHostContainer(failedUnitOfWork);
+          break;
+        case ContextProvider:
+          popProvider(failedUnitOfWork);
+          break;
+      }
+      // Replay the begin phase.
+      invokeGuardedCallback$2(null, workLoop, null, isAsync);
+      if (hasCaughtError()) {
+        clearCaughtError();
+      } else {
+        // This should be unreachable because the render phase is
+        // idempotent
+      }
+    };
+  }
+
   function resetContextStack() {
     // Reset the stack
     reset();
     // Reset the cursors
     resetContext();
-    resetProviderStack();
     resetHostContainer();
+
+    // TODO: Unify new context implementation with other stacks
+    resetProviderStack();
+
+    {
+      ReactStrictModeWarnings.discardPendingWarnings();
+    }
+
+    nextRoot = null;
+    nextRenderExpirationTime = NoWork;
+    nextUnitOfWork = null;
+
+    isRootReadyForCommit = false;
   }
 
   function commitAllHostEffects() {
@@ -11414,8 +11879,7 @@ var ReactFiberScheduler = function(config) {
       // updates, and deletions. To avoid needing to add a case for every
       // possible bitmap value, we remove the secondary effects from the
       // effect tag and switch on that value.
-      var primaryEffectTag =
-        effectTag & ~(Callback | Err | ContentReset | Ref | PerformedWork);
+      var primaryEffectTag = effectTag & (Placement | Update | Deletion);
       switch (primaryEffectTag) {
         case Placement: {
           commitPlacement(nextEffect);
@@ -11445,9 +11909,7 @@ var ReactFiberScheduler = function(config) {
           break;
         }
         case Deletion: {
-          isUnmounting = true;
           commitDeletion(nextEffect);
-          isUnmounting = false;
           break;
         }
       }
@@ -11459,7 +11921,11 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
-  function commitAllLifeCycles() {
+  function commitAllLifeCycles(
+    finishedRoot,
+    currentTime,
+    committedExpirationTime
+  ) {
     {
       ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings();
 
@@ -11467,24 +11933,28 @@ var ReactFiberScheduler = function(config) {
         ReactStrictModeWarnings.flushPendingDeprecationWarnings();
       }
     }
-
     while (nextEffect !== null) {
       var effectTag = nextEffect.effectTag;
 
       if (effectTag & (Update | Callback)) {
         recordEffect();
         var current = nextEffect.alternate;
-        commitLifeCycles(current, nextEffect);
+        commitLifeCycles(
+          finishedRoot,
+          current,
+          nextEffect,
+          currentTime,
+          committedExpirationTime
+        );
       }
 
-      if (effectTag & Ref) {
-        recordEffect();
-        commitAttachRef(nextEffect);
+      if (effectTag & ErrLog) {
+        commitErrorLogging(nextEffect, onUncaughtError);
       }
 
-      if (effectTag & Err) {
+      if (effectTag & Ref) {
         recordEffect();
-        commitErrorHandling(nextEffect);
+        commitAttachRef(nextEffect);
       }
 
       var next = nextEffect.nextEffect;
@@ -11499,11 +11969,22 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
+  function isAlreadyFailedLegacyErrorBoundary(instance) {
+    return (
+      legacyErrorBoundariesThatAlreadyFailed !== null &&
+      legacyErrorBoundariesThatAlreadyFailed.has(instance)
+    );
+  }
+
+  function markLegacyErrorBoundaryAsFailed(instance) {
+    if (legacyErrorBoundariesThatAlreadyFailed === null) {
+      legacyErrorBoundariesThatAlreadyFailed = new Set([instance]);
+    } else {
+      legacyErrorBoundariesThatAlreadyFailed.add(instance);
+    }
+  }
+
   function commitRoot(finishedWork) {
-    // We keep track of this so that captureError can collect any boundaries
-    // that capture an error during the commit phase. The reason these aren't
-    // local to this function is because errors that occur during cWU are
-    // captured elsewhere, to prevent the unmount from being interrupted.
     isWorking = true;
     isCommitting = true;
     startCommitTimer();
@@ -11515,7 +11996,15 @@ var ReactFiberScheduler = function(config) {
         "related to the return field. This error is likely caused by a bug " +
         "in React. Please file an issue."
     );
-    root.isReadyForCommit = false;
+    var committedExpirationTime = root.pendingCommitExpirationTime;
+    invariant(
+      committedExpirationTime !== NoWork,
+      "Cannot commit an incomplete root. This error is likely caused by a " +
+        "bug in React. Please file an issue."
+    );
+    root.pendingCommitExpirationTime = NoWork;
+
+    var currentTime = recalculateCurrentTime();
 
     // Reset this to null before calling lifecycles
     ReactCurrentOwner.current = null;
@@ -11546,12 +12035,12 @@ var ReactFiberScheduler = function(config) {
     startCommitHostEffectsTimer();
     while (nextEffect !== null) {
       var didError = false;
-      var _error = void 0;
+      var error = void 0;
       {
         invokeGuardedCallback$2(null, commitAllHostEffects, null);
         if (hasCaughtError()) {
           didError = true;
-          _error = clearCaughtError();
+          error = clearCaughtError();
         }
       }
       if (didError) {
@@ -11560,7 +12049,7 @@ var ReactFiberScheduler = function(config) {
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        captureError(nextEffect, _error);
+        onCommitPhaseError(nextEffect, error);
         // Clean-up
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
@@ -11585,12 +12074,19 @@ var ReactFiberScheduler = function(config) {
     startCommitLifeCyclesTimer();
     while (nextEffect !== null) {
       var _didError = false;
-      var _error2 = void 0;
+      var _error = void 0;
       {
-        invokeGuardedCallback$2(null, commitAllLifeCycles, null);
+        invokeGuardedCallback$2(
+          null,
+          commitAllLifeCycles,
+          null,
+          root,
+          currentTime,
+          committedExpirationTime
+        );
         if (hasCaughtError()) {
           _didError = true;
-          _error2 = clearCaughtError();
+          _error = clearCaughtError();
         }
       }
       if (_didError) {
@@ -11599,7 +12095,7 @@ var ReactFiberScheduler = function(config) {
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        captureError(nextEffect, _error2);
+        onCommitPhaseError(nextEffect, _error);
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
         }
@@ -11617,26 +12113,12 @@ var ReactFiberScheduler = function(config) {
       ReactFiberInstrumentation_1.debugTool.onCommitWork(finishedWork);
     }
 
-    // If we caught any errors during this commit, schedule their boundaries
-    // to update.
-    if (commitPhaseBoundaries) {
-      commitPhaseBoundaries.forEach(scheduleErrorRecovery);
-      commitPhaseBoundaries = null;
-    }
-
-    if (firstUncaughtError !== null) {
-      var _error3 = firstUncaughtError;
-      firstUncaughtError = null;
-      onUncaughtError(_error3);
-    }
-
     var remainingTime = root.current.expirationTime;
-
     if (remainingTime === NoWork) {
-      capturedErrors = null;
-      failedBoundaries = null;
+      // If there's no remaining work, we can clear the set of already failed
+      // error boundaries.
+      legacyErrorBoundariesThatAlreadyFailed = null;
     }
-
     return remainingTime;
   }
 
@@ -11668,6 +12150,9 @@ var ReactFiberScheduler = function(config) {
   }
 
   function completeUnitOfWork(workInProgress) {
+    // Attempt to complete the current unit of work, then move to the
+    // next sibling. If there are no more siblings, return to the
+    // parent fiber.
     while (true) {
       // The current, flushed, state of this fiber is the alternate.
       // Ideally nothing should rely on this, but relying on it here
@@ -11677,80 +12162,140 @@ var ReactFiberScheduler = function(config) {
       {
         ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
       }
-      var next = completeWork(
-        current,
-        workInProgress,
-        nextRenderExpirationTime
-      );
-      {
-        ReactDebugCurrentFiber.resetCurrentFiber();
-      }
 
       var returnFiber = workInProgress["return"];
       var siblingFiber = workInProgress.sibling;
 
-      resetExpirationTime(workInProgress, nextRenderExpirationTime);
-
-      if (next !== null) {
+      if ((workInProgress.effectTag & Incomplete) === NoEffect) {
+        // This fiber completed.
+        var next = completeWork(
+          current,
+          workInProgress,
+          nextRenderExpirationTime
+        );
         stopWorkTimer(workInProgress);
+        resetExpirationTime(workInProgress, nextRenderExpirationTime);
+        {
+          ReactDebugCurrentFiber.resetCurrentFiber();
+        }
+
+        if (next !== null) {
+          stopWorkTimer(workInProgress);
+          if (true && ReactFiberInstrumentation_1.debugTool) {
+            ReactFiberInstrumentation_1.debugTool.onCompleteWork(
+              workInProgress
+            );
+          }
+          // If completing this work spawned new work, do that next. We'll come
+          // back here again.
+          return next;
+        }
+
+        if (
+          returnFiber !== null &&
+          // Do not append effects to parents if a sibling failed to complete
+          (returnFiber.effectTag & Incomplete) === NoEffect
+        ) {
+          // Append all the effects of the subtree and this fiber onto the effect
+          // list of the parent. The completion order of the children affects the
+          // side-effect order.
+          if (returnFiber.firstEffect === null) {
+            returnFiber.firstEffect = workInProgress.firstEffect;
+          }
+          if (workInProgress.lastEffect !== null) {
+            if (returnFiber.lastEffect !== null) {
+              returnFiber.lastEffect.nextEffect = workInProgress.firstEffect;
+            }
+            returnFiber.lastEffect = workInProgress.lastEffect;
+          }
+
+          // If this fiber had side-effects, we append it AFTER the children's
+          // side-effects. We can perform certain side-effects earlier if
+          // needed, by doing multiple passes over the effect list. We don't want
+          // to schedule our own side-effect on our own list because if end up
+          // reusing children we'll schedule this effect onto itself since we're
+          // at the end.
+          var effectTag = workInProgress.effectTag;
+          // Skip both NoWork and PerformedWork tags when creating the effect list.
+          // PerformedWork effect is read by React DevTools but shouldn't be committed.
+          if (effectTag > PerformedWork) {
+            if (returnFiber.lastEffect !== null) {
+              returnFiber.lastEffect.nextEffect = workInProgress;
+            } else {
+              returnFiber.firstEffect = workInProgress;
+            }
+            returnFiber.lastEffect = workInProgress;
+          }
+        }
+
         if (true && ReactFiberInstrumentation_1.debugTool) {
           ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
         }
-        // If completing this work spawned new work, do that next. We'll come
-        // back here again.
-        return next;
-      }
 
-      if (returnFiber !== null) {
-        // Append all the effects of the subtree and this fiber onto the effect
-        // list of the parent. The completion order of the children affects the
-        // side-effect order.
-        if (returnFiber.firstEffect === null) {
-          returnFiber.firstEffect = workInProgress.firstEffect;
+        if (siblingFiber !== null) {
+          // If there is more work to do in this returnFiber, do that next.
+          return siblingFiber;
+        } else if (returnFiber !== null) {
+          // If there's no more work in this returnFiber. Complete the returnFiber.
+          workInProgress = returnFiber;
+          continue;
+        } else {
+          // We've reached the root.
+          isRootReadyForCommit = true;
+          return null;
         }
-        if (workInProgress.lastEffect !== null) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = workInProgress.firstEffect;
-          }
-          returnFiber.lastEffect = workInProgress.lastEffect;
+      } else {
+        // This fiber did not complete because something threw. Pop values off
+        // the stack without entering the complete phase. If this is a boundary,
+        // capture values if possible.
+        var _next = unwindWork(workInProgress);
+        // Because this fiber did not complete, don't reset its expiration time.
+        if (workInProgress.effectTag & DidCapture) {
+          // Restarting an error boundary
+          stopFailedWorkTimer(workInProgress);
+        } else {
+          stopWorkTimer(workInProgress);
         }
 
-        // If this fiber had side-effects, we append it AFTER the children's
-        // side-effects. We can perform certain side-effects earlier if
-        // needed, by doing multiple passes over the effect list. We don't want
-        // to schedule our own side-effect on our own list because if end up
-        // reusing children we'll schedule this effect onto itself since we're
-        // at the end.
-        var effectTag = workInProgress.effectTag;
-        // Skip both NoWork and PerformedWork tags when creating the effect list.
-        // PerformedWork effect is read by React DevTools but shouldn't be committed.
-        if (effectTag > PerformedWork) {
-          if (returnFiber.lastEffect !== null) {
-            returnFiber.lastEffect.nextEffect = workInProgress;
-          } else {
-            returnFiber.firstEffect = workInProgress;
+        {
+          ReactDebugCurrentFiber.resetCurrentFiber();
+        }
+
+        if (_next !== null) {
+          stopWorkTimer(workInProgress);
+          if (true && ReactFiberInstrumentation_1.debugTool) {
+            ReactFiberInstrumentation_1.debugTool.onCompleteWork(
+              workInProgress
+            );
           }
-          returnFiber.lastEffect = workInProgress;
+          // If completing this work spawned new work, do that next. We'll come
+          // back here again.
+          // Since we're restarting, remove anything that is not a host effect
+          // from the effect tag.
+          _next.effectTag &= HostEffectMask;
+          return _next;
         }
-      }
 
-      stopWorkTimer(workInProgress);
-      if (true && ReactFiberInstrumentation_1.debugTool) {
-        ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
-      }
+        if (returnFiber !== null) {
+          // Mark the parent fiber as incomplete and clear its effect list.
+          returnFiber.firstEffect = returnFiber.lastEffect = null;
+          returnFiber.effectTag |= Incomplete;
+        }
 
-      if (siblingFiber !== null) {
-        // If there is more work to do in this returnFiber, do that next.
-        return siblingFiber;
-      } else if (returnFiber !== null) {
-        // If there's no more work in this returnFiber. Complete the returnFiber.
-        workInProgress = returnFiber;
-        continue;
-      } else {
-        // We've reached the root.
-        var root = workInProgress.stateNode;
-        root.isReadyForCommit = true;
-        return null;
+        if (true && ReactFiberInstrumentation_1.debugTool) {
+          ReactFiberInstrumentation_1.debugTool.onCompleteWork(workInProgress);
+        }
+
+        if (siblingFiber !== null) {
+          // If there is more work to do in this returnFiber, do that next.
+          return siblingFiber;
+        } else if (returnFiber !== null) {
+          // If there's no more work in this returnFiber. Complete the returnFiber.
+          workInProgress = returnFiber;
+          continue;
+        } else {
+          return null;
+        }
       }
     }
 
@@ -11773,45 +12318,11 @@ var ReactFiberScheduler = function(config) {
       ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
     }
 
-    var next = beginWork(current, workInProgress, nextRenderExpirationTime);
-    {
-      ReactDebugCurrentFiber.resetCurrentFiber();
-    }
-    if (true && ReactFiberInstrumentation_1.debugTool) {
-      ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
-    }
-
-    if (next === null) {
-      // If this doesn't spawn new work, complete the current work.
-      next = completeUnitOfWork(workInProgress);
+    if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+      stashedWorkInProgressProperties = Object.assign({}, workInProgress);
     }
+    var next = beginWork(current, workInProgress, nextRenderExpirationTime);
 
-    ReactCurrentOwner.current = null;
-
-    return next;
-  }
-
-  function performFailedUnitOfWork(workInProgress) {
-    {
-      ReactStrictModeWarnings.discardPendingWarnings();
-    }
-
-    // The current, flushed, state of this fiber is the alternate.
-    // Ideally nothing should rely on this, but relying on it here
-    // means that we don't need an additional field on the work in
-    // progress.
-    var current = workInProgress.alternate;
-
-    // See if beginning this work spawns more work.
-    startWorkTimer(workInProgress);
-    {
-      ReactDebugCurrentFiber.setCurrentFiber(workInProgress);
-    }
-    var next = beginFailedWork(
-      current,
-      workInProgress,
-      nextRenderExpirationTime
-    );
     {
       ReactDebugCurrentFiber.resetCurrentFiber();
     }
@@ -11826,72 +12337,23 @@ var ReactFiberScheduler = function(config) {
 
     ReactCurrentOwner.current = null;
 
-    return next;
-  }
-
-  function workLoop(isAsync) {
-    if (capturedErrors !== null) {
-      // If there are unhandled errors, switch to the slow work loop.
-      // TODO: How to avoid this check in the fast path? Maybe the renderer
-      // could keep track of which roots have unhandled errors and call a
-      // forked version of renderRoot.
-      slowWorkLoopThatChecksForFailedWork(isAsync);
-      return;
-    }
-    if (!isAsync) {
-      // Flush all expired work.
-      while (nextUnitOfWork !== null) {
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-      }
-    } else {
-      // Flush asynchronous work until the deadline runs out of time.
-      while (nextUnitOfWork !== null && !shouldYield()) {
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-      }
-    }
+    return next;
   }
 
-  function slowWorkLoopThatChecksForFailedWork(isAsync) {
+  function workLoop(isAsync) {
     if (!isAsync) {
       // Flush all expired work.
       while (nextUnitOfWork !== null) {
-        if (hasCapturedError(nextUnitOfWork)) {
-          // Use a forked version of performUnitOfWork
-          nextUnitOfWork = performFailedUnitOfWork(nextUnitOfWork);
-        } else {
-          nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-        }
+        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
       }
     } else {
       // Flush asynchronous work until the deadline runs out of time.
       while (nextUnitOfWork !== null && !shouldYield()) {
-        if (hasCapturedError(nextUnitOfWork)) {
-          // Use a forked version of performUnitOfWork
-          nextUnitOfWork = performFailedUnitOfWork(nextUnitOfWork);
-        } else {
-          nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-        }
+        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
       }
     }
   }
 
-  function renderRootCatchBlock(root, failedWork, boundary, isAsync) {
-    // We're going to restart the error boundary that captured the error.
-    // Conceptually, we're unwinding the stack. We need to unwind the
-    // context stack, too.
-    unwindContexts(failedWork, boundary);
-
-    // Restart the error boundary using a forked version of
-    // performUnitOfWork that deletes the boundary's children. The entire
-    // failed subree will be unmounted. During the commit phase, a special
-    // lifecycle method is called on the error boundary, which triggers
-    // a re-render.
-    nextUnitOfWork = performFailedUnitOfWork(boundary);
-
-    // Continue working.
-    workLoop(isAsync);
-  }
-
   function renderRoot(root, expirationTime, isAsync) {
     invariant(
       !isWorking,
@@ -11900,15 +12362,11 @@ var ReactFiberScheduler = function(config) {
     );
     isWorking = true;
 
-    // We're about to mutate the work-in-progress tree. If the root was pending
-    // commit, it no longer is: we'll need to complete it again.
-    root.isReadyForCommit = false;
-
     // Check if we're starting from a fresh stack, or if we're resuming from
     // previously yielded work.
     if (
-      root !== nextRoot ||
       expirationTime !== nextRenderExpirationTime ||
+      root !== nextRoot ||
       nextUnitOfWork === null
     ) {
       // Reset the stack and start working from the root.
@@ -11918,347 +12376,145 @@ var ReactFiberScheduler = function(config) {
       nextUnitOfWork = createWorkInProgress(
         nextRoot.current,
         null,
-        expirationTime
+        nextRenderExpirationTime
       );
+      root.pendingCommitExpirationTime = NoWork;
     }
 
-    startWorkLoopTimer(nextUnitOfWork);
-
-    var didError = false;
-    var error = null;
-    {
-      invokeGuardedCallback$2(null, workLoop, null, isAsync);
-      if (hasCaughtError()) {
-        didError = true;
-        error = clearCaughtError();
-      }
-    }
-
-    // An error was thrown during the render phase.
-    while (didError) {
-      if (didFatal) {
-        // This was a fatal error. Don't attempt to recover from it.
-        firstUncaughtError = error;
-        break;
-      }
+    var didFatal = false;
 
-      var failedWork = nextUnitOfWork;
-      if (failedWork === null) {
-        // An error was thrown but there's no current unit of work. This can
-        // happen during the commit phase if there's a bug in the renderer.
-        didFatal = true;
-        continue;
-      }
+    startWorkLoopTimer(nextUnitOfWork);
 
-      // "Capture" the error by finding the nearest boundary. If there is no
-      // error boundary, we use the root.
-      var boundary = captureError(failedWork, error);
-      invariant(
-        boundary !== null,
-        "Should have found an error boundary. This error is likely " +
-          "caused by a bug in React. Please file an issue."
-      );
+    do {
+      try {
+        workLoop(isAsync);
+      } catch (thrownValue) {
+        if (nextUnitOfWork === null) {
+          // This is a fatal error.
+          didFatal = true;
+          onUncaughtError(thrownValue);
+          break;
+        }
 
-      if (didFatal) {
-        // The error we just captured was a fatal error. This happens
-        // when the error propagates to the root more than once.
-        continue;
-      }
+        if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
+          var failedUnitOfWork = nextUnitOfWork;
+          replayUnitOfWork(failedUnitOfWork, isAsync);
+        }
 
-      didError = false;
-      error = null;
-      {
-        invokeGuardedCallback$2(
-          null,
-          renderRootCatchBlock,
-          null,
-          root,
-          failedWork,
-          boundary,
-          isAsync
-        );
-        if (hasCaughtError()) {
-          didError = true;
-          error = clearCaughtError();
-          continue;
+        var sourceFiber = nextUnitOfWork;
+        var returnFiber = sourceFiber["return"];
+        if (returnFiber === null) {
+          // This is a fatal error.
+          didFatal = true;
+          onUncaughtError(thrownValue);
+          break;
         }
+        throwException(returnFiber, sourceFiber, thrownValue);
+        nextUnitOfWork = completeUnitOfWork(sourceFiber);
       }
-      // We're finished working. Exit the error loop.
       break;
-    }
-
-    var uncaughtError = firstUncaughtError;
+    } while (true);
 
     // We're done performing work. Time to clean up.
     stopWorkLoopTimer(interruptedBy);
     interruptedBy = null;
     isWorking = false;
-    didFatal = false;
-    firstUncaughtError = null;
-
-    if (uncaughtError !== null) {
-      onUncaughtError(uncaughtError);
-    }
-
-    return root.isReadyForCommit ? root.current.alternate : null;
-  }
-
-  // Returns the boundary that captured the error, or null if the error is ignored
-  function captureError(failedWork, error) {
-    // It is no longer valid because we exited the user code.
-    ReactCurrentOwner.current = null;
-    {
-      ReactDebugCurrentFiber.resetCurrentFiber();
-    }
-
-    // Search for the nearest error boundary.
-    var boundary = null;
-
-    // Passed to logCapturedError()
-    var errorBoundaryFound = false;
-    var willRetry = false;
-    var errorBoundaryName = null;
-
-    // Host containers are a special case. If the failed work itself is a host
-    // container, then it acts as its own boundary. In all other cases, we
-    // ignore the work itself and only search through the parents.
-    if (failedWork.tag === HostRoot) {
-      boundary = failedWork;
 
-      if (isFailedBoundary(failedWork)) {
-        // If this root already failed, there must have been an error when
-        // attempting to unmount it. This is a worst-case scenario and
-        // should only be possible if there's a bug in the renderer.
-        didFatal = true;
-      }
-    } else {
-      var node = failedWork["return"];
-      while (node !== null && boundary === null) {
-        if (node.tag === ClassComponent) {
-          var instance = node.stateNode;
-          if (typeof instance.componentDidCatch === "function") {
-            errorBoundaryFound = true;
-            errorBoundaryName = getComponentName(node);
-
-            // Found an error boundary!
-            boundary = node;
-            willRetry = true;
-          }
-        } else if (node.tag === HostRoot) {
-          // Treat the root like a no-op error boundary
-          boundary = node;
-        }
-
-        if (isFailedBoundary(node)) {
-          // This boundary is already in a failed state.
-
-          // If we're currently unmounting, that means this error was
-          // thrown while unmounting a failed subtree. We should ignore
-          // the error.
-          if (isUnmounting) {
-            return null;
-          }
-
-          // If we're in the commit phase, we should check to see if
-          // this boundary already captured an error during this commit.
-          // This case exists because multiple errors can be thrown during
-          // a single commit without interruption.
-          if (
-            commitPhaseBoundaries !== null &&
-            (commitPhaseBoundaries.has(node) ||
-              (node.alternate !== null &&
-                commitPhaseBoundaries.has(node.alternate)))
-          ) {
-            // If so, we should ignore this error.
-            return null;
-          }
-
-          // The error should propagate to the next boundary -— we keep looking.
-          boundary = null;
-          willRetry = false;
-        }
-
-        node = node["return"];
-      }
-    }
-
-    if (boundary !== null) {
-      // Add to the collection of failed boundaries. This lets us know that
-      // subsequent errors in this subtree should propagate to the next boundary.
-      if (failedBoundaries === null) {
-        failedBoundaries = new Set();
-      }
-      failedBoundaries.add(boundary);
-
-      // This method is unsafe outside of the begin and complete phases.
-      // We might be in the commit phase when an error is captured.
-      // The risk is that the return path from this Fiber may not be accurate.
-      // That risk is acceptable given the benefit of providing users more context.
-      var _componentStack = getStackAddendumByWorkInProgressFiber(failedWork);
-      var _componentName = getComponentName(failedWork);
-
-      // Add to the collection of captured errors. This is stored as a global
-      // map of errors and their component stack location keyed by the boundaries
-      // that capture them. We mostly use this Map as a Set; it's a Map only to
-      // avoid adding a field to Fiber to store the error.
-      if (capturedErrors === null) {
-        capturedErrors = new Map();
-      }
-
-      var capturedError = {
-        componentName: _componentName,
-        componentStack: _componentStack,
-        error: error,
-        errorBoundary: errorBoundaryFound ? boundary.stateNode : null,
-        errorBoundaryFound: errorBoundaryFound,
-        errorBoundaryName: errorBoundaryName,
-        willRetry: willRetry
-      };
-
-      capturedErrors.set(boundary, capturedError);
-
-      try {
-        logCapturedError(capturedError);
-      } catch (e) {
-        // Prevent cycle if logCapturedError() throws.
-        // A cycle may still occur if logCapturedError renders a component that throws.
-        var suppressLogging = e && e.suppressReactErrorLogging;
-        if (!suppressLogging) {
-          console.error(e);
-        }
-      }
-
-      // If we're in the commit phase, defer scheduling an update on the
-      // boundary until after the commit is complete
-      if (isCommitting) {
-        if (commitPhaseBoundaries === null) {
-          commitPhaseBoundaries = new Set();
-        }
-        commitPhaseBoundaries.add(boundary);
+    // Yield back to main thread.
+    if (didFatal) {
+      // There was a fatal error.
+      return null;
+    } else if (nextUnitOfWork === null) {
+      // We reached the root.
+      if (isRootReadyForCommit) {
+        // The root successfully completed. It's ready for commit.
+        root.pendingCommitExpirationTime = expirationTime;
+        var finishedWork = root.current.alternate;
+        return finishedWork;
       } else {
-        // Otherwise, schedule an update now.
-        // TODO: Is this actually necessary during the render phase? Is it
-        // possible to unwind and continue rendering at the same priority,
-        // without corrupting internal state?
-        scheduleErrorRecovery(boundary);
+        // The root did not complete.
+        invariant(
+          false,
+          "Expired work should have completed. This error is likely caused " +
+            "by a bug in React. Please file an issue."
+        );
       }
-      return boundary;
-    } else if (firstUncaughtError === null) {
-      // If no boundary is found, we'll need to throw the error
-      firstUncaughtError = error;
+    } else {
+      // There's more work to do, but we ran out of time. Yield back to
+      // the renderer.
+      return null;
     }
-    return null;
-  }
-
-  function hasCapturedError(fiber) {
-    // TODO: capturedErrors should store the boundary instance, to avoid needing
-    // to check the alternate.
-    return (
-      capturedErrors !== null &&
-      (capturedErrors.has(fiber) ||
-        (fiber.alternate !== null && capturedErrors.has(fiber.alternate)))
-    );
   }
 
-  function isFailedBoundary(fiber) {
-    // TODO: failedBoundaries should store the boundary instance, to avoid
-    // needing to check the alternate.
-    return (
-      failedBoundaries !== null &&
-      (failedBoundaries.has(fiber) ||
-        (fiber.alternate !== null && failedBoundaries.has(fiber.alternate)))
-    );
+  function scheduleCapture(sourceFiber, boundaryFiber, value, expirationTime) {
+    // TODO: We only support dispatching errors.
+    var capturedValue = createCapturedValue(value, sourceFiber);
+    var update = {
+      expirationTime: expirationTime,
+      partialState: null,
+      callback: null,
+      isReplace: false,
+      isForced: false,
+      capturedValue: capturedValue,
+      next: null
+    };
+    insertUpdateIntoFiber(boundaryFiber, update);
+    scheduleWork(boundaryFiber, expirationTime);
   }
 
-  function commitErrorHandling(effectfulFiber) {
-    var capturedError = void 0;
-    if (capturedErrors !== null) {
-      capturedError = capturedErrors.get(effectfulFiber);
-      capturedErrors["delete"](effectfulFiber);
-      if (capturedError == null) {
-        if (effectfulFiber.alternate !== null) {
-          effectfulFiber = effectfulFiber.alternate;
-          capturedError = capturedErrors.get(effectfulFiber);
-          capturedErrors["delete"](effectfulFiber);
-        }
-      }
-    }
-
+  function dispatch(sourceFiber, value, expirationTime) {
     invariant(
-      capturedError != null,
-      "No error for given unit of work. This error is likely caused by a " +
-        "bug in React. Please file an issue."
+      !isWorking || isCommitting,
+      "dispatch: Cannot dispatch during the render phase."
     );
 
-    switch (effectfulFiber.tag) {
-      case ClassComponent:
-        var instance = effectfulFiber.stateNode;
-
-        var info = {
-          componentStack: capturedError.componentStack
-        };
-
-        // Allow the boundary to handle the error, usually by scheduling
-        // an update to itself
-        instance.componentDidCatch(capturedError.error, info);
-        return;
-      case HostRoot:
-        if (firstUncaughtError === null) {
-          firstUncaughtError = capturedError.error;
-        }
-        return;
-      default:
-        invariant(
-          false,
-          "Invalid type of work. This error is likely caused by a bug in " +
-            "React. Please file an issue."
-        );
-    }
-  }
+    // TODO: Handle arrays
 
-  function unwindContexts(from, to) {
-    var node = from;
-    while (node !== null) {
-      switch (node.tag) {
+    var fiber = sourceFiber["return"];
+    while (fiber !== null) {
+      switch (fiber.tag) {
         case ClassComponent:
-          popContextProvider(node);
-          break;
-        case HostComponent:
-          popHostContext(node);
+          var ctor = fiber.type;
+          var instance = fiber.stateNode;
+          if (
+            typeof ctor.getDerivedStateFromCatch === "function" ||
+            (typeof instance.componentDidCatch === "function" &&
+              !isAlreadyFailedLegacyErrorBoundary(instance))
+          ) {
+            scheduleCapture(sourceFiber, fiber, value, expirationTime);
+            return;
+          }
           break;
+        // TODO: Handle async boundaries
         case HostRoot:
-          popHostContainer(node);
-          break;
-        case HostPortal:
-          popHostContainer(node);
-          break;
-        case ContextProvider:
-          popProvider(node);
-          break;
-      }
-      if (node === to || node.alternate === to) {
-        stopFailedWorkTimer(node);
-        break;
-      } else {
-        stopWorkTimer(node);
+          scheduleCapture(sourceFiber, fiber, value, expirationTime);
+          return;
       }
-      node = node["return"];
+      fiber = fiber["return"];
+    }
+
+    if (sourceFiber.tag === HostRoot) {
+      // Error was thrown at the root. There is no parent, so the root
+      // itself should capture it.
+      scheduleCapture(sourceFiber, sourceFiber, value, expirationTime);
     }
   }
 
-  function computeAsyncExpiration() {
+  function onCommitPhaseError(fiber, error) {
+    return dispatch(fiber, error, Sync);
+  }
+
+  function computeAsyncExpiration(currentTime) {
     // Given the current clock time, returns an expiration time. We use rounding
     // to batch like updates together.
     // Should complete within ~1000ms. 1200ms max.
-    var currentTime = recalculateCurrentTime();
-    var expirationMs = 1000;
-    var bucketSizeMs = 200;
+    var expirationMs = 5000;
+    var bucketSizeMs = 250;
     return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
   }
 
-  function computeInteractiveExpiration() {
+  function computeInteractiveExpiration(currentTime) {
     // Should complete within ~500ms. 600ms max.
-    var currentTime = recalculateCurrentTime();
     var expirationMs = 500;
     var bucketSizeMs = 100;
     return computeExpirationBucket(currentTime, expirationMs, bucketSizeMs);
@@ -12266,7 +12522,8 @@ var ReactFiberScheduler = function(config) {
 
   // Creates a unique async expiration time.
   function computeUniqueAsyncExpiration() {
-    var result = computeAsyncExpiration();
+    var currentTime = recalculateCurrentTime();
+    var result = computeAsyncExpiration(currentTime);
     if (result <= lastUniqueAsyncExpiration) {
       // Since we assume the current time monotonically increases, we only hit
       // this branch when computeUniqueAsyncExpiration is fired multiple times
@@ -12298,10 +12555,12 @@ var ReactFiberScheduler = function(config) {
       if (fiber.mode & AsyncMode) {
         if (isBatchingInteractiveUpdates) {
           // This is an interactive update
-          expirationTime = computeInteractiveExpiration();
+          var currentTime = recalculateCurrentTime();
+          expirationTime = computeInteractiveExpiration(currentTime);
         } else {
           // This is an async update
-          expirationTime = computeAsyncExpiration();
+          var _currentTime = recalculateCurrentTime();
+          expirationTime = computeAsyncExpiration(_currentTime);
         }
       } else {
         // This is a sync update
@@ -12326,23 +12585,6 @@ var ReactFiberScheduler = function(config) {
     return scheduleWorkImpl(fiber, expirationTime, false);
   }
 
-  function checkRootNeedsClearing(root, fiber, expirationTime) {
-    if (
-      !isWorking &&
-      root === nextRoot &&
-      expirationTime < nextRenderExpirationTime
-    ) {
-      // Restart the root from the top.
-      if (nextUnitOfWork !== null) {
-        // This is an interruption. (Used for performance tracking.)
-        interruptedBy = fiber;
-      }
-      nextRoot = null;
-      nextUnitOfWork = null;
-      nextRenderExpirationTime = NoWork;
-    }
-  }
-
   function scheduleWorkImpl(fiber, expirationTime, isErrorRecovery) {
     recordScheduleUpdate();
 
@@ -12374,10 +12616,27 @@ var ReactFiberScheduler = function(config) {
       if (node["return"] === null) {
         if (node.tag === HostRoot) {
           var root = node.stateNode;
-
-          checkRootNeedsClearing(root, fiber, expirationTime);
-          requestWork(root, expirationTime);
-          checkRootNeedsClearing(root, fiber, expirationTime);
+          if (
+            !isWorking &&
+            nextRenderExpirationTime !== NoWork &&
+            expirationTime < nextRenderExpirationTime
+          ) {
+            // This is an interruption. (Used for performance tracking.)
+            interruptedBy = fiber;
+            resetContextStack();
+          }
+          if (nextRoot !== root || !isWorking) {
+            requestWork(root, expirationTime);
+          }
+          if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
+            invariant(
+              false,
+              "Maximum update depth exceeded. This can happen when a " +
+                "component repeatedly calls setState inside " +
+                "componentWillUpdate or componentDidUpdate. React limits " +
+                "the number of nested updates to prevent infinite loops."
+            );
+          }
         } else {
           {
             if (!isErrorRecovery && fiber.tag === ClassComponent) {
@@ -12391,27 +12650,23 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
-  function scheduleErrorRecovery(fiber) {
-    scheduleWorkImpl(fiber, Sync, true);
-  }
-
   function recalculateCurrentTime() {
     // Subtract initial time so it fits inside 32bits
-    var ms = now() - startTime;
-    mostRecentCurrentTime = msToExpirationTime(ms);
+    mostRecentCurrentTimeMs = now() - originalStartTimeMs;
+    mostRecentCurrentTime = msToExpirationTime(mostRecentCurrentTimeMs);
     return mostRecentCurrentTime;
   }
 
   function deferredUpdates(fn) {
     var previousExpirationContext = expirationContext;
-    expirationContext = computeAsyncExpiration();
+    var currentTime = recalculateCurrentTime();
+    expirationContext = computeAsyncExpiration(currentTime);
     try {
       return fn();
     } finally {
       expirationContext = previousExpirationContext;
     }
   }
-
   function syncUpdates(fn, a, b, c, d) {
     var previousExpirationContext = expirationContext;
     expirationContext = Sync;
@@ -12469,7 +12724,7 @@ var ReactFiberScheduler = function(config) {
     }
 
     // Compute a timeout for the given expiration time.
-    var currentMs = now() - startTime;
+    var currentMs = now() - originalStartTimeMs;
     var expirationMs = expirationTimeToMs(expirationTime);
     var timeout = expirationMs - currentMs;
 
@@ -12482,16 +12737,35 @@ var ReactFiberScheduler = function(config) {
   // requestWork is called by the scheduler whenever a root receives an update.
   // It's up to the renderer to call renderRoot at some point in the future.
   function requestWork(root, expirationTime) {
-    if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
-      invariant(
-        false,
-        "Maximum update depth exceeded. This can happen when a " +
-          "component repeatedly calls setState inside componentWillUpdate or " +
-          "componentDidUpdate. React limits the number of nested updates to " +
-          "prevent infinite loops."
-      );
+    addRootToSchedule(root, expirationTime);
+
+    if (isRendering) {
+      // Prevent reentrancy. Remaining work will be scheduled at the end of
+      // the currently rendering batch.
+      return;
     }
 
+    if (isBatchingUpdates) {
+      // Flush work at the end of the batch.
+      if (isUnbatchingUpdates) {
+        // ...unless we're inside unbatchedUpdates, in which case we should
+        // flush it now.
+        nextFlushedRoot = root;
+        nextFlushedExpirationTime = Sync;
+        performWorkOnRoot(root, Sync, false);
+      }
+      return;
+    }
+
+    // TODO: Get rid of Sync and use current time?
+    if (expirationTime === Sync) {
+      performSyncWork();
+    } else {
+      scheduleCallbackWithExpiration(expirationTime);
+    }
+  }
+
+  function addRootToSchedule(root, expirationTime) {
     // Add the root to the schedule.
     // Check if this root is already part of the schedule.
     if (root.nextScheduledRoot === null) {
@@ -12516,37 +12790,11 @@ var ReactFiberScheduler = function(config) {
         root.remainingExpirationTime = expirationTime;
       }
     }
-
-    if (isRendering) {
-      // Prevent reentrancy. Remaining work will be scheduled at the end of
-      // the currently rendering batch.
-      return;
-    }
-
-    if (isBatchingUpdates) {
-      if (isUnbatchingUpdates) {
-        // Flush work at the end of the batch.
-        // ...unless we're inside unbatchedUpdates, in which case we should
-        // flush it now.
-        nextFlushedRoot = root;
-        nextFlushedExpirationTime = Sync;
-        performWorkOnRoot(root, Sync, false);
-      }
-      return;
-    }
-
-    // TODO: Get rid of Sync and use current time?
-    if (expirationTime === Sync) {
-      performSyncWork();
-    } else {
-      scheduleCallbackWithExpiration(expirationTime);
-    }
   }
 
   function findHighestPriorityRoot() {
     var highestPriorityWork = NoWork;
     var highestPriorityRoot = null;
-
     if (lastScheduledRoot !== null) {
       var previousScheduledRoot = lastScheduledRoot;
       var root = firstScheduledRoot;
@@ -12608,7 +12856,8 @@ var ReactFiberScheduler = function(config) {
     var previousFlushedRoot = nextFlushedRoot;
     if (
       previousFlushedRoot !== null &&
-      previousFlushedRoot === highestPriorityRoot
+      previousFlushedRoot === highestPriorityRoot &&
+      highestPriorityWork === Sync
     ) {
       nestedUpdateCount++;
     } else {
@@ -12683,7 +12932,6 @@ var ReactFiberScheduler = function(config) {
     // Clean-up.
     deadline = null;
     deadlineDidExpire = false;
-    nestedUpdateCount = 0;
 
     finishRendering();
   }
@@ -12702,6 +12950,8 @@ var ReactFiberScheduler = function(config) {
   }
 
   function finishRendering() {
+    nestedUpdateCount = 0;
+
     if (completedBatches !== null) {
       var batches = completedBatches;
       completedBatches = null;
@@ -12719,10 +12969,10 @@ var ReactFiberScheduler = function(config) {
     }
 
     if (hasUnhandledError) {
-      var _error4 = unhandledError;
+      var error = unhandledError;
       unhandledError = null;
       hasUnhandledError = false;
-      throw _error4;
+      throw error;
     }
   }
 
@@ -12815,8 +13065,6 @@ var ReactFiberScheduler = function(config) {
     return true;
   }
 
-  // TODO: Not happy about this hook. Conceptually, renderRoot should return a
-  // tuple of (isReadyForCommit, didError, error)
   function onUncaughtError(error) {
     invariant(
       nextFlushedRoot !== null,
@@ -12933,6 +13181,7 @@ var ReactFiberScheduler = function(config) {
   }
 
   return {
+    recalculateCurrentTime: recalculateCurrentTime,
     computeExpirationForFiber: computeExpirationForFiber,
     scheduleWork: scheduleWork,
     requestWork: requestWork,
@@ -12976,6 +13225,7 @@ var ReactFiberReconciler$1 = function(config) {
   var _ReactFiberScheduler = ReactFiberScheduler(config),
     computeUniqueAsyncExpiration =
       _ReactFiberScheduler.computeUniqueAsyncExpiration,
+    recalculateCurrentTime = _ReactFiberScheduler.recalculateCurrentTime,
     computeExpirationForFiber = _ReactFiberScheduler.computeExpirationForFiber,
     scheduleWork = _ReactFiberScheduler.scheduleWork,
     requestWork = _ReactFiberScheduler.requestWork,
@@ -12989,7 +13239,13 @@ var ReactFiberReconciler$1 = function(config) {
     interactiveUpdates = _ReactFiberScheduler.interactiveUpdates,
     flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates;
 
-  function scheduleRootUpdate(current, element, expirationTime, callback) {
+  function scheduleRootUpdate(
+    current,
+    element,
+    currentTime,
+    expirationTime,
+    callback
+  ) {
     {
       if (
         ReactDebugCurrentFiber.phase === "render" &&
@@ -13024,6 +13280,7 @@ var ReactFiberReconciler$1 = function(config) {
       callback: callback,
       isReplace: false,
       isForced: false,
+      capturedValue: null,
       next: null
     };
     insertUpdateIntoFiber(current, update);
@@ -13036,6 +13293,7 @@ var ReactFiberReconciler$1 = function(config) {
     element,
     container,
     parentComponent,
+    currentTime,
     expirationTime,
     callback
   ) {
@@ -13061,7 +13319,13 @@ var ReactFiberReconciler$1 = function(config) {
       container.pendingContext = context;
     }
 
-    return scheduleRootUpdate(current, element, expirationTime, callback);
+    return scheduleRootUpdate(
+      current,
+      element,
+      currentTime,
+      expirationTime,
+      callback
+    );
   }
 
   function findHostInstance(fiber) {
@@ -13078,17 +13342,34 @@ var ReactFiberReconciler$1 = function(config) {
     },
     updateContainer: function(element, container, parentComponent, callback) {
       var current = container.current;
+      var currentTime = recalculateCurrentTime();
       var expirationTime = computeExpirationForFiber(current);
       return updateContainerAtExpirationTime(
         element,
         container,
         parentComponent,
+        currentTime,
+        expirationTime,
+        callback
+      );
+    },
+    updateContainerAtExpirationTime: function(
+      element,
+      container,
+      parentComponent,
+      expirationTime,
+      callback
+    ) {
+      var currentTime = recalculateCurrentTime();
+      return updateContainerAtExpirationTime(
+        element,
+        container,
+        parentComponent,
+        currentTime,
         expirationTime,
         callback
       );
     },
-
-    updateContainerAtExpirationTime: updateContainerAtExpirationTime,
 
     flushRoot: flushRoot,
 
@@ -13833,8 +14114,7 @@ var ReactNativeRenderer = {
     NativeMethodsMixin: NativeMethodsMixin,
     // Used by react-native-github/Libraries/ components
     ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin, // requireNativeComponent
-    ReactGlobalSharedState: ReactGlobalSharedState, // Systrace
-    ReactNativeComponentTree: ReactNativeComponentTree, // InspectorUtils, ScrollResponder
+    ReactNativeComponentTree: ReactNativeComponentTree, // ScrollResponder
     ReactNativePropRegistry: ReactNativePropRegistry, // flattenStyle, Stylesheet
     TouchHistoryMath: TouchHistoryMath, // PanResponder
     createReactNativeComponentClass: createReactNativeComponentClass, // RCTText, RCTView, ReactNativeART
diff --git a/Libraries/Renderer/ReactNativeRenderer-prod.js b/Libraries/Renderer/ReactNativeRenderer-prod.js
index b62e953324916f..dd0cd8b9cb5346 100644
--- a/Libraries/Renderer/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/ReactNativeRenderer-prod.js
@@ -13,12 +13,12 @@
 require("InitializeCore");
 var invariant = require("fbjs/lib/invariant"),
   emptyFunction = require("fbjs/lib/emptyFunction"),
-  RCTEventEmitter = require("RCTEventEmitter"),
   UIManager = require("UIManager"),
-  React = require("react"),
+  RCTEventEmitter = require("RCTEventEmitter"),
   TextInputState = require("TextInputState"),
   deepDiffer = require("deepDiffer"),
   flattenStyle = require("flattenStyle"),
+  React = require("react"),
   emptyObject = require("fbjs/lib/emptyObject"),
   shallowEqual = require("fbjs/lib/shallowEqual"),
   ExceptionsManager = require("ExceptionsManager");
@@ -942,6 +942,7 @@ var eventTypes = {
       nativeEvent,
       nativeEventTarget
     ) {
+      if (null == targetInst) return null;
       var bubbleDispatchConfig = customBubblingEventTypes[topLevelType],
         directDispatchConfig = customDirectEventTypes[topLevelType];
       invariant(
@@ -991,26 +992,45 @@ function getInstanceFromTag(tag) {
   return "number" === typeof tag ? instanceCache[tag] || null : tag;
 }
 var ReactNativeComponentTree = Object.freeze({
-    precacheFiberNode: function(hostInst, tag) {
-      instanceCache[tag] = hostInst;
-    },
-    uncacheFiberNode: uncacheFiberNode,
-    getClosestInstanceFromNode: getInstanceFromTag,
-    getInstanceFromNode: getInstanceFromTag,
-    getNodeFromInstance: function(inst) {
-      var tag = inst.stateNode._nativeTag;
-      void 0 === tag && (tag = inst.stateNode.canonical._nativeTag);
-      invariant(tag, "All native instances should have a tag.");
-      return tag;
-    },
-    getFiberCurrentPropsFromNode: function(stateNode) {
-      return instanceProps[stateNode._nativeTag] || null;
-    },
-    updateFiberProps: function(tag, props) {
-      instanceProps[tag] = props;
-    }
-  }),
-  restoreTarget = null,
+  precacheFiberNode: function(hostInst, tag) {
+    instanceCache[tag] = hostInst;
+  },
+  uncacheFiberNode: uncacheFiberNode,
+  getClosestInstanceFromNode: getInstanceFromTag,
+  getInstanceFromNode: getInstanceFromTag,
+  getNodeFromInstance: function(inst) {
+    var tag = inst.stateNode._nativeTag;
+    void 0 === tag && (tag = inst.stateNode.canonical._nativeTag);
+    invariant(tag, "All native instances should have a tag.");
+    return tag;
+  },
+  getFiberCurrentPropsFromNode: function(stateNode) {
+    return instanceProps[stateNode._nativeTag] || null;
+  },
+  updateFiberProps: function(tag, props) {
+    instanceProps[tag] = props;
+  }
+});
+injection.injectEventPluginOrder([
+  "ResponderEventPlugin",
+  "ReactNativeBridgeEventPlugin"
+]);
+getFiberCurrentPropsFromNode =
+  ReactNativeComponentTree.getFiberCurrentPropsFromNode;
+getInstanceFromNode = ReactNativeComponentTree.getInstanceFromNode;
+getNodeFromInstance = ReactNativeComponentTree.getNodeFromInstance;
+ResponderEventPlugin.injection.injectGlobalResponderHandler({
+  onChange: function(from, to, blockNativeResponder) {
+    null !== to
+      ? UIManager.setJSResponder(to.stateNode._nativeTag, blockNativeResponder)
+      : UIManager.clearJSResponder();
+  }
+});
+injection.injectEventPluginsByName({
+  ResponderEventPlugin: ResponderEventPlugin,
+  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
+});
+var restoreTarget = null,
   restoreQueue = null;
 function restoreStateOfTarget(target) {
   if ((target = getInstanceFromNode(target))) {
@@ -1142,25 +1162,6 @@ var ReactNativeEventEmitter = Object.freeze({
   }
 });
 RCTEventEmitter.register(ReactNativeEventEmitter);
-injection.injectEventPluginOrder([
-  "ResponderEventPlugin",
-  "ReactNativeBridgeEventPlugin"
-]);
-getFiberCurrentPropsFromNode =
-  ReactNativeComponentTree.getFiberCurrentPropsFromNode;
-getInstanceFromNode = ReactNativeComponentTree.getInstanceFromNode;
-getNodeFromInstance = ReactNativeComponentTree.getNodeFromInstance;
-ResponderEventPlugin.injection.injectGlobalResponderHandler({
-  onChange: function(from, to, blockNativeResponder) {
-    null !== to
-      ? UIManager.setJSResponder(to.stateNode._nativeTag, blockNativeResponder)
-      : UIManager.clearJSResponder();
-  }
-});
-injection.injectEventPluginsByName({
-  ResponderEventPlugin: ResponderEventPlugin,
-  ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin
-});
 var hasSymbol = "function" === typeof Symbol && Symbol["for"],
   REACT_ELEMENT_TYPE = hasSymbol ? Symbol["for"]("react.element") : 60103,
   REACT_CALL_TYPE = hasSymbol ? Symbol["for"]("react.call") : 60104,
@@ -1294,12 +1295,6 @@ var TouchHistoryMath = {
     },
     noCentroid: -1
   },
-  ReactCurrentOwner =
-    React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,
-  ReactGlobalSharedState = Object.freeze({
-    ReactCurrentOwner: ReactCurrentOwner,
-    ReactDebugCurrentFrame: null
-  }),
   objects = {},
   uniqueID = 1,
   emptyObject$2 = {},
@@ -1561,6 +1556,8 @@ function mountSafeCallback(context, callback) {
     }
   };
 }
+var ReactCurrentOwner =
+  React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner;
 function getComponentName(fiber) {
   fiber = fiber.type;
   if ("function" === typeof fiber) return fiber.displayName || fiber.name;
@@ -1833,7 +1830,41 @@ function push(cursor, value) {
   valueStack[index] = cursor.current;
   cursor.current = value;
 }
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  do {
+    a: switch (workInProgress.tag) {
+      case 0:
+      case 1:
+      case 2:
+      case 5:
+        var owner = workInProgress._debugOwner,
+          source = workInProgress._debugSource;
+        var JSCompiler_inline_result = getComponentName(workInProgress);
+        var ownerName = null;
+        owner && (ownerName = getComponentName(owner));
+        owner = source;
+        JSCompiler_inline_result =
+          "\n    in " +
+          (JSCompiler_inline_result || "Unknown") +
+          (owner
+            ? " (at " +
+              owner.fileName.replace(/^.*[\\\/]/, "") +
+              ":" +
+              owner.lineNumber +
+              ")"
+            : ownerName ? " (created by " + ownerName + ")" : "");
+        break a;
+      default:
+        JSCompiler_inline_result = "";
+    }
+    info += JSCompiler_inline_result;
+    workInProgress = workInProgress["return"];
+  } while (workInProgress);
+  return info;
+}
 var _require = require("ReactFeatureFlags"),
+  enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch,
   debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects,
   debugRenderPhaseSideEffectsForStrictMode =
     _require.debugRenderPhaseSideEffectsForStrictMode;
@@ -2094,7 +2125,8 @@ function createUpdateQueue(baseState) {
     last: null,
     callbackList: null,
     hasForceUpdate: !1,
-    isInitialized: !1
+    isInitialized: !1,
+    capturedValues: null
   };
 }
 function insertUpdateIntoQueue(queue, update) {
@@ -2107,7 +2139,10 @@ function insertUpdateIntoQueue(queue, update) {
   )
     queue.expirationTime = update.expirationTime;
 }
-function insertUpdateIntoFiber(fiber, update) {
+var q1 = void 0,
+  q2 = void 0;
+function ensureUpdateQueues(fiber) {
+  q1 = q2 = null;
   var alternateFiber = fiber.alternate,
     queue1 = fiber.updateQueue;
   null === queue1 && (queue1 = fiber.updateQueue = createUpdateQueue(null));
@@ -2116,13 +2151,19 @@ function insertUpdateIntoFiber(fiber, update) {
       null === fiber &&
         (fiber = alternateFiber.updateQueue = createUpdateQueue(null)))
     : (fiber = null);
-  fiber = fiber !== queue1 ? fiber : null;
-  null === fiber
-    ? insertUpdateIntoQueue(queue1, update)
-    : null === queue1.last || null === fiber.last
-      ? (insertUpdateIntoQueue(queue1, update),
-        insertUpdateIntoQueue(fiber, update))
-      : (insertUpdateIntoQueue(queue1, update), (fiber.last = update));
+  q1 = queue1;
+  q2 = fiber !== queue1 ? fiber : null;
+}
+function insertUpdateIntoFiber(fiber, update) {
+  ensureUpdateQueues(fiber);
+  fiber = q1;
+  var queue2 = q2;
+  null === queue2
+    ? insertUpdateIntoQueue(fiber, update)
+    : null === fiber.last || null === queue2.last
+      ? (insertUpdateIntoQueue(fiber, update),
+        insertUpdateIntoQueue(queue2, update))
+      : (insertUpdateIntoQueue(fiber, update), (queue2.last = update));
 }
 function getStateFromUpdate(update, instance, prevState, props) {
   update = update.partialState;
@@ -2146,6 +2187,7 @@ function processUpdateQueue(
       first: queue.first,
       last: queue.last,
       isInitialized: queue.isInitialized,
+      capturedValues: queue.capturedValues,
       callbackList: null,
       hasForceUpdate: !1
     });
@@ -2197,6 +2239,11 @@ function processUpdateQueue(
         null === updateExpirationTime &&
           (updateExpirationTime = queue.callbackList = []),
         updateExpirationTime.push(update));
+      null !== update.capturedValue &&
+        ((updateExpirationTime = queue.capturedValues),
+        null === updateExpirationTime
+          ? (queue.capturedValues = [update.capturedValue])
+          : updateExpirationTime.push(update.capturedValue));
     }
     update = update.next;
   }
@@ -2204,6 +2251,7 @@ function processUpdateQueue(
     ? (workInProgress.effectTag |= 32)
     : null !== queue.first ||
       queue.hasForceUpdate ||
+      null !== queue.capturedValues ||
       (workInProgress.updateQueue = null);
   didSkip || (queue.baseState = current);
   return current;
@@ -2227,17 +2275,66 @@ function commitCallbacks(queue, context) {
       _callback.call(context);
     }
 }
+function callGetDerivedStateFromCatch(ctor, capturedValues) {
+  for (var resultState = {}, i = 0; i < capturedValues.length; i++) {
+    var partialState = ctor.getDerivedStateFromCatch.call(
+      null,
+      capturedValues[i].value
+    );
+    null !== partialState &&
+      void 0 !== partialState &&
+      Object.assign(resultState, partialState);
+  }
+  return resultState;
+}
 function ReactFiberClassComponent(
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
   memoizeState
 ) {
+  function checkShouldComponentUpdate(
+    workInProgress,
+    oldProps,
+    newProps,
+    oldState,
+    newState,
+    newContext
+  ) {
+    if (
+      null === oldProps ||
+      (null !== workInProgress.updateQueue &&
+        workInProgress.updateQueue.hasForceUpdate)
+    )
+      return !0;
+    var instance = workInProgress.stateNode;
+    workInProgress = workInProgress.type;
+    return "function" === typeof instance.shouldComponentUpdate
+      ? instance.shouldComponentUpdate(newProps, newState, newContext)
+      : workInProgress.prototype &&
+        workInProgress.prototype.isPureReactComponent
+        ? !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
+        : !0;
+  }
   function adoptClassInstance(workInProgress, instance) {
     instance.updater = updater;
     workInProgress.stateNode = instance;
     instance._reactInternalFiber = workInProgress;
   }
+  function callComponentWillReceiveProps(
+    workInProgress,
+    instance,
+    newProps,
+    newContext
+  ) {
+    workInProgress = instance.state;
+    "function" === typeof instance.componentWillReceiveProps &&
+      instance.componentWillReceiveProps(newProps, newContext);
+    "function" === typeof instance.UNSAFE_componentWillReceiveProps &&
+      instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    instance.state !== workInProgress &&
+      updater.enqueueReplaceState(instance, instance.state, null);
+  }
   function callGetDerivedStateFromProps(workInProgress, instance, props) {
     instance = workInProgress.type;
     if ("function" === typeof instance.getDerivedStateFromProps)
@@ -2269,7 +2366,7 @@ function ReactFiberClassComponent(
         callback: callback,
         isReplace: !1,
         isForced: !1,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       });
       scheduleWork(instance, expirationTime);
@@ -2284,7 +2381,7 @@ function ReactFiberClassComponent(
         callback: callback,
         isReplace: !0,
         isForced: !1,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       });
       scheduleWork(instance, expirationTime);
@@ -2299,7 +2396,7 @@ function ReactFiberClassComponent(
         callback: callback,
         isReplace: !1,
         isForced: !0,
-        nextCallback: null,
+        capturedValue: null,
         next: null
       });
       scheduleWork(instance, expirationTime);
@@ -2340,7 +2437,8 @@ function ReactFiberClassComponent(
       return ctor;
     },
     mountClassInstance: function(workInProgress, renderExpirationTime) {
-      var current = workInProgress.alternate,
+      var ctor = workInProgress.type,
+        current = workInProgress.alternate,
         instance = workInProgress.stateNode,
         props = workInProgress.pendingProps,
         unmaskedContext = getUnmaskedContext(workInProgress);
@@ -2350,20 +2448,20 @@ function ReactFiberClassComponent(
       instance.context = getMaskedContext(workInProgress, unmaskedContext);
       ("function" !== typeof instance.UNSAFE_componentWillMount &&
         "function" !== typeof instance.componentWillMount) ||
-        "function" === typeof workInProgress.type.getDerivedStateFromProps ||
-        ((unmaskedContext = instance.state),
+        "function" === typeof ctor.getDerivedStateFromProps ||
+        ((ctor = instance.state),
         "function" === typeof instance.componentWillMount &&
           instance.componentWillMount(),
         "function" === typeof instance.UNSAFE_componentWillMount &&
           instance.UNSAFE_componentWillMount(),
-        unmaskedContext !== instance.state &&
+        ctor !== instance.state &&
           updater.enqueueReplaceState(instance, instance.state, null),
-        (unmaskedContext = workInProgress.updateQueue),
-        null !== unmaskedContext &&
+        (ctor = workInProgress.updateQueue),
+        null !== ctor &&
           (instance.state = processUpdateQueue(
             current,
             workInProgress,
-            unmaskedContext,
+            ctor,
             instance,
             props,
             renderExpirationTime
@@ -2371,12 +2469,121 @@ function ReactFiberClassComponent(
       "function" === typeof instance.componentDidMount &&
         (workInProgress.effectTag |= 4);
     },
+    resumeMountClassInstance: function(workInProgress, renderExpirationTime) {
+      var ctor = workInProgress.type,
+        instance = workInProgress.stateNode;
+      instance.props = workInProgress.memoizedProps;
+      instance.state = workInProgress.memoizedState;
+      var oldProps = workInProgress.memoizedProps,
+        newProps = workInProgress.pendingProps,
+        oldContext = instance.context,
+        newUnmaskedContext = getUnmaskedContext(workInProgress);
+      newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
+      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+        "function" !== typeof instance.componentWillReceiveProps) ||
+        "function" === typeof ctor.getDerivedStateFromProps ||
+        ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            instance,
+            newProps,
+            newUnmaskedContext
+          ));
+      oldContext = void 0;
+      oldProps !== newProps &&
+        (oldContext = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps
+        ));
+      var oldState = workInProgress.memoizedState,
+        derivedStateFromCatch = void 0;
+      if (null !== workInProgress.updateQueue) {
+        renderExpirationTime = processUpdateQueue(
+          null,
+          workInProgress,
+          workInProgress.updateQueue,
+          instance,
+          newProps,
+          renderExpirationTime
+        );
+        var updateQueue = workInProgress.updateQueue;
+        null !== updateQueue &&
+          null !== updateQueue.capturedValues &&
+          enableGetDerivedStateFromCatch &&
+          "function" === typeof ctor.getDerivedStateFromCatch &&
+          (derivedStateFromCatch = callGetDerivedStateFromCatch(
+            ctor,
+            updateQueue.capturedValues
+          ));
+      } else renderExpirationTime = oldState;
+      null !== oldContext &&
+        void 0 !== oldContext &&
+        (renderExpirationTime =
+          null === renderExpirationTime || void 0 === renderExpirationTime
+            ? oldContext
+            : Object.assign({}, renderExpirationTime, oldContext));
+      null !== derivedStateFromCatch &&
+        void 0 !== derivedStateFromCatch &&
+        (renderExpirationTime =
+          null === renderExpirationTime || void 0 === renderExpirationTime
+            ? derivedStateFromCatch
+            : Object.assign({}, renderExpirationTime, derivedStateFromCatch));
+      if (
+        !(
+          oldProps !== newProps ||
+          oldState !== renderExpirationTime ||
+          didPerformWorkStackCursor.current ||
+          (null !== workInProgress.updateQueue &&
+            workInProgress.updateQueue.hasForceUpdate)
+        )
+      )
+        return (
+          "function" === typeof instance.componentDidMount &&
+            (workInProgress.effectTag |= 4),
+          !1
+        );
+      (oldProps = checkShouldComponentUpdate(
+        workInProgress,
+        oldProps,
+        newProps,
+        oldState,
+        renderExpirationTime,
+        newUnmaskedContext
+      ))
+        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
+            "function" !== typeof instance.componentWillUpdate) ||
+            "function" === typeof ctor.getDerivedStateFromProps ||
+            ("function" === typeof instance.componentWillUpdate &&
+              instance.componentWillUpdate(
+                newProps,
+                renderExpirationTime,
+                newUnmaskedContext
+              ),
+            "function" === typeof instance.UNSAFE_componentWillUpdate &&
+              instance.UNSAFE_componentWillUpdate(
+                newProps,
+                renderExpirationTime,
+                newUnmaskedContext
+              )),
+          "function" === typeof instance.componentDidUpdate &&
+            (workInProgress.effectTag |= 4))
+        : ("function" === typeof instance.componentDidMount &&
+            (workInProgress.effectTag |= 4),
+          memoizeProps(workInProgress, newProps),
+          memoizeState(workInProgress, renderExpirationTime));
+      instance.props = newProps;
+      instance.state = renderExpirationTime;
+      instance.context = newUnmaskedContext;
+      return oldProps;
+    },
     updateClassInstance: function(
       current,
       workInProgress,
       renderExpirationTime
     ) {
-      var instance = workInProgress.stateNode;
+      var ctor = workInProgress.type,
+        instance = workInProgress.stateNode;
       instance.props = workInProgress.memoizedProps;
       instance.state = workInProgress.memoizedState;
       var oldProps = workInProgress.memoizedProps,
@@ -2386,43 +2593,54 @@ function ReactFiberClassComponent(
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
       ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
         "function" !== typeof instance.componentWillReceiveProps) ||
-        "function" === typeof workInProgress.type.getDerivedStateFromProps ||
-        (oldProps === newProps && oldContext === newUnmaskedContext) ||
-        ((oldContext = instance.state),
-        "function" === typeof instance.componentWillReceiveProps &&
-          instance.componentWillReceiveProps(newProps, newUnmaskedContext),
-        "function" === typeof instance.UNSAFE_componentWillReceiveProps &&
-          instance.UNSAFE_componentWillReceiveProps(
+        "function" === typeof ctor.getDerivedStateFromProps ||
+        ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
+          callComponentWillReceiveProps(
+            workInProgress,
+            instance,
             newProps,
             newUnmaskedContext
-          ),
-        instance.state !== oldContext &&
-          updater.enqueueReplaceState(instance, instance.state, null));
-      var partialState = void 0;
+          ));
+      var derivedStateFromProps = void 0;
       oldProps !== newProps &&
-        (partialState = callGetDerivedStateFromProps(
+        (derivedStateFromProps = callGetDerivedStateFromProps(
           workInProgress,
           instance,
           newProps
         ));
       oldContext = workInProgress.memoizedState;
-      renderExpirationTime =
-        null !== workInProgress.updateQueue
-          ? processUpdateQueue(
-              current,
-              workInProgress,
-              workInProgress.updateQueue,
-              instance,
-              newProps,
-              renderExpirationTime
-            )
-          : oldContext;
-      null !== partialState &&
-        void 0 !== partialState &&
+      var derivedStateFromCatch = void 0;
+      if (null !== workInProgress.updateQueue) {
+        renderExpirationTime = processUpdateQueue(
+          current,
+          workInProgress,
+          workInProgress.updateQueue,
+          instance,
+          newProps,
+          renderExpirationTime
+        );
+        var updateQueue = workInProgress.updateQueue;
+        null !== updateQueue &&
+          null !== updateQueue.capturedValues &&
+          enableGetDerivedStateFromCatch &&
+          "function" === typeof ctor.getDerivedStateFromCatch &&
+          (derivedStateFromCatch = callGetDerivedStateFromCatch(
+            ctor,
+            updateQueue.capturedValues
+          ));
+      } else renderExpirationTime = oldContext;
+      null !== derivedStateFromProps &&
+        void 0 !== derivedStateFromProps &&
+        (renderExpirationTime =
+          null === renderExpirationTime || void 0 === renderExpirationTime
+            ? derivedStateFromProps
+            : Object.assign({}, renderExpirationTime, derivedStateFromProps));
+      null !== derivedStateFromCatch &&
+        void 0 !== derivedStateFromCatch &&
         (renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? partialState
-            : Object.assign({}, renderExpirationTime, partialState));
+            ? derivedStateFromCatch
+            : Object.assign({}, renderExpirationTime, derivedStateFromCatch));
       if (
         !(
           oldProps !== newProps ||
@@ -2439,33 +2657,17 @@ function ReactFiberClassComponent(
             (workInProgress.effectTag |= 4),
           !1
         );
-      partialState = renderExpirationTime;
-      if (
-        null === oldProps ||
-        (null !== workInProgress.updateQueue &&
-          workInProgress.updateQueue.hasForceUpdate)
-      )
-        partialState = !0;
-      else {
-        var instance$jscomp$0 = workInProgress.stateNode,
-          type = workInProgress.type;
-        partialState =
-          "function" === typeof instance$jscomp$0.shouldComponentUpdate
-            ? instance$jscomp$0.shouldComponentUpdate(
-                newProps,
-                partialState,
-                newUnmaskedContext
-              )
-            : type.prototype && type.prototype.isPureReactComponent
-              ? !shallowEqual(oldProps, newProps) ||
-                !shallowEqual(oldContext, partialState)
-              : !0;
-      }
-      partialState
+      (derivedStateFromProps = checkShouldComponentUpdate(
+        workInProgress,
+        oldProps,
+        newProps,
+        oldContext,
+        renderExpirationTime,
+        newUnmaskedContext
+      ))
         ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
             "function" !== typeof instance.componentWillUpdate) ||
-            "function" ===
-              typeof workInProgress.type.getDerivedStateFromProps ||
+            "function" === typeof ctor.getDerivedStateFromProps ||
             ("function" === typeof instance.componentWillUpdate &&
               instance.componentWillUpdate(
                 newProps,
@@ -2489,7 +2691,7 @@ function ReactFiberClassComponent(
       instance.props = newProps;
       instance.state = renderExpirationTime;
       instance.context = newUnmaskedContext;
-      return partialState;
+      return derivedStateFromProps;
     }
   };
 }
@@ -3199,7 +3401,19 @@ function ReactFiberBeginWork(
   computeExpirationForFiber
 ) {
   function reconcileChildren(current, workInProgress, nextChildren) {
-    var renderExpirationTime = workInProgress.expirationTime;
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      workInProgress.expirationTime
+    );
+  }
+  function reconcileChildrenAtExpirationTime(
+    current,
+    workInProgress,
+    nextChildren,
+    renderExpirationTime
+  ) {
     workInProgress.child =
       null === current
         ? mountChildFibers(
@@ -3227,22 +3441,43 @@ function ReactFiberBeginWork(
     current,
     workInProgress,
     shouldUpdate,
-    hasContext
+    hasContext,
+    didCaptureError,
+    renderExpirationTime
   ) {
     markRef(current, workInProgress);
-    if (!shouldUpdate)
+    if (!shouldUpdate && !didCaptureError)
       return (
         hasContext && invalidateContextProvider(workInProgress, !1),
         bailoutOnAlreadyFinishedWork(current, workInProgress)
       );
+    var ctor = workInProgress.type;
     shouldUpdate = workInProgress.stateNode;
     ReactCurrentOwner.current = workInProgress;
-    (debugRenderPhaseSideEffects ||
-      (debugRenderPhaseSideEffectsForStrictMode && workInProgress.mode & 2)) &&
-      shouldUpdate.render();
-    var nextChildren = shouldUpdate.render();
+    !didCaptureError ||
+    (enableGetDerivedStateFromCatch &&
+      "function" === typeof ctor.getDerivedStateFromCatch)
+      ? ((debugRenderPhaseSideEffects ||
+          (debugRenderPhaseSideEffectsForStrictMode &&
+            workInProgress.mode & 2)) &&
+          shouldUpdate.render(),
+        (ctor = shouldUpdate.render()))
+      : (ctor = null);
     workInProgress.effectTag |= 1;
-    reconcileChildren(current, workInProgress, nextChildren);
+    didCaptureError &&
+      (reconcileChildrenAtExpirationTime(
+        current,
+        workInProgress,
+        null,
+        renderExpirationTime
+      ),
+      (workInProgress.child = null));
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      ctor,
+      renderExpirationTime
+    );
     workInProgress.memoizedState = shouldUpdate.state;
     workInProgress.memoizedProps = shouldUpdate.props;
     hasContext && invalidateContextProvider(workInProgress, !0);
@@ -3342,25 +3577,6 @@ function ReactFiberBeginWork(
     }
     return workInProgress.child;
   }
-  function bailoutOnLowPriority(current, workInProgress) {
-    switch (workInProgress.tag) {
-      case 3:
-        pushHostRootContext(workInProgress);
-        break;
-      case 2:
-        pushContextProvider(workInProgress);
-        break;
-      case 4:
-        pushHostContainer(
-          workInProgress,
-          workInProgress.stateNode.containerInfo
-        );
-        break;
-      case 13:
-        pushProvider(workInProgress);
-    }
-    return null;
-  }
   var shouldSetTextContent = config.shouldSetTextContent,
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree,
     pushHostContext = hostContext.pushHostContext,
@@ -3383,14 +3599,32 @@ function ReactFiberBeginWork(
     callGetDerivedStateFromProps = config.callGetDerivedStateFromProps,
     constructClassInstance = config.constructClassInstance,
     mountClassInstance = config.mountClassInstance,
+    resumeMountClassInstance = config.resumeMountClassInstance,
     updateClassInstance = config.updateClassInstance;
   return {
     beginWork: function(current, workInProgress, renderExpirationTime) {
       if (
         0 === workInProgress.expirationTime ||
         workInProgress.expirationTime > renderExpirationTime
-      )
-        return bailoutOnLowPriority(current, workInProgress);
+      ) {
+        switch (workInProgress.tag) {
+          case 3:
+            pushHostRootContext(workInProgress);
+            break;
+          case 2:
+            pushContextProvider(workInProgress);
+            break;
+          case 4:
+            pushHostContainer(
+              workInProgress,
+              workInProgress.stateNode.containerInfo
+            );
+            break;
+          case 13:
+            pushProvider(workInProgress);
+        }
+        return null;
+      }
       switch (workInProgress.tag) {
         case 0:
           invariant(
@@ -3431,7 +3665,9 @@ function ReactFiberBeginWork(
                 current,
                 workInProgress,
                 !0,
-                props
+                props,
+                !1,
+                renderExpirationTime
               )))
             : ((workInProgress.tag = 1),
               reconcileChildren(current, workInProgress, fn),
@@ -3458,92 +3694,117 @@ function ReactFiberBeginWork(
             current
           );
         case 2:
-          return (
-            (props = pushContextProvider(workInProgress)),
-            (fn = void 0),
-            null === current
-              ? workInProgress.stateNode
-                ? invariant(!1, "Resuming work not yet implemented.")
-                : (constructClassInstance(
-                    workInProgress,
-                    workInProgress.pendingProps
-                  ),
-                  mountClassInstance(workInProgress, renderExpirationTime),
-                  (fn = !0))
-              : (fn = updateClassInstance(
-                  current,
+          props = pushContextProvider(workInProgress);
+          null === current
+            ? null === workInProgress.stateNode
+              ? (constructClassInstance(
+                  workInProgress,
+                  workInProgress.pendingProps
+                ),
+                mountClassInstance(workInProgress, renderExpirationTime),
+                (fn = !0))
+              : (fn = resumeMountClassInstance(
                   workInProgress,
                   renderExpirationTime
-                )),
-            finishClassComponent(current, workInProgress, fn, props)
+                ))
+            : (fn = updateClassInstance(
+                current,
+                workInProgress,
+                renderExpirationTime
+              ));
+          unmaskedContext = !1;
+          var updateQueue = workInProgress.updateQueue;
+          null !== updateQueue &&
+            null !== updateQueue.capturedValues &&
+            (unmaskedContext = fn = !0);
+          return finishClassComponent(
+            current,
+            workInProgress,
+            fn,
+            props,
+            unmaskedContext,
+            renderExpirationTime
           );
         case 3:
-          return (
-            pushHostRootContext(workInProgress),
-            (props = workInProgress.updateQueue),
-            null !== props
-              ? ((fn = workInProgress.memoizedState),
-                (props = processUpdateQueue(
-                  current,
+          a: if (
+            (pushHostRootContext(workInProgress),
+            (fn = workInProgress.updateQueue),
+            null !== fn)
+          ) {
+            unmaskedContext = workInProgress.memoizedState;
+            props = processUpdateQueue(
+              current,
+              workInProgress,
+              fn,
+              null,
+              null,
+              renderExpirationTime
+            );
+            workInProgress.memoizedState = props;
+            fn = workInProgress.updateQueue;
+            if (null !== fn && null !== fn.capturedValues) fn = null;
+            else if (unmaskedContext === props) {
+              resetHydrationState();
+              current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+              break a;
+            } else fn = props.element;
+            unmaskedContext = workInProgress.stateNode;
+            (null === current || null === current.child) &&
+            unmaskedContext.hydrate &&
+            enterHydrationState(workInProgress)
+              ? ((workInProgress.effectTag |= 2),
+                (workInProgress.child = mountChildFibers(
                   workInProgress,
-                  props,
-                  null,
                   null,
+                  fn,
                   renderExpirationTime
-                )),
-                fn === props
-                  ? (resetHydrationState(),
-                    (current = bailoutOnAlreadyFinishedWork(
-                      current,
-                      workInProgress
-                    )))
-                  : ((fn = props.element),
-                    (unmaskedContext = workInProgress.stateNode),
-                    (null === current || null === current.child) &&
-                    unmaskedContext.hydrate &&
-                    enterHydrationState(workInProgress)
-                      ? ((workInProgress.effectTag |= 2),
-                        (workInProgress.child = mountChildFibers(
-                          workInProgress,
-                          null,
-                          fn,
-                          renderExpirationTime
-                        )))
-                      : (resetHydrationState(),
-                        reconcileChildren(current, workInProgress, fn)),
-                    (workInProgress.memoizedState = props),
-                    (current = workInProgress.child)))
+                )))
               : (resetHydrationState(),
-                (current = bailoutOnAlreadyFinishedWork(
-                  current,
-                  workInProgress
-                ))),
-            current
-          );
+                reconcileChildren(current, workInProgress, fn));
+            workInProgress.memoizedState = props;
+            current = workInProgress.child;
+          } else
+            resetHydrationState(),
+              (current = bailoutOnAlreadyFinishedWork(current, workInProgress));
+          return current;
         case 5:
-          pushHostContext(workInProgress);
-          null === current && tryToClaimNextHydratableInstance(workInProgress);
-          props = workInProgress.type;
-          var memoizedProps = workInProgress.memoizedProps;
-          fn = workInProgress.pendingProps;
-          unmaskedContext = null !== current ? current.memoizedProps : null;
-          didPerformWorkStackCursor.current || memoizedProps !== fn
-            ? ((memoizedProps = fn.children),
-              shouldSetTextContent(props, fn)
-                ? (memoizedProps = null)
-                : unmaskedContext &&
-                  shouldSetTextContent(props, unmaskedContext) &&
-                  (workInProgress.effectTag |= 16),
-              markRef(current, workInProgress),
-              1073741823 !== renderExpirationTime &&
-              workInProgress.mode & 1 &&
-              shouldDeprioritizeSubtree(props, fn)
-                ? ((workInProgress.expirationTime = 1073741823),
-                  (current = null))
-                : (reconcileChildren(current, workInProgress, memoizedProps),
-                  (workInProgress.memoizedProps = fn),
-                  (current = workInProgress.child)))
-            : (current = bailoutOnAlreadyFinishedWork(current, workInProgress));
+          a: {
+            pushHostContext(workInProgress);
+            null === current &&
+              tryToClaimNextHydratableInstance(workInProgress);
+            props = workInProgress.type;
+            updateQueue = workInProgress.memoizedProps;
+            fn = workInProgress.pendingProps;
+            unmaskedContext = null !== current ? current.memoizedProps : null;
+            if (!didPerformWorkStackCursor.current && updateQueue === fn) {
+              if (
+                (updateQueue =
+                  workInProgress.mode & 1 &&
+                  shouldDeprioritizeSubtree(props, fn))
+              )
+                workInProgress.expirationTime = 1073741823;
+              if (!updateQueue || 1073741823 !== renderExpirationTime) {
+                current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+                break a;
+              }
+            }
+            updateQueue = fn.children;
+            shouldSetTextContent(props, fn)
+              ? (updateQueue = null)
+              : unmaskedContext &&
+                shouldSetTextContent(props, unmaskedContext) &&
+                (workInProgress.effectTag |= 16);
+            markRef(current, workInProgress);
+            1073741823 !== renderExpirationTime &&
+            workInProgress.mode & 1 &&
+            shouldDeprioritizeSubtree(props, fn)
+              ? ((workInProgress.expirationTime = 1073741823),
+                (workInProgress.memoizedProps = fn),
+                (current = null))
+              : (reconcileChildren(current, workInProgress, updateQueue),
+                (workInProgress.memoizedProps = fn),
+                (current = workInProgress.child));
+          }
           return current;
         case 6:
           return (
@@ -3648,28 +3909,28 @@ function ReactFiberBeginWork(
           unmaskedContext = workInProgress.memoizedProps;
           if (didPerformWorkStackCursor.current || unmaskedContext !== fn) {
             workInProgress.memoizedProps = fn;
-            memoizedProps = fn.value;
-            if (null === unmaskedContext) memoizedProps = 1073741823;
+            updateQueue = fn.value;
+            if (null === unmaskedContext) updateQueue = 1073741823;
             else {
               var oldValue = unmaskedContext.value;
-              (oldValue === memoizedProps &&
-                (0 !== oldValue || 1 / oldValue === 1 / memoizedProps)) ||
-              (oldValue !== oldValue && memoizedProps !== memoizedProps)
-                ? (memoizedProps = 0)
-                : ((memoizedProps =
+              (oldValue === updateQueue &&
+                (0 !== oldValue || 1 / oldValue === 1 / updateQueue)) ||
+              (oldValue !== oldValue && updateQueue !== updateQueue)
+                ? (updateQueue = 0)
+                : ((updateQueue =
                     "function" === typeof props.calculateChangedBits
-                      ? props.calculateChangedBits(oldValue, memoizedProps)
+                      ? props.calculateChangedBits(oldValue, updateQueue)
                       : 1073741823),
-                  (memoizedProps |= 0),
-                  0 !== memoizedProps &&
+                  (updateQueue |= 0),
+                  0 !== updateQueue &&
                     propagateContextChange(
                       workInProgress,
                       props,
-                      memoizedProps,
+                      updateQueue,
                       renderExpirationTime
                     ));
             }
-            workInProgress.stateNode = memoizedProps;
+            workInProgress.stateNode = updateQueue;
             pushProvider(workInProgress);
             null !== unmaskedContext && unmaskedContext.children === fn.children
               ? (current = bailoutOnAlreadyFinishedWork(
@@ -3687,12 +3948,12 @@ function ReactFiberBeginWork(
           unmaskedContext = workInProgress.type;
           fn = workInProgress.pendingProps;
           props = unmaskedContext.currentValue;
-          memoizedProps = unmaskedContext.changedBits;
-          0 !== memoizedProps &&
+          updateQueue = unmaskedContext.changedBits;
+          0 !== updateQueue &&
             propagateContextChange(
               workInProgress,
               unmaskedContext,
-              memoizedProps,
+              updateQueue,
               renderExpirationTime
             );
           renderExpirationTime = fn.observedBits;
@@ -3700,6 +3961,11 @@ function ReactFiberBeginWork(
             renderExpirationTime = 1073741823;
           workInProgress.stateNode = renderExpirationTime;
           renderExpirationTime = fn.children;
+          "function" !== typeof renderExpirationTime &&
+            invariant(
+              !1,
+              "A context consumer was rendered with multiple children, or a child that isn't a function. A context consumer expects a single child that is a function. If you did pass a function, make sure there is no trailing or leading whitespace around it."
+            );
           renderExpirationTime = renderExpirationTime(props);
           reconcileChildren(current, workInProgress, renderExpirationTime);
           return workInProgress.child;
@@ -3709,47 +3975,6 @@ function ReactFiberBeginWork(
             "Unknown unit of work tag. This error is likely caused by a bug in React. Please file an issue."
           );
       }
-    },
-    beginFailedWork: function(current, workInProgress, renderExpirationTime) {
-      switch (workInProgress.tag) {
-        case 2:
-          pushContextProvider(workInProgress);
-          break;
-        case 3:
-          pushHostRootContext(workInProgress);
-          break;
-        default:
-          invariant(
-            !1,
-            "Invalid type of work. This error is likely caused by a bug in React. Please file an issue."
-          );
-      }
-      workInProgress.effectTag |= 64;
-      null === current
-        ? (workInProgress.child = null)
-        : workInProgress.child !== current.child &&
-          (workInProgress.child = current.child);
-      if (
-        0 === workInProgress.expirationTime ||
-        workInProgress.expirationTime > renderExpirationTime
-      )
-        return bailoutOnLowPriority(current, workInProgress);
-      workInProgress.firstEffect = null;
-      workInProgress.lastEffect = null;
-      workInProgress.child =
-        null === current
-          ? mountChildFibers(workInProgress, null, null, renderExpirationTime)
-          : reconcileChildFibers(
-              workInProgress,
-              current.child,
-              null,
-              renderExpirationTime
-            );
-      2 === workInProgress.tag &&
-        ((current = workInProgress.stateNode),
-        (workInProgress.memoizedProps = current.props),
-        (workInProgress.memoizedState = current.state));
-      return workInProgress.child;
     }
   };
 }
@@ -3794,7 +4019,18 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
         case 1:
           return null;
         case 2:
-          return popContextProvider(workInProgress), null;
+          return (
+            popContextProvider(workInProgress),
+            (current = workInProgress.stateNode),
+            (newProps = workInProgress.updateQueue),
+            null !== newProps &&
+              null !== newProps.capturedValues &&
+              ((workInProgress.effectTag &= -65),
+              "function" === typeof current.componentDidCatch
+                ? (workInProgress.effectTag |= 256)
+                : (newProps.capturedValues = null)),
+            null
+          );
         case 3:
           popHostContainer(workInProgress);
           pop(didPerformWorkStackCursor, workInProgress);
@@ -3806,6 +4042,10 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           if (null === current || null === current.child)
             popHydrationState(workInProgress), (workInProgress.effectTag &= -3);
           updateHostContainer(workInProgress);
+          current = workInProgress.updateQueue;
+          null !== current &&
+            null !== current.capturedValues &&
+            (workInProgress.effectTag |= 256);
           return null;
         case 5:
           popHostContext(workInProgress);
@@ -3813,10 +4053,10 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           var type = workInProgress.type;
           if (null !== current && null != workInProgress.stateNode) {
             var oldProps = current.memoizedProps,
-              instance = workInProgress.stateNode,
+              _instance = workInProgress.stateNode,
               currentHostContext = getHostContext();
-            instance = prepareUpdate(
-              instance,
+            _instance = prepareUpdate(
+              _instance,
               type,
               oldProps,
               newProps,
@@ -3826,7 +4066,7 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
             updateHostComponent(
               current,
               workInProgress,
-              instance,
+              _instance,
               type,
               oldProps,
               newProps,
@@ -4006,7 +4246,121 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
     }
   };
 }
-function ReactFiberCommitWork(config, captureError) {
+function ReactFiberUnwindWork(
+  hostContext,
+  scheduleWork,
+  isAlreadyFailedLegacyErrorBoundary
+) {
+  var popHostContainer = hostContext.popHostContainer,
+    popHostContext = hostContext.popHostContext;
+  return {
+    throwException: function(returnFiber, sourceFiber, rawValue) {
+      sourceFiber.effectTag |= 512;
+      sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+      sourceFiber = {
+        value: rawValue,
+        source: sourceFiber,
+        stack: getStackAddendumByWorkInProgressFiber(sourceFiber)
+      };
+      do {
+        switch (returnFiber.tag) {
+          case 3:
+            ensureUpdateQueues(returnFiber);
+            returnFiber.updateQueue.capturedValues = [sourceFiber];
+            returnFiber.effectTag |= 1024;
+            return;
+          case 2:
+            rawValue = returnFiber.type;
+            var _instance = returnFiber.stateNode;
+            if (
+              0 === (returnFiber.effectTag & 64) &&
+              (("function" === typeof rawValue.getDerivedStateFromCatch &&
+                enableGetDerivedStateFromCatch) ||
+                (null !== _instance &&
+                  "function" === typeof _instance.componentDidCatch &&
+                  !isAlreadyFailedLegacyErrorBoundary(_instance)))
+            ) {
+              ensureUpdateQueues(returnFiber);
+              rawValue = returnFiber.updateQueue;
+              _instance = rawValue.capturedValues;
+              null === _instance
+                ? (rawValue.capturedValues = [sourceFiber])
+                : _instance.push(sourceFiber);
+              returnFiber.effectTag |= 1024;
+              return;
+            }
+        }
+        returnFiber = returnFiber["return"];
+      } while (null !== returnFiber);
+    },
+    unwindWork: function(workInProgress) {
+      switch (workInProgress.tag) {
+        case 2:
+          popContextProvider(workInProgress);
+          var effectTag = workInProgress.effectTag;
+          return effectTag & 1024
+            ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
+              workInProgress)
+            : null;
+        case 3:
+          return (
+            popHostContainer(workInProgress),
+            pop(didPerformWorkStackCursor, workInProgress),
+            pop(contextStackCursor, workInProgress),
+            (effectTag = workInProgress.effectTag),
+            effectTag & 1024
+              ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
+                workInProgress)
+              : null
+          );
+        case 5:
+          return popHostContext(workInProgress), null;
+        case 4:
+          return popHostContainer(workInProgress), null;
+        case 13:
+          return popProvider(workInProgress), null;
+        default:
+          return null;
+      }
+    }
+  };
+}
+function logError(boundary, errorInfo) {
+  var source = errorInfo.source,
+    stack = errorInfo.stack;
+  null === stack && (stack = getStackAddendumByWorkInProgressFiber(source));
+  null !== source && getComponentName(source);
+  errorInfo = errorInfo.value;
+  stack = null !== stack ? stack : "";
+  null !== boundary && getComponentName(boundary);
+  try {
+    if (errorInfo instanceof Error) {
+      var message = errorInfo.message,
+        name = errorInfo.name;
+      var errorToHandle = errorInfo;
+      try {
+        errorToHandle.message =
+          (message ? name + ": " + message : name) +
+          "\n\nThis error is located at:" +
+          stack;
+      } catch (e) {}
+    } else
+      errorToHandle =
+        "string" === typeof errorInfo
+          ? Error(errorInfo + "\n\nThis error is located at:" + stack)
+          : Error("Unspecified error at:" + stack);
+    ExceptionsManager.handleException(errorToHandle, !1);
+  } catch (e) {
+    (e && e.suppressReactErrorLogging) || console.error(e);
+  }
+}
+function ReactFiberCommitWork(
+  config,
+  captureError,
+  scheduleWork,
+  computeExpirationForFiber,
+  markLegacyErrorBoundaryAsFailed
+) {
   function safelyDetachRef(current) {
     var ref = current.ref;
     if (null !== ref)
@@ -4023,12 +4377,12 @@ function ReactFiberCommitWork(config, captureError) {
     switch (current.tag) {
       case 2:
         safelyDetachRef(current);
-        var instance = current.stateNode;
-        if ("function" === typeof instance.componentWillUnmount)
+        var _instance6 = current.stateNode;
+        if ("function" === typeof _instance6.componentWillUnmount)
           try {
-            (instance.props = current.memoizedProps),
-              (instance.state = current.memoizedState),
-              instance.componentWillUnmount();
+            (_instance6.props = current.memoizedProps),
+              (_instance6.state = current.memoizedState),
+              _instance6.componentWillUnmount();
           } catch (unmountError) {
             captureError(current, unmountError);
           }
@@ -4243,8 +4597,8 @@ function ReactFiberCommitWork(config, captureError) {
         case 2:
           break;
         case 5:
-          var instance = finishedWork.stateNode;
-          if (null != instance) {
+          var _instance7 = finishedWork.stateNode;
+          if (null != _instance7) {
             var newProps = finishedWork.memoizedProps;
             current = null !== current ? current.memoizedProps : newProps;
             var type = finishedWork.type,
@@ -4252,7 +4606,7 @@ function ReactFiberCommitWork(config, captureError) {
             finishedWork.updateQueue = null;
             null !== updatePayload &&
               commitUpdate(
-                instance,
+                _instance7,
                 updatePayload,
                 type,
                 current,
@@ -4266,11 +4620,11 @@ function ReactFiberCommitWork(config, captureError) {
             null !== finishedWork.stateNode,
             "This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue."
           );
-          instance = finishedWork.memoizedProps;
+          _instance7 = finishedWork.memoizedProps;
           commitTextUpdate(
             finishedWork.stateNode,
-            null !== current ? current.memoizedProps : instance,
-            instance
+            null !== current ? current.memoizedProps : _instance7,
+            _instance7
           );
           break;
         case 3:
@@ -4282,46 +4636,48 @@ function ReactFiberCommitWork(config, captureError) {
           );
       }
     },
-    commitLifeCycles: function(current, finishedWork) {
+    commitLifeCycles: function(finishedRoot, current, finishedWork) {
       switch (finishedWork.tag) {
         case 2:
-          var instance = finishedWork.stateNode;
+          finishedRoot = finishedWork.stateNode;
           if (finishedWork.effectTag & 4)
             if (null === current)
-              (instance.props = finishedWork.memoizedProps),
-                (instance.state = finishedWork.memoizedState),
-                instance.componentDidMount();
+              (finishedRoot.props = finishedWork.memoizedProps),
+                (finishedRoot.state = finishedWork.memoizedState),
+                finishedRoot.componentDidMount();
             else {
               var prevProps = current.memoizedProps;
               current = current.memoizedState;
-              instance.props = finishedWork.memoizedProps;
-              instance.state = finishedWork.memoizedState;
-              instance.componentDidUpdate(prevProps, current);
+              finishedRoot.props = finishedWork.memoizedProps;
+              finishedRoot.state = finishedWork.memoizedState;
+              finishedRoot.componentDidUpdate(prevProps, current);
             }
           finishedWork = finishedWork.updateQueue;
-          null !== finishedWork && commitCallbacks(finishedWork, instance);
+          null !== finishedWork && commitCallbacks(finishedWork, finishedRoot);
           break;
         case 3:
-          instance = finishedWork.updateQueue;
-          if (null !== instance) {
-            current = null;
+          current = finishedWork.updateQueue;
+          if (null !== current) {
+            finishedRoot = null;
             if (null !== finishedWork.child)
               switch (finishedWork.child.tag) {
                 case 5:
-                  current = getPublicInstance(finishedWork.child.stateNode);
+                  finishedRoot = getPublicInstance(
+                    finishedWork.child.stateNode
+                  );
                   break;
                 case 2:
-                  current = finishedWork.child.stateNode;
+                  finishedRoot = finishedWork.child.stateNode;
               }
-            commitCallbacks(instance, current);
+            commitCallbacks(current, finishedRoot);
           }
           break;
         case 5:
-          instance = finishedWork.stateNode;
+          finishedRoot = finishedWork.stateNode;
           null === current &&
             finishedWork.effectTag & 4 &&
             commitMount(
-              instance,
+              finishedRoot,
               finishedWork.type,
               finishedWork.memoizedProps,
               finishedWork
@@ -4338,16 +4694,59 @@ function ReactFiberCommitWork(config, captureError) {
           );
       }
     },
+    commitErrorLogging: function(finishedWork, onUncaughtError) {
+      switch (finishedWork.tag) {
+        case 2:
+          var ctor = finishedWork.type;
+          onUncaughtError = finishedWork.stateNode;
+          var updateQueue = finishedWork.updateQueue;
+          invariant(
+            null !== updateQueue && null !== updateQueue.capturedValues,
+            "An error logging effect should not have been scheduled if no errors were captured. This error is likely caused by a bug in React. Please file an issue."
+          );
+          var capturedErrors = updateQueue.capturedValues;
+          updateQueue.capturedValues = null;
+          "function" !== typeof ctor.getDerivedStateFromCatch &&
+            markLegacyErrorBoundaryAsFailed(onUncaughtError);
+          onUncaughtError.props = finishedWork.memoizedProps;
+          onUncaughtError.state = finishedWork.memoizedState;
+          for (ctor = 0; ctor < capturedErrors.length; ctor++) {
+            updateQueue = capturedErrors[ctor];
+            var _error = updateQueue.value;
+            logError(finishedWork, updateQueue);
+            onUncaughtError.componentDidCatch(_error);
+          }
+          break;
+        case 3:
+          ctor = finishedWork.updateQueue;
+          invariant(
+            null !== ctor && null !== ctor.capturedValues,
+            "An error logging effect should not have been scheduled if no errors were captured. This error is likely caused by a bug in React. Please file an issue."
+          );
+          capturedErrors = ctor.capturedValues;
+          ctor.capturedValues = null;
+          for (ctor = 0; ctor < capturedErrors.length; ctor++)
+            (updateQueue = capturedErrors[ctor]),
+              logError(finishedWork, updateQueue),
+              onUncaughtError(updateQueue.value);
+          break;
+        default:
+          invariant(
+            !1,
+            "This unit of work tag cannot capture errors.  This error is likely caused by a bug in React. Please file an issue."
+          );
+      }
+    },
     commitAttachRef: function(finishedWork) {
       var ref = finishedWork.ref;
       if (null !== ref) {
-        var instance = finishedWork.stateNode;
+        var _instance5 = finishedWork.stateNode;
         switch (finishedWork.tag) {
           case 5:
-            finishedWork = getPublicInstance(instance);
+            finishedWork = getPublicInstance(_instance5);
             break;
           default:
-            finishedWork = instance;
+            finishedWork = _instance5;
         }
         "function" === typeof ref
           ? ref(finishedWork)
@@ -4570,55 +4969,101 @@ function ReactFiberHydrationContext(config) {
   };
 }
 function ReactFiberScheduler(config) {
+  function resetContextStack() {
+    for (; -1 < index; ) (valueStack[index] = null), index--;
+    previousContext = emptyObject;
+    contextStackCursor.current = emptyObject;
+    didPerformWorkStackCursor.current = !1;
+    resetHostContainer();
+    for (var i = index$1; -1 < i; i--) {
+      var context = stack[i].type.context;
+      context.currentValue = context.defaultValue;
+      context.changedBits = 0;
+      changedBitsStack[i] = null;
+      currentValueStack[i] = null;
+      stack[i] = null;
+    }
+    index$1 = -1;
+    nextRoot = null;
+    nextRenderExpirationTime = 0;
+    nextUnitOfWork = null;
+    isRootReadyForCommit = !1;
+  }
+  function isAlreadyFailedLegacyErrorBoundary(instance) {
+    return (
+      null !== legacyErrorBoundariesThatAlreadyFailed &&
+      legacyErrorBoundariesThatAlreadyFailed.has(instance)
+    );
+  }
   function completeUnitOfWork(workInProgress$jscomp$0) {
     for (;;) {
-      var next = completeWork(
-          workInProgress$jscomp$0.alternate,
-          workInProgress$jscomp$0,
-          nextRenderExpirationTime
-        ),
+      var current = workInProgress$jscomp$0.alternate,
         returnFiber = workInProgress$jscomp$0["return"],
         siblingFiber = workInProgress$jscomp$0.sibling;
-      var workInProgress = workInProgress$jscomp$0;
-      if (
-        1073741823 === nextRenderExpirationTime ||
-        1073741823 !== workInProgress.expirationTime
-      ) {
-        if (2 !== workInProgress.tag && 3 !== workInProgress.tag)
-          var newExpirationTime = 0;
-        else
-          (newExpirationTime = workInProgress.updateQueue),
-            (newExpirationTime =
-              null === newExpirationTime
-                ? 0
-                : newExpirationTime.expirationTime);
-        for (var child = workInProgress.child; null !== child; )
-          0 !== child.expirationTime &&
-            (0 === newExpirationTime ||
-              newExpirationTime > child.expirationTime) &&
-            (newExpirationTime = child.expirationTime),
-            (child = child.sibling);
-        workInProgress.expirationTime = newExpirationTime;
-      }
-      if (null !== next) return next;
-      null !== returnFiber &&
-        (null === returnFiber.firstEffect &&
-          (returnFiber.firstEffect = workInProgress$jscomp$0.firstEffect),
-        null !== workInProgress$jscomp$0.lastEffect &&
-          (null !== returnFiber.lastEffect &&
-            (returnFiber.lastEffect.nextEffect =
-              workInProgress$jscomp$0.firstEffect),
-          (returnFiber.lastEffect = workInProgress$jscomp$0.lastEffect)),
-        1 < workInProgress$jscomp$0.effectTag &&
-          (null !== returnFiber.lastEffect
-            ? (returnFiber.lastEffect.nextEffect = workInProgress$jscomp$0)
-            : (returnFiber.firstEffect = workInProgress$jscomp$0),
-          (returnFiber.lastEffect = workInProgress$jscomp$0)));
-      if (null !== siblingFiber) return siblingFiber;
-      if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
-      else {
-        workInProgress$jscomp$0.stateNode.isReadyForCommit = !0;
-        break;
+      if (0 === (workInProgress$jscomp$0.effectTag & 512)) {
+        current = completeWork(
+          current,
+          workInProgress$jscomp$0,
+          nextRenderExpirationTime
+        );
+        var workInProgress = workInProgress$jscomp$0;
+        if (
+          1073741823 === nextRenderExpirationTime ||
+          1073741823 !== workInProgress.expirationTime
+        ) {
+          b: switch (workInProgress.tag) {
+            case 3:
+            case 2:
+              var newExpirationTime = workInProgress.updateQueue;
+              newExpirationTime =
+                null === newExpirationTime
+                  ? 0
+                  : newExpirationTime.expirationTime;
+              break b;
+            default:
+              newExpirationTime = 0;
+          }
+          for (var child = workInProgress.child; null !== child; )
+            0 !== child.expirationTime &&
+              (0 === newExpirationTime ||
+                newExpirationTime > child.expirationTime) &&
+              (newExpirationTime = child.expirationTime),
+              (child = child.sibling);
+          workInProgress.expirationTime = newExpirationTime;
+        }
+        if (null !== current) return current;
+        null !== returnFiber &&
+          0 === (returnFiber.effectTag & 512) &&
+          (null === returnFiber.firstEffect &&
+            (returnFiber.firstEffect = workInProgress$jscomp$0.firstEffect),
+          null !== workInProgress$jscomp$0.lastEffect &&
+            (null !== returnFiber.lastEffect &&
+              (returnFiber.lastEffect.nextEffect =
+                workInProgress$jscomp$0.firstEffect),
+            (returnFiber.lastEffect = workInProgress$jscomp$0.lastEffect)),
+          1 < workInProgress$jscomp$0.effectTag &&
+            (null !== returnFiber.lastEffect
+              ? (returnFiber.lastEffect.nextEffect = workInProgress$jscomp$0)
+              : (returnFiber.firstEffect = workInProgress$jscomp$0),
+            (returnFiber.lastEffect = workInProgress$jscomp$0)));
+        if (null !== siblingFiber) return siblingFiber;
+        if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
+        else {
+          isRootReadyForCommit = !0;
+          break;
+        }
+      } else {
+        workInProgress$jscomp$0 = unwindWork(workInProgress$jscomp$0);
+        if (null !== workInProgress$jscomp$0)
+          return (
+            (workInProgress$jscomp$0.effectTag &= 511), workInProgress$jscomp$0
+          );
+        null !== returnFiber &&
+          ((returnFiber.firstEffect = returnFiber.lastEffect = null),
+          (returnFiber.effectTag |= 512));
+        if (null !== siblingFiber) return siblingFiber;
+        if (null !== returnFiber) workInProgress$jscomp$0 = returnFiber;
+        else break;
       }
     }
     return null;
@@ -4633,263 +5078,114 @@ function ReactFiberScheduler(config) {
     ReactCurrentOwner.current = null;
     return next;
   }
-  function performFailedUnitOfWork(workInProgress) {
-    var next = beginFailedWork(
-      workInProgress.alternate,
-      workInProgress,
-      nextRenderExpirationTime
-    );
-    null === next && (next = completeUnitOfWork(workInProgress));
-    ReactCurrentOwner.current = null;
-    return next;
-  }
-  function workLoop(isAsync) {
-    if (null !== capturedErrors)
-      if (isAsync)
-        for (; null !== nextUnitOfWork && !shouldYield(); )
-          nextUnitOfWork = hasCapturedError(nextUnitOfWork)
-            ? performFailedUnitOfWork(nextUnitOfWork)
-            : performUnitOfWork(nextUnitOfWork);
-      else
-        for (; null !== nextUnitOfWork; )
-          nextUnitOfWork = hasCapturedError(nextUnitOfWork)
-            ? performFailedUnitOfWork(nextUnitOfWork)
-            : performUnitOfWork(nextUnitOfWork);
-    else if (isAsync)
-      for (; null !== nextUnitOfWork && !shouldYield(); )
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-    else
-      for (; null !== nextUnitOfWork; )
-        nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
-  }
   function renderRoot(root, expirationTime, isAsync) {
     invariant(
       !isWorking,
       "renderRoot was called recursively. This error is likely caused by a bug in React. Please file an issue."
     );
     isWorking = !0;
-    root.isReadyForCommit = !1;
     if (
-      root !== nextRoot ||
       expirationTime !== nextRenderExpirationTime ||
+      root !== nextRoot ||
       null === nextUnitOfWork
-    ) {
-      for (; -1 < index; ) (valueStack[index] = null), index--;
-      previousContext = emptyObject;
-      contextStackCursor.current = emptyObject;
-      didPerformWorkStackCursor.current = !1;
-      for (var i = index$1; -1 < i; i--) {
-        var context = stack[i].type.context;
-        context.currentValue = context.defaultValue;
-        context.changedBits = 0;
-        changedBitsStack[i] = null;
-        currentValueStack[i] = null;
-        stack[i] = null;
-      }
-      index$1 = -1;
-      resetHostContainer();
-      nextRoot = root;
-      nextRenderExpirationTime = expirationTime;
-      nextUnitOfWork = createWorkInProgress(
-        nextRoot.current,
-        null,
-        expirationTime
-      );
-    }
-    i = !1;
-    context = null;
-    try {
-      workLoop(isAsync);
-    } catch (e) {
-      (i = !0), (context = e);
-    }
-    for (; i; ) {
-      if (didFatal) {
-        firstUncaughtError = context;
-        break;
-      }
-      expirationTime = nextUnitOfWork;
-      if (null === expirationTime) didFatal = !0;
-      else {
-        var boundary = captureError(expirationTime, context);
-        invariant(
-          null !== boundary,
-          "Should have found an error boundary. This error is likely caused by a bug in React. Please file an issue."
-        );
-        if (!didFatal) {
-          try {
-            i = boundary;
-            context = isAsync;
-            for (boundary = i; null !== expirationTime; ) {
-              switch (expirationTime.tag) {
-                case 2:
-                  popContextProvider(expirationTime);
-                  break;
-                case 5:
-                  popHostContext(expirationTime);
-                  break;
-                case 3:
-                  popHostContainer(expirationTime);
-                  break;
-                case 4:
-                  popHostContainer(expirationTime);
-                  break;
-                case 13:
-                  popProvider(expirationTime);
-              }
-              if (
-                expirationTime === boundary ||
-                expirationTime.alternate === boundary
-              )
-                break;
-              expirationTime = expirationTime["return"];
-            }
-            nextUnitOfWork = performFailedUnitOfWork(i);
-            workLoop(context);
-          } catch (e) {
-            i = !0;
-            context = e;
-            continue;
-          }
+    )
+      resetContextStack(),
+        (nextRoot = root),
+        (nextRenderExpirationTime = expirationTime),
+        (nextUnitOfWork = createWorkInProgress(
+          nextRoot.current,
+          null,
+          nextRenderExpirationTime
+        )),
+        (root.pendingCommitExpirationTime = 0);
+    var didFatal = !1;
+    do {
+      try {
+        if (isAsync)
+          for (; null !== nextUnitOfWork && !shouldYield(); )
+            nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
+        else
+          for (; null !== nextUnitOfWork; )
+            nextUnitOfWork = performUnitOfWork(nextUnitOfWork);
+      } catch (thrownValue) {
+        if (null === nextUnitOfWork) {
+          didFatal = !0;
+          onUncaughtError(thrownValue);
           break;
         }
-      }
-    }
-    isAsync = firstUncaughtError;
-    didFatal = isWorking = !1;
-    firstUncaughtError = null;
-    null !== isAsync && onUncaughtError(isAsync);
-    return root.isReadyForCommit ? root.current.alternate : null;
-  }
-  function captureError(failedWork, error$jscomp$0) {
-    var boundary = (ReactCurrentOwner.current = null),
-      errorBoundaryFound = !1,
-      willRetry = !1,
-      errorBoundaryName = null;
-    if (3 === failedWork.tag)
-      (boundary = failedWork), isFailedBoundary(failedWork) && (didFatal = !0);
-    else
-      for (
-        var node = failedWork["return"];
-        null !== node && null === boundary;
-
-      ) {
-        2 === node.tag
-          ? "function" === typeof node.stateNode.componentDidCatch &&
-            ((errorBoundaryFound = !0),
-            (errorBoundaryName = getComponentName(node)),
-            (boundary = node),
-            (willRetry = !0))
-          : 3 === node.tag && (boundary = node);
-        if (isFailedBoundary(node)) {
-          if (
-            isUnmounting ||
-            (null !== commitPhaseBoundaries &&
-              (commitPhaseBoundaries.has(node) ||
-                (null !== node.alternate &&
-                  commitPhaseBoundaries.has(node.alternate))))
-          )
-            return null;
-          boundary = null;
-          willRetry = !1;
+        isAsync = nextUnitOfWork;
+        var returnFiber = isAsync["return"];
+        if (null === returnFiber) {
+          didFatal = !0;
+          onUncaughtError(thrownValue);
+          break;
         }
-        node = node["return"];
+        throwException(returnFiber, isAsync, thrownValue);
+        nextUnitOfWork = completeUnitOfWork(isAsync);
       }
-    if (null !== boundary) {
-      null === failedBoundaries && (failedBoundaries = new Set());
-      failedBoundaries.add(boundary);
-      var info = "";
-      node = failedWork;
-      do {
-        a: switch (node.tag) {
-          case 0:
-          case 1:
+      break;
+    } while (1);
+    isWorking = !1;
+    if (didFatal || null !== nextUnitOfWork) return null;
+    if (isRootReadyForCommit)
+      return (
+        (root.pendingCommitExpirationTime = expirationTime),
+        root.current.alternate
+      );
+    invariant(
+      !1,
+      "Expired work should have completed. This error is likely caused by a bug in React. Please file an issue."
+    );
+  }
+  function scheduleCapture(sourceFiber, boundaryFiber, value, expirationTime) {
+    sourceFiber = {
+      value: value,
+      source: sourceFiber,
+      stack: getStackAddendumByWorkInProgressFiber(sourceFiber)
+    };
+    insertUpdateIntoFiber(boundaryFiber, {
+      expirationTime: expirationTime,
+      partialState: null,
+      callback: null,
+      isReplace: !1,
+      isForced: !1,
+      capturedValue: sourceFiber,
+      next: null
+    });
+    scheduleWork(boundaryFiber, expirationTime);
+  }
+  function onCommitPhaseError(fiber$jscomp$0, error) {
+    a: {
+      invariant(
+        !isWorking || isCommitting,
+        "dispatch: Cannot dispatch during the render phase."
+      );
+      for (var fiber = fiber$jscomp$0["return"]; null !== fiber; ) {
+        switch (fiber.tag) {
           case 2:
-          case 5:
-            var owner = node._debugOwner,
-              source = node._debugSource;
-            var JSCompiler_inline_result = getComponentName(node);
-            var ownerName = null;
-            owner && (ownerName = getComponentName(owner));
-            owner = source;
-            JSCompiler_inline_result =
-              "\n    in " +
-              (JSCompiler_inline_result || "Unknown") +
-              (owner
-                ? " (at " +
-                  owner.fileName.replace(/^.*[\\\/]/, "") +
-                  ":" +
-                  owner.lineNumber +
-                  ")"
-                : ownerName ? " (created by " + ownerName + ")" : "");
+            var instance = fiber.stateNode;
+            if (
+              "function" === typeof fiber.type.getDerivedStateFromCatch ||
+              ("function" === typeof instance.componentDidCatch &&
+                !isAlreadyFailedLegacyErrorBoundary(instance))
+            ) {
+              scheduleCapture(fiber$jscomp$0, fiber, error, 1);
+              fiber$jscomp$0 = void 0;
+              break a;
+            }
+            break;
+          case 3:
+            scheduleCapture(fiber$jscomp$0, fiber, error, 1);
+            fiber$jscomp$0 = void 0;
             break a;
-          default:
-            JSCompiler_inline_result = "";
         }
-        info += JSCompiler_inline_result;
-        node = node["return"];
-      } while (node);
-      node = info;
-      failedWork = getComponentName(failedWork);
-      null === capturedErrors && (capturedErrors = new Map());
-      error$jscomp$0 = {
-        componentName: failedWork,
-        componentStack: node,
-        error: error$jscomp$0,
-        errorBoundary: errorBoundaryFound ? boundary.stateNode : null,
-        errorBoundaryFound: errorBoundaryFound,
-        errorBoundaryName: errorBoundaryName,
-        willRetry: willRetry
-      };
-      capturedErrors.set(boundary, error$jscomp$0);
-      try {
-        var componentStack = error$jscomp$0.componentStack,
-          error = error$jscomp$0.error;
-        if (error instanceof Error) {
-          var message = error.message,
-            name = error.name;
-          var errorToHandle = error;
-          try {
-            errorToHandle.message =
-              (message ? name + ": " + message : name) +
-              "\n\nThis error is located at:" +
-              componentStack;
-          } catch (e) {}
-        } else
-          errorToHandle =
-            "string" === typeof error
-              ? Error(error + "\n\nThis error is located at:" + componentStack)
-              : Error("Unspecified error at:" + componentStack);
-        ExceptionsManager.handleException(errorToHandle, !1);
-      } catch (e) {
-        (e && e.suppressReactErrorLogging) || console.error(e);
+        fiber = fiber["return"];
       }
-      isCommitting
-        ? (null === commitPhaseBoundaries &&
-            (commitPhaseBoundaries = new Set()),
-          commitPhaseBoundaries.add(boundary))
-        : scheduleErrorRecovery(boundary);
-      return boundary;
+      3 === fiber$jscomp$0.tag &&
+        scheduleCapture(fiber$jscomp$0, fiber$jscomp$0, error, 1);
+      fiber$jscomp$0 = void 0;
     }
-    null === firstUncaughtError && (firstUncaughtError = error$jscomp$0);
-    return null;
-  }
-  function hasCapturedError(fiber) {
-    return (
-      null !== capturedErrors &&
-      (capturedErrors.has(fiber) ||
-        (null !== fiber.alternate && capturedErrors.has(fiber.alternate)))
-    );
-  }
-  function isFailedBoundary(fiber) {
-    return (
-      null !== failedBoundaries &&
-      (failedBoundaries.has(fiber) ||
-        (null !== fiber.alternate && failedBoundaries.has(fiber.alternate)))
-    );
-  }
-  function computeAsyncExpiration() {
-    return 20 * ((((recalculateCurrentTime() + 100) / 20) | 0) + 1);
+    return fiber$jscomp$0;
   }
   function computeExpirationForFiber(fiber) {
     fiber =
@@ -4900,7 +5196,7 @@ function ReactFiberScheduler(config) {
           : fiber.mode & 1
             ? isBatchingInteractiveUpdates
               ? 10 * ((((recalculateCurrentTime() + 50) / 10) | 0) + 1)
-              : computeAsyncExpiration()
+              : 25 * ((((recalculateCurrentTime() + 500) / 25) | 0) + 1)
             : 1;
     isBatchingInteractiveUpdates &&
       (0 === lowestPendingInteractiveExpirationTime ||
@@ -4909,39 +5205,41 @@ function ReactFiberScheduler(config) {
     return fiber;
   }
   function scheduleWork(fiber, expirationTime) {
-    return scheduleWorkImpl(fiber, expirationTime, !1);
-  }
-  function scheduleWorkImpl(fiber, expirationTime) {
-    for (; null !== fiber; ) {
-      if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
-        fiber.expirationTime = expirationTime;
-      null !== fiber.alternate &&
-        (0 === fiber.alternate.expirationTime ||
-          fiber.alternate.expirationTime > expirationTime) &&
-        (fiber.alternate.expirationTime = expirationTime);
-      if (null === fiber["return"])
-        if (3 === fiber.tag) {
-          var root = fiber.stateNode;
-          !isWorking &&
-            root === nextRoot &&
-            expirationTime < nextRenderExpirationTime &&
-            ((nextUnitOfWork = nextRoot = null),
-            (nextRenderExpirationTime = 0));
-          requestWork(root, expirationTime);
-          !isWorking &&
-            root === nextRoot &&
-            expirationTime < nextRenderExpirationTime &&
-            ((nextUnitOfWork = nextRoot = null),
-            (nextRenderExpirationTime = 0));
-        } else break;
-      fiber = fiber["return"];
+    a: {
+      for (; null !== fiber; ) {
+        if (0 === fiber.expirationTime || fiber.expirationTime > expirationTime)
+          fiber.expirationTime = expirationTime;
+        null !== fiber.alternate &&
+          (0 === fiber.alternate.expirationTime ||
+            fiber.alternate.expirationTime > expirationTime) &&
+          (fiber.alternate.expirationTime = expirationTime);
+        if (null === fiber["return"])
+          if (3 === fiber.tag) {
+            var root = fiber.stateNode;
+            !isWorking &&
+              0 !== nextRenderExpirationTime &&
+              expirationTime < nextRenderExpirationTime &&
+              resetContextStack();
+            (nextRoot === root && isWorking) ||
+              requestWork(root, expirationTime);
+            nestedUpdateCount > NESTED_UPDATE_LIMIT &&
+              invariant(
+                !1,
+                "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
+              );
+          } else {
+            expirationTime = void 0;
+            break a;
+          }
+        fiber = fiber["return"];
+      }
+      expirationTime = void 0;
     }
-  }
-  function scheduleErrorRecovery(fiber) {
-    scheduleWorkImpl(fiber, 1, !0);
+    return expirationTime;
   }
   function recalculateCurrentTime() {
-    return (mostRecentCurrentTime = (((now() - startTime) / 10) | 0) + 2);
+    mostRecentCurrentTimeMs = now() - originalStartTimeMs;
+    return (mostRecentCurrentTime = ((mostRecentCurrentTimeMs / 10) | 0) + 2);
   }
   function syncUpdates(fn, a, b, c, d) {
     var previousExpirationContext = expirationContext;
@@ -4957,18 +5255,13 @@ function ReactFiberScheduler(config) {
       if (expirationTime > callbackExpirationTime) return;
       cancelDeferredCallback(callbackID);
     }
-    var currentMs = now() - startTime;
+    var currentMs = now() - originalStartTimeMs;
     callbackExpirationTime = expirationTime;
     callbackID = scheduleDeferredCallback(performAsyncWork, {
       timeout: 10 * (expirationTime - 2) - currentMs
     });
   }
   function requestWork(root, expirationTime) {
-    nestedUpdateCount > NESTED_UPDATE_LIMIT &&
-      invariant(
-        !1,
-        "Maximum update depth exceeded. This can happen when a component repeatedly calls setState inside componentWillUpdate or componentDidUpdate. React limits the number of nested updates to prevent infinite loops."
-      );
     if (null === root.nextScheduledRoot)
       (root.remainingExpirationTime = expirationTime),
         null === lastScheduledRoot
@@ -5041,7 +5334,8 @@ function ReactFiberScheduler(config) {
       }
     previousScheduledRoot = nextFlushedRoot;
     null !== previousScheduledRoot &&
-    previousScheduledRoot === highestPriorityRoot
+    previousScheduledRoot === highestPriorityRoot &&
+    1 === highestPriorityWork
       ? nestedUpdateCount++
       : (nestedUpdateCount = 0);
     nextFlushedRoot = highestPriorityRoot;
@@ -5086,10 +5380,10 @@ function ReactFiberScheduler(config) {
       scheduleCallbackWithExpiration(nextFlushedExpirationTime);
     deadline = null;
     deadlineDidExpire = !1;
-    nestedUpdateCount = 0;
     finishRendering();
   }
   function finishRendering() {
+    nestedUpdateCount = 0;
     if (null !== completedBatches) {
       var batches = completedBatches;
       completedBatches = null;
@@ -5154,18 +5448,24 @@ function ReactFiberScheduler(config) {
       expirationTime.current !== finishedWork,
       "Cannot commit the same tree as before. This is probably a bug related to the return field. This error is likely caused by a bug in React. Please file an issue."
     );
-    expirationTime.isReadyForCommit = !1;
+    firstBatch = expirationTime.pendingCommitExpirationTime;
+    invariant(
+      0 !== firstBatch,
+      "Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue."
+    );
+    expirationTime.pendingCommitExpirationTime = 0;
+    var currentTime = recalculateCurrentTime();
     ReactCurrentOwner.current = null;
-    1 < finishedWork.effectTag
-      ? null !== finishedWork.lastEffect
-        ? ((finishedWork.lastEffect.nextEffect = finishedWork),
-          (firstBatch = finishedWork.firstEffect))
-        : (firstBatch = finishedWork)
-      : (firstBatch = finishedWork.firstEffect);
+    if (1 < finishedWork.effectTag)
+      if (null !== finishedWork.lastEffect) {
+        finishedWork.lastEffect.nextEffect = finishedWork;
+        var firstEffect = finishedWork.firstEffect;
+      } else firstEffect = finishedWork;
+    else firstEffect = finishedWork.firstEffect;
     prepareForCommit(expirationTime.containerInfo);
-    for (nextEffect = firstBatch; null !== nextEffect; ) {
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
       var didError = !1,
-        _error = void 0;
+        error = void 0;
       try {
         for (; null !== nextEffect; ) {
           var effectTag = nextEffect.effectTag;
@@ -5174,7 +5474,7 @@ function ReactFiberScheduler(config) {
             var current = nextEffect.alternate;
             null !== current && commitDetachRef(current);
           }
-          switch (effectTag & -242) {
+          switch (effectTag & 14) {
             case 2:
               commitPlacement(nextEffect);
               nextEffect.effectTag &= -3;
@@ -5188,65 +5488,46 @@ function ReactFiberScheduler(config) {
               commitWork(nextEffect.alternate, nextEffect);
               break;
             case 8:
-              (isUnmounting = !0),
-                commitDeletion(nextEffect),
-                (isUnmounting = !1);
+              commitDeletion(nextEffect);
           }
           nextEffect = nextEffect.nextEffect;
         }
       } catch (e) {
-        (didError = !0), (_error = e);
+        (didError = !0), (error = e);
       }
       didError &&
         (invariant(
           null !== nextEffect,
           "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
         ),
-        captureError(nextEffect, _error),
+        onCommitPhaseError(nextEffect, error),
         null !== nextEffect && (nextEffect = nextEffect.nextEffect));
     }
     resetAfterCommit(expirationTime.containerInfo);
     expirationTime.current = finishedWork;
-    for (nextEffect = firstBatch; null !== nextEffect; ) {
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
       effectTag = !1;
       current = void 0;
       try {
-        for (; null !== nextEffect; ) {
+        for (
+          firstEffect = expirationTime,
+            didError = currentTime,
+            error = firstBatch;
+          null !== nextEffect;
+
+        ) {
           var effectTag$jscomp$0 = nextEffect.effectTag;
           effectTag$jscomp$0 & 36 &&
-            commitLifeCycles(nextEffect.alternate, nextEffect);
+            commitLifeCycles(
+              firstEffect,
+              nextEffect.alternate,
+              nextEffect,
+              didError,
+              error
+            );
+          effectTag$jscomp$0 & 256 &&
+            commitErrorLogging(nextEffect, onUncaughtError);
           effectTag$jscomp$0 & 128 && commitAttachRef(nextEffect);
-          if (effectTag$jscomp$0 & 64)
-            switch (((firstBatch = nextEffect),
-            (didError = void 0),
-            null !== capturedErrors &&
-              ((didError = capturedErrors.get(firstBatch)),
-              capturedErrors["delete"](firstBatch),
-              null == didError &&
-                null !== firstBatch.alternate &&
-                ((firstBatch = firstBatch.alternate),
-                (didError = capturedErrors.get(firstBatch)),
-                capturedErrors["delete"](firstBatch))),
-            invariant(
-              null != didError,
-              "No error for given unit of work. This error is likely caused by a bug in React. Please file an issue."
-            ),
-            firstBatch.tag)) {
-              case 2:
-                firstBatch.stateNode.componentDidCatch(didError.error, {
-                  componentStack: didError.componentStack
-                });
-                break;
-              case 3:
-                null === firstUncaughtError &&
-                  (firstUncaughtError = didError.error);
-                break;
-              default:
-                invariant(
-                  !1,
-                  "Invalid type of work. This error is likely caused by a bug in React. Please file an issue."
-                );
-            }
           var next = nextEffect.nextEffect;
           nextEffect.nextEffect = null;
           nextEffect = next;
@@ -5259,20 +5540,13 @@ function ReactFiberScheduler(config) {
           null !== nextEffect,
           "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
         ),
-        captureError(nextEffect, current),
+        onCommitPhaseError(nextEffect, current),
         null !== nextEffect && (nextEffect = nextEffect.nextEffect));
     }
     isWorking = isCommitting = !1;
     "function" === typeof onCommitRoot && onCommitRoot(finishedWork.stateNode);
-    commitPhaseBoundaries &&
-      (commitPhaseBoundaries.forEach(scheduleErrorRecovery),
-      (commitPhaseBoundaries = null));
-    null !== firstUncaughtError &&
-      ((finishedWork = firstUncaughtError),
-      (firstUncaughtError = null),
-      onUncaughtError(finishedWork));
     finishedWork = expirationTime.current.expirationTime;
-    0 === finishedWork && (failedBoundaries = capturedErrors = null);
+    0 === finishedWork && (legacyErrorBoundariesThatAlreadyFailed = null);
     root.remainingExpirationTime = finishedWork;
   }
   function shouldYield() {
@@ -5291,26 +5565,41 @@ function ReactFiberScheduler(config) {
   }
   var hostContext = ReactFiberHostContext(config),
     hydrationContext = ReactFiberHydrationContext(config),
-    popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext,
     resetHostContainer = hostContext.resetHostContainer,
-    _ReactFiberBeginWork = ReactFiberBeginWork(
+    beginWork = ReactFiberBeginWork(
       config,
       hostContext,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
-    ),
-    beginWork = _ReactFiberBeginWork.beginWork,
-    beginFailedWork = _ReactFiberBeginWork.beginFailedWork,
+    ).beginWork,
     completeWork = ReactFiberCompleteWork(config, hostContext, hydrationContext)
       .completeWork;
-  hostContext = ReactFiberCommitWork(config, captureError);
+  hostContext = ReactFiberUnwindWork(
+    hostContext,
+    scheduleWork,
+    isAlreadyFailedLegacyErrorBoundary
+  );
+  var throwException = hostContext.throwException,
+    unwindWork = hostContext.unwindWork;
+  hostContext = ReactFiberCommitWork(
+    config,
+    onCommitPhaseError,
+    scheduleWork,
+    computeExpirationForFiber,
+    function(instance) {
+      null === legacyErrorBoundariesThatAlreadyFailed
+        ? (legacyErrorBoundariesThatAlreadyFailed = new Set([instance]))
+        : legacyErrorBoundariesThatAlreadyFailed.add(instance);
+    },
+    recalculateCurrentTime
+  );
   var commitResetTextContent = hostContext.commitResetTextContent,
     commitPlacement = hostContext.commitPlacement,
     commitDeletion = hostContext.commitDeletion,
     commitWork = hostContext.commitWork,
     commitLifeCycles = hostContext.commitLifeCycles,
+    commitErrorLogging = hostContext.commitErrorLogging,
     commitAttachRef = hostContext.commitAttachRef,
     commitDetachRef = hostContext.commitDetachRef,
     now = config.now,
@@ -5318,8 +5607,9 @@ function ReactFiberScheduler(config) {
     cancelDeferredCallback = config.cancelDeferredCallback,
     prepareForCommit = config.prepareForCommit,
     resetAfterCommit = config.resetAfterCommit,
-    startTime = now(),
+    originalStartTimeMs = now(),
     mostRecentCurrentTime = 2,
+    mostRecentCurrentTimeMs = originalStartTimeMs,
     lastUniqueAsyncExpiration = 0,
     expirationContext = 0,
     isWorking = !1,
@@ -5327,13 +5617,9 @@ function ReactFiberScheduler(config) {
     nextRoot = null,
     nextRenderExpirationTime = 0,
     nextEffect = null,
-    capturedErrors = null,
-    failedBoundaries = null,
-    commitPhaseBoundaries = null,
-    firstUncaughtError = null,
-    didFatal = !1,
     isCommitting = !1,
-    isUnmounting = !1,
+    isRootReadyForCommit = !1,
+    legacyErrorBoundariesThatAlreadyFailed = null,
     firstScheduledRoot = null,
     lastScheduledRoot = null,
     callbackExpirationTime = 0,
@@ -5354,6 +5640,7 @@ function ReactFiberScheduler(config) {
     nestedUpdateCount = 0,
     timeHeuristicForUnitOfWork = 1;
   return {
+    recalculateCurrentTime: recalculateCurrentTime,
     computeExpirationForFiber: computeExpirationForFiber,
     scheduleWork: scheduleWork,
     requestWork: requestWork,
@@ -5414,7 +5701,8 @@ function ReactFiberScheduler(config) {
     },
     deferredUpdates: function(fn) {
       var previousExpirationContext = expirationContext;
-      expirationContext = computeAsyncExpiration();
+      expirationContext =
+        25 * ((((recalculateCurrentTime() + 500) / 25) | 0) + 1);
       try {
         return fn();
       } finally {
@@ -5448,7 +5736,7 @@ function ReactFiberScheduler(config) {
         (lowestPendingInteractiveExpirationTime = 0));
     },
     computeUniqueAsyncExpiration: function() {
-      var result = computeAsyncExpiration();
+      var result = 25 * ((((recalculateCurrentTime() + 500) / 25) | 0) + 1);
       result <= lastUniqueAsyncExpiration &&
         (result = lastUniqueAsyncExpiration + 1);
       return (lastUniqueAsyncExpiration = result);
@@ -5460,10 +5748,11 @@ function ReactFiberReconciler$1(config) {
     element,
     container,
     parentComponent,
+    currentTime,
     expirationTime,
     callback
   ) {
-    var current = container.current;
+    currentTime = container.current;
     if (parentComponent) {
       parentComponent = parentComponent._reactInternalFiber;
       var parentContext;
@@ -5495,15 +5784,16 @@ function ReactFiberReconciler$1(config) {
       ? (container.context = parentComponent)
       : (container.pendingContext = parentComponent);
     container = callback;
-    insertUpdateIntoFiber(current, {
+    insertUpdateIntoFiber(currentTime, {
       expirationTime: expirationTime,
       partialState: { element: element },
       callback: void 0 === container ? null : container,
       isReplace: !1,
       isForced: !1,
+      capturedValue: null,
       next: null
     });
-    scheduleWork(current, expirationTime);
+    scheduleWork(currentTime, expirationTime);
     return expirationTime;
   }
   function findHostInstance(fiber) {
@@ -5512,7 +5802,8 @@ function ReactFiberReconciler$1(config) {
   }
   var getPublicInstance = config.getPublicInstance;
   config = ReactFiberScheduler(config);
-  var computeExpirationForFiber = config.computeExpirationForFiber,
+  var recalculateCurrentTime = config.recalculateCurrentTime,
+    computeExpirationForFiber = config.computeExpirationForFiber,
     scheduleWork = config.scheduleWork;
   return {
     createContainer: function(containerInfo, isAsync, hydrate) {
@@ -5521,28 +5812,47 @@ function ReactFiberReconciler$1(config) {
         current: isAsync,
         containerInfo: containerInfo,
         pendingChildren: null,
-        remainingExpirationTime: 0,
-        isReadyForCommit: !1,
+        pendingCommitExpirationTime: 0,
         finishedWork: null,
         context: null,
         pendingContext: null,
         hydrate: hydrate,
+        remainingExpirationTime: 0,
         firstBatch: null,
         nextScheduledRoot: null
       };
       return (isAsync.stateNode = containerInfo);
     },
     updateContainer: function(element, container, parentComponent, callback) {
-      var expirationTime = computeExpirationForFiber(container.current);
+      var current = container.current,
+        currentTime = recalculateCurrentTime();
+      current = computeExpirationForFiber(current);
+      return updateContainerAtExpirationTime(
+        element,
+        container,
+        parentComponent,
+        currentTime,
+        current,
+        callback
+      );
+    },
+    updateContainerAtExpirationTime: function(
+      element,
+      container,
+      parentComponent,
+      expirationTime,
+      callback
+    ) {
+      var currentTime = recalculateCurrentTime();
       return updateContainerAtExpirationTime(
         element,
         container,
         parentComponent,
+        currentTime,
         expirationTime,
         callback
       );
     },
-    updateContainerAtExpirationTime: updateContainerAtExpirationTime,
     flushRoot: config.flushRoot,
     requestWork: config.requestWork,
     computeUniqueAsyncExpiration: config.computeUniqueAsyncExpiration,
@@ -5973,7 +6283,6 @@ var roots = new Map(),
         }
       },
       ReactNativeBridgeEventPlugin: ReactNativeBridgeEventPlugin,
-      ReactGlobalSharedState: ReactGlobalSharedState,
       ReactNativeComponentTree: ReactNativeComponentTree,
       ReactNativePropRegistry: ReactNativePropRegistry,
       TouchHistoryMath: TouchHistoryMath,
@@ -5998,7 +6307,7 @@ NativeRenderer.injectIntoDevTools({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.3.0-alpha.0",
+  version: "16.3.0-alpha.1",
   rendererPackageName: "react-native-renderer"
 });
 var ReactNativeRenderer$2 = Object.freeze({ default: ReactNativeRenderer }),

From c20e0f94feb42a71633212114b42c62494fd4ff0 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Wed, 28 Feb 2018 19:27:07 -0800
Subject: [PATCH 130/267] workaround android-only js module resolution issue

Summary: for some reason metro was not able to find js module with just .android.js variant. To workaround some build issue, added an empty .ios.js variant

Reviewed By: mdvacca

Differential Revision: D7115360

fbshipit-source-id: 40b95cf2efc4d3d599f39b88813469b6d78e7b48
---
 RNTester/js/ToolbarAndroidExample.ios.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 RNTester/js/ToolbarAndroidExample.ios.js

diff --git a/RNTester/js/ToolbarAndroidExample.ios.js b/RNTester/js/ToolbarAndroidExample.ios.js
new file mode 100644
index 00000000000000..b2553dc1b2bc9f
--- /dev/null
+++ b/RNTester/js/ToolbarAndroidExample.ios.js
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @providesModule ToolbarAndroidExample
+ */
+'use strict';
+
+// Not applicable to iOS.
+module.exports = require('View');

From 006b77f1ae7b02c74384983bdcd0ac2081969f9b Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Wed, 28 Feb 2018 19:41:29 -0800
Subject: [PATCH 131/267] iOS: pass fabric flag down to RCTRootView/RCTSurface
 for proper unmounting

Reviewed By: shergin

Differential Revision: D7119220

fbshipit-source-id: 7a822036e29e0d92f53a164acba2ab75e883b5c4
---
 React/Base/RCTRootContentView.h  | 10 +++++++++-
 React/Base/RCTRootContentView.m  | 26 ++++++++++++++++++++++----
 React/Base/RCTRootView.h         | 26 +++++++++++++++++++++++++-
 React/Base/RCTRootView.m         | 23 +++++++++++++++++++++--
 React/Base/Surface/RCTSurface.h  |  9 ++++++++-
 React/Base/Surface/RCTSurface.mm | 10 ++++++++++
 6 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/React/Base/RCTRootContentView.h b/React/Base/RCTRootContentView.h
index 28a0646cfed752..bd14cfb2005ea9 100644
--- a/React/Base/RCTRootContentView.h
+++ b/React/Base/RCTRootContentView.h
@@ -24,9 +24,17 @@
 @property (nonatomic, assign) BOOL passThroughTouches;
 @property (nonatomic, assign) RCTRootViewSizeFlexibility sizeFlexibility;
 
+@property (nonatomic, assign) BOOL fabric;
+
+- (instancetype)initWithFrame:(CGRect)frame
+                       bridge:(RCTBridge *)bridge
+                     reactTag:(NSNumber *)reactTag
+               sizeFlexiblity:(RCTRootViewSizeFlexibility)sizeFlexibility
+                       fabric:(BOOL)fabric NS_DESIGNATED_INITIALIZER;
+
 - (instancetype)initWithFrame:(CGRect)frame
                        bridge:(RCTBridge *)bridge
                      reactTag:(NSNumber *)reactTag
-               sizeFlexiblity:(RCTRootViewSizeFlexibility)sizeFlexibility NS_DESIGNATED_INITIALIZER;
+               sizeFlexiblity:(RCTRootViewSizeFlexibility)sizeFlexibility;
 
 @end
diff --git a/React/Base/RCTRootContentView.m b/React/Base/RCTRootContentView.m
index 9de3f78e095817..7782d06f02c3e4 100644
--- a/React/Base/RCTRootContentView.m
+++ b/React/Base/RCTRootContentView.m
@@ -21,8 +21,10 @@ - (instancetype)initWithFrame:(CGRect)frame
                        bridge:(RCTBridge *)bridge
                      reactTag:(NSNumber *)reactTag
                sizeFlexiblity:(RCTRootViewSizeFlexibility)sizeFlexibility
+                       fabric:(BOOL)fabric
 {
   if ((self = [super initWithFrame:frame])) {
+    _fabric = fabric;
     _bridge = bridge;
     self.reactTag = reactTag;
     _sizeFlexibility = sizeFlexibility;
@@ -33,6 +35,14 @@ - (instancetype)initWithFrame:(CGRect)frame
   return self;
 }
 
+- (instancetype)initWithFrame:(CGRect)frame
+                       bridge:(RCTBridge *)bridge
+                     reactTag:(NSNumber *)reactTag
+               sizeFlexiblity:(RCTRootViewSizeFlexibility)sizeFlexibility
+{
+  return [self initWithFrame:frame bridge:bridge reactTag:reactTag sizeFlexiblity:sizeFlexibility fabric:NO];
+}
+
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame:(CGRect)frame)
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder:(nonnull NSCoder *)aDecoder)
 
@@ -98,10 +108,18 @@ - (void)invalidate
   if (self.userInteractionEnabled) {
     self.userInteractionEnabled = NO;
     [(RCTRootView *)self.superview contentViewInvalidated];
-    [_bridge enqueueJSCall:@"AppRegistry"
-                    method:@"unmountApplicationComponentAtRootTag"
-                      args:@[self.reactTag]
-                completion:NULL];
+
+    if (_fabric) {
+      [_bridge enqueueJSCall:@"ReactFabric"
+                      method:@"unmountComponentAtNodeAndRemoveContainer"
+                        args:@[self.reactTag]
+                  completion:NULL];
+    } else {
+      [_bridge enqueueJSCall:@"AppRegistry"
+                      method:@"unmountApplicationComponentAtRootTag"
+                        args:@[self.reactTag]
+                  completion:NULL];
+    }
   }
 }
 
diff --git a/React/Base/RCTRootView.h b/React/Base/RCTRootView.h
index 9c04c822263625..41c21f672fdb0f 100644
--- a/React/Base/RCTRootView.h
+++ b/React/Base/RCTRootView.h
@@ -44,7 +44,16 @@ extern NSString *const RCTContentDidAppearNotification;
  */
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties NS_DESIGNATED_INITIALIZER;
+             initialProperties:(NSDictionary *)initialProperties
+                        fabric:(BOOL)fabric NS_DESIGNATED_INITIALIZER;
+
+/**
+ * - Convenience initializer -
+ * Initialize without using FabricUIManager.
+ */
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties;
 
 /**
  * - Convenience initializer -
@@ -58,6 +67,16 @@ extern NSString *const RCTContentDidAppearNotification;
                 initialProperties:(NSDictionary *)initialProperties
                     launchOptions:(NSDictionary *)launchOptions;
 
+/**
+ * - Convenience initializer -
+ */
+- (instancetype)initWithBundleURL:(NSURL *)bundleURL
+                       moduleName:(NSString *)moduleName
+                initialProperties:(NSDictionary *)initialProperties
+                    launchOptions:(NSDictionary *)launchOptions
+                           fabric:(BOOL)fabric;
+
+
 /**
  * The name of the JavaScript module to execute within the
  * specified scriptURL (required). Setting this will not have
@@ -146,6 +165,11 @@ extern NSString *const RCTContentDidAppearNotification;
 @property (nonatomic, assign) NSTimeInterval loadingViewFadeDelay;
 @property (nonatomic, assign) NSTimeInterval loadingViewFadeDuration;
 
+/**
+ * Indicates whether this view is managed by FabricUIManager or the traditional UIManager.
+ */
+@property (nonatomic, assign) BOOL fabric;
+
 @end
 
 @interface RCTRootView (Deprecated)
diff --git a/React/Base/RCTRootView.m b/React/Base/RCTRootView.m
index 204dd5871be16b..8fabbd6e84737d 100644
--- a/React/Base/RCTRootView.m
+++ b/React/Base/RCTRootView.m
@@ -52,6 +52,7 @@ @implementation RCTRootView
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties
+                        fabric:(BOOL)fabric
 {
   RCTAssertMainQueue();
   RCTAssert(bridge, @"A bridge instance is required to create an RCTRootView");
@@ -65,6 +66,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   if (self = [super initWithFrame:CGRectZero]) {
     self.backgroundColor = [UIColor whiteColor];
 
+    _fabric = fabric;
     _bridge = bridge;
     _moduleName = moduleName;
     _appProperties = [initialProperties copy];
@@ -106,16 +108,32 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+{
+  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:NO];
+}
+
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL
                        moduleName:(NSString *)moduleName
                 initialProperties:(NSDictionary *)initialProperties
                     launchOptions:(NSDictionary *)launchOptions
+                           fabric:(BOOL)fabric
 {
   RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:bundleURL
                                             moduleProvider:nil
                                              launchOptions:launchOptions];
 
-  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
+  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:fabric];
+}
+
+- (instancetype)initWithBundleURL:(NSURL *)bundleURL
+                       moduleName:(NSString *)moduleName
+                initialProperties:(NSDictionary *)initialProperties
+                    launchOptions:(NSDictionary *)launchOptions
+{
+  return [self initWithBundleURL:bundleURL moduleName:moduleName initialProperties:initialProperties launchOptions:launchOptions fabric:NO];
 }
 
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
@@ -271,7 +289,8 @@ - (void)bundleFinishedLoading:(RCTBridge *)bridge
   _contentView = [[RCTRootContentView alloc] initWithFrame:self.bounds
                                                     bridge:bridge
                                                   reactTag:self.reactTag
-                                            sizeFlexiblity:_sizeFlexibility];
+                                            sizeFlexiblity:_sizeFlexibility
+                                                    fabric:self.fabric];
   [self runApplication:bridge];
 
   _contentView.passThroughTouches = _passThroughTouches;
diff --git a/React/Base/Surface/RCTSurface.h b/React/Base/Surface/RCTSurface.h
index 66f5cabbc535c2..01d4896f9e30bd 100644
--- a/React/Base/Surface/RCTSurface.h
+++ b/React/Base/Surface/RCTSurface.h
@@ -42,9 +42,16 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (atomic, copy, readwrite) NSDictionary *properties;
 
+@property (nonatomic, assign, readonly) BOOL fabric;
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+                        fabric:(BOOL)fabric NS_DESIGNATED_INITIALIZER;
+
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties NS_DESIGNATED_INITIALIZER;
+             initialProperties:(NSDictionary *)initialProperties;
 
 #pragma mark - Dealing with UIView representation, the Main thread only access
 
diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
index 3581ac1e7f0520..eac4985e04c3d1 100644
--- a/React/Base/Surface/RCTSurface.mm
+++ b/React/Base/Surface/RCTSurface.mm
@@ -57,13 +57,16 @@ @implementation RCTSurface {
   atomic_bool _waitingForMountingStageOnMainQueue;
 }
 
+
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties
+                        fabric:(BOOL)fabric
 {
   RCTAssert(bridge.valid, @"Valid bridge is required to instanciate `RCTSurface`.");
 
   if (self = [super init]) {
+    _fabric = fabric;
     _bridge = bridge;
     _batchedBridge = [_bridge batchedBridge] ?: _bridge;
     _moduleName = moduleName;
@@ -102,6 +105,13 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+{
+  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:NO];
+}
+
 - (void)dealloc
 {
   [self _stop];

From af9d6479e541bd163e2189fabbcde78613c7a751 Mon Sep 17 00:00:00 2001
From: Pritesh Nandgaonkar <prit91@fb.com>
Date: Thu, 1 Mar 2018 04:00:28 -0800
Subject: [PATCH 132/267] Make two separate yoga targets for QE

Reviewed By: emilsjolander

Differential Revision: D7059278

fbshipit-source-id: dd11b018edc8ea930d5eba09c6c01e349bb8b63c
---
 .../src/main/java/com/facebook/yoga/YogaConfig.java         | 6 +++++-
 .../src/main/java/com/facebook/yoga/YogaConstants.java      | 2 ++
 ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java  | 6 +++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
index 3741583b96a2bb..e68c512140f015 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfig.java
@@ -16,7 +16,11 @@ public class YogaConfig {
   public static int SPACING_TYPE = 1;
 
   static {
-    SoLoader.loadLibrary("yoga");
+    if (YogaConstants.shouldUseFastMath) {
+      SoLoader.loadLibrary("yogafastmath");
+    } else {
+      SoLoader.loadLibrary("yoga");
+    }
   }
 
   long mNativePointer;
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
index e11c1044daf8f5..cb9bc8ca5a5a12 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
@@ -11,6 +11,8 @@ public class YogaConstants {
 
   public static final float UNDEFINED = Float.NaN;
 
+  public static boolean shouldUseFastMath = false;
+
   public static boolean isUndefined(float value) {
     return Float.compare(value, UNDEFINED) == 0;
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
index 1ba81249c6f950..c1c659335b5df4 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
@@ -17,7 +17,11 @@
 public class YogaNode implements Cloneable {
 
   static {
-    SoLoader.loadLibrary("yoga");
+    if (YogaConstants.shouldUseFastMath) {
+      SoLoader.loadLibrary("yogafastmath");
+    } else {
+      SoLoader.loadLibrary("yoga");
+    }
   }
 
   /**

From d174ab8a7af1ca75dd6538b96a0a1f6529612917 Mon Sep 17 00:00:00 2001
From: Pritesh Nandgaonkar <prit91@fb.com>
Date: Thu, 1 Mar 2018 04:00:35 -0800
Subject: [PATCH 133/267] Change NaN with large number

Reviewed By: emilsjolander

Differential Revision: D6969537

fbshipit-source-id: bdc09eaf703e0d313ca65c25a4fb44c99203d9bf
---
 .../java/com/facebook/yoga/YogaConstants.java |  21 +-
 .../main/java/com/facebook/yoga/YogaNode.java |  10 +-
 .../jni/first-party/yogajni/jni/YGJNI.cpp     |  16 +-
 ReactCommon/yoga/yoga/Utils.cpp               |  24 ++-
 ReactCommon/yoga/yoga/Utils.h                 |  34 ++-
 ReactCommon/yoga/yoga/YGLayout.cpp            |   9 +-
 ReactCommon/yoga/yoga/YGNode.cpp              |  41 ++--
 ReactCommon/yoga/yoga/YGStyle.cpp             |  10 +-
 ReactCommon/yoga/yoga/Yoga-internal.h         |  15 +-
 ReactCommon/yoga/yoga/Yoga.cpp                | 194 +++++++++++-------
 ReactCommon/yoga/yoga/Yoga.h                  |  15 +-
 11 files changed, 262 insertions(+), 127 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
index cb9bc8ca5a5a12..f235cfdeef6a7c 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaConstants.java
@@ -9,12 +9,29 @@
 
 public class YogaConstants {
 
-  public static final float UNDEFINED = Float.NaN;
+  /**
+   * Large positive number signifies that the property(float) is undefined. Earlier we used to have
+   * YGundefined as NAN, but the downside of this is that we can't use -ffast-math compiler flag as
+   * it assumes all floating-point calculation involve and result into finite numbers. For more
+   * information regarding -ffast-math compiler flag in clang, have a look at
+   * https://clang.llvm.org/docs/UsersManual.html#cmdoption-ffast-math
+   */
+  public static final float UNDEFINED = (float) (10E20);
 
   public static boolean shouldUseFastMath = false;
 
   public static boolean isUndefined(float value) {
-    return Float.compare(value, UNDEFINED) == 0;
+    // Value of a float in the case of it being not defined is 10.1E20. Earlier it used to be NAN,
+    // the benefit of which
+    // was that if NAN is involved in any mathematical expression the result was NAN. But since we
+    // want to have `-ffast-math`
+    // flag being used by compiler which assumes that the floating point values are not NAN and Inf,
+    // we represent YGUndefined as 10.1E20.
+    // But now if YGUndefined is involved in any mathematical operations this value(10.1E20) would
+    // change.
+    // So the following check makes sure that if the value is outside a range (-10E8, 10E8) then it
+    // is undefined.
+    return (Float.compare(value, (float) 10E8) >= 0 || Float.compare(value, (float) -10E8) <= 0);
   }
 
   public static boolean isUndefined(YogaValue value) {
diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
index c1c659335b5df4..df5fae91712879 100644
--- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java
@@ -652,11 +652,11 @@ public final long measure(float width, int widthMode, float height, int heightMo
     }
 
     return mMeasureFunction.measure(
-          this,
-          width,
-          YogaMeasureMode.fromInt(widthMode),
-          height,
-          YogaMeasureMode.fromInt(heightMode));
+        this,
+        width,
+        YogaMeasureMode.fromInt(widthMode),
+        height,
+        YogaMeasureMode.fromInt(heightMode));
   }
 
   private native void jni_YGNodeSetHasBaselineFunc(long nativePointer, boolean hasMeasureFunc);
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
index eb9d8120dc3dc4..46d73b44b4d7ff 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp
@@ -337,13 +337,15 @@ struct JYogaValue : public JavaClass<JYogaValue> {
   }
 };
 
-#define YG_NODE_JNI_STYLE_PROP(javatype, type, name)                                       \
-  javatype jni_YGNodeStyleGet##name(alias_ref<jobject>, jlong nativePointer) {             \
-    return (javatype) YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer));               \
-  }                                                                                        \
-                                                                                           \
-  void jni_YGNodeStyleSet##name(alias_ref<jobject>, jlong nativePointer, javatype value) { \
-    YGNodeStyleSet##name(_jlong2YGNodeRef(nativePointer), static_cast<type>(value));       \
+#define YG_NODE_JNI_STYLE_PROP(javatype, type, name)                           \
+  javatype jni_YGNodeStyleGet##name(alias_ref<jobject>, jlong nativePointer) { \
+    return (javatype)YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer));    \
+  }                                                                            \
+                                                                               \
+  void jni_YGNodeStyleSet##name(                                               \
+      alias_ref<jobject>, jlong nativePointer, javatype value) {               \
+    YGNodeStyleSet##name(                                                      \
+        _jlong2YGNodeRef(nativePointer), static_cast<type>(value));            \
   }
 
 #define YG_NODE_JNI_STYLE_UNIT_PROP(name)                                                         \
diff --git a/ReactCommon/yoga/yoga/Utils.cpp b/ReactCommon/yoga/yoga/Utils.cpp
index 110c7f0d7022cb..412845723b22b1 100644
--- a/ReactCommon/yoga/yoga/Utils.cpp
+++ b/ReactCommon/yoga/yoga/Utils.cpp
@@ -15,15 +15,37 @@ YGFlexDirection YGFlexDirectionCross(
       : YGFlexDirectionColumn;
 }
 
+float YGFloatMax(const float a, const float b) {
+  if (!YGFloatIsUndefined(a) && !YGFloatIsUndefined(b)) {
+    return fmaxf(a, b);
+  }
+  return YGFloatIsUndefined(a) ? b : a;
+}
+
+float YGFloatMin(const float a, const float b) {
+  if (!YGFloatIsUndefined(a) && !YGFloatIsUndefined(b)) {
+    return fminf(a, b);
+  }
+
+  return YGFloatIsUndefined(a) ? b : a;
+}
+
 bool YGValueEqual(const YGValue a, const YGValue b) {
   if (a.unit != b.unit) {
     return false;
   }
 
   if (a.unit == YGUnitUndefined ||
-      (std::isnan(a.value) && std::isnan(b.value))) {
+      (YGFloatIsUndefined(a.value) && YGFloatIsUndefined(b.value))) {
     return true;
   }
 
   return fabs(a.value - b.value) < 0.0001f;
 }
+
+bool YGFloatsEqual(const float a, const float b) {
+  if (!YGFloatIsUndefined(a) && !YGFloatIsUndefined(b)) {
+    return fabs(a - b) < 0.0001f;
+  }
+  return YGFloatIsUndefined(a) && YGFloatIsUndefined(b);
+}
diff --git a/ReactCommon/yoga/yoga/Utils.h b/ReactCommon/yoga/yoga/Utils.h
index db52acd672c0a2..6ebeb86fc6b2b5 100644
--- a/ReactCommon/yoga/yoga/Utils.h
+++ b/ReactCommon/yoga/yoga/Utils.h
@@ -54,6 +54,38 @@ struct YGCollectFlexItemsRowValues {
 
 bool YGValueEqual(const YGValue a, const YGValue b);
 
+// This custom float equality function returns true if either absolute
+// difference between two floats is less than 0.0001f or both are undefined.
+bool YGFloatsEqual(const float a, const float b);
+
+// We need custom max function, since we want that, if one argument is
+// YGUndefined then the max funtion should return the other argument as the max
+// value. We wouldn't have needed a custom max function if YGUndefined was NAN
+// as fmax has the same behaviour, but with NAN we cannot use `-ffast-math`
+// compiler flag.
+float YGFloatMax(const float a, const float b);
+
+// We need custom min function, since we want that, if one argument is
+// YGUndefined then the min funtion should return the other argument as the min
+// value. We wouldn't have needed a custom min function if YGUndefined was NAN
+// as fmin has the same behaviour, but with NAN we cannot use `-ffast-math`
+// compiler flag.
+float YGFloatMin(const float a, const float b);
+
+// This custom float comparision function compares the array of float with
+// YGFloatsEqual, as the default float comparision operator will not work(Look
+// at the comments of YGFloatsEqual function).
+template <std::size_t size>
+bool YGFloatArrayEqual(
+    const std::array<float, size>& val1,
+    const std::array<float, size>& val2) {
+  bool areEqual = true;
+  for (std::size_t i = 0; i < size && areEqual; ++i) {
+    areEqual = YGFloatsEqual(val1[i], val2[i]);
+  }
+  return areEqual;
+}
+
 YGFlexDirection YGFlexDirectionCross(
     const YGFlexDirection flexDirection,
     const YGDirection direction);
@@ -71,7 +103,7 @@ inline float YGResolveValue(const YGValue value, const float parentSize) {
     case YGUnitPoint:
       return value.value;
     case YGUnitPercent:
-      return value.value * parentSize / 100.0f;
+      return value.value * parentSize * 0.01;
   }
   return YGUndefined;
 }
diff --git a/ReactCommon/yoga/yoga/YGLayout.cpp b/ReactCommon/yoga/yoga/YGLayout.cpp
index 66348fc29c055c..208a6fe3f5c274 100644
--- a/ReactCommon/yoga/yoga/YGLayout.cpp
+++ b/ReactCommon/yoga/yoga/YGLayout.cpp
@@ -7,6 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 #include "YGLayout.h"
+#include "Utils.h"
 
 const std::array<float, 2> kYGDefaultDimensionValues = {
     {YGUndefined, YGUndefined}};
@@ -31,9 +32,11 @@ YGLayout::YGLayout()
       doesLegacyStretchFlagAffectsLayout(false) {}
 
 bool YGLayout::operator==(YGLayout layout) const {
-  bool isEqual = position == layout.position &&
-      dimensions == layout.dimensions && margin == layout.margin &&
-      border == layout.border && padding == layout.padding &&
+  bool isEqual = YGFloatArrayEqual(position, layout.position) &&
+      YGFloatArrayEqual(dimensions, layout.dimensions) &&
+      YGFloatArrayEqual(margin, layout.margin) &&
+      YGFloatArrayEqual(border, layout.border) &&
+      YGFloatArrayEqual(padding, layout.padding) &&
       direction == layout.direction && hadOverflow == layout.hadOverflow &&
       lastParentDirection == layout.lastParentDirection &&
       nextCachedMeasurementsIndex == layout.nextCachedMeasurementsIndex &&
diff --git a/ReactCommon/yoga/yoga/YGNode.cpp b/ReactCommon/yoga/yoga/YGNode.cpp
index 89be5bfe3bb5e0..ae7fce26e8ce3a 100644
--- a/ReactCommon/yoga/yoga/YGNode.cpp
+++ b/ReactCommon/yoga/yoga/YGNode.cpp
@@ -624,26 +624,28 @@ bool YGNode::isNodeFlexible() {
 float YGNode::getLeadingBorder(const YGFlexDirection axis) {
   if (YGFlexDirectionIsRow(axis) &&
       style_.border[YGEdgeStart].unit != YGUnitUndefined &&
+      !YGFloatIsUndefined(style_.border[YGEdgeStart].value) &&
       style_.border[YGEdgeStart].value >= 0.0f) {
     return style_.border[YGEdgeStart].value;
   }
 
-  return fmaxf(
-      YGComputedEdgeValue(style_.border, leading[axis], &YGValueZero)->value,
-      0.0f);
+  float computedEdgeValue =
+      YGComputedEdgeValue(style_.border, leading[axis], &YGValueZero)->value;
+  return YGFloatMax(computedEdgeValue, 0.0f);
 }
 
 float YGNode::getTrailingBorder(const YGFlexDirection flexDirection) {
   if (YGFlexDirectionIsRow(flexDirection) &&
       style_.border[YGEdgeEnd].unit != YGUnitUndefined &&
+      !YGFloatIsUndefined(style_.border[YGEdgeEnd].value) &&
       style_.border[YGEdgeEnd].value >= 0.0f) {
     return style_.border[YGEdgeEnd].value;
   }
 
-  return fmaxf(
+  float computedEdgeValue =
       YGComputedEdgeValue(style_.border, trailing[flexDirection], &YGValueZero)
-          ->value,
-      0.0f);
+          ->value;
+  return YGFloatMax(computedEdgeValue, 0.0f);
 }
 
 float YGNode::getLeadingPadding(
@@ -651,14 +653,16 @@ float YGNode::getLeadingPadding(
     const float widthSize) {
   if (YGFlexDirectionIsRow(axis) &&
       style_.padding[YGEdgeStart].unit != YGUnitUndefined &&
-      YGResolveValue(style_.padding[YGEdgeStart], widthSize) >= 0.0f) {
+      !YGFloatIsUndefined(
+          YGResolveValue(style_.padding[YGEdgeStart], widthSize)) &&
+      YGResolveValue(style_.padding[YGEdgeStart], widthSize) > 0.0f) {
     return YGResolveValue(style_.padding[YGEdgeStart], widthSize);
   }
-  return fmaxf(
-      YGResolveValue(
-          *YGComputedEdgeValue(style_.padding, leading[axis], &YGValueZero),
-          widthSize),
-      0.0f);
+
+  float resolvedValue = YGResolveValue(
+      *YGComputedEdgeValue(style_.padding, leading[axis], &YGValueZero),
+      widthSize);
+  return YGFloatMax(resolvedValue, 0.0f);
 }
 
 float YGNode::getTrailingPadding(
@@ -666,14 +670,17 @@ float YGNode::getTrailingPadding(
     const float widthSize) {
   if (YGFlexDirectionIsRow(axis) &&
       style_.padding[YGEdgeEnd].unit != YGUnitUndefined &&
+      !YGFloatIsUndefined(
+          YGResolveValue(style_.padding[YGEdgeEnd], widthSize)) &&
       YGResolveValue(style_.padding[YGEdgeEnd], widthSize) >= 0.0f) {
     return YGResolveValue(style_.padding[YGEdgeEnd], widthSize);
   }
-  return fmaxf(
-      YGResolveValue(
-          *YGComputedEdgeValue(style_.padding, trailing[axis], &YGValueZero),
-          widthSize),
-      0.0f);
+
+  float resolvedValue = YGResolveValue(
+      *YGComputedEdgeValue(style_.padding, trailing[axis], &YGValueZero),
+      widthSize);
+
+  return YGFloatMax(resolvedValue, 0.0f);
 }
 
 float YGNode::getLeadingPaddingAndBorder(
diff --git a/ReactCommon/yoga/yoga/YGStyle.cpp b/ReactCommon/yoga/yoga/YGStyle.cpp
index a73cb3ce6dd6ad..56b5a1e69e014b 100644
--- a/ReactCommon/yoga/yoga/YGStyle.cpp
+++ b/ReactCommon/yoga/yoga/YGStyle.cpp
@@ -70,21 +70,23 @@ bool YGStyle::operator==(const YGStyle& style) {
       YGValueArrayEqual(minDimensions, style.minDimensions) &&
       YGValueArrayEqual(maxDimensions, style.maxDimensions);
 
-  if (!(std::isnan(flex) && std::isnan(style.flex))) {
+  if (!(YGFloatIsUndefined(flex) && YGFloatIsUndefined(style.flex))) {
     areNonFloatValuesEqual = areNonFloatValuesEqual && flex == style.flex;
   }
 
-  if (!(std::isnan(flexGrow) && std::isnan(style.flexGrow))) {
+  if (!(YGFloatIsUndefined(flexGrow) && YGFloatIsUndefined(style.flexGrow))) {
     areNonFloatValuesEqual =
         areNonFloatValuesEqual && flexGrow == style.flexGrow;
   }
 
-  if (!(std::isnan(flexShrink) && std::isnan(style.flexShrink))) {
+  if (!(YGFloatIsUndefined(flexShrink) &&
+        YGFloatIsUndefined(style.flexShrink))) {
     areNonFloatValuesEqual =
         areNonFloatValuesEqual && flexShrink == style.flexShrink;
   }
 
-  if (!(std::isnan(aspectRatio) && std::isnan(style.aspectRatio))) {
+  if (!(YGFloatIsUndefined(aspectRatio) &&
+        YGFloatIsUndefined(style.aspectRatio))) {
     areNonFloatValuesEqual =
         areNonFloatValuesEqual && aspectRatio == style.aspectRatio;
   }
diff --git a/ReactCommon/yoga/yoga/Yoga-internal.h b/ReactCommon/yoga/yoga/Yoga-internal.h
index 21b14b239fc870..56078d6c3f06bc 100644
--- a/ReactCommon/yoga/yoga/Yoga-internal.h
+++ b/ReactCommon/yoga/yoga/Yoga-internal.h
@@ -62,19 +62,20 @@ struct YGCachedMeasurement {
     bool isEqual = widthMeasureMode == measurement.widthMeasureMode &&
         heightMeasureMode == measurement.heightMeasureMode;
 
-    if (!std::isnan(availableWidth) ||
-        !std::isnan(measurement.availableWidth)) {
+    if (!YGFloatIsUndefined(availableWidth) ||
+        !YGFloatIsUndefined(measurement.availableWidth)) {
       isEqual = isEqual && availableWidth == measurement.availableWidth;
     }
-    if (!std::isnan(availableHeight) ||
-        !std::isnan(measurement.availableHeight)) {
+    if (!YGFloatIsUndefined(availableHeight) ||
+        !YGFloatIsUndefined(measurement.availableHeight)) {
       isEqual = isEqual && availableHeight == measurement.availableHeight;
     }
-    if (!std::isnan(computedWidth) || !std::isnan(measurement.computedWidth)) {
+    if (!YGFloatIsUndefined(computedWidth) ||
+        !YGFloatIsUndefined(measurement.computedWidth)) {
       isEqual = isEqual && computedWidth == measurement.computedWidth;
     }
-    if (!std::isnan(computedHeight) ||
-        !std::isnan(measurement.computedHeight)) {
+    if (!YGFloatIsUndefined(computedHeight) ||
+        !YGFloatIsUndefined(measurement.computedHeight)) {
       isEqual = isEqual && computedHeight == measurement.computedHeight;
     }
 
diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp
index ff57e99f36a215..41f89e877e4caa 100644
--- a/ReactCommon/yoga/yoga/Yoga.cpp
+++ b/ReactCommon/yoga/yoga/Yoga.cpp
@@ -19,7 +19,10 @@
 /* define fmaxf if < VC12 */
 #if _MSC_VER < 1800
 __forceinline const float fmaxf(const float a, const float b) {
-  return (a > b) ? a : b;
+  if (!YGFloatIsUndefined(a) && !YGFloatIsUndefined(b)) {
+    return (a > b) ? a : b;
+  }
+  return YGFloatIsUndefined(a) ? b : a;
 }
 #endif
 #endif
@@ -118,7 +121,15 @@ static int YGDefaultLog(const YGConfigRef config,
 #endif
 
 bool YGFloatIsUndefined(const float value) {
-  return std::isnan(value);
+  // Value of a float in the case of it being not defined is 10.1E20. Earlier
+  // it used to be NAN, the benefit of which was that if NAN is involved in any
+  // mathematical expression the result was NAN. But since we want to have
+  // `-ffast-math` flag being used by compiler which assumes that the floating
+  // point values are not NAN and Inf, we represent YGUndefined as 10.1E20. But
+  // now if YGUndefined is involved in any mathematical operations this
+  // value(10.1E20) would change. So the following check makes sure that if the
+  // value is outside a range (-10E8, 10E8) then it is undefined.
+  return value >= 10E8 || value <= -10E8;
 }
 
 const YGValue* YGComputedEdgeValue(
@@ -788,13 +799,6 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
                           const char *reason,
                           const YGConfigRef config);
 
-bool YGFloatsEqual(const float a, const float b) {
-  if (YGFloatIsUndefined(a)) {
-    return YGFloatIsUndefined(b);
-  }
-  return fabs(a - b) < 0.0001f;
-}
-
 static void YGNodePrintInternal(const YGNodeRef node,
                                 const YGPrintOptions options) {
   std::string str;
@@ -909,12 +913,15 @@ static inline float YGNodeDimWithMargin(const YGNodeRef node,
 static inline bool YGNodeIsStyleDimDefined(const YGNodeRef node,
                                            const YGFlexDirection axis,
                                            const float parentSize) {
+  bool isUndefined =
+      YGFloatIsUndefined(node->getResolvedDimension(dim[axis]).value);
   return !(
       node->getResolvedDimension(dim[axis]).unit == YGUnitAuto ||
       node->getResolvedDimension(dim[axis]).unit == YGUnitUndefined ||
       (node->getResolvedDimension(dim[axis]).unit == YGUnitPoint &&
-       node->getResolvedDimension(dim[axis]).value < 0.0f) ||
+       !isUndefined && node->getResolvedDimension(dim[axis]).value < 0.0f) ||
       (node->getResolvedDimension(dim[axis]).unit == YGUnitPercent &&
+       !isUndefined &&
        (node->getResolvedDimension(dim[axis]).value < 0.0f ||
         YGFloatIsUndefined(parentSize))));
 }
@@ -964,8 +971,9 @@ static inline float YGNodeBoundAxis(const YGNodeRef node,
                                     const float value,
                                     const float axisSize,
                                     const float widthSize) {
-  return fmaxf(YGNodeBoundAxisWithinMinAndMax(node, axis, value, axisSize),
-               YGNodePaddingAndBorderForAxis(node, axis, widthSize));
+  return YGFloatMax(
+      YGNodeBoundAxisWithinMinAndMax(node, axis, value, axisSize),
+      YGNodePaddingAndBorderForAxis(node, axis, widthSize));
 }
 
 static void YGNodeSetChildTrailingPosition(const YGNodeRef node,
@@ -1035,19 +1043,19 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
              child->getConfig(), YGExperimentalFeatureWebFlexBasis) &&
          child->getLayout().computedFlexBasisGeneration !=
              gCurrentGenerationCount)) {
-      child->setLayoutComputedFlexBasis(fmaxf(
+      child->setLayoutComputedFlexBasis(YGFloatMax(
           resolvedFlexBasis,
           YGNodePaddingAndBorderForAxis(child, mainAxis, parentWidth)));
     }
   } else if (isMainAxisRow && isRowStyleDimDefined) {
     // The width is definite, so use that as the flex basis.
-    child->setLayoutComputedFlexBasis(fmaxf(
+    child->setLayoutComputedFlexBasis(YGFloatMax(
         YGResolveValue(
             child->getResolvedDimension(YGDimensionWidth), parentWidth),
         YGNodePaddingAndBorderForAxis(child, YGFlexDirectionRow, parentWidth)));
   } else if (!isMainAxisRow && isColumnStyleDimDefined) {
     // The height is definite, so use that as the flex basis.
-    child->setLayoutComputedFlexBasis(fmaxf(
+    child->setLayoutComputedFlexBasis(YGFloatMax(
         YGResolveValue(
             child->getResolvedDimension(YGDimensionHeight), parentHeight),
         YGNodePaddingAndBorderForAxis(
@@ -1162,7 +1170,7 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
                          "measure",
                          config);
 
-    child->setLayoutComputedFlexBasis(fmaxf(
+    child->setLayoutComputedFlexBasis(YGFloatMax(
         child->getLayout().measuredDimensions[dim[mainAxis]],
         YGNodePaddingAndBorderForAxis(child, mainAxis, parentWidth)));
   }
@@ -1252,7 +1260,8 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
     // If the size of the parent is defined then try to constrain the absolute child to that size
     // as well. This allows text within the absolute child to wrap to the size of its parent.
     // This is the same behavior as many browsers implement.
-    if (!isMainAxisRow && YGFloatIsUndefined(childWidth) && widthMode != YGMeasureModeUndefined &&
+    if (!isMainAxisRow && YGFloatIsUndefined(childWidth) &&
+        widthMode != YGMeasureModeUndefined && !YGFloatIsUndefined(width) &&
         width > 0) {
       childWidth = width;
       childWidthMeasureMode = YGMeasureModeAtMost;
@@ -1368,10 +1377,10 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(const YGNodeRef node,
   // We want to make sure we don't call measure with negative size
   const float innerWidth = YGFloatIsUndefined(availableWidth)
       ? availableWidth
-      : fmaxf(0, availableWidth - marginAxisRow - paddingAndBorderAxisRow);
+      : YGFloatMax(0, availableWidth - marginAxisRow - paddingAndBorderAxisRow);
   const float innerHeight = YGFloatIsUndefined(availableHeight)
       ? availableHeight
-      : fmaxf(
+      : YGFloatMax(
             0, availableHeight - marginAxisColumn - paddingAndBorderAxisColumn);
 
   if (widthMeasureMode == YGMeasureModeExactly &&
@@ -1474,9 +1483,12 @@ static bool YGNodeFixedSizeSetMeasuredDimensions(const YGNodeRef node,
                                                  const YGMeasureMode heightMeasureMode,
                                                  const float parentWidth,
                                                  const float parentHeight) {
-  if ((widthMeasureMode == YGMeasureModeAtMost && availableWidth <= 0.0f) ||
-      (heightMeasureMode == YGMeasureModeAtMost && availableHeight <= 0.0f) ||
-      (widthMeasureMode == YGMeasureModeExactly && heightMeasureMode == YGMeasureModeExactly)) {
+  if ((!YGFloatIsUndefined(availableWidth) &&
+       widthMeasureMode == YGMeasureModeAtMost && availableWidth <= 0.0f) ||
+      (!YGFloatIsUndefined(availableHeight) &&
+       heightMeasureMode == YGMeasureModeAtMost && availableHeight <= 0.0f) ||
+      (widthMeasureMode == YGMeasureModeExactly &&
+       heightMeasureMode == YGMeasureModeExactly)) {
     const float marginAxisColumn =
         node->getMarginForAxis(YGFlexDirectionColumn, parentWidth);
     const float marginAxisRow =
@@ -1545,13 +1557,16 @@ static float YGNodeCalculateAvailableInnerDim(
     // We want to make sure our available height does not violate min and max
     // constraints
     const float minInnerDim =
-        YGResolveValue(node->getStyle().minDimensions[dimension], parentDim) -
-        paddingAndBorder;
+        YGFloatIsUndefined(YGResolveValue(
+            node->getStyle().minDimensions[dimension], parentDim))
+        ? 0.0f
+        : YGResolveValue(node->getStyle().minDimensions[dimension], parentDim) -
+            paddingAndBorder;
     const float maxInnerDim =
         YGResolveValue(node->getStyle().maxDimensions[dimension], parentDim) -
         paddingAndBorder;
     availableInnerDim =
-        fmaxf(fminf(availableInnerDim, maxInnerDim), minInnerDim);
+        YGFloatMax(YGFloatMin(availableInnerDim, maxInnerDim), minInnerDim);
   }
 
   return availableInnerDim;
@@ -1752,14 +1767,17 @@ static float YGDistributeFreeSpaceSecondPass(
         mainAxisParentSize);
     float updatedMainSize = childFlexBasis;
 
-    if (collectedFlexItemsValues.remainingFreeSpace < 0) {
+    if (!YGFloatIsUndefined(collectedFlexItemsValues.remainingFreeSpace) &&
+        collectedFlexItemsValues.remainingFreeSpace < 0) {
       flexShrinkScaledFactor =
           -currentRelativeChild->resolveFlexShrink() * childFlexBasis;
       // Is this child able to shrink?
       if (flexShrinkScaledFactor != 0) {
         float childSize;
 
-        if (collectedFlexItemsValues.totalFlexShrinkScaledFactors == 0) {
+        if (!YGFloatIsUndefined(
+                collectedFlexItemsValues.totalFlexShrinkScaledFactors) &&
+            collectedFlexItemsValues.totalFlexShrinkScaledFactors == 0) {
           childSize = childFlexBasis + flexShrinkScaledFactor;
         } else {
           childSize = childFlexBasis +
@@ -1775,11 +1793,13 @@ static float YGDistributeFreeSpaceSecondPass(
             availableInnerMainDim,
             availableInnerWidth);
       }
-    } else if (collectedFlexItemsValues.remainingFreeSpace > 0) {
+    } else if (
+        !YGFloatIsUndefined(collectedFlexItemsValues.remainingFreeSpace) &&
+        collectedFlexItemsValues.remainingFreeSpace > 0) {
       flexGrowFactor = currentRelativeChild->resolveFlexGrow();
 
       // Is this child able to grow?
-      if (flexGrowFactor != 0) {
+      if (!YGFloatIsUndefined(flexGrowFactor) && flexGrowFactor != 0) {
         updatedMainSize = YGNodeBoundAxis(
             currentRelativeChild,
             mainAxis,
@@ -1926,7 +1946,8 @@ static void YGDistributeFreeSpaceFirstPass(
           -currentRelativeChild->resolveFlexShrink() * childFlexBasis;
 
       // Is this child able to shrink?
-      if (flexShrinkScaledFactor != 0) {
+      if (!YGFloatIsUndefined(flexShrinkScaledFactor) &&
+          flexShrinkScaledFactor != 0) {
         baseMainSize = childFlexBasis +
             collectedFlexItemsValues.remainingFreeSpace /
                 collectedFlexItemsValues.totalFlexShrinkScaledFactors *
@@ -1937,7 +1958,9 @@ static void YGDistributeFreeSpaceFirstPass(
             baseMainSize,
             availableInnerMainDim,
             availableInnerWidth);
-        if (baseMainSize != boundMainSize) {
+        if (!YGFloatIsUndefined(baseMainSize) &&
+            !YGFloatIsUndefined(boundMainSize) &&
+            baseMainSize != boundMainSize) {
           // By excluding this item's size and flex factor from remaining,
           // this item's
           // min/max constraints should also trigger in the second pass
@@ -1949,11 +1972,13 @@ static void YGDistributeFreeSpaceFirstPass(
               flexShrinkScaledFactor;
         }
       }
-    } else if (collectedFlexItemsValues.remainingFreeSpace > 0) {
+    } else if (
+        !YGFloatIsUndefined(collectedFlexItemsValues.remainingFreeSpace) &&
+        collectedFlexItemsValues.remainingFreeSpace > 0) {
       flexGrowFactor = currentRelativeChild->resolveFlexGrow();
 
       // Is this child able to grow?
-      if (flexGrowFactor != 0) {
+      if (!YGFloatIsUndefined(flexGrowFactor) && flexGrowFactor != 0) {
         baseMainSize = childFlexBasis +
             collectedFlexItemsValues.remainingFreeSpace /
                 collectedFlexItemsValues.totalFlexGrowFactors * flexGrowFactor;
@@ -1964,7 +1989,9 @@ static void YGDistributeFreeSpaceFirstPass(
             availableInnerMainDim,
             availableInnerWidth);
 
-        if (baseMainSize != boundMainSize) {
+        if (!YGFloatIsUndefined(baseMainSize) &&
+            !YGFloatIsUndefined(boundMainSize) &&
+            baseMainSize != boundMainSize) {
           // By excluding this item's size and flex factor from remaining,
           // this item's
           // min/max constraints should also trigger in the second pass
@@ -2069,9 +2096,9 @@ static void YGJustifyMainAxis(
   if (measureModeMainDim == YGMeasureModeAtMost &&
       collectedFlexItemsValues.remainingFreeSpace > 0) {
     if (style.minDimensions[dim[mainAxis]].unit != YGUnitUndefined &&
-        YGResolveValue(
-            style.minDimensions[dim[mainAxis]], mainAxisParentSize) >= 0) {
-      collectedFlexItemsValues.remainingFreeSpace = fmaxf(
+        !YGFloatIsUndefined(YGResolveValue(
+            style.minDimensions[dim[mainAxis]], mainAxisParentSize))) {
+      collectedFlexItemsValues.remainingFreeSpace = YGFloatMax(
           0,
           YGResolveValue(
               style.minDimensions[dim[mainAxis]], mainAxisParentSize) -
@@ -2115,7 +2142,7 @@ static void YGJustifyMainAxis(
       case YGJustifySpaceBetween:
         if (collectedFlexItemsValues.itemsOnLine > 1) {
           betweenMainDim =
-              fmaxf(collectedFlexItemsValues.remainingFreeSpace, 0) /
+              YGFloatMax(collectedFlexItemsValues.remainingFreeSpace, 0) /
               (collectedFlexItemsValues.itemsOnLine - 1);
         } else {
           betweenMainDim = 0;
@@ -2207,7 +2234,7 @@ static void YGJustifyMainAxis(
 
           // The cross dimension is the max of the elements dimension since
           // there can only be one element in that cross dimension.
-          collectedFlexItemsValues.crossDim = fmaxf(
+          collectedFlexItemsValues.crossDim = YGFloatMax(
               collectedFlexItemsValues.crossDim,
               YGNodeDimWithMargin(child, crossAxis, availableInnerWidth));
         }
@@ -2537,8 +2564,11 @@ static void YGNodelayoutImpl(const YGNodeRef node,
         availableInnerMainDim = maxInnerMainDim;
       } else {
         if (!node->getConfig()->useLegacyStretchBehaviour &&
-            (collectedFlexItemsValues.totalFlexGrowFactors == 0 ||
-             node->resolveFlexGrow() == 0)) {
+            ((YGFloatIsUndefined(
+                  collectedFlexItemsValues.totalFlexGrowFactors) &&
+              collectedFlexItemsValues.totalFlexGrowFactors == 0) ||
+             (YGFloatIsUndefined(node->resolveFlexGrow()) &&
+              node->resolveFlexGrow() == 0))) {
           // If we don't have any children to flex or we can't flex the node
           // itself, space we've used is all space we need. Root node also
           // should be shrunk to minimum
@@ -2743,13 +2773,13 @@ static void YGNodelayoutImpl(const YGNodeRef node,
 
             if (child->marginLeadingValue(crossAxis).unit == YGUnitAuto &&
                 child->marginTrailingValue(crossAxis).unit == YGUnitAuto) {
-              leadingCrossDim += fmaxf(0.0f, remainingCrossDim / 2);
+              leadingCrossDim += YGFloatMax(0.0f, remainingCrossDim / 2);
             } else if (
                 child->marginTrailingValue(crossAxis).unit == YGUnitAuto) {
               // No-Op
             } else if (
                 child->marginLeadingValue(crossAxis).unit == YGUnitAuto) {
-              leadingCrossDim += fmaxf(0.0f, remainingCrossDim);
+              leadingCrossDim += YGFloatMax(0.0f, remainingCrossDim);
             } else if (alignItem == YGAlignFlexStart) {
               // No-Op
             } else if (alignItem == YGAlignCenter) {
@@ -2768,7 +2798,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
     }
 
     totalLineCrossDim += collectedFlexItemsValues.crossDim;
-    maxLineMainDim = fmaxf(maxLineMainDim, collectedFlexItemsValues.mainDim);
+    maxLineMainDim =
+        YGFloatMax(maxLineMainDim, collectedFlexItemsValues.mainDim);
   }
 
   // STEP 8: MULTI-LINE CONTENT ALIGNMENT
@@ -2831,7 +2862,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
             break;
           }
           if (YGNodeIsLayoutDimDefined(child, crossAxis)) {
-            lineHeight = fmaxf(
+            lineHeight = YGFloatMax(
                 lineHeight,
                 child->getLayout().measuredDimensions[dim[crossAxis]] +
                     child->getMarginForAxis(crossAxis, availableInnerWidth));
@@ -2845,9 +2876,12 @@ static void YGNodelayoutImpl(const YGNodeRef node,
                 child->getMarginForAxis(
                     YGFlexDirectionColumn, availableInnerWidth) -
                 ascent;
-            maxAscentForCurrentLine = fmaxf(maxAscentForCurrentLine, ascent);
-            maxDescentForCurrentLine = fmaxf(maxDescentForCurrentLine, descent);
-            lineHeight = fmaxf(lineHeight, maxAscentForCurrentLine + maxDescentForCurrentLine);
+            maxAscentForCurrentLine =
+                YGFloatMax(maxAscentForCurrentLine, ascent);
+            maxDescentForCurrentLine =
+                YGFloatMax(maxDescentForCurrentLine, descent);
+            lineHeight = YGFloatMax(
+                lineHeight, maxAscentForCurrentLine + maxDescentForCurrentLine);
           }
         }
       }
@@ -2990,8 +3024,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
       measureModeMainDim == YGMeasureModeAtMost &&
       node->getStyle().overflow == YGOverflowScroll) {
     node->setLayoutMeasuredDimension(
-        fmaxf(
-            fminf(
+        YGFloatMax(
+            YGFloatMin(
                 availableInnerMainDim + paddingAndBorderAxisMain,
                 YGNodeBoundAxisWithinMinAndMax(
                     node, mainAxis, maxLineMainDim, mainAxisParentSize)),
@@ -3018,8 +3052,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
       measureModeCrossDim == YGMeasureModeAtMost &&
       node->getStyle().overflow == YGOverflowScroll) {
     node->setLayoutMeasuredDimension(
-        fmaxf(
-            fminf(
+        YGFloatMax(
+            YGFloatMin(
                 availableInnerCrossDim + paddingAndBorderAxisCross,
                 YGNodeBoundAxisWithinMinAndMax(
                     node,
@@ -3134,8 +3168,11 @@ static inline bool YGMeasureModeNewMeasureSizeIsStricterAndStillValid(YGMeasureM
                                                                       YGMeasureMode lastSizeMode,
                                                                       float lastSize,
                                                                       float lastComputedSize) {
-  return lastSizeMode == YGMeasureModeAtMost && sizeMode == YGMeasureModeAtMost &&
-         lastSize > size && (lastComputedSize <= size || YGFloatsEqual(size, lastComputedSize));
+  return lastSizeMode == YGMeasureModeAtMost &&
+      sizeMode == YGMeasureModeAtMost && !YGFloatIsUndefined(lastSize) &&
+      !YGFloatIsUndefined(size) && !YGFloatIsUndefined(lastComputedSize) &&
+      lastSize > size &&
+      (lastComputedSize <= size || YGFloatsEqual(size, lastComputedSize));
 }
 
 float YGRoundValueToPixelGrid(const float value,
@@ -3157,9 +3194,15 @@ float YGRoundValueToPixelGrid(const float value,
   } else {
     // Finally we just round the value
     scaledValue = scaledValue - fractial +
-        (fractial > 0.5f || YGFloatsEqual(fractial, 0.5f) ? 1.0f : 0.0f);
+        (!YGFloatIsUndefined(fractial) &&
+                 (fractial > 0.5f || YGFloatsEqual(fractial, 0.5f))
+             ? 1.0f
+             : 0.0f);
   }
-  return scaledValue / pointScaleFactor;
+  return (YGFloatIsUndefined(scaledValue) ||
+          YGFloatIsUndefined(pointScaleFactor))
+      ? YGUndefined
+      : scaledValue / pointScaleFactor;
 }
 
 bool YGNodeCanUseCachedMeasurement(const YGMeasureMode widthMode,
@@ -3175,7 +3218,8 @@ bool YGNodeCanUseCachedMeasurement(const YGMeasureMode widthMode,
                                    const float marginRow,
                                    const float marginColumn,
                                    const YGConfigRef config) {
-  if (lastComputedHeight < 0 || lastComputedWidth < 0) {
+  if ((!YGFloatIsUndefined(lastComputedHeight) && lastComputedHeight < 0) ||
+      (!YGFloatIsUndefined(lastComputedWidth) && lastComputedWidth < 0)) {
     return false;
   }
   bool useRoundedComparison =
@@ -3533,14 +3577,19 @@ static void YGRoundToPixelGrid(const YGNodeRef node,
 
   const uint32_t childCount = YGNodeGetChildCount(node);
   for (uint32_t i = 0; i < childCount; i++) {
-    YGRoundToPixelGrid(YGNodeGetChild(node, i), pointScaleFactor, absoluteNodeLeft, absoluteNodeTop);
+    YGRoundToPixelGrid(
+        YGNodeGetChild(node, i),
+        pointScaleFactor,
+        absoluteNodeLeft,
+        absoluteNodeTop);
   }
 }
 
-void YGNodeCalculateLayout(const YGNodeRef node,
-                           const float parentWidth,
-                           const float parentHeight,
-                           const YGDirection parentDirection) {
+void YGNodeCalculateLayout(
+    const YGNodeRef node,
+    const float parentWidth,
+    const float parentHeight,
+    const YGDirection parentDirection) {
   // Increment the generation count. This will force the recursive routine to
   // visit
   // all dirty nodes at least once. Subsequent visits will be skipped if the
@@ -3556,16 +3605,16 @@ void YGNodeCalculateLayout(const YGNodeRef node,
             node->getResolvedDimension(dim[YGFlexDirectionRow]), parentWidth) +
         node->getMarginForAxis(YGFlexDirectionRow, parentWidth);
     widthMeasureMode = YGMeasureModeExactly;
-  } else if (
-      YGResolveValue(
-          node->getStyle().maxDimensions[YGDimensionWidth], parentWidth) >=
-      0.0f) {
+  } else if (!YGFloatIsUndefined(YGResolveValue(
+                 node->getStyle().maxDimensions[YGDimensionWidth],
+                 parentWidth))) {
     width = YGResolveValue(
         node->getStyle().maxDimensions[YGDimensionWidth], parentWidth);
     widthMeasureMode = YGMeasureModeAtMost;
   } else {
     width = parentWidth;
-    widthMeasureMode = YGFloatIsUndefined(width) ? YGMeasureModeUndefined : YGMeasureModeExactly;
+    widthMeasureMode = YGFloatIsUndefined(width) ? YGMeasureModeUndefined
+                                                 : YGMeasureModeExactly;
   }
 
   float height = YGUndefined;
@@ -3576,18 +3625,17 @@ void YGNodeCalculateLayout(const YGNodeRef node,
                  parentHeight) +
         node->getMarginForAxis(YGFlexDirectionColumn, parentWidth);
     heightMeasureMode = YGMeasureModeExactly;
-  } else if (
-      YGResolveValue(
-          node->getStyle().maxDimensions[YGDimensionHeight], parentHeight) >=
-      0.0f) {
+  } else if (!YGFloatIsUndefined(YGResolveValue(
+                 node->getStyle().maxDimensions[YGDimensionHeight],
+                 parentHeight))) {
     height = YGResolveValue(
         node->getStyle().maxDimensions[YGDimensionHeight], parentHeight);
     heightMeasureMode = YGMeasureModeAtMost;
   } else {
     height = parentHeight;
-    heightMeasureMode = YGFloatIsUndefined(height) ? YGMeasureModeUndefined : YGMeasureModeExactly;
+    heightMeasureMode = YGFloatIsUndefined(height) ? YGMeasureModeUndefined
+                                                   : YGMeasureModeExactly;
   }
-
   if (YGLayoutNodeInternal(
           node,
           width,
diff --git a/ReactCommon/yoga/yoga/Yoga.h b/ReactCommon/yoga/yoga/Yoga.h
index 689f9f3e4e717b..a632917af859b7 100644
--- a/ReactCommon/yoga/yoga/Yoga.h
+++ b/ReactCommon/yoga/yoga/Yoga.h
@@ -18,13 +18,14 @@
 #include <stdbool.h>
 #endif
 
-// Not defined in MSVC++
-#ifndef NAN
-static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
-#define NAN (*(const float *) __nan)
-#endif
-
-#define YGUndefined NAN
+/** Large positive number signifies that the property(float) is undefined.
+ *Earlier we used to have YGundefined as NAN, but the downside of this is that
+ *we can't use -ffast-math compiler flag as it assumes all floating-point
+ *calculation involve and result into finite numbers. For more information
+ *regarding -ffast-math compiler flag in clang, have a look at
+ *https://clang.llvm.org/docs/UsersManual.html#cmdoption-ffast-math
+ **/
+#define YGUndefined 10E20F
 
 #include "YGEnums.h"
 #include "YGMacros.h"

From 8a7f68e21147e7372e79b19b9701d4fccd852174 Mon Sep 17 00:00:00 2001
From: Miguel Jimenez Esun <mjimenez@fb.com>
Date: Thu, 1 Mar 2018 05:30:27 -0800
Subject: [PATCH 134/267] Remove optional parameter from server and enforce
 empty list everywhere

Reviewed By: jeanlauliac

Differential Revision: D6999448

fbshipit-source-id: 39a6b9333e3c3ec05bae5423fcc84ad17e1fdc06
---
 local-cli/dependencies/dependencies.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/local-cli/dependencies/dependencies.js b/local-cli/dependencies/dependencies.js
index 33af4d084c567a..b80f68249de630 100644
--- a/local-cli/dependencies/dependencies.js
+++ b/local-cli/dependencies/dependencies.js
@@ -25,8 +25,10 @@ function dependencies(argv, config, args, packagerInstance) {
       typeof config.getTransformModulePath === 'function' ? config.getTransformModulePath() :
       undefined;
 
+
   const packageOpts = {
     assetRegistryPath: ASSET_REGISTRY_PATH,
+    cacheStores: [],
     projectRoots: config.getProjectRoots(),
     blacklistRE: config.getBlacklistRE(),
     dynamicDepsInPackages: config.dynamicDepsInPackages,

From b181b7797f67a4b0e227ca7138fad121105bcb74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Thu, 1 Mar 2018 08:07:40 -0800
Subject: [PATCH 135/267] Check PATENTS does not creep into files

Summary:
Some files have crept into the repo with the old license header. These are usually from PRs that were opened prior to the re-licensing of the project.

Let the script run, prior to fixing the errant files. The script outputs the following:

```
PATENTS crept into some new files?
 --- /dev/fd/63	2018-03-01 01:42:48.250153746 +0000
+++ /dev/fd/62	2018-03-01 01:42:48.250153746 +0000
@@ -1 +1,9 @@
+Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
+Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
+ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java
+ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java
+ReactCommon/yoga/yoga/YGLayout.cpp
+ReactCommon/yoga/yoga/YGLayout.h
+ReactCommon/yoga/yoga/YGStyle.cpp
+ReactCommon/yoga/yoga/YGStyle.h
 scripts/circleci/check_license.sh
Exited with code 1
```

Fix the headers in these files and run the script again. No output, exit code 0.
Closes https://github.com/facebook/react-native/pull/18143

Reviewed By: sophiebits

Differential Revision: D7119356

Pulled By: hramos

fbshipit-source-id: d238e4d4a3ae320a2c8e625c2fa29690057a4814
---
 .circleci/config.yml                                | 12 +++++++++---
 .../NativeAnimation/Nodes/RCTTrackingAnimatedNode.h |  6 ++----
 .../NativeAnimation/Nodes/RCTTrackingAnimatedNode.m |  6 ++----
 .../react/animated/TrackingAnimatedNode.java        |  6 ++----
 .../react/views/text/CustomLetterSpacingSpan.java   |  6 ++----
 ReactCommon/yoga/yoga/YGLayout.cpp                  |  7 +++----
 ReactCommon/yoga/yoga/YGLayout.h                    |  7 +++----
 ReactCommon/yoga/yoga/YGStyle.cpp                   |  7 +++----
 ReactCommon/yoga/yoga/YGStyle.h                     |  7 +++----
 scripts/circleci/check_license.sh                   | 13 +++++++++++++
 10 files changed, 42 insertions(+), 35 deletions(-)
 create mode 100755 scripts/circleci/check_license.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 12a44b30ae5856..2cfbaf4f6a3958 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -152,6 +152,11 @@ aliases:
     command: yarn flow check
     when: always
 
+  - &run-license-checks
+    name: Check license
+    command: ./scripts/circleci/check_license.sh
+    when: always
+    
   - &build-android-app
     name: Build Android App
     command: |
@@ -275,7 +280,7 @@ jobs:
 
   # Runs JavaScript lint and flow checks.
   # Currently will fail a PR if lint/flow raises issues.
-  js_checks:
+  analyze:
     <<: *js_defaults
     steps:
       - attach_workspace:
@@ -283,6 +288,7 @@ jobs:
 
       - run: *run-lint-checks
       - run: *run-flow-checks
+      - run: *run-license-checks
 
       - store_test_results:
           path: ~/react-native/reports/junit
@@ -576,8 +582,8 @@ workflows:
       - checkout_code:
           filters: *filter-ignore-gh-pages
 
-      # Run lint and flow checks
-      - js_checks:
+      # Run lint, flow, and other checks
+      - analyze:
           filters: *filter-ignore-gh-pages
           requires:
             - checkout_code
diff --git a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
index 8f3281789ddbb0..99e9bd1112a60e 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
+++ b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.h
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTAnimatedNode.h"
diff --git a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
index e77b773e040a12..42150285da4cd2 100644
--- a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
+++ b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "RCTTrackingAnimatedNode.h"
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java b/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java
index db312d23558078..a339780dfdb60f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.animated;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java
index 004d26138694e5..d41338ccd93664 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomLetterSpacingSpan.java
@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.react.views.text;
diff --git a/ReactCommon/yoga/yoga/YGLayout.cpp b/ReactCommon/yoga/yoga/YGLayout.cpp
index 208a6fe3f5c274..4d798476ab18f6 100644
--- a/ReactCommon/yoga/yoga/YGLayout.cpp
+++ b/ReactCommon/yoga/yoga/YGLayout.cpp
@@ -1,11 +1,10 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include "YGLayout.h"
 #include "Utils.h"
 
diff --git a/ReactCommon/yoga/yoga/YGLayout.h b/ReactCommon/yoga/yoga/YGLayout.h
index 125a6d0b03ed0a..cfe559f64bc170 100644
--- a/ReactCommon/yoga/yoga/YGLayout.h
+++ b/ReactCommon/yoga/yoga/YGLayout.h
@@ -1,11 +1,10 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 #include "Yoga-internal.h"
 
diff --git a/ReactCommon/yoga/yoga/YGStyle.cpp b/ReactCommon/yoga/yoga/YGStyle.cpp
index 56b5a1e69e014b..f3bc16fe1cc21b 100644
--- a/ReactCommon/yoga/yoga/YGStyle.cpp
+++ b/ReactCommon/yoga/yoga/YGStyle.cpp
@@ -1,11 +1,10 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include "YGStyle.h"
 
 const YGValue kYGValueUndefined = {YGUndefined, YGUnitUndefined};
diff --git a/ReactCommon/yoga/yoga/YGStyle.h b/ReactCommon/yoga/yoga/YGStyle.h
index a95b4a297e7667..74b9d6e0baa367 100644
--- a/ReactCommon/yoga/yoga/YGStyle.h
+++ b/ReactCommon/yoga/yoga/YGStyle.h
@@ -1,11 +1,10 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 #include "Yoga-internal.h"
 #include "Yoga.h"
diff --git a/scripts/circleci/check_license.sh b/scripts/circleci/check_license.sh
new file mode 100755
index 00000000000000..68b41d6ac441b6
--- /dev/null
+++ b/scripts/circleci/check_license.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Make sure we don't introduce accidental references to PATENTS.
+EXPECTED='scripts/circleci/check_license.sh'
+ACTUAL=$(git grep -l PATENTS)
+
+if [ "$EXPECTED" != "$ACTUAL" ]; then
+  echo "PATENTS crept into some new files?"
+  diff -u <(echo "$EXPECTED") <(echo "$ACTUAL") || true
+  exit 1
+fi

From 6b45fb2cb1ca44fa7375bc7696bf90a68a85df3c Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Thu, 1 Mar 2018 10:24:12 -0800
Subject: [PATCH 136/267] Create UIManager interface and extract common classes
 in uimanager/common

Reviewed By: achen1

Differential Revision: D7102674

fbshipit-source-id: e14b6782ad102ec1c3d37988df4bbd4190511f09
---
 .../facebook/react/ReactInstanceManager.java  | 46 +++----------------
 .../com/facebook/react/ReactRootView.java     |  4 +-
 .../main/java/com/facebook/react/bridge/BUCK  |  1 +
 .../facebook/react/bridge/BridgeListener.java |  2 +-
 .../react/bridge/CatalystInstance.java        |  4 ++
 .../react/bridge/CatalystInstanceImpl.java    | 25 +++++-----
 .../com/facebook/react/bridge/UIManager.java  | 13 ++++++
 .../react/fabric/FabricUIManagerModule.java   |  8 ++--
 .../flat/FlatNativeViewHierarchyManager.java  |  2 +-
 .../java/com/facebook/react/uimanager/BUCK    |  2 +
 .../uimanager/NativeViewHierarchyManager.java |  1 +
 .../react/uimanager/RootViewManager.java      |  1 +
 .../react/uimanager/UIImplementation.java     |  2 +
 .../react/uimanager/UIManagerModule.java      |  5 +-
 .../facebook/react/uimanager/UIModule.java    |  7 ---
 .../react/uimanager/UIViewOperationQueue.java |  1 +
 .../com/facebook/react/uimanager/common/BUCK  | 12 +++++
 .../{ => common}/MeasureSpecProvider.java     |  2 +-
 .../SizeMonitoringFrameLayout.java            |  2 +-
 19 files changed, 69 insertions(+), 71 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/UIModule.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
 rename ReactAndroid/src/main/java/com/facebook/react/uimanager/{ => common}/MeasureSpecProvider.java (90%)
 rename ReactAndroid/src/main/java/com/facebook/react/uimanager/{ => common}/SizeMonitoringFrameLayout.java (97%)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 4c2b560999719e..711e18001590a8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -58,6 +58,7 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
 import com.facebook.react.common.LifecycleState;
@@ -328,40 +329,6 @@ public void createReactContextInBackground() {
     recreateReactContextInBackgroundInner();
   }
 
-  @ThreadConfined(UI)
-  public void registerAdditionalPackages(List<ReactPackage> packages) {
-    if (packages == null || packages.isEmpty()) {
-      return;
-    }
-
-    // CatalystInstance hasn't been created, so add packages for later evaluation
-    if (!hasStartedCreatingInitialContext()) {
-      synchronized (mPackages) {
-        for (ReactPackage p : packages) {
-          if (!mPackages.contains(p)) {
-            mPackages.add(p);
-          }
-        }
-      }
-      return;
-    }
-
-    ReactContext context = getCurrentReactContext();
-    CatalystInstance catalystInstance = context != null ? context.getCatalystInstance() : null;
-
-    Assertions.assertNotNull(catalystInstance, "CatalystInstance null after hasStartedCreatingInitialContext true.");
-
-    final ReactApplicationContext reactContext = getReactApplicationContext();
-
-    NativeModuleRegistry nativeModuleRegistry = processPackages(reactContext, packages, true);
-    catalystInstance.extendNativeModules(nativeModuleRegistry);
-  }
-
-  @VisibleForTesting
-  public @Nullable ReactApplicationContext getReactApplicationContext() {
-    return new ReactApplicationContext(mApplicationContext);
-  }
-
   /**
    * Recreate the react application and context. This should be called if configuration has changed
    * or the developer has requested the app to be reloaded. It should only be called after an
@@ -1040,8 +1007,7 @@ private void attachRootViewToInstance(
       CatalystInstance catalystInstance) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.attachRootViewToInstance()");
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "attachRootViewToInstance");
-    UIManagerModule uiManagerModule = catalystInstance.getNativeModule(UIManagerModule.class);
-    final int rootTag = uiManagerModule.addRootView(rootView);
+    final int rootTag = catalystInstance.getNativeModule(UIManagerModule.class).addRootView(rootView);
     rootView.setRootViewTag(rootTag);
     rootView.invokeJSEntryPoint();
     Systrace.beginAsyncSection(
@@ -1097,7 +1063,7 @@ private ReactApplicationContext createReactContext(
       JSBundleLoader jsBundleLoader) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.createReactContext()");
     ReactMarker.logMarker(CREATE_REACT_CONTEXT_START);
-    final ReactApplicationContext reactContext = getReactApplicationContext();
+    final ReactApplicationContext reactContext = new ReactApplicationContext(mApplicationContext);
 
     if (mUseDeveloperSupport) {
       reactContext.setNativeModuleCallExceptionHandler(mDevSupportManager);
@@ -1113,8 +1079,7 @@ private ReactApplicationContext createReactContext(
       .setJSExecutor(jsExecutor)
       .setRegistry(nativeModuleRegistry)
       .setJSBundleLoader(jsBundleLoader)
-      .setNativeModuleCallExceptionHandler(exceptionHandler)
-      .setBridgeListener(mBridgeListener);
+      .setNativeModuleCallExceptionHandler(exceptionHandler);
 
     ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_START);
     // CREATE_CATALYST_INSTANCE_END is in JSCExecutor.cpp
@@ -1126,6 +1091,9 @@ private ReactApplicationContext createReactContext(
       Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
       ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_END);
     }
+    if (mBridgeListener != null) {
+      mBridgeListener.onBridgeStarted(reactContext, catalystInstance);
+    }
 
     if (mBridgeIdleDebugListener != null) {
       catalystInstance.addBridgeIdleDebugListener(mBridgeIdleDebugListener);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index a19382fbf5eec8..711d1795ec69fc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -41,10 +41,10 @@
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.JSTouchDispatcher;
-import com.facebook.react.uimanager.MeasureSpecProvider;
+import com.facebook.react.uimanager.common.MeasureSpecProvider;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.RootView;
-import com.facebook.react.uimanager.SizeMonitoringFrameLayout;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.systrace.Systrace;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
index 4102013202bcb2..69c22f16f8b7b9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
@@ -27,5 +27,6 @@ rn_android_library(
         react_native_target("java/com/facebook/debug/holder:holder"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/model:model"),
+        react_native_target("java/com/facebook/react/uimanager/common:common"),
     ] + ([react_native_target("jni/react/jni:jni")] if not IS_OSS_BUILD else []),
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeListener.java
index d39c72b50e86db..70b771ff558e81 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeListener.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeListener.java
@@ -9,6 +9,6 @@ public interface BridgeListener {
    * Called right after the RN Bridge is initialized
    * @param catalystInstance {@link CatalystInstance} bridge
    */
-  void onBridgeStarted(CatalystInstance catalystInstance);
+  void onBridgeStarted(ReactApplicationContext reactApplicationContext, CatalystInstance catalystInstance);
 
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
index 361cfda0f2fb1d..1f277e6ec384fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
@@ -98,4 +98,8 @@ void callFunction(
    * synchronized(jsContext) { nativeThingNeedingJsContext(jsContext.get()); }
    */
   JavaScriptContextHolder getJavaScriptContextHolder();
+
+  <T extends UIManager> void setFabricUIManager(T fabricUIManager);
+
+  <T extends UIManager> T getFabricUIManager();
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
index c583fbec1b2130..79233aae2e328c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -85,6 +85,7 @@ public String toString() {
   private volatile boolean mAcceptCalls = false;
 
   private boolean mJSBundleHasLoaded;
+  private UIManager mFabricUIManager;
   private @Nullable String mSourceURL;
 
   private JavaScriptContextHolder mJavaScriptContextHolder;
@@ -98,8 +99,7 @@ private CatalystInstanceImpl(
       final JavaScriptExecutor jsExecutor,
       final NativeModuleRegistry nativeModuleRegistry,
       final JSBundleLoader jsBundleLoader,
-      NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler,
-      final BridgeListener bridgeListener) {
+      NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler) {
     Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge.");
     mHybridData = initHybrid();
 
@@ -125,9 +125,6 @@ private CatalystInstanceImpl(
     Log.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
 
     mJavaScriptContextHolder = new JavaScriptContextHolder(getJavaScriptContext());
-    if (bridgeListener != null) {
-      bridgeListener.onBridgeStarted(this);
-    }
   }
 
   private static class BridgeCallback implements ReactCallback {
@@ -456,6 +453,14 @@ public JavaScriptContextHolder getJavaScriptContextHolder() {
     return mJavaScriptContextHolder;
   }
 
+  public UIManager getFabricUIManager() {
+    return mFabricUIManager;
+  }
+
+  public void setFabricUIManager(UIManager fabricUIManager) {
+    mFabricUIManager = fabricUIManager;
+  }
+
   private native long getJavaScriptContext();
 
   private void incrementPendingJSCalls() {
@@ -555,7 +560,6 @@ public static class Builder {
     private @Nullable NativeModuleRegistry mRegistry;
     private @Nullable JavaScriptExecutor mJSExecutor;
     private @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
-    private @Nullable BridgeListener mBridgeListener;
 
 
     public Builder setReactQueueConfigurationSpec(
@@ -585,20 +589,13 @@ public Builder setNativeModuleCallExceptionHandler(
       return this;
     }
 
-    public Builder setBridgeListener(
-      BridgeListener listener) {
-      mBridgeListener = listener;
-      return this;
-    }
-
     public CatalystInstanceImpl build() {
       return new CatalystInstanceImpl(
           Assertions.assertNotNull(mReactQueueConfigurationSpec),
           Assertions.assertNotNull(mJSExecutor),
           Assertions.assertNotNull(mRegistry),
           Assertions.assertNotNull(mJSBundleLoader),
-          Assertions.assertNotNull(mNativeModuleCallExceptionHandler),
-          mBridgeListener);
+          Assertions.assertNotNull(mNativeModuleCallExceptionHandler));
     }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
new file mode 100644
index 00000000000000..ff3e93ca1d5b91
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
@@ -0,0 +1,13 @@
+package com.facebook.react.bridge;
+
+import com.facebook.react.uimanager.common.MeasureSpecProvider;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
+
+public interface UIManager {
+
+  /**
+   * Registers a new root view.
+   */
+  <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(final T rootView);
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
index c920f3d3742e6e..e291d2188ba4b0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
@@ -5,17 +5,17 @@
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableNativeMap;
+import com.facebook.react.bridge.UIManager;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
-import com.facebook.react.uimanager.MeasureSpecProvider;
 import com.facebook.react.uimanager.ReactRootViewTagGenerator;
 import com.facebook.react.uimanager.ReactShadowNode;
 import com.facebook.react.uimanager.ReactShadowNodeImpl;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
-import com.facebook.react.uimanager.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
+import com.facebook.react.uimanager.common.MeasureSpecProvider;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -24,7 +24,7 @@
  * Fabric API.
  */
 @SuppressWarnings("unused") // used from JNI
-public class FabricUIManagerModule implements UIModule {
+public class FabricUIManagerModule implements UIManager {
 
   private final RootShadowNodeRegistry mRootShadowNodeRegistry = new RootShadowNodeRegistry();
   private final ReactApplicationContext mReactApplicationContext;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java
index eb2d082bdf89ab..ac1e0aadde92a5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatNativeViewHierarchyManager.java
@@ -19,7 +19,7 @@
 import android.view.ViewGroup;
 
 import com.facebook.react.uimanager.NativeViewHierarchyManager;
-import com.facebook.react.uimanager.SizeMonitoringFrameLayout;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
index 2449035004f906..50a22dfcb0463a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
@@ -14,6 +14,7 @@ rn_android_library(
     exported_deps = [
         ":DisplayMetrics",
         react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_target("java/com/facebook/react/uimanager/common:common"),
     ],
     provided_deps = [
         react_native_dep("third-party/android/support/v4:lib-support-v4"),
@@ -40,6 +41,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager/util:util"),
+        react_native_target("java/com/facebook/react/uimanager/common:common"),
         react_native_target("res:uimanager"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
index 95d919ed10d8c9..2b259c6806ff6c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
@@ -29,6 +29,7 @@
 import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.touch.JSResponderHandler;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationController;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationListener;
 import com.facebook.systrace.Systrace;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java
index c590a53eaf2ad8..cc6ebae5366dc3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootViewManager.java
@@ -8,6 +8,7 @@
 package com.facebook.react.uimanager;
 
 import android.view.ViewGroup;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 
 /**
  * View manager for ReactRootView components.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
index 98e4a592c6ec9d..c312ff763b0691 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java
@@ -24,6 +24,8 @@
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
+import com.facebook.react.uimanager.common.MeasureSpecProvider;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.systrace.Systrace;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
index d4ceecfb660fc7..282c92ca3814a8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java
@@ -28,10 +28,13 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.common.MeasureSpecProvider;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.systrace.Systrace;
@@ -72,7 +75,7 @@
  */
 @ReactModule(name = UIManagerModule.NAME)
 public class UIManagerModule extends ReactContextBaseJavaModule implements
-    OnBatchCompleteListener, LifecycleEventListener, PerformanceCounter, UIModule {
+    OnBatchCompleteListener, LifecycleEventListener, PerformanceCounter, UIManager {
 
   /**
    * Enables lazy discovery of a specific {@link ViewManager} by its name.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIModule.java
deleted file mode 100644
index a3fee6652d25e0..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIModule.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.facebook.react.uimanager;
-
-public interface UIModule {
-
-  <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootView(final T rootView);
-
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
index dcce5b8ed9b44d..5cef75341d6b45 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
@@ -21,6 +21,7 @@
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.modules.core.ReactChoreographer;
+import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
new file mode 100644
index 00000000000000..5c4a5b26df6114
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
@@ -0,0 +1,12 @@
+load("//ReactNative:DEFS.bzl", "rn_android_library", "react_native_dep", "react_native_target")
+
+rn_android_library(
+    name = "common",
+    srcs = glob(["*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecProvider.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/MeasureSpecProvider.java
similarity index 90%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecProvider.java
rename to ReactAndroid/src/main/java/com/facebook/react/uimanager/common/MeasureSpecProvider.java
index b03a8362c59377..7cc657470d1b20 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/MeasureSpecProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/MeasureSpecProvider.java
@@ -1,6 +1,6 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
-package com.facebook.react.uimanager;
+package com.facebook.react.uimanager.common;
 
 import android.view.View;
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/SizeMonitoringFrameLayout.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/SizeMonitoringFrameLayout.java
similarity index 97%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/SizeMonitoringFrameLayout.java
rename to ReactAndroid/src/main/java/com/facebook/react/uimanager/common/SizeMonitoringFrameLayout.java
index 9e6c580155cf03..19af1031a8e804 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/SizeMonitoringFrameLayout.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/SizeMonitoringFrameLayout.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.uimanager;
+package com.facebook.react.uimanager.common;
 
 import javax.annotation.Nullable;
 

From b5b0ee853e91822c1a6390ab9694db31cf94cd99 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Thu, 1 Mar 2018 10:24:14 -0800
Subject: [PATCH 137/267] Adding configuration of Fabric inside ReactRootView.

Reviewed By: achen1

Differential Revision: D7102701

fbshipit-source-id: f655327372c42ad86042011a3af3ee693d14014a
---
 .../com/facebook/react/ReactInstanceManager.java  |  3 ++-
 .../java/com/facebook/react/ReactRootView.java    |  9 +++++++++
 .../react/uimanager/ReactShadowNodeImpl.java      | 15 +++++++++++++--
 .../react/uimanager/UIViewOperationQueue.java     |  2 +-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 711e18001590a8..0b24f48db1a90b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -1007,7 +1007,8 @@ private void attachRootViewToInstance(
       CatalystInstance catalystInstance) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.attachRootViewToInstance()");
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "attachRootViewToInstance");
-    final int rootTag = catalystInstance.getNativeModule(UIManagerModule.class).addRootView(rootView);
+    UIManager uiManagerModule = rootView.isFabric() ? catalystInstance.getFabricUIManager() : catalystInstance.getNativeModule(UIManagerModule.class);
+    final int rootTag = uiManagerModule.addRootView(rootView);
     rootView.setRootViewTag(rootTag);
     rootView.invokeJSEntryPoint();
     Systrace.beginAsyncSection(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index 711d1795ec69fc..1bed2f5bb3b9bf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -88,6 +88,7 @@ public interface ReactRootViewEventListener {
   private int mWidthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
   private int mHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
   private @Nullable Runnable mJSEntryPoint;
+  private boolean mIsFabric = false;
 
   public ReactRootView(Context context) {
     super(context);
@@ -523,6 +524,14 @@ public void handleException(Throwable t) {
     mReactInstanceManager.getCurrentReactContext().handleException(e);
   }
 
+  public void setIsFabric(boolean isFabric) {
+    mIsFabric = isFabric;
+  }
+
+  public boolean isFabric() {
+    return mIsFabric;
+  }
+
   @Nullable
   public ReactInstanceManager getReactInstanceManager() {
     return mReactInstanceManager;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index 92a4d57fe192c8..449f85cc5745e5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -361,7 +361,7 @@ public boolean dispatchUpdates(
       float absoluteX,
       float absoluteY,
       UIViewOperationQueue uiViewOperationQueue,
-      NativeViewHierarchyOptimizer nativeViewHierarchyOptimizer) {
+      @Nullable NativeViewHierarchyOptimizer nativeViewHierarchyOptimizer) {
     if (mNodeUpdated) {
       onCollectExtraUpdates(uiViewOperationQueue);
     }
@@ -391,7 +391,18 @@ public boolean dispatchUpdates(
       mScreenHeight = newScreenHeight;
 
       if (layoutHasChanged) {
-        nativeViewHierarchyOptimizer.handleUpdateLayout(this);
+        //TODO: T26400974 ReactShadowNode should not depend on nativeViewHierarchyOptimizer
+        if (nativeViewHierarchyOptimizer != null) {
+          nativeViewHierarchyOptimizer.handleUpdateLayout(this);
+        } else {
+          uiViewOperationQueue.enqueueUpdateLayout(
+            getParent().getReactTag(),
+            getReactTag(),
+            getScreenX(),
+            getScreenY(),
+            getScreenWidth(),
+            getScreenHeight());
+        }
       }
 
       return layoutHasChanged;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
index 5cef75341d6b45..1f2135db86523e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
@@ -764,7 +764,7 @@ public void prependUIBlock(UIBlock block) {
     mOperations.add(0, new UIBlockOperation(block));
   }
 
-  /* package */ void dispatchViewUpdates(
+  public void dispatchViewUpdates(
       final int batchId, final long commitStartTime, final long layoutTime) {
     SystraceMessage.beginSection(
       Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,

From c0c388c8aa84264f243e0160b1fd0a8ffeee6ed2 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Thu, 1 Mar 2018 10:24:16 -0800
Subject: [PATCH 138/267] Adding simple View rendering support using
 FabricUIManager.

Reviewed By: achen1

Differential Revision: D7102725

fbshipit-source-id: d2878d036843ba01201c4df617680269b5f59039
---
 .../react/fabric/FabricUIManagerModule.java   | 94 +++++++++++++++++--
 1 file changed, 84 insertions(+), 10 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
index e291d2188ba4b0..57a7516000a3b0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
@@ -3,15 +3,19 @@
 package com.facebook.react.fabric;
 
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.JavaOnlyArray;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
+import com.facebook.react.uimanager.NativeViewHierarchyManager;
 import com.facebook.react.uimanager.ReactRootViewTagGenerator;
 import com.facebook.react.uimanager.ReactShadowNode;
 import com.facebook.react.uimanager.ReactShadowNodeImpl;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIViewOperationQueue;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.uimanager.common.MeasureSpecProvider;
@@ -19,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
+
 /**
  * This class is responsible to create, clone and update {@link ReactShadowNode} using the
  * Fabric API.
@@ -26,14 +31,17 @@
 @SuppressWarnings("unused") // used from JNI
 public class FabricUIManagerModule implements UIManager {
 
+  private static final String TAG = FabricUIManagerModule.class.toString();
   private final RootShadowNodeRegistry mRootShadowNodeRegistry = new RootShadowNodeRegistry();
   private final ReactApplicationContext mReactApplicationContext;
   private final ViewManagerRegistry mViewManagerRegistry;
+  private final UIViewOperationQueue mUIViewOperationQueue;
 
   public FabricUIManagerModule(ReactApplicationContext reactContext,
-      ViewManagerRegistry viewManagerRegistry) {
+    ViewManagerRegistry viewManagerRegistry) {
     mReactApplicationContext = reactContext;
     mViewManagerRegistry = viewManagerRegistry;
+    mUIViewOperationQueue = new UIViewOperationQueue(reactContext, new NativeViewHierarchyManager(viewManagerRegistry), 0);
   }
 
   /**
@@ -41,16 +49,21 @@ public FabricUIManagerModule(ReactApplicationContext reactContext,
    */
   @Nullable
   public ReactShadowNode createNode(int reactTag,
-      String viewName,
-      int rootTag,
-      ReadableNativeMap props) {
+    String viewName,
+    int rootTag,
+    ReadableNativeMap props) {
 
     ViewManager viewManager = mViewManagerRegistry.get(viewName);
     ReactShadowNode node = viewManager.createShadowNodeInstance(mReactApplicationContext);
-    node.setRootNode(getRootNode(rootTag));
+    ReactShadowNode rootNode = getRootNode(rootTag);
+    node.setRootNode(rootNode);
     node.setReactTag(reactTag);
+    node.setThemedContext(rootNode.getThemedContext());
+
     ReactStylesDiffMap styles = updateProps(node, props);
 
+    mUIViewOperationQueue
+      .enqueueCreateView(rootNode.getThemedContext(), reactTag, viewName, styles);
     return node;
   }
 
@@ -135,6 +148,7 @@ private void assertReactShadowNodeCopy(ReactShadowNode source, ReactShadowNode t
   @Nullable
   public void appendChild(ReactShadowNode parent, ReactShadowNode child) {
     parent.addChildAt(child, parent.getChildCount());
+    setChildren(parent.getReactTag(), child.getReactTag());
   }
 
   /**
@@ -153,8 +167,60 @@ public void appendChildToSet(List<ReactShadowNode> childList, ReactShadowNode ch
   }
 
   public void completeRoot(int rootTag, List<ReactShadowNode> childList) {
-    // TODO Diffing old Tree with new Tree
-    // Do we need to hold references to old and new tree?
+    if (!childList.isEmpty()) {
+      ReactShadowNode rootNode = getRootNode(rootTag);
+      for (int i = 0; i < childList.size(); i++) {
+        ReactShadowNode child = childList.get(i);
+        rootNode.addChildAt(child, i);
+        setChildren(rootTag, child.getReactTag());
+      }
+
+      calculateRootLayout(rootNode);
+      applyUpdatesRecursive(rootNode, 0, 0);
+      mUIViewOperationQueue.dispatchViewUpdates(1, System.currentTimeMillis(), System.currentTimeMillis());
+    }
+  }
+
+  private void setChildren(int parent, int child) {
+    JavaOnlyArray childrenTags = new JavaOnlyArray();
+    childrenTags.pushInt(child);
+    mUIViewOperationQueue.enqueueSetChildren(
+      parent,
+      childrenTags
+    );
+  }
+
+  private void calculateRootLayout(ReactShadowNode cssRoot) {
+    cssRoot.calculateLayout();
+  }
+
+  private void applyUpdatesRecursive(
+    ReactShadowNode cssNode,
+    float absoluteX,
+    float absoluteY) {
+
+    if (!cssNode.hasUpdates()) {
+      return;
+    }
+
+    if (!cssNode.isVirtualAnchor()) {
+      for (int i = 0; i < cssNode.getChildCount(); i++) {
+        applyUpdatesRecursive(
+          cssNode.getChildAt(i),
+          absoluteX + cssNode.getLayoutX(),
+          absoluteY + cssNode.getLayoutY());
+      }
+    }
+
+    int tag = cssNode.getReactTag();
+    if (mRootShadowNodeRegistry.getNode(tag) == null) {
+      boolean frameDidChange = cssNode.dispatchUpdates(
+        absoluteX,
+        absoluteY,
+        mUIViewOperationQueue,
+        null);
+    }
+    cssNode.markUpdateSeen();
   }
 
   @Override
@@ -162,10 +228,18 @@ public <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootVi
     final T rootView) {
     int rootTag = ReactRootViewTagGenerator.getNextRootViewTag();
     ThemedReactContext themedRootContext = new ThemedReactContext(
-        mReactApplicationContext,
-        rootView.getContext());
+      mReactApplicationContext,
+      rootView.getContext());
+
+    ReactShadowNode rootShadowNode = createRootShadowNode(rootTag, themedRootContext);
+
+    int widthMeasureSpec = rootView.getWidthMeasureSpec();
+    int heightMeasureSpec = rootView.getHeightMeasureSpec();
+    rootShadowNode.setStyleWidthAuto();
+    rootShadowNode.setStyleHeightAuto();
 
-    mRootShadowNodeRegistry.addNode(createRootShadowNode(rootTag, themedRootContext));
+    mRootShadowNodeRegistry.addNode(rootShadowNode);
+    mUIViewOperationQueue.addRootView(rootTag, rootView, themedRootContext);
     return rootTag;
   }
 

From 9b3861c1095e64e3cfeea416cdcf9f2d58291e33 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Thu, 1 Mar 2018 10:24:19 -0800
Subject: [PATCH 139/267] Fix unmount of ReactRootView for Fabric surfaces

Reviewed By: fkgozali

Differential Revision: D7114865

fbshipit-source-id: f0a1c47c983e610fe0dba3051ed8aa350ac052cc
---
 Libraries/Renderer/shims/ReactFabric.js       |  4 ++
 .../src/main/java/com/facebook/react/BUCK     |  1 +
 .../facebook/react/ReactInstanceManager.java  |  9 +++-
 .../react/fabric/FabricUIManagerModule.java   | 44 ++++++++++++++++++-
 .../com/facebook/react/modules/fabric/BUCK    | 14 ++++++
 .../react/modules/fabric/ReactFabric.java     | 18 ++++++++
 .../react/uimanager/ReactShadowNodeImpl.java  |  2 +-
 7 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/modules/fabric/ReactFabric.java

diff --git a/Libraries/Renderer/shims/ReactFabric.js b/Libraries/Renderer/shims/ReactFabric.js
index 4a396c224cd4ff..4162ca62fef73d 100644
--- a/Libraries/Renderer/shims/ReactFabric.js
+++ b/Libraries/Renderer/shims/ReactFabric.js
@@ -9,6 +9,8 @@
  */
 'use strict';
 
+const BatchedBridge = require('BatchedBridge');
+
 // TODO @sema: Adjust types
 import type {ReactNativeType} from 'ReactNativeTypes';
 
@@ -20,4 +22,6 @@ if (__DEV__) {
   ReactFabric = require('ReactFabric-prod');
 }
 
+BatchedBridge.registerCallableModule('ReactFabric', ReactFabric);
+
 module.exports = (ReactFabric: ReactNativeType);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK
index 2fabe4a1196a40..9a33c9af419216 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK
@@ -27,6 +27,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/appregistry:appregistry"),
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/modules/debug:debug"),
+        react_native_target("java/com/facebook/react/modules/fabric:fabric"),
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
         react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
         react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 0b24f48db1a90b..1ecbd0efd45c6f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -71,6 +71,7 @@
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import com.facebook.react.modules.appregistry.AppRegistry;
+import com.facebook.react.modules.fabric.ReactFabric;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
@@ -1033,8 +1034,14 @@ private void detachViewFromInstance(
       CatalystInstance catalystInstance) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.detachViewFromInstance()");
     UiThreadUtil.assertOnUiThread();
-    catalystInstance.getJSModule(AppRegistry.class)
+    if (rootView.isFabric()) {
+      catalystInstance.getJSModule(ReactFabric.class)
+        .unmountComponentAtNodeAndRemoveContainer(rootView.getId());
+    } else {
+      catalystInstance.getJSModule(AppRegistry.class)
         .unmountApplicationComponentAtRootTag(rootView.getId());
+    }
+
   }
 
   private void tearDownReactContext(ReactContext reactContext) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
index 57a7516000a3b0..1cc927c576b8aa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
@@ -2,6 +2,12 @@
 
 package com.facebook.react.fabric;
 
+import static android.view.View.MeasureSpec.AT_MOST;
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.UNSPECIFIED;
+
+import android.util.Log;
+import android.view.View;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JavaOnlyArray;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -235,8 +241,7 @@ public <T extends SizeMonitoringFrameLayout & MeasureSpecProvider> int addRootVi
 
     int widthMeasureSpec = rootView.getWidthMeasureSpec();
     int heightMeasureSpec = rootView.getHeightMeasureSpec();
-    rootShadowNode.setStyleWidthAuto();
-    rootShadowNode.setStyleHeightAuto();
+    updateRootView(rootShadowNode, widthMeasureSpec, heightMeasureSpec);
 
     mRootShadowNodeRegistry.addNode(rootShadowNode);
     mUIViewOperationQueue.addRootView(rootTag, rootView, themedRootContext);
@@ -257,4 +262,39 @@ private ReactShadowNode createRootShadowNode(int rootTag, ThemedReactContext the
     return rootNode;
   }
 
+  /**
+   * Updates the styles of the {@link ReactShadowNode} based on the Measure specs received by
+   * parameters.
+   */
+  public void updateRootView(
+    ReactShadowNode rootCSSNode, int widthMeasureSpec, int heightMeasureSpec) {
+    int widthMode = View.MeasureSpec.getMode(widthMeasureSpec);
+    int widthSize = View.MeasureSpec.getSize(widthMeasureSpec);
+    switch (widthMode) {
+      case EXACTLY:
+        rootCSSNode.setStyleWidth(widthSize);
+        break;
+      case AT_MOST:
+        rootCSSNode.setStyleMaxWidth(widthSize);
+        break;
+      case UNSPECIFIED:
+        rootCSSNode.setStyleWidthAuto();
+        break;
+    }
+
+    int heightMode = View.MeasureSpec.getMode(heightMeasureSpec);
+    int heightSize = View.MeasureSpec.getSize(heightMeasureSpec);
+    switch (heightMode) {
+      case EXACTLY:
+        rootCSSNode.setStyleHeight(heightSize);
+        break;
+      case AT_MOST:
+        rootCSSNode.setStyleMaxHeight(heightSize);
+        break;
+      case UNSPECIFIED:
+        rootCSSNode.setStyleHeightAuto();
+        break;
+    }
+  }
+
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
new file mode 100644
index 00000000000000..e7b5d9a72c26cf
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK
@@ -0,0 +1,14 @@
+load("//ReactNative:DEFS.bzl", "rn_android_library", "react_native_target")
+
+rn_android_library(
+    name = "fabric",
+    srcs = glob(["**/*.java"]),
+    provided_deps = [
+    ],
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+    ],
+)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/ReactFabric.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/ReactFabric.java
new file mode 100644
index 00000000000000..888e9bafda3e62
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fabric/ReactFabric.java
@@ -0,0 +1,18 @@
+package com.facebook.react.modules.fabric;
+
+import com.facebook.react.bridge.JavaScriptModule;
+
+/**
+ * JS module used to execute Fabric specific methods.
+ * Note: This is a temporary class that will be replaced when Fabric is fully integrated with the
+ * rest of the modules.
+ */
+public interface ReactFabric extends JavaScriptModule {
+
+  /**
+   * JS method used to unmount Fabric surfaces.
+   * @param rootTag {@link int} react tag of Root {@link com.facebook.react.uimanager.ReactShadowNode}
+   */
+  void unmountComponentAtNodeAndRemoveContainer(int rootTag);
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index 449f85cc5745e5..73ed6bc4813c99 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -222,7 +222,7 @@ public void addChildAt(ReactShadowNodeImpl child, int i) {
         "Tried to add child that already has a parent! Remove it from its parent first.");
     }
     if (mChildren == null) {
-      mChildren = new ArrayList<ReactShadowNodeImpl>(4);
+      mChildren = new ArrayList<>(4);
     }
     mChildren.add(i, child);
     child.mParent = this;

From 3f85dc53377dfacbb834439af87c3b0e9acffa86 Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Thu, 1 Mar 2018 12:04:23 -0800
Subject: [PATCH 140/267] Log java error messages from FabricUIManagerModule

Reviewed By: mdvacca

Differential Revision: D7126177

fbshipit-source-id: bafa6e2b3dabf39d2ca0d9a8830b877fc5ae97ec
---
 .../react/fabric/FabricUIManagerModule.java   | 124 ++++++++++++------
 1 file changed, 85 insertions(+), 39 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
index 1cc927c576b8aa..26eb5ad5bd30b9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
@@ -58,19 +58,23 @@ public ReactShadowNode createNode(int reactTag,
     String viewName,
     int rootTag,
     ReadableNativeMap props) {
-
-    ViewManager viewManager = mViewManagerRegistry.get(viewName);
-    ReactShadowNode node = viewManager.createShadowNodeInstance(mReactApplicationContext);
-    ReactShadowNode rootNode = getRootNode(rootTag);
-    node.setRootNode(rootNode);
-    node.setReactTag(reactTag);
-    node.setThemedContext(rootNode.getThemedContext());
-
-    ReactStylesDiffMap styles = updateProps(node, props);
-
-    mUIViewOperationQueue
-      .enqueueCreateView(rootNode.getThemedContext(), reactTag, viewName, styles);
-    return node;
+    try {
+      ViewManager viewManager = mViewManagerRegistry.get(viewName);
+      ReactShadowNode node = viewManager.createShadowNodeInstance(mReactApplicationContext);
+      ReactShadowNode rootNode = getRootNode(rootTag);
+      node.setRootNode(rootNode);
+      node.setReactTag(reactTag);
+      node.setThemedContext(rootNode.getThemedContext());
+
+      ReactStylesDiffMap styles = updateProps(node, props);
+
+      mUIViewOperationQueue
+        .enqueueCreateView(rootNode.getThemedContext(), reactTag, viewName, styles);
+      return node;
+    } catch (Exception e) {
+      handleException(rootTag, e);
+      return null;
+    }
   }
 
   private ReactShadowNode getRootNode(int rootTag) {
@@ -93,9 +97,14 @@ private ReactStylesDiffMap updateProps(ReactShadowNode node, @Nullable ReadableN
    */
   @Nullable
   public ReactShadowNode cloneNode(ReactShadowNode node) {
-    ReactShadowNode clone = node.mutableCopy();
-    assertReactShadowNodeCopy(node, clone);
-    return clone;
+    try {
+      ReactShadowNode clone = node.mutableCopy();
+      assertReactShadowNodeCopy(node, clone);
+      return clone;
+    } catch (Exception e) {
+      handleException(node.getThemedContext(), e);
+      return null;
+    }
   }
 
   /**
@@ -105,9 +114,14 @@ public ReactShadowNode cloneNode(ReactShadowNode node) {
    */
   @Nullable
   public ReactShadowNode cloneNodeWithNewChildren(ReactShadowNode node) {
-    ReactShadowNode clone = node.mutableCopyWithNewChildren();
-    assertReactShadowNodeCopy(node, clone);
-    return clone;
+    try {
+      ReactShadowNode clone = node.mutableCopyWithNewChildren();
+      assertReactShadowNodeCopy(node, clone);
+      return clone;
+    } catch (Exception e) {
+      handleException(node.getThemedContext(), e);
+      return null;
+    }
   }
 
   /**
@@ -119,10 +133,15 @@ public ReactShadowNode cloneNodeWithNewChildren(ReactShadowNode node) {
   public ReactShadowNode cloneNodeWithNewProps(
       ReactShadowNode node,
       @Nullable ReadableNativeMap newProps) {
-    ReactShadowNode clone = node.mutableCopy();
-    updateProps(clone, newProps);
-    assertReactShadowNodeCopy(node, clone);
-    return clone;
+    try {
+      ReactShadowNode clone = node.mutableCopy();
+      updateProps(clone, newProps);
+      assertReactShadowNodeCopy(node, clone);
+      return clone;
+    } catch (Exception e) {
+      handleException(node.getThemedContext(), e);
+      return null;
+    }
   }
 
   /**
@@ -135,10 +154,16 @@ public ReactShadowNode cloneNodeWithNewProps(
   public ReactShadowNode cloneNodeWithNewChildrenAndProps(
       ReactShadowNode node,
       ReadableNativeMap newProps) {
-    ReactShadowNode clone = node.mutableCopyWithNewChildren();
-    updateProps(clone, newProps);
-    assertReactShadowNodeCopy(node, clone);
-    return clone;
+    try {
+      ReactShadowNode clone = node.mutableCopyWithNewChildren();
+      updateProps(clone, newProps);
+      assertReactShadowNodeCopy(node, clone);
+      return clone;
+    } catch (Exception e) {
+      handleException(node.getThemedContext(), e);
+      getRootNode(1).getThemedContext().handleException(e);
+      return null;
+    }
   }
 
   private void assertReactShadowNodeCopy(ReactShadowNode source, ReactShadowNode target) {
@@ -153,8 +178,12 @@ private void assertReactShadowNodeCopy(ReactShadowNode source, ReactShadowNode t
    */
   @Nullable
   public void appendChild(ReactShadowNode parent, ReactShadowNode child) {
-    parent.addChildAt(child, parent.getChildCount());
-    setChildren(parent.getReactTag(), child.getReactTag());
+    try {
+      parent.addChildAt(child, parent.getChildCount());
+      setChildren(parent.getReactTag(), child.getReactTag());
+    } catch (Exception e) {
+      handleException(parent.getThemedContext(), e);
+    }
   }
 
   /**
@@ -173,17 +202,22 @@ public void appendChildToSet(List<ReactShadowNode> childList, ReactShadowNode ch
   }
 
   public void completeRoot(int rootTag, List<ReactShadowNode> childList) {
-    if (!childList.isEmpty()) {
-      ReactShadowNode rootNode = getRootNode(rootTag);
-      for (int i = 0; i < childList.size(); i++) {
-        ReactShadowNode child = childList.get(i);
-        rootNode.addChildAt(child, i);
-        setChildren(rootTag, child.getReactTag());
+    try {
+      if (!childList.isEmpty()) {
+        ReactShadowNode rootNode = getRootNode(rootTag);
+        for (int i = 0; i < childList.size(); i++) {
+          ReactShadowNode child = childList.get(i);
+          rootNode.addChildAt(child, i);
+          setChildren(rootTag, child.getReactTag());
+        }
+
+        calculateRootLayout(rootNode);
+        applyUpdatesRecursive(rootNode, 0, 0);
+        mUIViewOperationQueue
+          .dispatchViewUpdates(1, System.currentTimeMillis(), System.currentTimeMillis());
       }
-
-      calculateRootLayout(rootNode);
-      applyUpdatesRecursive(rootNode, 0, 0);
-      mUIViewOperationQueue.dispatchViewUpdates(1, System.currentTimeMillis(), System.currentTimeMillis());
+    } catch (Exception e) {
+      handleException(rootTag, e);
     }
   }
 
@@ -297,4 +331,16 @@ public void updateRootView(
     }
   }
 
+  private void handleException(ThemedReactContext context, Exception e) {
+    try {
+      context.handleException(e);
+    } catch (Exception ex) {
+      Log.e(TAG, "Exception while executing a Fabric method", e);
+      throw new RuntimeException(ex.getMessage(), e);
+    }
+  }
+
+  private void handleException(int rootTag, Exception e) {
+    handleException(getRootNode(rootTag).getThemedContext(), e);
+  }
 }

From 22990c3ce7cb2e97a2e2caffdf24e00661ce6013 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Thu, 1 Mar 2018 16:45:03 -0800
Subject: [PATCH 141/267] Add extra information to error message reported when
 a ReactRawText is included as a child of a non Text component

Reviewed By: achen1

Differential Revision: D7120188

fbshipit-source-id: 553a26d04a62dceb86d791bcdcb3a5e16a12f64b
---
 .../react/uimanager/ReactShadowNode.java       |  7 ++++++-
 .../react/uimanager/ReactShadowNodeImpl.java   | 18 +++++++++++-------
 .../views/text/ReactRawTextShadowNode.java     |  5 ++++-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
index af0841a487c9fe..71f8d0936bd4f5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
@@ -187,6 +187,11 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   boolean isDescendantOf(T ancestorNode);
 
+  /**
+   * @return a {@link String} representation of the Yoga hierarchy of this {@link ReactShadowNode}
+   */
+  String getHierarchyInfo();
+
   /*
    * In some cases we need a way to specify some environmental data to shadow node
    * to improve layout (or do something similar), so {@code localData} serves these needs.
@@ -197,7 +202,7 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
    * Use  {@link UIManagerModule#setViewLocalData} to set this property
    * (to provide local/environmental data for a shadow node) from the main thread.
    */
-  public void setLocalData(Object data);
+  void setLocalData(Object data);
 
   /**
    * Returns the offset within the native children owned by all layout-only nodes in the subtree
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index 73ed6bc4813c99..fe807cfc2c7ef6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -9,7 +9,6 @@
 import static java.lang.System.arraycopy;
 
 import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.annotations.ReactPropertyHolder;
 import com.facebook.yoga.YogaAlign;
 import com.facebook.yoga.YogaBaselineFunction;
@@ -235,9 +234,9 @@ public void addChildAt(ReactShadowNodeImpl child, int i) {
         throw new RuntimeException(
             "Cannot add a child that doesn't have a YogaNode to a parent without a measure "
                 + "function! (Trying to add a '"
-                + child.getClass().getSimpleName()
+                + child.toString()
                 + "' to a '"
-                + getClass().getSimpleName()
+                + toString()
                 + "')");
       }
       mYogaNode.addChildAt(childYogaNode, i);
@@ -570,6 +569,11 @@ public boolean isDescendantOf(ReactShadowNodeImpl ancestorNode) {
     return isDescendant;
   }
 
+  @Override
+  public String toString() {
+    return mViewClassName;
+  }
+
   /*
    * In some cases we need a way to specify some environmental data to shadow node
    * to improve layout (or do something similar), so {@code localData} serves these needs.
@@ -962,13 +966,13 @@ public boolean isMeasureDefined() {
   }
 
   @Override
-  public String toString() {
+  public String getHierarchyInfo() {
     StringBuilder sb = new StringBuilder();
-    toStringWithIndentation(sb, 0);
+    getHierarchyInfoWithIndentation(sb, 0);
     return sb.toString();
   }
 
-  private void toStringWithIndentation(StringBuilder result, int level) {
+  private void getHierarchyInfoWithIndentation(StringBuilder result, int level) {
     // Spaces and tabs are dropped by IntelliJ logcat integration, so rely on __ instead.
     for (int i = 0; i < level; ++i) {
       result.append("__");
@@ -987,7 +991,7 @@ private void toStringWithIndentation(StringBuilder result, int level) {
     }
 
     for (int i = 0; i < getChildCount(); i++) {
-      getChildAt(i).toStringWithIndentation(result, level + 1);
+      getChildAt(i).getHierarchyInfoWithIndentation(result, level + 1);
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
index a37fab61a27d22..87f6d53692c59f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.java
@@ -49,5 +49,8 @@ public boolean isVirtual() {
     return true;
   }
 
-
+  @Override
+  public String toString() {
+    return getViewClass() + " [text: " + mText + "]";
+  }
 }

From 6404529b7611d24e1db25100501cd771c3e12a0f Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Thu, 1 Mar 2018 16:51:48 -0800
Subject: [PATCH 142/267] Added an Assertion that addRoot is called before
 completeRoot

Reviewed By: mdvacca

Differential Revision: D7127321

fbshipit-source-id: a8215fda0d854471bed9aa5476141dfffc4dc11c
---
 .../react/fabric/FabricUIManagerModule.java   | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
index 26eb5ad5bd30b9..28692254138f06 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
@@ -180,7 +180,7 @@ private void assertReactShadowNodeCopy(ReactShadowNode source, ReactShadowNode t
   public void appendChild(ReactShadowNode parent, ReactShadowNode child) {
     try {
       parent.addChildAt(child, parent.getChildCount());
-      setChildren(parent.getReactTag(), child.getReactTag());
+      addChild(parent.getReactTag(), child.getReactTag());
     } catch (Exception e) {
       handleException(parent.getThemedContext(), e);
     }
@@ -203,25 +203,26 @@ public void appendChildToSet(List<ReactShadowNode> childList, ReactShadowNode ch
 
   public void completeRoot(int rootTag, List<ReactShadowNode> childList) {
     try {
-      if (!childList.isEmpty()) {
-        ReactShadowNode rootNode = getRootNode(rootTag);
-        for (int i = 0; i < childList.size(); i++) {
-          ReactShadowNode child = childList.get(i);
-          rootNode.addChildAt(child, i);
-          setChildren(rootTag, child.getReactTag());
-        }
-
-        calculateRootLayout(rootNode);
-        applyUpdatesRecursive(rootNode, 0, 0);
-        mUIViewOperationQueue
-          .dispatchViewUpdates(1, System.currentTimeMillis(), System.currentTimeMillis());
+      ReactShadowNode rootNode = getRootNode(rootTag);
+      Assertions.assertNotNull(
+        rootNode,
+        "Root view with tag " + rootTag + " must be added before completeRoot is called");
+      for (int i = 0; i < childList.size(); i++) {
+        ReactShadowNode child = childList.get(i);
+        rootNode.addChildAt(child, i);
+        addChild(rootTag, child.getReactTag());
       }
+
+      calculateRootLayout(rootNode);
+      applyUpdatesRecursive(rootNode, 0, 0);
+      mUIViewOperationQueue
+        .dispatchViewUpdates(1, System.currentTimeMillis(), System.currentTimeMillis());
     } catch (Exception e) {
       handleException(rootTag, e);
     }
   }
 
-  private void setChildren(int parent, int child) {
+  private void addChild(int parent, int child) {
     JavaOnlyArray childrenTags = new JavaOnlyArray();
     childrenTags.pushInt(child);
     mUIViewOperationQueue.enqueueSetChildren(

From 78b30659bc0b45ba8f1b7f581255d3065174847a Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Thu, 1 Mar 2018 16:51:49 -0800
Subject: [PATCH 143/267] Fix appendChild

Reviewed By: mdvacca

Differential Revision: D7128443

fbshipit-source-id: 4eedea4df2b636eb9589cbe5e84c5c6a8aa33539
---
 .../react/fabric/FabricUIManagerModule.java   | 25 +++++++++----------
 .../facebook/react/uimanager/ViewAtIndex.java |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
index 28692254138f06..b16c7067717213 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
@@ -22,6 +22,7 @@
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIViewOperationQueue;
+import com.facebook.react.uimanager.ViewAtIndex;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.uimanager.common.MeasureSpecProvider;
@@ -179,8 +180,16 @@ private void assertReactShadowNodeCopy(ReactShadowNode source, ReactShadowNode t
   @Nullable
   public void appendChild(ReactShadowNode parent, ReactShadowNode child) {
     try {
-      parent.addChildAt(child, parent.getChildCount());
-      addChild(parent.getReactTag(), child.getReactTag());
+      int childIndex = parent.getChildCount();
+      parent.addChildAt(child, childIndex);
+      ViewAtIndex[] viewsToAdd =
+        new ViewAtIndex[]{new ViewAtIndex(child.getReactTag(), childIndex)};
+      mUIViewOperationQueue.enqueueManageChildren(
+        parent.getReactTag(),
+        null,
+        viewsToAdd,
+        null
+      );
     } catch (Exception e) {
       handleException(parent.getThemedContext(), e);
     }
@@ -209,8 +218,7 @@ public void completeRoot(int rootTag, List<ReactShadowNode> childList) {
         "Root view with tag " + rootTag + " must be added before completeRoot is called");
       for (int i = 0; i < childList.size(); i++) {
         ReactShadowNode child = childList.get(i);
-        rootNode.addChildAt(child, i);
-        addChild(rootTag, child.getReactTag());
+        appendChild(rootNode, child);
       }
 
       calculateRootLayout(rootNode);
@@ -222,15 +230,6 @@ public void completeRoot(int rootTag, List<ReactShadowNode> childList) {
     }
   }
 
-  private void addChild(int parent, int child) {
-    JavaOnlyArray childrenTags = new JavaOnlyArray();
-    childrenTags.pushInt(child);
-    mUIViewOperationQueue.enqueueSetChildren(
-      parent,
-      childrenTags
-    );
-  }
-
   private void calculateRootLayout(ReactShadowNode cssRoot) {
     cssRoot.calculateLayout();
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java
index 18d95d7c17160f..6000e0554c854f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.java
@@ -13,7 +13,7 @@
  * Data structure that couples view tag to it's index in parent view. Used for managing children
  * operation.
  */
-/* package */ class ViewAtIndex {
+public class ViewAtIndex {
   public static Comparator<ViewAtIndex> COMPARATOR = new Comparator<ViewAtIndex>() {
     @Override
     public int compare(ViewAtIndex lhs, ViewAtIndex rhs) {

From 7216079a7915fe3b06de72a831c22a6bb4ff1aad Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Thu, 1 Mar 2018 16:53:36 -0800
Subject: [PATCH 144/267] Avoid var specific hoisting rules

Reviewed By: sahrens

Differential Revision: D7116184

fbshipit-source-id: 4fd1654028e52f5aafad348546b889f1737c7399
---
 .../ActivityIndicator/ActivityIndicator.js      | 17 +++++++++--------
 Libraries/Components/TextInput/TextInput.js     | 10 +++++++---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
index 6f9d34966dc284..a520b657904738 100644
--- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js
+++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js
@@ -21,6 +21,7 @@ const ViewPropTypes = require('ViewPropTypes');
 
 const createReactClass = require('create-react-class');
 const requireNativeComponent = require('requireNativeComponent');
+let RCTActivityIndicator;
 
 const GRAY = '#999999';
 
@@ -120,6 +121,14 @@ const ActivityIndicator = createReactClass({
   }
 });
 
+if (Platform.OS === 'ios') {
+  RCTActivityIndicator = requireNativeComponent(
+    'RCTActivityIndicatorView',
+    ActivityIndicator,
+    { nativeOnly: { activityIndicatorViewStyle: true } }
+  );
+}
+
 const styles = StyleSheet.create({
   container: {
     alignItems: 'center',
@@ -135,12 +144,4 @@ const styles = StyleSheet.create({
   },
 });
 
-if (Platform.OS === 'ios') {
-  var RCTActivityIndicator = requireNativeComponent(
-    'RCTActivityIndicatorView',
-    ActivityIndicator,
-    { nativeOnly: { activityIndicatorViewStyle: true } }
-  );
-}
-
 module.exports = ActivityIndicator;
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 383e7e6ac35027..6b812a2cf4150a 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -39,6 +39,10 @@ const requireNativeComponent = require('requireNativeComponent');
  * run Flow. */
 const warning = require('fbjs/lib/warning');
 
+let AndroidTextInput;
+let RCTMultilineTextInputView;
+let RCTSinglelineTextInputView;
+
 const onlyMultiline = {
   onTextInput: true,
   children: true,
@@ -47,13 +51,13 @@ const onlyMultiline = {
 import type {ViewChildContext} from 'ViewContext';
 
 if (Platform.OS === 'android') {
-  var AndroidTextInput = requireNativeComponent('AndroidTextInput', null);
+  AndroidTextInput = requireNativeComponent('AndroidTextInput', null);
 } else if (Platform.OS === 'ios') {
-  var RCTMultilineTextInputView = requireNativeComponent(
+  RCTMultilineTextInputView = requireNativeComponent(
     'RCTMultilineTextInputView',
     null,
   );
-  var RCTSinglelineTextInputView = requireNativeComponent(
+  RCTSinglelineTextInputView = requireNativeComponent(
     'RCTSinglelineTextInputView',
     null,
   );

From 7be3d1cbafa4434b05b8ae5b3ec2ba08a5edac9c Mon Sep 17 00:00:00 2001
From: Rafael Oleza <rafeca@fb.com>
Date: Fri, 2 Mar 2018 02:47:42 -0800
Subject: [PATCH 145/267] Make the chrome debugger handle dynamic delta ids

Differential Revision: D7112419

fbshipit-source-id: 1d80c0c13144dd19bbcd5535383befc6567cacf7
---
 .../server/util/debugger-ui/DeltaPatcher.js   |  8 +++++++
 .../util/debugger-ui/deltaUrlToBlobUrl.js     | 24 +++++++++----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/local-cli/server/util/debugger-ui/DeltaPatcher.js b/local-cli/server/util/debugger-ui/DeltaPatcher.js
index c137894942c51c..ecc92dce7b0ec1 100644
--- a/local-cli/server/util/debugger-ui/DeltaPatcher.js
+++ b/local-cli/server/util/debugger-ui/DeltaPatcher.js
@@ -30,6 +30,7 @@
         pre: new Map(),
         post: new Map(),
         modules: new Map(),
+        id: undefined,
       };
       this._initialized = false;
       this._lastNumModifiedFiles = 0;
@@ -66,6 +67,7 @@
           pre: new Map(),
           post: new Map(),
           modules: new Map(),
+          id: undefined,
         };
       }
 
@@ -80,9 +82,15 @@
       this._patchMap(this._lastBundle.post, deltaBundle.post);
       this._patchMap(this._lastBundle.modules, deltaBundle.delta);
 
+      this._lastBundle.id = deltaBundle.id;
+
       return this;
     }
 
+    getLastBundleId() {
+      return this._lastBundle.id;
+    }
+
     /**
      * Returns the number of modified files in the last received Delta. This is
      * currently used to populate the `X-Metro-Files-Changed-Count` HTTP header
diff --git a/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js b/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js
index afc1dd5caea3d6..d611062952aa22 100644
--- a/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js
+++ b/local-cli/server/util/debugger-ui/deltaUrlToBlobUrl.js
@@ -20,31 +20,34 @@
    * whole JS bundle Blob.
    */
   async function deltaUrlToBlobUrl(deltaUrl) {
-    let cachedBundle = cachedBundleUrls.get(deltaUrl);
+    const client = global.DeltaPatcher.get(deltaUrl);
 
-    const deltaBundleId = cachedBundle
-      ? `&deltaBundleId=${cachedBundle.id}`
+    const deltaBundleId = client.getLastBundleId()
+      ? `&deltaBundleId=${client.getLastBundleId()}`
       : '';
 
     const data = await fetch(deltaUrl + deltaBundleId);
     const bundle = await data.json();
 
-    const deltaPatcher = global.DeltaPatcher.get(bundle.id).applyDelta({
+    const deltaPatcher = client.applyDelta({
+      id: bundle.id,
       pre: new Map(bundle.pre),
       post: new Map(bundle.post),
       delta: new Map(bundle.delta),
       reset: bundle.reset,
     });
 
+    let cachedBundle = cachedBundleUrls.get(deltaUrl);
+
     // If nothing changed, avoid recreating a bundle blob by reusing the
     // previous one.
     if (deltaPatcher.getLastNumModifiedFiles() === 0 && cachedBundle) {
-      return cachedBundle.url;
+      return cachedBundle;
     }
 
     // Clean up the previous bundle URL to not leak memory.
     if (cachedBundle) {
-      URL.revokeObjectURL(cachedBundle.url);
+      URL.revokeObjectURL(cachedBundle);
     }
 
     // To make Source Maps work correctly, we need to add a newline between
@@ -58,13 +61,10 @@
       type: 'application/javascript',
     });
 
-    const bundleUrl = URL.createObjectURL(blob);
-    cachedBundleUrls.set(deltaUrl, {
-      id: bundle.id,
-      url: bundleUrl,
-    });
+    const bundleContents = URL.createObjectURL(blob);
+    cachedBundleUrls.set(deltaUrl, bundleContents);
 
-    return bundleUrl;
+    return bundleContents;
   }
 
   global.deltaUrlToBlobUrl = deltaUrlToBlobUrl;

From 30469ed00170a74743d2ba5aadce61aae742715c Mon Sep 17 00:00:00 2001
From: Leo Natan <lnatan@wix.com>
Date: Fri, 2 Mar 2018 13:59:33 -0800
Subject: [PATCH 146/267] Expose React Native version as a symbol rather than
 macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Add RCTGetReactNativeVersion() to expose version in native code. Right now, version is exposed internally to RN using a MACRO constant. This exposes a symbol (function) that can be called to retrieve the React Native version in iOS.

Also exposed RCTVersion.h as a public header in the React project so it is available to developers.

The motivation behind this is for https://github.com/wix/detox —we need to know what RN version the user has, if any, so we can properly handle support and abstract differences.

Ran bump-oss-version.js to ensure the template is applied properly. Also compiled the project to make sure nothing is broken.

 [IOS] [ENHANCEMENT] [RCTVersion.h] - Expose version as a compile-time symbol for native queries

<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
Closes https://github.com/facebook/react-native/pull/18136

Differential Revision: D7141076

Pulled By: hramos

fbshipit-source-id: 18a92b8c60d7b43fa0ed22597ea46a35cff73c56
---
 React/Base/RCTPlatform.m                      |  2 +-
 React/Base/RCTVersion.h                       | 17 +++++-----
 React/Base/RCTVersion.m                       | 33 +++++++++++++++++++
 React/React.xcodeproj/project.pbxproj         |  8 +++++
 scripts/bump-oss-version.js                   |  4 +--
 .../versiontemplates/RCTVersion.h.template    | 15 ---------
 .../versiontemplates/RCTVersion.m.template    | 33 +++++++++++++++++++
 7 files changed, 86 insertions(+), 26 deletions(-)
 create mode 100644 React/Base/RCTVersion.m
 delete mode 100644 scripts/versiontemplates/RCTVersion.h.template
 create mode 100644 scripts/versiontemplates/RCTVersion.m.template

diff --git a/React/Base/RCTPlatform.m b/React/Base/RCTPlatform.m
index 8aed9fe386947f..4c1124b54cce58 100644
--- a/React/Base/RCTPlatform.m
+++ b/React/Base/RCTPlatform.m
@@ -45,7 +45,7 @@ + (BOOL)requiresMainQueueSetup
     @"systemName": [device systemName],
     @"interfaceIdiom": interfaceIdiom([device userInterfaceIdiom]),
     @"isTesting": @(RCTRunningInTestEnvironment()),
-    @"reactNativeVersion": RCT_REACT_NATIVE_VERSION,
+    @"reactNativeVersion": RCTGetReactNativeVersion(),
   };
 }
 
diff --git a/React/Base/RCTVersion.h b/React/Base/RCTVersion.h
index f224a341af3eaa..ca46f31421eac3 100644
--- a/React/Base/RCTVersion.h
+++ b/React/Base/RCTVersion.h
@@ -1,15 +1,16 @@
 /**
- * @generated by scripts/bump-oss-version.js
- *
  * Copyright (c) 2015-present, Facebook, Inc.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
-#define RCT_REACT_NATIVE_VERSION @{ \
-  @"major": @(0), \
-  @"minor": @(0), \
-  @"patch": @(0), \
-  @"prerelease": [NSNull null], \
-}
+
+#import <Foundation/Foundation.h>
+
+extern NSString* const RCTVersionMajor;
+extern NSString* const RCTVersionMinor;
+extern NSString* const RCTVersionPatch;
+extern NSString* const RCTVersionPrerelease;
+
+extern NSDictionary* RCTGetReactNativeVersion(void);
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
new file mode 100644
index 00000000000000..41f178395c9018
--- /dev/null
+++ b/React/Base/RCTVersion.m
@@ -0,0 +1,33 @@
+/**
+ * @generated by scripts/bump-oss-version.js
+ *
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTVersion.h"
+
+NSString* const RCTVersionMajor = @"major";
+NSString* const RCTVersionMinor = @"minor";
+NSString* const RCTVersionPatch = @"patch";
+NSString* const RCTVersionPrerelease = @"prerelease";
+
+static NSDictionary* __rnVersion;
+
+__attribute__((constructor))
+static void __makeVersion()
+{
+  __rnVersion = @{
+                  RCTVersionMajor: @(0),
+                  RCTVersionMinor: @(0),
+                  RCTVersionPatch: @(0),
+                  RCTVersionPrerelease: [NSNull null],
+                  };
+}
+
+NSDictionary* RCTGetReactNativeVersion(void)
+{
+  return __rnVersion;
+}
diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
index 0f79353b3f2dea..1ec79122f44a68 100644
--- a/React/React.xcodeproj/project.pbxproj
+++ b/React/React.xcodeproj/project.pbxproj
@@ -334,6 +334,9 @@
 		352DCFF01D19F4C20056D623 /* RCTI18nUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 352DCFEF1D19F4C20056D623 /* RCTI18nUtil.m */; };
 		369123E11DDC75850095B341 /* RCTJSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */; };
 		391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 391E86A21C623EC800009732 /* RCTTouchEvent.m */; };
+		39C50FF92046EACF00CEE534 /* RCTVersion.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 199B8A6E1F44DB16005DEF67 /* RCTVersion.h */; };
+		39C50FFB2046EE3500CEE534 /* RCTVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 39C50FFA2046EE3500CEE534 /* RCTVersion.m */; };
+		39C50FFC2046EE3500CEE534 /* RCTVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 39C50FFA2046EE3500CEE534 /* RCTVersion.m */; };
 		3D05745A1DE5FFF500184BB4 /* RCTJavaScriptLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */; };
 		3D0B84221EC0B3F600B2BD8E /* RCTResizeMode.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0851DE4F3A000E03CC6 /* RCTResizeMode.h */; };
 		3D0B84231EC0B40D00B2BD8E /* RCTImageLoader.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0831DE4F3A000E03CC6 /* RCTImageLoader.h */; };
@@ -1589,6 +1592,7 @@
 			dstPath = include/React;
 			dstSubfolderSpec = 16;
 			files = (
+				39C50FF92046EACF00CEE534 /* RCTVersion.h in Copy Headers */,
 				591F78DE202ADB8F004A668C /* RCTLayout.h in Copy Headers */,
 				59EDBCBD1FDF4E43003573DE /* RCTScrollableProtocol.h in Copy Headers */,
 				59EDBCBE1FDF4E43003573DE /* (null) in Copy Headers */,
@@ -2059,6 +2063,7 @@
 		369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJSCSamplingProfiler.m; sourceTree = "<group>"; };
 		391E86A21C623EC800009732 /* RCTTouchEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTouchEvent.m; sourceTree = "<group>"; };
 		391E86A31C623EC800009732 /* RCTTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTouchEvent.h; sourceTree = "<group>"; };
+		39C50FFA2046EE3500CEE534 /* RCTVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTVersion.m; sourceTree = "<group>"; };
 		3D0B84281EC0B49400B2BD8E /* RCTTVRemoteHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVRemoteHandler.h; sourceTree = "<group>"; };
 		3D0B84291EC0B49400B2BD8E /* RCTTVRemoteHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTVRemoteHandler.m; sourceTree = "<group>"; };
 		3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVNavigationEventEmitter.h; sourceTree = "<group>"; };
@@ -2997,6 +3002,7 @@
 				83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */,
 				83CBBA501A601E3B00E9B192 /* RCTUtils.m */,
 				199B8A6E1F44DB16005DEF67 /* RCTVersion.h */,
+				39C50FFA2046EE3500CEE534 /* RCTVersion.m */,
 				599FAA291FB274970058CCF6 /* Surface */,
 			);
 			path = Base;
@@ -4153,6 +4159,7 @@
 				5960C1BC1F0804A00066FD5B /* RCTLayoutAnimationGroup.m in Sources */,
 				2D3B5ECF1D9B096F00451313 /* RCTFont.mm in Sources */,
 				2D3B5ED51D9B098000451313 /* RCTModalHostViewController.m in Sources */,
+				39C50FFC2046EE3500CEE534 /* RCTVersion.m in Sources */,
 				2D3B5EBC1D9B092600451313 /* RCTKeyboardObserver.m in Sources */,
 				657734931EE8356100A0E9EA /* RCTInspector.mm in Sources */,
 				59EB6DBE1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.mm in Sources */,
@@ -4467,6 +4474,7 @@
 				13D9FEEB1CDCCECF00158BD7 /* RCTEventEmitter.m in Sources */,
 				599FAA3E1FB274980058CCF6 /* RCTSurfaceRootShadowView.m in Sources */,
 				AC70D2E91DE489E4002E6351 /* RCTJavaScriptLoader.mm in Sources */,
+				39C50FFB2046EE3500CEE534 /* RCTVersion.m in Sources */,
 				14F7A0EC1BDA3B3C003C6C10 /* RCTPerfMonitor.m in Sources */,
 				5960C1B71F0804A00066FD5B /* RCTLayoutAnimation.m in Sources */,
 				13134C9E1E296B2A00B9F3CB /* RCTCxxModule.mm in Sources */,
diff --git a/scripts/bump-oss-version.js b/scripts/bump-oss-version.js
index 03f5ec19093df2..11ac0f940e0f95 100755
--- a/scripts/bump-oss-version.js
+++ b/scripts/bump-oss-version.js
@@ -67,8 +67,8 @@ fs.writeFileSync(
 );
 
 fs.writeFileSync(
-  'React/Base/RCTVersion.h',
-  cat('scripts/versiontemplates/RCTVersion.h.template')
+  'React/Base/RCTVersion.m',
+  cat('scripts/versiontemplates/RCTVersion.m.template')
     .replace('${major}', `@(${major})`)
     .replace('${minor}', `@(${minor})`)
     .replace('${patch}', `@(${patch})`)
diff --git a/scripts/versiontemplates/RCTVersion.h.template b/scripts/versiontemplates/RCTVersion.h.template
deleted file mode 100644
index 1ab81aacc44aec..00000000000000
--- a/scripts/versiontemplates/RCTVersion.h.template
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @generated by scripts/bump-oss-version.js
- *
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#define RCT_REACT_NATIVE_VERSION @{ \
-  @"major": ${major}, \
-  @"minor": ${minor}, \
-  @"patch": ${patch}, \
-  @"prerelease": ${prerelease}, \
-}
diff --git a/scripts/versiontemplates/RCTVersion.m.template b/scripts/versiontemplates/RCTVersion.m.template
new file mode 100644
index 00000000000000..a550fb3216014d
--- /dev/null
+++ b/scripts/versiontemplates/RCTVersion.m.template
@@ -0,0 +1,33 @@
+/**
+ * @generated by scripts/bump-oss-version.js
+ *
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTVersion.h"
+
+NSString* const RCTVersionMajor = @"major";
+NSString* const RCTVersionMinor = @"minor";
+NSString* const RCTVersionPatch = @"patch";
+NSString* const RCTVersionPrerelease = @"prerelease";
+
+static NSDictionary* __rnVersion;
+
+__attribute__((constructor))
+static void __makeVersion()
+{
+  __rnVersion = @{
+                  RCTVersionMajor: ${major},
+                  RCTVersionMinor: ${minor},
+                  RCTVersionPatch: ${patch},
+                  RCTVersionPrerelease: ${prerelease},
+                  };
+}
+
+NSDictionary* RCTGetReactNativeVersion(void)
+{
+  return __rnVersion;
+}

From 5d3efa7d6f33c8ba9665e3145ebf2ba9649541bc Mon Sep 17 00:00:00 2001
From: Michael Lee <mzlee@fb.com>
Date: Fri, 2 Mar 2018 16:46:03 -0800
Subject: [PATCH 147/267] Mark targets as explicitly Android

Reviewed By: mmmulani

Differential Revision: D7141568

fbshipit-source-id: 6c8679790309e72ca220443ecf693087f82ece85
---
 ReactAndroid/src/main/jni/packagerconnection/BUCK | 5 +++--
 ReactAndroid/src/main/jni/react/jni/BUCK          | 5 +++--
 ReactAndroid/src/main/jni/react/perftests/BUCK    | 5 +++--
 ReactNative/DEFS.bzl                              | 3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ReactAndroid/src/main/jni/packagerconnection/BUCK b/ReactAndroid/src/main/jni/packagerconnection/BUCK
index b1095f42d35021..caede999292be2 100644
--- a/ReactAndroid/src/main/jni/packagerconnection/BUCK
+++ b/ReactAndroid/src/main/jni/packagerconnection/BUCK
@@ -1,6 +1,6 @@
-load("//ReactNative:DEFS.bzl", "cxx_library", "FBJNI_TARGET", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "IS_OSS_BUILD", "react_native_xplat_target")
+load("//ReactNative:DEFS.bzl", "rn_xplat_cxx_library", "FBJNI_TARGET", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "ANDROID", "IS_OSS_BUILD", "react_native_xplat_target")
 
-cxx_library(
+rn_xplat_cxx_library(
     name = "jni",
     srcs = glob(["*.cpp"]),
     headers = glob(
@@ -16,6 +16,7 @@ cxx_library(
     ],
     fbandroid_deps = ANDROID_JSC_DEPS,
     fbobjc_deps = APPLE_JSC_DEPS,
+    platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"PackagerConnectionJNI\"",
         "-DWITH_FBSYSTRACE=1",
diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK
index a33e775d459d3d..7673ad3bdfd348 100644
--- a/ReactAndroid/src/main/jni/react/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/jni/BUCK
@@ -1,4 +1,4 @@
-load("//ReactNative:DEFS.bzl", "cxx_library", "react_native_xplat_target", "FBJNI_TARGET", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "IS_OSS_BUILD")
+load("//ReactNative:DEFS.bzl", "rn_xplat_cxx_library", "react_native_xplat_target", "FBJNI_TARGET", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "ANDROID", "IS_OSS_BUILD")
 
 EXPORTED_HEADERS = [
     "AndroidJSCFactory.h",
@@ -20,7 +20,7 @@ EXPORTED_HEADERS = [
     "WritableNativeMap.h",
 ]
 
-cxx_library(
+rn_xplat_cxx_library(
     name = "jni",
     srcs = glob(["*.cpp"]),
     headers = glob(
@@ -41,6 +41,7 @@ cxx_library(
     fbandroid_allow_jni_merging = True,
     fbandroid_deps = ANDROID_JSC_DEPS,
     fbobjc_deps = APPLE_JSC_DEPS,
+    platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNativeJNI\"",
         "-DWITH_FBSYSTRACE=1",
diff --git a/ReactAndroid/src/main/jni/react/perftests/BUCK b/ReactAndroid/src/main/jni/react/perftests/BUCK
index 4a9c42a4ee1a0e..6baeaf89834a06 100644
--- a/ReactAndroid/src/main/jni/react/perftests/BUCK
+++ b/ReactAndroid/src/main/jni/react/perftests/BUCK
@@ -1,12 +1,13 @@
-load("//ReactNative:DEFS.bzl", "cxx_library", "react_native_xplat_target")
+load("//ReactNative:DEFS.bzl", "rn_xplat_cxx_library", "react_native_xplat_target", "ANDROID")
 
-cxx_library(
+rn_xplat_cxx_library(
     name = "perftests",
     srcs = ["OnLoad.cpp"],
     compiler_flags = [
         "-fexceptions",
         "-std=c++1y",
     ],
+    platforms = ANDROID,
     soname = "libnativereactperftests.$(ext)",
     visibility = [
         "fbandroid//instrumentation_tests/com/facebook/react/...",
diff --git a/ReactNative/DEFS.bzl b/ReactNative/DEFS.bzl
index 9cca53e663b890..8842ed74f8cd23 100644
--- a/ReactNative/DEFS.bzl
+++ b/ReactNative/DEFS.bzl
@@ -21,6 +21,7 @@ ANDROID_JSC_INTERNAL_DEPS = [
     '//native/third-party/jsc:jsc_legacy_profiler',
 ]
 ANDROID_JSC_DEPS = ANDROID_JSC_INTERNAL_DEPS
+ANDROID = "Android"
 
 YOGA_TARGET = '//ReactAndroid/src/main/java/com/facebook:yoga'
 FBGLOGINIT_TARGET = '//ReactAndroid/src/main/jni/first-party/fbgloginit:fbgloginit'
@@ -33,7 +34,7 @@ with allow_unsafe_import():
 
 
 # Building is not supported in OSS right now
-def rn_xplat_cxx_library(name, **kwargs):
+def rn_xplat_cxx_library(name, platforms = None, **kwargs):
     cxx_library(name=name, **kwargs)
 
 

From 0d148ad67a0efd142d520860b4ca16df1446b749 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Fri, 2 Mar 2018 17:10:59 -0800
Subject: [PATCH 148/267] Refactor FabricUIManagerModule -> FabricUIManager

Reviewed By: fkgozali

Differential Revision: D7125829

fbshipit-source-id: 46f9722a20e0bbf7f99a0cc36067035b009d73d8
---
 .../main/java/com/facebook/react/fabric/FabricBinding.java  | 2 +-
 .../{FabricUIManagerModule.java => FabricUIManager.java}    | 6 +++---
 .../com/facebook/react/fabric/RootShadowNodeRegistry.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename ReactAndroid/src/main/java/com/facebook/react/fabric/{FabricUIManagerModule.java => FabricUIManager.java} (98%)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
index 2f09ef700bed77..37a943afac69b7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricBinding.java
@@ -4,6 +4,6 @@
 
 public interface FabricBinding {
 
-  void installFabric(JavaScriptContextHolder jsContext, FabricUIManagerModule fabricModule);
+  void installFabric(JavaScriptContextHolder jsContext, FabricUIManager fabricModule);
 
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
similarity index 98%
rename from ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
rename to ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index b16c7067717213..ed8369cba76b1b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -36,15 +36,15 @@
  * Fabric API.
  */
 @SuppressWarnings("unused") // used from JNI
-public class FabricUIManagerModule implements UIManager {
+public class FabricUIManager implements UIManager {
 
-  private static final String TAG = FabricUIManagerModule.class.toString();
+  private static final String TAG = FabricUIManager.class.toString();
   private final RootShadowNodeRegistry mRootShadowNodeRegistry = new RootShadowNodeRegistry();
   private final ReactApplicationContext mReactApplicationContext;
   private final ViewManagerRegistry mViewManagerRegistry;
   private final UIViewOperationQueue mUIViewOperationQueue;
 
-  public FabricUIManagerModule(ReactApplicationContext reactContext,
+  public FabricUIManager(ReactApplicationContext reactContext,
     ViewManagerRegistry viewManagerRegistry) {
     mReactApplicationContext = reactContext;
     mViewManagerRegistry = viewManagerRegistry;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java
index 5aeff65500afca..95f2c1cedaee02 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/RootShadowNodeRegistry.java
@@ -5,7 +5,7 @@
 
 /**
  * Simple container class to keep track of {@link ReactShadowNode}s that represents the Root
- * Shadow Nodes of a {@link FabricUIManagerModule}
+ * Shadow Nodes of a {@link FabricUIManager}
  */
 public class RootShadowNodeRegistry {
 

From ffcd06797783d3f550aadd53f2154f53985f72ac Mon Sep 17 00:00:00 2001
From: Shoaib Meenai <smeenai@fb.com>
Date: Fri, 2 Mar 2018 19:05:03 -0800
Subject: [PATCH 149/267] Wrap global variables in extern C

Reviewed By: compnerd

Differential Revision: D7144899

fbshipit-source-id: d40bda0e9225734398e35adc582b8932c0280b24
---
 React/Base/RCTBundleURLProvider.h    | 8 ++++++++
 React/DevSupport/RCTPackagerClient.h | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/React/Base/RCTBundleURLProvider.h b/React/Base/RCTBundleURLProvider.h
index 234b7ebf4f5e2c..23ed40cbfccba8 100644
--- a/React/Base/RCTBundleURLProvider.h
+++ b/React/Base/RCTBundleURLProvider.h
@@ -7,10 +7,18 @@
 
 #import <Foundation/Foundation.h>
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 extern NSString *const RCTBundleURLProviderUpdatedNotification;
 
 extern const NSUInteger kRCTBundleURLProviderDefaultPort;
 
+#if defined(__cplusplus)
+}
+#endif
+
 @interface RCTBundleURLProvider : NSObject
 
 /**
diff --git a/React/DevSupport/RCTPackagerClient.h b/React/DevSupport/RCTPackagerClient.h
index fb8e8961afffa3..230d685f4e2a11 100644
--- a/React/DevSupport/RCTPackagerClient.h
+++ b/React/DevSupport/RCTPackagerClient.h
@@ -12,8 +12,16 @@
 @class RCTPackagerClientResponder;
 @class RCTReconnectingWebSocket;
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 extern const int RCT_PACKAGER_CLIENT_PROTOCOL_VERSION;
 
+#if defined(__cplusplus)
+}
+#endif
+
 @protocol RCTPackagerClientMethod <NSObject>
 
 - (void)handleRequest:(NSDictionary<NSString *, id> *)params withResponder:(RCTPackagerClientResponder *)responder;

From 34b8876ac6510398e03a03c94f4ffb9aaa7519d3 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Fri, 2 Mar 2018 19:32:09 -0800
Subject: [PATCH 150/267] iOS: Introduced RCTSurfaceHostingProxyRootView for
 migration to RCTSurfaceHostingView

Summary:
To help with migration from direct usages of RCTRootView to RCTSurfaceHostingView, RCTSurfaceHostingProxyRootView is added, which is simply a custom impl of RCTSurfaceHostingView, but will all RCTRootView APIs preserved. This makes it easy to do a drop-in replacement in native callsites:

```
// before:
RCTRootView *rootView = [[RCTRootView alloc] init...];

// after:
RCTRootView *rootView = (RCTRootView *)[[RCTSurfaceHostingProxyRootView alloc] init...];
```

Reviewed By: shergin

Differential Revision: D7141696

fbshipit-source-id: db8c447749eaa896efaa37774a9babef132128eb
---
 .../RCTSurfaceHostingProxyRootView.h          |  65 ++++++
 .../RCTSurfaceHostingProxyRootView.mm         | 205 ++++++++++++++++++
 .../RCTSurfaceHostingView.h                   |  12 +-
 .../RCTSurfaceHostingView.mm                  |  20 +-
 4 files changed, 295 insertions(+), 7 deletions(-)
 create mode 100644 React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
 create mode 100644 React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm

diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
new file mode 100644
index 00000000000000..b761cc33bde868
--- /dev/null
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTRootView.h>
+
+#import "RCTSurfaceHostingView.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * This is a RCTRootView-compatible implementation of RCTSurfaceHostingView.
+ * Use this class to replace all usages of RCTRootView in the app for easier migration
+ * to RCTSurfaceHostingView.
+ *
+ * WARNING: In the future, RCTRootView will be deprecated in favor of RCTSurfaceHostingView.
+ */
+@interface RCTSurfaceHostingProxyRootView : RCTSurfaceHostingView
+
+#pragma mark RCTRootView compatibility - keep these sync'ed with RCTRootView.h
+
+@property (nonatomic, copy, readonly) NSString *moduleName;
+@property (nonatomic, strong, readonly) RCTBridge *bridge;
+@property (nonatomic, copy, readwrite) NSDictionary *appProperties;
+@property (nonatomic, assign) RCTRootViewSizeFlexibility sizeFlexibility;
+@property (nonatomic, weak) id<RCTRootViewDelegate> delegate;
+@property (nonatomic, weak) UIViewController *reactViewController;
+@property (nonatomic, strong, readonly) UIView *contentView;
+@property (nonatomic, strong) UIView *loadingView;
+@property (nonatomic, assign) BOOL passThroughTouches;
+@property (nonatomic, assign) NSTimeInterval loadingViewFadeDelay;
+@property (nonatomic, assign) NSTimeInterval loadingViewFadeDuration;
+@property (nonatomic, assign) BOOL fabric;
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+                        fabric:(BOOL)fabric NS_DESIGNATED_INITIALIZER;
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties;
+
+- (instancetype)initWithBundleURL:(NSURL *)bundleURL
+                       moduleName:(NSString *)moduleName
+                initialProperties:(NSDictionary *)initialProperties
+                    launchOptions:(NSDictionary *)launchOptions;
+
+- (instancetype)initWithBundleURL:(NSURL *)bundleURL
+                       moduleName:(NSString *)moduleName
+                initialProperties:(NSDictionary *)initialProperties
+                    launchOptions:(NSDictionary *)launchOptions
+                           fabric:(BOOL)fabric;
+
+- (void)cancelTouches;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
new file mode 100644
index 00000000000000..114b1f3981bfc3
--- /dev/null
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
@@ -0,0 +1,205 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTSurfaceHostingProxyRootView.h"
+
+#import <objc/runtime.h>
+
+#import "RCTAssert.h"
+#import "RCTBridge.h"
+#import "RCTLog.h"
+#import "RCTPerformanceLogger.h"
+#import "RCTProfile.h"
+#import "RCTRootContentView.h"
+#import "RCTRootViewDelegate.h"
+#import "RCTSurface.h"
+#import "UIView+React.h"
+
+static RCTSurfaceSizeMeasureMode convertToSurfaceSizeMeasureMode(RCTRootViewSizeFlexibility sizeFlexibility) {
+  switch (sizeFlexibility) {
+    case RCTRootViewSizeFlexibilityWidthAndHeight:
+      return RCTSurfaceSizeMeasureModeWidthUndefined | RCTSurfaceSizeMeasureModeHeightUndefined;
+    case RCTRootViewSizeFlexibilityWidth:
+      return RCTSurfaceSizeMeasureModeWidthUndefined | RCTSurfaceSizeMeasureModeHeightExact;
+    case RCTRootViewSizeFlexibilityHeight:
+      return RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightUndefined;
+    case RCTRootViewSizeFlexibilityNone:
+      return RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact;
+  }
+}
+
+static RCTRootViewSizeFlexibility convertToRootViewSizeFlexibility(RCTSurfaceSizeMeasureMode sizeMeasureMode) {
+  switch (sizeMeasureMode) {
+    case RCTSurfaceSizeMeasureModeWidthUndefined | RCTSurfaceSizeMeasureModeHeightUndefined:
+      return RCTRootViewSizeFlexibilityWidthAndHeight;
+    case RCTSurfaceSizeMeasureModeWidthUndefined | RCTSurfaceSizeMeasureModeHeightExact:
+      return RCTRootViewSizeFlexibilityWidth;
+    case RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightUndefined:
+      return RCTRootViewSizeFlexibilityHeight;
+    case RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact:
+    default:
+      return RCTRootViewSizeFlexibilityNone;
+  }
+}
+
+@implementation RCTSurfaceHostingProxyRootView
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+                        fabric:(BOOL)fabric
+{
+  RCTAssertMainQueue();
+  RCTAssert(bridge, @"A bridge instance is required to create an RCTSurfaceHostingProxyRootView");
+  RCTAssert(moduleName, @"A moduleName is required to create an RCTSurfaceHostingProxyRootView");
+
+  RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTSurfaceHostingProxyRootView init]", nil);
+  if (!bridge.isLoading) {
+    [bridge.performanceLogger markStartForTag:RCTPLTTI];
+  }
+
+  if (self = [super initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:fabric]) {
+    self.backgroundColor = [UIColor whiteColor];
+  }
+
+  RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
+
+  return self;
+}
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+{
+  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:NO];
+}
+
+- (instancetype)initWithBundleURL:(NSURL *)bundleURL
+                       moduleName:(NSString *)moduleName
+                initialProperties:(NSDictionary *)initialProperties
+                    launchOptions:(NSDictionary *)launchOptions
+                           fabric:(BOOL)fabric
+{
+  RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:bundleURL
+                                            moduleProvider:nil
+                                             launchOptions:launchOptions];
+
+  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:fabric];
+}
+
+- (instancetype)initWithBundleURL:(NSURL *)bundleURL
+                       moduleName:(NSString *)moduleName
+                initialProperties:(NSDictionary *)initialProperties
+                    launchOptions:(NSDictionary *)launchOptions
+{
+  return [self initWithBundleURL:bundleURL moduleName:moduleName initialProperties:initialProperties launchOptions:launchOptions fabric:NO];
+}
+
+RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
+RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder)
+
+# pragma mark proxy methods to RCTSurfaceHostingView
+
+- (NSString *)moduleName
+{
+  return super.surface.moduleName;
+}
+
+- (RCTBridge *)bridge
+{
+  return super.surface.bridge;
+}
+
+- (BOOL)fabric
+{
+  return super.surface.fabric;
+}
+
+- (UIView *)contentView
+{
+  return self;
+}
+
+- (NSNumber *)reactTag
+{
+  return super.surface.rootViewTag;
+}
+
+- (RCTRootViewSizeFlexibility)sizeFlexibility
+{
+  return convertToRootViewSizeFlexibility(super.sizeMeasureMode);
+}
+
+- (void)setSizeFlexibility:(RCTRootViewSizeFlexibility)sizeFlexibility
+{
+  super.sizeMeasureMode = convertToSurfaceSizeMeasureMode(sizeFlexibility);
+}
+
+- (NSDictionary *)appProperties
+{
+  return super.surface.properties;
+}
+
+- (void)setAppProperties:(NSDictionary *)appProperties
+{
+  [super.surface setProperties:appProperties];
+}
+
+- (CGSize)intrinsicContentSize
+{
+  return super.surface.intrinsicSize;
+}
+
+- (UIView *)loadingView
+{
+  return super.activityIndicatorViewFactory ? super.activityIndicatorViewFactory() : nil;
+}
+
+- (void)setLoadingView:(UIView *)loadingView
+{
+  super.activityIndicatorViewFactory = ^UIView *(void) {
+    return loadingView;
+  };
+}
+
+#pragma mark RCTSurfaceDelegate proxying
+
+- (void)surface:(RCTSurface *)surface didChangeStage:(RCTSurfaceStage)stage
+{
+  [super surface:surface didChangeStage:stage];
+  if (RCTSurfaceStageIsRunning(stage)) {
+    [super.surface.bridge.performanceLogger markStopForTag:RCTPLTTI];
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [[NSNotificationCenter defaultCenter] postNotificationName:RCTContentDidAppearNotification
+                                                          object:self];
+    });
+  }
+}
+
+- (void)surface:(RCTSurface *)surface didChangeIntrinsicSize:(CGSize)intrinsicSize
+{
+  [super surface:surface didChangeIntrinsicSize:intrinsicSize];
+
+  [_delegate rootViewDidChangeIntrinsicSize:(RCTRootView *)self];
+}
+
+#pragma mark legacy
+
+- (UIViewController *)reactViewController
+{
+  return _reactViewController ?: [super reactViewController];
+}
+
+#pragma mark unsupported
+
+- (void)cancelTouches
+{
+  // Not supported.
+}
+
+@end
+
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
index 340a7c33b1987d..6f6ffe50f599ac 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
@@ -7,6 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
+#import <React/RCTSurfaceDelegate.h>
 #import <React/RCTSurfaceSizeMeasureMode.h>
 #import <React/RCTSurfaceStage.h>
 
@@ -23,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
  * This class can be used as easy-to-use general purpose integration point
  * of ReactNative-powered experiences in UIKit based apps.
  */
-@interface RCTSurfaceHostingView : UIView
+@interface RCTSurfaceHostingView : UIView <RCTSurfaceDelegate>
 
 /**
  * Designated initializer.
@@ -41,6 +42,15 @@ NS_ASSUME_NONNULL_BEGIN
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties;
 
+/**
+ * Convenience initializer.
+ * To control toggle Fabric for the Surface.
+ */
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+                        fabric:(BOOL)fabric;
+
 /**
  * Surface object which is currently using to power the view.
  * Read-only.
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
index 3fd9048d128828..de4f5ec97332cb 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
@@ -13,7 +13,7 @@
 #import "RCTSurfaceView.h"
 #import "RCTUtils.h"
 
-@interface RCTSurfaceHostingView () <RCTSurfaceDelegate>
+@interface RCTSurfaceHostingView ()
 
 @property (nonatomic, assign) BOOL isActivityIndicatorViewVisible;
 @property (nonatomic, assign) BOOL isSurfaceViewVisible;
@@ -33,13 +33,21 @@ @implementation RCTSurfaceHostingView {
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties
+                        fabric:(BOOL)fabric
 {
-  RCTSurface *surface =
-    [[RCTSurface alloc] initWithBridge:bridge
-                            moduleName:moduleName
-                     initialProperties:initialProperties];
-
+  RCTSurface *surface = [[RCTSurface alloc] initWithBridge:bridge
+                                                moduleName:moduleName
+                                         initialProperties:initialProperties
+                                                    fabric:fabric];
   return [self initWithSurface:surface];
+
+}
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+{
+  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:NO];
 }
 
 - (instancetype)initWithSurface:(RCTSurface *)surface

From f7343576fc2ca941b03145d9e97208bcbc8c345b Mon Sep 17 00:00:00 2001
From: Alex McKelvey <alexmck@fb.com>
Date: Fri, 2 Mar 2018 21:50:04 -0800
Subject: [PATCH 151/267] Truncate filter label if it's too long to fit

Differential Revision: D7144192

fbshipit-source-id: 4001930b194421682fa9bdc9b097434910f339b6
---
 Libraries/Utilities/truncate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Utilities/truncate.js b/Libraries/Utilities/truncate.js
index 6a1204f9c4c2fb..5ad0f86ee30db4 100644
--- a/Libraries/Utilities/truncate.js
+++ b/Libraries/Utilities/truncate.js
@@ -25,7 +25,7 @@ const defaultOptions = {
 const truncate = function(
   str: ?string,
   maxChars: number,
-  options: truncateOptions
+  options?: truncateOptions
 ): ?string {
   options = Object.assign({}, defaultOptions, options);
   if (str && str.length &&

From 3152e930955b6440edf14fe9c5d246181bc22a55 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Sat, 3 Mar 2018 15:04:46 -0800
Subject: [PATCH 152/267] Converting Libraries/Components to not use var

Reviewed By: sahrens

Differential Revision: D7117137

fbshipit-source-id: a55a04928a0073a17e0709e851aa8b11678042ba
---
 .../AccessibilityInfo.android.js              |  16 +--
 .../AccessibilityInfo.ios.js                  |  20 ++--
 .../Components/AppleTV/TVViewPropTypes.js     |   4 +-
 .../DatePicker/DatePickerIOS.android.js       |  10 +-
 .../DrawerLayoutAndroid.android.js            |  48 ++++-----
 Libraries/Components/LazyRenderer.js          |  10 +-
 .../Components/Navigation/NavigatorIOS.ios.js |  78 +++++++-------
 Libraries/Components/Picker/Picker.js         |  26 ++---
 .../Picker/PickerAndroid.android.js           |  44 ++++----
 Libraries/Components/Picker/PickerIOS.ios.js  |  30 +++---
 .../ProgressViewIOS.android.js                |  10 +-
 .../ProgressViewIOS/ProgressViewIOS.ios.js    |  22 ++--
 .../SegmentedControlIOS.android.js            |  10 +-
 .../SegmentedControlIOS.ios.js                |  22 ++--
 Libraries/Components/Slider/Slider.js         |  24 ++---
 Libraries/Components/StaticRenderer.js        |   4 +-
 Libraries/Components/Subscribable.js          |   2 +-
 Libraries/Components/Switch/Switch.js         |  20 ++--
 .../Components/TabBarIOS/TabBarIOS.ios.js     |  14 +--
 .../TabBarIOS/TabBarItemIOS.android.js        |   8 +-
 .../Components/TabBarIOS/TabBarItemIOS.ios.js |  20 ++--
 Libraries/Components/TextInput/TextInput.js   |  20 ++--
 .../Components/TextInput/TextInputState.js    |   6 +-
 .../ToastAndroid/ToastAndroid.android.js      |   4 +-
 .../ToastAndroid/ToastAndroid.ios.js          |   4 +-
 .../ToolbarAndroid/ToolbarAndroid.android.js  |  38 +++----
 .../Touchable/BoundingDimensions.js           |   4 +-
 Libraries/Components/Touchable/PooledClass.js |  40 +++----
 Libraries/Components/Touchable/Position.js    |   4 +-
 Libraries/Components/Touchable/Touchable.js   | 100 +++++++++---------
 .../Components/Touchable/TouchableBounce.js   |  20 ++--
 .../TouchableNativeFeedback.android.js        |  36 +++----
 .../Touchable/TouchableNativeFeedback.ios.js  |  10 +-
 .../Components/Touchable/TouchableOpacity.js  |  28 ++---
 .../Touchable/ensureComponentIsNative.js      |   4 +-
 .../Touchable/ensurePositiveDelayProps.js     |   4 +-
 .../View/PlatformViewPropTypes.ios.js         |   2 +-
 .../View/ReactNativeStyleAttributes.js        |  18 ++--
 .../View/ReactNativeViewAttributes.js         |   4 +-
 .../Components/View/ViewStylePropTypes.js     |  12 +--
 .../ViewPager/ViewPagerAndroid.android.js     |  20 ++--
 .../Components/WebView/WebView.android.js     |  60 +++++------
 Libraries/Components/WebView/WebView.ios.js   |  82 +++++++-------
 43 files changed, 481 insertions(+), 481 deletions(-)

diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
index b08593a066724f..afc4abe1533a72 100644
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js
@@ -9,18 +9,18 @@
  */
 'use strict';
 
-var NativeModules = require('NativeModules');
-var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
+const NativeModules = require('NativeModules');
+const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
 
-var RCTAccessibilityInfo = NativeModules.AccessibilityInfo;
+const RCTAccessibilityInfo = NativeModules.AccessibilityInfo;
 
-var TOUCH_EXPLORATION_EVENT = 'touchExplorationDidChange';
+const TOUCH_EXPLORATION_EVENT = 'touchExplorationDidChange';
 
 type ChangeEventName = $Enum<{
   change: string,
 }>;
 
-var _subscriptions = new Map();
+const _subscriptions = new Map();
 
 /**
  * Sometimes it's useful to know whether or not the device has a screen reader
@@ -32,7 +32,7 @@ var _subscriptions = new Map();
  * See http://facebook.github.io/react-native/docs/accessibilityinfo.html
  */
 
-var AccessibilityInfo = {
+const AccessibilityInfo = {
 
   fetch: function(): Promise {
     return new Promise((resolve, reject) => {
@@ -48,7 +48,7 @@ var AccessibilityInfo = {
     eventName: ChangeEventName,
     handler: Function
   ): void {
-    var listener = RCTDeviceEventEmitter.addListener(
+    const listener = RCTDeviceEventEmitter.addListener(
       TOUCH_EXPLORATION_EVENT,
       (enabled) => {
         handler(enabled);
@@ -61,7 +61,7 @@ var AccessibilityInfo = {
     eventName: ChangeEventName,
     handler: Function
   ): void {
-    var listener = _subscriptions.get(handler);
+    const listener = _subscriptions.get(handler);
     if (!listener) {
       return;
     }
diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
index 822f0dcbaab8bd..6e39b5e477d5fb 100644
--- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
+++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js
@@ -9,21 +9,21 @@
  */
 'use strict';
 
-var NativeModules = require('NativeModules');
-var Promise = require('Promise');
-var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
+const NativeModules = require('NativeModules');
+const Promise = require('Promise');
+const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
 
-var AccessibilityManager = NativeModules.AccessibilityManager;
+const AccessibilityManager = NativeModules.AccessibilityManager;
 
-var VOICE_OVER_EVENT = 'voiceOverDidChange';
-var ANNOUNCEMENT_DID_FINISH_EVENT = 'announcementDidFinish';
+const VOICE_OVER_EVENT = 'voiceOverDidChange';
+const ANNOUNCEMENT_DID_FINISH_EVENT = 'announcementDidFinish';
 
 type ChangeEventName = $Enum<{
   change: string,
   announcementFinished: string
 }>;
 
-var _subscriptions = new Map();
+const _subscriptions = new Map();
 
 /**
  * Sometimes it's useful to know whether or not the device has a screen reader
@@ -34,7 +34,7 @@ var _subscriptions = new Map();
  *
  * See http://facebook.github.io/react-native/docs/accessibilityinfo.html
  */
-var AccessibilityInfo = {
+const AccessibilityInfo = {
 
   /**
    * Query whether a screen reader is currently enabled.
@@ -72,7 +72,7 @@ var AccessibilityInfo = {
     eventName: ChangeEventName,
     handler: Function
   ): Object {
-    var listener;
+    let listener;
 
     if (eventName === 'change') {
       listener = RCTDeviceEventEmitter.addListener(
@@ -127,7 +127,7 @@ var AccessibilityInfo = {
     eventName: ChangeEventName,
     handler: Function
   ): void {
-    var listener = _subscriptions.get(handler);
+    const listener = _subscriptions.get(handler);
     if (!listener) {
       return;
     }
diff --git a/Libraries/Components/AppleTV/TVViewPropTypes.js b/Libraries/Components/AppleTV/TVViewPropTypes.js
index fab7a30b84d40f..90b86aa47d730b 100644
--- a/Libraries/Components/AppleTV/TVViewPropTypes.js
+++ b/Libraries/Components/AppleTV/TVViewPropTypes.js
@@ -8,12 +8,12 @@
  * @flow
  */
 'use strict';
-var PropTypes = require('prop-types');
+const PropTypes = require('prop-types');
 
 /**
  * Additional View properties for Apple TV
  */
-var TVViewPropTypes = {
+const TVViewPropTypes = {
     /**
      * *(Apple TV only)* When set to true, this view will be focusable
      * and navigable using the Apple TV remote.
diff --git a/Libraries/Components/DatePicker/DatePickerIOS.android.js b/Libraries/Components/DatePicker/DatePickerIOS.android.js
index 8a1db045e01763..2a0d8998bfb556 100644
--- a/Libraries/Components/DatePicker/DatePickerIOS.android.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.android.js
@@ -9,10 +9,10 @@
 
 'use strict';
 
-var React = require('React');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var View = require('View');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const View = require('View');
 
 class DummyDatePickerIOS extends React.Component {
   render() {
@@ -24,7 +24,7 @@ class DummyDatePickerIOS extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   dummyDatePickerIOS: {
     height: 100,
     width: 300,
diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
index 3a39a7d02f6b9e..6a20d894f4f4c4 100644
--- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
+++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js
@@ -8,28 +8,28 @@
  */
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var Platform = require('Platform');
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNative = require('ReactNative');
-var StatusBar = require('StatusBar');
-var StyleSheet = require('StyleSheet');
-var UIManager = require('UIManager');
-var View = require('View');
-var ViewPropTypes = require('ViewPropTypes');
+const ColorPropType = require('ColorPropType');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const Platform = require('Platform');
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const StatusBar = require('StatusBar');
+const StyleSheet = require('StyleSheet');
+const UIManager = require('UIManager');
+const View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
 
-var DrawerConsts = UIManager.AndroidDrawerLayout.Constants;
+const DrawerConsts = UIManager.AndroidDrawerLayout.Constants;
 
-var createReactClass = require('create-react-class');
-var dismissKeyboard = require('dismissKeyboard');
-var requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require('create-react-class');
+const dismissKeyboard = require('dismissKeyboard');
+const requireNativeComponent = require('requireNativeComponent');
 
-var RK_DRAWER_REF = 'drawerlayout';
-var INNERVIEW_REF = 'innerView';
+const RK_DRAWER_REF = 'drawerlayout';
+const INNERVIEW_REF = 'innerView';
 
-var DRAWER_STATES = [
+const DRAWER_STATES = [
   'Idle',
   'Dragging',
   'Settling',
@@ -66,7 +66,7 @@ var DRAWER_STATES = [
  * },
  * ```
  */
-var DrawerLayoutAndroid = createReactClass({
+const DrawerLayoutAndroid = createReactClass({
   displayName: 'DrawerLayoutAndroid',
   statics: {
     positions: DrawerConsts.DrawerPosition,
@@ -169,8 +169,8 @@ var DrawerLayoutAndroid = createReactClass({
   },
 
   render: function() {
-    var drawStatusBar = Platform.Version >= 21 && this.props.statusBarBackgroundColor;
-    var drawerViewWrapper =
+    const drawStatusBar = Platform.Version >= 21 && this.props.statusBarBackgroundColor;
+    const drawerViewWrapper =
       <View
         style={[
           styles.drawerSubview,
@@ -180,7 +180,7 @@ var DrawerLayoutAndroid = createReactClass({
         {this.props.renderNavigationView()}
         {drawStatusBar && <View style={styles.drawerStatusBar} />}
       </View>;
-    var childrenWrapper =
+    const childrenWrapper =
       <View ref={INNERVIEW_REF} style={styles.mainSubview} collapsable={false}>
         {drawStatusBar &&
         <StatusBar
@@ -282,7 +282,7 @@ var DrawerLayoutAndroid = createReactClass({
 
 });
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   base: {
     flex: 1,
     elevation: 16,
@@ -313,6 +313,6 @@ var styles = StyleSheet.create({
 });
 
 // The View that contains both the actual drawer and the main view
-var AndroidDrawerLayout = requireNativeComponent('AndroidDrawerLayout', DrawerLayoutAndroid);
+const AndroidDrawerLayout = requireNativeComponent('AndroidDrawerLayout', DrawerLayoutAndroid);
 
 module.exports = DrawerLayoutAndroid;
diff --git a/Libraries/Components/LazyRenderer.js b/Libraries/Components/LazyRenderer.js
index 826c0eb559faf6..851bf55feee032 100644
--- a/Libraries/Components/LazyRenderer.js
+++ b/Libraries/Components/LazyRenderer.js
@@ -8,12 +8,12 @@
  */
 'use strict';
 
-var React = require('React');
-var createReactClass = require('create-react-class');
-var PropTypes = require('prop-types');
-var TimerMixin = require('react-timer-mixin');
+const React = require('React');
+const createReactClass = require('create-react-class');
+const PropTypes = require('prop-types');
+const TimerMixin = require('react-timer-mixin');
 
-var LazyRenderer = createReactClass({
+const LazyRenderer = createReactClass({
   displayName: 'LazyRenderer',
   mixin: [TimerMixin],
 
diff --git a/Libraries/Components/Navigation/NavigatorIOS.ios.js b/Libraries/Components/Navigation/NavigatorIOS.ios.js
index 66aa906f61a4fd..289680bf6fc6f3 100644
--- a/Libraries/Components/Navigation/NavigatorIOS.ios.js
+++ b/Libraries/Components/Navigation/NavigatorIOS.ios.js
@@ -9,30 +9,30 @@
  */
 'use strict';
 
-var EventEmitter = require('EventEmitter');
-var Image = require('Image');
-var RCTNavigatorManager = require('NativeModules').NavigatorManager;
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNative = require('ReactNative');
-var StaticContainer = require('StaticContainer.react');
-var StyleSheet = require('StyleSheet');
-var TVEventHandler = require('TVEventHandler');
-var View = require('View');
-var ViewPropTypes = require('ViewPropTypes');
-
-var createReactClass = require('create-react-class');
-var invariant = require('fbjs/lib/invariant');
-var requireNativeComponent = require('requireNativeComponent');
+const EventEmitter = require('EventEmitter');
+const Image = require('Image');
+const RCTNavigatorManager = require('NativeModules').NavigatorManager;
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const StaticContainer = require('StaticContainer.react');
+const StyleSheet = require('StyleSheet');
+const TVEventHandler = require('TVEventHandler');
+const View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
+
+const createReactClass = require('create-react-class');
+const invariant = require('fbjs/lib/invariant');
+const requireNativeComponent = require('requireNativeComponent');
 
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
  * found when Flow v0.54 was deployed. To see the error delete this comment and
  * run Flow. */
 const keyMirror = require('fbjs/lib/keyMirror');
 
-var TRANSITIONER_REF = 'transitionerRef';
+const TRANSITIONER_REF = 'transitionerRef';
 
-var __uid = 0;
+let __uid = 0;
 function getuid() {
   return __uid++;
 }
@@ -305,7 +305,7 @@ type Event = Object;
  * is pushed.
  *
  */
-var NavigatorIOS = createReactClass({
+const NavigatorIOS = createReactClass({
   displayName: 'NavigatorIOS',
 
   propTypes: {
@@ -584,7 +584,7 @@ var NavigatorIOS = createReactClass({
 
   _getFocusEmitter: function(): EventEmitter {
     // Flow not yet tracking assignments to instance fields.
-    var focusEmitter = this._focusEmitter;
+    let focusEmitter = this._focusEmitter;
     if (!focusEmitter) {
       focusEmitter = new EventEmitter();
       this._focusEmitter = focusEmitter;
@@ -614,13 +614,13 @@ var NavigatorIOS = createReactClass({
   },
 
   _handleNavigatorStackChanged: function(e: Event) {
-    var newObservedTopOfStack = e.nativeEvent.stackLength - 1;
+    const newObservedTopOfStack = e.nativeEvent.stackLength - 1;
 
     invariant(
       newObservedTopOfStack <= this.state.requestedTopOfStack,
       'No navigator item should be pushed without JS knowing about it %s %s', newObservedTopOfStack, this.state.requestedTopOfStack
     );
-    var wasWaitingForConfirmation =
+    const wasWaitingForConfirmation =
       this.state.requestedTopOfStack !== this.state.observedTopOfStack;
     if (wasWaitingForConfirmation) {
       invariant(
@@ -638,7 +638,7 @@ var NavigatorIOS = createReactClass({
     // Progress isn't always 0 or 1 at the end, the system rounds
     // If the Navigator is offscreen these values won't be updated
     // TOOD: Revisit this decision when no longer relying on native navigator.
-    var nextState = {
+    const nextState = {
       observedTopOfStack: newObservedTopOfStack,
       makingNavigatorRequest: false,
       updatingAllIndicesAtOrBeyond: null,
@@ -653,7 +653,7 @@ var NavigatorIOS = createReactClass({
     // Updating the indices that we're deleting and that's all. (Truth: Nothing
     // even uses the indices in this case, but let's make this describe the
     // truth anyways).
-    var updatingAllIndicesAtOrBeyond =
+    const updatingAllIndicesAtOrBeyond =
       this.state.routeStack.length > this.state.observedTopOfStack + 1 ?
       this.state.observedTopOfStack + 1 :
       null;
@@ -677,8 +677,8 @@ var NavigatorIOS = createReactClass({
     if (this.state.requestedTopOfStack === this.state.observedTopOfStack) {
       this._tryLockNavigator(() => {
 
-        var nextStack = this.state.routeStack.concat([route]);
-        var nextIDStack = this.state.idStack.concat([getuid()]);
+        const nextStack = this.state.routeStack.concat([route]);
+        const nextIDStack = this.state.idStack.concat([getuid()]);
         this.setState({
           // We have to make sure that we've also supplied enough views to
           // satisfy our request to adjust the `requestedTopOfStack`.
@@ -704,7 +704,7 @@ var NavigatorIOS = createReactClass({
     if (this.state.requestedTopOfStack === this.state.observedTopOfStack) {
       if (this.state.requestedTopOfStack > 0) {
         this._tryLockNavigator(() => {
-          var newRequestedTopOfStack = this.state.requestedTopOfStack - n;
+          const newRequestedTopOfStack = this.state.requestedTopOfStack - n;
           invariant(newRequestedTopOfStack >= 0, 'Cannot pop below 0');
           this.setState({
             requestedTopOfStack: newRequestedTopOfStack,
@@ -742,8 +742,8 @@ var NavigatorIOS = createReactClass({
 
     // I don't believe we need to lock for a replace since there's no
     // navigation actually happening
-    var nextIDStack = this.state.idStack.slice();
-    var nextRouteStack = this.state.routeStack.slice();
+    const nextIDStack = this.state.idStack.slice();
+    const nextRouteStack = this.state.routeStack.slice();
     nextIDStack[index] = getuid();
     nextRouteStack[index] = route;
 
@@ -785,12 +785,12 @@ var NavigatorIOS = createReactClass({
    * @param route The new route to navigate to.
    */
   popToRoute: function(route: Route) {
-    var indexOfRoute = this.state.routeStack.indexOf(route);
+    const indexOfRoute = this.state.routeStack.indexOf(route);
     invariant(
       indexOfRoute !== -1,
       'Calling pop to route for a route that doesn\'t exist!'
     );
-    var numToPop = this.state.routeStack.length - indexOfRoute - 1;
+    const numToPop = this.state.routeStack.length - indexOfRoute - 1;
     this.popN(numToPop);
   },
 
@@ -841,12 +841,12 @@ var NavigatorIOS = createReactClass({
   },
 
   _routeToStackItem: function(routeArg: Route, i: number) {
-    var {component, wrapperStyle, passProps, ...route} = routeArg;
-    var {itemWrapperStyle, ...props} = this.props;
-    var shouldUpdateChild =
+    const {component, wrapperStyle, passProps, ...route} = routeArg;
+    const {itemWrapperStyle, ...props} = this.props;
+    const shouldUpdateChild =
       this.state.updatingAllIndicesAtOrBeyond != null &&
       this.state.updatingAllIndicesAtOrBeyond >= i;
-    var Component = component;
+    const Component = component;
     return (
       <StaticContainer key={'nav' + i} shouldUpdate={shouldUpdateChild}>
         <RCTNavigatorItem
@@ -868,12 +868,12 @@ var NavigatorIOS = createReactClass({
   },
 
   _renderNavigationStackItems: function() {
-    var shouldRecurseToNavigator =
+    const shouldRecurseToNavigator =
       this.state.makingNavigatorRequest ||
       this.state.updatingAllIndicesAtOrBeyond !== null;
     // If not recursing update to navigator at all, may as well avoid
     // computation of navigator children.
-    var items = shouldRecurseToNavigator ?
+    const items = shouldRecurseToNavigator ?
       this.state.routeStack.map(this._routeToStackItem) : null;
     return (
       <StaticContainer shouldUpdate={shouldRecurseToNavigator}>
@@ -919,7 +919,7 @@ var NavigatorIOS = createReactClass({
   },
 });
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   stackItem: {
     backgroundColor: 'white',
     overflow: 'hidden',
@@ -934,7 +934,7 @@ var styles = StyleSheet.create({
   },
 });
 
-var RCTNavigator = requireNativeComponent('RCTNavigator');
-var RCTNavigatorItem = requireNativeComponent('RCTNavItem');
+const RCTNavigator = requireNativeComponent('RCTNavigator');
+const RCTNavigatorItem = requireNativeComponent('RCTNavItem');
 
 module.exports = NavigatorIOS;
diff --git a/Libraries/Components/Picker/Picker.js b/Libraries/Components/Picker/Picker.js
index d4b225c8abe7a3..1df316249d7ce7 100644
--- a/Libraries/Components/Picker/Picker.js
+++ b/Libraries/Components/Picker/Picker.js
@@ -10,27 +10,27 @@
 
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var PickerIOS = require('PickerIOS');
-var PickerAndroid = require('PickerAndroid');
-var Platform = require('Platform');
-var React = require('React');
+const ColorPropType = require('ColorPropType');
+const PickerIOS = require('PickerIOS');
+const PickerAndroid = require('PickerAndroid');
+const Platform = require('Platform');
+const React = require('React');
 const PropTypes = require('prop-types');
-var StyleSheetPropType = require('StyleSheetPropType');
-var TextStylePropTypes = require('TextStylePropTypes');
-var UnimplementedView = require('UnimplementedView');
+const StyleSheetPropType = require('StyleSheetPropType');
+const TextStylePropTypes = require('TextStylePropTypes');
+const UnimplementedView = require('UnimplementedView');
 const ViewPropTypes = require('ViewPropTypes');
-var ViewStylePropTypes = require('ViewStylePropTypes');
+const ViewStylePropTypes = require('ViewStylePropTypes');
 
-var itemStylePropType = StyleSheetPropType(TextStylePropTypes);
+const itemStylePropType = StyleSheetPropType(TextStylePropTypes);
 
-var pickerStyleType = StyleSheetPropType({
+const pickerStyleType = StyleSheetPropType({
   ...ViewStylePropTypes,
   color: ColorPropType,
 });
 
-var MODE_DIALOG = 'dialog';
-var MODE_DROPDOWN = 'dropdown';
+const MODE_DIALOG = 'dialog';
+const MODE_DROPDOWN = 'dropdown';
 
 /**
  * Individual selectable item in a Picker.
diff --git a/Libraries/Components/Picker/PickerAndroid.android.js b/Libraries/Components/Picker/PickerAndroid.android.js
index c164db953731ed..bd9c664a8fa5d6 100644
--- a/Libraries/Components/Picker/PickerAndroid.android.js
+++ b/Libraries/Components/Picker/PickerAndroid.android.js
@@ -10,21 +10,21 @@
 
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var React = require('React');
-var ReactPropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
-var StyleSheetPropType = require('StyleSheetPropType');
+const ColorPropType = require('ColorPropType');
+const React = require('React');
+const ReactPropTypes = require('prop-types');
+const StyleSheet = require('StyleSheet');
+const StyleSheetPropType = require('StyleSheetPropType');
 const ViewPropTypes = require('ViewPropTypes');
-var ViewStylePropTypes = require('ViewStylePropTypes');
+const ViewStylePropTypes = require('ViewStylePropTypes');
 
-var processColor = require('processColor');
-var requireNativeComponent = require('requireNativeComponent');
+const processColor = require('processColor');
+const requireNativeComponent = require('requireNativeComponent');
 
-var REF_PICKER = 'picker';
-var MODE_DROPDOWN = 'dropdown';
+const REF_PICKER = 'picker';
+const MODE_DROPDOWN = 'dropdown';
 
-var pickerStyleType = StyleSheetPropType({
+const pickerStyleType = StyleSheetPropType({
   ...ViewStylePropTypes,
   color: ColorPropType,
 });
@@ -56,7 +56,7 @@ class PickerAndroid extends React.Component<{
 
   constructor(props, context) {
     super(props, context);
-    var state = this._stateFromProps(props);
+    const state = this._stateFromProps(props);
 
     this.state = {
       ...state,
@@ -70,7 +70,7 @@ class PickerAndroid extends React.Component<{
 
   // Translate prop and children into stuff that the native picker understands.
   _stateFromProps = (props) => {
-    var selectedIndex = 0;
+    let selectedIndex = 0;
     const items = React.Children.map(props.children, (child, index) => {
       if (child.props.value === props.selectedValue) {
         selectedIndex = index;
@@ -88,9 +88,9 @@ class PickerAndroid extends React.Component<{
   };
 
   render() {
-    var Picker = this.props.mode === MODE_DROPDOWN ? DropdownPicker : DialogPicker;
+    const Picker = this.props.mode === MODE_DROPDOWN ? DropdownPicker : DialogPicker;
 
-    var nativeProps = {
+    const nativeProps = {
       enabled: this.props.enabled,
       items: this.state.items,
       mode: this.props.mode,
@@ -107,10 +107,10 @@ class PickerAndroid extends React.Component<{
 
   _onChange = (event: Event) => {
     if (this.props.onValueChange) {
-      var position = event.nativeEvent.position;
+      const position = event.nativeEvent.position;
       if (position >= 0) {
-        var children = React.Children.toArray(this.props.children);
-        var value = children[position].props.value;
+        const children = React.Children.toArray(this.props.children);
+        const value = children[position].props.value;
         this.props.onValueChange(value, position);
       } else {
         this.props.onValueChange(null, position);
@@ -138,7 +138,7 @@ class PickerAndroid extends React.Component<{
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   pickerAndroid: {
     // The picker will conform to whatever width is given, but we do
     // have to set the component's height explicitly on the
@@ -149,14 +149,14 @@ var styles = StyleSheet.create({
   },
 });
 
-var cfg = {
+const cfg = {
   nativeOnly: {
     items: true,
     selected: true,
   }
 };
 
-var DropdownPicker = requireNativeComponent('AndroidDropdownPicker', PickerAndroid, cfg);
-var DialogPicker = requireNativeComponent('AndroidDialogPicker', PickerAndroid, cfg);
+const DropdownPicker = requireNativeComponent('AndroidDropdownPicker', PickerAndroid, cfg);
+const DialogPicker = requireNativeComponent('AndroidDialogPicker', PickerAndroid, cfg);
 
 module.exports = PickerAndroid;
diff --git a/Libraries/Components/Picker/PickerIOS.ios.js b/Libraries/Components/Picker/PickerIOS.ios.js
index 3963a9485f259a..d1fe0761d5cc34 100644
--- a/Libraries/Components/Picker/PickerIOS.ios.js
+++ b/Libraries/Components/Picker/PickerIOS.ios.js
@@ -10,21 +10,21 @@
  */
 'use strict';
 
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
 const PropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
-var StyleSheetPropType = require('StyleSheetPropType');
-var TextStylePropTypes = require('TextStylePropTypes');
-var View = require('View');
+const StyleSheet = require('StyleSheet');
+const StyleSheetPropType = require('StyleSheetPropType');
+const TextStylePropTypes = require('TextStylePropTypes');
+const View = require('View');
 const ViewPropTypes = require('ViewPropTypes');
-var processColor = require('processColor');
+const processColor = require('processColor');
 
-var createReactClass = require('create-react-class');
-var itemStylePropType = StyleSheetPropType(TextStylePropTypes);
-var requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require('create-react-class');
+const itemStylePropType = StyleSheetPropType(TextStylePropTypes);
+const requireNativeComponent = require('requireNativeComponent');
 
-var PickerIOS = createReactClass({
+const PickerIOS = createReactClass({
   displayName: 'PickerIOS',
   mixins: [NativeMethodsMixin],
 
@@ -45,8 +45,8 @@ var PickerIOS = createReactClass({
 
   // Translate PickerIOS prop and children into stuff that RCTPickerIOS understands.
   _stateFromProps: function(props) {
-    var selectedIndex = 0;
-    var items = [];
+    let selectedIndex = 0;
+    const items = [];
     React.Children.toArray(props.children).forEach(function (child, index) {
       if (child.props.value === props.selectedValue) {
         selectedIndex = index;
@@ -111,7 +111,7 @@ PickerIOS.Item = class extends React.Component {
   }
 };
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   pickerIOS: {
     // The picker will conform to whatever width is given, but we do
     // have to set the component's height explicitly on the
@@ -120,7 +120,7 @@ var styles = StyleSheet.create({
   },
 });
 
-var RCTPickerIOS = requireNativeComponent('RCTPicker', {
+const RCTPickerIOS = requireNativeComponent('RCTPicker', {
   propTypes: {
     style: itemStylePropType,
   },
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
index 46591f62802974..f467db1ff51f64 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js
@@ -10,10 +10,10 @@
 
 'use strict';
 
-var React = require('React');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var View = require('View');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const View = require('View');
 
 class DummyProgressViewIOS extends React.Component {
   render() {
@@ -27,7 +27,7 @@ class DummyProgressViewIOS extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   dummy: {
     width: 120,
     height: 20,
diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
index 310f02507c9421..55ae1b83abe13d 100644
--- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
+++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js
@@ -9,20 +9,20 @@
  */
 'use strict';
 
-var Image = require('Image');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
-var PropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
-var ViewPropTypes = require('ViewPropTypes');
+const Image = require('Image');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
+const PropTypes = require('prop-types');
+const StyleSheet = require('StyleSheet');
+const ViewPropTypes = require('ViewPropTypes');
 
-var createReactClass = require('create-react-class');
-var requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require('create-react-class');
+const requireNativeComponent = require('requireNativeComponent');
 
 /**
  * Use `ProgressViewIOS` to render a UIProgressView on iOS.
  */
-var ProgressViewIOS = createReactClass({
+const ProgressViewIOS = createReactClass({
   displayName: 'ProgressViewIOS',
   mixins: [NativeMethodsMixin],
 
@@ -69,13 +69,13 @@ var ProgressViewIOS = createReactClass({
   }
 });
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   progressView: {
     height: 2,
   },
 });
 
-var RCTProgressView = requireNativeComponent(
+const RCTProgressView = requireNativeComponent(
   'RCTProgressView',
   ProgressViewIOS
 );
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
index 16be1c8f2b1458..a5b4c0b339bf6e 100644
--- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
+++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js
@@ -10,10 +10,10 @@
 
 'use strict';
 
-var React = require('React');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var View = require('View');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const View = require('View');
 
 class DummySegmentedControlIOS extends React.Component {
   render() {
@@ -27,7 +27,7 @@ class DummySegmentedControlIOS extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   dummy: {
     width: 120,
     height: 50,
diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
index f7748fcc8dbf45..3eb4249fa2dbce 100644
--- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
+++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js
@@ -9,21 +9,21 @@
  */
 'use strict';
 
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
-var PropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
-var ViewPropTypes = require('ViewPropTypes');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
+const PropTypes = require('prop-types');
+const StyleSheet = require('StyleSheet');
+const ViewPropTypes = require('ViewPropTypes');
 
-var createReactClass = require('create-react-class');
-var requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require('create-react-class');
+const requireNativeComponent = require('requireNativeComponent');
 
 type DefaultProps = {
   values: Array<string>,
   enabled: boolean,
 };
 
-var SEGMENTED_CONTROL_REFERENCE = 'segmentedcontrol';
+const SEGMENTED_CONTROL_REFERENCE = 'segmentedcontrol';
 
 type Event = Object;
 
@@ -47,7 +47,7 @@ type Event = Object;
  * />
  * ````
  */
-var SegmentedControlIOS = createReactClass({
+const SegmentedControlIOS = createReactClass({
   displayName: 'SegmentedControlIOS',
   mixins: [NativeMethodsMixin],
 
@@ -117,13 +117,13 @@ var SegmentedControlIOS = createReactClass({
   }
 });
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   segmentedControl: {
     height: 28,
   },
 });
 
-var RCTSegmentedControl = requireNativeComponent(
+const RCTSegmentedControl = requireNativeComponent(
   'RCTSegmentedControl',
   SegmentedControlIOS
 );
diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js
index 683789520e5685..5a163fe176d129 100644
--- a/Libraries/Components/Slider/Slider.js
+++ b/Libraries/Components/Slider/Slider.js
@@ -9,18 +9,18 @@
  */
 'use strict';
 
-var Image = require('Image');
-var ColorPropType = require('ColorPropType');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
-var Platform = require('Platform');
-var React = require('React');
-var PropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
-var ViewPropTypes = require('ViewPropTypes');
+const Image = require('Image');
+const ColorPropType = require('ColorPropType');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
+const Platform = require('Platform');
+const React = require('React');
+const PropTypes = require('prop-types');
+const StyleSheet = require('StyleSheet');
+const ViewPropTypes = require('ViewPropTypes');
 
-var createReactClass = require('create-react-class');
-var requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require('create-react-class');
+const requireNativeComponent = require('requireNativeComponent');
 
 type Event = Object;
 
@@ -84,7 +84,7 @@ type Event = Object;
  *```
  *
  */
-var Slider = createReactClass({
+const Slider = createReactClass({
   displayName: 'Slider',
   mixins: [NativeMethodsMixin],
 
diff --git a/Libraries/Components/StaticRenderer.js b/Libraries/Components/StaticRenderer.js
index d5474e943bccad..777fe900e120b6 100644
--- a/Libraries/Components/StaticRenderer.js
+++ b/Libraries/Components/StaticRenderer.js
@@ -9,9 +9,9 @@
  */
 'use strict';
 
-var React = require('React');
+const React = require('React');
 
-var PropTypes = require('prop-types');
+const PropTypes = require('prop-types');
 
 class StaticRenderer extends React.Component<{
   shouldUpdate: boolean,
diff --git a/Libraries/Components/Subscribable.js b/Libraries/Components/Subscribable.js
index cc665ef98f78db..6825acd02f70c5 100644
--- a/Libraries/Components/Subscribable.js
+++ b/Libraries/Components/Subscribable.js
@@ -19,7 +19,7 @@ import type EventEmitter from 'EventEmitter';
  * React Core
  */
 
-var Subscribable = {};
+const Subscribable = {};
 
 Subscribable.Mixin = {
 
diff --git a/Libraries/Components/Switch/Switch.js b/Libraries/Components/Switch/Switch.js
index 545b29b271f02f..e88272dacfa1d0 100644
--- a/Libraries/Components/Switch/Switch.js
+++ b/Libraries/Components/Switch/Switch.js
@@ -9,16 +9,16 @@
  */
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var Platform = require('Platform');
-var React = require('React');
+const ColorPropType = require('ColorPropType');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const Platform = require('Platform');
+const React = require('React');
 const PropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
+const StyleSheet = require('StyleSheet');
 const ViewPropTypes = require('ViewPropTypes');
 
-var createReactClass = require('create-react-class');
-var requireNativeComponent = require('requireNativeComponent');
+const createReactClass = require('create-react-class');
+const requireNativeComponent = require('requireNativeComponent');
 
 type DefaultProps = {
   value: boolean,
@@ -36,7 +36,7 @@ type DefaultProps = {
  * @keyword checkbox
  * @keyword toggle
  */
-var Switch = createReactClass({
+const Switch = createReactClass({
   displayName: 'Switch',
   propTypes: {
     ...ViewPropTypes,
@@ -98,7 +98,7 @@ var Switch = createReactClass({
   },
 
   render: function() {
-    var props = {...this.props};
+    const props = {...this.props};
     props.onStartShouldSetResponder = () => true;
     props.onResponderTerminationRequest = () => false;
     if (Platform.OS === 'android') {
@@ -122,7 +122,7 @@ var Switch = createReactClass({
   },
 });
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   rctSwitchIOS: {
     height: 31,
     width: 51,
diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
index 2e838b097df387..bfd180823347ba 100644
--- a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
@@ -9,14 +9,14 @@
  */
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var React = require('React');
+const ColorPropType = require('ColorPropType');
+const React = require('React');
 const PropTypes = require('prop-types');
-var StyleSheet = require('StyleSheet');
-var TabBarItemIOS = require('TabBarItemIOS');
+const StyleSheet = require('StyleSheet');
+const TabBarItemIOS = require('TabBarItemIOS');
 const ViewPropTypes = require('ViewPropTypes');
 
-var requireNativeComponent = require('requireNativeComponent');
+const requireNativeComponent = require('requireNativeComponent');
 
 import type {StyleObj} from 'StyleSheetTypes';
 import type {ViewProps} from 'ViewPropTypes';
@@ -92,12 +92,12 @@ class TabBarIOS extends React.Component<ViewProps & {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   tabGroup: {
     flex: 1,
   }
 });
 
-var RCTTabBar = requireNativeComponent('RCTTabBar', TabBarIOS);
+const RCTTabBar = requireNativeComponent('RCTTabBar', TabBarIOS);
 
 module.exports = TabBarIOS;
diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js
index ffd46d9c59d8e9..ff891312c21acd 100644
--- a/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js
+++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js
@@ -9,9 +9,9 @@
 
 'use strict';
 
-var React = require('React');
-var View = require('View');
-var StyleSheet = require('StyleSheet');
+const React = require('React');
+const View = require('View');
+const StyleSheet = require('StyleSheet');
 
 class DummyTab extends React.Component {
   render() {
@@ -26,7 +26,7 @@ class DummyTab extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   tab: {
     // TODO(5405356): Implement overflow: visible so position: absolute isn't useless
     // position: 'absolute',
diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
index eb5c6b2326269f..6b56cf78ecb86e 100644
--- a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
@@ -9,17 +9,17 @@
  */
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var Image = require('Image');
-var React = require('React');
+const ColorPropType = require('ColorPropType');
+const Image = require('Image');
+const React = require('React');
 const PropTypes = require('prop-types');
-var StaticContainer = require('StaticContainer.react');
-var StyleSheet = require('StyleSheet');
-var View = require('View');
+const StaticContainer = require('StaticContainer.react');
+const StyleSheet = require('StyleSheet');
+const View = require('View');
 
 const ViewPropTypes = require('ViewPropTypes');
 
-var requireNativeComponent = require('requireNativeComponent');
+const requireNativeComponent = require('requireNativeComponent');
 
 class TabBarItemIOS extends React.Component {
   static propTypes = {
@@ -113,7 +113,7 @@ class TabBarItemIOS extends React.Component {
   }
 
   render() {
-    var {style, children, ...props} = this.props;
+    const {style, children, ...props} = this.props;
 
     // if the tab has already been shown once, always continue to show it so we
     // preserve state between tab transitions
@@ -136,7 +136,7 @@ class TabBarItemIOS extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   tab: {
     position: 'absolute',
     top: 0,
@@ -146,6 +146,6 @@ var styles = StyleSheet.create({
   }
 });
 
-var RCTTabBarItem = requireNativeComponent('RCTTabBarItem', TabBarItemIOS);
+const RCTTabBarItem = requireNativeComponent('RCTTabBarItem', TabBarItemIOS);
 
 module.exports = TabBarItemIOS;
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 6b812a2cf4150a..deb3b40e48bdee 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -706,9 +706,9 @@ const TextInput = createReactClass({
   },
 
   _renderIOSLegacy: function() {
-    var textContainer;
+    let textContainer;
 
-    var props = Object.assign({}, this.props);
+    const props = Object.assign({}, this.props);
     props.style = [this.props.style];
 
     if (props.selection && props.selection.end == null) {
@@ -720,7 +720,7 @@ const TextInput = createReactClass({
 
     if (!props.multiline) {
       if (__DEV__) {
-        for (var propKey in onlyMultiline) {
+        for (const propKey in onlyMultiline) {
           if (props[propKey]) {
             const error = new Error(
               'TextInput prop `' +
@@ -744,8 +744,8 @@ const TextInput = createReactClass({
         />
       );
     } else {
-      var children = props.children;
-      var childCount = 0;
+      let children = props.children;
+      let childCount = 0;
       React.Children.forEach(children, () => ++childCount);
       invariant(
         !(props.value && childCount),
@@ -797,7 +797,7 @@ const TextInput = createReactClass({
   },
 
   _renderIOS: function() {
-    var props = Object.assign({}, this.props);
+    const props = Object.assign({}, this.props);
     props.style = [this.props.style];
 
     if (props.selection && props.selection.end == null) {
@@ -857,8 +857,8 @@ const TextInput = createReactClass({
     /* $FlowFixMe(>=0.53.0 site=react_native_fb,react_native_oss) This comment
      * suppresses an error when upgrading Flow's support for React. To see the
      * error delete this comment and run Flow. */
-    var children = this.props.children;
-    var childCount = 0;
+    let children = this.props.children;
+    let childCount = 0;
     React.Children.forEach(children, () => ++childCount);
     invariant(
       !(this.props.value && childCount),
@@ -932,7 +932,7 @@ const TextInput = createReactClass({
       });
     }
 
-    var text = event.nativeEvent.text;
+    const text = event.nativeEvent.text;
     this.props.onChange && this.props.onChange(event);
     this.props.onChangeText && this.props.onChangeText(text);
 
@@ -1016,7 +1016,7 @@ const TextInput = createReactClass({
   },
 });
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   multilineInput: {
     // This default top inset makes RCTMultilineTextInputView seem as close as possible
     // to single-line RCTSinglelineTextInputView defaults, using the system defaults
diff --git a/Libraries/Components/TextInput/TextInputState.js b/Libraries/Components/TextInput/TextInputState.js
index 46524070fe2147..afcca82bf320f3 100644
--- a/Libraries/Components/TextInput/TextInputState.js
+++ b/Libraries/Components/TextInput/TextInputState.js
@@ -13,10 +13,10 @@
  */
 'use strict';
 
-var Platform = require('Platform');
-var UIManager = require('UIManager');
+const Platform = require('Platform');
+const UIManager = require('UIManager');
 
-var TextInputState = {
+const TextInputState = {
    /**
    * Internal state
    */
diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.android.js b/Libraries/Components/ToastAndroid/ToastAndroid.android.js
index 5434126660f317..15a8a597a5b686 100644
--- a/Libraries/Components/ToastAndroid/ToastAndroid.android.js
+++ b/Libraries/Components/ToastAndroid/ToastAndroid.android.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-var RCTToastAndroid = require('NativeModules').ToastAndroid;
+const RCTToastAndroid = require('NativeModules').ToastAndroid;
 
 /**
  * This exposes the native ToastAndroid module as a JS module. This has a function 'show'
@@ -33,7 +33,7 @@ var RCTToastAndroid = require('NativeModules').ToastAndroid;
  * ```
  */
 
-var ToastAndroid = {
+const ToastAndroid = {
 
   // Toast duration constants
   SHORT: RCTToastAndroid.SHORT,
diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.ios.js b/Libraries/Components/ToastAndroid/ToastAndroid.ios.js
index b44f812ecff0f5..83db0cfa82cae4 100644
--- a/Libraries/Components/ToastAndroid/ToastAndroid.ios.js
+++ b/Libraries/Components/ToastAndroid/ToastAndroid.ios.js
@@ -9,9 +9,9 @@
  */
 'use strict';
 
-var warning = require('fbjs/lib/warning');
+const warning = require('fbjs/lib/warning');
 
-var ToastAndroid = {
+const ToastAndroid = {
 
   show: function (
     message: string,
diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
index 941d1432855a70..1d845e5b65bacf 100644
--- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
+++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js
@@ -9,20 +9,20 @@
 
 'use strict';
 
-var Image = require('Image');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
-var UIManager = require('UIManager');
-var ViewPropTypes = require('ViewPropTypes');
-var ColorPropType = require('ColorPropType');
+const Image = require('Image');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
+const UIManager = require('UIManager');
+const ViewPropTypes = require('ViewPropTypes');
+const ColorPropType = require('ColorPropType');
 
-var createReactClass = require('create-react-class');
-var requireNativeComponent = require('requireNativeComponent');
-var resolveAssetSource = require('resolveAssetSource');
+const createReactClass = require('create-react-class');
+const requireNativeComponent = require('requireNativeComponent');
+const resolveAssetSource = require('resolveAssetSource');
 
-var optionalImageSource = PropTypes.oneOfType([
+const optionalImageSource = PropTypes.oneOfType([
   Image.propTypes.source,
   // Image.propTypes.source is required but we want it to be optional, so we OR
   // it with a nullable propType.
@@ -64,7 +64,7 @@ var optionalImageSource = PropTypes.oneOfType([
  *
  * [0]: https://developer.android.com/reference/android/support/v7/widget/Toolbar.html
  */
-var ToolbarAndroid = createReactClass({
+const ToolbarAndroid = createReactClass({
   displayName: 'ToolbarAndroid',
   mixins: [NativeMethodsMixin],
 
@@ -162,7 +162,7 @@ var ToolbarAndroid = createReactClass({
   },
 
   render: function() {
-    var nativeProps = {
+    const nativeProps = {
       ...this.props,
     };
     if (this.props.logo) {
@@ -175,9 +175,9 @@ var ToolbarAndroid = createReactClass({
       nativeProps.overflowIcon = resolveAssetSource(this.props.overflowIcon);
     }
     if (this.props.actions) {
-      var nativeActions = [];
-      for (var i = 0; i < this.props.actions.length; i++) {
-        var action = {
+      const nativeActions = [];
+      for (let i = 0; i < this.props.actions.length; i++) {
+        const action = {
           ...this.props.actions[i],
         };
         if (action.icon) {
@@ -195,7 +195,7 @@ var ToolbarAndroid = createReactClass({
   },
 
   _onSelect: function(event) {
-    var position = event.nativeEvent.position;
+    const position = event.nativeEvent.position;
     if (position === -1) {
       this.props.onIconClicked && this.props.onIconClicked();
     } else {
@@ -204,7 +204,7 @@ var ToolbarAndroid = createReactClass({
   },
 });
 
-var NativeToolbar = requireNativeComponent('ToolbarAndroid', ToolbarAndroid, {
+const NativeToolbar = requireNativeComponent('ToolbarAndroid', ToolbarAndroid, {
   nativeOnly: {
     nativeActions: true,
   }
diff --git a/Libraries/Components/Touchable/BoundingDimensions.js b/Libraries/Components/Touchable/BoundingDimensions.js
index 73e700ca313bb9..9bc78e515d8ef3 100644
--- a/Libraries/Components/Touchable/BoundingDimensions.js
+++ b/Libraries/Components/Touchable/BoundingDimensions.js
@@ -9,9 +9,9 @@
 
 'use strict';
 
-var PooledClass = require('PooledClass');
+const PooledClass = require('PooledClass');
 
-var twoArgumentPooler = PooledClass.twoArgumentPooler;
+const twoArgumentPooler = PooledClass.twoArgumentPooler;
 
 /**
  * PooledClass representing the bounding rectangle of a region.
diff --git a/Libraries/Components/Touchable/PooledClass.js b/Libraries/Components/Touchable/PooledClass.js
index ad5d874baa9c03..a3ae190aa3d22f 100644
--- a/Libraries/Components/Touchable/PooledClass.js
+++ b/Libraries/Components/Touchable/PooledClass.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-var invariant = require('fbjs/lib/invariant');
+const invariant = require('fbjs/lib/invariant');
 
 /**
  * Static poolers. Several custom versions for each potential number of
@@ -19,10 +19,10 @@ var invariant = require('fbjs/lib/invariant');
  * the Class itself, not an instance. If any others are needed, simply add them
  * here, or in their own files.
  */
-var oneArgumentPooler = function(copyFieldsFrom) {
-  var Klass = this;
+const oneArgumentPooler = function(copyFieldsFrom) {
+  const Klass = this;
   if (Klass.instancePool.length) {
-    var instance = Klass.instancePool.pop();
+    const instance = Klass.instancePool.pop();
     Klass.call(instance, copyFieldsFrom);
     return instance;
   } else {
@@ -30,10 +30,10 @@ var oneArgumentPooler = function(copyFieldsFrom) {
   }
 };
 
-var twoArgumentPooler = function(a1, a2) {
-  var Klass = this;
+const twoArgumentPooler = function(a1, a2) {
+  const Klass = this;
   if (Klass.instancePool.length) {
-    var instance = Klass.instancePool.pop();
+    const instance = Klass.instancePool.pop();
     Klass.call(instance, a1, a2);
     return instance;
   } else {
@@ -41,10 +41,10 @@ var twoArgumentPooler = function(a1, a2) {
   }
 };
 
-var threeArgumentPooler = function(a1, a2, a3) {
-  var Klass = this;
+const threeArgumentPooler = function(a1, a2, a3) {
+  const Klass = this;
   if (Klass.instancePool.length) {
-    var instance = Klass.instancePool.pop();
+    const instance = Klass.instancePool.pop();
     Klass.call(instance, a1, a2, a3);
     return instance;
   } else {
@@ -52,10 +52,10 @@ var threeArgumentPooler = function(a1, a2, a3) {
   }
 };
 
-var fourArgumentPooler = function(a1, a2, a3, a4) {
-  var Klass = this;
+const fourArgumentPooler = function(a1, a2, a3, a4) {
+  const Klass = this;
   if (Klass.instancePool.length) {
-    var instance = Klass.instancePool.pop();
+    const instance = Klass.instancePool.pop();
     Klass.call(instance, a1, a2, a3, a4);
     return instance;
   } else {
@@ -63,8 +63,8 @@ var fourArgumentPooler = function(a1, a2, a3, a4) {
   }
 };
 
-var standardReleaser = function(instance) {
-  var Klass = this;
+const standardReleaser = function(instance) {
+  const Klass = this;
   invariant(
     instance instanceof Klass,
     'Trying to release an instance into a pool of a different type.',
@@ -75,8 +75,8 @@ var standardReleaser = function(instance) {
   }
 };
 
-var DEFAULT_POOL_SIZE = 10;
-var DEFAULT_POOLER = oneArgumentPooler;
+const DEFAULT_POOL_SIZE = 10;
+const DEFAULT_POOLER = oneArgumentPooler;
 
 type Pooler = any;
 
@@ -89,7 +89,7 @@ type Pooler = any;
  * @param {Function} CopyConstructor Constructor that can be used to reset.
  * @param {Function} pooler Customizable pooler.
  */
-var addPoolingTo = function<T>(
+const addPoolingTo = function<T>(
   CopyConstructor: Class<T>,
   pooler: Pooler,
 ): Class<T> & {
@@ -100,7 +100,7 @@ var addPoolingTo = function<T>(
 } {
   // Casting as any so that flow ignores the actual implementation and trusts
   // it to match the type we declared
-  var NewKlass = (CopyConstructor: any);
+  const NewKlass = (CopyConstructor: any);
   NewKlass.instancePool = [];
   NewKlass.getPooled = pooler || DEFAULT_POOLER;
   if (!NewKlass.poolSize) {
@@ -110,7 +110,7 @@ var addPoolingTo = function<T>(
   return NewKlass;
 };
 
-var PooledClass = {
+const PooledClass = {
   addPoolingTo: addPoolingTo,
   oneArgumentPooler: (oneArgumentPooler: Pooler),
   twoArgumentPooler: (twoArgumentPooler: Pooler),
diff --git a/Libraries/Components/Touchable/Position.js b/Libraries/Components/Touchable/Position.js
index 229e791fb92794..572d1132f038bc 100644
--- a/Libraries/Components/Touchable/Position.js
+++ b/Libraries/Components/Touchable/Position.js
@@ -9,9 +9,9 @@
 
 'use strict';
 
-var PooledClass = require('PooledClass');
+const PooledClass = require('PooledClass');
 
-var twoArgumentPooler = PooledClass.twoArgumentPooler;
+const twoArgumentPooler = PooledClass.twoArgumentPooler;
 
 /**
  * Position does not expose methods for construction via an `HTMLDOMElement`,
diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js
index ff63195b089ada..9bfa38c6870a12 100644
--- a/Libraries/Components/Touchable/Touchable.js
+++ b/Libraries/Components/Touchable/Touchable.js
@@ -110,7 +110,7 @@ const normalizeColor = require('normalizeColor');
 /**
  * Touchable states.
  */
-var States = keyMirror({
+const States = keyMirror({
   NOT_RESPONDER: null,                   // Not the responder
   RESPONDER_INACTIVE_PRESS_IN: null,     // Responder, inactive, in the `PressRect`
   RESPONDER_INACTIVE_PRESS_OUT: null,    // Responder, inactive, out of `PressRect`
@@ -124,7 +124,7 @@ var States = keyMirror({
 /**
  * Quick lookup map for states that are considered to be "active"
  */
-var IsActive = {
+const IsActive = {
   RESPONDER_ACTIVE_PRESS_OUT: true,
   RESPONDER_ACTIVE_PRESS_IN: true
 };
@@ -133,20 +133,20 @@ var IsActive = {
  * Quick lookup for states that are considered to be "pressing" and are
  * therefore eligible to result in a "selection" if the press stops.
  */
-var IsPressingIn = {
+const IsPressingIn = {
   RESPONDER_INACTIVE_PRESS_IN: true,
   RESPONDER_ACTIVE_PRESS_IN: true,
   RESPONDER_ACTIVE_LONG_PRESS_IN: true,
 };
 
-var IsLongPressingIn = {
+const IsLongPressingIn = {
   RESPONDER_ACTIVE_LONG_PRESS_IN: true,
 };
 
 /**
  * Inputs to the state machine.
  */
-var Signals = keyMirror({
+const Signals = keyMirror({
   DELAY: null,
   RESPONDER_GRANT: null,
   RESPONDER_RELEASE: null,
@@ -159,7 +159,7 @@ var Signals = keyMirror({
 /**
  * Mapping from States x Signals => States
  */
-var Transitions = {
+const Transitions = {
   NOT_RESPONDER: {
     DELAY: States.ERROR,
     RESPONDER_GRANT: States.RESPONDER_INACTIVE_PRESS_IN,
@@ -237,15 +237,15 @@ var Transitions = {
 // ==== Typical Constants for integrating into UI components ====
 // var HIT_EXPAND_PX = 20;
 // var HIT_VERT_OFFSET_PX = 10;
-var HIGHLIGHT_DELAY_MS = 130;
+const HIGHLIGHT_DELAY_MS = 130;
 
-var PRESS_EXPAND_PX = 20;
+const PRESS_EXPAND_PX = 20;
 
-var LONG_PRESS_THRESHOLD = 500;
+const LONG_PRESS_THRESHOLD = 500;
 
-var LONG_PRESS_DELAY_MS = LONG_PRESS_THRESHOLD - HIGHLIGHT_DELAY_MS;
+const LONG_PRESS_DELAY_MS = LONG_PRESS_THRESHOLD - HIGHLIGHT_DELAY_MS;
 
-var LONG_PRESS_ALLOWED_MOVEMENT = 10;
+const LONG_PRESS_ALLOWED_MOVEMENT = 10;
 
 // Default amount "active" region protrudes beyond box
 
@@ -313,7 +313,7 @@ var LONG_PRESS_ALLOWED_MOVEMENT = 10;
  *
  * @lends Touchable.prototype
  */
-var TouchableMixin = {
+const TouchableMixin = {
   componentDidMount: function() {
     if (!Platform.isTVOS) {
       return;
@@ -321,7 +321,7 @@ var TouchableMixin = {
 
     this._tvEventHandler = new TVEventHandler();
     this._tvEventHandler.enable(this, function(cmp, evt) {
-      var myTag = ReactNative.findNodeHandle(cmp);
+      const myTag = ReactNative.findNodeHandle(cmp);
       evt.dispatchConfig = {};
       if (myTag === evt.tag) {
         if (evt.eventType === 'focus') {
@@ -389,7 +389,7 @@ var TouchableMixin = {
    *
    */
   touchableHandleResponderGrant: function(e) {
-    var dispatchID = e.currentTarget;
+    const dispatchID = e.currentTarget;
     // Since e is used in a callback invoked on another event loop
     // (as in setTimeout etc), we need to call e.persist() on the
     // event to make sure it doesn't get reused in the event object pool.
@@ -401,7 +401,7 @@ var TouchableMixin = {
     this.state.touchable.touchState = States.NOT_RESPONDER;
     this.state.touchable.responderID = dispatchID;
     this._receiveSignal(Signals.RESPONDER_GRANT, e);
-    var delayMS =
+    let delayMS =
       this.touchableGetHighlightDelayMS !== undefined ?
       Math.max(this.touchableGetHighlightDelayMS(), 0) : HIGHLIGHT_DELAY_MS;
     delayMS = isNaN(delayMS) ? HIGHLIGHT_DELAY_MS : delayMS;
@@ -414,7 +414,7 @@ var TouchableMixin = {
       this._handleDelay(e);
     }
 
-    var longDelayMS =
+    let longDelayMS =
       this.touchableGetLongPressDelayMS !== undefined ?
       Math.max(this.touchableGetLongPressDelayMS(), 10) : LONG_PRESS_DELAY_MS;
     longDelayMS = isNaN(longDelayMS) ? LONG_PRESS_DELAY_MS : longDelayMS;
@@ -453,9 +453,9 @@ var TouchableMixin = {
       return;
     }
 
-    var positionOnActivate = this.state.touchable.positionOnActivate;
-    var dimensionsOnActivate = this.state.touchable.dimensionsOnActivate;
-    var pressRectOffset = this.touchableGetPressRectOffset ?
+    const positionOnActivate = this.state.touchable.positionOnActivate;
+    const dimensionsOnActivate = this.state.touchable.dimensionsOnActivate;
+    const pressRectOffset = this.touchableGetPressRectOffset ?
       this.touchableGetPressRectOffset() : {
         left: PRESS_EXPAND_PX,
         right: PRESS_EXPAND_PX,
@@ -463,12 +463,12 @@ var TouchableMixin = {
         bottom: PRESS_EXPAND_PX
       };
 
-    var pressExpandLeft = pressRectOffset.left;
-    var pressExpandTop = pressRectOffset.top;
-    var pressExpandRight = pressRectOffset.right;
-    var pressExpandBottom = pressRectOffset.bottom;
+    let pressExpandLeft = pressRectOffset.left;
+    let pressExpandTop = pressRectOffset.top;
+    let pressExpandRight = pressRectOffset.right;
+    let pressExpandBottom = pressRectOffset.bottom;
 
-    var hitSlop = this.touchableGetHitSlop ?
+    const hitSlop = this.touchableGetHitSlop ?
       this.touchableGetHitSlop() : null;
 
     if (hitSlop) {
@@ -478,18 +478,18 @@ var TouchableMixin = {
       pressExpandBottom += hitSlop.bottom;
     }
 
-    var touch = TouchEventUtils.extractSingleTouch(e.nativeEvent);
-    var pageX = touch && touch.pageX;
-    var pageY = touch && touch.pageY;
+    const touch = TouchEventUtils.extractSingleTouch(e.nativeEvent);
+    const pageX = touch && touch.pageX;
+    const pageY = touch && touch.pageY;
 
     if (this.pressInLocation) {
-      var movedDistance = this._getDistanceBetweenPoints(pageX, pageY, this.pressInLocation.pageX, this.pressInLocation.pageY);
+      const movedDistance = this._getDistanceBetweenPoints(pageX, pageY, this.pressInLocation.pageX, this.pressInLocation.pageY);
       if (movedDistance > LONG_PRESS_ALLOWED_MOVEMENT) {
         this._cancelLongPressDelayTimeout();
       }
     }
 
-    var isTouchWithinActive =
+    const isTouchWithinActive =
         pageX > positionOnActivate.left - pressExpandLeft &&
         pageY > positionOnActivate.top - pressExpandTop &&
         pageX <
@@ -502,7 +502,7 @@ var TouchableMixin = {
           pressExpandBottom;
     if (isTouchWithinActive) {
       this._receiveSignal(Signals.ENTER_PRESS_RECT, e);
-      var curState = this.state.touchable.touchState;
+      const curState = this.state.touchable.touchState;
       if (curState === States.RESPONDER_INACTIVE_PRESS_IN) {
         // fix for t7967420
         this._cancelLongPressDelayTimeout();
@@ -620,7 +620,7 @@ var TouchableMixin = {
 
   _handleLongDelay: function(e) {
     this.longPressDelayTimeout = null;
-    var curState = this.state.touchable.touchState;
+    const curState = this.state.touchable.touchState;
     if (curState !== States.RESPONDER_ACTIVE_PRESS_IN &&
         curState !== States.RESPONDER_ACTIVE_LONG_PRESS_IN) {
       console.error('Attempted to transition from state `' + curState + '` to `' +
@@ -640,9 +640,9 @@ var TouchableMixin = {
    * @sideeffects
    */
   _receiveSignal: function(signal, e) {
-    var responderID = this.state.touchable.responderID;
-    var curState = this.state.touchable.touchState;
-    var nextState = Transitions[curState] && Transitions[curState][signal];
+    const responderID = this.state.touchable.responderID;
+    const curState = this.state.touchable.touchState;
+    const nextState = Transitions[curState] && Transitions[curState][signal];
     if (!responderID && signal === Signals.RESPONDER_RELEASE) {
       return;
     }
@@ -675,17 +675,17 @@ var TouchableMixin = {
   },
 
   _savePressInLocation: function(e) {
-    var touch = TouchEventUtils.extractSingleTouch(e.nativeEvent);
-    var pageX = touch && touch.pageX;
-    var pageY = touch && touch.pageY;
-    var locationX = touch && touch.locationX;
-    var locationY = touch && touch.locationY;
+    const touch = TouchEventUtils.extractSingleTouch(e.nativeEvent);
+    const pageX = touch && touch.pageX;
+    const pageY = touch && touch.pageY;
+    const locationX = touch && touch.locationX;
+    const locationY = touch && touch.locationY;
     this.pressInLocation = {pageX, pageY, locationX, locationY};
   },
 
   _getDistanceBetweenPoints: function (aX, aY, bX, bY) {
-    var deltaX = aX - bX;
-    var deltaY = aY - bY;
+    const deltaX = aX - bX;
+    const deltaY = aY - bY;
     return Math.sqrt(deltaX * deltaX + deltaY * deltaY);
   },
 
@@ -701,10 +701,10 @@ var TouchableMixin = {
    * @sideeffects
    */
   _performSideEffectsForTransition: function(curState, nextState, signal, e) {
-    var curIsHighlight = this._isHighlight(curState);
-    var newIsHighlight = this._isHighlight(nextState);
+    const curIsHighlight = this._isHighlight(curState);
+    const newIsHighlight = this._isHighlight(nextState);
 
-    var isFinalSignal =
+    const isFinalSignal =
       signal === Signals.RESPONDER_TERMINATED ||
       signal === Signals.RESPONDER_RELEASE;
 
@@ -727,14 +727,14 @@ var TouchableMixin = {
     }
 
     if (IsPressingIn[curState] && signal === Signals.RESPONDER_RELEASE) {
-      var hasLongPressHandler = !!this.props.onLongPress;
-      var pressIsLongButStillCallOnPress =
+      const hasLongPressHandler = !!this.props.onLongPress;
+      const pressIsLongButStillCallOnPress =
         IsLongPressingIn[curState] && (    // We *are* long pressing..
-          !hasLongPressHandler ||          // But either has no long handler
-          !this.touchableLongPressCancelsPress() // or we're told to ignore it.
+          (// But either has no long handler
+          !hasLongPressHandler || !this.touchableLongPressCancelsPress()) // or we're told to ignore it.
         );
 
-      var shouldInvokePress =  !IsLongPressingIn[curState] || pressIsLongButStillCallOnPress;
+      const shouldInvokePress =  !IsLongPressingIn[curState] || pressIsLongButStillCallOnPress;
       if (shouldInvokePress && this.touchableHandlePress) {
         if (!newIsHighlight && !curIsHighlight) {
           // we never highlighted because of delay, but we should highlight now
@@ -768,7 +768,7 @@ var TouchableMixin = {
 
 };
 
-var Touchable = {
+const Touchable = {
   Mixin: TouchableMixin,
   TOUCH_TARGET_DEBUG: false, // Highlights all touchable targets. Toggle with Inspector.
   /**
diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js
index 2f0949b6ff22f2..2afef30637b59d 100644
--- a/Libraries/Components/Touchable/TouchableBounce.js
+++ b/Libraries/Components/Touchable/TouchableBounce.js
@@ -10,13 +10,13 @@
  */
 'use strict';
 
-var Animated = require('Animated');
-var EdgeInsetsPropType = require('EdgeInsetsPropType');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
-var createReactClass = require('create-react-class');
-var PropTypes = require('prop-types');
-var Touchable = require('Touchable');
+const Animated = require('Animated');
+const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
+const createReactClass = require('create-react-class');
+const PropTypes = require('prop-types');
+const Touchable = require('Touchable');
 
 type Event = Object;
 
@@ -25,7 +25,7 @@ type State = {
   scale: Animated.Value,
 };
 
-var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
+const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 
 /**
  * Example of using the `TouchableMixin` to play well with other responder
@@ -34,7 +34,7 @@ var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
  * `TouchableMixin` expects us to implement some abstract methods to handle
  * interesting interactions such as `handleTouchablePress`.
  */
-var TouchableBounce = createReactClass({
+const TouchableBounce = createReactClass({
   displayName: 'TouchableBounce',
   mixins: [Touchable.Mixin, NativeMethodsMixin],
 
@@ -115,7 +115,7 @@ var TouchableBounce = createReactClass({
   },
 
   touchableHandlePress: function(e: Event) {
-    var onPressWithCompletion = this.props.onPressWithCompletion;
+    const onPressWithCompletion = this.props.onPressWithCompletion;
     if (onPressWithCompletion) {
       onPressWithCompletion(() => {
         this.state.scale.setValue(0.93);
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
index effad37642759a..c4808b9bef23e3 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
@@ -8,37 +8,37 @@
  */
 'use strict';
 
-var Platform = require('Platform');
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNative = require('ReactNative');
-var Touchable = require('Touchable');
-var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
-var UIManager = require('UIManager');
-
-var createReactClass = require('create-react-class');
-var ensurePositiveDelayProps = require('ensurePositiveDelayProps');
-var processColor = require('processColor');
-
-var rippleBackgroundPropType = PropTypes.shape({
+const Platform = require('Platform');
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const Touchable = require('Touchable');
+const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
+const UIManager = require('UIManager');
+
+const createReactClass = require('create-react-class');
+const ensurePositiveDelayProps = require('ensurePositiveDelayProps');
+const processColor = require('processColor');
+
+const rippleBackgroundPropType = PropTypes.shape({
   type: PropTypes.oneOf(['RippleAndroid']),
   color: PropTypes.number,
   borderless: PropTypes.bool,
 });
 
-var themeAttributeBackgroundPropType = PropTypes.shape({
+const themeAttributeBackgroundPropType = PropTypes.shape({
   type: PropTypes.oneOf(['ThemeAttrAndroid']),
   attribute: PropTypes.string.isRequired,
 });
 
-var backgroundPropType = PropTypes.oneOfType([
+const backgroundPropType = PropTypes.oneOfType([
   rippleBackgroundPropType,
   themeAttributeBackgroundPropType,
 ]);
 
 type Event = Object;
 
-var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
+const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 
 /**
  * A wrapper for making views respond properly to touches (Android only).
@@ -69,7 +69,7 @@ var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
  * ```
  */
 
-var TouchableNativeFeedback = createReactClass({
+const TouchableNativeFeedback = createReactClass({
   displayName: 'TouchableNativeFeedback',
   propTypes: {
     ...TouchableWithoutFeedback.propTypes,
@@ -233,7 +233,7 @@ var TouchableNativeFeedback = createReactClass({
       this.props.useForeground && TouchableNativeFeedback.canUseNativeForeground()
         ? 'nativeForegroundAndroid'
         : 'nativeBackgroundAndroid';
-    var childProps = {
+    const childProps = {
       ...child.props,
       [drawableProp]: this.props.background,
       accessible: this.props.accessible !== false,
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
index c624cb7fdbf0d0..e898d20ab64a97 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js
@@ -9,10 +9,10 @@
 
 'use strict';
 
-var React = require('React');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var View = require('View');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const View = require('View');
 
 class DummyTouchableNativeFeedback extends React.Component {
   static SelectableBackground = () => ({});
@@ -29,7 +29,7 @@ class DummyTouchableNativeFeedback extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   container: {
     height: 100,
     width: 300,
diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
index e8d6ca171abc6e..abb77ac95a3854 100644
--- a/Libraries/Components/Touchable/TouchableOpacity.js
+++ b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -11,22 +11,22 @@
 
 // Note (avik): add @flow when Flow supports spread properties in propTypes
 
-var Animated = require('Animated');
-var Easing = require('Easing');
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var React = require('React');
-var PropTypes = require('prop-types');
-var TimerMixin = require('react-timer-mixin');
-var Touchable = require('Touchable');
-var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
+const Animated = require('Animated');
+const Easing = require('Easing');
+const NativeMethodsMixin = require('NativeMethodsMixin');
+const React = require('React');
+const PropTypes = require('prop-types');
+const TimerMixin = require('react-timer-mixin');
+const Touchable = require('Touchable');
+const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 
-var createReactClass = require('create-react-class');
-var ensurePositiveDelayProps = require('ensurePositiveDelayProps');
-var flattenStyle = require('flattenStyle');
+const createReactClass = require('create-react-class');
+const ensurePositiveDelayProps = require('ensurePositiveDelayProps');
+const flattenStyle = require('flattenStyle');
 
 type Event = Object;
 
-var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
+const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 
 /**
  * A wrapper for making views respond properly to touches.
@@ -116,7 +116,7 @@ var PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
  * ```
  *
  */
-var TouchableOpacity = createReactClass({
+const TouchableOpacity = createReactClass({
   displayName: 'TouchableOpacity',
   mixins: [TimerMixin, Touchable.Mixin, NativeMethodsMixin],
 
@@ -234,7 +234,7 @@ var TouchableOpacity = createReactClass({
   },
 
   _getChildStyleOpacityWithDefault: function() {
-   var childStyle = flattenStyle(this.props.style) || {};
+   const childStyle = flattenStyle(this.props.style) || {};
    return childStyle.opacity == undefined ? 1 : childStyle.opacity;
  },
 
diff --git a/Libraries/Components/Touchable/ensureComponentIsNative.js b/Libraries/Components/Touchable/ensureComponentIsNative.js
index de01d017716ba2..63c1e8bf8d02d0 100644
--- a/Libraries/Components/Touchable/ensureComponentIsNative.js
+++ b/Libraries/Components/Touchable/ensureComponentIsNative.js
@@ -9,9 +9,9 @@
  */
 'use strict';
 
-var invariant = require('fbjs/lib/invariant');
+const invariant = require('fbjs/lib/invariant');
 
-var ensureComponentIsNative = function(component: any) {
+const ensureComponentIsNative = function(component: any) {
   invariant(
     component && typeof component.setNativeProps === 'function',
     'Touchable child must either be native or forward setNativeProps to a ' +
diff --git a/Libraries/Components/Touchable/ensurePositiveDelayProps.js b/Libraries/Components/Touchable/ensurePositiveDelayProps.js
index 85f60091f6049f..51b97f5ca42e68 100644
--- a/Libraries/Components/Touchable/ensurePositiveDelayProps.js
+++ b/Libraries/Components/Touchable/ensurePositiveDelayProps.js
@@ -9,9 +9,9 @@
  */
 'use strict';
 
-var invariant = require('fbjs/lib/invariant');
+const invariant = require('fbjs/lib/invariant');
 
-var ensurePositiveDelayProps = function(props: any) {
+const ensurePositiveDelayProps = function(props: any) {
   invariant(
     !(props.delayPressIn < 0 || props.delayPressOut < 0 ||
       props.delayLongPress < 0),
diff --git a/Libraries/Components/View/PlatformViewPropTypes.ios.js b/Libraries/Components/View/PlatformViewPropTypes.ios.js
index 2394a51746d199..c3e4f6c6100de2 100644
--- a/Libraries/Components/View/PlatformViewPropTypes.ios.js
+++ b/Libraries/Components/View/PlatformViewPropTypes.ios.js
@@ -10,7 +10,7 @@
 
 const Platform = require('Platform');
 
-var TVViewPropTypes = {};
+let TVViewPropTypes = {};
 if (Platform.isTVOS) {
   TVViewPropTypes = require('TVViewPropTypes');
 }
diff --git a/Libraries/Components/View/ReactNativeStyleAttributes.js b/Libraries/Components/View/ReactNativeStyleAttributes.js
index 462e9b7caeb6bb..a9441cad97f156 100644
--- a/Libraries/Components/View/ReactNativeStyleAttributes.js
+++ b/Libraries/Components/View/ReactNativeStyleAttributes.js
@@ -10,19 +10,19 @@
 
 'use strict';
 
-var ImageStylePropTypes = require('ImageStylePropTypes');
-var TextStylePropTypes = require('TextStylePropTypes');
-var ViewStylePropTypes = require('ViewStylePropTypes');
+const ImageStylePropTypes = require('ImageStylePropTypes');
+const TextStylePropTypes = require('TextStylePropTypes');
+const ViewStylePropTypes = require('ViewStylePropTypes');
 
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
  * found when Flow v0.54 was deployed. To see the error delete this comment and
  * run Flow. */
-var keyMirror = require('fbjs/lib/keyMirror');
-var processColor = require('processColor');
-var processTransform = require('processTransform');
-var sizesDiffer = require('sizesDiffer');
+const keyMirror = require('fbjs/lib/keyMirror');
+const processColor = require('processColor');
+const processTransform = require('processTransform');
+const sizesDiffer = require('sizesDiffer');
 
-var ReactNativeStyleAttributes = {
+const ReactNativeStyleAttributes = {
   ...keyMirror(ViewStylePropTypes),
   ...keyMirror(TextStylePropTypes),
   ...keyMirror(ImageStylePropTypes),
@@ -31,7 +31,7 @@ var ReactNativeStyleAttributes = {
 ReactNativeStyleAttributes.transform = { process: processTransform };
 ReactNativeStyleAttributes.shadowOffset = { diff: sizesDiffer };
 
-var colorAttributes = { process: processColor };
+const colorAttributes = { process: processColor };
 ReactNativeStyleAttributes.backgroundColor = colorAttributes;
 ReactNativeStyleAttributes.borderBottomColor = colorAttributes;
 ReactNativeStyleAttributes.borderColor = colorAttributes;
diff --git a/Libraries/Components/View/ReactNativeViewAttributes.js b/Libraries/Components/View/ReactNativeViewAttributes.js
index 64f81c7196691c..26fb368aceb96f 100644
--- a/Libraries/Components/View/ReactNativeViewAttributes.js
+++ b/Libraries/Components/View/ReactNativeViewAttributes.js
@@ -9,9 +9,9 @@
  */
 'use strict';
 
-var ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
+const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
 
-var ReactNativeViewAttributes = {};
+const ReactNativeViewAttributes = {};
 
 ReactNativeViewAttributes.UIView = {
   pointerEvents: true,
diff --git a/Libraries/Components/View/ViewStylePropTypes.js b/Libraries/Components/View/ViewStylePropTypes.js
index 6e9c92163b3181..c21ce5934ac33c 100644
--- a/Libraries/Components/View/ViewStylePropTypes.js
+++ b/Libraries/Components/View/ViewStylePropTypes.js
@@ -9,16 +9,16 @@
  */
 'use strict';
 
-var ColorPropType = require('ColorPropType');
-var LayoutPropTypes = require('LayoutPropTypes');
-var ReactPropTypes = require('prop-types');
-var ShadowPropTypesIOS = require('ShadowPropTypesIOS');
-var TransformPropTypes = require('TransformPropTypes');
+const ColorPropType = require('ColorPropType');
+const LayoutPropTypes = require('LayoutPropTypes');
+const ReactPropTypes = require('prop-types');
+const ShadowPropTypesIOS = require('ShadowPropTypesIOS');
+const TransformPropTypes = require('TransformPropTypes');
 
 /**
  * Warning: Some of these properties may not be supported in all releases.
  */
-var ViewStylePropTypes = {
+const ViewStylePropTypes = {
   ...LayoutPropTypes,
   ...ShadowPropTypesIOS,
   ...TransformPropTypes,
diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
index bcc1d8609a5f3a..8463503bd7930b 100644
--- a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
+++ b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js
@@ -9,16 +9,16 @@
  */
 'use strict';
 
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNative = require('ReactNative');
-var UIManager = require('UIManager');
-var ViewPropTypes = require('ViewPropTypes');
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const UIManager = require('UIManager');
+const ViewPropTypes = require('ViewPropTypes');
 
-var dismissKeyboard = require('dismissKeyboard');
-var requireNativeComponent = require('requireNativeComponent');
+const dismissKeyboard = require('dismissKeyboard');
+const requireNativeComponent = require('requireNativeComponent');
 
-var VIEWPAGER_REF = 'viewPager';
+const VIEWPAGER_REF = 'viewPager';
 
 type Event = Object;
 
@@ -163,7 +163,7 @@ class ViewPagerAndroid extends React.Component<{
       if (!child) {
         return null;
       }
-      var newProps = {
+      const newProps = {
         ...child.props,
         style: [child.props.style, {
           position: 'absolute',
@@ -246,6 +246,6 @@ class ViewPagerAndroid extends React.Component<{
   }
 }
 
-var NativeAndroidViewPager = requireNativeComponent('AndroidViewPager', ViewPagerAndroid);
+const NativeAndroidViewPager = requireNativeComponent('AndroidViewPager', ViewPagerAndroid);
 
 module.exports = ViewPagerAndroid;
diff --git a/Libraries/Components/WebView/WebView.android.js b/Libraries/Components/WebView/WebView.android.js
index 851378755da463..16f2991df1e770 100644
--- a/Libraries/Components/WebView/WebView.android.js
+++ b/Libraries/Components/WebView/WebView.android.js
@@ -8,30 +8,30 @@
  */
 'use strict';
 
-var EdgeInsetsPropType = require('EdgeInsetsPropType');
-var ActivityIndicator = require('ActivityIndicator');
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNative = require('ReactNative');
-var StyleSheet = require('StyleSheet');
-var UIManager = require('UIManager');
-var View = require('View');
-var ViewPropTypes = require('ViewPropTypes');
-
-var deprecatedPropType = require('deprecatedPropType');
-var keyMirror = require('fbjs/lib/keyMirror');
-var requireNativeComponent = require('requireNativeComponent');
-var resolveAssetSource = require('resolveAssetSource');
-
-var RCT_WEBVIEW_REF = 'webview';
-
-var WebViewState = keyMirror({
+const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const ActivityIndicator = require('ActivityIndicator');
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const StyleSheet = require('StyleSheet');
+const UIManager = require('UIManager');
+const View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
+
+const deprecatedPropType = require('deprecatedPropType');
+const keyMirror = require('fbjs/lib/keyMirror');
+const requireNativeComponent = require('requireNativeComponent');
+const resolveAssetSource = require('resolveAssetSource');
+
+const RCT_WEBVIEW_REF = 'webview';
+
+const WebViewState = keyMirror({
   IDLE: null,
   LOADING: null,
   ERROR: null,
 });
 
-var defaultRenderLoading = () => (
+const defaultRenderLoading = () => (
   <View style={styles.loadingView}>
     <ActivityIndicator
       style={styles.loadingProgressBar}
@@ -252,12 +252,12 @@ class WebView extends React.Component {
   }
 
   render() {
-    var otherView = null;
+    let otherView = null;
 
    if (this.state.viewState === WebViewState.LOADING) {
       otherView = (this.props.renderLoading || defaultRenderLoading)();
     } else if (this.state.viewState === WebViewState.ERROR) {
-      var errorEvent = this.state.lastErrorEvent;
+      const errorEvent = this.state.lastErrorEvent;
       otherView = this.props.renderError && this.props.renderError(
         errorEvent.domain,
         errorEvent.code,
@@ -266,14 +266,14 @@ class WebView extends React.Component {
       console.error('RCTWebView invalid state encountered: ' + this.state.loading);
     }
 
-    var webViewStyles = [styles.container, this.props.style];
+    const webViewStyles = [styles.container, this.props.style];
     if (this.state.viewState === WebViewState.LOADING ||
       this.state.viewState === WebViewState.ERROR) {
       // if we're in either LOADING or ERROR states, don't show the webView
       webViewStyles.push(styles.hidden);
     }
 
-    var source = this.props.source || {};
+    const source = this.props.source || {};
     if (this.props.html) {
       source.html = this.props.html;
     } else if (this.props.url) {
@@ -290,7 +290,7 @@ class WebView extends React.Component {
 
     let NativeWebView = nativeConfig.component || RCTWebView;
 
-    var webView =
+    const webView =
       <NativeWebView
         ref={RCT_WEBVIEW_REF}
         key="webViewKey"
@@ -399,14 +399,14 @@ class WebView extends React.Component {
   };
 
   onLoadingStart = (event) => {
-    var onLoadStart = this.props.onLoadStart;
+    const onLoadStart = this.props.onLoadStart;
     onLoadStart && onLoadStart(event);
     this.updateNavigationState(event);
   };
 
   onLoadingError = (event) => {
     event.persist(); // persist this event because we need to store it
-    var {onError, onLoadEnd} = this.props;
+    const {onError, onLoadEnd} = this.props;
     onError && onError(event);
     onLoadEnd && onLoadEnd(event);
     console.warn('Encountered an error loading page', event.nativeEvent);
@@ -418,7 +418,7 @@ class WebView extends React.Component {
   };
 
   onLoadingFinish = (event) => {
-    var {onLoad, onLoadEnd} = this.props;
+    const {onLoad, onLoadEnd} = this.props;
     onLoad && onLoad(event);
     onLoadEnd && onLoadEnd(event);
     this.setState({
@@ -428,14 +428,14 @@ class WebView extends React.Component {
   };
 
   onMessage = (event: Event) => {
-    var {onMessage} = this.props;
+    const {onMessage} = this.props;
     onMessage && onMessage(event);
   }
 }
 
-var RCTWebView = requireNativeComponent('RCTWebView', WebView, WebView.extraNativeComponentConfig);
+const RCTWebView = requireNativeComponent('RCTWebView', WebView, WebView.extraNativeComponentConfig);
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   container: {
     flex: 1,
   },
diff --git a/Libraries/Components/WebView/WebView.ios.js b/Libraries/Components/WebView/WebView.ios.js
index e11f8e3851b622..f01cfae537dd33 100644
--- a/Libraries/Components/WebView/WebView.ios.js
+++ b/Libraries/Components/WebView/WebView.ios.js
@@ -9,31 +9,31 @@
  */
 'use strict';
 
-var ActivityIndicator = require('ActivityIndicator');
-var EdgeInsetsPropType = require('EdgeInsetsPropType');
-var React = require('React');
-var PropTypes = require('prop-types');
-var ReactNative = require('ReactNative');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var UIManager = require('UIManager');
-var View = require('View');
-var ViewPropTypes = require('ViewPropTypes');
-var ScrollView = require('ScrollView');
-
-var deprecatedPropType = require('deprecatedPropType');
-var invariant = require('fbjs/lib/invariant');
-var keyMirror = require('fbjs/lib/keyMirror');
-var processDecelerationRate = require('processDecelerationRate');
-var requireNativeComponent = require('requireNativeComponent');
-var resolveAssetSource = require('resolveAssetSource');
-
-var RCTWebViewManager = require('NativeModules').WebViewManager;
-
-var BGWASH = 'rgba(255,255,255,0.8)';
-var RCT_WEBVIEW_REF = 'webview';
-
-var WebViewState = keyMirror({
+const ActivityIndicator = require('ActivityIndicator');
+const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const React = require('React');
+const PropTypes = require('prop-types');
+const ReactNative = require('ReactNative');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const UIManager = require('UIManager');
+const View = require('View');
+const ViewPropTypes = require('ViewPropTypes');
+const ScrollView = require('ScrollView');
+
+const deprecatedPropType = require('deprecatedPropType');
+const invariant = require('fbjs/lib/invariant');
+const keyMirror = require('fbjs/lib/keyMirror');
+const processDecelerationRate = require('processDecelerationRate');
+const requireNativeComponent = require('requireNativeComponent');
+const resolveAssetSource = require('resolveAssetSource');
+
+const RCTWebViewManager = require('NativeModules').WebViewManager;
+
+const BGWASH = 'rgba(255,255,255,0.8)';
+const RCT_WEBVIEW_REF = 'webview';
+
+const WebViewState = keyMirror({
   IDLE: null,
   LOADING: null,
   ERROR: null,
@@ -67,12 +67,12 @@ const DataDetectorTypes = [
   'all',
 ];
 
-var defaultRenderLoading = () => (
+const defaultRenderLoading = () => (
   <View style={styles.loadingView}>
     <ActivityIndicator />
   </View>
 );
-var defaultRenderError = (errorDomain, errorCode, errorDesc) => (
+const defaultRenderError = (errorDomain, errorCode, errorDesc) => (
   <View style={styles.errorContainer}>
     <Text style={styles.errorTextTitle}>
       Error loading page
@@ -415,12 +415,12 @@ class WebView extends React.Component {
   }
 
   render() {
-    var otherView = null;
+    let otherView = null;
 
     if (this.state.viewState === WebViewState.LOADING) {
       otherView = (this.props.renderLoading || defaultRenderLoading)();
     } else if (this.state.viewState === WebViewState.ERROR) {
-      var errorEvent = this.state.lastErrorEvent;
+      const errorEvent = this.state.lastErrorEvent;
       invariant(
         errorEvent != null,
         'lastErrorEvent expected to be non-null'
@@ -436,7 +436,7 @@ class WebView extends React.Component {
       );
     }
 
-    var webViewStyles = [styles.container, styles.webView, this.props.style];
+    const webViewStyles = [styles.container, styles.webView, this.props.style];
     if (this.state.viewState === WebViewState.LOADING ||
       this.state.viewState === WebViewState.ERROR) {
       // if we're in either LOADING or ERROR states, don't show the webView
@@ -447,15 +447,15 @@ class WebView extends React.Component {
 
     const viewManager = nativeConfig.viewManager || RCTWebViewManager;
 
-    var onShouldStartLoadWithRequest = this.props.onShouldStartLoadWithRequest && ((event: Event) => {
-      var shouldStart = this.props.onShouldStartLoadWithRequest &&
+    const onShouldStartLoadWithRequest = this.props.onShouldStartLoadWithRequest && ((event: Event) => {
+      const shouldStart = this.props.onShouldStartLoadWithRequest &&
         this.props.onShouldStartLoadWithRequest(event.nativeEvent);
       viewManager.startLoadWithResult(!!shouldStart, event.nativeEvent.lockIdentifier);
     });
 
-    var decelerationRate = processDecelerationRate(this.props.decelerationRate);
+    const decelerationRate = processDecelerationRate(this.props.decelerationRate);
 
-    var source = this.props.source || {};
+    const source = this.props.source || {};
     if (this.props.html) {
       source.html = this.props.html;
     } else if (this.props.url) {
@@ -466,7 +466,7 @@ class WebView extends React.Component {
 
     const NativeWebView = nativeConfig.component || RCTWebView;
 
-    var webView =
+    const webView =
       <NativeWebView
         ref={RCT_WEBVIEW_REF}
         key="webViewKey"
@@ -594,14 +594,14 @@ class WebView extends React.Component {
   };
 
   _onLoadingStart = (event: Event) => {
-    var onLoadStart = this.props.onLoadStart;
+    const onLoadStart = this.props.onLoadStart;
     onLoadStart && onLoadStart(event);
     this._updateNavigationState(event);
   };
 
   _onLoadingError = (event: Event) => {
     event.persist(); // persist this event because we need to store it
-    var {onError, onLoadEnd} = this.props;
+    const {onError, onLoadEnd} = this.props;
     onError && onError(event);
     onLoadEnd && onLoadEnd(event);
     console.warn('Encountered an error loading page', event.nativeEvent);
@@ -613,7 +613,7 @@ class WebView extends React.Component {
   };
 
   _onLoadingFinish = (event: Event) => {
-    var {onLoad, onLoadEnd} = this.props;
+    const {onLoad, onLoadEnd} = this.props;
     onLoad && onLoad(event);
     onLoadEnd && onLoadEnd(event);
     this.setState({
@@ -623,14 +623,14 @@ class WebView extends React.Component {
   };
 
   _onMessage = (event: Event) => {
-    var {onMessage} = this.props;
+    const {onMessage} = this.props;
     onMessage && onMessage(event);
   }
 }
 
-var RCTWebView = requireNativeComponent('RCTWebView', WebView, WebView.extraNativeComponentConfig);
+const RCTWebView = requireNativeComponent('RCTWebView', WebView, WebView.extraNativeComponentConfig);
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   container: {
     flex: 1,
   },

From 70a3ececc368a8d0fe4b57b13ac956ad99a637c7 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Sat, 3 Mar 2018 15:06:43 -0800
Subject: [PATCH 153/267] Tightening type for flattenStyle

Reviewed By: yungsters

Differential Revision: D7131703

fbshipit-source-id: d8e37fcd0c743057e04760b1e50f8d879bd2826a
---
 Libraries/Animated/src/nodes/AnimatedTransform.js | 8 ++++----
 Libraries/StyleSheet/flattenStyle.js              | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Libraries/Animated/src/nodes/AnimatedTransform.js b/Libraries/Animated/src/nodes/AnimatedTransform.js
index fd5049e9b8d8af..48f82f9fe3443d 100644
--- a/Libraries/Animated/src/nodes/AnimatedTransform.js
+++ b/Libraries/Animated/src/nodes/AnimatedTransform.js
@@ -15,9 +15,9 @@ const AnimatedWithChildren = require('./AnimatedWithChildren');
 const NativeAnimatedHelper = require('../NativeAnimatedHelper');
 
 class AnimatedTransform extends AnimatedWithChildren {
-  _transforms: Array<Object>;
+  _transforms: $ReadOnlyArray<Object>;
 
-  constructor(transforms: Array<Object>) {
+  constructor(transforms: $ReadOnlyArray<Object>) {
     super();
     this._transforms = transforms;
   }
@@ -34,7 +34,7 @@ class AnimatedTransform extends AnimatedWithChildren {
     });
   }
 
-  __getValue(): Array<Object> {
+  __getValue(): $ReadOnlyArray<Object> {
     return this._transforms.map(transform => {
       const result = {};
       for (const key in transform) {
@@ -49,7 +49,7 @@ class AnimatedTransform extends AnimatedWithChildren {
     });
   }
 
-  __getAnimatedValue(): Array<Object> {
+  __getAnimatedValue(): $ReadOnlyArray<Object> {
     return this._transforms.map(transform => {
       const result = {};
       for (const key in transform) {
diff --git a/Libraries/StyleSheet/flattenStyle.js b/Libraries/StyleSheet/flattenStyle.js
index 88f839e2885ec3..21da509723294c 100644
--- a/Libraries/StyleSheet/flattenStyle.js
+++ b/Libraries/StyleSheet/flattenStyle.js
@@ -9,10 +9,9 @@
  */
 'use strict';
 
-var invariant = require('fbjs/lib/invariant');
 var ReactNativePropRegistry;
 
-import type { StyleObj } from 'StyleSheetTypes';
+import type { DimensionValue, ColorValue, StyleProp, Style } from 'StyleSheetTypes';
 
 function getStyle(style) {
   if (ReactNativePropRegistry === undefined) {
@@ -24,11 +23,10 @@ function getStyle(style) {
   return style;
 }
 
-function flattenStyle(style: ?StyleObj): ?Object {
-  if (!style) {
+function flattenStyle(style: ?StyleProp<Style<DimensionValue, ColorValue>>): ?Style<DimensionValue, ColorValue> {
+  if (style == null) {
     return undefined;
   }
-  invariant(style !== true, 'style may be false but not true');
 
   if (!Array.isArray(style)) {
     /* $FlowFixMe(>=0.63.0 site=react_native_fb) This comment suppresses an

From 498cf7e2d7c6888e5a049c94e9f72f4676d528b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Sun, 4 Mar 2018 18:10:29 -0800
Subject: [PATCH 154/267] =?UTF-8?q?Re=C3=ABnable=20iOS=20and=20tvOS=20test?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Although the test suites have a handful of failing tests, the jobs themselves do not fail.

Let's get these tests back into the fold so that we may track our progress getting these back to a good state.

cc dlowder-salesforce

Run tests on Circle, and confirm everything is green: https://circleci.com/workflow-run/4dd1a84b-502d-4ad6-aa41-64c768392a6b

If you go into the test iOS and test tvOS jobs, you will see that we are collecting test results at the top. These results show the failing individual tests.
Closes https://github.com/facebook/react-native/pull/18171

Differential Revision: D7151558

Pulled By: hramos

fbshipit-source-id: f105ec8bc97e80ed1b8358cde3f13a1ad3b271c2
---
 .circleci/config.yml | 87 +++++++++-----------------------------------
 scripts/objc-test.sh |  6 ---
 2 files changed, 18 insertions(+), 75 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2cfbaf4f6a3958..1b75edce484827 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -211,27 +211,27 @@ aliases:
       mkdir -p ~/react-native/reports/junit/
 
   - &build-objc-ios-test-app
-    name: Build Objective-C iOS Test App
+    name: Build iOS Test App
     command: ./scripts/objc-test-ios.sh
   
   - &run-objc-ios-tests
-    name: Objective-C iOS Test Suite
+    name: iOS Test Suite
     command: ./scripts/objc-test-ios.sh test
 
   - &build-objc-tvos-test-app
-    name: Build Objective-C tvOS Test App
+    name: Build tvOS Test App
     command: ./scripts/objc-test-tvos.sh
 
   - &run-objc-tvos-tests
-    name: Objective-C tvOS Test Suite
+    name: tvOS Test Suite
     command: ./scripts/objc-test-tvos.sh test
 
   - &run-objc-ios-e2e-tests
-    name: Objective-C iOS End-to-End Test Suite
+    name: iOS End-to-End Test Suite
     command: node ./scripts/run-ci-e2e-tests.js --ios --js --retries 3;
 
   - &run-objc-tvos-e2e-tests
-    name: Objective-C tvOS End-to-End Test Suite
+    name: tvOS End-to-End Test Suite
     command: node ./scripts/run-ci-e2e-tests.js --tvos --js --retries 3;
 
 defaults: &defaults
@@ -292,8 +292,6 @@ jobs:
 
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
       - store_artifacts:
           path: ~/react-native/yarn.lock
 
@@ -308,8 +306,6 @@ jobs:
 
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
 
   # Runs JavaScript tests on Node 6
   test_javascript_node6_compatibility:
@@ -328,83 +324,47 @@ jobs:
 
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
-
-  # Builds iOS test app
-  build_objc_ios_test_app:
-    <<: *macos_defaults
-    dependencies:
-      pre:
-        - xcrun instruments -w "iPhone 5s (11.1)" || true
-    steps:
-      - attach_workspace:
-          at: ~/react-native
-
-      - run: *build-objc-ios-test-app
 
   # Runs unit tests on iOS devices
-  test_objc_ios:
+  test_ios:
     <<: *macos_defaults
-    dependencies:
-      pre:
-        - xcrun instruments -w "iPhone 5s (11.1)" || true
     steps:
       - attach_workspace:
           at: ~/react-native
 
+      - run: xcrun instruments -w "iPhone 5s (11.1)" || true
+      - run: brew install watchman
       - run: *run-objc-ios-tests
 
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
-
-  # Builds tvOS test app
-  build_objc_tvos_test_app:
-    <<: *macos_defaults
-    dependencies:
-      pre:
-        - xcrun instruments -w "Apple TV 1080p (11.1)" || true
-    steps:
-      - attach_workspace:
-          at: ~/react-native
-
-      - run: *build-objc-tvos-test-app
 
   # Runs unit tests on tvOS devices
-  test_objc_tvos:
+  test_tvos:
     <<: *macos_defaults
-    dependencies:
-      pre:
-        - xcrun instruments -w "Apple TV 1080p (11.1)" || true
     steps:
       - attach_workspace:
           at: ~/react-native
 
+      - run: xcrun instruments -w "Apple TV 1080p (11.1)" || true
+      - run: brew install watchman
       - run: *run-objc-tvos-tests
 
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
 
   # Runs end to end tests
-  test_objc_ios_e2e:
+  test_ios_e2e:
     <<: *macos_defaults
-    dependencies:
-      pre:
-        - xcrun instruments -w "iPhone 5s (11.1)" || true
     steps:
       - attach_workspace:
           at: ~/react-native
 
+      - run: xcrun instruments -w "iPhone 5s (11.1)" || true
       - run: *run-objc-ios-e2e-tests
 
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
 
   # Checks podspec
   test_podspec:
@@ -523,8 +483,6 @@ jobs:
       - run: *collect-android-test-results
       - store_test_results:
           path: ~/react-native/reports/junit
-      - store_artifacts:
-          path: ~/react-native/reports/junit
 
 
   # Analyze pull request and raise any lint/flow issues.
@@ -604,18 +562,18 @@ workflows:
           requires:
             - checkout_code
 
-      # Build iOS & tvOS test apps
-      - build_objc_ios_test_app:
+      # Test iOS & tvOS
+      - test_ios:
           filters: *filter-ignore-gh-pages
           requires:
             - checkout_code
-      - build_objc_tvos_test_app:
+      - test_tvos:
           filters: *filter-ignore-gh-pages
           requires:
             - checkout_code
 
       # End-to-end tests
-      - test_objc_ios_e2e:
+      - test_ios_e2e:
           filters: *filter-ignore-gh-pages
           requires:
             - checkout_code
@@ -657,15 +615,6 @@ workflows:
 
   #     # The following were DISABLED because they have not run since 
   #     # the migration from Travis, and they have broken since then,
-  #     # Test iOS & tvOS
-  #     - test_objc_ios:
-  #         filters: *filter-ignore-gh-pages
-  #         requires:
-  #           - checkout_code
-  #     - test_objc_tvos:
-  #         filters: *filter-ignore-gh-pages
-  #         requires:
-  #           - checkout_code
   #     # CocoaPods
   #     - test_podspec:
   #         filters: *filter-ignore-gh-pages
diff --git a/scripts/objc-test.sh b/scripts/objc-test.sh
index 81614c5f6edffc..f2c0459989daaa 100755
--- a/scripts/objc-test.sh
+++ b/scripts/objc-test.sh
@@ -73,9 +73,6 @@ curl 'http://localhost:8081/IntegrationTests/RCTRootViewIntegrationTestApp.bundl
 rm temp.bundle
 
 # Run tests
-# TODO: We use xcodebuild because xctool would stall when collecting info about
-# the tests before running them. Switch back when this issue with xctool has
-# been resolved.
 xcodebuild \
   -project "RNTester/RNTester.xcodeproj" \
   -scheme $SCHEME \
@@ -87,9 +84,6 @@ xcodebuild \
 else
 
 # Don't run tests. No need to pass -destination to xcodebuild.
-# TODO: We use xcodebuild because xctool would stall when collecting info about
-# the tests before running them. Switch back when this issue with xctool has
-# been resolved.
 xcodebuild \
   -project "RNTester/RNTester.xcodeproj" \
   -scheme $SCHEME \

From a1295e1707a856b9cd5c3129320d386aa9166310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Ara=C3=BAjo?= <ruka.araujo@gmail.com>
Date: Mon, 5 Mar 2018 10:40:55 -0800
Subject: [PATCH 155/267] Fix Viewpager on Android when using native
 navigation.

Summary:
See the "broken" video attached to really understand the problem easily.

On Android after navigating to any other screen using wix navigation library, the native viewpager would lose the settling page behaviour which is quite annoying for the users.

This is caused by the onAttachedToWindow that resets mFirstLayout to true inside ViewPager. By request another layout pass, everything works as expected.

Working video is the application with patched RN.

[broken.mp4](https://github.com/facebook/react-native/files/1128028/broken.mp4.zip)
[working.mp4](https://github.com/facebook/react-native/files/1128032/working.mp4.zip)
Closes https://github.com/facebook/react-native/pull/14867

Differential Revision: D7154981

Pulled By: hramos

fbshipit-source-id: 2b3570800a5320ed2c12c488748d9e1358936c84
---
 .../react/views/viewpager/ReactViewPager.java | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
index 77e93269bdcf3f..48b5f1a6194956 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/viewpager/ReactViewPager.java
@@ -210,6 +210,26 @@ public void setScrollEnabled(boolean scrollEnabled) {
     mScrollEnabled = scrollEnabled;
   }
 
+
+  @Override
+  protected void onAttachedToWindow() {
+    super.onAttachedToWindow();
+    // The viewpager reset an internal flag on this method so we need to run another layout pass
+    // after attaching to window.
+    this.requestLayout();
+    post(measureAndLayout);
+  }
+
+  private final Runnable measureAndLayout = new Runnable() {
+    @Override
+    public void run() {
+      measure(
+              MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.EXACTLY),
+              MeasureSpec.makeMeasureSpec(getHeight(), MeasureSpec.EXACTLY));
+      layout(getLeft(), getTop(), getRight(), getBottom());
+    }
+  };
+
   /*package*/ void addViewToAdapter(View child, int index) {
     getAdapter().addView(child, index);
   }

From f389ad8b76dfde6f5f526f89fc3fd7823f0bbe38 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jjkim@fb.com>
Date: Mon, 5 Mar 2018 10:43:12 -0800
Subject: [PATCH 156/267] Move fb_xplat_cxx.bzl to xplat/build_defs

Reviewed By: mzlee, ttsugriy

Differential Revision: D7152463

fbshipit-source-id: ad7ca85f225343a043e2f606c6b3bbf74f42bbcd
---
 ReactCommon/cxxreact/tests/BUCK | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactCommon/cxxreact/tests/BUCK b/ReactCommon/cxxreact/tests/BUCK
index 09c0a244fb7115..010e7c8e50d069 100644
--- a/ReactCommon/cxxreact/tests/BUCK
+++ b/ReactCommon/cxxreact/tests/BUCK
@@ -11,8 +11,8 @@ TEST_SRCS = [
 ]
 
 if not IS_OSS_BUILD:
+    load("@xplat//build_defs:fb_xplat_cxx.bzl", "cxx_test")
     load("@xplat//configurations/buck/android:jni_instrumentation_test", "jni_instrumentation_test_lib")
-    load("@xplat//configurations/buck:fb_xplat_cxx.bzl", "cxx_test")
     load("@xplat//configurations/buck:default_platform_defs.bzl", "APPLE")
     jni_instrumentation_test_lib(
         name = 'tests',

From 87690570c8147f57db2af2f4c9984ac5db9ec5c9 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Mon, 5 Mar 2018 10:43:25 -0800
Subject: [PATCH 157/267] Remove log in JSDevSupportModule

Reviewed By: fkgozali

Differential Revision: D7138115

fbshipit-source-id: f9cdda250b60a305195e01a11d0907f658d0a9d1
---
 Libraries/Utilities/JSDevSupportModule.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Libraries/Utilities/JSDevSupportModule.js b/Libraries/Utilities/JSDevSupportModule.js
index 0b8cdca1f6835c..a33e91e886185b 100644
--- a/Libraries/Utilities/JSDevSupportModule.js
+++ b/Libraries/Utilities/JSDevSupportModule.js
@@ -18,7 +18,6 @@ var JSDevSupportModule = {
 
     var result = renderer.getInspectorDataForViewTag(tag);
     var path = result.hierarchy.map( (item) => item.name).join(' -> ');
-    console.error('StackOverflowException rendering JSComponent: ' + path);
     require('NativeModules').JSDevSupport.setResult(path, null);
   },
 };

From 3f8a04ba624783bfc541c05d3775b46682cfc810 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Mon, 5 Mar 2018 10:53:00 -0800
Subject: [PATCH 158/267] Revert "Better Android Gradle Plugin 3.x integration"

Summary:
This reverts commit d16ff3bd8b92fa84a9007bf5ebedd8153e4c089d.

Currently breaks with the gradle version used by RN, I think there has been some work to update that to a more recent one but for now I think we should just revert it.

It errors with:

```
Could not find method registerGeneratedResFolders() for arguments [file collection] on object of type com.android.build.gradle.internal.api.ApplicationVariantImpl.
```

Tested that RN tester now builds when using the right react.gradle (#18188)

[ ANDROID ] [ BUGFIX ] [ react.gradle ] - REVERT "Support Android Gradle Plugin 3.x and AAPT2"
[ ANDROID ] [ FEATURE ] [ react.gradle ] - REVERT "Expose the bundling task and its outputs via ext properties"
Closes https://github.com/facebook/react-native/pull/18189

Differential Revision: D7155176

Pulled By: hramos

fbshipit-source-id: 87b7b80b39cd345eebac4631efe6697971a1dbdf
---
 react.gradle | 199 +++++++++++++++++++++++++--------------------------
 1 file changed, 97 insertions(+), 102 deletions(-)

diff --git a/react.gradle b/react.gradle
index 685862193bb945..64b2f02f8cbf26 100644
--- a/react.gradle
+++ b/react.gradle
@@ -6,117 +6,112 @@ def cliPath = config.cliPath ?: "node_modules/react-native/local-cli/cli.js"
 def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
 def entryFile = config.entryFile ?: "index.android.js"
 def bundleCommand = config.bundleCommand ?: "bundle"
-def reactRoot = file(config.root ?: "../../")
+
+// because elvis operator
+def elvisFile(thing) {
+    return thing ? file(thing) : null;
+}
+
+def reactRoot = elvisFile(config.root) ?: file("../../")
 def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"]
 def bundleConfig = config.bundleConfig ? "${reactRoot}/${config.bundleConfig}" : null ;
 
+void runBefore(String dependentTaskName, Task task) {
+    Task dependentTask = tasks.findByPath(dependentTaskName);
+    if (dependentTask != null) {
+        dependentTask.dependsOn task
+    }
+}
 
 gradle.projectsEvaluated {
-    android.applicationVariants.all { def variant ->
-        // Create variant and target names
-        def targetName = variant.name.capitalize()
-        def targetPath = variant.dirName
-
-        // React js bundle directories
-        def jsBundleDir = file("$buildDir/generated/assets/react/${targetPath}")
-        def resourcesDir = file("$buildDir/generated/res/react/${targetPath}")
-
-        def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
-
-        // Additional node and packager commandline arguments
-        def nodeExecutableAndArgs = config.nodeExecutableAndArgs ?: ["node"]
-        def extraPackagerArgs = config.extraPackagerArgs ?: []
-
-        def currentBundleTask = tasks.create(
-            name: "bundle${targetName}JsAndAssets",
-            type: Exec) {
-            group = "react"
-            description = "bundle JS and assets for ${targetName}."
-
-            // Create dirs if they are not there (e.g. the "clean" task just ran)
-            doFirst {
-                jsBundleDir.deleteDir()
-                jsBundleDir.mkdirs()
-                resourcesDir.deleteDir()
-                resourcesDir.mkdirs()
-            }
-
-            // Set up inputs and outputs so gradle can cache the result
-            inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
-            outputs.dir jsBundleDir
-            outputs.dir resourcesDir
-
-            // Set up the call to the react-native cli
-            workingDir reactRoot
-
-            // Set up dev mode
-            def devEnabled = !(config."devDisabledIn${targetName}"
-                || targetName.toLowerCase().contains("release"))
-
-            def extraArgs = extraPackagerArgs;
-
-            if (bundleConfig) {
-                extraArgs = extraArgs.clone()
-                extraArgs.add("--config");
-                extraArgs.add(bundleConfig);
-            }
-
-            if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                commandLine("cmd", "/c", *nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
-                    "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
-            } else {
-                commandLine(*nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
-                    "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
-            }
-
-            enabled config."bundleIn${targetName}" ||
-                config."bundleIn${variant.buildType.name.capitalize()}" ?:
-                targetName.toLowerCase().contains("release")
-        }
-
-        // Expose a minimal interface on the application variant and the task itself:
-        variant.ext.bundleJsAndAssets = currentBundleTask
-        currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
-        currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
-
-        variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)
-        variant.mergeResources.dependsOn(currentBundleTask)
-
-        def resourcesDirConfigValue = config."resourcesDir${targetName}"
-        if (resourcesDirConfigValue) {
-            def currentCopyResTask = tasks.create(
-                name: "copy${targetName}BundledResources",
-                type: Copy) {
+    // Grab all build types and product flavors
+    def buildTypes = android.buildTypes.collect { type -> type.name }
+    def productFlavors = android.productFlavors.collect { flavor -> flavor.name }
+
+    // When no product flavors defined, use empty
+    if (!productFlavors) productFlavors.add('')
+
+    productFlavors.each { productFlavorName ->
+        buildTypes.each { buildTypeName ->
+            // Create variant and target names
+            def flavorNameCapitalized = "${productFlavorName.capitalize()}"
+            def buildNameCapitalized = "${buildTypeName.capitalize()}"
+            def targetName = "${flavorNameCapitalized}${buildNameCapitalized}"
+            def targetPath = productFlavorName ?
+                    "${productFlavorName}/${buildTypeName}" :
+                    "${buildTypeName}"
+
+            // React js bundle directories
+            def jsBundleDirConfigName = "jsBundleDir${targetName}"
+            def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
+                    file("$buildDir/intermediates/assets/${targetPath}")
+
+            def resourcesDirConfigName = "resourcesDir${targetName}"
+            def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
+                    file("$buildDir/intermediates/res/merged/${targetPath}")
+            def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
+
+            // Bundle task name for variant
+            def bundleJsAndAssetsTaskName = "bundle${targetName}JsAndAssets"
+
+            // Additional node and packager commandline arguments
+            def nodeExecutableAndArgs = config.nodeExecutableAndArgs ?: ["node"]
+            def extraPackagerArgs = config.extraPackagerArgs ?: []
+
+            def currentBundleTask = tasks.create(
+                    name: bundleJsAndAssetsTaskName,
+                    type: Exec) {
                 group = "react"
-                description = "copy bundled resources into custom location for ${targetName}."
-
-                from resourcesDir
-                into file(resourcesDirConfigValue)
-
-                dependsOn(currentBundleTask)
-
-                enabled currentBundleTask.enabled
+                description = "bundle JS and assets for ${targetName}."
+
+                // Create dirs if they are not there (e.g. the "clean" task just ran)
+                doFirst {
+                    jsBundleDir.mkdirs()
+                    resourcesDir.mkdirs()
+                }
+
+                // Set up inputs and outputs so gradle can cache the result
+                inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
+                outputs.dir jsBundleDir
+                outputs.dir resourcesDir
+
+                // Set up the call to the react-native cli
+                workingDir reactRoot
+
+                // Set up dev mode
+                def devEnabled = !(config."devDisabledIn${targetName}"
+                    || targetName.toLowerCase().contains("release"))
+
+                def extraArgs = extraPackagerArgs;
+
+                if (bundleConfig) {
+                  extraArgs = extraArgs.clone()
+                  extraArgs.add("--config");
+                  extraArgs.add(bundleConfig);
+                }
+
+                if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                    commandLine("cmd", "/c", *nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
+                            "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
+                } else {
+                    commandLine(*nodeExecutableAndArgs, cliPath, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
+                            "--reset-cache", "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir, *extraArgs)
+                }
+
+                enabled config."bundleIn${targetName}" ||
+                    config."bundleIn${buildTypeName.capitalize()}" ?:
+                            targetName.toLowerCase().contains("release")
             }
 
-            variant.packageApplication.dependsOn(currentCopyResTask)
-        }
-
-        def currentAssetsCopyTask = tasks.create(
-            name: "copy${targetName}BundledJs",
-            type: Copy) {
-            group = "react"
-            description = "copy bundled JS into ${targetName}."
+            // Hook bundle${productFlavor}${buildType}JsAndAssets into the android build process
+            currentBundleTask.dependsOn("merge${targetName}Resources")
+            currentBundleTask.dependsOn("merge${targetName}Assets")
 
-            from jsBundleDir
-            into file(config."jsBundleDir${targetName}" ?:
-                "$buildDir/intermediates/assets/${targetPath}")
-
-            // mergeAssets must run first, as it clears the intermediates directory
-            dependsOn(variant.mergeAssets)
-
-            enabled currentBundleTask.enabled
+            runBefore("process${flavorNameCapitalized}Armeabi-v7a${buildNameCapitalized}Resources", currentBundleTask)
+            runBefore("process${flavorNameCapitalized}X86${buildNameCapitalized}Resources", currentBundleTask)
+            runBefore("processUniversal${targetName}Resources", currentBundleTask)
+            runBefore("process${targetName}Resources", currentBundleTask)
+            runBefore("dataBindingProcessLayouts${targetName}", currentBundleTask)
         }
-
-        variant.packageApplication.dependsOn(currentAssetsCopyTask)
     }
 }

From 9f239d791431010f4f1bf980f57c3a7ff7bafdf4 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Mon, 5 Mar 2018 10:53:53 -0800
Subject: [PATCH 159/267] Use react.gradle from repo root instead of copy in
 RNTester

Summary:
RNTester used a copy of the main react.gradle file instead of the real one. Recent changes to the real file caused builds to fail with older gradle versions but was not caught by CI because it wasn't using that file for RNTester. That copy of react.gradle is just a leftover from when projects included a copy instead of importing the one in RN directly.

Note: CI WILL fail with this PR, if we have trouble landing this I can add the revert in this commit too but wanted to keep it as 2 separate commits.

Tested that building RNTester actually fails now that it uses react.gradle with recent changes, then tested that is builds properly when reverting d16ff3bd8b92fa84a9007bf5ebedd8153e4c089d.

[INTERNAL] [MINOR] [RNTester] - Use react.gradle from repo root instead of copy in RNTester
Closes https://github.com/facebook/react-native/pull/18188

Differential Revision: D7155179

Pulled By: hramos

fbshipit-source-id: 15b461a63b841bf807e7d11ba3ead005ca5e33b0
---
 RNTester/android/app/build.gradle |  2 +-
 RNTester/android/app/react.gradle | 96 -------------------------------
 2 files changed, 1 insertion(+), 97 deletions(-)
 delete mode 100644 RNTester/android/app/react.gradle

diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle
index 9e55d12326f023..95d02acb788a99 100644
--- a/RNTester/android/app/build.gradle
+++ b/RNTester/android/app/build.gradle
@@ -64,7 +64,7 @@ project.ext.react = [
     inputExcludes: ["android/**", "./**"]
 ]
 
-apply from: "react.gradle"
+apply from: "../../../react.gradle"
 
 /**
  * Set this to true to create three separate APKs instead of one:
diff --git a/RNTester/android/app/react.gradle b/RNTester/android/app/react.gradle
deleted file mode 100644
index c0dca024c8dfac..00000000000000
--- a/RNTester/android/app/react.gradle
+++ /dev/null
@@ -1,96 +0,0 @@
-import org.apache.tools.ant.taskdefs.condition.Os
-
-def config = project.hasProperty("react") ? project.react : [];
-
-def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
-def entryFile = config.entryFile ?: "index.android.js"
-
-// because elvis operator
-def elvisFile(thing) {
-    return thing ? file(thing) : null;
-}
-
-def reactRoot = elvisFile(config.root) ?: file("../../")
-def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"]
-
-void runBefore(String dependentTaskName, Task task) {
-    Task dependentTask = tasks.findByPath(dependentTaskName);
-    if (dependentTask != null) {
-        dependentTask.dependsOn task
-    }
-}
-
-gradle.projectsEvaluated {
-    // Grab all build types and product flavors
-    def buildTypes = android.buildTypes.collect { type -> type.name }
-    def productFlavors = android.productFlavors.collect { flavor -> flavor.name }
-
-    // When no product flavors defined, use empty
-    if (!productFlavors) productFlavors.add('')
-
-    productFlavors.each { productFlavorName ->
-        buildTypes.each { buildTypeName ->
-            // Create variant and source names
-            def sourceName = "${buildTypeName}"
-            def targetName = "${sourceName.capitalize()}"
-            if (productFlavorName) {
-                sourceName = "${productFlavorName}${targetName}"
-            }
-
-            // React js bundle directories
-            def jsBundleDirConfigName = "jsBundleDir${targetName}"
-            def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
-                    file("$buildDir/intermediates/assets/${sourceName}")
-
-            def resourcesDirConfigName = "jsBundleDir${targetName}"
-            def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
-                    file("$buildDir/intermediates/res/merged/${sourceName}")
-            def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
-
-            // Bundle task name for variant
-            def bundleJsAndAssetsTaskName = "bundle${targetName}JsAndAssets"
-
-            def currentBundleTask = tasks.create(
-                    name: bundleJsAndAssetsTaskName,
-                    type: Exec) {
-                group = "react"
-                description = "bundle JS and assets for ${targetName}."
-
-                // Create dirs if they are not there (e.g. the "clean" task just ran)
-                doFirst {
-                    jsBundleDir.mkdirs()
-                    resourcesDir.mkdirs()
-                }
-
-                // Set up inputs and outputs so gradle can cache the result
-                inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
-                outputs.dir jsBundleDir
-                outputs.dir resourcesDir
-
-                // Set up the call to the react-native cli
-                workingDir reactRoot
-
-                // Set up dev mode
-                def devEnabled = !targetName.toLowerCase().contains("release")
-                if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                    commandLine "cmd", "/c", "node", "./local-cli/cli.js", "bundle", "--platform", "android", "--dev", "${devEnabled}",
-                            "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir
-                } else {
-                    commandLine "node", "./local-cli/cli.js", "bundle", "--platform", "android", "--dev", "${devEnabled}",
-                            "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir
-                }
-
-                enabled config."bundleIn${targetName}" ?: targetName.toLowerCase().contains("release")
-            }
-
-            // Hook bundle${productFlavor}${buildType}JsAndAssets into the android build process
-            currentBundleTask.dependsOn("merge${targetName}Resources")
-            currentBundleTask.dependsOn("merge${targetName}Assets")
-
-            runBefore("processArmeabi-v7a${targetName}Resources", currentBundleTask)
-            runBefore("processX86${targetName}Resources", currentBundleTask)
-            runBefore("processUniversal${targetName}Resources", currentBundleTask)
-            runBefore("process${targetName}Resources", currentBundleTask)
-        }
-    }
-}

From 4466b6fa7ce5325cac3233a23b10ffcb4ff038a7 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Mon, 5 Mar 2018 10:55:19 -0800
Subject: [PATCH 160/267] Refactor BridgeListener into JSIModulesProvider

Reviewed By: achen1

Differential Revision: D7140944

fbshipit-source-id: 092ea8569af5b5f90e005d6dc2c1819c1c9cf58f
---
 .../facebook/react/ReactInstanceManager.java  | 17 +++++++-------
 .../react/ReactInstanceManagerBuilder.java    | 13 +++++------
 .../com/facebook/react/ReactNativeHost.java   |  8 ++++---
 .../facebook/react/bridge/BridgeListener.java | 14 -----------
 .../react/bridge/CatalystInstance.java        |  6 ++---
 .../react/bridge/CatalystInstanceImpl.java    | 13 +++++++----
 .../com/facebook/react/bridge/JSIModule.java  |  7 ++++++
 .../react/bridge/JSIModuleHolder.java         | 12 ++++++++++
 .../react/bridge/JSIModuleRegistry.java       | 23 +++++++++++++++++++
 .../react/bridge/JSIModulesProvider.java      | 15 ++++++++++++
 .../com/facebook/react/bridge/UIManager.java  |  2 +-
 11 files changed, 89 insertions(+), 41 deletions(-)
 delete mode 100644 ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeListener.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModule.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleHolder.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModulesProvider.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 1ecbd0efd45c6f..1d2731a71c856b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -43,10 +43,10 @@
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.infer.annotation.ThreadSafe;
-import com.facebook.react.bridge.BridgeListener;
 import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.CatalystInstanceImpl;
 import com.facebook.react.bridge.JSBundleLoader;
+import com.facebook.react.bridge.JSIModulesProvider;
 import com.facebook.react.bridge.JavaJSExecutor;
 import com.facebook.react.bridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
@@ -71,11 +71,11 @@
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import com.facebook.react.modules.appregistry.AppRegistry;
-import com.facebook.react.modules.fabric.ReactFabric;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
+import com.facebook.react.modules.fabric.ReactFabric;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.UIImplementationProvider;
 import com.facebook.react.uimanager.UIManagerModule;
@@ -157,7 +157,7 @@ public interface ReactInstanceEventListener {
   private final @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
   private final boolean mLazyNativeModulesEnabled;
   private final boolean mDelayViewManagerClassLoadsEnabled;
-  private final @Nullable BridgeListener mBridgeListener;
+  private final @Nullable JSIModulesProvider mJSIModulesProvider;
   private List<ViewManager> mViewManagers;
 
   private class ReactContextInitParams {
@@ -207,7 +207,7 @@ public static ReactInstanceManagerBuilder builder() {
     @Nullable DevBundleDownloadListener devBundleDownloadListener,
     int minNumShakes,
     int minTimeLeftInFrameForNonBatchedOperationMs,
-    @Nullable BridgeListener bridgeListener) {
+    @Nullable JSIModulesProvider jsiModulesProvider) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.ctor()");
     initializeSoLoaderIfNecessary(applicationContext);
 
@@ -256,7 +256,7 @@ public void invokeDefaultOnBackPressed() {
       }
       mPackages.addAll(packages);
     }
-    mBridgeListener = bridgeListener;
+    mJSIModulesProvider = jsiModulesProvider;
 
     // Instantiate ReactChoreographer in UI thread.
     ReactChoreographer.initialize();
@@ -1008,7 +1008,7 @@ private void attachRootViewToInstance(
       CatalystInstance catalystInstance) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.attachRootViewToInstance()");
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "attachRootViewToInstance");
-    UIManager uiManagerModule = rootView.isFabric() ? catalystInstance.getFabricUIManager() : catalystInstance.getNativeModule(UIManagerModule.class);
+    UIManager uiManagerModule = rootView.isFabric() ? catalystInstance.getJSIModule(UIManager.class) : catalystInstance.getNativeModule(UIManagerModule.class);
     final int rootTag = uiManagerModule.addRootView(rootView);
     rootView.setRootViewTag(rootTag);
     rootView.invokeJSEntryPoint();
@@ -1099,8 +1099,9 @@ private ReactApplicationContext createReactContext(
       Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
       ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_END);
     }
-    if (mBridgeListener != null) {
-      mBridgeListener.onBridgeStarted(reactContext, catalystInstance);
+    if (mJSIModulesProvider != null) {
+      catalystInstance.addJSIModules(mJSIModulesProvider
+        .getJSIModules(reactContext, catalystInstance.getJavaScriptContextHolder()));
     }
 
     if (mBridgeIdleDebugListener != null) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
index 5f9042093ab9ee..75792d83db3bea 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
@@ -7,8 +7,7 @@
 import android.app.Activity;
 import android.app.Application;
 import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.bridge.BridgeListener;
-import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.JSIModulesProvider;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.JSCJavaScriptExecutorFactory;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
@@ -50,7 +49,7 @@ public class ReactInstanceManagerBuilder {
   private @Nullable JavaScriptExecutorFactory mJavaScriptExecutorFactory;
   private int mMinNumShakes = 1;
   private int mMinTimeLeftInFrameForNonBatchedOperationMs = -1;
-  private @Nullable BridgeListener mBridgeListener;
+  private @Nullable JSIModulesProvider mJSIModulesProvider;
 
   /* package protected */ ReactInstanceManagerBuilder() {
   }
@@ -65,9 +64,9 @@ public ReactInstanceManagerBuilder setUIImplementationProvider(
     return this;
   }
 
-  public ReactInstanceManagerBuilder setBridgeListener(
-    @Nullable BridgeListener listener) {
-    mBridgeListener = listener;
+  public ReactInstanceManagerBuilder setJSIModulesProvider(
+    @Nullable JSIModulesProvider jsiModulesProvider) {
+    mJSIModulesProvider = jsiModulesProvider;
     return this;
   }
 
@@ -290,6 +289,6 @@ public ReactInstanceManager build() {
         mDevBundleDownloadListener,
         mMinNumShakes,
         mMinTimeLeftInFrameForNonBatchedOperationMs,
-        mBridgeListener);
+      mJSIModulesProvider);
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
index 243053fcfe689f..e1537d550f36fc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
@@ -7,6 +7,7 @@
 
 package com.facebook.react;
 
+import com.facebook.react.bridge.JSIModulesProvider;
 import javax.annotation.Nullable;
 
 import java.util.List;
@@ -14,7 +15,7 @@
 import android.app.Application;
 
 import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.bridge.BridgeListener;
+import com.facebook.react.bridge.JSIModulesProvider;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
@@ -75,7 +76,7 @@ protected ReactInstanceManager createReactInstanceManager() {
       .setRedBoxHandler(getRedBoxHandler())
       .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
       .setUIImplementationProvider(getUIImplementationProvider())
-      .setBridgeListener(getBridgeListener())
+      .setJSIModulesProvider(getJSIModulesProvider())
       .setInitialLifecycleState(LifecycleState.BEFORE_CREATE);
 
     for (ReactPackage reactPackage : getPackages()) {
@@ -122,7 +123,8 @@ protected UIImplementationProvider getUIImplementationProvider() {
     return new UIImplementationProvider();
   }
 
-  protected @Nullable BridgeListener getBridgeListener() {
+  protected @Nullable
+  JSIModulesProvider getJSIModulesProvider() {
     return null;
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeListener.java
deleted file mode 100644
index 70b771ff558e81..00000000000000
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeListener.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.facebook.react.bridge;
-
-/**
- * Interface to listen to bridge events.
- */
-public interface BridgeListener {
-
-  /**
-   * Called right after the RN Bridge is initialized
-   * @param catalystInstance {@link CatalystInstance} bridge
-   */
-  void onBridgeStarted(ReactApplicationContext reactApplicationContext, CatalystInstance catalystInstance);
-
-}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
index 1f277e6ec384fe..fe6d4611226636 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
@@ -11,6 +11,7 @@
 import com.facebook.react.bridge.queue.ReactQueueConfiguration;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import java.util.Collection;
+import java.util.List;
 import javax.annotation.Nullable;
 
 /**
@@ -62,6 +63,7 @@ void callFunction(
   <T extends JavaScriptModule> T getJSModule(Class<T> jsInterface);
   <T extends NativeModule> boolean hasNativeModule(Class<T> nativeModuleInterface);
   <T extends NativeModule> T getNativeModule(Class<T> nativeModuleInterface);
+  <T extends JSIModule> T getJSIModule(Class<T> jsiModuleInterface);
   Collection<NativeModule> getNativeModules();
 
   /**
@@ -99,7 +101,5 @@ void callFunction(
    */
   JavaScriptContextHolder getJavaScriptContextHolder();
 
-  <T extends UIManager> void setFabricUIManager(T fabricUIManager);
-
-  <T extends UIManager> T getFabricUIManager();
+  void addJSIModules(List<JSIModuleHolder> jsiModules);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
index 79233aae2e328c..7ab1216267db6c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -26,6 +26,7 @@
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.Nullable;
@@ -79,13 +80,13 @@ public String toString() {
   private final Object mJSCallsPendingInitLock = new Object();
 
   private final NativeModuleRegistry mNativeModuleRegistry;
+  private final JSIModuleRegistry mJSIModuleRegistry = new JSIModuleRegistry();
   private final NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
   private final MessageQueueThread mNativeModulesQueueThread;
   private boolean mInitialized = false;
   private volatile boolean mAcceptCalls = false;
 
   private boolean mJSBundleHasLoaded;
-  private UIManager mFabricUIManager;
   private @Nullable String mSourceURL;
 
   private JavaScriptContextHolder mJavaScriptContextHolder;
@@ -453,12 +454,14 @@ public JavaScriptContextHolder getJavaScriptContextHolder() {
     return mJavaScriptContextHolder;
   }
 
-  public UIManager getFabricUIManager() {
-    return mFabricUIManager;
+  @Override
+  public void addJSIModules(List<JSIModuleHolder> jsiModules) {
+    mJSIModuleRegistry.registerModules(jsiModules);
   }
 
-  public void setFabricUIManager(UIManager fabricUIManager) {
-    mFabricUIManager = fabricUIManager;
+  @Override
+  public <T extends JSIModule> T getJSIModule(Class<T> jsiModuleInterface) {
+    return mJSIModuleRegistry.getModule(jsiModuleInterface);
   }
 
   private native long getJavaScriptContext();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModule.java
new file mode 100644
index 00000000000000..5b9e2495449d57
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModule.java
@@ -0,0 +1,7 @@
+package com.facebook.react.bridge;
+
+/**
+ * Marker interface used to represent a JSI Module.
+ */
+public interface JSIModule {
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleHolder.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleHolder.java
new file mode 100644
index 00000000000000..de98ae54b51c8e
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleHolder.java
@@ -0,0 +1,12 @@
+package com.facebook.react.bridge;
+
+/**
+ * Holder class used to register {@link JSIModule} into JSI Bridge.
+ */
+public interface JSIModuleHolder {
+
+  Class<? extends JSIModule> getJSIModuleClass();
+
+  <T extends JSIModule> T getJSIModule();
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
new file mode 100644
index 00000000000000..913aae68bcbfa2
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
@@ -0,0 +1,23 @@
+package com.facebook.react.bridge;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import com.facebook.infer.annotation.Assertions;
+
+public class JSIModuleRegistry {
+
+  private final Map<Class, JSIModule> mModules = new HashMap<>();
+
+  public JSIModuleRegistry() { }
+
+  public <T extends JSIModule> T getModule(Class<T> moduleClass) {
+    return (T) Assertions.assertNotNull(mModules.get(moduleClass));
+  }
+
+  public void registerModules(List<JSIModuleHolder> jsiModules) {
+    for (JSIModuleHolder holder : jsiModules) {
+      mModules.put(holder.getJSIModuleClass(), holder.getJSIModule());
+    }
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModulesProvider.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModulesProvider.java
new file mode 100644
index 00000000000000..8abaa1ff79e2c2
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModulesProvider.java
@@ -0,0 +1,15 @@
+package com.facebook.react.bridge;
+
+import java.util.List;
+
+/**
+ * Interface used to initialize JSI Modules into the JSI Bridge.
+ */
+public interface JSIModulesProvider {
+
+  /**
+   * @return a {@link List<JSIModuleHolder>} that contain the list of JSI Modules.
+   */
+  List<JSIModuleHolder> getJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext);
+
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
index ff3e93ca1d5b91..6cbca5de698f86 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.java
@@ -3,7 +3,7 @@
 import com.facebook.react.uimanager.common.MeasureSpecProvider;
 import com.facebook.react.uimanager.common.SizeMonitoringFrameLayout;
 
-public interface UIManager {
+public interface UIManager extends JSIModule {
 
   /**
    * Registers a new root view.

From 19b98519992a033079191dc2f12c68533588ab4c Mon Sep 17 00:00:00 2001
From: Sophie Alpert <sophiebits@fb.com>
Date: Mon, 5 Mar 2018 14:12:23 -0800
Subject: [PATCH 161/267] Update VirtualizedList to not throw with double
 constructor

Summary: constructor shouldn't have side effects.

Reviewed By: sahrens

Differential Revision: D7146018

fbshipit-source-id: 0ca311e48d6bad81988ed48605c8134068c482da
---
 Libraries/Lists/VirtualizedList.js | 62 ++++++++++++++++++------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index f40b44e404c4f6..e6acee9e77c271 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -442,6 +442,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       getScrollMetrics: PropTypes.func,
       horizontal: PropTypes.bool,
       getOutermostParentListRef: PropTypes.func,
+      getNestedChildState: PropTypes.func,
       registerAsNestedChild: PropTypes.func,
       unregisterAsNestedChild: PropTypes.func,
     }),
@@ -452,6 +453,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       getScrollMetrics: PropTypes.func,
       horizontal: PropTypes.bool,
       getOutermostParentListRef: PropTypes.func,
+      getNestedChildState: PropTypes.func,
       registerAsNestedChild: PropTypes.func,
       unregisterAsNestedChild: PropTypes.func,
     }),
@@ -463,6 +465,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         getScrollMetrics: this._getScrollMetrics,
         horizontal: this.props.horizontal,
         getOutermostParentListRef: this._getOutermostParentListRef,
+        getNestedChildState: this._getNestedChildState,
         registerAsNestedChild: this._registerAsNestedChild,
         unregisterAsNestedChild: this._unregisterAsNestedChild,
       },
@@ -492,6 +495,11 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     }
   };
 
+  _getNestedChildState = (key: string): ?ChildListState => {
+    const existingChildData = this._nestedChildLists.get(key);
+    return existingChildData && existingChildData.state;
+  };
+
   _registerAsNestedChild = (childList: {
     cellKey: string,
     key: string,
@@ -518,8 +526,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     if (this._hasInteracted) {
       childList.ref.recordInteraction();
     }
-
-    return existingChildData && existingChildData.state;
   };
 
   _unregisterAsNestedChild = (childList: {
@@ -577,11 +583,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     };
 
     if (this._isNestedWithSameOrientation()) {
-      const storedState = this.context.virtualizedList.registerAsNestedChild({
-        cellKey: this._getCellKey(),
-        key: this.props.listKey || this._getCellKey(),
-        ref: this,
-      });
+      const storedState = this.context.virtualizedList.getNestedChildState(
+        this.props.listKey || this._getCellKey(),
+      );
       if (storedState) {
         initialState = storedState;
         this.state = storedState;
@@ -592,6 +596,16 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     this.state = initialState;
   }
 
+  componentDidMount() {
+    if (this._isNestedWithSameOrientation()) {
+      this.context.virtualizedList.registerAsNestedChild({
+        cellKey: this._getCellKey(),
+        key: this.props.listKey || this._getCellKey(),
+        ref: this,
+      });
+    }
+  }
+
   componentWillUnmount() {
     if (this._isNestedWithSameOrientation()) {
       this.context.virtualizedList.unregisterAsNestedChild({
@@ -611,29 +625,17 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     this._fillRateHelper.deactivateAndFlush();
   }
 
-  UNSAFE_componentWillReceiveProps(newProps: Props) {
+  static getDerivedStateFromProps(newProps: Props, prevState: State) {
     const {data, extraData, getItemCount, maxToRenderPerBatch} = newProps;
     // first and last could be stale (e.g. if a new, shorter items props is passed in), so we make
     // sure we're rendering a reasonable range here.
-    this.setState({
+    return {
       first: Math.max(
         0,
-        Math.min(
-          this.state.first,
-          getItemCount(data) - 1 - maxToRenderPerBatch,
-        ),
+        Math.min(prevState.first, getItemCount(data) - 1 - maxToRenderPerBatch),
       ),
-      last: Math.max(0, Math.min(this.state.last, getItemCount(data) - 1)),
-    });
-    if (data !== this.props.data || extraData !== this.props.extraData) {
-      this._hasDataChangedSinceEndReached = true;
-
-      // clear the viewableIndices cache to also trigger
-      // the onViewableItemsChanged callback with the new data
-      this._viewabilityTuples.forEach(tuple => {
-        tuple.viewabilityHelper.resetViewableIndices();
-      });
-    }
+      last: Math.max(0, Math.min(prevState.last, getItemCount(data) - 1)),
+    };
   }
 
   _pushCells(
@@ -916,7 +918,17 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     }
   }
 
-  componentDidUpdate() {
+  componentDidUpdate(prevProps: Props) {
+    const {data, extraData} = this.props;
+    if (data !== prevProps.data || extraData !== prevProps.extraData) {
+      this._hasDataChangedSinceEndReached = true;
+
+      // clear the viewableIndices cache to also trigger
+      // the onViewableItemsChanged callback with the new data
+      this._viewabilityTuples.forEach(tuple => {
+        tuple.viewabilityHelper.resetViewableIndices();
+      });
+    }
     this._scheduleCellsToRenderUpdate();
   }
 

From 860fcd458a1873ebcf977be01670be5912ae7104 Mon Sep 17 00:00:00 2001
From: rickhanlonii <rickhanlonii@gmail.com>
Date: Mon, 5 Mar 2018 14:20:47 -0800
Subject: [PATCH 162/267] Update node-notifier (has mem leak fix)

Summary:
Noticed that we're on a version of node-notifier that has a leak mentioned [here](https://github.com/mikaelbr/node-notifier/issues/183) and fixed in the newest version.

Automated tests

 [INTERNAL] [BUGFIX] [package.json] - Update node-notifier dependency
Closes https://github.com/facebook/react-native/pull/18033

Differential Revision: D7102637

Pulled By: hramos

fbshipit-source-id: 850f3d826c1d880a6281d95e4d5af68e9af89927
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7afce5a614ec5a..eb1471c7476754 100644
--- a/package.json
+++ b/package.json
@@ -181,7 +181,7 @@
     "mkdirp": "^0.5.1",
     "morgan": "^1.9.0",
     "node-fetch": "^1.3.3",
-    "node-notifier": "^5.1.2",
+    "node-notifier": "^5.2.1",
     "npmlog": "^2.0.4",
     "opn": "^3.0.2",
     "optimist": "^0.6.1",

From 19a4a7d3cb6d00780ccbbbd7b0062896f64ab24d Mon Sep 17 00:00:00 2001
From: Dan Zimmerman <danzimm@fb.com>
Date: Mon, 5 Mar 2018 14:30:17 -0800
Subject: [PATCH 163/267] Remove callFunctionSync experimental APIs

Reviewed By: michalgr

Differential Revision: D6124038

fbshipit-source-id: 219afe30783da92cf10f800dc35e64823b61cf4b
---
 React/Base/RCTBridge.h                  | 16 ---------
 React/Base/RCTBridge.m                  |  8 -----
 React/CxxBridge/RCTCxxBridge.mm         | 47 -------------------------
 ReactCommon/cxxreact/Instance.h         |  9 -----
 ReactCommon/cxxreact/JSCExecutor.cpp    | 24 -------------
 ReactCommon/cxxreact/JSCExecutor.h      | 11 ------
 ReactCommon/cxxreact/NativeToJsBridge.h | 29 ---------------
 7 files changed, 144 deletions(-)

diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
index 7db16baea37735..11d453343e236a 100644
--- a/React/Base/RCTBridge.h
+++ b/React/Base/RCTBridge.h
@@ -120,22 +120,6 @@ RCT_EXTERN NSString *RCTBridgeModuleNameForClass(Class bridgeModuleClass);
 - (void)enqueueJSCall:(NSString *)moduleDotMethod args:(NSArray *)args;
 - (void)enqueueJSCall:(NSString *)module method:(NSString *)method args:(NSArray *)args completion:(dispatch_block_t)completion;
 
-/**
- * This method is used to call functions in the JavaScript application context
- * synchronously.  This is intended for use by applications which do their own
- * thread management and are careful to manage multi-threaded access to the JSVM.
- * See also -[RCTBridgeDelgate shouldBridgeLoadJavaScriptSynchronously], which
- * may be needed to ensure that any requires JS code is loaded before this method
- * is called.  If the underlying executor is not JSC, this will return nil.  Safe
- * to call from any thread.
- *
- * @experimental
- */
-- (JSValue *)callFunctionOnModule:(NSString *)module
-                           method:(NSString *)method
-                        arguments:(NSArray *)arguments
-                            error:(NSError **)error;
-
 /**
  * This method registers the file path of an additional JS segment by its ID.
  *
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index a84a966e361810..7250a0ea3f9bfb 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -364,14 +364,6 @@ - (void)enqueueCallback:(NSNumber *)cbID args:(NSArray *)args
   [self.batchedBridge enqueueCallback:cbID args:args];
 }
 
-- (JSValue *)callFunctionOnModule:(NSString *)module
-                           method:(NSString *)method
-                        arguments:(NSArray *)arguments
-                            error:(NSError **)error
-{
-  return [self.batchedBridge callFunctionOnModule:module method:method arguments:arguments error:error];
-}
-
 - (void)registerSegmentWithId:(NSUInteger)segmentId path:(NSString *)path
 {
   [self.batchedBridge registerSegmentWithId:segmentId path:path];
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 1da12b8a217e3a..50dc3fb8dba18b 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -1183,53 +1183,6 @@ - (void)executeApplicationScript:(NSData *)script
   }];
 }
 
-- (JSValue *)callFunctionOnModule:(NSString *)module
-                           method:(NSString *)method
-                        arguments:(NSArray *)arguments
-                            error:(NSError **)error
-{
-  if (!_reactInstance) {
-    if (error) {
-      *error = RCTErrorWithMessage(
-        @"callFunctionOnModule was called on uninitialized bridge");
-    }
-    return nil;
-  } else if (self.executorClass) {
-    if (error) {
-      *error = RCTErrorWithMessage(
-        @"callFunctionOnModule can only be used with JSC executor");
-    }
-    return nil;
-  } else if (!self.valid) {
-    if (error) {
-      *error = RCTErrorWithMessage(
-        @"Bridge is no longer valid");
-    }
-    return nil;
-  } else if (self.loading) {
-    if (error) {
-      *error = RCTErrorWithMessage(
-        @"Bridge is still loading");
-    }
-    return nil;
-  }
-
-  RCT_PROFILE_BEGIN_EVENT(0, @"callFunctionOnModule", (@{ @"module": module, @"method": method }));
-  __block JSValue *ret = nil;
-  NSError *errorObj = tryAndReturnError(^{
-    Value result = self->_reactInstance->callFunctionSync([module UTF8String], [method UTF8String], (id)arguments);
-    JSContext *context = contextForGlobalContextRef(JSC_JSContextGetGlobalContext(result.context()));
-    ret = [JSC_JSValue(result.context()) valueWithJSValueRef:result inContext:context];
-  });
-  RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"js_call");
-
-  if (error) {
-    *error = errorObj;
-  }
-
-  return ret;
-}
-
 - (void)registerSegmentWithId:(NSUInteger)segmentId path:(NSString *)path
 {
   if (_reactInstance) {
diff --git a/ReactCommon/cxxreact/Instance.h b/ReactCommon/cxxreact/Instance.h
index bcd0bea395acb3..e35ce4bbe2ac3e 100644
--- a/ReactCommon/cxxreact/Instance.h
+++ b/ReactCommon/cxxreact/Instance.h
@@ -63,15 +63,6 @@ class RN_EXPORT Instance {
   // This method is experimental, and may be modified or removed.
   void registerBundle(uint32_t bundleId, const std::string& bundlePath);
 
-  // This method is experimental, and may be modified or removed.
-  template <typename T>
-  Value callFunctionSync(const std::string &module, const std::string &method,
-                         T &&args) {
-    CHECK(nativeToJsBridge_);
-    return nativeToJsBridge_->callFunctionSync(module, method,
-                                               std::forward<T>(args));
-  }
-
   const ModuleRegistry &getModuleRegistry() const;
   ModuleRegistry &getModuleRegistry();
 
diff --git a/ReactCommon/cxxreact/JSCExecutor.cpp b/ReactCommon/cxxreact/JSCExecutor.cpp
index 01c8c96de19560..81e71eddbaa5e9 100644
--- a/ReactCommon/cxxreact/JSCExecutor.cpp
+++ b/ReactCommon/cxxreact/JSCExecutor.cpp
@@ -581,30 +581,6 @@ namespace facebook {
       callNativeModules(std::move(result));
     }
 
-    Value JSCExecutor::callFunctionSyncWithValue(
-                                                 const std::string& module, const std::string& method, Value args) {
-      SystraceSection s("JSCExecutor::callFunction");
-      Object result = [&] {
-        JSContextLock lock(m_context);
-        if (!m_callFunctionReturnResultAndFlushedQueueJS) {
-          bindBridge();
-        }
-        return m_callFunctionReturnResultAndFlushedQueueJS->callAsFunction({
-          Value(m_context, String::createExpectingAscii(m_context, module)),
-          Value(m_context, String::createExpectingAscii(m_context, method)),
-          std::move(args),
-        }).asObject();
-      }();
-
-      Value length = result.getProperty("length");
-
-      if (!length.isNumber() || length.asInteger() != 2) {
-        std::runtime_error("Return value of a callFunction must be an array of size 2");
-      }
-      callNativeModules(result.getPropertyAtIndex(1));
-      return result.getPropertyAtIndex(0);
-    }
-
     void JSCExecutor::setGlobalVariable(std::string propName, std::unique_ptr<const JSBigString> jsonValue) {
       try {
         SystraceSection s("JSCExecutor::setGlobalVariable", "propName", propName);
diff --git a/ReactCommon/cxxreact/JSCExecutor.h b/ReactCommon/cxxreact/JSCExecutor.h
index 258697af5c9587..5acc967722e5ca 100644
--- a/ReactCommon/cxxreact/JSCExecutor.h
+++ b/ReactCommon/cxxreact/JSCExecutor.h
@@ -79,14 +79,6 @@ class RN_EXPORT JSCExecutor : public JSExecutor, public PrivateDataBase {
     const double callbackId,
     const folly::dynamic& arguments) override;
 
-  template <typename T>
-  Value callFunctionSync(
-      const std::string& module, const std::string& method, T&& args) {
-    return callFunctionSyncWithValue(
-      module, method, JSCValueEncoder<typename std::decay<T>::type>::toJSCValue(
-        m_context, std::forward<T>(args)));
-  }
-
   virtual void setGlobalVariable(
     std::string propName,
     std::unique_ptr<const JSBigString> jsonValue) override;
@@ -123,9 +115,6 @@ class RN_EXPORT JSCExecutor : public JSExecutor, public PrivateDataBase {
 
   void initOnJSVMThread() throw(JSException);
   static bool isNetworkInspected(const std::string &owner, const std::string &app, const std::string &device);
-  // This method is experimental, and may be modified or removed.
-  Value callFunctionSyncWithValue(
-    const std::string& module, const std::string& method, Value value);
   void terminateOnJSVMThread();
   void bindBridge() throw(JSException);
   void callNativeModules(Value&&);
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.h b/ReactCommon/cxxreact/NativeToJsBridge.h
index 586766e387bdab..78d960a08a4529 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.h
+++ b/ReactCommon/cxxreact/NativeToJsBridge.h
@@ -55,35 +55,6 @@ class NativeToJsBridge {
    */
   void invokeCallback(double callbackId, folly::dynamic&& args);
 
-  /**
-   * Executes a JS method on the given executor synchronously, returning its
-   * return value.  JSException will be thrown if JS throws an exception;
-   * another standard exception may be thrown for C++ bridge failures, or if
-   * the executor is not capable of synchronous calls.
-   *
-   * This method is experimental, and may be modified or removed.
-   *
-   * loadApplicationScriptSync() must be called and finished executing
-   * before callFunctionSync().
-   */
-  template <typename T>
-  Value callFunctionSync(const std::string& module, const std::string& method, T&& args) {
-    if (*m_destroyed) {
-      throw std::logic_error(
-        folly::to<std::string>("Synchronous call to ", module, ".", method,
-                               " after bridge is destroyed"));
-    }
-
-    JSCExecutor *jscExecutor = dynamic_cast<JSCExecutor*>(m_executor.get());
-    if (!jscExecutor) {
-      throw std::invalid_argument(
-        folly::to<std::string>("Executor type ", typeid(m_executor.get()).name(),
-                               " does not support synchronous calls"));
-    }
-
-    return jscExecutor->callFunctionSync(module, method, std::forward<T>(args));
-  }
-
   /**
    * Starts the JS application.  If bundleRegistry is non-null, then it is
    * used to fetch JavaScript modules as individual scripts.

From 9366ce416fbf015e4795987d39a65199b1b335c2 Mon Sep 17 00:00:00 2001
From: Maksym Komarychev <maxkomarychev@gmail.com>
Date: Mon, 5 Mar 2018 15:46:32 -0800
Subject: [PATCH 164/267] Update opacity when `disabled` prop is changed

Summary:
fixes #17105

If you render

```
    <TouchableOpacity
        disabled={true}
        style={{opacity: 0.5}}
    >
        ...
    </TouchableOpacity>
```

and then

```
    <TouchableOpacity
        disabled={false}
        style={{opacity: 1}}
    >
        ...
    </TouchableOpacity>
```

The content of `TouchableOpacity` will still have opacity = 0.5 because real
opacity is controlled by animated property which should be properly updated
when `disabled` prop changes.

<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

Usually when a button or other UI component is built with `TouchableOpacity` you may want to change it's opacity if state of component is changed (enabled/disabled). Opacity provided in props is overridden with internally-managed animated value. Add extra check when component is updated to trigger opacity animation upon change of `disabled` flag.

You can use code from https://github.com/facebook/react-native/issues/17105.

(If this PR adds or changes functionality, please take some time to update the docs at https://github.com/facebook/react-native-website, and link to your PR here.)

[GENERAL][BUGFIX][TouchableOpacity] - trigger animation on `opacity` upon change in `disabled` prop.
<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
Closes https://github.com/facebook/react-native/pull/17106

Differential Revision: D7158549

Pulled By: hramos

fbshipit-source-id: 209cc433b829b129810e8a884964c8853ca3fe8f
---
 Libraries/Components/Touchable/TouchableOpacity.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
index abb77ac95a3854..cbffbb59784972 100644
--- a/Libraries/Components/Touchable/TouchableOpacity.js
+++ b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -160,6 +160,12 @@ const TouchableOpacity = createReactClass({
     ensurePositiveDelayProps(nextProps);
   },
 
+  componentDidUpdate: function(prevProps, prevState) {
+    if (this.props.disabled !== prevProps.disabled) {
+      this._opacityInactive(250);
+    }
+  },
+
   /**
    * Animate the touchable to a new opacity.
    */

From b4ce4277af6e14dc2bdfa20c874e95348fcbae8f Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Mon, 5 Mar 2018 18:29:39 -0800
Subject: [PATCH 165/267] iOS: branch out Fabric handling into a separate
 RCTSurface-compatible class.

Reviewed By: mmmulani

Differential Revision: D7158824

fbshipit-source-id: 80eb61835181fa3f522b788e2861470cba88890a
---
 React/Base/RCTRootContentView.h               | 10 +-----
 React/Base/RCTRootContentView.m               | 25 +++------------
 React/Base/RCTRootView.h                      | 25 +--------------
 React/Base/RCTRootView.m                      | 23 ++-----------
 React/Base/Surface/RCTSurface.h               | 22 ++++++++-----
 React/Base/Surface/RCTSurface.mm              | 32 ++++++++-----------
 .../RCTSurfaceHostingProxyRootView.h          | 14 +-------
 .../RCTSurfaceHostingProxyRootView.mm         | 26 ++-------------
 .../RCTSurfaceHostingView.h                   | 10 +++---
 .../RCTSurfaceHostingView.mm                  | 20 +++++-------
 React/Fabric/Surface/RCTFabricSurface.h       | 16 ++++++++++
 React/Fabric/Surface/RCTFabricSurface.mm      | 22 +++++++++++++
 .../RCTFabricSurfaceHostingProxyRootView.h    | 16 ++++++++++
 .../RCTFabricSurfaceHostingProxyRootView.mm   | 19 +++++++++++
 .../Surface/RCTFabricSurfaceHostingView.h     | 16 ++++++++++
 .../Surface/RCTFabricSurfaceHostingView.mm    | 25 +++++++++++++++
 16 files changed, 165 insertions(+), 156 deletions(-)
 create mode 100644 React/Fabric/Surface/RCTFabricSurface.h
 create mode 100644 React/Fabric/Surface/RCTFabricSurface.mm
 create mode 100644 React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h
 create mode 100644 React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm
 create mode 100644 React/Fabric/Surface/RCTFabricSurfaceHostingView.h
 create mode 100644 React/Fabric/Surface/RCTFabricSurfaceHostingView.mm

diff --git a/React/Base/RCTRootContentView.h b/React/Base/RCTRootContentView.h
index bd14cfb2005ea9..28a0646cfed752 100644
--- a/React/Base/RCTRootContentView.h
+++ b/React/Base/RCTRootContentView.h
@@ -24,17 +24,9 @@
 @property (nonatomic, assign) BOOL passThroughTouches;
 @property (nonatomic, assign) RCTRootViewSizeFlexibility sizeFlexibility;
 
-@property (nonatomic, assign) BOOL fabric;
-
-- (instancetype)initWithFrame:(CGRect)frame
-                       bridge:(RCTBridge *)bridge
-                     reactTag:(NSNumber *)reactTag
-               sizeFlexiblity:(RCTRootViewSizeFlexibility)sizeFlexibility
-                       fabric:(BOOL)fabric NS_DESIGNATED_INITIALIZER;
-
 - (instancetype)initWithFrame:(CGRect)frame
                        bridge:(RCTBridge *)bridge
                      reactTag:(NSNumber *)reactTag
-               sizeFlexiblity:(RCTRootViewSizeFlexibility)sizeFlexibility;
+               sizeFlexiblity:(RCTRootViewSizeFlexibility)sizeFlexibility NS_DESIGNATED_INITIALIZER;
 
 @end
diff --git a/React/Base/RCTRootContentView.m b/React/Base/RCTRootContentView.m
index 7782d06f02c3e4..67b1f8b7002151 100644
--- a/React/Base/RCTRootContentView.m
+++ b/React/Base/RCTRootContentView.m
@@ -21,10 +21,8 @@ - (instancetype)initWithFrame:(CGRect)frame
                        bridge:(RCTBridge *)bridge
                      reactTag:(NSNumber *)reactTag
                sizeFlexiblity:(RCTRootViewSizeFlexibility)sizeFlexibility
-                       fabric:(BOOL)fabric
 {
   if ((self = [super initWithFrame:frame])) {
-    _fabric = fabric;
     _bridge = bridge;
     self.reactTag = reactTag;
     _sizeFlexibility = sizeFlexibility;
@@ -35,14 +33,6 @@ - (instancetype)initWithFrame:(CGRect)frame
   return self;
 }
 
-- (instancetype)initWithFrame:(CGRect)frame
-                       bridge:(RCTBridge *)bridge
-                     reactTag:(NSNumber *)reactTag
-               sizeFlexiblity:(RCTRootViewSizeFlexibility)sizeFlexibility
-{
-  return [self initWithFrame:frame bridge:bridge reactTag:reactTag sizeFlexiblity:sizeFlexibility fabric:NO];
-}
-
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame:(CGRect)frame)
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder:(nonnull NSCoder *)aDecoder)
 
@@ -109,17 +99,10 @@ - (void)invalidate
     self.userInteractionEnabled = NO;
     [(RCTRootView *)self.superview contentViewInvalidated];
 
-    if (_fabric) {
-      [_bridge enqueueJSCall:@"ReactFabric"
-                      method:@"unmountComponentAtNodeAndRemoveContainer"
-                        args:@[self.reactTag]
-                  completion:NULL];
-    } else {
-      [_bridge enqueueJSCall:@"AppRegistry"
-                      method:@"unmountApplicationComponentAtRootTag"
-                        args:@[self.reactTag]
-                  completion:NULL];
-    }
+    [_bridge enqueueJSCall:@"AppRegistry"
+                    method:@"unmountApplicationComponentAtRootTag"
+                      args:@[self.reactTag]
+                completion:NULL];
   }
 }
 
diff --git a/React/Base/RCTRootView.h b/React/Base/RCTRootView.h
index 41c21f672fdb0f..daab13efbe8c21 100644
--- a/React/Base/RCTRootView.h
+++ b/React/Base/RCTRootView.h
@@ -44,16 +44,7 @@ extern NSString *const RCTContentDidAppearNotification;
  */
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-                        fabric:(BOOL)fabric NS_DESIGNATED_INITIALIZER;
-
-/**
- * - Convenience initializer -
- * Initialize without using FabricUIManager.
- */
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties;
+             initialProperties:(NSDictionary *)initialProperties NS_DESIGNATED_INITIALIZER;
 
 /**
  * - Convenience initializer -
@@ -67,15 +58,6 @@ extern NSString *const RCTContentDidAppearNotification;
                 initialProperties:(NSDictionary *)initialProperties
                     launchOptions:(NSDictionary *)launchOptions;
 
-/**
- * - Convenience initializer -
- */
-- (instancetype)initWithBundleURL:(NSURL *)bundleURL
-                       moduleName:(NSString *)moduleName
-                initialProperties:(NSDictionary *)initialProperties
-                    launchOptions:(NSDictionary *)launchOptions
-                           fabric:(BOOL)fabric;
-
 
 /**
  * The name of the JavaScript module to execute within the
@@ -165,11 +147,6 @@ extern NSString *const RCTContentDidAppearNotification;
 @property (nonatomic, assign) NSTimeInterval loadingViewFadeDelay;
 @property (nonatomic, assign) NSTimeInterval loadingViewFadeDuration;
 
-/**
- * Indicates whether this view is managed by FabricUIManager or the traditional UIManager.
- */
-@property (nonatomic, assign) BOOL fabric;
-
 @end
 
 @interface RCTRootView (Deprecated)
diff --git a/React/Base/RCTRootView.m b/React/Base/RCTRootView.m
index 8fabbd6e84737d..204dd5871be16b 100644
--- a/React/Base/RCTRootView.m
+++ b/React/Base/RCTRootView.m
@@ -52,7 +52,6 @@ @implementation RCTRootView
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties
-                        fabric:(BOOL)fabric
 {
   RCTAssertMainQueue();
   RCTAssert(bridge, @"A bridge instance is required to create an RCTRootView");
@@ -66,7 +65,6 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   if (self = [super initWithFrame:CGRectZero]) {
     self.backgroundColor = [UIColor whiteColor];
 
-    _fabric = fabric;
     _bridge = bridge;
     _moduleName = moduleName;
     _appProperties = [initialProperties copy];
@@ -108,32 +106,16 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-{
-  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:NO];
-}
-
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL
                        moduleName:(NSString *)moduleName
                 initialProperties:(NSDictionary *)initialProperties
                     launchOptions:(NSDictionary *)launchOptions
-                           fabric:(BOOL)fabric
 {
   RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:bundleURL
                                             moduleProvider:nil
                                              launchOptions:launchOptions];
 
-  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:fabric];
-}
-
-- (instancetype)initWithBundleURL:(NSURL *)bundleURL
-                       moduleName:(NSString *)moduleName
-                initialProperties:(NSDictionary *)initialProperties
-                    launchOptions:(NSDictionary *)launchOptions
-{
-  return [self initWithBundleURL:bundleURL moduleName:moduleName initialProperties:initialProperties launchOptions:launchOptions fabric:NO];
+  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
 }
 
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
@@ -289,8 +271,7 @@ - (void)bundleFinishedLoading:(RCTBridge *)bridge
   _contentView = [[RCTRootContentView alloc] initWithFrame:self.bounds
                                                     bridge:bridge
                                                   reactTag:self.reactTag
-                                            sizeFlexiblity:_sizeFlexibility
-                                                    fabric:self.fabric];
+                                            sizeFlexiblity:_sizeFlexibility];
   [self runApplication:bridge];
 
   _contentView.passThroughTouches = _passThroughTouches;
diff --git a/React/Base/Surface/RCTSurface.h b/React/Base/Surface/RCTSurface.h
index 01d4896f9e30bd..5c3566725e49b5 100644
--- a/React/Base/Surface/RCTSurface.h
+++ b/React/Base/Surface/RCTSurface.h
@@ -42,16 +42,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (atomic, copy, readwrite) NSDictionary *properties;
 
-@property (nonatomic, assign, readonly) BOOL fabric;
-
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-                        fabric:(BOOL)fabric NS_DESIGNATED_INITIALIZER;
-
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties;
+             initialProperties:(NSDictionary *)initialProperties NS_DESIGNATED_INITIALIZER;
 
 #pragma mark - Dealing with UIView representation, the Main thread only access
 
@@ -122,6 +115,19 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (BOOL)synchronouslyWaitForStage:(RCTSurfaceStage)stage timeout:(NSTimeInterval)timeout;
 
+#pragma mark - Mounting/Unmounting of React components
+
+/**
+ * Mount the React component specified by the given moduleName. This is typically
+ * calling runApplication.js from the native side.
+ */
+- (void)mountReactComponentWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName params:(NSDictionary *)params;
+
+/**
+ * Unmount the React component specified by the given rootViewTag, called from native.
+ */
+- (void)unmountReactComponentWithBridge:(RCTBridge *)bridge rootViewTag:(NSNumber *)rootViewTag;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
index eac4985e04c3d1..2817cf29aa6418 100644
--- a/React/Base/Surface/RCTSurface.mm
+++ b/React/Base/Surface/RCTSurface.mm
@@ -61,12 +61,10 @@ @implementation RCTSurface {
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties
-                        fabric:(BOOL)fabric
 {
   RCTAssert(bridge.valid, @"Valid bridge is required to instanciate `RCTSurface`.");
 
   if (self = [super init]) {
-    _fabric = fabric;
     _bridge = bridge;
     _batchedBridge = [_bridge batchedBridge] ?: _bridge;
     _moduleName = moduleName;
@@ -105,13 +103,6 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-{
-  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:NO];
-}
-
 - (void)dealloc
 {
   [self _stop];
@@ -310,21 +301,14 @@ - (void)_run
 
   RCTLogInfo(@"Running surface %@ (%@)", _moduleName, applicationParameters);
 
-  [batchedBridge enqueueJSCall:@"AppRegistry"
-                        method:@"runApplication"
-                          args:@[_moduleName, applicationParameters]
-                    completion:NULL];
+  [self mountReactComponentWithBridge:batchedBridge moduleName:_moduleName params:applicationParameters];
 
   [self _setStage:RCTSurfaceStageSurfaceDidRun];
 }
 
 - (void)_stop
 {
-  RCTBridge *batchedBridge = self._batchedBridge;
-  [batchedBridge enqueueJSCall:@"AppRegistry"
-                        method:@"unmountApplicationComponentAtRootTag"
-                          args:@[self->_rootViewTag]
-                    completion:NULL];
+  [self unmountReactComponentWithBridge:self._batchedBridge rootViewTag:self->_rootViewTag];
 }
 
 - (void)_registerRootView
@@ -571,4 +555,16 @@ - (void)uiManagerDidPerformMounting:(RCTUIManager *)manager
   }
 }
 
+#pragma mark - Mounting/Unmounting of React components
+
+- (void)mountReactComponentWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName params:(NSDictionary *)params
+{
+  [bridge enqueueJSCall:@"AppRegistry" method:@"runApplication" args:@[moduleName, params] completion:NULL];
+}
+
+- (void)unmountReactComponentWithBridge:(RCTBridge *)bridge rootViewTag:(NSNumber *)rootViewTag
+{
+  [bridge enqueueJSCall:@"AppRegistry" method:@"unmountApplicationComponentAtRootTag" args:@[rootViewTag] completion:NULL];
+}
+
 @end
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
index b761cc33bde868..6e07b1ac0a8f7b 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
@@ -35,28 +35,16 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL passThroughTouches;
 @property (nonatomic, assign) NSTimeInterval loadingViewFadeDelay;
 @property (nonatomic, assign) NSTimeInterval loadingViewFadeDuration;
-@property (nonatomic, assign) BOOL fabric;
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-                        fabric:(BOOL)fabric NS_DESIGNATED_INITIALIZER;
-
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties;
+             initialProperties:(NSDictionary *)initialProperties NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL
                        moduleName:(NSString *)moduleName
                 initialProperties:(NSDictionary *)initialProperties
                     launchOptions:(NSDictionary *)launchOptions;
 
-- (instancetype)initWithBundleURL:(NSURL *)bundleURL
-                       moduleName:(NSString *)moduleName
-                initialProperties:(NSDictionary *)initialProperties
-                    launchOptions:(NSDictionary *)launchOptions
-                           fabric:(BOOL)fabric;
-
 - (void)cancelTouches;
 
 @end
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
index 114b1f3981bfc3..4fc100f6b6c15c 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
@@ -51,7 +51,6 @@ @implementation RCTSurfaceHostingProxyRootView
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties
-                        fabric:(BOOL)fabric
 {
   RCTAssertMainQueue();
   RCTAssert(bridge, @"A bridge instance is required to create an RCTSurfaceHostingProxyRootView");
@@ -62,7 +61,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     [bridge.performanceLogger markStartForTag:RCTPLTTI];
   }
 
-  if (self = [super initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:fabric]) {
+  if (self = [super initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties]) {
     self.backgroundColor = [UIColor whiteColor];
   }
 
@@ -71,32 +70,16 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-{
-  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:NO];
-}
-
 - (instancetype)initWithBundleURL:(NSURL *)bundleURL
                        moduleName:(NSString *)moduleName
                 initialProperties:(NSDictionary *)initialProperties
                     launchOptions:(NSDictionary *)launchOptions
-                           fabric:(BOOL)fabric
 {
   RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:bundleURL
                                             moduleProvider:nil
                                              launchOptions:launchOptions];
 
-  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:fabric];
-}
-
-- (instancetype)initWithBundleURL:(NSURL *)bundleURL
-                       moduleName:(NSString *)moduleName
-                initialProperties:(NSDictionary *)initialProperties
-                    launchOptions:(NSDictionary *)launchOptions
-{
-  return [self initWithBundleURL:bundleURL moduleName:moduleName initialProperties:initialProperties launchOptions:launchOptions fabric:NO];
+  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
 }
 
 RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
@@ -114,11 +97,6 @@ - (RCTBridge *)bridge
   return super.surface.bridge;
 }
 
-- (BOOL)fabric
-{
-  return super.surface.fabric;
-}
-
 - (UIView *)contentView
 {
   return self;
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
index 6f6ffe50f599ac..4434df84e00503 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h
@@ -43,13 +43,11 @@ NS_ASSUME_NONNULL_BEGIN
              initialProperties:(NSDictionary *)initialProperties;
 
 /**
- * Convenience initializer.
- * To control toggle Fabric for the Surface.
+ * Create an instance of RCTSurface to be hosted.
  */
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-                        fabric:(BOOL)fabric;
+- (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge
+                             moduleName:(NSString *)moduleName
+                      initialProperties:(NSDictionary *)initialProperties;
 
 /**
  * Surface object which is currently using to power the view.
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
index de4f5ec97332cb..3c3ab2bf7fa8a5 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
@@ -33,23 +33,12 @@ @implementation RCTSurfaceHostingView {
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
              initialProperties:(NSDictionary *)initialProperties
-                        fabric:(BOOL)fabric
 {
-  RCTSurface *surface = [[RCTSurface alloc] initWithBridge:bridge
-                                                moduleName:moduleName
-                                         initialProperties:initialProperties
-                                                    fabric:fabric];
+  RCTSurface *surface = [self createSurfaceWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
   return [self initWithSurface:surface];
 
 }
 
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-{
-  return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties fabric:NO];
-}
-
 - (instancetype)initWithSurface:(RCTSurface *)surface
 {
   if (self = [super initWithFrame:CGRectZero]) {
@@ -67,6 +56,13 @@ - (instancetype)initWithSurface:(RCTSurface *)surface
   return self;
 }
 
+- (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge
+                             moduleName:(NSString *)moduleName
+                      initialProperties:(NSDictionary *)initialProperties
+{
+  return [[RCTSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
+}
+
 - (void)setFrame:(CGRect)frame
 {
   [super setFrame:frame];
diff --git a/React/Fabric/Surface/RCTFabricSurface.h b/React/Fabric/Surface/RCTFabricSurface.h
new file mode 100644
index 00000000000000..1672a9a86ac6b9
--- /dev/null
+++ b/React/Fabric/Surface/RCTFabricSurface.h
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTSurface.h>
+
+/**
+ * Fabric-compatible RCTSurface implementation.
+ * It may not continue extending from RCTSurface in the future.
+ */
+@interface RCTFabricSurface : RCTSurface
+
+@end
diff --git a/React/Fabric/Surface/RCTFabricSurface.mm b/React/Fabric/Surface/RCTFabricSurface.mm
new file mode 100644
index 00000000000000..bcdaac13129e94
--- /dev/null
+++ b/React/Fabric/Surface/RCTFabricSurface.mm
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTFabricSurface.h"
+
+#import <React/RCTBridge.h>
+
+@implementation RCTFabricSurface
+
+- (void)unmountReactComponentWithBridge:(RCTBridge *)bridge rootViewTag:(NSNumber *)rootViewTag
+{
+  [bridge enqueueJSCall:@"ReactFabric"
+                 method:@"unmountComponentAtNodeAndRemoveContainer"
+                   args:@[rootViewTag]
+             completion:NULL];
+}
+
+@end
diff --git a/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h b/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h
new file mode 100644
index 00000000000000..3214426e77d680
--- /dev/null
+++ b/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTSurfaceHostingProxyRootView.h>
+
+/**
+ * Fabric-compatible RCTSurfaceHostingProxyRootView implementation.
+ */
+@interface RCTFabricSurfaceHostingProxyRootView : RCTSurfaceHostingProxyRootView
+
+@end
+
diff --git a/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm b/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm
new file mode 100644
index 00000000000000..159a63c865e444
--- /dev/null
+++ b/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTFabricSurfaceHostingProxyRootView.h"
+
+#import "RCTFabricSurface.h"
+
+@implementation RCTFabricSurfaceHostingProxyRootView
+
+- (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge moduleName:(NSString *)moduleName initialProperties:(NSDictionary *)initialProperties
+{
+  return [[RCTFabricSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
+}
+
+@end
diff --git a/React/Fabric/Surface/RCTFabricSurfaceHostingView.h b/React/Fabric/Surface/RCTFabricSurfaceHostingView.h
new file mode 100644
index 00000000000000..c50fa51acee97a
--- /dev/null
+++ b/React/Fabric/Surface/RCTFabricSurfaceHostingView.h
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTSurfaceHostingView.h>
+
+/**
+ * Fabric-compatible RCTSurfaceHostingView implementation.
+ */
+@interface RCTFabricSurfaceHostingView : RCTSurfaceHostingView
+
+@end
+
diff --git a/React/Fabric/Surface/RCTFabricSurfaceHostingView.mm b/React/Fabric/Surface/RCTFabricSurfaceHostingView.mm
new file mode 100644
index 00000000000000..395d40afb68e21
--- /dev/null
+++ b/React/Fabric/Surface/RCTFabricSurfaceHostingView.mm
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTFabricSurfaceHostingView.h"
+
+#import "RCTFabricSurface.h"
+
+@implementation RCTFabricSurfaceHostingView
+
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                    moduleName:(NSString *)moduleName
+             initialProperties:(NSDictionary *)initialProperties
+{
+  RCTFabricSurface *surface = [[RCTFabricSurface alloc] initWithBridge:bridge
+                                                            moduleName:moduleName
+                                                     initialProperties:initialProperties];
+  return [self initWithSurface:surface];
+}
+
+@end
+

From b98bf1e09739860d82e37225f1635bba3bc817b3 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Mon, 5 Mar 2018 18:34:33 -0800
Subject: [PATCH 166/267] Remove polymorphic types from StyleSheetTypes

Summary:
These types were polymorphic so that stricter types could be passed in for dimension or color. For example, color could be a union of allowed colors. However, since `rgb(0,0,0)` is a valid color, these would have to be allowed opaque types and every creator or caller of these colors would have to use a function.

This would require a massive change to every RN product in the world for negligable gain because StyleSheet values are validated at dev at runtime and cause redboxes for invalid uses.

Since we don't plan to adopt these widely, lets clean up the complexity of these types.

Reviewed By: sahrens

Differential Revision: D7158920

fbshipit-source-id: c58ae402c8248b0863c217c27153191a49c6b980
---
 Libraries/StyleSheet/StyleSheetTypes.js | 116 ++++++++++++------------
 Libraries/StyleSheet/flattenStyle.js    |   4 +-
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index cfd0f50bba2ccf..9d4916e6655814 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -18,38 +18,38 @@ export opaque type StyleSheetStyle: number = number;
 export type ColorValue = null | string;
 export type DimensionValue = null | number | string | AnimatedNode;
 
-export type LayoutStyle<+Dimension = DimensionValue> = {
+export type LayoutStyle = {
   +display?: 'none' | 'flex',
-  +width?: Dimension,
-  +height?: Dimension,
-  +bottom?: Dimension,
-  +end?: Dimension,
-  +left?: Dimension,
-  +right?: Dimension,
-  +start?: Dimension,
-  +top?: Dimension,
-  +minWidth?: Dimension,
-  +maxWidth?: Dimension,
-  +minHeight?: Dimension,
-  +maxHeight?: Dimension,
-  +margin?: Dimension,
-  +marginBottom?: Dimension,
-  +marginEnd?: Dimension,
-  +marginHorizontal?: Dimension,
-  +marginLeft?: Dimension,
-  +marginRight?: Dimension,
-  +marginStart?: Dimension,
-  +marginTop?: Dimension,
-  +marginVertical?: Dimension,
-  +padding?: Dimension,
-  +paddingBottom?: Dimension,
-  +paddingEnd?: Dimension,
-  +paddingHorizontal?: Dimension,
-  +paddingLeft?: Dimension,
-  +paddingRight?: Dimension,
-  +paddingStart?: Dimension,
-  +paddingTop?: Dimension,
-  +paddingVertical?: Dimension,
+  +width?: DimensionValue,
+  +height?: DimensionValue,
+  +bottom?: DimensionValue,
+  +end?: DimensionValue,
+  +left?: DimensionValue,
+  +right?: DimensionValue,
+  +start?: DimensionValue,
+  +top?: DimensionValue,
+  +minWidth?: DimensionValue,
+  +maxWidth?: DimensionValue,
+  +minHeight?: DimensionValue,
+  +maxHeight?: DimensionValue,
+  +margin?: DimensionValue,
+  +marginBottom?: DimensionValue,
+  +marginEnd?: DimensionValue,
+  +marginHorizontal?: DimensionValue,
+  +marginLeft?: DimensionValue,
+  +marginRight?: DimensionValue,
+  +marginStart?: DimensionValue,
+  +marginTop?: DimensionValue,
+  +marginVertical?: DimensionValue,
+  +padding?: DimensionValue,
+  +paddingBottom?: DimensionValue,
+  +paddingEnd?: DimensionValue,
+  +paddingHorizontal?: DimensionValue,
+  +paddingLeft?: DimensionValue,
+  +paddingRight?: DimensionValue,
+  +paddingStart?: DimensionValue,
+  +paddingTop?: DimensionValue,
+  +paddingVertical?: DimensionValue,
   +borderWidth?: number,
   +borderBottomWidth?: number,
   +borderEndWidth?: number,
@@ -114,8 +114,8 @@ export type TransformStyle = {
   >,
 };
 
-export type ShadowStyle<+Color = ColorValue> = {
-  +shadowColor?: Color,
+export type ShadowStyle = {
+  +shadowColor?: ColorValue,
   +shadowOffset?: {
     +width?: number,
     +height?: number,
@@ -124,19 +124,19 @@ export type ShadowStyle<+Color = ColorValue> = {
   +shadowRadius?: number,
 };
 
-export type ViewStyle<+Dimension = DimensionValue, +Color = ColorValue> = {
-  ...$Exact<LayoutStyle<Dimension>>,
-  ...$Exact<ShadowStyle<Color>>,
+export type ViewStyle = {
+  ...$Exact<LayoutStyle>,
+  ...$Exact<ShadowStyle>,
   ...$Exact<TransformStyle>,
   +backfaceVisibility?: 'visible' | 'hidden',
-  +backgroundColor?: Color,
-  +borderColor?: Color,
-  +borderBottomColor?: Color,
-  +borderEndColor?: Color,
-  +borderLeftColor?: Color,
-  +borderRightColor?: Color,
-  +borderStartColor?: Color,
-  +borderTopColor?: Color,
+  +backgroundColor?: ColorValue,
+  +borderColor?: ColorValue,
+  +borderBottomColor?: ColorValue,
+  +borderEndColor?: ColorValue,
+  +borderLeftColor?: ColorValue,
+  +borderRightColor?: ColorValue,
+  +borderStartColor?: ColorValue,
+  +borderTopColor?: ColorValue,
   +borderRadius?: number,
   +borderBottomEndRadius?: number,
   +borderBottomLeftRadius?: number,
@@ -158,9 +158,9 @@ export type ViewStyle<+Dimension = DimensionValue, +Color = ColorValue> = {
   +elevation?: number,
 };
 
-export type TextStyle<+Dimension = DimensionValue, +Color = ColorValue> = {
-  ...$Exact<ViewStyle<Dimension, Color>>,
-  +color?: Color,
+export type TextStyle = {
+  ...$Exact<ViewStyle>,
+  +color?: ColorValue,
   +fontFamily?: string,
   +fontSize?: number,
   +fontStyle?: 'normal' | 'italic',
@@ -185,7 +185,7 @@ export type TextStyle<+Dimension = DimensionValue, +Color = ColorValue> = {
   >,
   +textShadowOffset?: {+width?: number, +height?: number},
   +textShadowRadius?: number,
-  +textShadowColor?: Color,
+  +textShadowColor?: ColorValue,
   +letterSpacing?: number,
   +lineHeight?: number,
   +textAlign?: 'auto' | 'left' | 'right' | 'center' | 'justify',
@@ -197,21 +197,21 @@ export type TextStyle<+Dimension = DimensionValue, +Color = ColorValue> = {
     | 'line-through'
     | 'underline line-through',
   +textDecorationStyle?: 'solid' | 'double' | 'dotted' | 'dashed',
-  +textDecorationColor?: Color,
+  +textDecorationColor?: ColorValue,
   +writingDirection?: 'auto' | 'ltr' | 'rtl',
 };
 
-export type ImageStyle<+Dimension = DimensionValue, +Color = ColorValue> = {
-  ...$Exact<ViewStyle<Dimension, Color>>,
+export type ImageStyle = {
+  ...$Exact<ViewStyle>,
   +resizeMode?: 'contain' | 'cover' | 'stretch' | 'center' | 'repeat',
-  +tintColor?: Color,
+  +tintColor?: ColorValue,
   +overlayColor?: string,
 };
 
-export type Style<+Dimension = DimensionValue, +Color = ColorValue> = {
-  ...$Exact<TextStyle<Dimension, Color>>,
+export type Style = {
+  ...$Exact<TextStyle>,
   +resizeMode?: 'contain' | 'cover' | 'stretch' | 'center' | 'repeat',
-  +tintColor?: Color,
+  +tintColor?: ColorValue,
   +overlayColor?: string,
 };
 
@@ -233,7 +233,7 @@ export type StyleProp<+T> =
 //   $Shape<ImageStyle<DimensionValue, ColorValue>>,
 // >;
 
-export type StyleObj = StyleProp<$Shape<Style<DimensionValue, ColorValue>>>;
+export type StyleObj = StyleProp<$Shape<Style>>;
 export type StyleValue = StyleObj;
 
 export type ViewStyleProp = StyleObj;
@@ -241,7 +241,7 @@ export type TextStyleProp = StyleObj;
 export type ImageStyleProp = StyleObj;
 
 export type Styles = {
-  +[key: string]: $Shape<Style<DimensionValue, ColorValue>>,
+  +[key: string]: $Shape<Style>,
 };
 export type StyleSheet<+S: Styles> = $ObjMap<S, (Object) => StyleSheetStyle>;
 
@@ -260,4 +260,4 @@ type Props = {position: TypeForStyleKey<'position'>};
 This will correctly give you the type 'absolute' | 'relative' instead of the
 weak type of just string;
 */
-export type TypeForStyleKey<+key: $Keys<Style<>>> = $ElementType<Style<>, key>;
+export type TypeForStyleKey<+key: $Keys<Style>> = $ElementType<Style, key>;
diff --git a/Libraries/StyleSheet/flattenStyle.js b/Libraries/StyleSheet/flattenStyle.js
index 21da509723294c..362d351d8ccb70 100644
--- a/Libraries/StyleSheet/flattenStyle.js
+++ b/Libraries/StyleSheet/flattenStyle.js
@@ -11,7 +11,7 @@
 
 var ReactNativePropRegistry;
 
-import type { DimensionValue, ColorValue, StyleProp, Style } from 'StyleSheetTypes';
+import type { StyleProp, Style } from 'StyleSheetTypes';
 
 function getStyle(style) {
   if (ReactNativePropRegistry === undefined) {
@@ -23,7 +23,7 @@ function getStyle(style) {
   return style;
 }
 
-function flattenStyle(style: ?StyleProp<Style<DimensionValue, ColorValue>>): ?Style<DimensionValue, ColorValue> {
+function flattenStyle(style: ?StyleProp<Style>): ?Style {
   if (style == null) {
     return undefined;
   }

From b6c7e551a91c406884cbbe8ee37c0038a1b7f0be Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Mon, 5 Mar 2018 18:34:34 -0800
Subject: [PATCH 167/267] Using ReadOnly and Exact types for StyleSheet

Summary: There are a few more things that need to be tightened up but they cause *tons* of errors in FBSource and require more investigation before we can change them.

Reviewed By: sahrens

Differential Revision: D7160522

fbshipit-source-id: 17167efd80fd6c3bac5a055d2ab58b3b251c1b8b
---
 Libraries/StyleSheet/StyleSheetTypes.js | 279 ++++++++++++------------
 1 file changed, 142 insertions(+), 137 deletions(-)

diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index 9d4916e6655814..0964a9446dbb3b 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -18,153 +18,155 @@ export opaque type StyleSheetStyle: number = number;
 export type ColorValue = null | string;
 export type DimensionValue = null | number | string | AnimatedNode;
 
-export type LayoutStyle = {
-  +display?: 'none' | 'flex',
-  +width?: DimensionValue,
-  +height?: DimensionValue,
-  +bottom?: DimensionValue,
-  +end?: DimensionValue,
-  +left?: DimensionValue,
-  +right?: DimensionValue,
-  +start?: DimensionValue,
-  +top?: DimensionValue,
-  +minWidth?: DimensionValue,
-  +maxWidth?: DimensionValue,
-  +minHeight?: DimensionValue,
-  +maxHeight?: DimensionValue,
-  +margin?: DimensionValue,
-  +marginBottom?: DimensionValue,
-  +marginEnd?: DimensionValue,
-  +marginHorizontal?: DimensionValue,
-  +marginLeft?: DimensionValue,
-  +marginRight?: DimensionValue,
-  +marginStart?: DimensionValue,
-  +marginTop?: DimensionValue,
-  +marginVertical?: DimensionValue,
-  +padding?: DimensionValue,
-  +paddingBottom?: DimensionValue,
-  +paddingEnd?: DimensionValue,
-  +paddingHorizontal?: DimensionValue,
-  +paddingLeft?: DimensionValue,
-  +paddingRight?: DimensionValue,
-  +paddingStart?: DimensionValue,
-  +paddingTop?: DimensionValue,
-  +paddingVertical?: DimensionValue,
-  +borderWidth?: number,
-  +borderBottomWidth?: number,
-  +borderEndWidth?: number,
-  +borderLeftWidth?: number,
-  +borderRightWidth?: number,
-  +borderStartWidth?: number,
-  +borderTopWidth?: number,
-  +position?: 'absolute' | 'relative',
-  +flexDirection?: 'row' | 'row-reverse' | 'column' | 'column-reverse',
-  +flexWrap?: 'wrap' | 'nowrap',
-  +justifyContent?:
+export type LayoutStyle = $ReadOnly<{|
+  display?: 'none' | 'flex',
+  width?: DimensionValue,
+  height?: DimensionValue,
+  bottom?: DimensionValue,
+  end?: DimensionValue,
+  left?: DimensionValue,
+  right?: DimensionValue,
+  start?: DimensionValue,
+  top?: DimensionValue,
+  minWidth?: DimensionValue,
+  maxWidth?: DimensionValue,
+  minHeight?: DimensionValue,
+  maxHeight?: DimensionValue,
+  margin?: DimensionValue,
+  marginBottom?: DimensionValue,
+  marginEnd?: DimensionValue,
+  marginHorizontal?: DimensionValue,
+  marginLeft?: DimensionValue,
+  marginRight?: DimensionValue,
+  marginStart?: DimensionValue,
+  marginTop?: DimensionValue,
+  marginVertical?: DimensionValue,
+  padding?: DimensionValue,
+  paddingBottom?: DimensionValue,
+  paddingEnd?: DimensionValue,
+  paddingHorizontal?: DimensionValue,
+  paddingLeft?: DimensionValue,
+  paddingRight?: DimensionValue,
+  paddingStart?: DimensionValue,
+  paddingTop?: DimensionValue,
+  paddingVertical?: DimensionValue,
+  borderWidth?: number,
+  borderBottomWidth?: number,
+  borderEndWidth?: number,
+  borderLeftWidth?: number,
+  borderRightWidth?: number,
+  borderStartWidth?: number,
+  borderTopWidth?: number,
+  position?: 'absolute' | 'relative',
+  flexDirection?: 'row' | 'row-reverse' | 'column' | 'column-reverse',
+  flexWrap?: 'wrap' | 'nowrap',
+  justifyContent?:
     | 'flex-start'
     | 'flex-end'
     | 'center'
     | 'space-between'
     | 'space-around'
     | 'space-evenly',
-  +alignItems?: 'flex-start' | 'flex-end' | 'center' | 'stretch' | 'baseline',
-  +alignSelf?:
+  alignItems?: 'flex-start' | 'flex-end' | 'center' | 'stretch' | 'baseline',
+  alignSelf?:
     | 'auto'
     | 'flex-start'
     | 'flex-end'
     | 'center'
     | 'stretch'
     | 'baseline',
-  +alignContent?:
+  alignContent?:
     | 'flex-start'
     | 'flex-end'
     | 'center'
     | 'stretch'
     | 'space-between'
     | 'space-around',
-  +overflow?: 'visible' | 'hidden' | 'scroll',
-  +flex?: number,
-  +flexGrow?: number,
-  +flexShrink?: number,
-  +flexBasis?: number | string,
-  +aspectRatio?: number,
-  +zIndex?: number,
-  +direction?: 'inherit' | 'ltr' | 'rtl',
-};
+  overflow?: 'visible' | 'hidden' | 'scroll',
+  flex?: number,
+  flexGrow?: number,
+  flexShrink?: number,
+  flexBasis?: number | string,
+  aspectRatio?: number,
+  zIndex?: number,
+  direction?: 'inherit' | 'ltr' | 'rtl',
+|}>;
 
-export type TransformStyle = {
-  +transform?: $ReadOnlyArray<
-    | {+perspective: number | AnimatedNode}
-    | {+rotate: string}
-    | {+rotateX: string}
-    | {+rotateY: string}
-    | {+rotateZ: string}
-    | {+scale: number | AnimatedNode}
-    | {+scaleX: number | AnimatedNode}
-    | {+scaleY: number | AnimatedNode}
-    | {+translateX: number | AnimatedNode}
-    | {+translateY: number | AnimatedNode}
-    | {
+export type TransformStyle = $ReadOnly<{|
+  transform?: $ReadOnlyArray<
+    | {|+perspective: number | AnimatedNode|}
+    | {|+rotate: string|}
+    | {|+rotateX: string|}
+    | {|+rotateY: string|}
+    | {|+rotateZ: string|}
+    | {|+scale: number | AnimatedNode|}
+    | {|+scaleX: number | AnimatedNode|}
+    | {|+scaleY: number | AnimatedNode|}
+    | {|+translateX: number | AnimatedNode|}
+    | {|+translateY: number | AnimatedNode|}
+    | {|
       +translate: [number | AnimatedNode, number | AnimatedNode] | AnimatedNode,
-    }
-    | {+skewX: string}
-    | {+skewY: string}
+    |}
+    | {|+skewX: string|}
+    | {|+skewY: string|}
     // TODO: what is the actual type it expects?
-    | {+matrix: $ReadOnlyArray<number | AnimatedNode> | AnimatedNode},
+    | {|
+      +matrix: $ReadOnlyArray<number | AnimatedNode> | AnimatedNode,
+    |},
   >,
-};
+|}>;
 
-export type ShadowStyle = {
-  +shadowColor?: ColorValue,
-  +shadowOffset?: {
-    +width?: number,
-    +height?: number,
-  },
-  +shadowOpacity?: number | AnimatedNode,
-  +shadowRadius?: number,
-};
+export type ShadowStyle = $ReadOnly<{|
+  shadowColor?: ColorValue,
+  shadowOffset?: $ReadOnly<{|
+    width?: number,
+    height?: number,
+  |}>,
+  shadowOpacity?: number | AnimatedNode,
+  shadowRadius?: number,
+|}>;
 
-export type ViewStyle = {
+export type ViewStyle = $ReadOnly<{|
   ...$Exact<LayoutStyle>,
   ...$Exact<ShadowStyle>,
   ...$Exact<TransformStyle>,
-  +backfaceVisibility?: 'visible' | 'hidden',
-  +backgroundColor?: ColorValue,
-  +borderColor?: ColorValue,
-  +borderBottomColor?: ColorValue,
-  +borderEndColor?: ColorValue,
-  +borderLeftColor?: ColorValue,
-  +borderRightColor?: ColorValue,
-  +borderStartColor?: ColorValue,
-  +borderTopColor?: ColorValue,
-  +borderRadius?: number,
-  +borderBottomEndRadius?: number,
-  +borderBottomLeftRadius?: number,
-  +borderBottomRightRadius?: number,
-  +borderBottomStartRadius?: number,
-  +borderTopEndRadius?: number,
-  +borderTopLeftRadius?: number,
-  +borderTopRightRadius?: number,
-  +borderTopStartRadius?: number,
-  +borderStyle?: 'solid' | 'dotted' | 'dashed',
-  +borderWidth?: number,
-  +borderBottomWidth?: number,
-  +borderEndWidth?: number,
-  +borderLeftWidth?: number,
-  +borderRightWidth?: number,
-  +borderStartWidth?: number,
-  +borderTopWidth?: number,
-  +opacity?: number | AnimatedNode,
-  +elevation?: number,
-};
+  backfaceVisibility?: 'visible' | 'hidden',
+  backgroundColor?: ColorValue,
+  borderColor?: ColorValue,
+  borderBottomColor?: ColorValue,
+  borderEndColor?: ColorValue,
+  borderLeftColor?: ColorValue,
+  borderRightColor?: ColorValue,
+  borderStartColor?: ColorValue,
+  borderTopColor?: ColorValue,
+  borderRadius?: number,
+  borderBottomEndRadius?: number,
+  borderBottomLeftRadius?: number,
+  borderBottomRightRadius?: number,
+  borderBottomStartRadius?: number,
+  borderTopEndRadius?: number,
+  borderTopLeftRadius?: number,
+  borderTopRightRadius?: number,
+  borderTopStartRadius?: number,
+  borderStyle?: 'solid' | 'dotted' | 'dashed',
+  borderWidth?: number,
+  borderBottomWidth?: number,
+  borderEndWidth?: number,
+  borderLeftWidth?: number,
+  borderRightWidth?: number,
+  borderStartWidth?: number,
+  borderTopWidth?: number,
+  opacity?: number | AnimatedNode,
+  elevation?: number,
+|}>;
 
-export type TextStyle = {
+export type TextStyle = $ReadOnly<{|
   ...$Exact<ViewStyle>,
-  +color?: ColorValue,
-  +fontFamily?: string,
-  +fontSize?: number,
-  +fontStyle?: 'normal' | 'italic',
-  +fontWeight?:
+  color?: ColorValue,
+  fontFamily?: string,
+  fontSize?: number,
+  fontStyle?: 'normal' | 'italic',
+  fontWeight?:
     | 'normal'
     | 'bold'
     | '100'
@@ -176,37 +178,40 @@ export type TextStyle = {
     | '700'
     | '800'
     | '900',
-  +fontVariant?: $ReadOnlyArray<
+  fontVariant?: $ReadOnlyArray<
     | 'small-caps'
     | 'oldstyle-nums'
     | 'lining-nums'
     | 'tabular-nums'
     | 'proportional-nums',
   >,
-  +textShadowOffset?: {+width?: number, +height?: number},
-  +textShadowRadius?: number,
-  +textShadowColor?: ColorValue,
-  +letterSpacing?: number,
-  +lineHeight?: number,
-  +textAlign?: 'auto' | 'left' | 'right' | 'center' | 'justify',
-  +textAlignVertical?: 'auto' | 'top' | 'bottom' | 'center',
-  +includeFontPadding?: boolean,
-  +textDecorationLine?:
+  textShadowOffset?: $ReadOnly<{|
+    width?: number,
+    height?: number,
+  |}>,
+  textShadowRadius?: number,
+  textShadowColor?: ColorValue,
+  letterSpacing?: number,
+  lineHeight?: number,
+  textAlign?: 'auto' | 'left' | 'right' | 'center' | 'justify',
+  textAlignVertical?: 'auto' | 'top' | 'bottom' | 'center',
+  includeFontPadding?: boolean,
+  textDecorationLine?:
     | 'none'
     | 'underline'
     | 'line-through'
     | 'underline line-through',
-  +textDecorationStyle?: 'solid' | 'double' | 'dotted' | 'dashed',
-  +textDecorationColor?: ColorValue,
-  +writingDirection?: 'auto' | 'ltr' | 'rtl',
-};
+  textDecorationStyle?: 'solid' | 'double' | 'dotted' | 'dashed',
+  textDecorationColor?: ColorValue,
+  writingDirection?: 'auto' | 'ltr' | 'rtl',
+|}>;
 
-export type ImageStyle = {
+export type ImageStyle = $ReadOnly<{|
   ...$Exact<ViewStyle>,
-  +resizeMode?: 'contain' | 'cover' | 'stretch' | 'center' | 'repeat',
-  +tintColor?: ColorValue,
-  +overlayColor?: string,
-};
+  resizeMode?: 'contain' | 'cover' | 'stretch' | 'center' | 'repeat',
+  tintColor?: ColorValue,
+  overlayColor?: string,
+|}>;
 
 export type Style = {
   ...$Exact<TextStyle>,

From 52c7957349a21f1652d1759f9e68f40917f20e00 Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Mon, 5 Mar 2018 18:35:43 -0800
Subject: [PATCH 168/267] Fix lint in StyleSheet.compose

Reviewed By: TheSavior, yungsters

Differential Revision: D7106910

fbshipit-source-id: e150c6622bb1af9830eef06757897d42002f5676
---
 Libraries/StyleSheet/StyleSheet.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index 3971365c98e9c8..48f4418b8ed214 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -139,10 +139,10 @@ module.exports = {
    * PureComponent checks.
    */
   compose(style1: ?StyleProp, style2: ?StyleProp): ?StyleProp {
-    if (style1 && style2) {
+    if (style1 != null && style2 != null) {
       return [style1, style2];
     } else {
-      return style1 || style2;
+      return style1 != null ? style1 : style2;
     }
   },
 

From ac929ef4f6069dfbf4a9be93a33dd938b3801e6c Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Mon, 5 Mar 2018 21:07:37 -0800
Subject: [PATCH 169/267] Fix subtle bugs in cloning and FabricUIManager

Reviewed By: achen1

Differential Revision: D7164980

fbshipit-source-id: 86e9f3f11b67c8947b177aac23f99808083c3121
---
 .../main/java/com/facebook/react/fabric/FabricUIManager.java    | 1 +
 .../java/com/facebook/react/uimanager/ReactShadowNodeImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index ed8369cba76b1b..4ac993cf5199d2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -64,6 +64,7 @@ public ReactShadowNode createNode(int reactTag,
       ReactShadowNode node = viewManager.createShadowNodeInstance(mReactApplicationContext);
       ReactShadowNode rootNode = getRootNode(rootTag);
       node.setRootNode(rootNode);
+      node.setViewClassName(viewName);
       node.setReactTag(reactTag);
       node.setThemedContext(rootNode.getThemedContext());
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index fe807cfc2c7ef6..5624324c04d24a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -104,7 +104,7 @@ public ReactShadowNodeImpl(ReactShadowNodeImpl original) {
       mShouldNotifyOnLayout = original.mShouldNotifyOnLayout;
       mNodeUpdated = original.mNodeUpdated;
       mChildren = original.mChildren == null ? null : new ArrayList<>(original.mChildren);
-      mParent = original.mParent;
+      mParent = null;
       mIsLayoutOnly = original.mIsLayoutOnly;
       mTotalNativeChildren = original.mTotalNativeChildren;
       mNativeParent = original.mNativeParent;

From e839c919463df23efefde48a67b6aa6f6184fdbb Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Mon, 5 Mar 2018 22:18:13 -0800
Subject: [PATCH 170/267] Generalize JavaOnlyMap's getMap

Reviewed By: mdvacca

Differential Revision: D7165678

fbshipit-source-id: 3dd88b24c89af369c9d5f3cc57c96f29c4f10d47
---
 .../src/main/java/com/facebook/react/bridge/JavaOnlyMap.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
index 62be17622de388..bce96a33921d93 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.java
@@ -107,8 +107,8 @@ public String getString(String name) {
   }
 
   @Override
-  public JavaOnlyMap getMap(String name) {
-    return (JavaOnlyMap) mBackingMap.get(name);
+  public ReadableMap getMap(String name) {
+    return (ReadableMap) mBackingMap.get(name);
   }
 
   @Override

From 6eef7de46ee5c5004854c1cdd5cd83f2a608f622 Mon Sep 17 00:00:00 2001
From: Peter van der Zee <kuvos@fb.com>
Date: Tue, 6 Mar 2018 02:12:04 -0800
Subject: [PATCH 171/267] Adding tests to cover regressions when upgrading to
 babel 7

Reviewed By: mjesun

Differential Revision: D7123659

fbshipit-source-id: f344786dfe5e4c6c0d81992504ba93688edeb5db
---
 Libraries/Blob/__tests__/File-test.js | 31 +++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/Libraries/Blob/__tests__/File-test.js b/Libraries/Blob/__tests__/File-test.js
index d466d61b8b3502..c10f90c18766ae 100644
--- a/Libraries/Blob/__tests__/File-test.js
+++ b/Libraries/Blob/__tests__/File-test.js
@@ -13,8 +13,39 @@ jest.setMock('NativeModules', {
   BlobModule: require('../__mocks__/BlobModule'),
 });
 
+const Blob = require('Blob');
 const File = require('File');
 
+describe('babel 7 smoke test', function() {
+  it('should be able to extend a class with native name', function() {
+    let called = false;
+    class Array {
+      constructor() {
+        called = true;
+        return {foo: 'PASS'};
+      }
+    }
+    class A extends Array {
+      constructor() {
+        super();
+      }
+    }
+
+    // there is/was a regression in Babel where this would break and super()
+    // would not actually invoke the constructor of the parent class if the
+    // parent class had a name matching a built-in class (like Blob)
+    expect(new A().foo).toBe('PASS');
+    expect(called).toBe(true);
+  });
+});
+
+describe('Blob', function() {
+  it('regression caused by circular dep && babel 7', function() {
+    const blob = new Blob([], {type: 'image/jpeg'});
+    expect(blob).toBeInstanceOf(Blob);
+  });
+});
+
 describe('File', function() {
   it('should create empty file', () => {
     const file = new File([], 'test.jpg');

From d2f05740a8e475108c23b2e24de9030a0cbb2a8d Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Tue, 6 Mar 2018 10:32:52 -0800
Subject: [PATCH 172/267] Add support to FabricUIManger to handle Throwable

Reviewed By: achen1

Differential Revision: D7168684

fbshipit-source-id: c655730b5bf5e181974096c2b940f6457be8a40d
---
 .../react/fabric/FabricUIManager.java         | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index 4ac993cf5199d2..5184fbebdbde81 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -73,8 +73,8 @@ public ReactShadowNode createNode(int reactTag,
       mUIViewOperationQueue
         .enqueueCreateView(rootNode.getThemedContext(), reactTag, viewName, styles);
       return node;
-    } catch (Exception e) {
-      handleException(rootTag, e);
+    } catch (Throwable t) {
+      handleException(getRootNode(rootTag), t);
       return null;
     }
   }
@@ -103,8 +103,8 @@ public ReactShadowNode cloneNode(ReactShadowNode node) {
       ReactShadowNode clone = node.mutableCopy();
       assertReactShadowNodeCopy(node, clone);
       return clone;
-    } catch (Exception e) {
-      handleException(node.getThemedContext(), e);
+    } catch (Throwable t) {
+      handleException(node, t);
       return null;
     }
   }
@@ -120,8 +120,8 @@ public ReactShadowNode cloneNodeWithNewChildren(ReactShadowNode node) {
       ReactShadowNode clone = node.mutableCopyWithNewChildren();
       assertReactShadowNodeCopy(node, clone);
       return clone;
-    } catch (Exception e) {
-      handleException(node.getThemedContext(), e);
+    } catch (Throwable t) {
+      handleException(node, t);
       return null;
     }
   }
@@ -140,8 +140,8 @@ public ReactShadowNode cloneNodeWithNewProps(
       updateProps(clone, newProps);
       assertReactShadowNodeCopy(node, clone);
       return clone;
-    } catch (Exception e) {
-      handleException(node.getThemedContext(), e);
+    } catch (Throwable t) {
+      handleException(node, t);
       return null;
     }
   }
@@ -161,9 +161,8 @@ public ReactShadowNode cloneNodeWithNewChildrenAndProps(
       updateProps(clone, newProps);
       assertReactShadowNodeCopy(node, clone);
       return clone;
-    } catch (Exception e) {
-      handleException(node.getThemedContext(), e);
-      getRootNode(1).getThemedContext().handleException(e);
+    } catch (Throwable t) {
+      handleException(node, t);
       return null;
     }
   }
@@ -191,8 +190,8 @@ public void appendChild(ReactShadowNode parent, ReactShadowNode child) {
         viewsToAdd,
         null
       );
-    } catch (Exception e) {
-      handleException(parent.getThemedContext(), e);
+    } catch (Throwable t) {
+      handleException(parent, t);
     }
   }
 
@@ -227,7 +226,7 @@ public void completeRoot(int rootTag, List<ReactShadowNode> childList) {
       mUIViewOperationQueue
         .dispatchViewUpdates(1, System.currentTimeMillis(), System.currentTimeMillis());
     } catch (Exception e) {
-      handleException(rootTag, e);
+      handleException(getRootNode(rootTag), e);
     }
   }
 
@@ -332,16 +331,16 @@ public void updateRootView(
     }
   }
 
-  private void handleException(ThemedReactContext context, Exception e) {
+  private void handleException(ReactShadowNode node, Throwable t) {
     try {
-      context.handleException(e);
+      ThemedReactContext context = node.getThemedContext();
+      // TODO move exception management to JNI side, and refactor to avoid wrapping Throwable into
+      // a RuntimeException
+      context.handleException(new RuntimeException(t));
     } catch (Exception ex) {
-      Log.e(TAG, "Exception while executing a Fabric method", e);
-      throw new RuntimeException(ex.getMessage(), e);
+      Log.e(TAG, "Exception while executing a Fabric method", t);
+      throw new RuntimeException(ex.getMessage(), t);
     }
   }
 
-  private void handleException(int rootTag, Exception e) {
-    handleException(getRootNode(rootTag).getThemedContext(), e);
-  }
 }

From b7bb2e5745f2bdbfeeccef8d97d469730942e01c Mon Sep 17 00:00:00 2001
From: Krzysztof Ciombor <krzysztof.ciombor@swmansion.com>
Date: Tue, 6 Mar 2018 10:41:27 -0800
Subject: [PATCH 173/267] Add support for Android TV devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

* To be on par with Apple TV support, this makes it possible to run React Native apps on Android TV devices (See also: https://react-native.canny.io/feature-requests/p/android-tv-support)
* These changes also make it possible to navigate through the app using D-PAD buttons that are present on some mobile devices
* Since these changes affect, among others, `ReactRootView.java` and `Touchable.js` code and are closely related to Apple TV implementation, it makes sense for them to be included in the core

 - React native apps can be launched on Android TV devices and properly render their content
 - Navigation is possible using left, right, top, bottom arrows from the remote (or D-PAD)
 - Touchable components can handle D-PAD center button press events and correctly fire their `onPress` handlers
 - Touchable components will receive `onPressIn` and `onPressOut` events and can react to focus/blur changes appropriately (just like on Apple TV)
 - `Platform` constants allow to check if the react-native app is running on TV (`Platform.isTV`)
 - `ScrollView`s behave correctly (same as native implementation) when switching to view outside bounds – that is, the container would scroll such that the newly focused element is fully visible
 - Native "clicking" sounds are played when moving between focusable elements
 - Play/Pause click event is send to `TVEventHandler`
 - Rewind and FastForward events are send to `TVEventHandler`
 - Back button behaves as a normal Android back button
 - Diagonal buttons work correctly on Android TV, e.g. if there is no button directly to the right from the focused one, but there is one to the right but a bit higher/lower it will grab focus
 - Dev menu can be accessed by long pressing fast forward button

A demo showing RNTester app running on Android TV device (Amazon Fire TV Stick) can be found here:
[![RNAndroidTVDemo](http://img.youtube.com/vi/EzIQErHhY20/0.jpg)](http://www.youtube.com/watch?v=EzIQErHhY20)

- `TextInput` will not work on Android TV devices. There's an issue with native `ReactEditText` implementation that prevents it from receiving focus. This makes it impossible to navigate to `TextInput`.
This will be fixed next, but will be included in a separate Pull Request
- ~Overlay permissions cannot be granted on Android TV devices running Android version >= 6.0
This is because the overlay permission can only be granted by firing an Intent to open settings page (`ACTION_MANAGE_OVERLAY_PERMISSION`). Since this page does not exist on TV devices the permission cannot be requested. This will make the app crash when trying to open dev menu (⌘+M) or displaying a redbox error.
Note: This does not affect devices running Android version < 6.0 (for example Amazon Fire TV Stick)~
This is now fixed by: https://github.com/facebook/react-native/pull/16596

* Launch the RNTester app on Android TV device.
  * Ensure it launches without a crash
  * Ensure basic navigation is possible
  * Ensure Touchable components can receive select events
* Ensure the changes do not break current Android and iOS mobile devices functionality.
* Ensure the changes do not break current Apple TV functionality.

[RNAndroidTVDemo video](http://img.youtube.com/vi/EzIQErHhY20/0.jpg)

* Added `ReactAndroidTVViewManager` that handles TV `KeyEvent`s and dispatches events to JS - This is the core that enables basic navigation functionality on Android TV devices
* Following the above change we copy `TVEventHandler.ios.js` into `TVEventHandler.android.js` to enable JS to pick up those native navigation events and dispatch them further to subscribed views. (Note: We do not have a native `TVNavigationEventEmitter` implementation on Android, thus this file is slightly modified, e.g. it does pass `null` to `NativeEventEmitter` constructor)
* Added `uiMode` to `AndroidInfoModule`. (**Note**: This required changing `extends BaseJavaModule` to `extends ReactContextBaseJavaModule` to be able to use `getSystemService` which requires `Context` instance!
* Added `isTV` constants to both `Platform.ios.js` (keeping the deprecated `isTVOS` as well) and `Platform.android.js`
* Changed condition check on `Touchable.js` to use the newly added `isTV` flag to properly handle TV navigation events on Android as well
* Added `LEANBACK_LAUNCHER` to `RNTester` `intent-filter` so that it is possible to launch it on Android TV devices.
* See also a PR to `react-native-website` repo with updated docs for Android TV: https://github.com/facebook/react-native-website/pull/59

 - [ ] Fix `TextInput` components handling by allowing them to be focused and making a proper navigation between them (and/or other components) possible. One thing to note here that the default behavior to immediately open software keyboard when focused on `TextInput` field will need to be adjusted on Android TV as well)
 - [x] Fix overlay permissions issue by changing the way redbox/dev menu are displayed (see: https://github.com/facebook/react-native/pull/16596)
 - [ ] Adjust placement of TV-related files (e.g. the `TVEventHandler.js` file is placed inside `AppleTV` directory which is not accurate, since it does handle Android TV events as well)

Previous discussion: https://github.com/SoftwareMansion/react-native/pull/1
<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAl  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->

[ANDROID] [FEATURE] [TV] - Added support for Android TV devices
Closes https://github.com/facebook/react-native/pull/16500

Differential Revision: D6536847

Pulled By: hramos

fbshipit-source-id: 17bbb11e8583b97f195ced5fd9762f8902fb8a3d
---
 .../AppleTV/TVEventHandler.android.js         |  18 ----
 ...VEventHandler.ios.js => TVEventHandler.js} |   6 +-
 .../Components/AppleTV/TVViewPropTypes.js     |  10 +-
 Libraries/Components/Button.js                |  11 +-
 Libraries/Components/Touchable/Touchable.js   |   4 +-
 .../TouchableNativeFeedback.android.js        |  11 +-
 .../Components/Touchable/TouchableOpacity.js  |   4 +-
 .../View/PlatformViewPropTypes.android.js     |  11 --
 ...pTypes.ios.js => PlatformViewPropTypes.js} |   5 +-
 Libraries/Utilities/Platform.android.js       |   4 +
 Libraries/Utilities/Platform.ios.js           |   6 ++
 .../android/app/src/main/AndroidManifest.xml  |   7 ++
 .../app/src/main/res/drawable/tv_banner.png   | Bin 0 -> 28950 bytes
 React/Modules/RCTTVNavigationEventEmitter.m   |   2 +-
 ...alystNativeJSToJavaParametersTestCase.java |   2 +-
 .../tests/CatalystUIManagerTestCase.java      |   2 +-
 .../react/tests/ProgressBarTestCase.java      |   2 +-
 .../react/tests/ViewRenderingTestCase.java    |   2 +-
 .../facebook/react/CoreModulesPackage.java    |   2 +-
 .../com/facebook/react/ReactActivity.java     |  10 ++
 .../facebook/react/ReactActivityDelegate.java |  20 ++++
 .../ReactAndroidHWInputDeviceHelper.java      | 100 ++++++++++++++++++
 .../com/facebook/react/ReactRootView.java     |  59 +++++++++--
 .../modules/systeminfo/AndroidInfoModule.java |  35 +++++-
 .../react/views/view/ReactViewManager.java    |  12 ++-
 25 files changed, 275 insertions(+), 70 deletions(-)
 delete mode 100644 Libraries/Components/AppleTV/TVEventHandler.android.js
 rename Libraries/Components/AppleTV/{TVEventHandler.ios.js => TVEventHandler.js} (91%)
 delete mode 100644 Libraries/Components/View/PlatformViewPropTypes.android.js
 rename Libraries/Components/View/{PlatformViewPropTypes.ios.js => PlatformViewPropTypes.js} (61%)
 create mode 100644 RNTester/android/app/src/main/res/drawable/tv_banner.png
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java

diff --git a/Libraries/Components/AppleTV/TVEventHandler.android.js b/Libraries/Components/AppleTV/TVEventHandler.android.js
deleted file mode 100644
index 718fa84a8de515..00000000000000
--- a/Libraries/Components/AppleTV/TVEventHandler.android.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @providesModule TVEventHandler
- * @flow
- */
-'use strict';
-
-function TVEventHandler() {}
-
-TVEventHandler.prototype.enable = function(component: ?any, callback: Function) {};
-
-TVEventHandler.prototype.disable = function() {};
-
-module.exports = TVEventHandler;
diff --git a/Libraries/Components/AppleTV/TVEventHandler.ios.js b/Libraries/Components/AppleTV/TVEventHandler.js
similarity index 91%
rename from Libraries/Components/AppleTV/TVEventHandler.ios.js
rename to Libraries/Components/AppleTV/TVEventHandler.js
index 94e67c23cf3532..363d50d903d876 100644
--- a/Libraries/Components/AppleTV/TVEventHandler.ios.js
+++ b/Libraries/Components/AppleTV/TVEventHandler.js
@@ -9,7 +9,7 @@
  */
 'use strict';
 
-const React = require('React');
+const Platform = require('Platform');
 const TVNavigationEventEmitter = require('NativeModules').TVNavigationEventEmitter;
 const NativeEventEmitter = require('NativeEventEmitter');
 
@@ -19,13 +19,13 @@ function TVEventHandler() {
 }
 
 TVEventHandler.prototype.enable = function(component: ?any, callback: Function) {
-  if (!TVNavigationEventEmitter) {
+  if (Platform.OS === 'ios' && !TVNavigationEventEmitter) {
     return;
   }
 
   this.__nativeTVNavigationEventEmitter = new NativeEventEmitter(TVNavigationEventEmitter);
   this.__nativeTVNavigationEventListener = this.__nativeTVNavigationEventEmitter.addListener(
-    'onTVNavEvent',
+    'onHWKeyEvent',
     (data) => {
       if (callback) {
         callback(component, data);
diff --git a/Libraries/Components/AppleTV/TVViewPropTypes.js b/Libraries/Components/AppleTV/TVViewPropTypes.js
index 90b86aa47d730b..2b6a6d4e53dcd1 100644
--- a/Libraries/Components/AppleTV/TVViewPropTypes.js
+++ b/Libraries/Components/AppleTV/TVViewPropTypes.js
@@ -15,17 +15,13 @@ const PropTypes = require('prop-types');
  */
 const TVViewPropTypes = {
     /**
-     * *(Apple TV only)* When set to true, this view will be focusable
-     * and navigable using the Apple TV remote.
-     *
-     * @platform ios
+     * When set to true, this view will be focusable
+     * and navigable using the TV remote.
      */
     isTVSelectable: PropTypes.bool,
 
     /**
-     * *(Apple TV only)* May be set to true to force the Apple TV focus engine to move focus to this view.
-     *
-     * @platform ios
+     * May be set to true to force the TV focus engine to move focus to this view.
      */
     hasTVPreferredFocus: PropTypes.bool,
 
diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js
index dc5071f83193c9..4370f3571c103c 100644
--- a/Libraries/Components/Button.js
+++ b/Libraries/Components/Button.js
@@ -53,6 +53,7 @@ class Button extends React.Component<{
   title: string,
   onPress: () => any,
   color?: ?string,
+  hasTVPreferredFocus?: ?boolean,
   accessibilityLabel?: ?string,
   disabled?: ?boolean,
   testID?: ?string,
@@ -75,6 +76,10 @@ class Button extends React.Component<{
      * If true, disable all interactions for this component.
      */
     disabled: PropTypes.bool,
+    /**
+     * TV preferred focus (see documentation for the View component).
+     */
+    hasTVPreferredFocus: PropTypes.bool,
     /**
      * Handler to be called when the user taps the button
      */
@@ -83,12 +88,6 @@ class Button extends React.Component<{
      * Used to locate this view in end-to-end tests.
      */
     testID: PropTypes.string,
-    /**
-     * *(Apple TV only)* TV preferred focus (see documentation for the View component).
-     *
-     * @platform ios
-     */
-    hasTVPreferredFocus: PropTypes.bool,
   };
 
   render() {
diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js
index 9bfa38c6870a12..00a82cd64ac6e6 100644
--- a/Libraries/Components/Touchable/Touchable.js
+++ b/Libraries/Components/Touchable/Touchable.js
@@ -315,7 +315,7 @@ const LONG_PRESS_ALLOWED_MOVEMENT = 10;
  */
 const TouchableMixin = {
   componentDidMount: function() {
-    if (!Platform.isTVOS) {
+    if (!Platform.isTV) {
       return;
     }
 
@@ -329,7 +329,7 @@ const TouchableMixin = {
         } else if (evt.eventType === 'blur') {
           cmp.touchableHandleActivePressOut && cmp.touchableHandleActivePressOut(evt);
         } else if (evt.eventType === 'select') {
-          cmp.touchableHandlePress && cmp.touchableHandlePress(evt);
+          cmp.touchableHandlePress && !cmp.props.disabled && cmp.touchableHandlePress(evt);
         }
       }
     });
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
index c4808b9bef23e3..4f3887642dce43 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js
@@ -82,6 +82,11 @@ const TouchableNativeFeedback = createReactClass({
      */
     background: backgroundPropType,
 
+    /**
+     * TV preferred focus (see documentation for the View component).
+     */
+    hasTVPreferredFocus: PropTypes.bool,
+
     /**
      * Set to true to add the ripple effect to the foreground of the view, instead of the
      * background. This is useful if one of your child views has a background of its own, or you're
@@ -156,7 +161,9 @@ const TouchableNativeFeedback = createReactClass({
   touchableHandleActivePressIn: function(e: Event) {
     this.props.onPressIn && this.props.onPressIn(e);
     this._dispatchPressedStateChange(true);
-    this._dispatchHotspotUpdate(this.pressInLocation.locationX, this.pressInLocation.locationY);
+    if (this.pressInLocation) {
+      this._dispatchHotspotUpdate(this.pressInLocation.locationX, this.pressInLocation.locationY);
+    }
   },
 
   touchableHandleActivePressOut: function(e: Event) {
@@ -244,6 +251,8 @@ const TouchableNativeFeedback = createReactClass({
       testID: this.props.testID,
       onLayout: this.props.onLayout,
       hitSlop: this.props.hitSlop,
+      isTVSelectable: true,
+      hasTVPreferredFocus: this.props.hasTVPreferredFocus,
       onStartShouldSetResponder: this.touchableHandleStartShouldSetResponder,
       onResponderTerminationRequest: this.touchableHandleResponderTerminationRequest,
       onResponderGrant: this.touchableHandleResponderGrant,
diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
index cbffbb59784972..8ff2ab8d0f2a34 100644
--- a/Libraries/Components/Touchable/TouchableOpacity.js
+++ b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -128,9 +128,7 @@ const TouchableOpacity = createReactClass({
      */
     activeOpacity: PropTypes.number,
     /**
-     * *(Apple TV only)* TV preferred focus (see documentation for the View component).
-     *
-     * @platform ios
+     * TV preferred focus (see documentation for the View component).
      */
     hasTVPreferredFocus: PropTypes.bool,
     /**
diff --git a/Libraries/Components/View/PlatformViewPropTypes.android.js b/Libraries/Components/View/PlatformViewPropTypes.android.js
deleted file mode 100644
index 64425f94110961..00000000000000
--- a/Libraries/Components/View/PlatformViewPropTypes.android.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @providesModule PlatformViewPropTypes
- * @flow
- */
-
-module.export = {};
diff --git a/Libraries/Components/View/PlatformViewPropTypes.ios.js b/Libraries/Components/View/PlatformViewPropTypes.js
similarity index 61%
rename from Libraries/Components/View/PlatformViewPropTypes.ios.js
rename to Libraries/Components/View/PlatformViewPropTypes.js
index c3e4f6c6100de2..891fa34572a4f7 100644
--- a/Libraries/Components/View/PlatformViewPropTypes.ios.js
+++ b/Libraries/Components/View/PlatformViewPropTypes.js
@@ -11,7 +11,10 @@
 const Platform = require('Platform');
 
 let TVViewPropTypes = {};
-if (Platform.isTVOS) {
+// We need to always include TVViewPropTypes on Android
+// as unlike on iOS we can't detect TV devices at build time
+// and hence make view manager export a different list of native properties.
+if (Platform.isTV || Platform.OS === 'android') {
   TVViewPropTypes = require('TVViewPropTypes');
 }
 
diff --git a/Libraries/Utilities/Platform.android.js b/Libraries/Utilities/Platform.android.js
index 006f371777ec86..f0e80633f2f283 100644
--- a/Libraries/Utilities/Platform.android.js
+++ b/Libraries/Utilities/Platform.android.js
@@ -22,6 +22,10 @@ const Platform = {
     const constants = NativeModules.PlatformConstants;
     return constants && constants.isTesting;
   },
+  get isTV(): boolean {
+    const constants = NativeModules.PlatformConstants;
+    return constants && constants.uiMode === 'tv';
+  },
   select: (obj: Object) => 'android' in obj ? obj.android : obj.default,
 };
 
diff --git a/Libraries/Utilities/Platform.ios.js b/Libraries/Utilities/Platform.ios.js
index 00bd3882651f83..776880b7fa400d 100644
--- a/Libraries/Utilities/Platform.ios.js
+++ b/Libraries/Utilities/Platform.ios.js
@@ -22,7 +22,13 @@ const Platform = {
     const constants = NativeModules.PlatformConstants;
     return constants ? constants.interfaceIdiom === 'pad' : false;
   },
+  /**
+   * Deprecated, use `isTV` instead.
+   */
   get isTVOS() {
+    return Platform.isTV;
+  },
+  get isTV() {
     const constants = NativeModules.PlatformConstants;
     return constants ? constants.interfaceIdiom === 'tv' : false;
   },
diff --git a/RNTester/android/app/src/main/AndroidManifest.xml b/RNTester/android/app/src/main/AndroidManifest.xml
index 818cdd422d54e7..0bde8735a3a8b2 100644
--- a/RNTester/android/app/src/main/AndroidManifest.xml
+++ b/RNTester/android/app/src/main/AndroidManifest.xml
@@ -20,9 +20,14 @@
     android:minSdkVersion="16"
     android:targetSdkVersion="23" />
 
+  <!--
+  android:icon is used to display launcher icon on mobile devices.
+  android:banner is used to display a rectangular banned launcher icon on Android TV devices.
+  -->
   <application
       android:name=".RNTesterApplication"
       android:allowBackup="true"
+      android:banner="@drawable/tv_banner"
       android:icon="@drawable/launcher_icon"
       android:label="@string/app_name"
       android:theme="@style/Theme.ReactNative.AppCompat.Light" >
@@ -34,6 +39,8 @@
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
+        <!-- Needed to properly create a launch intent when running on Android TV -->
+        <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
       </intent-filter>
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
diff --git a/RNTester/android/app/src/main/res/drawable/tv_banner.png b/RNTester/android/app/src/main/res/drawable/tv_banner.png
new file mode 100644
index 0000000000000000000000000000000000000000..d67884677f12f902cc74bed12c81b47474ce2852
GIT binary patch
literal 28950
zcmbSyg;N{f7jJMVTA+BbBE{XlMT&cIcXxMpx8e@Pi$idyI0Q&3?zFhO+gpBb-aqh|
zVUtN_v%B}+bME=biBkL~iT;l09S8(MmzEM!27zF{0`D7<5rO0O*7bYf1<_bmQVe(n
z{_aIP0)Q73M=32A5C|3L?H>k|l|ul0h~z3QFOKy09WD|(@s1wb4G2UIk`@zI^;|mY
z(yB7E%F4TbvLU^79m@E`!N5`3P}xyAhP!ImQqR_m&@2q5=Fz2K{DmNeCnD1Qb%i{r
z^^7U4Raio#@SGf#ICgcx9%8t(AfF21GFMkOAMek+>D+1ZXMPDdZn)*6rToOcDTdM2
zJu@1);ADK-H79tew|?e-%J7oh^EywZ=Q<^h--Fb@_e~fdcn@Rvb`(bn{NLvvLGHk}
zdaj^_x8wiEm%bGJ4;5rT#H<9QydEBR!@iP(LVpLmfXM<LiQTSPd@%<0PdoMs;d)s%
z!&s=nUEdK12#9+s9Hx57sV9gO$>#(A$s&eZ2%q9Ed_{(X!xGsOikU?(EYMp0JeLnQ
z^~(_dBgo&YS0N;GhTQxe9E7zF9d4P`3Ec(`WJ5=n9S$xB4l>-FU}2fIG2|XJt%5E7
zpR!aU$Y@4}(bF!5#E7L>#GnkG*?m4sBJ0IK)nS{eAhWk8z7wB(0Lc>Yrb!zviZ#n_
zwR)z7SuEa_#!<i{BVe1Ye&^xxQcJ4oeh03gs{KGdLxeToAaahte=>{2fMz@0%O&qN
zo)+S;c$XGuv)CFQWk>XGhKf@;X^vV;ElK@D45fwE4wag;(mWAbhizR92B>GGoJ<7S
z)(C3}!*AYX8I{lrMwF$u!S>nA2pKM@{j9Q-!lB{=h#3;BmB%)rQYt<KW|XQ(0+*L(
zH-Am>egB{7p`SodFDHC+L7-6M$A@^y_3QmM(t_hEm>*$g1Oy`FK@!}iY9%mrra9EH
z4WUK0qnsMMKdc>K^=KA=2{)($*CGf(8}~X$=L=!xH(}<BVBqFy8$Y5^s2do=eRW-A
zq;9hPS!}9qDt8eYV)`rbC2NZ=225Tlo7Ge>wyQ=o)>H+>+Q`I9JZ5$DYYvG#CO77Z
zBxr>Z81Bc0Rr&l|=NdFWDOv;-{zMG{8|KjR>&kht=ASvT8D&|Rx;4QBf5dg4g4x)8
z7pM#u_+z*A2>v~f&!?IQzngwiI2Q6cM%#YhsMu(=8%}3YbE5?5Jm)%H$M4L%GWd+B
z2%&1zo$6l~2)==ujW#m53pVSHC66B7cNh)yUhne>)^B1jVANRIf!1in4J&tJZ8gji
z^PpXeC=sK<UWwCt9P1wj-e%n^EkM~A8E%+$5#6|(dtnFPqo(dSY@qq^4|Fj&)Is~M
zbTAG7H|q~eB2pG}{)~h+9)Z8o?7O^r6@OYkW<)}mV&~}u?8?bBxpn+U{IOgbg#LN+
zZ^_K`v!TU8&jfAzi%&BSXf}|JB-m<<D6zKG#Mfr56=$yDJN7_lmxq4R<lv7r@B(Yg
zOS^F|cwh8GEwouw|Eo!_`<MCSXRrA@W|VFA;Z&d`gbs68<perRQYLF|_U+U5f%HHL
zN$o>E1-!tr83eQKJ!Tu;Z5z=|6iGy{b6wcEE|z{io&)HWL&j^paq*mT?c?#^3_K~%
zr11<~t#qXSjXP}M!#_9l7(13N;L<HVI=U!6q0N3LNw&hZe_YcgxH$uX<%P!RB!g;2
z$6}05B1eI27t!lZ;FUDuwBJ!N;9Hk*X31uvZw{=optISaKC4oOGuxPjn^vOhR#NoV
zDPl1GKy0UBQHvMG+1yXIrW93hfjtos6`~=sctSneCJBLdxUl5{a9t@Bt8zpUs}f5N
zrrFXM=Knyx@>7;y_c{dUHz`ihJQh$3ErJcc9LrZGi7S2Q0oG+*Xq1IkXj+_!wq|%6
z43!1T5guAgXJFo@GuM%m+1hT%IgC&~sZ$1{RHd~zq1LMh3#zxpuVps*=BMv156hh#
zE8FJ$<c%L~pY!t5kMr_EvI=W7)qz-58YNO8XbqR&`bk%BMzHG{04r>{e1!1ctwB^d
zbsQ30<XZp0*#4Hn=9M0-9nTrFZHyAK&jX)-Mg$-}Q6;q}%3Y@PyZ$N~j7@eOEgbn!
z0v8q3%O<ZoP3g?<T{HX}oxoENh>!+GMxz`!5m984elcEVo_|3HgI+Km7A7a-3K`pc
zT6)Ihf^P1`$g9}U#{D+tmd*Dq-lFycqQLEsIH|Sy{JNCQ-8NGzp;^)z;|0zjjG_Eg
z%MjgODxBEGWQ4`X{7Gobdd6fp0T{#5dTk6b@-w^a=byt9j7Di?jGP*EQz~~Dh;NH9
zNp@YEd!bYudftk6-G)7crW>&NFWI}pMBj8JTj6f;?t235Fi9yYxI*`^g3daU8jW(^
zY%lBxf$h;~JkNh^#Ql6}+){u68&)#I)(Zx1*kpqq#3dJkbcrH48Vu&6R_ytV)vT3`
z1q)?e#1N?&hVyr79Io~pNy9fL8sgyCtgsrXND|NF7*)w*-sRVt^vW71w2;MXYloQu
zYvsaW-K9;qW1UL`#I!_wS%Ehm?&tm{JjW(yJHIPKz%hwUO6w9`T3W>*7h8jS0!#~J
z0yK*t==kxbFJqOJ#<|laQ*xFQm=nxl$)~$J6d^t@nW>*~h;$pSM-)H5&&Z1=mW*G-
zN?xKA>`d!LJ**tWwa$|L@$loHZa<^sK?^CsH_WCHW!VThrw}40bMkN((Z-X~x6Q3$
zQiI`#?5H~oEce^35uVg-BZxJ}oTHs3D<{o=nC9O;aUEY>L`lF`q4636Gk(s_l96dT
zW#E=|MWJ#V?H^QC(z}SQV!U5+%nmv<$=;FRBjY3Oc%VsCr<ODeGU`T~`d=VC;cnMH
zaJlQ=JVi1IQPt(TP+t^|d$s3WzT5?Vxx^_I4=?A)Y~V16f`wP(mI1d@R?F;&Pgad&
zn$ks#<}fJbud<p$P@UwsST&IlmRa}tNNe&^yi4T`7x^{ic;)ao13ka>RB1t;+=C;5
zMAL$}yb_C~i|*4}8b&u6Vlc~zD?j1XzGcX_du}`iEb6k+9IHIw0aI<4!ge@RPN#4G
zfZSA))u}ypXfwivk6Jauh1bt`WLA3J7cNABy9T1bsQq{ElJMK!t*?E*3@Zk8U%VDY
ztVyuYvhX%YlFmCf6#N@9N<pg?Y?WjGH79O5Xm~&0x}3dmn{t;m^Kxn{ayjI^0rAn<
ziDg32F3!S@bx94n3ITjt|Agnr?`y(#(i$^%7SxN1ANIHgXDdG>;C@&Uw5CnygxL98
z9lqn)gsI>Bo3Rtd6Dm>hYm!RA>-CO~>>EZK2OmYb>JTj&Txc(=+&4)Ee4xbek1%q~
zU@k8)6^capnEv~`ZjN0O3MOb3^zk1NT^8R<{g19A%JJ<{h(JWJA}YuCHzb(ztZehl
zt=bhY^U2$>J~1c|@Q*}n9k^eYEb>k-E#bn|kp7MawoA%gEB0M?hk>}Y@5f)AFremc
zX$9f$c>Ym@v+gaD3XzhXneu(Am65Cd9gJA7EyE8n7dkpe?bln|b8uohz}ZJTDzs&*
zWQb2fxP40$-#i;LoRg@j+@#SXn>{>)=N^w#$XSEHR+?!Dw|F=YdC)Yn4IS=qR<7Tu
zy8TphAw|EPKWA4gfB0XRL?cEq$x$v-xa*26&vrI(fozGAz#HUxXP$gzKN<Y=dRD~g
z3{4;fg+|(@#cHFBP)$4p2zbL?4g67TAiiU%0YQM8TOP5d*3-3FK1A8dt2IM$-{17H
zE6>V_iRkRcFx$cQwBcA%ths|N%r2-l4IOy?&svTa-hH|ID7U*NJ7(XeX2`X>gwFr?
z4!AAW7S?!n<}~0Bbt>Umg9<g?A&8Kr%N}`(HTPFpem09+)YEv|un!&s;!-k1u)YA5
z&Ohy4j#?RRMo7+PGYdk-P#Hu@oArAZJ!Oyxcg_}ym6mhHIAIxzgTwLJoMl8W|HSui
z!oZo#HCF!!@C24iEUht;5n?FeX1*HHM&8{_a=nEyPAD&Q?{*eUQ7(HTmvFy0N<kKn
zNoYZ5r9!!Ed-~xgUv~Ic8D2Sj5?a|b@o%o?O~0`!bRC2pwRX1bvI{$!+ku=q8(~FY
zy$x}9teS|jo#iYpNpjA@rzd6~u+Xr1fB0zk01M5EPUhe4->1+jLZkt*{}`g1!V&Ig
z_;@R}3)nRhTMC4ytF6Gt7!(jsA&ddp@r8LnOd|e<uA;ImU1mD{p$}_5Fp}fX_o2!B
z)D9IYzrDnD`3r)2EUkCUCV6G|+FqhDW@w`0&9E1u#q3IR2j$+DtTmn`Ax-@;wq`RW
z<sn4x;E1LC-H_H8Soy(ilJ;oOKP$G5Nj$loN+HF6jUPI~z-7nP_d=sc&KgEu_pydR
zfKs5T`MUc;=lOjP*e^^|;XBl<X~N3j@?<L%^IP5pRVD|svb9(H@FRT$rbvPq{bF6!
zyCJW!Z)#Yw3g^#Px4hautj&6i{k|~6iOg>Ur4p1cCa+~8%k<n)4Q`N0{CVKb^?u^|
zzpU0!@n`qCz_rR;JQ-RR2kRYi3APHL#3A(lm6@cpkwsIwd%0$rU}J<C*nP-x=F4cL
zE0vguPY6^=g1la1xj^Dg=K!}WZ?tsxJkclABM8%tRz^$bC8<-Z>1`5~W-+1$*(|}Q
ziQ4jI^l28Qd%R(wTC}I7*X;11TD4pz6PL>$Y3N>hY%Hi;XsrXNP6EVL#l<x;c~qCF
zKP>e%R*q(`^u*)wZ2UNMkei<Z7nB6JhE@9!oWip;=eVZ%|E}5gNhW^+q7+ywjFryf
zNbTd-4L4qDgu377XRRHl*N_?edm9*iA?nL?B3(X<bOQk3+NeYn7VkM@L>*@RQ15ko
zYC|`A=uK@9usD^Lr~EU?Q-257Z2~+(R}o!m<!NL32WM@_=L0hT^bp6f1*y#{C*xSo
zmt-74UcL>BWYHmUi8a-wEvZiKNIGJ-Z<p<*`ozx2exlB3)Sss?vfI(#V2A<N(?0q;
zm5yvZs%NSaZ7UVy+>0i?P}m@fuarMc`&&ouEZqxzB@U8^yWT%4owijl*>Nf>b8{)+
zahyQE-5L6h^bf{5C6>PwvNBUC8_<mKC@1l7xw#Ax$h>w@gr?z4Q&utP4gB9)Bef(T
zTye=So59WkqzES!;#=*jJJ>e;*eXAv)Li_V+9YnEo+-TMb-XG;txbz<Qsrbk{(fUC
z(5C^Vft}Xj0G%aa9>`bcED#Bc04V6|G%L5~cRivvI8%%DT5QXK?v!Pvd*wHh8n%6S
zB9i;fgu=l({xZ~6mm-YZQCGMBK@21}mIRb0rwN$%hQ4CTA2=Q3v7Y}6>QdWSWR(+2
zhauJ!G2A;nbr0^iV;@M5ZoQ^d#VnuwCO8jK$SYMyGup^V!(+eOx;1?lWTUN}Gs~;T
z@ThxFE#g73W%1(szrqljWZVU69EB#vPQByK5ZOPB>-^5dV!GkUvL$ChOaoL%5CH8_
z<e61gqX`lQGM^R;G2DK+opQA@z}G|ZjoNdz#<-%y-?aIbt$kK$CTiLN0Gm_0<MSKG
zh_1R@5zw9%w~tYR2Yplj3W+Sn9|Q=yMx|4&o}GC2hWze~Pw`s;-AVE^O@4XgD@Jbl
zCG>);Uo6|jyYynxv!P`W*cNa4G_BzCo?p01_EhqI&<EZ2X)<)D5Wtc$6IGP@$N!k!
z{+JFz%d=}}bKcWwBKzNCX=sO{q!?N>w2y3st(Vax*|ErUbAJbMF}a~719dkC>BWg<
zx=z>Ma6=nnwIbccuTJ|%97!5*^TTX%B}CJouhXp(l{mRd@yxMm_xD1v2!<|cejjjH
z70-P0(W72@n?nMGK^f-m#EG!X@ZUr}X-2__QS%xPGPeDu5LB-so`1)GG3I?lw~Kss
ze2D4zzTwGT;s$o_HsFZuj!eW`Id$<ATUtlA?`$rjNG>K-l+Q-5+k6gNhShA_7Jvjw
zTM=<H$(Is`{x8lDgc?P)nTYAjpKPJ#!mz2&O`)6fO7YcWn(%&-_t)J5D?8RRWv8CR
zffPzQAApVT<S6u!qZ)CVcq1zf+{#%!%a$2lkl&!7q_Guu@mF9pY1YPo8@c)F(=sbd
z@jt2D`?)34a$#fZkA45kbZX{-aqYjyuB$`QG1pZ}j4!!TdaET0euL_3AN>u8PyV>9
zpi);SRcwtK4`IgVofU1;f}V`)6@aoF`*xpjC)^?eD>xC~kdQ`NE6JudN!g);ApKix
z8u6~{^LKTL!zJ79Z3AOpwqK{q9rJfC>vv7~4{O>!Qf1Zeptj?;7-VOhTD}MKmD%Av
zcO5-lNy0vhcMh+;`Q*->v-z)&r>{a!8+T3-#`zT8oSX#p4;0D=RN^WsTocv@pA{!<
zo2{xtv6&mt(sI7}`9XGM2wXaP2CvrwN8F+EzQlA|xMO8o9Y~l!5m3ck7lC@c5ON<X
zo>;B>cc~6NdBnYKjo1-5VV0Gq?kMiov2D8+o4-yT)x@rh(C(KOCl`Rbcv!gEUf4s+
znb3hs)L^M?EZ_GK|DGk_IN@@)=l<{rVXDl3GT`=b{eWg0Ac6invk9WAWY~6{<1EAP
zQB>Bd7R>D`9rq;^vbWo}Awm?L-&N<|0;+TU-~Ajs9{xJ1SpbJIoNVIn`xIK_Djh<9
znDB>MNYK9z_zWXykZ<+_b*2Lt|EhJC*olLb{p=}~=gjO3Za#ksZ$~Cz3U}xLF7c<)
zH+_va>SD!U7WOW8iaFr#mw-@*W8Fv9*B9VgWSuYS5&U{6PZ#8^+T*n|ia(OLuwAZO
zsxc)E`DB7+biW~f=5owLMvNbh^X%;?(yIw&OFYgweB5@Mpi;O$A64=9y+}#s7w)sZ
z(6P>ZCd=g)e}_zx9(1^=WAlz(1ZxpPqb~!zR${4r+#jpWUH0HtO8_5+weXPhAA=!&
z<)xzZwbs^bIcP8);R#QC(%^o>2Recl%3U6P|6rNmSG|gC&3k>?bNg{;9eVHReD$aH
zk#_w_yxZgKyH}<M@(j!d<d-26@t<~JXvZWJLaskpScA~)bcnrTATUDZy)2D-_5*PC
zx01T^H>rmh_SImB5_n^CpG_#A<lL37EX_HtqUhaqdm_Kyq?3Gd_vRaJ>tbC~{9cb1
zvT)u?ikXqlXQijiP0JXgdke=RN-Y6nXt~V0Qwo=#GA6)W$?&IrM(Z%0_Ld<#>y(t=
zH_<hJy~QIW;B?htbJ03|nO)w0GuPo_{b{=A_7BfuulpT`!z+8h{qSp*=#LtB|F)k^
zM}GS0Sp>dI9$+*$Xk(-;{&3ygjirGe>F1IIQThbT{1!x=&MD%0;vCv9^I#*bEr8a!
z|26gLWO8Uc8V#aaLB~|Gj0Fqf%=kcfYi{E2c$EQc7!b<!&tWjS(*VWwmWirg@IC>F
zjp<<LL-O}!S{&G6#od|d$5G>Bb44yLFTEty!M59nR1}K4R}9j#^nfP?9@1{?>-)j#
zXNBvO*FP`vYadTs|2N=Ul-B=R83BA<Ty+@tl3wp#|Bx0(jkd8J4)45abKH{_@)Odx
zO8%Do0D273qWE<A$XID>B|ia}!GVb6PZ#Zd?DC=fw<5^p;OMHFt6MVX073Ht+HMPz
z4TO~$-~Lr{5#)La-1O{IzvB}98l=zlp~@Tf4)jA3h@a^Wv#RK|(h%IHJ0)(m4-?2p
zh5q)R{~a<p^^*a?-!+{2qBa!8dVucO{dy&2{!~y_R>aM+@?KY5+vz}dvMbeI@O$=H
z?vhQLHf`PsuV1&}p|`FAgDVD~=29a!SsCq==IFt_bM7pmovs-k<*>-$mT}E8tO~wJ
zGfJ96NZ`6Q&Y|8?b2}k`g&6Tf0_Otg;kSpM97Ut;>|#hFly_)1{Q>rj@jB0MS#bAP
zRXDjdY|a72h{m(CeYvciZp;JAlS5^DX@!D=xsTB}S;zA=Mp!%PModsXma)k@-MMSN
zF{x|>#AX2U;;NP32SZ_7W4MX8+IrIedqlHKCsxYm@%{u*D<Y89y~iejKC?`h?~Her
z-hG{n1YR(utoe{-8?UgY#>{jCGI@msbYqd_UoFRRr1@q9p=ppfPbuXzfL=(jpxsi7
zGCEKiAf&SOiO+W>g)gHz>;<FPKI-1I95~Hg@8fFLPWYt?J65%LEb$(uK6L`I(DQgD
z7;rV$Q91mwSM70Up>X1q!t{mn0Cbl8RdKJpVhj}1{$H(P71tdsgrZT8Myq11kIPYK
zo&5c=cqNOjC_$wiHiWevO|-3v5a6}}0><Fb!Q~Sv)|c!Jk8Tb8^T!*9@ADtR^`~uM
z96x@ZyZ1e=FaYR7zR4Rr4YE8VtS{DBDiFl=X1+;mYdR~UCN>o=88P9+;cFtJNAJU3
zaSPw$t<FU2pSVlRLEAYTKdhl<1wt{MHI3LW8efq3EBEiJps!lzJporH-CaJpOhWK8
zV)s02&or;Ax35kS5<sdJ>8g3u^-@XRN3CVLAIN0qZL|}Y7Ou8#>i#Hl+K_deZe&@<
z!OB)Ak24HDlS7?vbYenXX01nu)5y+Vk9^1~H8#i?LMb<`b`Q>ATFvLU&O2?d>e7TT
z>nK{gzSgAX^I$E67d(VpV5^JTV4NVnkGJ}_j6tha2sY`;P1G1m2a;K|jM)U&JA&o7
zEbY8*{p?@dQj7re+Gml{(`2i@p|SU8@-Diz*X}W!YHvR?_6!GNxOmpn`6}?T>F^RX
zYtmEK1a0xC?OG6Pk6G_0{DDPIEZ+4~=8w#x!5nxB4wEU{AuF_5)V9Mq41>BTV2QX9
zg(>^Dd!%jpZ+B$7ZLTAo3bL}V&;fRx2C|7L4m90q|DD{PYc%)JUhesZiHQ|U9NGcI
zT*(^4^O^ixuaXjrMO$K;`b}%=??iJm;DU+|zf<Mql{AXg#FalV%3e2pcDa76nAvTl
zVnV$p4JDu39c~X?scwx#uu@az<cc>U4?Uml(k|XgZ>hEAzxum%SCYRoOsjCeHjU(K
zbNX;lFZA4Gup=p{Fk%prZG>;24AO=2r>XsF9MMWEp`T(jL11h)Vs!>mefU;f7VdC7
z{dO=OygV_q5s1V}8!gZ9FuMa=#q>%GA9of?L2~tVT7B3R7Vk8CXza)70k(;_v|cOe
zYH_M833<Eh=*|jPylQZNmHI|{O7tIg7Uxi`l@oNrwxBVQ`88#&c}9q`AEH`;tj#8a
zU;WdsLxArf%`tazn>givxKk0BH+WtY+C41N^JPlqK7)Ok(OKW9eLi~pNbd&nWIOw1
zm6@haolI$>v~#70Nv0N0gv@9J-i}x(9ks_Y%BKHvAxAu~x_wN~qC?CW$;J5q#&bRd
zG0n*+N0qnwaTELXsC4pwWHxKU)BS1lPy^Ilb)jt(k=mSG5Oxb?fc+@HP%A%pt<9qI
zUO&I%vF~=V4?8AXc_oa<clKmsaDJJS6#574eyj!-ivO|v%jo78fL!}xdI0(!*RA;}
zd)9E8t!g^yC{`;03l_(9Q$Gs1k?>DgUZ2fNlfm{$YAg8!F7d8*X47(31&%gzoNB0p
zMG5>T?lIxwrJiOvoaH+8n@p*1NP-3%*+2$;8v3%{dDq8^`|8B9SC217V4+Rg^SDJC
za9Bj<S33VHiRnLCd$RsdJpkUaKGdUU(BNrx{bXyvzZUk#47z9A98UufYK~`&gQ=Ic
z5e&lPvp*$GzwFMWEI+Gpp*Qn@Hq>4;%du5b)51!(s-&j>>sb1JmR{v{%RBt_y-ke*
zahFg5yG}i~l+)EYVV~!|$<oOCLGxzILSM<b<1Z|*Y+RPkt=QK;t&nXas#KqQZRM-W
zrcx+>?X&qR^)=Y~KU0UHfWcb<k9U$!{f}h+?%%P4U+>G-w}oCOd%CfkTUXcr&DVB~
zzFyPG9x`_ifIiQAtHmLLhQWJnf{(%jspRG?k&8E<yyGRecs-#6Qjz#a^L}%;I&)kN
zlqN|fTk_RZN7p|jM%U*53lY!$Z*<x&ZrYBc+PoS;GAv7z!7Bj4wfRI=J3PuJ1C3uT
z>%W~!gjD=4rO)fh8Qq8HO)uOHl$)RR&NwqKc{4Amv>cPDQ?dr^EPr#db<fOY_FUd!
zyk3oVX`~ehXnwnY8*Q@g`x_vnuIG5}*8Ym(nN3m5Xb^%lg0tGk)!@*QN3QpmNk!)^
zwvb{w0}FPiJ@_e?slj@>)7tWuLdOWyCB-T9J`9J`(pLH!t)=3Ii=puy6jHw>W;v<M
zer*n>AT_XI;;XokaB^Z-f3LdpjMJyK;`k*|5}u8+vD7QRH$MKg>Mo+fb$&-o#F6R1
zrHBVmplAWEm?ua*5-4z})Y|?loekB&ls{7NdO_>&oztg?FPNz^sm}K(B4D3X{ss<B
z<}}JFlY_)I0!%g0qNU?&aQX=TAn;(^>x(_3uUE<I+YuJcB7$~L)d~IsJRY@dGYqLR
zjDI!m$iCEv*3y7#Z~{u0yHfT_<)LbMts23aX1+#p(DSRTjG(r;1Z<W&Z6><b?an5#
z&32_Rb}O~Sy$hylnIw9P;e-WL;}tHa+3S(R=w#bb=x~HDui)02ZLHDfJL}s>;?YdI
zm1Z}ZNmNec0_nxFHqA$a4wygj90wBY6WG!1eNBvV{k`mywVP^jW8d;=Trj2)f=b+r
z{U9`TAGU{i?Bx12-#6*lo65f6K}T`b<|>dkYs}vN$GqHrC10uBb)#$+nvl#lyqKhw
zm#DVAuiuoi8~L}E0boNN0-iQ43`oL9o5?N!wkeT@8BQ!75^yK``YvGq@s;N^e-ZtK
z69BaV*C7Fu0auXMgM<3hqxCHh(p7-bHi}R-pa$7S5T%|ZFP4t>qTdsu*Zn^)z{2IH
z8cDyK;K%}eK(0yL##)FU>qV=F4Z@$$Tq0d9WX#y2yQDPH!Ywwd*&|bv)=tmDF66Z{
zn^r`<+nMC53HMty`SR-Bz`y;=whvl5%r9p?o`o$-wA%<;ezmjp(``&#hW#axuV@x5
zVxQL|!_6;cF4g~I_klquQ9kfLgvMmXzeth_tR;oW_h}&(^uI6U2V<@niPzmxK1M8@
z1B`d#W~X9;)5l)9=|1l51A*(036)Oy;)#Ifl1GC|%2>)Tj~{y(3RXu{NaLlB>Zt*y
zFW_!tH$UeXHsI-I{+`F-wa=QM5D{;Er{{q-;5Kzc=qaXX_$j7e^66r77D$%oCp`DH
zuj@UMqGjaIC5XM(R?H8^`+Usx$3XTzx})e29`MKFaD}tOXdE4W9N3-TLUn2$u(OVD
z07|iVKAE)f7&$n7X(fhailz?*uE%eT`9bxKLp2ArarP>|{^$DOve961wF;CbPjeMJ
zxU0Mtbl=3%i-&}ON1~XDEr5;(V12K9<Q#bGhD4{Yw`Er5hr<#eLXA`a!do4>=q;W+
z$+R*q1%%R_zd7VP50Z|jI@vPT?$_r+mk9|xT2^_xTdS<lILHY4!i5N+&LxsLerM#B
zOV25O6Ka+5X4<*V#Is3xdS9J(%aAGVTGl)ruJ68Kov+Qk@CAh`5C?2OpPo-TA}L^=
z-1LzK9L;q+<#q@ie?O2#541VdD>d5C=GN#ZZSfJczm>4P{~P`DC}Xb84-x~h5HPa~
z_<*gGVZp2}t;Rz_E&E3NO&O1Mj-*CMolG^I{Q-%uIu5$G0R=h!P-t_ES1H=~Vf3c!
zFMv1hcoUCgn22rrpWttnV{|83ZUn-yROR~{M_Rv-;k+q`hP06yC3U~GWGp)Xxv$0N
zQyvxSka)aFnoWw?Y)pe|DgKv}u_=3KLVc|KslY5x^?T(i-juQ)`#c!Y^brQ@xJ~vm
zUqFZRN_5F#ZsYj!chYwJc`&7lKD9XQrs1IwUH0W<SZMp!z$>JCx0duVZ0dvou2(wo
zyhZ4RE#TqUKuh3e*uD!Q<l~)SatyyPn2ro07TEaO(R3U}(a~L4dxXUHMR*_$|DR5C
zmNO9)dZSGdYNk~;!U14k@VJv)^1}H7x(Vg*@&YP%Xz#2KILuaajyj&3(YmZgW=NX-
z3by7Jv2$_Vd>PegT>fjdX@BQPE6<m|zl{5o(teXe@9*{98;57f`NptG8EMc2$e_wv
zx*d3*IrYq!F}+;sCPKDjt7@diY_Cb2j~Aj#hf=w_tL?@9jXOyz((^$0E-8zC+K4Qx
z9lx9Z)cA3QO9$#wvK5_BF14Td(&8gLUTr!FNNORj-Po=_iMOS0#TQv>5}(fQP<mdM
zh%1M0g6~qhhaA>lzrW=a34ZwAdd4^Sd!GIxPMdaC0@HiVIKhqvyKJ=Kt($<j5{aan
z@NlJPP>!Z^!@(h_*2i5oy;xzaga_C^fW*oxo3TSzUk%1vSMREFlWgWjUAlm?oi6@6
zbJ(}AcZs}xgqN^@2@IDS;#ZqfGc8;a8dLxjlN6(-sd)i|#ex`&Jqo7hlS*I7jU)7?
z=-&SAvND~Qqj+NeSTF{gZZ<hQZCqrk*Yp{*+_-SjuXfWxs;0uh!hQlBqR(b_d8mQ@
zMkVknI9Of6s4*)?X)xOV(5_P0Mu#Rh-OKg?6WU^nSOc}k0u+!Fs6gjnC?GVZl#ptk
zhtWl0PRr|zqav^gZZ=(J3q6y*E}lM$R$jiY-Mo}>8y)=Pg4<{>PNu-U1Juh-frTA!
zeqizLb>wBS`-|+T%8nL}1A=HWAh|R1N#n#fP}7Q!Q7L4m@_o^lVj_0$%g8&dO_9~M
zstVc#z|+OcR%9~&Y6gGv6)}Xht=eqIC*EUi4trF(edCvJU)O!8RpP#W#`zz@X#V*{
zAAgH8t;Liq_DbcuHQ(`OviFM^iJP{c(U-%eq352JJ%iwJueyw?0aJ9l{}Mp+VD(+=
z4KHGBO>Aj>jo5~i$4fRcxp?03v@2V)4Nhm@X8zfA;s+Qw1;28x_Lzim+~D5k^Q%LQ
z&cH5mbD_xl#jQx6OSVgqOu?qBd?+#eW&098;^yqB(0Xpd{cwWdnr7GI8!6Ik<Q91?
zj@Ya2p%8`X2~-~0=ijrtC;&alPmhKVx|hzSOdpmAHq^o$k4`Bv9aU=I;?-fFm_2dO
zPTh)I;{KeKRZPz}sWRl%r~V#WGyX)@N>)1842?gZ)kzcY{#`T?9g1B<F8Pl3jKwl0
z4;W8zNJzR|HH(b7G-r#>Ot0t6TvXQAUR@DfuEI3u{2vy>cBTTXIt6?<Zi?H4bl!y{
zTgj<+?30uNR6*8gnRVetv_{;oMjQ?!nGXW~>VQKT^xK`l8wO4zb^0*yQ;D+@@h%Fj
zmrUUYLp<$7i!2L%X?!u%^zKr2yGM#;VJYZ2%16o6ISbxYky~<fioGufLj;=EATCFN
zlL^`!Q<NCWvL;=2f6S_==USmx3P8bfn|0_MaW9Br!2&hg^33kmFJKzmUq^IuEEowL
zv0VkL&3SMWD?jm<FtvPUk8cRwH2q}+-e6TDMo8xWR4z+>+j!7Xj{4J*h(>&fS5_;H
zFUb;4our@2nO{O*>d2Gvf+SRIFVPx$4RDHJvWkiDhNqTJdcM&#e(iBja8AQ#RJ}<7
zgVoF?VpwE3(bJIwyU2#%pV4AWi4#`R51kXSHv&K9+O|fWCwl>B#x+}5ulvgEEg>MV
zUjuP!e;vNnba8HI_kCuXr+UN*x>`&nv+bQzA{QMCw!(^>h4*7d6{`v4X8qt9*BSUx
zNV#i`+!%ryNrDLltI~D4=OMsqBsYE<rmnMlh>x(*TFH&~`iZ`<?A8xu!uORg-SN^p
zpBH)(3^*a~nJbt91Vo)t>S@+JK4y(z($iRX&xW2seXL6PFjQ^~ZIfd&EmnvMpiLt|
z_!N=|k@l04`6=j9A9ac#oXaa)+l1{adH4taa(3@!U|$<`InU&h^@L29QN21d=!m67
z_3AqO2RiychSvnxAE2@_u%CQW@NCUsx01EoTwKgw8F`>;Hu{%^S6|euNqJnqd?N@L
z{;X5wnZ|Ow5^a=Ja?NTGxpxgDEn&IhObZ)&kF6qYw8i2(P|}tLo>%{3Br_`Q94Y_d
zl=;w6LPcldv8gNMo>%EUpxZH<yZYVg_D8y!uy#6$Im&IiiiCY{4Vg3bUOh2=;zHgb
zL+&q*U4RiJ4gnNctNfG&^}r|IOaS*ClxkJK>%PIhi`8FWR3EL31sKb%d4RlMyYY`u
zHBbfFw)vG(5O@pD7YRCGy0;Qya-|L|63|qw|NR3t)i))fLd|2e0H{*8@@)E`$@V|0
z9~!e7TI(DZ_FiTf6*70|tknML7!O8q05k!kduQZF19^{__CDO;MBw%gT-0h)?4tc;
zz!h8MT8<9xeNN3()v^L#y>2#2tqi6)QJ5m~4%r;x07Scf9chO@&#4eMl^xz$lbOyp
z&2N%b2Kf54^6F={jwHs^ti~nws}OnP0vnn6Cev23b6L-34y!RU(I@~ESE-Z_I7!O(
zgOgpQnE*4B`_uQ2LVbdpuT#!sWe-oyFJwcR?0UhZ>~w`bCBpo*GZro>%!}HSz~&2h
z`8tHfjy&(0yC@!6LVNM(acpU)fT@&|14_u)26(zD{gGOHc!gzJ`hV$X@b{eO*{1;s
zuf}JRPSrK9w_$L-snV?l#f!CJet<lGu{I~@CqFKbUEioR)j7f^x5J;Q(8iPR=pp#`
zvrYxJx<zuDk#Y8r3lhA@*XgfQoH8lo8iX>3yHom#X-0M1<)|wycGg-Z*@znbc?Zv4
zK}!t!J|`9Bz^*{bQo1r9lHfde-$C%S1QTJRdG#^DMk#^8DF2z9#@&x{Uhi6X`Br29
z;@gyu^N!b8vgzdJc1lDH;WXu^O33WH)y46KF18f;37~=!%Kyyg&tl3G%gWV?tVm_a
zvY|b*OP<NWqHLX#KN62$za75&Bs5lPuD@lyr@DpPG}#+_X+omHW3YVro74I`*MtgS
zY!X>E^Lg*gK<darT1R%fh+-@U)l})Uil7>@CjZcpcfpWYl~Q>qVZX=M9iNe&4I%(Q
zjehSG_4(Dei_jjIUD~HF29G5e)!kB{g`2q0!0t^KuA}qoDQ1VOmc1{e@m6_oJ>VMY
zv0$q_XAAc}z^;V3TT!K}ZjIB+&BN!Nf7M@I+7&(AQY8b3sQs=5bDeX=b!Y-kB&~uS
z{-Hs=993$W_Q;z#eUkbb{22@dAx?QpTo-Mb`7>tbhFZGlkGcs+D@W*y=bvUb9OTnt
zCs10gtjqoSi!C}-g-6^8>hT9-pV%;Wa7dZTsMN$)Iq`!Hvr*LJOmi#%vnXM!pdWOZ
zQw<vyE~JZmXW|7f0iT1U!FU-H_$J6MpP?nWVuMxBu}X-RVv8?+L;P9#inPHltJ2D9
zafYPWCCzNIXgk&hBG>}(ySEZRVTA55K0zF7k_AjG&!Z0VDu;h#4%;M-9rf9RcQ634
z!Qg=g1&0%W#9?|Ff(AHR)!yHp`t^F;I5=NZGxBz{nu2Vv#0j)90PEX)_%h%XTe$wj
z4_Uekswzn`&flR^NWYxL8+=p5)2ufg%0n^GHcJ9B!t#EUx{XpP@JZp>dQtq*VZaF^
z3cu0=78jY$XRZ{$c9poBznN*~Hb^B4C};qH(45;QVih8O@{Wi2V_i1=;%<5T<Q}Y<
z-Z|%z(2JY>Ox3iugT06mls6(My;DiLpoL{C+${{QQd<;sq}7c<@}52BL={7p$b(*6
z_UaR;%y4xS6w>nTK6rmmqeg-N`<D_ENT2`kzgbq>YH_s=k<_Qbiqp2w&h`Tb&%i(h
zmD=ZK^z}BtclZ})z_!C{paqJkQPh^>)|70uoOD5Zp67Vf6P^o*4K_VU*8xXtPs+S)
z;QG_P$Gt+&b8Rk;`SCv&P;c`Upbh`eUm9t!uw=1}dT#f)a`RPbe*7}lXBuaXjO?O6
zxorF*rL)F0)5f2s(1w8^>&-m3>BzTf&adgUT*I?qGQ1tP7MXW!^e$wToO0&Gi8v&I
zfBW2dY;!wSI`PlQPG8qn^C<%MIvC&)-i)-zf8+5~?p#q{05c7{9AdnJWe0C*3D{CE
zek_gI#XRu$Lx5a#$}og5Azg(Z(x<bmiS>C5Vh?x>9b&Y(ZSMiMSe}sJv6FAcc*f4+
z*uTr^jX38c6>ARV%5wl35?G+z?x^@%HA?CqJ686HA9;Ju?W8QUq#_nr5#Y*;DyQ-5
zs^iLsox^HvcwmxVtOlIT3tfs|>Uga0ww!doiipN)oO^@FCcfQWzMeU_MqYct88T>F
z6VnLHZ<;%d05g_`zsL2nK{PbF3_|E(LE9PN-1|HT<Z30^s9AI0{KSo=mqTs(+V7j3
ze|hB>P&p`<SN8ygqyO5o_cyxw(7FXoM`99C(yi{J3~Py~YcQDY#CT^Nf8VzLy<7dl
z?SSdAaM7236Dy!2(%jX>#1cwjswO@ybuwd8Qd#DMWwE*gA6!+#JBbZ!!jX0fOhQW|
z`UnRL>wqt*gvvGLVp8ibQd2|aq=j~>b$&Lq`C;C?z)nk77I2B(joy8=2%`o<?xruV
zbUa5n3((9UsDK|h1E24b-Xg0+RsK1%k>bsIiqIg0fR$%fe;l?F8F3UQP{=V|Coz_4
zz6RKLg!sM3C8teF#Y<DA#x?%?g(LFy)97JVeI9R~>1eodBi7ih@h}fzJC|~WoK4Zd
z6b=+{CL+bqHBgpW6RkdeQ4q5#R_*#Syy?xq;T|xMS{LxG^tD0kr-#dK7-dlYo|WyI
zYKBc74O1rpQKz~1WXNC&P|8X;v=-n^n`dhDuUX>^b$-3y5t}v}@{-YK=)pAdy@A>x
zoRyYuO=V?8KnP=$-&aysc(iUuc<$`0F0rFg_M5T9YNhZgB!}g(Yj`u&$1pRafOMRo
z+I_t!t?$tnP<;j_z39IxX~_Kv#Z<t!pE}3!XBYgDh+eakp*NJPz30E#$q3lnNvK`i
zpDo=o?DEHZd)XC)6FJadkuK?g1QkDBa-yK$8AD$}9{{)f*Lq=7!ePW7%RokG3^#a{
z+*}EdWdAmG?nC%W&T8Z0tjs$`J)q1sa}fONy;8R8Nz8-(%9lrHrs7gOsA^#*%#<w)
zL%>y{!86dvd=E_Ab_Vu%qTv=2L)1@h<6$$FBd1RX4KpN)E+vHvK<`C5OrZ9}0=Im4
z9#kKoWuDbSo*Tu~i&p@7RESV$`^8v9Ujx4*rt2T7w2av)@95j@{)1n-sVI2qoQRf?
z0Z@7FJ{!`g?&GRVEBUR>)x=kHLH?Rh0r$qL`I5kn6N8gG3XQ(Jq)Zm@hw71q#{aa<
z4j>g9<e4sj*RA(jo!RS9YeBq#+Xc7Q@sIOs9-E)P+TxGiA9Jbw&x7#OSfR}!M##<3
zrz6kO!Qa=5n8vBqEEBU(OAQ2%^TKmwH*E%z4J~dssKqd5BSUr@44Sx#Q_7pxH}JR#
z2cW_lD`TSc%DZL#yOOkEp~*DBPE}ZA@UyYjw4W2|dg{<dKbSXs?;@Any<1N<fJWlR
zftBuRn`g!5I3q4}_B3lKreBvgn-^19&Nrzl<dS8fdNFtv7SnF7w3A~hYcB4dg<|jz
zvj_`zTJgdRARKRpk$gD?{(aU`<eUv>2is);X2<5*Cu3g-qLa+{X<>}UyFfb$Bb1QD
z!)XuSCys2KAFckE{F?xe5;1KuR;tC+Vc>2B#;B22bIzd#P({YpK5Ee8FXvzVgJO2R
zs;T~yF%88M2jyU(MFVi3chFa|aGCL-d)LUWpGVpui8cwc@Z%pZf2)k%v;{oLq5a$c
zM0)v&0c+xv@sLw#I2nHKCZsJYD%D7Nk<*t~U<bG|KlC$nWn^h0t$UNh)sNAr3ZAch
z@87INpp=}^&lsqaMl{7Cc_CFYb{-W+9!<;#zb&_Gvn7quL%@D_?#XACR08eV(}61}
z(>~tj+<XsBt;PRp`emt5<$W&8M^ICpDAWnX&c`g}ijftjek_uVsT8P?XW;MoSSd<O
zljw+ki>VmE*E;n6;FdunS_Et@XH-h6nY!tJ58sSYiADCvrL6zG#xgTwf~dXUmC@nE
zd*z+wR9(j<RVXG4ZgO#(Ej6(&va-04vdj#s@LXh)FIch#105C#cq-u1(nUwhjyqif
z5iIRyN(P%>5wb{M3*gN^EmO?!kl#N|3x`nISd#+xr2kEW<^&4c)1C;hE5k8_m+WOJ
zaqUxGLpxao%hb{(Xw|@il2%iOn8SUxo7PSoV(Q=9sEv_@|2pAyDUUj@=pI=XoT<2v
z=BSTbS$c0pbI}e)(kqqzd>C$(M^CDg_L*oHp`H;H7)7pQMlinj`mx8)IBXm7oo-)W
z{H5vnK0Lf?^xaEvIo_6q_>gb~d&L%E>9Us|10Ps5N;$=?;bPY_w;}BMHg`Y2ytC%#
z+;htH)dH8CuY78v9%fw(1h#ipZ{G6bGB@2o9KV}}joYJO0+t2)AMs2!7MF^qBcsd0
zT7q4=hJP~+H{$QQ)s4rn!_ywUnNUs+uI2hYr@}akX`)(!-!BrHZF1A+@<Aav#q{cg
z^SfM{sUvau<r3UBEo9=D$|vp;k^%ewE?}^#@7)utIyB7;+qEA$IT_~HGVAA51DdrG
zz!AFhj49BgDuLH){nK+lc11|srfL`0U>ips`oV)QVI*|>ZnC@JW_SM|8C_e&x4m~8
z%*@0f;_{y#)KpYt+bE9gfi51-)UIvXB{6+}z~_osP;_<YU2`jUE(2{OXiB=T9BuZc
zAg{;@m&s3<SMrzc;!?5_+Qf%|x2@3~H|}F69eL)9^qh`>9;%Z{zdSFs%Ds=4@3jzC
z$^@yKXnYx(_D+IN{$ax?S~ev%)}$Ca>DA))>GYm6>e#^im(i!XwLia*Zsp}9f=mK2
z-b1pze=l0i>a28^)|F&`>eKy?;o|AGYq9}yc+eISra^ezOH*69dx1L-gOg%tw|=>Z
zLRk`ZhsMLP%t_eZ{hx(@potbk@V(81b4ij8M_7~t-_=J<h1!ei$CQ)@-C}Ku(q)8`
ze-|LECWbFifbc9ZjhbWjR>72#@b4W#jr`~!&gvhhff1Lo5H1XL2j~MreR2;syal`I
zEo<HlZBFvKZ#<G)mmo!M#-`9`u<Doo^p9gAKl~<O?{ls>+a7e$U?Dr&oEz4>o+rJf
zA1ToVwweAk=-G;%A9}{|fYa($vuxs?K<ka%b7(qNRpLsl&{R21qyRl#z!)!*xgi%V
z$F!5ajR<;|LZQ44Bx4_46cfgN#hbX={eM<ICdU;ssdYflTE34_qkj{?^f%Qhte-=p
zsB~4cxUlg`h!}w)v7+1n4n$vgUp1nc5_U2E912-uV|s{(Hq`+<VXjJd_nz<7b=wy`
zH(x)(A1O%^7195q)1apvFMLaCpGun5Mlx|Tv8(skdzqQxKsppb+T5|1u~vymDPehI
zx#4CR1M$Pho+DpE?0g|pA{i4UAsYwxVM`RNH?TGEY|mUUfxAJEY4`xvuK$>m7OAX1
zPKKKm(DL&gjn@#Pg2th7I-!}0%_+_{{-5sj7+I<7Za9cJZ6qLm0`(O>Y*hEA6E&bz
z!ip?wIe`p@Ei`%1m8E=_|K<V({U*gZg4m@5ea9cGMD|IQZ8FAoEl2$HR2a%eVRwM5
z<^BC`@UWv<hFD>gVD%u*)4?Xa>xU#os?wy{&FGSUMv<`R9z((gzS{{qx-h^q76};-
zqiXnc;ZNW%C$(2GY<tw_I04-OYF>1iNn+Kvxu#LrRud}G?d@2g?WMLeIcgnu9pdh6
z7AcvQ>kXql1_mX`#~->hPh1Zc#VJY8KZbpZ^z5(SBnLjE_QIOX4}3_YzD?AW*HBA*
zy-v%{6rxy40tVq3r&8vJuDS>ZE#A@|^>6gsNj6IPo$5PWKtj}}l{Dzf)y|~Lyepmf
zjS4h`=tA0i+nrV?>{Z-&8$SZ5j6w89h8zFp1}z0wotk(@e5hzpPBw(Dj@97rRpa$H
zdnN>+@oqc@FuQ5?`R?eAbD|k9n+e4NlE(X`6Tb6#Z8Dw8i<Ory3iukc`t1m`E>Hm5
zr^K<sD>WQa4RbB+r8O5_`$5q);^Vg#iZ3U8QT2`Vywd6X`t&*osn40KSjBHS*)M`C
z>{p{yn^1n;E(0{C`!F9u?hP!CH9T@hw2=I77<@A6Gx9}IGeZnrkwoA8_yCh)F8SKX
zi#FF`XN`uI%~2~cWkI)@3-yr;Qy##6NFPRPR~W%rz<&gsu7AkOWk_i`B&KmhAWH5j
zwTd^gGTQ;?o`TyaSE0kBvBmTnh=<v`!UuG%fGhndoNfLe3{Zmd6;)_62v!Ofl;ir$
zwSI3l0^<xE!J~S|%hv4ESd`oe`RtTAu#2!>!FCHS{9T;_M4}>#Kk4RP%{z1H)@#PJ
zkxPTrus`f;jVMPBvyuT%y06?(`xU<epEqGyjeWcoyQ3dq=VPQ`MGNU@z`^)KZKkJE
zL#P{&=Bs#sYCtEb6U%QFDCqi(?wI^lJC&qVcE>B60^R|mxgKqo(*_%{n;L*zz%S6W
zCFv*}?)0I`U5iu4fH(dcM>_x_Hbft5+NBG+lHyQonpVayzvIg<u=Ce=tWXuh8(+Y~
z=hGQ_a?qjEC(=6Nf!)}OjhXA3#H5Amg>%td>gH!%v*PaKu-MM;Ughc}24P2*hYZtu
zTwm7R7iR5}4G2zvsN`^bcA=3sE6PD21IU}~1isPP=%RbH{3PP3z@9Uf*F@Q_NdLo0
zh5Kx>=bxg<>o}mFJPZ{QZQiQ}u~E9|LHKoKH+4DFXd>lqnn#wK6zkw9yYy2sp}$mm
zNh$a5lm&GzwQD*<{g#cEF&8g_T}o%;5Gx)V*dj(@0lpg3=gvaa4n7zFxaRy@Q@&$`
zBN|--Z8RNg(UsiF%5&%n$$a4;$@HGQ68BIc^xhVb(i|7kXbxt4{>9W)B!E{6?Xkjn
zJtkG@%Dedil!Oj2go`(Qm*yABNvdxO=jZJ3Tyn}fTi8R_4WoBzA`V_K%l;$6&8GU>
zobp9I;=TvO>P2BL#B?Z(=}baf#5#{}+J`p3qA{@ryHI&qw?ewh$>cC#70k3Lu|6c!
zpU`tXmw`EJgqE>aIwb<lY{At{3pEFM6W&&H^clKQ4?rW}k>^VO8};h^of&A%t0-5m
zv0=&P;%YC$&%lG5H=&I^x7+QDvDe>P$&3T|H{Q}wVhCZp)s#zD9I8}X>7Z`h<M>!k
z=FUp>mx)m|ov$z^Q!^xHC_*2}6gkmjC`}YB*#BnUUP>pX0ML5hcx-qYhZ-%5x&mHL
z2UUkwM3#<=V%2mH0r;6C#PhcKwBAld89t9)ljwGHtyJB(huF?D-O|Hlj4wvx<Nyn+
zjMvoel*tms8;8h0Tg!3A6rm^d4<Oql_%|f@4VN)lROb>O8hjcvE~YnWS8{V%nZX|v
zJvMF^jkge=4pMb0g*4<RUcF93FhKcw?^;lAJ|K-^Q?>q=%q|u%xMYypFXDCaU#YZh
z#}!G!!a4E|2JK>!S7LSAYNbR?I28*wBVUORnqJefqx-b5jI@5L++{34Ee!8tL&2>=
z*;tFriOr$51`sxR?;6PLPbjYf;IvBvpqF^@i`xJ50@zf;w|X&ytW)6qGJiHz6*Fd}
zBLMPXGnpYFUYeIR@~r;9IK+sG^74c5igI2V9H3DWU}(=Q`8KWoE3>q=-r}p2Z%gCK
z>Z59W>w5$eaNeQ))yop`FQ9er#kS7~@bjjOjZr}tY8jgB>TjO9OQ+EE@{3%56^?jK
z32Zg^YyvtnVHyo@CF7$x|AzMrt-Ib67xu&c;Lol5d`646!0jJ>k5rCb{Y<qy1@yPR
zp7jS@h@?&goW&WedLB8vJVlU{#3($qB&1)m2w>ShQUv^)xK$6BtN_FHDvZIthb@4N
zb=I(=hm<DrmJT+PVdt{RvWE#<et}PGpjWF6W5dM5Ibo&&vIH=Kh2?BY%~9c#b$QpK
zYc+B~<X{pB{ob2QHI^ohrMl0kLrdGXT6n79zku~v6slpqZ^2DPG7Yp|8v?SB-XvXi
zmYJ4`Zk=-pBBh;`*0~|yw%B8mZj`q!x{0^_*J2M_y=h%DzEsk2#+V%OJT?eGK<<pq
z^XPq79klAfb(+NL62OduUuV~7POPSTSiDr5y?!T$XC|yp_YT;aHB<QV%p6uceIe${
z34lj5aoaKQ_Y3PqTfS@qy&EwRpj2Rg!FbbmEq}x<`k-|M=3TzF+?uha>F#>1^OfD`
zc$}J*`nV_ci!<2CHd9jv;iF(24G8}mK*fUl7Dy#=R0aydA;%QfM}r?phWRui8r&Q7
zksJdSF5CoC2Lnkn6HlUxqU0l)M6=l6zdmVV+1>h^Q=!w6o=LN~+W&V($kMqqefd_^
z!|&Fh`}J`=jLwy-ka19dZ*#{H-yy-naXp({O@}POCn)v;ZGCBxckc9(#ppfA0nGz2
z>sCzn6M@K*QDCJ~y;*`*@Vl2zOu81;;nmyEWMq+l|8`^j6IirwnThA^4!8UZ%_k^9
ziNr9C3YlHHV}#=CfUl+q{kq1_p2L(vv;WiCRlY^>z5S)T8<q~~Zs`>1?r!Nukq!ar
z4y9ST5$SG_l$3@QkXpLoneXpUc;3t#xaQh3=bZcg)R{3l$RZ}s=|0ddYOIppvlP0*
zg|Y~jMEB{@=oWARN9ByMk7JeEA;0UU1#(({AJdF$m%NWI@Rva0m9`yE#ekDkt?w(#
zg7652ldVP(k~#ciQh`Y8gR;;$eF*1C=Y{(jVz}cMT2yUEu9*qwYvow>X2$wU?NIi~
zQ$S`MjFIrE(u5WRxfX0$bh{$L!bM_3t_PO54+mK{VQ|T6WaK#s3HVCfSxiIJtXrBk
zpXARPNmCut3QLvmUuyp`){3fr^U66eZe06uqnTcry~!R^&y%|~WfNk&EAEU!rPZg)
z)x!Dt$iE+C5Ut@!%dL6z&LgjaLfK;7h3$t~i-y&|G-;udhIpr}gNmB?_1*!!10`-u
z1ltd3V<#aOI8wjY-(W4WIIAlDsh{O#H+b|_h{VTTM*DmmY1Y=5ff1?+w&Kg$2^ESO
z<Il>`%dpT{QQ%y`GWp=c6Dxb?7^ajWd4Uv4oSl*66h6;CtaeaXNak=LN}f{-zCgEj
zPl%Y1_?8c8jQeYHv2)PL^&Xprr%KL6F-8=)LxYVFb~9Y-co?<6wKKAI+)h1WL)`u{
zhWIfu6{kQ4#-KF>a>Ox^V#b|=Et&qCDC(ZDJLiz^y(KqRt*h0TFX4d_ZB*?lfu9cK
z<1*~cF4zp;dLVae(E(Urz6}%)&>LmVhedd9A2A*f!$Pi^s%$v>5Q1B58law_2H{)(
za<Lxsu;g{2rC{$~obx_V8RzB@QLR>hi%L$EX5NhQh}I<RS1#r8XA+LaEd{4kxK1Us
zH{84-5Fv?f#C%)$rHeU9C}~`dZ>oXflfP4Ie1aoeUFs0z(>%9F#lnyoGv%C}qe<l&
zI3t<pB(xv1lDV(UF~X5Nbkb}40<ziTq|5?`z)@DS7ky-24bhaDX#!VwxBw3Z$6o+r
z^dv@lZ?|S!&{q~GJL$6u>z)@_4$fBw$1;QJ&Jd3-5>2$yB)*Z5R=rPGk26i9s^-w$
zhrpDvW8o*o!5^%vW8_be@Tgkq5B+A(hC?4?yLty?-NJq<b^sm0;w`L1_^6vCTok1`
z91lL#5ta3?seJ|<RVyuq@#LuNIG<eh)j?O9Z-Y%oB}*NLhHMGwO}I3fcV(Z>{2I}p
z^pqQqXv+g-E|c^~dBa%dX<R6ov%u4VA-0M2W=nX=Vg4{)lxBz_ex^<ye2BdgAhhEF
z6Y4;b!7o(j>^Zt`4Lo~G@E2RAEaIo8kxt?0aabWU&QLeyzoJ2orY>s@`-pKXA0`y)
zeF~21HV$tU3cH0W!xO8-A`ng&+NrAIg{aQKdy~;I7&kh%D&2ApcJUkmBaJO&L%?M+
zg;X=I-zw+xyf?qM68u?C3%nQw<$RP=R=p2`;C!L>r%@5Pieuh*>*FY@Q+35wA<FGS
z$v%ddB-pXaHzalbh+gF`-OsQ8kW3t}X9YR9WwuJueBp82Fk4{pCy!aB=K(<n%D=EB
znm(Z|tp;APqqIQiw?*t?ylp-Qx)Ic!xQg-0zNiNul_e5B*Yi{MoEN`ZYzMxc1elKq
zwE%Iw?BHh%Ni_YF^8lp?^T*3g6c9f@LcV!VtU6a+v73kkDbvf{Db`cIah;?gs3bzF
zyzgC7De4^Iz&l$vr8uXPZiZGPtz32bs}Q9&H5TuIv_IgMswWycl^xt-=3b3^UCbh>
z7+yICG6;i&aRS4Io&#&!C(Z%pUg22W5*B{Zo(i($z=jj{f$&4pKy3*%pY~BgTk9XQ
zDc$6KnAvlM#UtDpZ$7wt%x!2yvb0M>xBjcVRWZY%#8Ts4$9H^USqTj%(<KA>Dal+>
zWYRfS;4zX|2yM(s^<04S0pxhs5UcI$q*pT*hUvVFc@5PKJBsOq^q=N!a=pU^55f@H
zALw&pnQGn}h(DPS*2r;SGx;=Ad?5u_`64HQd#SNrY6OzEJGa~Sr*ol+**OW_>%9}t
zx=(vQ^kHAlx+A$ZyF99i1`;f{Nz7h?I_D()V0Lzx37o;|!LTP=Od0Ce-Cu4yC+DZy
zfp#EwEDR>w*2TkJ67v_#oWDiAV-U$eUh!T8vc$?v{_$~%Wj*2Wd`8j;I8OdDp!yd$
z3C-}9x>rITOuk&ts|-u2QY0{y4FiKrkz*uP+d-{$eb?kJ-&CQdz&FJcgCGVQ&SKJP
zkUx!^dW;TP``ao+QS6vy;FEih)$%PWV+-3`6~)OF1?W%A(_8zFZTg=Vc~#_@#+c=o
z8a>)phT8u~FL@J(=t+@N#_yv3e1ou-8=uTJ!^zY(6y)9SrILb+V`uHHf<ZZ7Yg24M
z+DIDLr%ceS>V*9%3Q2LPP+JMKsb047`ouSdXNLyyh|oOP1wyMRO=whi1pea#krg8}
z>Y6J7T}^SpH!;*vrALX+Cd%{Y^V7lb$}L|vgN||&5hE_u2znm=ZOTnFCtQm?_#*UN
z9CB?1cR!QA>}-E8yO><K+y23J7cd<Nze?LbY<!j)Tk?H)h`Fp8amys<JOU^H$~-Z$
zn8l!da*k@j9B4-Ln74z@_`gi3<E)0gj^kXm0~wfdLVEK<IaWNPXem&qRM*9%3ZUbp
zj$masi|^yefh%5BB?NB^QT*(-E~@n_R|!kG;X;d#fbPusqusMLc@UOjAU(Q5WDosE
zjcT$!7&|}6C@|#f-8E;N_Smg0pw#u2!qQ%{PF2%M3e}sjkdZ@Go6$$`)pq{3-Dsp8
z3gv{txCmGkyTN22!slJ0pX33N7yyK~%g}rgaQ?ht8ov<cZV(0}Cswc~mN)7I=8SJl
z{Nj8WDwFuBVKi(Q>*l;UvR+~G*2Kf4v)vPJBEdLlYJaKDYJg&QTF{mHp_R$@4yqm)
z1oz}Qb>7v-v_W;!uS~F<lW_Fi_Os_l)#n6+G_9xOYjta`D|hSWEVP$fp>EA?gIa;r
zyO=7jOlsu|%%1DNLc|iUQ#Sq(`wi;g*L(FatymgWn0~Hb!=XAJwDIicwyJ~}$bjRS
zl(C@lRzQs|ZWq<hj{ch)zsKy!*1aorl^OwM6`bOdC9eps$Ul9vVnVFSsu=rXt7QMA
z46W)Y56&;RwX4yiw95U}jVrV?X&>(hg%sa%FCfk{T`Do^hIlos3^Akg#M1-Q$}n9b
z0;PTGOhxR9oYQ}|IuU!aQ}m~A$d07em2*^@=y}?7bKuu3wqPd<M2X=xj7?laHCv`F
z=Zazq31wf#Hu|gOk?3OcO&AgUN*ROK@5@ZgP@VKuiI#A(4KghEO$zJzd?j1*utqxn
z)ihHT$abd0%?c8Y|A8tjck=}!ZpVGwEBN(>;%+6=Y-oS6HskEEV>%GLxfZ0M)?RgP
zomp3GFGLLbE7WtT+sU_KeAij$yf!TVGu-^;_x_9)JR|VLi;wDdB%c<jIX<5{b$A7p
zEGZF#k}y2jU-lgH?xnuQYpsD#b|i!Ms}$SGgUUhmM&nw#wM2mcQluX*jrp|cYO&(@
z9!{;J@OLm7|H7NKU_L^V{*lrt!jLKE3`&x^tLbf%;z&dC3Ap!yw*pH32|#drj!@Kg
zSz}I*ErBf{#n}~BqRj$xFI<T#JEs4l86rGE+?YNOF9ioTg`}b?JMHP-wlEY4G5Kk%
z(H*)c@el)M6}y6PGY?dr^v^M>&lO;bT61S3E2oCXK{$bRoPhCt7D3Cn(d|7|Kreg=
zUtcoI^>+`j71vb*(PTZv<nIV`*JbzUIm~BAL`l%y9F(L%XUx5mVc4znhDaqf9P1Sf
z4|wN4-TPd2wW{<pqVkP9JP(kEt0qW@U!F&9U8z7lbf*E<Pnl;ySg-$3f=WJbR=yWL
z4cIOFJNal$`f&Hl?G-77fRJi&>R+a;9eIfkEB2*Ix|D=TaBR0gU*4bLk4R#wvaTwl
z7Y5p@uzRUc@NEFAho15hk2a%M7E>dGI^SR$;sAGkxK%YWSTlo;fQi5Fef0u!qykh>
zw*1`?**>Xza34kMzd7cFNhsBVYRyx8!9^<~*|q~2@syBJ>)Jo7>-s=*S|ODpcKL7i
zTc9a{9LD7pl`o}^+}YU5OBPO|&g)Xe%#H%qeRnSgwryFr1bnu{&@!|qhG76f6ZkJ*
zm9?I!a>s==21>C+s{QTiF5|%*hY2m#ade)&c0c|tl+x(3Gw*&Bd^vm*RQ`Drr`k-6
z5Ho{yg&MR57XMW5VJ|wkeu$e%Gz03b+|6SK<=tf8j%1#71r}}jK|lsbj4N(*xUBSX
zjf4PX0g8;!m8o}izjjHa091LK9P*)B8Jq0w-(Olu*;q{1Xl+}gZOlL5_-xxL?eH<7
zSE33d^`UcECtDj%^Y!(ozFUlFq|qjc2sFQQNJ*@)QPW+P@BeLBE+IeWJeTlFbB?Rr
zUuWi+iY*!T13l#uckES$1Xu2TK=wYra66h}stdC5{CJ*e-<WkJ%0yZ)%md}E3`@u8
zQ8xWAFMp*tP4G^k<Pb!%FGF%bI7JYBh^t}PLFtxOy)Er|<Y9kH$1Gw_Y{cAkBk*{s
zi)RgaAFOkIJSAYn&HUEA*j~)sUEtVA5SG=l<kofn3rW7D=2nCyPz$JHyUb$e`MEa?
zL56?XOk)`^IiF2033;Zs?9uF$;wXco9v4voa4^yg0Ig<K#-ai;ZUL7Ku1|v}^ld(v
z4|s;k<84MByYD_m2~QMgvfx%yZ@W1&yKepP?O7w<{s;axae~e1A9?$R_$~z3$}+wB
zJ*?)mb$p*wI(Dv&#^oG-mIp`3osQ<it=<J^W*dg~e1Z1IU*6*dBm|4Mx+&8_f;;T8
zNu^ngb5%C@iYZ)%D*sY74Byz4CRkd|y=ZE>cW;=Q-Q9M~7nZ=pn0CZulNcE{<27S1
z;}=6I_ukHL!(T&{GtCG6ZUm|C#RZ>P1oL<J^5q@WA4n84hMf!D2<^!PQ_%zmNh36r
zdUZK%_sIc1XAHEpb^x7Q_7<!*ba7%MSZP<#_GDU&J3PrWg)@!}d3|SOkcsX5`!5~?
zDLM;>P);c-FPE6eP$S(_<{g|bI%wg_sEn{(>vKbvZ^>0RVaWp3k?U<xxR;XuZK_-a
z^lteAvV2h*J;0r@rd}8q%P*k0#C-p5e6g<WBya#Oin_=9IjiT(*QH(V!)5?bg=V(1
z*)Do-xa@8|Z;_nuQ~1GFPmx=~RuoSsrx8I^g6y<$=?DacbFY?r1M1cQNU`9?a&pDU
z%oXpPF&=I_p=x|!B%bW7qC<a^Jw^<K-2Gh9e2a{p^f-K~&T<j9I`<XFJzEhEi{z@y
z`yAvcwo1NmSb6Xy>VVqGrJ05ZT(SK;`~(MO-GHW(wAYxJQ^6ttXS{VDs3ZP%El>zn
zs#oWH)w5KO%~R7OvN7=5e(&-$iILALU2iRNSFtY<mH+9~I%^2eRTbIazVoXP@*k8#
zHTCW6d=Zdb=~dM#w<j&`z6c#-Y*M9J>M!qVp|_(PL0e1-x-1k>&&ctDl&q>``7q8E
zNtfP$+%4h(N~|l{;MCaX;HnuD^f`Yf8#bD4k=CS_aR{WZWEI{Y8b<$4`xudLEjIyB
zE5d4db&E<SspKPG$|D2AgkYLoOOk(D<FVYrg8iT8TW5~hZ%R}#^34oK%JdiEKom_p
z-Hjd;=6^cBs=&%_Ca1w5Dr9bz`xvS7+Y6OikHa{nN(J2uC4pUlJ6RrBzqzv1h)q~!
z@<^kiExru=BP)bCdN^a4M|z;!xb4YI|2Nxns#Gp0i3!$(xGO9-E~1x~6l$l%IHhrn
zqkW+Af{8vvu4)|{tBs+1g4lGs-ki@;dNi=JXcJ=o`ar!~y1^>((-(>QC_nroDsGL?
z+q<^RZXEOWC%T~hVe{Si?HlcYzxL#ysy4&IXT|cgWw%^nlR(Y$ELm)UsKP`*i0Bkq
zlb#Y;jjD(+@LA4*Q=V5oHNFpq^f52C#&%PzyivTSMH+sV(ofHy7U8;eA>eG<3Bxda
z4$fi(c#U+1Mb4l_+75Ihmeo%MS3yJLH`eghKc-d48X41L(?5Imes+$S5fJRZW%=gT
zEl*D`<fp=0f2U>y1=QM>NB_d6xTAGj6PIgZy&*skdVNaGA2?gPTWnxzre5WfJOT;#
zjM;vK9<(D0JQv(Kj(f$?IsW-*-5SoUJUerxbv9if3O4O-YmbStEGWz^^++u}<gP%L
zRSgvw9~Th+u9X$5=ap7t4=06m*s&TuXt~04<MK(Tk>9Aa5A0#;*_XU0vcqm#Pc)hq
zZ>t5$H&VKqM+_n#P{;RoWS8brO@<LR?8rPAqASmD|3m(yhp@kHqG`8x`<uo1j%;*+
z%@ecmDbeokaEEEYP~h5&7B=ONa~5|CLpke4%XPdfywryg=$pyNUJqrjBDM)oeRFVw
zDSf|RL6Wk4u;#{UNm*FBU11_lIg`%lpVs15u#`fuRk^{QM}*T-nHM1nui(waJ6xg_
z_hhsnS4l0+gYWN#ZW)z*VJwSTw0wG-{*lN~uQF~>K>ogfXv$a@r~VsmRSG`=7*|W7
zdsHnEICwda7|@6Lb3|5tG9#D6acZJa?pxVA&kDQmRfpbv>$@_pnS|5fyvPXfahiA8
zdkS_Ru{E=qNjm0QTzeNWNmatPI`^m~oEi?N-D~*tr42WQXvLdU_@`lII2(OG{it`$
zga0Zj8>4^c`E2>j`f~er^LZ2)AH0;nOg&+tU$EUEQj#aOr1Dl-Oi5<>MfK!lZz;j-
zi?a%$xS|oZiVc~{`;QfQCp1&qV$&i9sZ{m9*<D{4rU8`;I3$8=hXx!E2#zE@+F7x=
zH%qIf38^7#T|2fKa~x$M6LD}MvttqLLfara+4+7>6=kVmhunr+`IH_WZ$b$2;XYz-
z(m`s}!Qy*juVB{UGUIz6y~d!4zJzA}`N^KeHU1WMe|?{D<aHv!FQaY)I=}x><zKtb
z_4@ql<neC9`qQTY;a+{}jlRs<PMz+vus<I^Oqn2TS=us!R4aOjS5|_EzlBWZJ@JQT
zGVvC(NR*XWi+!TxAb=;E1|_HK5V4S?TaqH7&dbH395C^Z0RA8X)MZ#?*dyfZRAMkg
zNIHuVUxWIGA{&FdE!~$IGU5G}SwR(V_Q#nN5va(pW=KaWZFk2bF2x36PzKO#zA0!2
zNy0a(8$wYzjvB9sL7faNSS5qqM+&rUQA5-8x^nyW4VW(*76eLp>7B~PLa=PFOc?Oi
zhM=txGrvD~&O?p7Bu@<>RM322c%-7L(e11A7=gs4AyQyv&_o0%a&J95E!`Gsr8k&d
zo-Qbv`YCYX@8_|qw>vnjhDqR7LNdJ2DgHg&W$Zv8>hJC+I>?Za^!L7>D}fLveKC#e
zTCe_C5Dz`!-Cnd@Le{11W^Ce@Fzc0cbKv}MK=-4NAb>*nGx8?=%IKZHNO+<isIbW+
z#qLXNHZUgMH>r;q6|je<b|#HfGIb!5mvWP(GK!)mtX)2q--6Pgv;|(Ke&`eH%~BDG
z&-Y<`FO`+_b!%^>J+FZJG$)+5a{1~LzjTp2C<eKvak#o?u~r3Z+1J9sqS=%1;J+N!
zXVotLCRW~y^NOhWO{H=H7T(%<JTMqd9JMkWWsU>^m<9j<8{aV-PSm$c&-;(wgr>~?
z1e=^(xi_rHk9+{7(cytb5Is?C{?*+1(Fseji0UDb<eCEiFw+3edgN7s>s7aQuG+6Z
zoS3Y`eaEP)^o%}x-er#B$V6nz($6oim)4p-J<Ae4<SndXu2C37yo+<%8B@SZ>X0oM
zbiL3Mx)5tL{xX9$lxX5l)pN5#Js=r$kMh2(_d{n(2V4&w_tpXO3$(1qeQ#F_WZvmb
znQvfb?Eh+hCMMi&qh}_vaJSc8Cpp2l#0bOdW9BIP@fi5oOFruc|IlXwNgrSLjN>NU
z;`-SHsu_@sqf%m-Qgi5F+;V)Pn^#s$CcNn|!Op4<kYC~`O>{^|E|}R-B&R)6|AEcF
zyCdQ<zGa7<)5sVd6;qb_ObxkJU}eB;Z#uy54WbN^tLGG+Em<dn^tb)F$hsoNa&6??
zF~<go8BN{-=@2c@hJM1-B_#Ak4ZZ%{3FY5=01apO*Ey%168oPwQ886DRC#CYeR}iS
zibAlTb=_f`9bE@5cu=yS+wW&vB<A;%o$Ri@FgM9Z`TN%5^|_H!Hv!nc@rN*98c?Ue
z+VCy1u_AW)6MG*-sPBH9W_REGGtrSNMeYlsvM)mL)oDD!bJx767gmU(T?k=9POM%e
zdc?o@!H-Ne{2%ou`PIEyS>CiY&c2PIU(3d{a1?bmRh%|zE@HolTq5USe9a5P4^twn
zK;vf#&BX|1><DG6p)xzHv8tJ66&E2^PA4oL9XS~T0qPGx=d-s8-f*xNh$SEi<8#(I
zezPA%%8YQBL?U5_R9NB${&ivP`OyUT9RK<yKluFdy+qzHsYFAkFAe?MnSd$i_`c=&
zbxnW+1#!^By*fJs0=2nlVj|b~;Jw|A{CJo-(C@9!!X>+2v4gguXXeb|J^uGY7n^{c
z4)7VVCcY(*|2s1ow8$D}R?meGFSFm2?Rg}Xi61=QJYw4LiRf#+;&eKWWwNEEV;K6&
zpnCVuG?C9R5Aer8BShDc^t*eYIAJ{19h99jhQmL6sW}FWwuIn4>v`j4*S=$V*z@)R
z@;kS3A6(mt=X-teUtV{HMNirC6)EazpPI%>x(n7uE8<ySKO9j3f~(|Zf0=t*VCVX>
z&`k?0;HTLL!mC4k71w3}1x_bV(9J^?23?7w{FKOlSgObG=-T@5An<yd(!}ZZT-He+
z`}q#4cdG#s`vr`uRpUX)&{=!l!r?<1i5HSqEoz^14h{6<7=;)IE}=}Xvb8hw4_obY
zDCN8%v%C-M57aupOj?jiDrtCccwHwKc{>oK0T2pntzRY%lBA;;HDHPK8OyS`nO{*I
zvN#^%`Iu@0)0MLCiCfef1Z;9E2TTYgv=ZOoH+S^gdD@p<p%+B18$H<h%SV8u$xLw1
z&Zw4%eaUAcRe*EF^n*QE5a1+MEZqKeM|pj53XV>^p5ES7-uEb7ko{8+@LA8HApZmP
za{wEdZ?-?a^OzfGeA)bTl<OZ@A30rTIs`aQqSmB}w5Pv@{U1r`s>?k7+EanpJc~*n
zV$*t!82a{P00<i<COdpjE8dk_jT-~c<S6PLET}M%)@#d+MLa*Dl7tWco#(0sxt8Bn
z<YPFl^JEFi@Q30Uk^r{Wx#J=?fdal3sk7vw8WyT4CVxNP-sct4d4?3;i?Wgm#T(l^
z={(x)Mihf*umTGv>yWN(o7oTNPwlI0Jr{3!0_J)cT6tE*Efl=*r?0R3h|Q>-zmNa$
zck#3C<JwdD-UfrK<&&CJ>d-m7Jxt5!?jIUyOX`PcLO`%I-d=nf!U~ZcvKCpK8-Gyv
z_@Uc0-ORyff#|S;!b1b6<^t_XIXTAbt@l-5^fMRhojV*H9^ek5FENYXrFZYr0;Y+`
zU|7(W<M)QFYDL4Sv<XZNovAwM8Wdi=8@40N`h+sZJbX|Z`gloW?J%|`-`@|Hg_AmJ
z*%_L#^r%YKEAgMR=HZ-GM=rZ;Nvr9Rq<HdkjB*le{|vEp>9Ta-SO8|mif<{7hffU-
zJQ)dKU;*!T9{PTW+mVdeQ~BYlA}=|Kw`uD3n&aywUn#fg_(A3$8Uf5jO@ytnt^Dy9
z(&TJv@sdION=&tn*w`LSKg}ET>1Y7gq2(#tWMLi}YXE4(&JqIhyKT$I1=gz}Njf=U
z$0p*+IbLx)AV44n#IK<YNsgb!s8ds1`h>hTGT=rDq0B?BaSzS1P@mr*|9)uQ>H+gl
zFm_v;oIE@_u6;|Yc{F(Mn{~=yD<4^}4(n{H5mN^Ugd6<dHv;t3!xd`ejn!plcw8Jk
zYkVVaZ_gueQJWC`0D&5O3b>CTF6}&W#nG+&sTBqgaS_^1l4@fAWJNO)5q#M1JAFm0
zkTQ7wJv^u`?J0}f@1{1SuV*r7a3tWM3}D|R6KGX#%T$GTuN#amqiaSC<Q0YVas$T*
zMTh?kP>R6-8bfG8hMvr)T07e9^hu7&B>5;<Z)y8qIUGzUoOorJK31~g+VckEe&`k-
z@g3rb>p>_6cB;|<BnscvHqr1g+2$0SyMYJ@o2}wx7Pv_75V^#qrXEbRqGhDO(q4Iw
z8Ke1lb!SzgA3$Q?I~ppBZ|{t6oxj!>#o5vTx1+)Kux>_p&jMZ_{7{T`%ky=|GQ;Xm
z{`N3nEXMnCN6R7wH6y+@bsy|BJcy)|l(wJN?6N3V=H=mDvY*Wg(HTC4@kL^2VMZli
zfX!IN6Q22{r>OHOpe9Nm8F|EP>C7;j^D&#$(!vuI3v<g!ITkekdtM%F#Ch#Icu-O}
z)IiUoL9G?T`v)zhmBNS&<inBsPb){--qbQg)MsOs${wnTjb@y2=?Ua1zcm$2;e+eP
z^)F^=SjUGI*UDpAWvNnG@~G~VZ~?<hd}4S(4~NS;6L2IWi^Vti`erc!hcOw38HW!v
zE1o#nh{!!$kw0P@<(Nr$57CDm$EJ2B?*n<XI{Fv>Tc8jc#vyr4UTiXN+;@>gT}izp
z_DJ~XtPzL+T(1`8<P_}iZ|I1_h`sdtmM-v}r@10txh4;u5<O6`zvYaDlPaH0EMIBS
zbkvMU;dswtxYB_)vNB$$tCqGtfgGgHk40#LPDLoR`Vz1G9+lLVy8>I`AloLSNDCew
z5!u?HksM%m5l8DpCa%{rGx63(S7Xj!Erxt&XE3u=!iPwONtVBUMkLeUV75mHgNKjP
z_^5hIra?r_WtKIbSxWx+-;&vzu)u9Q1n>nuqklo_{d=(X+X^hxFJ=vnVyf=UjVcPv
ztB^?DvKXfmiQ48*27Z4~R8nJkMJDkFKaec{E}1a(`4Nu~Z#=JD#u4uL--3FZWr?o{
z#Q>>!2y2mk`j^(f;L~<yOlwJU>Z6oLJD#RP{Nbsp7`c}KMY0gm(YA#;hiI8W`%5HC
zp;U}AnZ|~Pl4CthfrIFl&vR#sdzuSt+~Nqoy0+z^b;ESHahIz87h#h2M%w=JxjiXs
zVpQIGugFi1TSqofv1V*7G(_`ILcevvgBBN30WdX12}fMQ^sjEbSRCsSLwjE3W=s70
zs7;tadm{nwiQ}gKD+hkcZ3-MZ&4dWV5mQnb_YxCgQMt+R;}C4BxYTUPN4ZDH+v_<4
zckkk(007o%fmQ#8pRr$SIQ5Q^F@0w=qA+R+zaxD1^CNIeEVY@rp5o;npZNh^ZVw7!
zU!TD`aHSxhpW$cE(ixBq4(l4_I$=c{jQL7W_;!SNewN2Y_!I59?z>PlhX2$vAV|^p
zt++Pi2$&c`X>I}$JI887Q9e{Chm_8+4Id>S2FeN*XhvBHd*J7M^n7C|Q>n({{HwQd
zy%*?k`m2G}Z7x^rik0o`p#0<Hd!-1~;Mm+^@io#DAY+kM%7EH;eTokVlMbZB21A?S
zc<9Q-1}zj8ayMkTQD^~z!>$MPlPOv+%HMEN$MYZ|3S{K%w0(w-;FR~o-}ZPPb4z)6
zlb5#sSHQ@~_Olpy!q_$S;xEDK@R5^xIqw;Trc!V^N%aXkw4gB|cojRH&K<z4^#g((
zutG`r&u=ojEHf-eZecg>B<6qGzdC|xr?f!59rJh!9_7xGEK_)Z5G%#X%8Ll(SGXxS
zuBwr9qR<qDq!a^|vBdqA5IO5DRMaH4ve7`w^RxWyfc2fxlJ(t_=O+!|JcpsWQ2wu+
zujCU_;AWNbbn+{tall*53VC@Wu&E(bC45C`!qb}S8+}CSrlY5e=$-ZUc0tk45eI%9
zz(N#8nk^e;nM!16pkTl&hDZ+i`BLuyVG=`pX(_3t=8H!l84=vo5$b`zojTzJK>9)_
z5ysN8Xc=7Jb(gBi>d=mP+Kum6Jm?6BhFTK(nh87`kK10f1=_K?BSW$CA;l(}^;}Ir
zEWwQ2I%62a3d`p=P(;vB7&ShyeduCWN;(IdIAB1FijNFDOsYFL01Lj6fpbFTLZUYj
zzv#h@_o!p}I753Q;p0qCF$kq%54^SE9g(|h+9|#PWQSx?;S`jzRh1Z>5`I}k>A2(4
zt#5kv&FXgdHd~!ep-L;;wzk+66jHc*Bi!2412?x*s;>Q7ZsWC=wXaZ7;_^Xsah+HX
zOp*}9{W#&zsekjkk{U(Q)3_u7Xa!HbAm)Xb0rnyG1nwAmxsS-o^U^Vhv<hhKMb-<h
zR{s=Q1<2mVD&&RFjhu|e@NN<k>8gi20@N!H0GuXeiTk3;fU~KGly#$+v!69cd#Zwb
zH+3r8DX}a!wV;Po{CM}3Faizs&6*3w9s3y&-A&vzWM%{?vsU}4)78ixDmUBywzxYT
z?=1R<7^lKPJfgXkC-~B|OYjvEPoF)e`bcHx>)mHhEEZfVFZ^c1MaKD5c2VbrWwJ`S
znFId*n*HCNny_G;Vkl`^_2nM8ujd$2#L^4Grk9#%uK(L|?&(J)TIkPBkr@FkZY(U)
zen(@$i<RJ7VE@*@CkMb$9#f7*Zf_mfmRbgSxu7Eb>_g9osAp<XtpXbZdff8ERa8`a
zGfjB!;b?7PXVVJrF2TFZgXz9FB*vzW$UR(tO2!#t@xp*Qx*8Sl^D`bRIPAnC%93;v
zMFC1SRNQ1HQ@`l2eLuy!xF%=>@v*>Qn8c4O0{z)m5lxK2+3>3_23kTQTv!_J<Q(ar
z&@a*lg)RmT<a)LiQd<tldf%ALPHRFi9N$yfMVkKY9?@ZUQa}%<#^RWlnf_qWwK6<p
zheAS5DPM2*MS`og<nE0}#CMBW;A;Y{BCA7yvK+DRg_Eji^G;`Mi~tnQ-OHY^UB)9L
zFly*w<dBQfr+<SaP%Wwo<T(K9$JYHdpovG&jsTP19NY8)vtqSWA#zZ>2Yc>dZ4vW7
zhT-Xk#HL1&V8;&11>u&U-N54jzu1txYQr2W=)W!cFHkC83kXPk?;U6nlHdGbvEo5e
z0wrT~_d(D%G9`^Gv={lWm%M@L^t}Ho8|fdW2E@xEyBB(6kE|9v8f@BtpqaBOc>}fX
z2GMi9OK{ZNRJiV+KVyJ;=K+520UA#DHB0{?F{8rswNO$%sdO1l?6dQsSZzyy@R9>d
zdUkkXIo_d&XX(m7<@%uVI?=H_ez~t0PWb2uL(F*Bj#XqL0G=s;T?h=u18^XXijfqB
zdRgPUWUg)TBbRR=%QxbPj_~nw?XUk;L;GX|t#{XWT=5Ot>a#y64py+5RWO+5$JsTC
zF>5WYuv~;=srcgH{T;(pMrq-SORj#nI4~JOViIhNZ4KOgnkHLD@p?)2$%Z|mfec#L
z7_Of^Js_Ur+OTN#DHqdR<f$>wYr)YFfp>*vQYLB=4Z)Uc3H8UVA09fFzc55d(Idu@
z17Vt4%Oc0D17oae5e}7I(ja2`aXto<+B!{{0z71WAs|2nSmCogl&w*;`N7aO#{a~k
z&%;>eIZgKO>wiF`mVjbZF_7Om)|M31254fc12WT|X(%XcO}#S16}CpeYcv+u1yjTn
zlgi$C8KU#D3Q;;kLbWPwZuh%HJ>}|>FcKK1c@hxT@-W@4>%#$YElQIHtuHN%Qj?SV
zu{t6IFUrJSB^B2V3m*u|97j-@9oKCcbtEPn_F5c+G>GP{#`%G%cUo=T^X-LmpThe~
zRwO1r6{%HU=$<7JTrDeQj2cR#T7RetNMrp`LV&l)C|~hkaT06NGSK4fWFL+aijo(=
zr7Np)@yf@@9WN(k#$*a~_EN=`D`ypgV!P@tKD)!%oQ3?t$N-ksDoL?jDAcF6MLUY`
zPPcb?7xG!Su}4XXMHms{7y&5vlPRb;WdtV9J{}t`Kn6%>qjN85B%4A>6BL&0>EEy1
zW4nURTvCmV(4z$2?sE<kx@~FLj^DODPnP{I`aeJpm&Dv-lwe61Vg*vxXLBe)P!zJz
z;jM>96p-mf6j}BQkR#N~mCor`wgLi50C5K*SIaOapg#7CvGx5cfgZ&aHK4)`eoPR?
z!Lwyy@`zBPJCq8-FLqgV$7<R;)@=(%B7)q#wZ01Zbg8*S3vgKezVH>&pCbXSe3TZX
zNGTR-PM~T4<Gj(qCeVP7_!#xe0$D0!C;}gV3Z#%g8^?PyIufvS-p-42#A7Pnsp=P?
z)5fKudgRf6VGcbzSUYEs(g>oa4N2O6CnK`HegSaX;~lN4FJDhMIa@m1m%mZmm*YPQ
z16dKOPXwJj%l#+kR6rV(cSy6kuMQ|#`3$J6KMqvfF?T^WyizIl%T8178!p98Z`~Id
zZiQ*zw5JH}mhsprMJR!-2!X9-4=_Z`0gz=Lot~$Tyzj>XZ*e4Cb{z+rl4tutzPKG+
zO(s82KUo~WCTh=!Z&{6TEx(*lIyuj?EZ19$vJ6pm3j<!qC)kM=<q@I+yS<jtQlu0B
z<q0!`!rooFN-8HIw|z?+29{>XwI0cYF9PL!hTUF7+VjAN;3^G4wM(#Oo+UVvR6)X*
zXvrNH2|6rG*9uRkg>5@^(J5cS5dlKM-6QK43(p*0#u9V(x4z;)3H&qExLaf|Fw@{{
zpb|c1kll6?ykX+*F7HJ)LJK4maUj-WS4@EG2=jt!p?L1h8UL^Gqktm&5g4|?WQj?W
zo<Kkd7}2K;dgwQP%8c5o1(6?@g*Wc0Vv64Y8wfEd#Ue*8i-D(;T_&kC`T{JHS#(BI
z@{L&X@c1V;CkY7O-NrC1#GdpGtzbCIT1;e%Ws$9c1F5I|@^4JiIF>>rbY@s$BcWyv
zolZ_9kapw7-Y(_oXV;C|FUh<6k86Kvrb3R8!iJMn#@iQp;_stDpP9ij$U#m$)cWvV
z)3g<L^a6~wAKj!ACY494Wu711c|}w4;Ql#lyr&3@Myf<wGp~wQVjzxzQ~@&sGGIl{
zuKK0okefLY(%9EO#yQD5_>pzukYBSmpO)Y=XSqhWIWQ|h{(OBq$WZv`Hg@|rj+o@|
z<jIw@qJ_3(>;>$U7{-c>X6;F~6?69kYnM5hC7z;Fv_7cT$<`Tg(X#SB$xBl7&CNI*
z<C{9B;VS8ik=1%1U)m39fW=-0hpN<;!AR(!gg_noZU0>o^|A}}B9$ftsh&;h+OhpQ
zhIRHf-#n}<sheR7!=6=44IRPP2#T=y+znKd&!3v4OJmGEJP0s81tU$@Zk+`Zx<33P
zi&gqjE@jGDe@0&Z8Wd40P3a@n1o9`v)ye9e)&aL7r@t;}jx>RryAgru1-in2S74Bf
tz!m6u2LD|(5iI_@{y+YBUKsa^Gd-$_q?>bH3w*&4q$IB<S1V%?_J7a3QZfJl

literal 0
HcmV?d00001

diff --git a/React/Modules/RCTTVNavigationEventEmitter.m b/React/Modules/RCTTVNavigationEventEmitter.m
index 7d6774b012ddbe..3ebe46381d1899 100644
--- a/React/Modules/RCTTVNavigationEventEmitter.m
+++ b/React/Modules/RCTTVNavigationEventEmitter.m
@@ -9,7 +9,7 @@
 
 NSString *const RCTTVNavigationEventNotification = @"RCTTVNavigationEventNotification";
 
-static NSString *const TVNavigationEventName = @"onTVNavEvent";
+static NSString *const TVNavigationEventName = @"onHWKeyEvent";
 
 @implementation RCTTVNavigationEventEmitter
 
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
index ffaeb08148cb22..00dee97df81cce 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystNativeJSToJavaParametersTestCase.java
@@ -98,7 +98,7 @@ public void run() {
     mRecordingTestModule = new RecordingTestModule();
     mCatalystInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mRecordingTestModule)
-        .addNativeModule(new AndroidInfoModule())
+        .addNativeModule(new AndroidInfoModule(getContext()))
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
index d753d03f96dec2..4d58d579139d61 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/CatalystUIManagerTestCase.java
@@ -88,7 +88,7 @@ public void run() {
 
     jsModule = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(uiManager)
-        .addNativeModule(new AndroidInfoModule())
+        .addNativeModule(new AndroidInfoModule(getContext()))
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
index 38ed87b5d8c31f..70dd287164bdc1 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ProgressBarTestCase.java
@@ -80,7 +80,7 @@ public void run() {
 
     mInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(mUIManager)
-        .addNativeModule(new AndroidInfoModule())
+        .addNativeModule(new AndroidInfoModule(getContext()))
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
index 11a2328021db36..73412bc21239d3 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/ViewRenderingTestCase.java
@@ -61,7 +61,7 @@ public void run() {
 
     mCatalystInstance = ReactTestHelper.catalystInstanceBuilder(this)
         .addNativeModule(uiManager)
-        .addNativeModule(new AndroidInfoModule())
+        .addNativeModule(new AndroidInfoModule(getContext()))
         .addNativeModule(new DeviceInfoModule(getContext()))
         .addNativeModule(new AppStateModule(getContext()))
         .addNativeModule(new FakeWebSocketModule())
diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
index ecda016133b275..c6a778a6745e55 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -79,7 +79,7 @@ public List<ModuleSpec> getNativeModules(final ReactApplicationContext reactCont
             new Provider<NativeModule>() {
               @Override
               public NativeModule get() {
-                return new AndroidInfoModule();
+                return new AndroidInfoModule(reactContext);
               }
             }),
         ModuleSpec.nativeModuleSpec(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
index 3a8ca14b3ce8c7..bbe9cad4473816 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
@@ -75,11 +75,21 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     mDelegate.onActivityResult(requestCode, resultCode, data);
   }
 
+  @Override
+  public boolean onKeyDown(int keyCode, KeyEvent event) {
+    return mDelegate.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
+  }
+
   @Override
   public boolean onKeyUp(int keyCode, KeyEvent event) {
     return mDelegate.onKeyUp(keyCode, event) || super.onKeyUp(keyCode, event);
   }
 
+  @Override
+  public boolean onKeyLongPress(int keyCode, KeyEvent event) {
+    return mDelegate.onKeyLongPress(keyCode, event) || super.onKeyLongPress(keyCode, event);
+  }
+
   @Override
   public void onBackPressed() {
     if (!mDelegate.onBackPressed()) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
index bee643c9bbc15e..03141fb00b07b2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
@@ -127,6 +127,16 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
   }
 
+  public boolean onKeyDown(int keyCode, KeyEvent event) {
+    if (getReactNativeHost().hasInstance()
+      && getReactNativeHost().getUseDeveloperSupport()
+      && keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) {
+      event.startTracking();
+      return true;
+    }
+    return false;
+  }
+
   public boolean onKeyUp(int keyCode, KeyEvent event) {
     if (getReactNativeHost().hasInstance() && getReactNativeHost().getUseDeveloperSupport()) {
       if (keyCode == KeyEvent.KEYCODE_MENU) {
@@ -143,6 +153,16 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
     return false;
   }
 
+  public boolean onKeyLongPress(int keyCode, KeyEvent event) {
+    if (getReactNativeHost().hasInstance()
+        && getReactNativeHost().getUseDeveloperSupport()
+        && keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) {
+      getReactNativeHost().getReactInstanceManager().showDevOptionsDialog();
+      return true;
+    }
+    return false;
+  }
+
   public boolean onBackPressed() {
     if (getReactNativeHost().hasInstance()) {
       getReactNativeHost().getReactInstanceManager().onBackPressed();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java b/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java
new file mode 100644
index 00000000000000..8c3df938340e47
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react;
+
+import android.view.KeyEvent;
+import android.view.View;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.common.MapBuilder;
+
+import java.util.Map;
+
+/**
+ * Responsible for dispatching events specific for hardware inputs.
+ */
+public class ReactAndroidHWInputDeviceHelper {
+
+  /**
+   * Contains a mapping between handled KeyEvents and the corresponding navigation event
+   * that should be fired when the KeyEvent is received.
+   */
+  private static final Map<Integer, String> KEY_EVENTS_ACTIONS = MapBuilder.of(
+    KeyEvent.KEYCODE_DPAD_CENTER,
+    "select",
+    KeyEvent.KEYCODE_ENTER,
+    "select",
+    KeyEvent.KEYCODE_SPACE,
+    "select",
+    KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE,
+    "playPause",
+    KeyEvent.KEYCODE_MEDIA_REWIND,
+    "rewind",
+    KeyEvent.KEYCODE_MEDIA_FAST_FORWARD,
+    "fastForward"
+  );
+
+  /**
+   * We keep a reference to the last focused view id
+   * so that we can send it as a target for key events
+   * and be able to send a blur event when focus changes.
+   */
+  private int mLastFocusedViewId = View.NO_ID;
+
+  private final ReactRootView mReactRootView;
+
+  ReactAndroidHWInputDeviceHelper(ReactRootView mReactRootView) {
+    this.mReactRootView = mReactRootView;
+  }
+
+  /**
+   * Called from {@link ReactRootView}.
+   * This is the main place the key events are handled.
+   */
+  public void handleKeyEvent(KeyEvent ev) {
+    int eventKeyCode = ev.getKeyCode();
+    int eventKeyAction = ev.getAction();
+    if (eventKeyAction == KeyEvent.ACTION_UP && KEY_EVENTS_ACTIONS.containsKey(eventKeyCode)) {
+      dispatchEvent(KEY_EVENTS_ACTIONS.get(eventKeyCode), mLastFocusedViewId);
+    }
+  }
+
+  /**
+   * Called from {@link ReactRootView} when focused view changes.
+   */
+  public void onFocusChanged(View newFocusedView) {
+    if (mLastFocusedViewId == newFocusedView.getId()) {
+      return;
+    }
+    if (mLastFocusedViewId != View.NO_ID) {
+      dispatchEvent("blur", mLastFocusedViewId);
+    }
+    mLastFocusedViewId = newFocusedView.getId();
+    dispatchEvent("focus", newFocusedView.getId());
+  }
+
+  /**
+   * Called from {@link ReactRootView} when the whole view hierarchy looses focus.
+   */
+  public void clearFocus() {
+    if (mLastFocusedViewId != View.NO_ID) {
+      dispatchEvent("blur", mLastFocusedViewId);
+    }
+    mLastFocusedViewId = View.NO_ID;
+  }
+
+  private void dispatchEvent(String eventType, int targetViewId) {
+    WritableMap event = new WritableNativeMap();
+    event.putString("eventType", eventType);
+    if (targetViewId != View.NO_ID) {
+      event.putInt("tag", targetViewId);
+    }
+    mReactRootView.sendEvent("onHWKeyEvent", event);
+  }
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index 1bed2f5bb3b9bf..5d4a88bc5025c1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -16,6 +16,7 @@
 import android.os.Bundle;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.View;
@@ -84,6 +85,7 @@ public interface ReactRootViewEventListener {
   private boolean mIsAttachedToInstance;
   private boolean mShouldLogContentAppeared;
   private final JSTouchDispatcher mJSTouchDispatcher = new JSTouchDispatcher(this);
+  private final ReactAndroidHWInputDeviceHelper mAndroidHWInputDeviceHelper = new ReactAndroidHWInputDeviceHelper(this);
   private boolean mWasMeasured = false;
   private int mWidthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
   private int mHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
@@ -213,6 +215,47 @@ protected void dispatchDraw(Canvas canvas) {
     }
   }
 
+  @Override
+  public boolean dispatchKeyEvent(KeyEvent ev) {
+    if (mReactInstanceManager == null || !mIsAttachedToInstance ||
+      mReactInstanceManager.getCurrentReactContext() == null) {
+      FLog.w(
+        ReactConstants.TAG,
+        "Unable to handle key event as the catalyst instance has not been attached");
+      return super.dispatchKeyEvent(ev);
+    }
+    mAndroidHWInputDeviceHelper.handleKeyEvent(ev);
+    return super.dispatchKeyEvent(ev);
+  }
+
+  @Override
+  protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {
+    if (mReactInstanceManager == null || !mIsAttachedToInstance ||
+      mReactInstanceManager.getCurrentReactContext() == null) {
+      FLog.w(
+        ReactConstants.TAG,
+        "Unable to handle focus changed event as the catalyst instance has not been attached");
+      super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
+      return;
+    }
+    mAndroidHWInputDeviceHelper.clearFocus();
+    super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
+  }
+
+  @Override
+  public void requestChildFocus(View child, View focused) {
+    if (mReactInstanceManager == null || !mIsAttachedToInstance ||
+      mReactInstanceManager.getCurrentReactContext() == null) {
+      FLog.w(
+        ReactConstants.TAG,
+        "Unable to handle child focus changed event as the catalyst instance has not been attached");
+      super.requestChildFocus(child, focused);
+      return;
+    }
+    mAndroidHWInputDeviceHelper.onFocusChanged(focused);
+    super.requestChildFocus(child, focused);
+  }
+
   private void dispatchJSTouchEvent(MotionEvent event) {
     if (mReactInstanceManager == null || !mIsAttachedToInstance ||
       mReactInstanceManager.getCurrentReactContext() == null) {
@@ -536,6 +579,14 @@ public boolean isFabric() {
   public ReactInstanceManager getReactInstanceManager() {
     return mReactInstanceManager;
   }
+  
+  /* package */ void sendEvent(String eventName, @Nullable WritableMap params) {
+    if (mReactInstanceManager != null) {
+      mReactInstanceManager.getCurrentReactContext()
+        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+        .emit(eventName, params);
+    }
+  }
 
   private class CustomGlobalLayoutListener implements ViewTreeObserver.OnGlobalLayoutListener {
     private final Rect mVisibleViewArea;
@@ -665,13 +716,5 @@ private void emitUpdateDimensionsEvent() {
           .getNativeModule(DeviceInfoModule.class)
           .emitUpdateDimensionsEvent();
     }
-
-    private void sendEvent(String eventName, @Nullable WritableMap params) {
-      if (mReactInstanceManager != null) {
-        mReactInstanceManager.getCurrentReactContext()
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-            .emit(eventName, params);
-      }
-    }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
index 98ca742f716803..1037d4c5ecbdcc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
@@ -7,9 +7,12 @@
 
 package com.facebook.react.modules.systeminfo;
 
+import android.app.UiModeManager;
+import android.content.res.Configuration;
 import android.os.Build;
 
-import com.facebook.react.bridge.BaseJavaModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.module.annotations.ReactModule;
 
 import java.util.HashMap;
@@ -17,14 +20,41 @@
 
 import javax.annotation.Nullable;
 
+import static android.content.Context.UI_MODE_SERVICE;
+
 /**
  * Module that exposes Android Constants to JS.
  */
 @ReactModule(name = "PlatformConstants")
-public class AndroidInfoModule extends BaseJavaModule {
+public class AndroidInfoModule extends ReactContextBaseJavaModule {
 
   private static final String IS_TESTING = "IS_TESTING";
 
+  public AndroidInfoModule(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  /**
+   * See: https://developer.android.com/reference/android/app/UiModeManager.html#getCurrentModeType()
+   */
+  private String uiMode() {
+    UiModeManager uiModeManager = (UiModeManager) getReactApplicationContext().getSystemService(UI_MODE_SERVICE);
+    switch (uiModeManager.getCurrentModeType()) {
+      case Configuration.UI_MODE_TYPE_TELEVISION:
+        return "tv";
+      case Configuration.UI_MODE_TYPE_CAR:
+        return "car";
+      case Configuration.UI_MODE_TYPE_DESK:
+        return "desk";
+      case Configuration.UI_MODE_TYPE_WATCH:
+        return "watch";
+      case Configuration.UI_MODE_TYPE_NORMAL:
+        return "normal";
+      default:
+        return "unknown";
+    }
+  }
+
   @Override
   public String getName() {
     return "PlatformConstants";
@@ -41,6 +71,7 @@ public String getName() {
     constants.put("ServerHost", AndroidInfoHelpers.getServerHost());
     constants.put("isTesting", "true".equals(System.getProperty(IS_TESTING)));
     constants.put("reactNativeVersion", ReactNativeVersion.VERSION);
+    constants.put("uiMode", uiMode());
     return constants;
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
index 0cd8f4ccf58b9c..b4eb587049bd9e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
@@ -56,8 +56,16 @@ public void setAccessible(ReactViewGroup view, boolean accessible) {
     view.setFocusable(accessible);
   }
 
-  @ReactPropGroup(
-    names = {
+  @ReactProp(name = "hasTVPreferredFocus")
+  public void setTVPreferredFocus(ReactViewGroup view, boolean hasTVPreferredFocus) {
+    if (hasTVPreferredFocus) {
+      view.setFocusable(true);
+      view.setFocusableInTouchMode(true);
+      view.requestFocus();
+    }
+  }
+
+  @ReactPropGroup(names = {
       ViewProps.BORDER_RADIUS,
       ViewProps.BORDER_TOP_LEFT_RADIUS,
       ViewProps.BORDER_TOP_RIGHT_RADIUS,

From 48c339ddc73abd25beabcf8083ff6b921a60a1f9 Mon Sep 17 00:00:00 2001
From: David Aurelio <davidaurelio@fb.com>
Date: Tue, 6 Mar 2018 11:01:34 -0800
Subject: [PATCH 174/267] Add `RCTJavaScriptWillStartExecutingNotification`

Summary:
`RCTJavaScriptWillStartLoadingNotification` is being posted when starting the bridge, not when starting to execute JS code.

Here, we add `RCTJavaScriptWillStartExecutingNotification`, and in post it before executing JS with `RCTCxxBridge`.

Reviewed By: fromcelticpark

Differential Revision: D7153659

fbshipit-source-id: 902075308d54a47bef43b6f57edf2e624f621ceb
---
 React/Base/RCTBridge.h          | 8 +++++++-
 React/Base/RCTBridge.m          | 1 +
 React/CxxBridge/RCTCxxBridge.mm | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
index 11d453343e236a..2a7eabe5ce84ba 100644
--- a/React/Base/RCTBridge.h
+++ b/React/Base/RCTBridge.h
@@ -19,10 +19,16 @@
 @class RCTPerformanceLogger;
 
 /**
- * This notification fires when the bridge starts loading the JS bundle.
+ * This notification fires when the bridge initializes.
  */
 RCT_EXTERN NSString *const RCTJavaScriptWillStartLoadingNotification;
 
+
+/**
+ * This notification fires when the bridge starts executing the JS bundle.
+ */
+RCT_EXTERN NSString *const RCTJavaScriptWillStartExecutingNotification;
+
 /**
  * This notification fires when the bridge has finished loading the JS bundle.
  */
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index 7250a0ea3f9bfb..76f2d17a203faf 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -23,6 +23,7 @@
 #import "RCTUtils.h"
 
 NSString *const RCTJavaScriptWillStartLoadingNotification = @"RCTJavaScriptWillStartLoadingNotification";
+NSString *const RCTJavaScriptWillStartExecutingNotification = @"RCTJavaScriptWillStartExecutingNotification";
 NSString *const RCTJavaScriptDidLoadNotification = @"RCTJavaScriptDidLoadNotification";
 NSString *const RCTJavaScriptDidFailToLoadNotification = @"RCTJavaScriptDidFailToLoadNotification";
 NSString *const RCTDidInitializeModuleNotification = @"RCTDidInitializeModuleNotification";
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 50dc3fb8dba18b..7411dcdcc61394 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -1162,6 +1162,9 @@ - (void)executeApplicationScript:(NSData *)script
 {
   [self _tryAndHandleError:^{
     NSString *sourceUrlStr = deriveSourceURL(url);
+    [[NSNotificationCenter defaultCenter]
+      postNotificationName:RCTJavaScriptWillStartExecutingNotification
+      object:self->_parentBridge userInfo:@{@"bridge": self}];
     if (isRAMBundle(script)) {
       [self->_performanceLogger markStartForTag:RCTPLRAMBundleLoad];
       auto ramBundle = std::make_unique<JSIndexedRAMBundle>(sourceUrlStr.UTF8String);

From 2e51fa5f5d4f229329ae457ab1a77ba5bcea0448 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Tue, 6 Mar 2018 12:39:37 -0800
Subject: [PATCH 175/267] iOS: RCTSurface needs to re-register its root view on
 bridge reload

Summary: When reloading JS during development, surface needs to make sure the root view gets re-registered before attempting to remount it. This fixes redbox on JS reload.

Reviewed By: shergin

Differential Revision: D7170416

fbshipit-source-id: c84b999d2cdc35cb9e26feef2a1e1a7ce35cfa70
---
 React/Base/Surface/RCTSurface.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
index 2817cf29aa6418..5bc3de232317d4 100644
--- a/React/Base/Surface/RCTSurface.mm
+++ b/React/Base/Surface/RCTSurface.mm
@@ -209,6 +209,7 @@ - (void)handleBridgeDidLoadJavaScriptNotification:(NSNotification *)notification
   }
 
   if (isRerunNeeded) {
+    [self _registerRootView];
     [self _run];
   }
 }

From e7b83410240e242508918bcef558587c9311cf20 Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Tue, 6 Mar 2018 16:04:41 -0800
Subject: [PATCH 176/267] Add Fabric test for text nodes

Reviewed By: mdvacca

Differential Revision: D7165356

fbshipit-source-id: ab5b019943d0d6f759bdb16ca646e34a2ef79e23
---
 .../react/fabric/FabricUIManager.java         | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index 5184fbebdbde81..2835921e5ebc7d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -70,8 +70,10 @@ public ReactShadowNode createNode(int reactTag,
 
       ReactStylesDiffMap styles = updateProps(node, props);
 
-      mUIViewOperationQueue
-        .enqueueCreateView(rootNode.getThemedContext(), reactTag, viewName, styles);
+      if (!node.isVirtual()) {
+        mUIViewOperationQueue
+          .enqueueCreateView(rootNode.getThemedContext(), reactTag, viewName, styles);
+      }
       return node;
     } catch (Throwable t) {
       handleException(getRootNode(rootTag), t);
@@ -184,12 +186,14 @@ public void appendChild(ReactShadowNode parent, ReactShadowNode child) {
       parent.addChildAt(child, childIndex);
       ViewAtIndex[] viewsToAdd =
         new ViewAtIndex[]{new ViewAtIndex(child.getReactTag(), childIndex)};
-      mUIViewOperationQueue.enqueueManageChildren(
-        parent.getReactTag(),
-        null,
-        viewsToAdd,
-        null
-      );
+      if (!child.isVirtual()) {
+        mUIViewOperationQueue.enqueueManageChildren(
+          parent.getReactTag(),
+          null,
+          viewsToAdd,
+          null
+        );
+      }
     } catch (Throwable t) {
       handleException(parent, t);
     }
@@ -221,6 +225,7 @@ public void completeRoot(int rootTag, List<ReactShadowNode> childList) {
         appendChild(rootNode, child);
       }
 
+      notifyOnBeforeLayoutRecursive(rootNode);
       calculateRootLayout(rootNode);
       applyUpdatesRecursive(rootNode, 0, 0);
       mUIViewOperationQueue
@@ -230,6 +235,16 @@ public void completeRoot(int rootTag, List<ReactShadowNode> childList) {
     }
   }
 
+  private void notifyOnBeforeLayoutRecursive(ReactShadowNode node) {
+    if (!node.hasUpdates()) {
+      return;
+    }
+    for (int i = 0; i < node.getChildCount(); i++) {
+      notifyOnBeforeLayoutRecursive(node.getChildAt(i));
+    }
+    node.onBeforeLayout();
+  }
+
   private void calculateRootLayout(ReactShadowNode cssRoot) {
     cssRoot.calculateLayout();
   }

From 6fc416313c79022317c5ce0fadae535012100573 Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Tue, 6 Mar 2018 16:04:43 -0800
Subject: [PATCH 177/267] Clean up FabricUIManagerViewHierarchyTest

Reviewed By: mdvacca

Differential Revision: D7165823

fbshipit-source-id: e6d2a83bf9e089c67d69de6581d177bdf0d2ec4e
---
 .../main/java/com/facebook/react/fabric/FabricUIManager.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index 2835921e5ebc7d..2fa9557f529337 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -15,6 +15,7 @@
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
+import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.NativeViewHierarchyManager;
 import com.facebook.react.uimanager.ReactRootViewTagGenerator;
 import com.facebook.react.uimanager.ReactShadowNode;
@@ -46,6 +47,7 @@ public class FabricUIManager implements UIManager {
 
   public FabricUIManager(ReactApplicationContext reactContext,
     ViewManagerRegistry viewManagerRegistry) {
+    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext);
     mReactApplicationContext = reactContext;
     mViewManagerRegistry = viewManagerRegistry;
     mUIViewOperationQueue = new UIViewOperationQueue(reactContext, new NativeViewHierarchyManager(viewManagerRegistry), 0);

From d52569c4a1b6bd19792e4bda23e3a8c3ac4ad8df Mon Sep 17 00:00:00 2001
From: samsafay <samsafay@gmail.com>
Date: Tue, 6 Mar 2018 17:37:27 -0800
Subject: [PATCH 178/267] check for GET and Head in send request

Summary:
React Native had an underlying problem connecting to Firestore (Google's latest database) from Android devices. You can follow the issue [here](https://github.com/firebase/firebase-js-sdk/issues/283).
The main problem was in NetworkingModule.java. Please refer to section 3 of 4.5.6 in whatwg.org's guideline https://xhr.spec.whatwg.org/#dom-xmlhttprequest-send

In this [video](https://www.youtube.com/watch?v=tILagf46ys8), I am showing how the react native behaved before adding the new fix and how it worked after the new fix added.  The new fix starts at 50 seconds.

[ANDROID] [BUGFIX] [FIRESTORE][XMLHttpRequest][ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java] - Fixes the connection to Firestore by following whatwg.org's XMLHttpRequest send() method
Closes https://github.com/facebook/react-native/pull/17940

Differential Revision: D7173468

Pulled By: hramos

fbshipit-source-id: 354d36f03d611889073553b93a7c43c6d4363ff3
---
 .../com/facebook/react/modules/network/NetworkingModule.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
index cc9c6349053047..5534eb6449cf55 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
@@ -348,7 +348,7 @@ public void onProgress(long bytesWritten, long contentLength, boolean done) {
     }
 
     RequestBody requestBody;
-    if (data == null) {
+    if (data == null || method.toLowerCase().equals("get") || method.toLowerCase().equals("head")) {
       requestBody = RequestBodyUtil.getEmptyBody(method);
     } else if (handler != null) {
       requestBody = handler.toRequestBody(data, contentType);

From d7b5b2e9e4545bd6da2f5dd5002d884bcc0556ee Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Tue, 6 Mar 2018 17:49:16 -0800
Subject: [PATCH 179/267] Allow Inspector to handle 2 renderers

Summary: To avoid crashing when there are 2 different renderers, let the Inspector be a bit lenient.

Reviewed By: yungsters

Differential Revision: D7175338

fbshipit-source-id: ee5f86252f090361e42b6e2a93ae56c4c83c8c53
---
 Libraries/Inspector/Inspector.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/Libraries/Inspector/Inspector.js b/Libraries/Inspector/Inspector.js
index 90e30b346a9461..963b616fca3bcb 100644
--- a/Libraries/Inspector/Inspector.js
+++ b/Libraries/Inspector/Inspector.js
@@ -32,15 +32,26 @@ export type ReactRenderer = {
 };
 
 const hook = window.__REACT_DEVTOOLS_GLOBAL_HOOK__;
-const renderer: ReactRenderer = findRenderer();
+const renderers = findRenderers();
+
 // required for devtools to be able to edit react native styles
 hook.resolveRNStyle = require('flattenStyle');
 
-function findRenderer(): ReactRenderer {
-  const renderers = hook._renderers;
-  const keys = Object.keys(renderers);
-  invariant(keys.length === 1, 'Expected to find exactly one React Native renderer on DevTools hook.');
-  return renderers[keys[0]];
+function findRenderers(): $ReadOnlyArray<ReactRenderer> {
+  const allRenderers = Object.keys(hook._renderers).map(key => hook._renderers[key]);
+  invariant(allRenderers.length >= 1, 'Expected to find at least one React Native renderer on DevTools hook.');
+  return allRenderers;
+}
+
+function getInspectorDataForViewTag(touchedViewTag: number) {
+  for (let i = 0; i < renderers.length; i++) {
+    const renderer = renderers[i];
+    const inspectorData = renderer.getInspectorDataForViewTag(touchedViewTag);
+    if (inspectorData.hierarchy.length > 0) {
+      return inspectorData;
+    }
+  }
+  throw new Error('Expected to find at least one React renderer.');
 }
 
 class Inspector extends React.Component<{
@@ -170,7 +181,7 @@ class Inspector extends React.Component<{
       props,
       selection,
       source,
-    } = renderer.getInspectorDataForViewTag(touchedViewTag);
+    } = getInspectorDataForViewTag(touchedViewTag);
 
     if (this.state.devtoolsAgent) {
       // Skip host leafs

From c129457d3a6622d7c28e8b27829ffc2b0a03c5eb Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Tue, 6 Mar 2018 18:45:36 -0800
Subject: [PATCH 180/267] Typing ViewProp, ImageProp

Summary:
Tightening these types.

We can't type TextProp the same way yet because of something fishy in Flow:

https://flow.org/try/#0KYDwDg9gTgLgBDAnmYcAqoYGUkBtUC8cA3gD4BQccAZhAHYwBiAhgLYCWuiAXHAM4wo7OgHMANJRr1s7AF7BedAK6sARsCgTSAXwDc5cqEiwEyVIwAiWRtJyJ8cImUm0GLDl14ChorXoNG0PBIKOiYdvgAClAQYI5wACQASsDMACYA8nRcADwJWAAWzCg5GCDYeMAAfFW6cAD09XAprBAAbqjJqZnZiHDMdGkIBagaMVBwIhDAfP0A7syIBgDG9AJwllgRChtWNgzb8cQu0u6cPHAA5LQQlxL+5Kt062UV9sAAasxQvK-b0bF4pttrogA

Reviewed By: olegbl

Differential Revision: D7165134

fbshipit-source-id: 2fd3de2af8bdc53231d59de71def1e6a7221aff7
---
 Libraries/StyleSheet/StyleSheetTypes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index 0964a9446dbb3b..96a8e39cf02306 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -241,9 +241,9 @@ export type StyleProp<+T> =
 export type StyleObj = StyleProp<$Shape<Style>>;
 export type StyleValue = StyleObj;
 
-export type ViewStyleProp = StyleObj;
+export type ViewStyleProp = StyleProp<$ReadOnly<$Shape<ViewStyle>>>;
 export type TextStyleProp = StyleObj;
-export type ImageStyleProp = StyleObj;
+export type ImageStyleProp = StyleProp<$ReadOnly<$Shape<ImageStyle>>>;
 
 export type Styles = {
   +[key: string]: $Shape<Style>,

From 321ba067a8323c80262e51c94a931199d5ff5cd7 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Tue, 6 Mar 2018 23:21:55 -0800
Subject: [PATCH 181/267] Type TextStyleProp

Reviewed By: yungsters

Differential Revision: D7176472

fbshipit-source-id: 35f499bdac6c089d5f45884f6f11ea539c8b7085
---
 Libraries/StyleSheet/StyleSheetTypes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index 96a8e39cf02306..93090e399d0728 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -242,7 +242,7 @@ export type StyleObj = StyleProp<$Shape<Style>>;
 export type StyleValue = StyleObj;
 
 export type ViewStyleProp = StyleProp<$ReadOnly<$Shape<ViewStyle>>>;
-export type TextStyleProp = StyleObj;
+export type TextStyleProp = StyleProp<$ReadOnly<$Shape<TextStyle>>>;
 export type ImageStyleProp = StyleProp<$ReadOnly<$Shape<ImageStyle>>>;
 
 export type Styles = {

From 135637ce244e3f6626d6ecf22c1ff771cac97003 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Tue, 6 Mar 2018 23:21:57 -0800
Subject: [PATCH 182/267] Merging tests for flattenStyle

Reviewed By: yungsters

Differential Revision: D7176652

fbshipit-source-id: 25b6f2e4f8397ba6f07b2913775b91af90b45750
---
 .../StyleSheet/__tests__/flattenStyle-test.js | 136 ++++++++++++++++--
 1 file changed, 121 insertions(+), 15 deletions(-)

diff --git a/Libraries/StyleSheet/__tests__/flattenStyle-test.js b/Libraries/StyleSheet/__tests__/flattenStyle-test.js
index 6613944ed9664a..2f0fdcc0fb0ab5 100644
--- a/Libraries/StyleSheet/__tests__/flattenStyle-test.js
+++ b/Libraries/StyleSheet/__tests__/flattenStyle-test.js
@@ -8,30 +8,48 @@
  */
 'use strict';
 
-var flattenStyle = require('flattenStyle');
+const StyleSheet = require('StyleSheet');
+const StyleSheetValidation = require('StyleSheetValidation');
+const flattenStyle = require('flattenStyle');
 
-describe('flattenStyle', () => {
+function getFixture() {
+  StyleSheetValidation.addValidStylePropTypes({
+    styleA: () => {},
+    styleB: () => {},
+  });
+
+  return StyleSheet.create({
+    elementA: {
+      styleA: 'moduleA/elementA/styleA',
+      styleB: 'moduleA/elementA/styleB',
+    },
+    elementB: {
+      styleB: 'moduleA/elementB/styleB',
+    },
+  });
+}
 
+describe('flattenStyle', () => {
   it('should merge style objects', () => {
-    var style1 = {width: 10};
-    var style2 = {height: 20};
-    var flatStyle = flattenStyle([style1, style2]);
+    const style1 = {width: 10};
+    const style2 = {height: 20};
+    const flatStyle = flattenStyle([style1, style2]);
     expect(flatStyle.width).toBe(10);
     expect(flatStyle.height).toBe(20);
   });
 
   it('should override style properties', () => {
-    var style1 = {backgroundColor: '#000', width: 10};
-    var style2 = {backgroundColor: '#023c69', width: null};
-    var flatStyle = flattenStyle([style1, style2]);
+    const style1 = {backgroundColor: '#000', width: 10};
+    const style2 = {backgroundColor: '#023c69', width: null};
+    const flatStyle = flattenStyle([style1, style2]);
     expect(flatStyle.backgroundColor).toBe('#023c69');
     expect(flatStyle.width).toBe(null);
   });
 
   it('should overwrite properties with `undefined`', () => {
-    var style1 = {backgroundColor: '#000'};
-    var style2 = {backgroundColor: undefined};
-    var flatStyle = flattenStyle([style1, style2]);
+    const style1 = {backgroundColor: '#000'};
+    const style2 = {backgroundColor: undefined};
+    const flatStyle = flattenStyle([style1, style2]);
     expect(flatStyle.backgroundColor).toBe(undefined);
   });
 
@@ -40,11 +58,99 @@ describe('flattenStyle', () => {
   });
 
   it('should recursively flatten arrays', () => {
-    var style1 = {width: 10};
-    var style2 = {height: 20};
-    var style3 = {width: 30};
-    var flatStyle = flattenStyle([null, [], [style1, style2], style3]);
+    const style1 = {width: 10};
+    const style2 = {height: 20};
+    const style3 = {width: 30};
+    const flatStyle = flattenStyle([null, [], [style1, style2], style3]);
     expect(flatStyle.width).toBe(30);
     expect(flatStyle.height).toBe(20);
   });
+
+  it('should not allocate an object when there is no style', () => {
+    const nullStyle = flattenStyle(null);
+    const nullStyleAgain = flattenStyle(null);
+
+    expect(nullStyle).toBe(nullStyleAgain);
+    expect(nullStyle).toBe(undefined);
+  });
+
+  it('should not allocate an object when there is a style', () => {
+    const style = {a: 'b'};
+    const nullStyle = flattenStyle(style);
+
+    expect(nullStyle).toBe(style);
+  });
+
+  it('should not allocate an object when there is a single class', () => {
+    const fixture = getFixture();
+    var singleStyle = flattenStyle(fixture.elementA);
+    var singleStyleAgain = flattenStyle(fixture.elementA);
+
+    expect(singleStyle).toBe(singleStyleAgain);
+    expect(singleStyle).toEqual({
+      styleA: 'moduleA/elementA/styleA',
+      styleB: 'moduleA/elementA/styleB',
+    });
+  });
+
+  it('should merge single class and style properly', () => {
+    const fixture = getFixture();
+    var style = {styleA: 'overrideA', styleC: 'overrideC'};
+    var arrayStyle = flattenStyle([fixture.elementA, style]);
+
+    expect(arrayStyle).toEqual({
+      styleA: 'overrideA',
+      styleB: 'moduleA/elementA/styleB',
+      styleC: 'overrideC',
+    });
+  });
+
+  it('should merge multiple classes', () => {
+    const fixture = getFixture();
+    var AthenB = flattenStyle([fixture.elementA, fixture.elementB]);
+    var BthenA = flattenStyle([fixture.elementB, fixture.elementA]);
+
+    expect(AthenB).toEqual({
+      styleA: 'moduleA/elementA/styleA',
+      styleB: 'moduleA/elementB/styleB',
+    });
+    expect(BthenA).toEqual({
+      styleA: 'moduleA/elementA/styleA',
+      styleB: 'moduleA/elementA/styleB',
+    });
+  });
+
+  it('should merge multiple classes with style', () => {
+    const fixture = getFixture();
+    var style = {styleA: 'overrideA'};
+    var AthenB = flattenStyle([fixture.elementA, fixture.elementB, style]);
+    var BthenA = flattenStyle([fixture.elementB, fixture.elementA, style]);
+
+    expect(AthenB).toEqual({
+      styleA: 'overrideA',
+      styleB: 'moduleA/elementB/styleB',
+    });
+    expect(BthenA).toEqual({
+      styleA: 'overrideA',
+      styleB: 'moduleA/elementA/styleB',
+    });
+  });
+
+  it('should flatten recursively', () => {
+    const fixture = getFixture();
+    var style = [{styleA: 'newA', styleB: 'newB'}, {styleA: 'newA2'}];
+    var AthenB = flattenStyle([fixture.elementA, fixture.elementB, style]);
+
+    expect(AthenB).toEqual({
+      styleA: 'newA2',
+      styleB: 'newB',
+    });
+  });
+
+  it('should ignore invalid class names', () => {
+    var invalid = flattenStyle(1234, null);
+
+    expect(invalid).toEqual({});
+    // Invalid class name 1234 skipping ...
+  });
 });

From b58e377961ddd278bfa36df0e15953f976875de6 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Tue, 6 Mar 2018 23:21:59 -0800
Subject: [PATCH 183/267] Remove Unused Exports from StyleSheetTypes

Summary: These types were barely used and unnecessary.

Reviewed By: yungsters

Differential Revision: D7177287

fbshipit-source-id: 63cb6d3aae4889a92b2c23f0df864b5657e6e1ee
---
 Libraries/StyleSheet/StyleSheet.js      |  9 ++++-----
 Libraries/StyleSheet/StyleSheetTypes.js | 22 +++++++---------------
 Libraries/StyleSheet/flattenStyle.js    |  4 ++--
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index 48f4418b8ed214..bb4e57d2c9c1c6 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -20,14 +20,13 @@ import type {
   StyleSheetStyle as _StyleSheetStyle,
   Styles as _Styles,
   StyleSheet as _StyleSheet,
-  StyleValue as _StyleValue,
   StyleObj,
+  LayoutStyle
 } from 'StyleSheetTypes';
 
 export type StyleProp = StyleObj;
 export type Styles = _Styles;
 export type StyleSheet<S> = _StyleSheet<S>;
-export type StyleValue = _StyleValue;
 export type StyleSheetStyle = _StyleSheetStyle;
 
 let hairlineWidth = PixelRatio.roundToNearestPixel(0.4);
@@ -35,14 +34,14 @@ if (hairlineWidth === 0) {
   hairlineWidth = 1 / PixelRatio.get();
 }
 
-const absoluteFillObject = {
-  position: ('absolute': 'absolute'),
+const absoluteFillObject: LayoutStyle = {
+  position: 'absolute',
   left: 0,
   right: 0,
   top: 0,
   bottom: 0,
 };
-const absoluteFill: typeof absoluteFillObject =
+const absoluteFill: StyleSheetStyle =
   ReactNativePropRegistry.register(absoluteFillObject); // This also freezes it
 
 /**
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index 93090e399d0728..f23fc1f2942782 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -220,7 +220,7 @@ export type Style = {
   +overlayColor?: string,
 };
 
-export type StyleProp<+T> =
+type GenericStyleProp<+T> =
   | null
   | void
   | T
@@ -228,26 +228,18 @@ export type StyleProp<+T> =
   | number
   | false
   | ''
-  | $ReadOnlyArray<StyleProp<T>>;
+  | $ReadOnlyArray<GenericStyleProp<T>>;
 
-// export type ViewStyleProp = StyleProp<$Shape<ViewStyle<DimensionValue>>>;
-// export type TextStyleProp = StyleProp<
-//   $Shape<TextStyle<DimensionValue, ColorValue>>,
-// >;
-// export type ImageStyleProp = StyleProp<
-//   $Shape<ImageStyle<DimensionValue, ColorValue>>,
-// >;
+export type StyleObj = GenericStyleProp<$Shape<Style>>;
 
-export type StyleObj = StyleProp<$Shape<Style>>;
-export type StyleValue = StyleObj;
-
-export type ViewStyleProp = StyleProp<$ReadOnly<$Shape<ViewStyle>>>;
-export type TextStyleProp = StyleProp<$ReadOnly<$Shape<TextStyle>>>;
-export type ImageStyleProp = StyleProp<$ReadOnly<$Shape<ImageStyle>>>;
+export type ViewStyleProp = GenericStyleProp<$ReadOnly<$Shape<ViewStyle>>>;
+export type TextStyleProp = GenericStyleProp<$ReadOnly<$Shape<TextStyle>>>;
+export type ImageStyleProp = GenericStyleProp<$ReadOnly<$Shape<ImageStyle>>>;
 
 export type Styles = {
   +[key: string]: $Shape<Style>,
 };
+
 export type StyleSheet<+S: Styles> = $ObjMap<S, (Object) => StyleSheetStyle>;
 
 /*
diff --git a/Libraries/StyleSheet/flattenStyle.js b/Libraries/StyleSheet/flattenStyle.js
index 362d351d8ccb70..204d03c1dc5af2 100644
--- a/Libraries/StyleSheet/flattenStyle.js
+++ b/Libraries/StyleSheet/flattenStyle.js
@@ -11,7 +11,7 @@
 
 var ReactNativePropRegistry;
 
-import type { StyleProp, Style } from 'StyleSheetTypes';
+import type { StyleObj, Style } from 'StyleSheetTypes';
 
 function getStyle(style) {
   if (ReactNativePropRegistry === undefined) {
@@ -23,7 +23,7 @@ function getStyle(style) {
   return style;
 }
 
-function flattenStyle(style: ?StyleProp<Style>): ?Style {
+function flattenStyle(style: ?StyleObj): ?Style {
   if (style == null) {
     return undefined;
   }

From ec884890b1f40da42e84202e082b4cef2506bbfc Mon Sep 17 00:00:00 2001
From: Eric Rozell <erozell@outlook.com>
Date: Wed, 7 Mar 2018 08:53:55 -0800
Subject: [PATCH 184/267] Fixing bugs in link and unlink

Summary:
Android uses the name of the package, not the config, for the `isInstalled` check. Sending both parameters to `isInstalled` so we have a consistent API.

<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.

Help us understand your motivation by explaining why you decided to make this change.

You can learn more about contributing to React Native here: http://facebook.github.io/react-native/docs/contributing.html

Happy contributing!

-->

A bug was uncovered in the react-native link command where Android would not unlink because the wrong parameters were being sent to `isInstalled`.

Successfully linked and unlinked `react-native-fs` on Windows and Mac. Jest tests pass.

<!--
Help reviewers and the release process by writing your own release notes

**INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

  CATEGORY
[----------]        TYPE
[ CLI      ]   [-------------]      LOCATION
[ DOCS     ]   [ BREAKING    ]   [-------------]
[ GENERAL  ]   [ BUGFIX      ]   [-{Component}-]
[ INTERNAL ]   [ ENHANCEMENT ]   [ {File}      ]
[ IOS      ]   [ FEATURE     ]   [ {Directory} ]   |-----------|
[ ANDROID  ]   [ MINOR       ]   [ {Framework} ] - | {Message} |
[----------]   [-------------]   [-------------]   |-----------|

[CATEGORY] [TYPE] [LOCATION] - MESSAGE

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->

[CLI][BUGFIX][local-cli/link/link.js] - Fix issue with `isInstalled` check for Android
[CLI][BUGFIX][local-cli/link/unlink.js] - Fix issue with `isInstalled` check for Android
[CLI][BUGFIX][local-cli/link/ios/common/unregisterNativeModule.js] - Fix references to unregister implementations.
Closes https://github.com/facebook/react-native/pull/18207

Differential Revision: D7180885

Pulled By: hramos

fbshipit-source-id: 5f479cd9d7b1ebd8626b461e9dc1f22988e2c61f
---
 local-cli/link/ios/common/isInstalled.js            | 4 ++--
 local-cli/link/ios/common/unregisterNativeModule.js | 4 ++--
 local-cli/link/link.js                              | 2 +-
 local-cli/link/unlink.js                            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/local-cli/link/ios/common/isInstalled.js b/local-cli/link/ios/common/isInstalled.js
index a7a5f2d07d192e..69bcd8bdf32d88 100644
--- a/local-cli/link/ios/common/isInstalled.js
+++ b/local-cli/link/ios/common/isInstalled.js
@@ -1,6 +1,6 @@
 const isInstalledIOS = require('../isInstalled');
 const isInstalledPods = require('../../pods/isInstalled');
 
-module.exports = function isInstalled(config, name) {
-  return isInstalledIOS(config, name) || isInstalledPods(config, name);
+module.exports = function isInstalled(projectConfig, name, dependencyConfig) {
+  return isInstalledIOS(projectConfig, dependencyConfig) || isInstalledPods(projectConfig, dependencyConfig);
 };
diff --git a/local-cli/link/ios/common/unregisterNativeModule.js b/local-cli/link/ios/common/unregisterNativeModule.js
index b42882623fbe34..e6d34ada4cce95 100644
--- a/local-cli/link/ios/common/unregisterNativeModule.js
+++ b/local-cli/link/ios/common/unregisterNativeModule.js
@@ -1,8 +1,8 @@
 const compact = require('lodash').compact;
 const isInstalledIOS = require('../isInstalled');
 const isInstalledPods = require('../../pods/isInstalled');
-const unregisterDependencyIOS = require('../registerNativeModule');
-const unregisterDependencyPods = require('../../pods/registerNativeModule');
+const unregisterDependencyIOS = require('../unregisterNativeModule');
+const unregisterDependencyPods = require('../../pods/unregisterNativeModule');
 
 module.exports = function unregisterNativeModule(
   name,
diff --git a/local-cli/link/link.js b/local-cli/link/link.js
index 7799b5c171f6e8..b77c135f9f470f 100644
--- a/local-cli/link/link.js
+++ b/local-cli/link/link.js
@@ -49,7 +49,7 @@ const linkDependency = (platforms, project, dependency) => {
         return null;
       }
 
-      const isInstalled = linkConfig.isInstalled(project[platform], dependency.config[platform]);
+      const isInstalled = linkConfig.isInstalled(project[platform], dependency.name, dependency.config[platform]);
 
       if (isInstalled) {
         log.info(chalk.grey(`Platform '${platform}' module ${dependency.name} is already linked`));
diff --git a/local-cli/link/unlink.js b/local-cli/link/unlink.js
index 1b504e3ed4d01a..91c89ab7ec0844 100644
--- a/local-cli/link/unlink.js
+++ b/local-cli/link/unlink.js
@@ -32,7 +32,7 @@ const unlinkDependency = (platforms, project, dependency, packageName, otherDepe
         return;
       }
 
-      const isInstalled = linkConfig.isInstalled(project[platform], dependency[platform]);
+      const isInstalled = linkConfig.isInstalled(project[platform], packageName, dependency[platform]);
 
       if (!isInstalled) {
         log.info(`Platform '${platform}' module ${packageName} is not installed`);

From cade29797183b8f67c538f9aa343728c374c9986 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Wed, 7 Mar 2018 10:20:52 -0800
Subject: [PATCH 185/267] iOS Surface: properly reset some internal states when
 JS reloads

Summary:
There are a few important states that didn't reset correctly when reloading JS:
* the RCTSurfaceStage was stuck at all bits enabled, hence no further stage change happened (even though the state "reset" to `RCTSurfaceStageBridgeDidLoad`)
* the RCTSurfaceView didn't get recreated, because the _view ivar was never cleared
* similarly, the _touchHandler ivar attached to the _view was never re-setup --> all touches after JS reload were dropped before this diff

Reviewed By: mmmulani

Differential Revision: D7178038

fbshipit-source-id: ba49bc205f8bf43842471b7ab748cef8549ea212
---
 React/Base/Surface/RCTSurface.mm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
index 5bc3de232317d4..30110ceae42e71 100644
--- a/React/Base/Surface/RCTSurface.mm
+++ b/React/Base/Surface/RCTSurface.mm
@@ -186,6 +186,10 @@ - (void)handleBridgeWillLoadJavaScriptNotification:(NSNotification *)notificatio
 {
   RCTAssertMainQueue();
 
+  // Reset states because the bridge is reloading. This is similar to initialization phase.
+  _stage = RCTSurfaceStageSurfaceDidInitialize;
+  _view = nil;
+  _touchHandler = nil;
   [self _setStage:RCTSurfaceStageBridgeDidLoad];
 }
 

From ee26d9bcb0719246efa51af404aa7805404675cc Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Wed, 7 Mar 2018 12:03:26 -0800
Subject: [PATCH 186/267] Make StyleSheet.create type private

Summary:
This type is being used in many places where a much simpler type is often better. In a real pinch this type can still be accessed as so:

```
function returnsStyleSheet(
): $Call<typeof StyleSheet.create, *> {
  return StyleSheet.create({
    root: {
      background: 'white',
    }
  })
}

returnsStyleSheet().foo // foo doesn't exist
returnsStyleSheet().root // okay
```

Reviewed By: yungsters

Differential Revision: D7178524

fbshipit-source-id: 3c0ed03486ca00f1e287261e402fd47807f1fc3d
---
 Libraries/StyleSheet/StyleSheet.js      |  3 +--
 Libraries/StyleSheet/StyleSheetTypes.js |  2 --
 RNTester/js/RNTesterExampleList.js      | 12 +++---------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index bb4e57d2c9c1c6..8e51e73840f54b 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -19,15 +19,14 @@ const flatten = require('flattenStyle');
 import type {
   StyleSheetStyle as _StyleSheetStyle,
   Styles as _Styles,
-  StyleSheet as _StyleSheet,
   StyleObj,
   LayoutStyle
 } from 'StyleSheetTypes';
 
 export type StyleProp = StyleObj;
 export type Styles = _Styles;
-export type StyleSheet<S> = _StyleSheet<S>;
 export type StyleSheetStyle = _StyleSheetStyle;
+type StyleSheet<+S: Styles> = $ObjMap<S, (Object) => StyleSheetStyle>;
 
 let hairlineWidth = PixelRatio.roundToNearestPixel(0.4);
 if (hairlineWidth === 0) {
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index f23fc1f2942782..c51787c61f0f4e 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -240,8 +240,6 @@ export type Styles = {
   +[key: string]: $Shape<Style>,
 };
 
-export type StyleSheet<+S: Styles> = $ObjMap<S, (Object) => StyleSheetStyle>;
-
 /*
 Utility type get non-nullable types for specific style keys.
 Useful when a component requires values for certain Style Keys.
diff --git a/RNTester/js/RNTesterExampleList.js b/RNTester/js/RNTesterExampleList.js
index 072a31f3d1b650..1217fd064d5c50 100644
--- a/RNTester/js/RNTesterExampleList.js
+++ b/RNTester/js/RNTesterExampleList.js
@@ -20,15 +20,9 @@ const RNTesterActions = require('./RNTesterActions');
 const RNTesterStatePersister = require('./RNTesterStatePersister');
 const View = require('View');
 
-import type {
-  RNTesterExample,
-} from './RNTesterList.ios';
-import type {
-  PassProps,
-} from './RNTesterStatePersister';
-import type {
-  StyleObj,
-} from 'StyleSheetTypes';
+import type {RNTesterExample} from './RNTesterList.ios';
+import type {PassProps} from './RNTesterStatePersister';
+import type {StyleObj} from 'StyleSheetTypes';
 
 type Props = {
   onNavigate: Function,

From 49ffc9fada4266c3ba9751c5e8e4c475174c7e6c Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Wed, 7 Mar 2018 12:03:28 -0800
Subject: [PATCH 187/267] Rename StyleProp to DangerouslyImpreciseStyleProp

Summary:
We want to rename these types to be more clear what they are actually for. I did this with a find and replace:

```
import type {StyleProp} from 'StyleSheet';
```

to

```
import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
```

and `StyleProp` to `DangerouslyImpreciseStyleProp`.

Reviewed By: yungsters

Differential Revision: D7178609

fbshipit-source-id: 32952e0c3a8b6aceef306f1f3c18844feb18f1aa
---
 Libraries/StyleSheet/StyleSheet.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index 8e51e73840f54b..00a69d2025ea1d 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -23,7 +23,7 @@ import type {
   LayoutStyle
 } from 'StyleSheetTypes';
 
-export type StyleProp = StyleObj;
+export type DangerouslyImpreciseStyleProp = StyleObj;
 export type Styles = _Styles;
 export type StyleSheetStyle = _StyleSheetStyle;
 type StyleSheet<+S: Styles> = $ObjMap<S, (Object) => StyleSheetStyle>;
@@ -136,7 +136,7 @@ module.exports = {
    * array, saving allocations and maintaining reference equality for
    * PureComponent checks.
    */
-  compose(style1: ?StyleProp, style2: ?StyleProp): ?StyleProp {
+  compose(style1: ?DangerouslyImpreciseStyleProp, style2: ?DangerouslyImpreciseStyleProp): ?DangerouslyImpreciseStyleProp {
     if (style1 != null && style2 != null) {
       return [style1, style2];
     } else {

From a3c07c95effd891c2bd5f3257efe5b24d85862be Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Wed, 7 Mar 2018 13:12:51 -0800
Subject: [PATCH 188/267] StyleObj -> DangerouslyImpreciseStyleProp

Summary:
Migrating everything to import from StyleSheet instead of StyleSheetTypes.

Search and replaced
```
import type {StyleObj} from 'StyleSheetTypes';
```
to
```
import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
```

and then replacing `StyleObj` with `DangerouslyImpreciseStyleProp` and fixing up the remaining flow errors by hand.

Reviewed By: yungsters

Differential Revision: D7184077

fbshipit-source-id: b8dabb9d48038b5a997ab715687300bad57aa9d4
---
 Libraries/Components/TabBarIOS/TabBarIOS.ios.js | 4 ++--
 Libraries/Inspector/ElementProperties.js        | 4 ++--
 Libraries/Lists/FlatList.js                     | 4 ++--
 Libraries/Lists/VirtualizedList.js              | 6 +++---
 Libraries/StyleSheet/StyleSheet.js              | 4 ++--
 Libraries/StyleSheet/StyleSheetTypes.js         | 2 +-
 Libraries/StyleSheet/flattenStyle.js            | 5 +++--
 RNTester/js/RNTesterExampleList.js              | 6 +++---
 RNTester/js/ScrollViewExample.js                | 4 ++--
 9 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
index bfd180823347ba..9d1b63567ba826 100644
--- a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
@@ -18,11 +18,11 @@ const ViewPropTypes = require('ViewPropTypes');
 
 const requireNativeComponent = require('requireNativeComponent');
 
-import type {StyleObj} from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 import type {ViewProps} from 'ViewPropTypes';
 
 class TabBarIOS extends React.Component<ViewProps & {
-  style?: StyleObj,
+  style?: DangerouslyImpreciseStyleProp,
   unselectedTintColor?: string,
   tintColor?: string,
   unselectedItemTintColor?: string,
diff --git a/Libraries/Inspector/ElementProperties.js b/Libraries/Inspector/ElementProperties.js
index f7937c5f7edb2a..460e1c2df81059 100644
--- a/Libraries/Inspector/ElementProperties.js
+++ b/Libraries/Inspector/ElementProperties.js
@@ -23,11 +23,11 @@ const flattenStyle = require('flattenStyle');
 const mapWithSeparator = require('mapWithSeparator');
 const openFileInEditor = require('openFileInEditor');
 
-import type {StyleObj} from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 
 class ElementProperties extends React.Component<{
   hierarchy: Array<$FlowFixMe>,
-  style?: StyleObj,
+  style?: DangerouslyImpreciseStyleProp,
   source?: {
     fileName?: string,
     lineNumber?: number,
diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
index e5b4a8310330c7..13b87ed995b756 100644
--- a/Libraries/Lists/FlatList.js
+++ b/Libraries/Lists/FlatList.js
@@ -18,7 +18,7 @@ const ListView = require('ListView');
 
 const invariant = require('fbjs/lib/invariant');
 
-import type {StyleObj} from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 import type {
   ViewabilityConfig,
   ViewToken,
@@ -96,7 +96,7 @@ type OptionalProps<ItemT> = {
   /**
    * Optional custom style for multi-item rows generated when numColumns > 1.
    */
-  columnWrapperStyle?: StyleObj,
+  columnWrapperStyle?: DangerouslyImpreciseStyleProp,
   /**
    * A marker property for telling the list to re-render (since it implements `PureComponent`). If
    * any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index e6acee9e77c271..90e978cf8e3cca 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -32,7 +32,7 @@ const warning = require('fbjs/lib/warning');
 
 const {computeWindowedRenderLimits} = require('VirtualizeUtils');
 
-import type {StyleObj} from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 import type {
   ViewabilityConfig,
   ViewToken,
@@ -644,7 +644,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     stickyIndicesFromProps: Set<number>,
     first: number,
     last: number,
-    inversionStyle: ?StyleObj,
+    inversionStyle: ?DangerouslyImpreciseStyleProp,
   ) {
     const {
       CellRendererComponent,
@@ -1545,7 +1545,7 @@ class CellRenderer extends React.Component<
     fillRateHelper: FillRateHelper,
     horizontal: ?boolean,
     index: number,
-    inversionStyle: ?StyleObj,
+    inversionStyle: ?DangerouslyImpreciseStyleProp,
     item: Item,
     onLayout: (event: Object) => void, // This is extracted by ScrollViewStickyHeader
     onUnmount: (cellKey: string) => void,
diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index 00a69d2025ea1d..7f5888d8f5fde8 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -19,11 +19,11 @@ const flatten = require('flattenStyle');
 import type {
   StyleSheetStyle as _StyleSheetStyle,
   Styles as _Styles,
-  StyleObj,
+  ____StyleObj_Internal,
   LayoutStyle
 } from 'StyleSheetTypes';
 
-export type DangerouslyImpreciseStyleProp = StyleObj;
+export type DangerouslyImpreciseStyleProp = ____StyleObj_Internal;
 export type Styles = _Styles;
 export type StyleSheetStyle = _StyleSheetStyle;
 type StyleSheet<+S: Styles> = $ObjMap<S, (Object) => StyleSheetStyle>;
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index c51787c61f0f4e..c8df91073331b3 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -230,7 +230,7 @@ type GenericStyleProp<+T> =
   | ''
   | $ReadOnlyArray<GenericStyleProp<T>>;
 
-export type StyleObj = GenericStyleProp<$Shape<Style>>;
+export type ____StyleObj_Internal = GenericStyleProp<$Shape<Style>>;
 
 export type ViewStyleProp = GenericStyleProp<$ReadOnly<$Shape<ViewStyle>>>;
 export type TextStyleProp = GenericStyleProp<$ReadOnly<$Shape<TextStyle>>>;
diff --git a/Libraries/StyleSheet/flattenStyle.js b/Libraries/StyleSheet/flattenStyle.js
index 204d03c1dc5af2..43122e0746957c 100644
--- a/Libraries/StyleSheet/flattenStyle.js
+++ b/Libraries/StyleSheet/flattenStyle.js
@@ -11,7 +11,8 @@
 
 var ReactNativePropRegistry;
 
-import type { StyleObj, Style } from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
+import type { Style } from 'StyleSheetTypes';
 
 function getStyle(style) {
   if (ReactNativePropRegistry === undefined) {
@@ -23,7 +24,7 @@ function getStyle(style) {
   return style;
 }
 
-function flattenStyle(style: ?StyleObj): ?Style {
+function flattenStyle(style: ?DangerouslyImpreciseStyleProp): ?Style {
   if (style == null) {
     return undefined;
   }
diff --git a/RNTester/js/RNTesterExampleList.js b/RNTester/js/RNTesterExampleList.js
index 1217fd064d5c50..96e1ed9b474a68 100644
--- a/RNTester/js/RNTesterExampleList.js
+++ b/RNTester/js/RNTesterExampleList.js
@@ -22,7 +22,7 @@ const View = require('View');
 
 import type {RNTesterExample} from './RNTesterList.ios';
 import type {PassProps} from './RNTesterStatePersister';
-import type {StyleObj} from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 
 type Props = {
   onNavigate: Function,
@@ -31,8 +31,8 @@ type Props = {
     APIExamples: Array<RNTesterExample>,
   },
   persister: PassProps<*>,
-  searchTextInputStyle: StyleObj,
-  style?: ?StyleObj,
+  searchTextInputStyle: DangerouslyImpreciseStyleProp,
+  style?: ?DangerouslyImpreciseStyleProp,
 };
 
 class RowComponent extends React.PureComponent<{
diff --git a/RNTester/js/ScrollViewExample.js b/RNTester/js/ScrollViewExample.js
index f0d1e9bb19c617..f5b5c8aab8fd5c 100644
--- a/RNTester/js/ScrollViewExample.js
+++ b/RNTester/js/ScrollViewExample.js
@@ -10,7 +10,7 @@
  */
 'use strict';
 
-import type {StyleObj} from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 
 const ActivityIndicator = require('ActivityIndicator');
 const Platform = require('Platform');
@@ -252,7 +252,7 @@ if (Platform.OS === 'ios') {
 class Thumb extends React.PureComponent<{|
   source?: string | number,
   msg?: string,
-  style?: StyleObj,
+  style?: DangerouslyImpreciseStyleProp,
 |}> {
   render() {
     const {source} = this.props;

From 3c23645cae864f54d435fe9c26c4d8c58e3aad3b Mon Sep 17 00:00:00 2001
From: Rafael Oleza <rafeca@fb.com>
Date: Wed, 7 Mar 2018 14:54:20 -0800
Subject: [PATCH 189/267] Bump metro@0.29.0

Reviewed By: BYK

Differential Revision: D7181876

fbshipit-source-id: a1b567303b8024b832bf43dd6be56ccebffaf39c
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index eb1471c7476754..86dd83d3ad9711 100644
--- a/package.json
+++ b/package.json
@@ -174,8 +174,8 @@
     "graceful-fs": "^4.1.3",
     "inquirer": "^3.0.6",
     "lodash": "^4.17.5",
-    "metro": "^0.28.0",
-    "metro-core": "^0.28.0",
+    "metro": "^0.29.0",
+    "metro-core": "^0.29.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",

From cf89a2cbfd4fb66580a0ed2b195a6daf680ca79c Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Wed, 7 Mar 2018 16:24:14 -0800
Subject: [PATCH 190/267] Move __StyleProp to StyleSheet

Reviewed By: yungsters

Differential Revision: D7185815

fbshipit-source-id: 897ae37af3f03aa1408f020bcc7e61004d4dbc0d
---
 Libraries/StyleSheet/StyleSheet.js      |  7 +++++++
 Libraries/StyleSheet/StyleSheetTypes.js | 13 +++++++++----
 Libraries/Text/TextProps.js             |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index 7f5888d8f5fde8..80f4b209c0de09 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -20,10 +20,17 @@ import type {
   StyleSheetStyle as _StyleSheetStyle,
   Styles as _Styles,
   ____StyleObj_Internal,
+  ____ViewStyleProp_Internal,
+  ____TextStyleProp_Internal,
+  ____ImageStyleProp_Internal,
   LayoutStyle
 } from 'StyleSheetTypes';
 
 export type DangerouslyImpreciseStyleProp = ____StyleObj_Internal;
+export type ViewStyleProp = ____ViewStyleProp_Internal;
+export type TextStyleProp = ____TextStyleProp_Internal;
+export type ImageStyleProp = ____ImageStyleProp_Internal;
+
 export type Styles = _Styles;
 export type StyleSheetStyle = _StyleSheetStyle;
 type StyleSheet<+S: Styles> = $ObjMap<S, (Object) => StyleSheetStyle>;
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index c8df91073331b3..eeef8bc6680af9 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -231,10 +231,15 @@ type GenericStyleProp<+T> =
   | $ReadOnlyArray<GenericStyleProp<T>>;
 
 export type ____StyleObj_Internal = GenericStyleProp<$Shape<Style>>;
-
-export type ViewStyleProp = GenericStyleProp<$ReadOnly<$Shape<ViewStyle>>>;
-export type TextStyleProp = GenericStyleProp<$ReadOnly<$Shape<TextStyle>>>;
-export type ImageStyleProp = GenericStyleProp<$ReadOnly<$Shape<ImageStyle>>>;
+export type ____ViewStyleProp_Internal = GenericStyleProp<
+  $ReadOnly<$Shape<ViewStyle>>,
+>;
+export type ____TextStyleProp_Internal = GenericStyleProp<
+  $ReadOnly<$Shape<TextStyle>>,
+>;
+export type ____ImageStyleProp_Internal = GenericStyleProp<
+  $ReadOnly<$Shape<ImageStyle>>,
+>;
 
 export type Styles = {
   +[key: string]: $Shape<Style>,
diff --git a/Libraries/Text/TextProps.js b/Libraries/Text/TextProps.js
index 7b077f9cd7851e..770e7ec0e50113 100644
--- a/Libraries/Text/TextProps.js
+++ b/Libraries/Text/TextProps.js
@@ -14,7 +14,7 @@
 import type {Node} from 'react';
 
 import type {LayoutEvent} from 'CoreEventTypes';
-import type {TextStyleProp} from 'StyleSheetTypes';
+import type {TextStyleProp} from 'StyleSheet';
 
 type PressRetentionOffset = {
   top: number,

From 23e0f868c981d1519b66b34da144654d8032d452 Mon Sep 17 00:00:00 2001
From: Tugrul Ince <ince@fb.com>
Date: Wed, 7 Mar 2018 16:35:00 -0800
Subject: [PATCH 191/267] Mark more ObjC methods called from RN as dynamic

Reviewed By: kostiakoval

Differential Revision: D7174480

fbshipit-source-id: 38af8e6e94cb8cdf6aa551d9df1b3e16543387e5
---
 React/Base/RCTBridgeModule.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/React/Base/RCTBridgeModule.h b/React/Base/RCTBridgeModule.h
index f138868eb3062b..07116bb80ef950 100644
--- a/React/Base/RCTBridgeModule.h
+++ b/React/Base/RCTBridgeModule.h
@@ -197,7 +197,7 @@ RCT_EXTERN void RCTRegisterModule(Class); \
  */
 #define RCT_REMAP_BLOCKING_SYNCHRONOUS_METHOD(js_name, returnType, method) \
   _RCT_EXTERN_REMAP_METHOD(js_name, method, YES) \
-  - (returnType)method;
+  - (returnType)method RCT_DYNAMIC;
 
 /**
  * Use this macro in a private Objective-C implementation file to automatically

From 7bf3b20837726ff43c2d7ed8a0d5012f3a1e1e7a Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Wed, 7 Mar 2018 16:40:38 -0800
Subject: [PATCH 192/267] iOS: create C++ <-> ObjC++ connector for
 FabricUIManager to do UI operations

Reviewed By: shergin

Differential Revision: D7162911

fbshipit-source-id: 3e303020dafdccc51f52c3359a7054dc8a787978
---
 .../RCTFabricPlatformUIOperationManager.h     | 46 ++++++++++++++++++
 .../RCTFabricPlatformUIOperationManager.mm    | 48 +++++++++++++++++++
 React/Fabric/RCTFabricUIManagerWrapper.h      |  5 +-
 React/Fabric/RCTFabricUIManagerWrapper.mm     |  8 +++-
 ReactCommon/fabric/FabricUIManager.cpp        | 16 +++++--
 ReactCommon/fabric/FabricUIManager.h          | 17 +++++--
 .../IFabricPlatformUIOperationManager.h       | 23 +++++++++
 ReactCommon/fabric/ShadowNode.cpp             |  7 ++-
 ReactCommon/fabric/ShadowNode.h               |  7 ++-
 9 files changed, 163 insertions(+), 14 deletions(-)
 create mode 100644 React/Fabric/RCTFabricPlatformUIOperationManager.h
 create mode 100644 React/Fabric/RCTFabricPlatformUIOperationManager.mm
 create mode 100644 ReactCommon/fabric/IFabricPlatformUIOperationManager.h

diff --git a/React/Fabric/RCTFabricPlatformUIOperationManager.h b/React/Fabric/RCTFabricPlatformUIOperationManager.h
new file mode 100644
index 00000000000000..2e9df3c770445c
--- /dev/null
+++ b/React/Fabric/RCTFabricPlatformUIOperationManager.h
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#import <memory>
+
+#include <fabric/IFabricPlatformUIOperationManager.h>
+
+@class RCTFabricPlatformUIOperationManager;
+
+namespace facebook {
+namespace react {
+
+/**
+ * Connector class (from C++ to ObjC++) to allow FabricUIManager to invoke native UI operations/updates.
+ * UIKit-related impl doesn't live here, but this class gets passed to the FabricUIManager C++ impl directly.
+ */
+class RCTFabricPlatformUIOperationManagerConnector : public IFabricPlatformUIOperationManager {
+public:
+  RCTFabricPlatformUIOperationManagerConnector();
+  ~RCTFabricPlatformUIOperationManagerConnector();
+
+  void performUIOperation();
+
+private:
+  void *self_;
+  RCTFabricPlatformUIOperationManager *manager_;
+};
+
+} // namespace react
+} // namespace facebook
+
+/**
+ * Actual ObjC++ implementation of the UI operations.
+ */
+@interface RCTFabricPlatformUIOperationManager : NSObject
+
+- (void)performUIOperation;
+
+@end
diff --git a/React/Fabric/RCTFabricPlatformUIOperationManager.mm b/React/Fabric/RCTFabricPlatformUIOperationManager.mm
new file mode 100644
index 00000000000000..3bccc58e051645
--- /dev/null
+++ b/React/Fabric/RCTFabricPlatformUIOperationManager.mm
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTFabricPlatformUIOperationManager.h"
+
+namespace facebook {
+namespace react {
+
+RCTFabricPlatformUIOperationManagerConnector::RCTFabricPlatformUIOperationManagerConnector() {
+  self_ = (__bridge_retained void *)[RCTFabricPlatformUIOperationManager new];
+  manager_ = (__bridge RCTFabricPlatformUIOperationManager *)self_;
+}
+
+RCTFabricPlatformUIOperationManagerConnector::~RCTFabricPlatformUIOperationManagerConnector() {
+  CFRelease(self_);
+  self_ = NULL;
+  manager_ = NULL;
+}
+
+void RCTFabricPlatformUIOperationManagerConnector::performUIOperation() {
+  [manager_ performUIOperation];
+}
+
+} // namespace react
+} // namespace facebook
+
+// -----------------------------------------------------------------------------
+// Start of ObjC++ impl
+// Access UIKit here.
+// -----------------------------------------------------------------------------
+@implementation RCTFabricPlatformUIOperationManager
+
+- (void)dealloc
+{
+  NSLog(@"RCTFabricPlatformUIOperationManager: dealloc()");
+}
+
+- (void)performUIOperation
+{
+  // TODO
+  NSLog(@"RCTFabricPlatformUIOperationManager: performUIOperation()");
+}
+
+@end
diff --git a/React/Fabric/RCTFabricUIManagerWrapper.h b/React/Fabric/RCTFabricUIManagerWrapper.h
index 1db660fcf380a4..d40ef78c359cc3 100644
--- a/React/Fabric/RCTFabricUIManagerWrapper.h
+++ b/React/Fabric/RCTFabricUIManagerWrapper.h
@@ -18,8 +18,8 @@ namespace react {
 
 class FabricUIManager;
 
-}
-}
+} // namespace react
+} // namespace facebook
 
 using namespace facebook::react;
 
@@ -28,7 +28,6 @@ using namespace facebook::react;
  */
 @interface RCTFabricUIManagerWrapper : NSObject <RCTInvalidating>
 
-- (instancetype)initWithManager:(std::shared_ptr<FabricUIManager>)manager;
 - (std::shared_ptr<FabricUIManager>)manager;
 
 @end
diff --git a/React/Fabric/RCTFabricUIManagerWrapper.mm b/React/Fabric/RCTFabricUIManagerWrapper.mm
index e1fc129d8a7bac..892669145d0ae6 100644
--- a/React/Fabric/RCTFabricUIManagerWrapper.mm
+++ b/React/Fabric/RCTFabricUIManagerWrapper.mm
@@ -9,17 +9,21 @@
 
 #include <fabric/FabricUIManager.h>
 
+#import "RCTFabricPlatformUIOperationManager.h"
+
 // This file contains experimental placeholders, nothing is finalized.
 @implementation RCTFabricUIManagerWrapper
 {
   std::shared_ptr<FabricUIManager> _manager;
+  std::shared_ptr<IFabricPlatformUIOperationManager> _platformUIOperationManager;
 }
 
-- (instancetype)initWithManager:(std::shared_ptr<FabricUIManager>)manager
+- (instancetype)init
 {
   self = [super init];
   if (self) {
-    _manager = manager;
+    _platformUIOperationManager = std::make_shared<RCTFabricPlatformUIOperationManagerConnector>();
+    _manager = std::make_shared<FabricUIManager>(_platformUIOperationManager);
   }
   return self;
 }
diff --git a/ReactCommon/fabric/FabricUIManager.cpp b/ReactCommon/fabric/FabricUIManager.cpp
index 1a383519a83924..54262fc9edbf2e 100644
--- a/ReactCommon/fabric/FabricUIManager.cpp
+++ b/ReactCommon/fabric/FabricUIManager.cpp
@@ -1,14 +1,23 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 
 #include "FabricUIManager.h"
+
+#include "IFabricPlatformUIOperationManager.h"
 #include "ShadowNode.h"
 
 namespace facebook {
 namespace react {
 
-FabricUIManager::FabricUIManager() {}
+FabricUIManager::FabricUIManager(const std::shared_ptr<IFabricPlatformUIOperationManager> &platformUIOperationManager) :
+  platformUIOperationManager_(platformUIOperationManager) {};
 
 ShadowNodeRef FabricUIManager::createNode(int reactTag, std::string viewName, int rootTag, folly::dynamic props, void *instanceHandle) {
+  platformUIOperationManager_->performUIOperation();
   return std::make_shared<ShadowNode>(reactTag, viewName, rootTag, props, instanceHandle);
 }
 
@@ -41,4 +50,5 @@ void FabricUIManager::appendChildToSet(const ShadowNodeSetRef &childSet, const S
 void FabricUIManager::completeRoot(int rootTag, const ShadowNodeSetRef &childSet) {
 }
 
-}}
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/FabricUIManager.h b/ReactCommon/fabric/FabricUIManager.h
index 7362c54dfa30cf..06ee2a94f70e80 100644
--- a/ReactCommon/fabric/FabricUIManager.h
+++ b/ReactCommon/fabric/FabricUIManager.h
@@ -1,4 +1,9 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 
 #pragma once
 
@@ -10,6 +15,7 @@ namespace facebook {
 namespace react {
 
 class ShadowNode;
+class IFabricPlatformUIOperationManager;
 
 typedef std::shared_ptr<const ShadowNode> ShadowNodeRef;
 typedef folly::fbvector<const ShadowNodeRef> ShadowNodeSet;
@@ -17,7 +23,7 @@ typedef std::shared_ptr<const ShadowNodeSet> ShadowNodeSetRef;
 
 class FabricUIManager {
 public:
-  FabricUIManager();
+  FabricUIManager(const std::shared_ptr<IFabricPlatformUIOperationManager> &platformUIOperationManager);
 
   ShadowNodeRef createNode(int reactTag, std::string viewName, int rootTag, folly::dynamic props, void *instanceHandle);
   ShadowNodeRef cloneNode(const ShadowNodeRef &node);
@@ -28,7 +34,10 @@ class FabricUIManager {
   ShadowNodeSetRef createChildSet(int rootTag);
   void appendChildToSet(const ShadowNodeSetRef &childSet, const ShadowNodeRef &childNode);
   void completeRoot(int rootTag, const ShadowNodeSetRef &childSet);
-};
 
-}}
+private:
+  std::shared_ptr<IFabricPlatformUIOperationManager> platformUIOperationManager_;
+};
 
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/IFabricPlatformUIOperationManager.h b/ReactCommon/fabric/IFabricPlatformUIOperationManager.h
new file mode 100644
index 00000000000000..ff1434c7520d9f
--- /dev/null
+++ b/ReactCommon/fabric/IFabricPlatformUIOperationManager.h
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+namespace facebook {
+namespace react {
+
+/**
+ * An interface for FabricUIManager to perform platform-specific UI operations, like updating native UIView's in iOS.
+ */
+class IFabricPlatformUIOperationManager {
+public:
+  // TODO: add meaningful methods
+  virtual void performUIOperation() = 0;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/ShadowNode.cpp b/ReactCommon/fabric/ShadowNode.cpp
index 39b4d145a798c6..9f675572bc81c3 100644
--- a/ReactCommon/fabric/ShadowNode.cpp
+++ b/ReactCommon/fabric/ShadowNode.cpp
@@ -1,4 +1,9 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 
 #include "ShadowNode.h"
 
diff --git a/ReactCommon/fabric/ShadowNode.h b/ReactCommon/fabric/ShadowNode.h
index a707f7160970a9..257b7c19e940c9 100644
--- a/ReactCommon/fabric/ShadowNode.h
+++ b/ReactCommon/fabric/ShadowNode.h
@@ -1,4 +1,9 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 
 #pragma once
 

From a162dc8cc6bffb5c9d19d1c96879da7bc4d8afce Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Wed, 7 Mar 2018 18:34:51 -0800
Subject: [PATCH 193/267] Fix RefreshControl's dependency on
 AndroidSwipeRefreshLayout

Reviewed By: mdvacca

Differential Revision: D7185836

fbshipit-source-id: 726e6e6792f1f3971c2f7de9bb83ff888815220d
---
 Libraries/Components/RefreshControl/RefreshControl.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Libraries/Components/RefreshControl/RefreshControl.js b/Libraries/Components/RefreshControl/RefreshControl.js
index 14f383dc08c274..8aac1ebf3e5744 100644
--- a/Libraries/Components/RefreshControl/RefreshControl.js
+++ b/Libraries/Components/RefreshControl/RefreshControl.js
@@ -20,7 +20,11 @@ const createReactClass = require('create-react-class');
 const requireNativeComponent = require('requireNativeComponent');
 
 if (Platform.OS === 'android') {
-  var RefreshLayoutConsts = require('UIManager').AndroidSwipeRefreshLayout.Constants;
+  const AndroidSwipeRefreshLayout =
+    require('UIManager').AndroidSwipeRefreshLayout;
+  var RefreshLayoutConsts = AndroidSwipeRefreshLayout
+    ? AndroidSwipeRefreshLayout.Constants
+    : {SIZE: {}};
 } else {
   var RefreshLayoutConsts = {SIZE: {}};
 }

From 596bcb6d8473af5b1543ba591ee46e6dc18d6f83 Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Wed, 7 Mar 2018 18:34:53 -0800
Subject: [PATCH 194/267] Initialize ReactChoreographer before creating the
 TimingModule

Reviewed By: mdvacca

Differential Revision: D7185838

fbshipit-source-id: f775f5668ccff3b311c95a0bdd37a420ec64b7d4
---
 .../com/facebook/react/testing/ReactIntegrationTestCase.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
index 31947b0682778a..e08878d3c780f9 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
@@ -7,6 +7,7 @@
 
 package com.facebook.react.testing;
 
+import com.facebook.react.modules.core.ReactChoreographer;
 import javax.annotation.Nullable;
 
 import java.util.concurrent.CountDownLatch;
@@ -139,6 +140,7 @@ protected Timing createTimingModule() {
         new Runnable() {
           @Override
           public void run() {
+            ReactChoreographer.initialize();
             Timing timing = new Timing(getContext(), mock(DevSupportManager.class));
             simpleSettableFuture.set(timing);
           }

From 8cdc7d3e0284bb6bbe22edc93a3ed23f6897837a Mon Sep 17 00:00:00 2001
From: "Andrew Chen (Eng)" <ayc@fb.com>
Date: Wed, 7 Mar 2018 18:34:55 -0800
Subject: [PATCH 195/267] Don't assume the SourceCode native module exists

Reviewed By: yungsters

Differential Revision: D7185837

fbshipit-source-id: e8efc22ac0af092dbc1fdf616b0b3f111390dd5d
---
 Libraries/Core/Devtools/getDevServer.js | 2 +-
 Libraries/Image/resolveAssetSource.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Libraries/Core/Devtools/getDevServer.js b/Libraries/Core/Devtools/getDevServer.js
index e413709da1cece..975a75f827b240 100644
--- a/Libraries/Core/Devtools/getDevServer.js
+++ b/Libraries/Core/Devtools/getDevServer.js
@@ -25,7 +25,7 @@ type DevServerInfo = {
  */
 function getDevServer(): DevServerInfo {
   if (_cachedDevServerURL === undefined) {
-    const match = SourceCode.scriptURL && SourceCode.scriptURL.match(/^https?:\/\/.*?\//);
+    const match = SourceCode && SourceCode.scriptURL && SourceCode.scriptURL.match(/^https?:\/\/.*?\//);
     _cachedDevServerURL = match ? match[0] : null;
   }
 
diff --git a/Libraries/Image/resolveAssetSource.js b/Libraries/Image/resolveAssetSource.js
index a5b6229d35d738..24fec6ef33c78a 100644
--- a/Libraries/Image/resolveAssetSource.js
+++ b/Libraries/Image/resolveAssetSource.js
@@ -92,7 +92,7 @@ if (!sourceCode) {
   const NativeModules = require('NativeModules');
   sourceCode = NativeModules && NativeModules.SourceCode;
 }
-_sourceCodeScriptURL = sourceCode.scriptURL;
+_sourceCodeScriptURL = sourceCode && sourceCode.scriptURL;
 
 module.exports = resolveAssetSource;
 module.exports.pickScale = AssetSourceResolver.pickScale;

From 89757edb34cdfd22791c59981f840c7de1979325 Mon Sep 17 00:00:00 2001
From: Alex McKelvey <alexmck@fb.com>
Date: Wed, 7 Mar 2018 22:33:21 -0800
Subject: [PATCH 196/267] Add eslint-plugin-react-native Yarn package and
 enable no-inline-styles rule for Marketplace

Reviewed By: TheSavior

Differential Revision: D7158098

fbshipit-source-id: 52c92c5427d27278c8f82ffa5d61b7e9ebbf7824
---
 .eslintrc    | 6 ++++++
 package.json | 1 +
 2 files changed, 7 insertions(+)

diff --git a/.eslintrc b/.eslintrc
index 2c1f512a16ce28..9887d1c6d8dbe0 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -13,6 +13,7 @@
     "flowtype",
     "prettier",
     "react",
+    "react-native",
     "jest"
   ],
 
@@ -252,6 +253,11 @@
     "react/self-closing-comp": 1,
     "react/wrap-multilines": 0,
 
+  // React-Native Plugin
+  // The following rules are made available via `eslint-plugin-react-native`
+
+    "react-native/no-inline-styles": 1,
+
   // Jest Plugin
   // The following rules are made available via `eslint-plugin-jest`.
     "jest/no-disabled-tests": 1,
diff --git a/package.json b/package.json
index 86dd83d3ad9711..d69018f16f5626 100644
--- a/package.json
+++ b/package.json
@@ -166,6 +166,7 @@
     "denodeify": "^1.2.1",
     "envinfo": "^3.0.0",
     "errorhandler": "^1.5.0",
+    "eslint-plugin-react-native": "^3.2.1",
     "event-target-shim": "^1.0.5",
     "fbjs": "^0.8.14",
     "fbjs-scripts": "^0.8.1",

From 5f497ca302711e19eafa35f5ee00a8601695c6cb Mon Sep 17 00:00:00 2001
From: Jakub Grzmiel <jakubgr@fb.com>
Date: Thu, 8 Mar 2018 00:09:49 -0800
Subject: [PATCH 197/267] Convert constant with build flags to function

Reviewed By: ttsugriy

Differential Revision: D7184372

fbshipit-source-id: c66f473ad15898532f24c6276898ab250e749744
---
 ReactCommon/cxxreact/BUCK | 8 ++++----
 ReactCommon/fabric/BUCK   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index 24d1d421e6f6ae..5f84b3fd5a241b 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -1,4 +1,4 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "DEBUG_PREPROCESSOR_FLAGS")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "rn_xplat_cxx_library", "ANDROID_INSPECTOR_FLAGS", "APPLE_INSPECTOR_FLAGS", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "react_native_xplat_target")
 
 CXX_LIBRARY_COMPILER_FLAGS = [
@@ -9,8 +9,8 @@ CXX_LIBRARY_COMPILER_FLAGS = [
 APPLE_COMPILER_FLAGS = []
 
 if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "STATIC_LIBRARY_IOS_FLAGS", "flags")
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(STATIC_LIBRARY_IOS_FLAGS, 'compiler_flags')
+    load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_static_library_ios_flags", "flags")
+    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), 'compiler_flags')
 
 rn_xplat_cxx_library(
     name = "module",
@@ -139,7 +139,7 @@ rn_xplat_cxx_library(
     fbobjc_frameworks = [
         "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework",
     ],
-    fbobjc_preprocessor_flags = DEBUG_PREPROCESSOR_FLAGS + APPLE_INSPECTOR_FLAGS,
+    fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + APPLE_INSPECTOR_FLAGS,
     force_static = True,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
diff --git a/ReactCommon/fabric/BUCK b/ReactCommon/fabric/BUCK
index 4fcbe82b5b40a9..fcf321eaeac051 100644
--- a/ReactCommon/fabric/BUCK
+++ b/ReactCommon/fabric/BUCK
@@ -1,4 +1,4 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "DEBUG_PREPROCESSOR_FLAGS")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "rn_xplat_cxx_library", "APPLE_INSPECTOR_FLAGS")
 
 CXX_LIBRARY_COMPILER_FLAGS = [
@@ -9,8 +9,8 @@ CXX_LIBRARY_COMPILER_FLAGS = [
 APPLE_COMPILER_FLAGS = []
 
 if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck/apple:flag_defs.bzl", "STATIC_LIBRARY_IOS_FLAGS", "flags")
-    APPLE_COMPILER_FLAGS = flags.get_flag_value(STATIC_LIBRARY_IOS_FLAGS, 'compiler_flags')
+    load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_static_library_ios_flags", "flags")
+    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), 'compiler_flags')
 
 rn_xplat_cxx_library(
     name = "fabric",
@@ -27,7 +27,7 @@ rn_xplat_cxx_library(
         "-frtti",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
-    fbobjc_preprocessor_flags = DEBUG_PREPROCESSOR_FLAGS + APPLE_INSPECTOR_FLAGS,
+    fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + APPLE_INSPECTOR_FLAGS,
     force_static = True,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

From d89517d60a8a6cabc9013b603fa3f63a1face6a2 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Thu, 8 Mar 2018 00:35:51 -0800
Subject: [PATCH 198/267] Remove usage of Internal StyleSheet type

Summary: This type shouldn't be necessary from outside code. All callsites were able to be fixed by using the other types like TextStyleProp

Reviewed By: yungsters

Differential Revision: D7187551

fbshipit-source-id: 34fb7fb5f5e72e6cfcb9748157cb5eb6ad3e1f46
---
 Libraries/StyleSheet/StyleSheet.js      | 8 +++-----
 Libraries/StyleSheet/StyleSheetTypes.js | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index 80f4b209c0de09..d607d74eb36cf7 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -17,7 +17,7 @@ const StyleSheetValidation = require('StyleSheetValidation');
 const flatten = require('flattenStyle');
 
 import type {
-  StyleSheetStyle as _StyleSheetStyle,
+  ____StyleSheetInternalStyleIdentifier_Internal as StyleSheetInternalStyleIdentifier,
   Styles as _Styles,
   ____StyleObj_Internal,
   ____ViewStyleProp_Internal,
@@ -32,8 +32,6 @@ export type TextStyleProp = ____TextStyleProp_Internal;
 export type ImageStyleProp = ____ImageStyleProp_Internal;
 
 export type Styles = _Styles;
-export type StyleSheetStyle = _StyleSheetStyle;
-type StyleSheet<+S: Styles> = $ObjMap<S, (Object) => StyleSheetStyle>;
 
 let hairlineWidth = PixelRatio.roundToNearestPixel(0.4);
 if (hairlineWidth === 0) {
@@ -47,7 +45,7 @@ const absoluteFillObject: LayoutStyle = {
   top: 0,
   bottom: 0,
 };
-const absoluteFill: StyleSheetStyle =
+const absoluteFill: StyleSheetInternalStyleIdentifier =
   ReactNativePropRegistry.register(absoluteFillObject); // This also freezes it
 
 /**
@@ -223,7 +221,7 @@ module.exports = {
   /**
    * Creates a StyleSheet style reference from the given object.
    */
-  create<S: Styles>(obj: S): StyleSheet<S> {
+  create<+S: Styles>(obj: S): $ObjMap<S, (Object) => StyleSheetInternalStyleIdentifier> {
     const result = {};
     for (const key in obj) {
       StyleSheetValidation.validateStyle(key, obj);
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index eeef8bc6680af9..4aeaf0623a059e 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -13,7 +13,7 @@
 
 import AnimatedNode from 'AnimatedNode';
 
-export opaque type StyleSheetStyle: number = number;
+export opaque type ____StyleSheetInternalStyleIdentifier_Internal: number = number;
 
 export type ColorValue = null | string;
 export type DimensionValue = null | number | string | AnimatedNode;
@@ -224,7 +224,7 @@ type GenericStyleProp<+T> =
   | null
   | void
   | T
-  | StyleSheetStyle
+  | ____StyleSheetInternalStyleIdentifier_Internal
   | number
   | false
   | ''

From 852084ad454565bb856e85f09e098f1a4a0771a6 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Thu, 8 Mar 2018 00:35:53 -0800
Subject: [PATCH 199/267] Remove usage of Styles type

Summary: This type was often used when (View|Text|Image)StyleProp should have been used instead. Since there were no valid usages of it in our codebase, we are not making it public anymore.

Reviewed By: yungsters

Differential Revision: D7188658

fbshipit-source-id: 7112cc4a7da7b007b5c758a0890d2e0b8fe1797a
---
 Libraries/StyleSheet/StyleSheet.js      | 6 ++----
 Libraries/StyleSheet/StyleSheetTypes.js | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index d607d74eb36cf7..3223b033e3d4e8 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -18,7 +18,7 @@ const flatten = require('flattenStyle');
 
 import type {
   ____StyleSheetInternalStyleIdentifier_Internal as StyleSheetInternalStyleIdentifier,
-  Styles as _Styles,
+  ____Styles_Internal,
   ____StyleObj_Internal,
   ____ViewStyleProp_Internal,
   ____TextStyleProp_Internal,
@@ -31,8 +31,6 @@ export type ViewStyleProp = ____ViewStyleProp_Internal;
 export type TextStyleProp = ____TextStyleProp_Internal;
 export type ImageStyleProp = ____ImageStyleProp_Internal;
 
-export type Styles = _Styles;
-
 let hairlineWidth = PixelRatio.roundToNearestPixel(0.4);
 if (hairlineWidth === 0) {
   hairlineWidth = 1 / PixelRatio.get();
@@ -221,7 +219,7 @@ module.exports = {
   /**
    * Creates a StyleSheet style reference from the given object.
    */
-  create<+S: Styles>(obj: S): $ObjMap<S, (Object) => StyleSheetInternalStyleIdentifier> {
+  create<+S: ____Styles_Internal>(obj: S): $ObjMap<S, (Object) => StyleSheetInternalStyleIdentifier> {
     const result = {};
     for (const key in obj) {
       StyleSheetValidation.validateStyle(key, obj);
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index 4aeaf0623a059e..72db60b2c361cc 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -241,7 +241,7 @@ export type ____ImageStyleProp_Internal = GenericStyleProp<
   $ReadOnly<$Shape<ImageStyle>>,
 >;
 
-export type Styles = {
+export type ____Styles_Internal = {
   +[key: string]: $Shape<Style>,
 };
 

From 5b32358c9e1f9bb97b1d8f7dda0995bf129ad7ed Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Thu, 8 Mar 2018 00:35:55 -0800
Subject: [PATCH 200/267] Prettier

Reviewed By: yungsters

Differential Revision: D7188912

fbshipit-source-id: 3466c542dc0fb1832b4545b1a307183efcd72b1d
---
 Libraries/StyleSheet/StyleSheet.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index 3223b033e3d4e8..e7af29e2c53dc6 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -6,6 +6,7 @@
  *
  * @providesModule StyleSheet
  * @flow
+ * @format
  */
 'use strict';
 
@@ -23,7 +24,7 @@ import type {
   ____ViewStyleProp_Internal,
   ____TextStyleProp_Internal,
   ____ImageStyleProp_Internal,
-  LayoutStyle
+  LayoutStyle,
 } from 'StyleSheetTypes';
 
 export type DangerouslyImpreciseStyleProp = ____StyleObj_Internal;
@@ -43,8 +44,9 @@ const absoluteFillObject: LayoutStyle = {
   top: 0,
   bottom: 0,
 };
-const absoluteFill: StyleSheetInternalStyleIdentifier =
-  ReactNativePropRegistry.register(absoluteFillObject); // This also freezes it
+const absoluteFill: StyleSheetInternalStyleIdentifier = ReactNativePropRegistry.register(
+  absoluteFillObject,
+); // This also freezes it
 
 /**
  * A StyleSheet is an abstraction similar to CSS StyleSheets
@@ -139,7 +141,10 @@ module.exports = {
    * array, saving allocations and maintaining reference equality for
    * PureComponent checks.
    */
-  compose(style1: ?DangerouslyImpreciseStyleProp, style2: ?DangerouslyImpreciseStyleProp): ?DangerouslyImpreciseStyleProp {
+  compose(
+    style1: ?DangerouslyImpreciseStyleProp,
+    style2: ?DangerouslyImpreciseStyleProp,
+  ): ?DangerouslyImpreciseStyleProp {
     if (style1 != null && style2 != null) {
       return [style1, style2];
     } else {
@@ -197,7 +202,10 @@ module.exports = {
    * internally to process color and transform values. You should not use this
    * unless you really know what you are doing and have exhausted other options.
    */
-  setStyleAttributePreprocessor(property: string, process: (nextProp: mixed) => mixed) {
+  setStyleAttributePreprocessor(
+    property: string,
+    process: (nextProp: mixed) => mixed,
+  ) {
     let value;
 
     if (typeof ReactNativeStyleAttributes[property] === 'string') {
@@ -213,13 +221,15 @@ module.exports = {
       console.warn(`Overwriting ${property} style attribute preprocessor`);
     }
 
-    ReactNativeStyleAttributes[property] = { ...value, process };
+    ReactNativeStyleAttributes[property] = {...value, process};
   },
 
   /**
    * Creates a StyleSheet style reference from the given object.
    */
-  create<+S: ____Styles_Internal>(obj: S): $ObjMap<S, (Object) => StyleSheetInternalStyleIdentifier> {
+  create<+S: ____Styles_Internal>(
+    obj: S,
+  ): $ObjMap<S, (Object) => StyleSheetInternalStyleIdentifier> {
     const result = {};
     for (const key in obj) {
       StyleSheetValidation.validateStyle(key, obj);

From 4895c645ea17ff939811f3d5ec6218cd4e31c5fb Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Thu, 8 Mar 2018 00:35:58 -0800
Subject: [PATCH 201/267] Rename Style to DangerouslyImpreciseStyle

Reviewed By: yungsters

Differential Revision: D7190268

fbshipit-source-id: d652a95be7550d65cfbfc59f41d7bda92915bacf
---
 Libraries/StyleSheet/StyleSheet.js      |  4 ++--
 Libraries/StyleSheet/StyleSheetTypes.js | 12 ++++++++----
 Libraries/StyleSheet/flattenStyle.js    |  7 +++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js
index e7af29e2c53dc6..3320c459b68ca0 100644
--- a/Libraries/StyleSheet/StyleSheet.js
+++ b/Libraries/StyleSheet/StyleSheet.js
@@ -20,14 +20,14 @@ const flatten = require('flattenStyle');
 import type {
   ____StyleSheetInternalStyleIdentifier_Internal as StyleSheetInternalStyleIdentifier,
   ____Styles_Internal,
-  ____StyleObj_Internal,
+  ____DangerouslyImpreciseStyleProp_Internal,
   ____ViewStyleProp_Internal,
   ____TextStyleProp_Internal,
   ____ImageStyleProp_Internal,
   LayoutStyle,
 } from 'StyleSheetTypes';
 
-export type DangerouslyImpreciseStyleProp = ____StyleObj_Internal;
+export type DangerouslyImpreciseStyleProp = ____DangerouslyImpreciseStyleProp_Internal;
 export type ViewStyleProp = ____ViewStyleProp_Internal;
 export type TextStyleProp = ____TextStyleProp_Internal;
 export type ImageStyleProp = ____ImageStyleProp_Internal;
diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js
index 72db60b2c361cc..b9c3c59fd2d345 100644
--- a/Libraries/StyleSheet/StyleSheetTypes.js
+++ b/Libraries/StyleSheet/StyleSheetTypes.js
@@ -213,7 +213,7 @@ export type ImageStyle = $ReadOnly<{|
   overlayColor?: string,
 |}>;
 
-export type Style = {
+export type DangerouslyImpreciseStyle = {
   ...$Exact<TextStyle>,
   +resizeMode?: 'contain' | 'cover' | 'stretch' | 'center' | 'repeat',
   +tintColor?: ColorValue,
@@ -230,7 +230,9 @@ type GenericStyleProp<+T> =
   | ''
   | $ReadOnlyArray<GenericStyleProp<T>>;
 
-export type ____StyleObj_Internal = GenericStyleProp<$Shape<Style>>;
+export type ____DangerouslyImpreciseStyleProp_Internal = GenericStyleProp<
+  $Shape<DangerouslyImpreciseStyle>,
+>;
 export type ____ViewStyleProp_Internal = GenericStyleProp<
   $ReadOnly<$Shape<ViewStyle>>,
 >;
@@ -242,7 +244,7 @@ export type ____ImageStyleProp_Internal = GenericStyleProp<
 >;
 
 export type ____Styles_Internal = {
-  +[key: string]: $Shape<Style>,
+  +[key: string]: $Shape<DangerouslyImpreciseStyle>,
 };
 
 /*
@@ -260,4 +262,6 @@ type Props = {position: TypeForStyleKey<'position'>};
 This will correctly give you the type 'absolute' | 'relative' instead of the
 weak type of just string;
 */
-export type TypeForStyleKey<+key: $Keys<Style>> = $ElementType<Style, key>;
+export type TypeForStyleKey<
+  +key: $Keys<DangerouslyImpreciseStyle>,
+> = $ElementType<DangerouslyImpreciseStyle, key>;
diff --git a/Libraries/StyleSheet/flattenStyle.js b/Libraries/StyleSheet/flattenStyle.js
index 43122e0746957c..37ac2d434a0fb4 100644
--- a/Libraries/StyleSheet/flattenStyle.js
+++ b/Libraries/StyleSheet/flattenStyle.js
@@ -6,13 +6,14 @@
  *
  * @providesModule flattenStyle
  * @flow
+ * @format
  */
 'use strict';
 
 var ReactNativePropRegistry;
 
 import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
-import type { Style } from 'StyleSheetTypes';
+import type {DangerouslyImpreciseStyle} from 'StyleSheetTypes';
 
 function getStyle(style) {
   if (ReactNativePropRegistry === undefined) {
@@ -24,7 +25,9 @@ function getStyle(style) {
   return style;
 }
 
-function flattenStyle(style: ?DangerouslyImpreciseStyleProp): ?Style {
+function flattenStyle(
+  style: ?DangerouslyImpreciseStyleProp,
+): ?DangerouslyImpreciseStyle {
   if (style == null) {
     return undefined;
   }

From f2ad77f90a5553d05448acbc4eac1eb7ad4809d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Thu, 8 Mar 2018 12:02:45 -0800
Subject: [PATCH 202/267] Update additional license headers

Reviewed By: sophiebits

Differential Revision: D7196607

fbshipit-source-id: 9e6452f583b2b5616f5bb38f26f2ae33c14bb820
---
 Libraries/Image/RCTImageStoreManager.h                       | 5 ++++-
 Libraries/Utilities/__mocks__/PixelRatio.js                  | 5 ++++-
 Libraries/Wrapper/Example/RCTWrapperExampleView.h            | 5 ++++-
 Libraries/Wrapper/Example/RCTWrapperExampleView.m            | 5 ++++-
 Libraries/Wrapper/Example/RCTWrapperExampleViewController.h  | 5 ++++-
 Libraries/Wrapper/Example/RCTWrapperExampleViewController.m  | 5 ++++-
 .../Wrapper/Example/RCTWrapperReactRootViewController.h      | 5 ++++-
 .../Wrapper/Example/RCTWrapperReactRootViewController.m      | 5 ++++-
 Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h   | 5 ++++-
 Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m   | 5 ++++-
 Libraries/Wrapper/RCTWrapper.h                               | 5 ++++-
 Libraries/Wrapper/RCTWrapperShadowView.h                     | 5 ++++-
 Libraries/Wrapper/RCTWrapperShadowView.m                     | 5 ++++-
 Libraries/Wrapper/RCTWrapperView.h                           | 5 ++++-
 Libraries/Wrapper/RCTWrapperView.m                           | 5 ++++-
 Libraries/Wrapper/RCTWrapperViewControllerHostingView.h      | 5 ++++-
 Libraries/Wrapper/RCTWrapperViewControllerHostingView.m      | 5 ++++-
 Libraries/Wrapper/RCTWrapperViewManager.h                    | 5 ++++-
 Libraries/Wrapper/RCTWrapperViewManager.m                    | 5 ++++-
 babel-preset/transforms/transform-symbol-member.js           | 5 ++++-
 local-cli/core/__tests__/ios/findPodfilePath.spec.js         | 2 --
 local-cli/core/__tests__/ios/findPodspecName.spec.js         | 2 --
 local-cli/link/__tests__/android/isInstalled.spec.js         | 2 --
 local-cli/link/__tests__/android/makeBuildPatch.spec.js      | 2 --
 local-cli/link/__tests__/android/makeImportPatch.spec.js     | 2 --
 local-cli/link/__tests__/android/makePackagePatch.spec.js    | 2 --
 local-cli/link/__tests__/android/makeSettingsPatch.spec.js   | 2 --
 local-cli/link/__tests__/android/makeStringsPatch.spec.js    | 2 --
 local-cli/link/__tests__/getDependencyConfig.spec.js         | 2 --
 local-cli/link/__tests__/groupFilesByType.spec.js            | 2 --
 local-cli/link/__tests__/ios/addFileToProject.spec.js        | 2 --
 local-cli/link/__tests__/ios/addSharedLibraries.spec.js      | 2 --
 local-cli/link/__tests__/ios/createGroup.spec.js             | 2 --
 local-cli/link/__tests__/ios/getBuildProperty.spec.js        | 2 --
 local-cli/link/__tests__/ios/getGroup.spec.js                | 2 --
 local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js     | 2 --
 local-cli/link/__tests__/ios/getHeadersInFolder.spec.js      | 2 --
 local-cli/link/__tests__/ios/getPlist.spec.js                | 2 --
 local-cli/link/__tests__/ios/getPlistPath.spec.js            | 2 --
 local-cli/link/__tests__/ios/getProducts.spec.js             | 2 --
 local-cli/link/__tests__/ios/getTargets.spec.js              | 2 --
 local-cli/link/__tests__/ios/hasLibraryImported.spec.js      | 2 --
 local-cli/link/__tests__/ios/isInstalled.spec.js             | 2 --
 local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js    | 2 --
 local-cli/link/__tests__/ios/removeProjectFromLibraries.js   | 2 --
 .../link/__tests__/ios/removeProjectFromProject.spec.js      | 2 --
 local-cli/link/__tests__/ios/removeSharedLibrary.spec.js     | 2 --
 local-cli/link/__tests__/pods/findLineToAddPod.spec.js       | 2 --
 .../link/__tests__/pods/findMarkedLinesInPodfile.spec.js     | 2 --
 local-cli/link/__tests__/pods/findPodTargetLine.spec.js      | 2 --
 local-cli/link/__tests__/pods/isInstalled.spec.js            | 2 --
 local-cli/link/__tests__/pods/removePodEntry.spec.js         | 2 --
 local-cli/link/__tests__/promiseWaterfall.spec.js            | 2 --
 53 files changed, 80 insertions(+), 86 deletions(-)

diff --git a/Libraries/Image/RCTImageStoreManager.h b/Libraries/Image/RCTImageStoreManager.h
index 2bdffbe3051acd..3f070ada1d27be 100644
--- a/Libraries/Image/RCTImageStoreManager.h
+++ b/Libraries/Image/RCTImageStoreManager.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Utilities/__mocks__/PixelRatio.js b/Libraries/Utilities/__mocks__/PixelRatio.js
index 36e5bacdf3108a..242d4773380ee3 100644
--- a/Libraries/Utilities/__mocks__/PixelRatio.js
+++ b/Libraries/Utilities/__mocks__/PixelRatio.js
@@ -1,5 +1,8 @@
 /**
- * Copyright 2004-present Facebook. All Rights Reserved.
+ * Copyright (c) 2004-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleView.h b/Libraries/Wrapper/Example/RCTWrapperExampleView.h
index e169368c0fb67c..b7d2aa4aaddf65 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleView.h
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleView.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleView.m b/Libraries/Wrapper/Example/RCTWrapperExampleView.m
index 05494750c96d8e..218eefbac98d0a 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleView.m
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleView.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import "RCTWrapperExampleView.h"
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h
index 2778090a5b68c3..c0a838cf5a5d5a 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m
index 0d5473600e7f6f..b49862028019b8 100644
--- a/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m
+++ b/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import "RCTWrapperExampleViewController.h"
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h
index 8b915dcafad47d..0d31356faac7be 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m
index acdef85cf94314..c93b2a2076cd64 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import "RCTWrapperReactRootViewController.h"
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h
index 1a6fd506809505..357dea11dc6bd8 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m
index 6150453881303d..4fb88e9c1cbdbb 100644
--- a/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m
+++ b/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the license found in the
+// LICENSE-examples file in the root directory of this source tree.
 
 #import "RCTWrapperReactRootViewManager.h"
 
diff --git a/Libraries/Wrapper/RCTWrapper.h b/Libraries/Wrapper/RCTWrapper.h
index 4fa389a03e4e3d..2fff2638542f19 100644
--- a/Libraries/Wrapper/RCTWrapper.h
+++ b/Libraries/Wrapper/RCTWrapper.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/RCTWrapperShadowView.h b/Libraries/Wrapper/RCTWrapperShadowView.h
index 1a64b85d5e54c5..ab7d332eb322dd 100644
--- a/Libraries/Wrapper/RCTWrapperShadowView.h
+++ b/Libraries/Wrapper/RCTWrapperShadowView.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/RCTWrapperShadowView.m b/Libraries/Wrapper/RCTWrapperShadowView.m
index 723ead6177da56..09b1f2eea2c5fd 100644
--- a/Libraries/Wrapper/RCTWrapperShadowView.m
+++ b/Libraries/Wrapper/RCTWrapperShadowView.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import "RCTWrapperShadowView.h"
 
diff --git a/Libraries/Wrapper/RCTWrapperView.h b/Libraries/Wrapper/RCTWrapperView.h
index 0aa6dfc83fe8e9..f6c8599f2a8c62 100644
--- a/Libraries/Wrapper/RCTWrapperView.h
+++ b/Libraries/Wrapper/RCTWrapperView.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/RCTWrapperView.m b/Libraries/Wrapper/RCTWrapperView.m
index 9843c12835a600..483f07f92cdb39 100644
--- a/Libraries/Wrapper/RCTWrapperView.m
+++ b/Libraries/Wrapper/RCTWrapperView.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import "RCTWrapperView.h"
 
diff --git a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h
index cf85e8cab9f62e..d323944bb46b71 100644
--- a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h
+++ b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import <UIKit/UIKit.h>
 
diff --git a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m
index 8503ee88e5e28d..da42a0c4fafde5 100644
--- a/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m
+++ b/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import "RCTWrapperViewControllerHostingView.h"
 
diff --git a/Libraries/Wrapper/RCTWrapperViewManager.h b/Libraries/Wrapper/RCTWrapperViewManager.h
index bdd5d9f40c7be9..ae8dcee5963188 100644
--- a/Libraries/Wrapper/RCTWrapperViewManager.h
+++ b/Libraries/Wrapper/RCTWrapperViewManager.h
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import <React/RCTViewManager.h>
 
diff --git a/Libraries/Wrapper/RCTWrapperViewManager.m b/Libraries/Wrapper/RCTWrapperViewManager.m
index 687c7a46cf3ab8..7058a4d06d6898 100644
--- a/Libraries/Wrapper/RCTWrapperViewManager.m
+++ b/Libraries/Wrapper/RCTWrapperViewManager.m
@@ -1,4 +1,7 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
 
 #import "RCTWrapperViewManager.h"
 
diff --git a/babel-preset/transforms/transform-symbol-member.js b/babel-preset/transforms/transform-symbol-member.js
index 5962918dc67230..fd5333d1fe5445 100644
--- a/babel-preset/transforms/transform-symbol-member.js
+++ b/babel-preset/transforms/transform-symbol-member.js
@@ -1,5 +1,8 @@
 /**
- * Copyright 2004-present Facebook. All Rights Reserved.
+ * Copyright (c) 2004-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 'use strict';
diff --git a/local-cli/core/__tests__/ios/findPodfilePath.spec.js b/local-cli/core/__tests__/ios/findPodfilePath.spec.js
index b3390e9d14a4a5..a5e97030574eef 100644
--- a/local-cli/core/__tests__/ios/findPodfilePath.spec.js
+++ b/local-cli/core/__tests__/ios/findPodfilePath.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/core/__tests__/ios/findPodspecName.spec.js b/local-cli/core/__tests__/ios/findPodspecName.spec.js
index 984441d927b1df..91873779022ad1 100644
--- a/local-cli/core/__tests__/ios/findPodspecName.spec.js
+++ b/local-cli/core/__tests__/ios/findPodspecName.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/android/isInstalled.spec.js b/local-cli/link/__tests__/android/isInstalled.spec.js
index 01ddc38219f67d..131d753731afea 100644
--- a/local-cli/link/__tests__/android/isInstalled.spec.js
+++ b/local-cli/link/__tests__/android/isInstalled.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/android/makeBuildPatch.spec.js b/local-cli/link/__tests__/android/makeBuildPatch.spec.js
index c37ecc8b8c20ea..0fd082da91f650 100644
--- a/local-cli/link/__tests__/android/makeBuildPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeBuildPatch.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/android/makeImportPatch.spec.js b/local-cli/link/__tests__/android/makeImportPatch.spec.js
index 4e59f7bee6042f..d02eb66898555f 100644
--- a/local-cli/link/__tests__/android/makeImportPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeImportPatch.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/android/makePackagePatch.spec.js b/local-cli/link/__tests__/android/makePackagePatch.spec.js
index 72b379d101c470..c7e55c7e90f2b0 100644
--- a/local-cli/link/__tests__/android/makePackagePatch.spec.js
+++ b/local-cli/link/__tests__/android/makePackagePatch.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/android/makeSettingsPatch.spec.js b/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
index 223f0d6c405c14..a8c7e3c2ba8d4f 100644
--- a/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeSettingsPatch.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/android/makeStringsPatch.spec.js b/local-cli/link/__tests__/android/makeStringsPatch.spec.js
index faa8f8681f0901..3015f15b340bef 100644
--- a/local-cli/link/__tests__/android/makeStringsPatch.spec.js
+++ b/local-cli/link/__tests__/android/makeStringsPatch.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/getDependencyConfig.spec.js b/local-cli/link/__tests__/getDependencyConfig.spec.js
index f8abb0192bb338..30db06d537fc30 100644
--- a/local-cli/link/__tests__/getDependencyConfig.spec.js
+++ b/local-cli/link/__tests__/getDependencyConfig.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/groupFilesByType.spec.js b/local-cli/link/__tests__/groupFilesByType.spec.js
index 49d57daf9ef9cf..a96ff6e24d3827 100644
--- a/local-cli/link/__tests__/groupFilesByType.spec.js
+++ b/local-cli/link/__tests__/groupFilesByType.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/addFileToProject.spec.js b/local-cli/link/__tests__/ios/addFileToProject.spec.js
index a82c99db475acb..ca32c867090ca7 100644
--- a/local-cli/link/__tests__/ios/addFileToProject.spec.js
+++ b/local-cli/link/__tests__/ios/addFileToProject.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/addSharedLibraries.spec.js b/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
index dd628c45ca74f7..36343a89ce6462 100644
--- a/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
+++ b/local-cli/link/__tests__/ios/addSharedLibraries.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/createGroup.spec.js b/local-cli/link/__tests__/ios/createGroup.spec.js
index a997d4e5b5368a..b3fbf67a1a1fdf 100644
--- a/local-cli/link/__tests__/ios/createGroup.spec.js
+++ b/local-cli/link/__tests__/ios/createGroup.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/getBuildProperty.spec.js b/local-cli/link/__tests__/ios/getBuildProperty.spec.js
index ed4ab075b0f7a1..831944bbb94de0 100644
--- a/local-cli/link/__tests__/ios/getBuildProperty.spec.js
+++ b/local-cli/link/__tests__/ios/getBuildProperty.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/getGroup.spec.js b/local-cli/link/__tests__/ios/getGroup.spec.js
index cbc241821f8fab..f46cc31ebd7cdf 100644
--- a/local-cli/link/__tests__/ios/getGroup.spec.js
+++ b/local-cli/link/__tests__/ios/getGroup.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js b/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
index 49d27084ae925f..7e96a20b0edc44 100644
--- a/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
+++ b/local-cli/link/__tests__/ios/getHeaderSearchPath.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js b/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
index 19f53bca545d22..ff106865791441 100644
--- a/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
+++ b/local-cli/link/__tests__/ios/getHeadersInFolder.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/getPlist.spec.js b/local-cli/link/__tests__/ios/getPlist.spec.js
index 36ae648ce63b82..156320079b8a39 100644
--- a/local-cli/link/__tests__/ios/getPlist.spec.js
+++ b/local-cli/link/__tests__/ios/getPlist.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/getPlistPath.spec.js b/local-cli/link/__tests__/ios/getPlistPath.spec.js
index 346da6872e64eb..bf7c922edc89f4 100644
--- a/local-cli/link/__tests__/ios/getPlistPath.spec.js
+++ b/local-cli/link/__tests__/ios/getPlistPath.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/getProducts.spec.js b/local-cli/link/__tests__/ios/getProducts.spec.js
index f304d106982e77..26bee69fca00d4 100644
--- a/local-cli/link/__tests__/ios/getProducts.spec.js
+++ b/local-cli/link/__tests__/ios/getProducts.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/getTargets.spec.js b/local-cli/link/__tests__/ios/getTargets.spec.js
index a2917a26ee1a83..99f3f370215eca 100644
--- a/local-cli/link/__tests__/ios/getTargets.spec.js
+++ b/local-cli/link/__tests__/ios/getTargets.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/hasLibraryImported.spec.js b/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
index 4a2b9789240408..6d9d1723f9032c 100644
--- a/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
+++ b/local-cli/link/__tests__/ios/hasLibraryImported.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/isInstalled.spec.js b/local-cli/link/__tests__/ios/isInstalled.spec.js
index d55970e8d3aa9e..bc291d79df3416 100644
--- a/local-cli/link/__tests__/ios/isInstalled.spec.js
+++ b/local-cli/link/__tests__/ios/isInstalled.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js b/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
index 9a480c4c1affe6..e834b32da8cb9f 100644
--- a/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
+++ b/local-cli/link/__tests__/ios/mapHeaderSearchPaths.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/removeProjectFromLibraries.js b/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
index 18baf84b4af126..262d61b11e8efc 100644
--- a/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
+++ b/local-cli/link/__tests__/ios/removeProjectFromLibraries.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js b/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
index 02dbdf02eba0c0..54a3e07cd7aa14 100644
--- a/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
+++ b/local-cli/link/__tests__/ios/removeProjectFromProject.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js b/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
index 455c8d9ec89024..601f0f7aa57573 100644
--- a/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
+++ b/local-cli/link/__tests__/ios/removeSharedLibrary.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/pods/findLineToAddPod.spec.js b/local-cli/link/__tests__/pods/findLineToAddPod.spec.js
index 1c8d33956c76b9..e065fd406ffe7b 100644
--- a/local-cli/link/__tests__/pods/findLineToAddPod.spec.js
+++ b/local-cli/link/__tests__/pods/findLineToAddPod.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js b/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
index a62e69b915a8d5..f3b6880949f49a 100644
--- a/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
+++ b/local-cli/link/__tests__/pods/findMarkedLinesInPodfile.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/pods/findPodTargetLine.spec.js b/local-cli/link/__tests__/pods/findPodTargetLine.spec.js
index e9d3371c897432..d64a2513c7cc5f 100644
--- a/local-cli/link/__tests__/pods/findPodTargetLine.spec.js
+++ b/local-cli/link/__tests__/pods/findPodTargetLine.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/pods/isInstalled.spec.js b/local-cli/link/__tests__/pods/isInstalled.spec.js
index 4a9a1f43b006c5..abda0fbe32d6c6 100644
--- a/local-cli/link/__tests__/pods/isInstalled.spec.js
+++ b/local-cli/link/__tests__/pods/isInstalled.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/pods/removePodEntry.spec.js b/local-cli/link/__tests__/pods/removePodEntry.spec.js
index 1c9032be647dd5..5c2f4a951f02bd 100644
--- a/local-cli/link/__tests__/pods/removePodEntry.spec.js
+++ b/local-cli/link/__tests__/pods/removePodEntry.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 
diff --git a/local-cli/link/__tests__/promiseWaterfall.spec.js b/local-cli/link/__tests__/promiseWaterfall.spec.js
index 0675e6e58db4f7..d34aa650217772 100644
--- a/local-cli/link/__tests__/promiseWaterfall.spec.js
+++ b/local-cli/link/__tests__/promiseWaterfall.spec.js
@@ -4,8 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * All rights reserved.
- *
  * @emails oncall+javascript_foundation
  */
 

From ecd3d9541875356fa1ee0293bf723de9d792acf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Thu, 8 Mar 2018 13:20:22 -0800
Subject: [PATCH 203/267] Ignore yarn.lock and package-lock.json in oss

Summary:
Attn janicduplessis
Closes https://github.com/facebook/react-native/pull/18281

Differential Revision: D7200858

Pulled By: hramos

fbshipit-source-id: 8566251255a12aba3a3f9d6af532c4f842a8c41e
---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 19c3bbdce24975..6b290712dbd6d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,8 @@ node_modules
 
 # TODO: Check in yarn.lock in open source. Right now we need to keep it out
 # from the GitHub repo as importing it might conflict with internal workspaces
-*/**/yarn.lock
+yarn.lock
+package-lock.json
 
 # OS X
 .DS_Store

From 49396aa78d218625c1933fa864acd70853faa9f9 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Thu, 8 Mar 2018 14:20:00 -0800
Subject: [PATCH 204/267] Fix typing of View refs

Reviewed By: olegbl

Differential Revision: D7192405

fbshipit-source-id: 9d9bce8202a5e8f44d92ef6d0afbf8f55e9ea95a
---
 Libraries/Image/ImageBackground.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Libraries/Image/ImageBackground.js b/Libraries/Image/ImageBackground.js
index 95d2b688a35006..405bced59ce254 100644
--- a/Libraries/Image/ImageBackground.js
+++ b/Libraries/Image/ImageBackground.js
@@ -17,8 +17,6 @@ const View = require('View');
 
 const ensureComponentIsNative = require('ensureComponentIsNative');
 
-import type {NativeMethodsMixinType} from 'ReactNativeTypes';
-
 /**
  * Very simple drop-in replacement for <Image> which supports nesting views.
  *
@@ -53,7 +51,7 @@ class ImageBackground extends React.Component<$FlowFixMeProps> {
     }
   }
 
-  _viewRef: ?NativeMethodsMixinType = null;
+  _viewRef: ?React.ElementRef<typeof View> = null;
 
   _captureRef = ref => {
     this._viewRef = ref;

From dbdf43b428da19a9eba012753904bcf33339ea9a Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Thu, 8 Mar 2018 15:43:23 -0800
Subject: [PATCH 205/267] propTypes are optional for native components

Summary:
We plan to migrate native components like View, Text, and Image to be typed with Flow instead of propTypes so that we can better enforce our usages.

This change makes it so that *if* propTypes are defined they must cover the native props. However, if they aren't specified, the validation doesn't occur.

Eventually, the prop validation should occur via codegen that generates an interface the native component must implement from the flow types defined in JS.

Reviewed By: yungsters

Differential Revision: D7203649

fbshipit-source-id: a8095aa46807ce03272e2962289e8f5705b422b9
---
 Libraries/ReactNative/verifyPropTypes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Libraries/ReactNative/verifyPropTypes.js b/Libraries/ReactNative/verifyPropTypes.js
index 30d29f200adb60..7791899d298b2f 100644
--- a/Libraries/ReactNative/verifyPropTypes.js
+++ b/Libraries/ReactNative/verifyPropTypes.js
@@ -17,7 +17,7 @@ export type ComponentInterface =
   | {
       name?: string,
       displayName?: string,
-      propTypes: Object,
+      propTypes?: Object,
     };
 
 function verifyPropTypes(
@@ -41,7 +41,7 @@ function verifyPropTypes(
     componentInterface.propTypes;
 
   if (!propTypes) {
-    throw new Error('`' + componentName + '` has no propTypes defined`');
+    return;
   }
 
   var nativeProps = viewConfig.NativeProps;

From 214da52fe76c1688d0c1a402b3e6c4d0fc19d882 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Thu, 8 Mar 2018 15:48:39 -0800
Subject: [PATCH 206/267] AccessibilityLabel is optional

Summary:
We have a bunch of components internally that use accessibilityLabel in invalid ways.
View was originally typed as any so invalid usages weren't caught. In order to fix these we have to move forward with getting back to flow having no errors. We are weakening these types to get there and we can tighten them again later.

Reviewed By: yungsters

Differential Revision: D7203260

fbshipit-source-id: 2282eba14899c620de5b4b1c1b2670b157f2fc9e
---
 Libraries/Components/View/ViewPropTypes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js
index 7ced5e35f2bf5a..570862988d67e2 100644
--- a/Libraries/Components/View/ViewPropTypes.js
+++ b/Libraries/Components/View/ViewPropTypes.js
@@ -46,7 +46,7 @@ export type ViewLayoutEvent = {
 // so we must include TVViewProps
 export type ViewProps = {
   accessible?: bool,
-  accessibilityLabel?: React$PropType$Primitive<any>,
+  accessibilityLabel?: null | React$PropType$Primitive<any> | string | Array<any> | any,
   accessibilityActions?: Array<string>,
   accessibilityComponentType?: AccessibilityComponentType,
   accessibilityLiveRegion?: 'none' | 'polite' | 'assertive',

From 34f8e7f848bf337e1c1e258faf8183204efa3e18 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Thu, 8 Mar 2018 17:50:17 -0800
Subject: [PATCH 207/267] `fabric/debug` module and `DebugStringConvertible`
 class

Summary:
This is a very first diff in a series of undefined length implementing React Native Shadow Tree infra in C++.
All Shadow Nodes, Props and etc. implements `DebugStringConvertible`.

Authored by shergin

Reviewed By: shergin

Differential Revision: D7163868

fbshipit-source-id: 9c001aa5bd0723f709a07b1833f512c51e3bec11
---
 ReactCommon/fabric/BUCK                       | 16 ++---
 ReactCommon/fabric/debug/BUCK                 | 46 ++++++++++++
 .../fabric/debug/DebugStringConvertible.cpp   | 71 +++++++++++++++++++
 .../fabric/debug/DebugStringConvertible.h     | 59 +++++++++++++++
 .../debug/DebugStringConvertibleItem.cpp      | 41 +++++++++++
 .../fabric/debug/DebugStringConvertibleItem.h | 45 ++++++++++++
 6 files changed, 269 insertions(+), 9 deletions(-)
 create mode 100644 ReactCommon/fabric/debug/BUCK
 create mode 100644 ReactCommon/fabric/debug/DebugStringConvertible.cpp
 create mode 100644 ReactCommon/fabric/debug/DebugStringConvertible.h
 create mode 100644 ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp
 create mode 100644 ReactCommon/fabric/debug/DebugStringConvertibleItem.h

diff --git a/ReactCommon/fabric/BUCK b/ReactCommon/fabric/BUCK
index fcf321eaeac051..9c5cc4a631c304 100644
--- a/ReactCommon/fabric/BUCK
+++ b/ReactCommon/fabric/BUCK
@@ -1,10 +1,5 @@
 load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "rn_xplat_cxx_library", "APPLE_INSPECTOR_FLAGS")
-
-CXX_LIBRARY_COMPILER_FLAGS = [
-    "-std=c++14",
-    "-Wall",
-]
+load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_xplat_target", "rn_xplat_cxx_library", "APPLE_INSPECTOR_FLAGS")
 
 APPLE_COMPILER_FLAGS = []
 
@@ -14,17 +9,19 @@ if not IS_OSS_BUILD:
 
 rn_xplat_cxx_library(
     name = "fabric",
-    srcs = glob(["**/*.cpp"]),
+    srcs = glob(["*.cpp"]),
     header_namespace = "",
     exported_headers = subdir_glob(
         [
-            ("", "**/*.h"),
+            ("", "*.h"),
         ],
         prefix = "fabric",
     ),
-    compiler_flags = CXX_LIBRARY_COMPILER_FLAGS + [
+    compiler_flags = [
         "-fexceptions",
         "-frtti",
+        "-std=c++14",
+        "-Wall",
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + APPLE_INSPECTOR_FLAGS,
@@ -42,5 +39,6 @@ rn_xplat_cxx_library(
         "xplat//folly:memory",
         "xplat//folly:molly",
         "xplat//third-party/glog:glog",
+        react_native_xplat_target("fabric/debug:debug"),
     ],
 )
diff --git a/ReactCommon/fabric/debug/BUCK b/ReactCommon/fabric/debug/BUCK
new file mode 100644
index 00000000000000..5a021202ebb776
--- /dev/null
+++ b/ReactCommon/fabric/debug/BUCK
@@ -0,0 +1,46 @@
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_xplat_target", "rn_xplat_cxx_library", "APPLE_INSPECTOR_FLAGS")
+
+APPLE_COMPILER_FLAGS = []
+
+if not IS_OSS_BUILD:
+    load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_static_library_ios_flags", "flags")
+    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), 'compiler_flags')
+
+rn_xplat_cxx_library(
+    name = "debug",
+    srcs = glob(
+        [
+            "**/*.cpp",
+        ],
+    ),
+    headers = glob(
+        [
+            "**/*.h",
+        ],
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        prefix = "fabric/debug",
+    ),
+    compiler_flags = [
+        "-std=c++14",
+        "-Wall",
+        "-fexceptions",
+        "-frtti",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + APPLE_INSPECTOR_FLAGS,
+    force_static = True,
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "xplat//folly:headers_only",
+    ],
+)
diff --git a/ReactCommon/fabric/debug/DebugStringConvertible.cpp b/ReactCommon/fabric/debug/DebugStringConvertible.cpp
new file mode 100644
index 00000000000000..8186297643e98f
--- /dev/null
+++ b/ReactCommon/fabric/debug/DebugStringConvertible.cpp
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "DebugStringConvertible.h"
+
+namespace facebook {
+namespace react {
+
+std::string DebugStringConvertible::getDebugChildrenDescription(int level) const {
+  std::string childrenString = "";
+
+  for (auto child : getDebugChildren()) {
+    childrenString += child->getDebugDescription(level + 1);
+  }
+
+  return childrenString;
+}
+
+std::string DebugStringConvertible::getDebugPropsDescription(int level) const {
+  std::string propsString = "";
+
+  for (auto prop : getDebugProps()) {
+    auto name = prop->getDebugName();
+    auto value = prop->getDebugValue();
+    auto children = prop->getDebugPropsDescription(level + 1);
+    auto valueAndChildren = value + (children.empty() ? "" : "(" + children + ")");
+    propsString += " " + name + (valueAndChildren.empty() ? "" : "=" + valueAndChildren);
+  }
+
+  if (!propsString.empty()) {
+    // Removing leading space character.
+    propsString.erase(propsString.begin());
+  }
+
+  return propsString;
+}
+
+std::string DebugStringConvertible::getDebugDescription(int level) const {
+  std::string nameString = getDebugName();
+  std::string valueString = getDebugValue();
+  std::string childrenString = getDebugChildrenDescription(level);
+  std::string propsString = getDebugPropsDescription(level);
+
+  return "<" + nameString +
+    (valueString.empty() ? "" : "=" + valueString) +
+    (propsString.empty() ? "" : " " + propsString) +
+    (childrenString.empty() ? "/>" : ">" + childrenString + "</" + nameString + ">");
+}
+
+std::string DebugStringConvertible::getDebugName() const {
+  return "Node";
+}
+
+std::string DebugStringConvertible::getDebugValue() const {
+  return "";
+}
+
+SharedDebugStringConvertibleList DebugStringConvertible::getDebugChildren() const {
+  return SharedDebugStringConvertibleList();
+}
+
+SharedDebugStringConvertibleList DebugStringConvertible::getDebugProps() const {
+  return SharedDebugStringConvertibleList();
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/debug/DebugStringConvertible.h b/ReactCommon/fabric/debug/DebugStringConvertible.h
new file mode 100644
index 00000000000000..b743a933243d74
--- /dev/null
+++ b/ReactCommon/fabric/debug/DebugStringConvertible.h
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace facebook {
+namespace react {
+
+class DebugStringConvertible;
+
+using SharedDebugStringConvertible = std::shared_ptr<const DebugStringConvertible>;
+using SharedDebugStringConvertibleList = std::vector<const SharedDebugStringConvertible>;
+
+// Abstract class describes conformance to DebugStringConvertible concept
+// and implements basic recursive debug string assembly algorithm.
+// Use this as a base class for providing a debugging textual representation
+// of your class.
+// TODO (#26770211): Clear up the naming.
+class DebugStringConvertible {
+
+public:
+  // Returns a name of the object.
+  // Default implementation returns "Node".
+  virtual std::string getDebugName() const;
+
+  // Returns a value assosiate with the object.
+  // Default implementation returns an empty string.
+  virtual std::string getDebugValue() const;
+
+  // Returns a list of `DebugStringConvertible` objects which can be considered
+  // as *children* of the object.
+  // Default implementation returns an empty list.
+  virtual SharedDebugStringConvertibleList getDebugChildren() const;
+
+  // Returns a list of `DebugStringConvertible` objects which can be considered
+  // as *properties* of the object.
+  // Default implementation returns an empty list.
+  virtual SharedDebugStringConvertibleList getDebugProps() const;
+
+  // Returns a string which represents the object in a human-readable way.
+  // Default implementation returns a description of the subtree
+  // rooted at this node, represented in XML-like format.
+  virtual std::string getDebugDescription(int level = 0) const;
+
+  // Do same as `getDebugDescription` but return only *children* and
+  // *properties* parts (which are used in `getDebugDescription`).
+  virtual std::string getDebugPropsDescription(int level = 0) const;
+  virtual std::string getDebugChildrenDescription(int level = 0) const;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp b/ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp
new file mode 100644
index 00000000000000..8baffb5b75d5a2
--- /dev/null
+++ b/ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "DebugStringConvertibleItem.h"
+
+namespace facebook {
+namespace react {
+
+DebugStringConvertibleItem::DebugStringConvertibleItem(
+  const std::string &name,
+  const std::string &value,
+  const SharedDebugStringConvertibleList &props,
+  const SharedDebugStringConvertibleList &children
+):
+  name_(name),
+  value_(value),
+  props_(props),
+  children_(children) {}
+
+std::string DebugStringConvertibleItem::getDebugName() const {
+  return name_;
+}
+
+std::string DebugStringConvertibleItem::getDebugValue() const {
+  return value_;
+}
+
+SharedDebugStringConvertibleList DebugStringConvertibleItem::getDebugProps() const {
+  return props_;
+}
+
+SharedDebugStringConvertibleList DebugStringConvertibleItem::getDebugChildren() const {
+  return children_;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/debug/DebugStringConvertibleItem.h b/ReactCommon/fabric/debug/DebugStringConvertibleItem.h
new file mode 100644
index 00000000000000..257ea1db2bc04a
--- /dev/null
+++ b/ReactCommon/fabric/debug/DebugStringConvertibleItem.h
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fabric/debug/DebugStringConvertible.h>
+
+namespace facebook {
+namespace react {
+
+// Trivial implementation of `DebugStringConvertible` abstract class
+// with a stored output; useful for assembling `DebugStringConvertible` values
+// in custom implementations of `getDebugChildren` and `getDebugProps`.
+class DebugStringConvertibleItem:
+  public DebugStringConvertible {
+
+public:
+  DebugStringConvertibleItem() = default;
+  DebugStringConvertibleItem(const DebugStringConvertibleItem &item) = default;
+
+  DebugStringConvertibleItem(
+    const std::string &name = "",
+    const std::string &value = "",
+    const SharedDebugStringConvertibleList &props = {},
+    const SharedDebugStringConvertibleList &children = {}
+  );
+
+  std::string getDebugName() const override;
+  std::string getDebugValue() const override;
+  SharedDebugStringConvertibleList getDebugChildren() const override;
+  SharedDebugStringConvertibleList getDebugProps() const override;
+
+private:
+  std::string name_;
+  std::string value_;
+  SharedDebugStringConvertibleList props_;
+  SharedDebugStringConvertibleList children_;
+};
+
+} // namespace react
+} // namespace facebook

From 3c86701ea7290d83ee5ebedce9474188605dd61e Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Thu, 8 Mar 2018 17:50:18 -0800
Subject: [PATCH 208/267] `fabric/core` module and `Sealable` class

Summary:
`Sealable` class represents something which can be *sealed* (imperatively marked as immutable).

Authored by shergin

Reviewed By: shergin

Differential Revision: D7174883

fbshipit-source-id: 8b26ca5b1a5154953a099895778eab86228acc46
---
 ReactCommon/fabric/BUCK                       |  2 +-
 ReactCommon/fabric/core/BUCK                  | 51 +++++++++++++++++
 .../fabric/core/primitives/Sealable.cpp       | 30 ++++++++++
 ReactCommon/fabric/core/primitives/Sealable.h | 57 +++++++++++++++++++
 4 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 ReactCommon/fabric/core/BUCK
 create mode 100644 ReactCommon/fabric/core/primitives/Sealable.cpp
 create mode 100644 ReactCommon/fabric/core/primitives/Sealable.h

diff --git a/ReactCommon/fabric/BUCK b/ReactCommon/fabric/BUCK
index 9c5cc4a631c304..6788c76801c954 100644
--- a/ReactCommon/fabric/BUCK
+++ b/ReactCommon/fabric/BUCK
@@ -39,6 +39,6 @@ rn_xplat_cxx_library(
         "xplat//folly:memory",
         "xplat//folly:molly",
         "xplat//third-party/glog:glog",
-        react_native_xplat_target("fabric/debug:debug"),
+        react_native_xplat_target("fabric/core:core"),
     ],
 )
diff --git a/ReactCommon/fabric/core/BUCK b/ReactCommon/fabric/core/BUCK
new file mode 100644
index 00000000000000..4001090955b434
--- /dev/null
+++ b/ReactCommon/fabric/core/BUCK
@@ -0,0 +1,51 @@
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_xplat_target", "rn_xplat_cxx_library", "APPLE_INSPECTOR_FLAGS")
+
+APPLE_COMPILER_FLAGS = []
+
+if not IS_OSS_BUILD:
+    load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_static_library_ios_flags", "flags")
+    APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), 'compiler_flags')
+
+rn_xplat_cxx_library(
+    name = "core",
+    srcs = glob(
+        [
+            "**/*.cpp",
+        ],
+    ),
+    headers = glob(
+        [
+            "**/*.h",
+        ],
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("primitives", "*.h"),
+        ],
+        prefix = "fabric/core",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + APPLE_INSPECTOR_FLAGS,
+    force_static = True,
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "xplat//fbsystrace:fbsystrace",
+        "xplat//folly:headers_only",
+        "xplat//folly:memory",
+        "xplat//folly:molly",
+        "xplat//third-party/glog:glog",
+        react_native_xplat_target("fabric/debug:debug"),
+    ],
+)
diff --git a/ReactCommon/fabric/core/primitives/Sealable.cpp b/ReactCommon/fabric/core/primitives/Sealable.cpp
new file mode 100644
index 00000000000000..fc4bb8c259ec4d
--- /dev/null
+++ b/ReactCommon/fabric/core/primitives/Sealable.cpp
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "Sealable.h"
+
+#include <stdexcept>
+
+namespace facebook {
+namespace react {
+
+void Sealable::seal() const {
+  sealed_ = true;
+}
+
+bool Sealable::getSealed() const {
+  return sealed_;
+}
+
+void Sealable::ensureUnsealed() const {
+  if (sealed_) {
+    throw std::runtime_error("Attempt to mutate a sealed object.");
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/fabric/core/primitives/Sealable.h b/ReactCommon/fabric/core/primitives/Sealable.h
new file mode 100644
index 00000000000000..1f8fa0f093a073
--- /dev/null
+++ b/ReactCommon/fabric/core/primitives/Sealable.h
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+namespace facebook {
+namespace react {
+
+/*
+ * Represents something which can be *sealed* (imperatively marked as immutable).
+ *
+ * Why do we need this? In Fabric, some objects are semi-immutable
+ * even if they explicitly marked as `const`. It means that in some special
+ * cases those objects can be const-cast-away and then mutated. That comes from
+ * the fact that we share some object's life-cycle responsibilities with React
+ * and the immutability is guaranteed by some logic splitted between native and
+ * JavaScript worlds (which makes impossible to fully use immutability
+ * enforcement at a language level).
+ * To detect possible errors as early as possible we additionally mark objects
+ * as *sealed* after some stage and then enforce this at run-time.
+ *
+ * How to use:
+ *   1. Inherit your class from `Sealable`.
+ *   2. Call `ensureUnsealed()` from all non-const methods.
+ *   3. Call `seal()` at some point from which any modifications
+ *      must be prevented.
+ */
+class Sealable {
+public:
+  /*
+   * Seals the object. This operation is irreversible;
+   * the object cannot be "unsealed" after being sealing.
+   */
+  void seal() const;
+
+  /*
+   * Returns if the object already sealed or not.
+   */
+  bool getSealed() const;
+
+protected:
+  /*
+   * Throws an exception if the object is sealed.
+   * Call this from all non-`const` methods.
+   */
+  void ensureUnsealed() const;
+
+private:
+  mutable bool sealed_ {false};
+};
+
+} // namespace react
+} // namespace facebook

From 118521c20bcbc7f12bcc337f653d551b5992da05 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Thu, 8 Mar 2018 23:33:06 -0800
Subject: [PATCH 209/267] RN: Prettify Systrace

Reviewed By: TheSavior

Differential Revision: D7207468

fbshipit-source-id: 05ae6e003ae3e55bc2d3a905f41c28f7041dd7f0
---
 Libraries/Performance/Systrace.js | 268 ++++++++++++++++--------------
 1 file changed, 141 insertions(+), 127 deletions(-)

diff --git a/Libraries/Performance/Systrace.js b/Libraries/Performance/Systrace.js
index 1abedee7c1734b..8b4aa1fc62faec 100644
--- a/Libraries/Performance/Systrace.js
+++ b/Libraries/Performance/Systrace.js
@@ -6,7 +6,9 @@
  *
  * @providesModule Systrace
  * @flow
+ * @format
  */
+
 'use strict';
 
 const invariant = require('fbjs/lib/invariant');
@@ -14,18 +16,17 @@ const invariant = require('fbjs/lib/invariant');
 type RelayProfiler = {
   attachProfileHandler(
     name: string,
-    handler: (name: string, state?: any) => () => void
+    handler: (name: string, state?: any) => () => void,
   ): void,
 
   attachAggregateHandler(
     name: string,
-    handler: (name: string, callback: () => void) => void
+    handler: (name: string, callback: () => void) => void,
   ): void,
 };
 
-/* eslint no-bitwise: 0 */
-const TRACE_TAG_REACT_APPS = 1 << 17;
-const TRACE_TAG_JS_VM_CALLS = 1 << 27;
+const TRACE_TAG_REACT_APPS = 1 << 17; // eslint-disable-line no-bitwise
+const TRACE_TAG_JS_VM_CALLS = 1 << 27; // eslint-disable-line no-bitwise
 
 let _enabled = false;
 let _asyncCookie = 0;
@@ -36,66 +37,68 @@ let _canInstallReactHook = false;
 // Implements a subset of User Timing API necessary for React measurements.
 // https://developer.mozilla.org/en-US/docs/Web/API/User_Timing_API
 const REACT_MARKER = '\u269B';
-const userTimingPolyfill = __DEV__ ? {
-  mark(markName: string) {
-    if (_enabled) {
-      _markStackIndex++;
-      _markStack[_markStackIndex] = markName;
-      let systraceLabel = markName;
-      // Since perf measurements are a shared namespace in User Timing API,
-      // we prefix all React results with a React emoji.
-      if (markName[0] === REACT_MARKER) {
-        // This is coming from React.
-        // Removing component IDs keeps trace colors stable.
-        const indexOfId = markName.lastIndexOf(' (#');
-        const cutoffIndex = indexOfId !== -1 ? indexOfId : markName.length;
-        // Also cut off the emoji because it breaks Systrace
-        systraceLabel = markName.slice(2, cutoffIndex);
-      }
-      Systrace.beginEvent(systraceLabel);
-    }
-  },
-  measure(measureName: string, startMark: ?string, endMark: ?string) {
-    if (_enabled) {
-      invariant(
-        typeof measureName === 'string' &&
-        typeof startMark === 'string' &&
-        typeof endMark === 'undefined',
-        'Only performance.measure(string, string) overload is supported.'
-      );
-      const topMark = _markStack[_markStackIndex];
-      invariant(
-        startMark === topMark,
-        'There was a mismatching performance.measure() call. ' +
-        'Expected "%s" but got "%s."',
-        topMark,
-        startMark,
-      );
-      _markStackIndex--;
-      // We can't use more descriptive measureName because Systrace doesn't
-      // let us edit labels post factum.
-      Systrace.endEvent();
-    }
-  },
-  clearMarks(markName: string) {
-    if (_enabled) {
-      if (_markStackIndex === -1) {
-        return;
-      }
-      if (markName === _markStack[_markStackIndex]) {
-        // React uses this for "cancelling" started measurements.
-        // Systrace doesn't support deleting measurements, so we just stop them.
-        if (userTimingPolyfill != null) {
-          userTimingPolyfill.measure(markName, markName);
+const userTimingPolyfill = __DEV__
+  ? {
+      mark(markName: string) {
+        if (_enabled) {
+          _markStackIndex++;
+          _markStack[_markStackIndex] = markName;
+          let systraceLabel = markName;
+          // Since perf measurements are a shared namespace in User Timing API,
+          // we prefix all React results with a React emoji.
+          if (markName[0] === REACT_MARKER) {
+            // This is coming from React.
+            // Removing component IDs keeps trace colors stable.
+            const indexOfId = markName.lastIndexOf(' (#');
+            const cutoffIndex = indexOfId !== -1 ? indexOfId : markName.length;
+            // Also cut off the emoji because it breaks Systrace
+            systraceLabel = markName.slice(2, cutoffIndex);
+          }
+          Systrace.beginEvent(systraceLabel);
         }
-      }
+      },
+      measure(measureName: string, startMark: ?string, endMark: ?string) {
+        if (_enabled) {
+          invariant(
+            typeof measureName === 'string' &&
+              typeof startMark === 'string' &&
+              typeof endMark === 'undefined',
+            'Only performance.measure(string, string) overload is supported.',
+          );
+          const topMark = _markStack[_markStackIndex];
+          invariant(
+            startMark === topMark,
+            'There was a mismatching performance.measure() call. ' +
+              'Expected "%s" but got "%s."',
+            topMark,
+            startMark,
+          );
+          _markStackIndex--;
+          // We can't use more descriptive measureName because Systrace doesn't
+          // let us edit labels post factum.
+          Systrace.endEvent();
+        }
+      },
+      clearMarks(markName: string) {
+        if (_enabled) {
+          if (_markStackIndex === -1) {
+            return;
+          }
+          if (markName === _markStack[_markStackIndex]) {
+            // React uses this for "cancelling" started measurements.
+            // Systrace doesn't support deleting measurements, so we just stop them.
+            if (userTimingPolyfill != null) {
+              userTimingPolyfill.measure(markName, markName);
+            }
+          }
+        }
+      },
+      clearMeasures() {
+        // React calls this to avoid memory leaks in browsers, but we don't keep
+        // measurements anyway.
+      },
     }
-  },
-  clearMeasures() {
-    // React calls this to avoid memory leaks in browsers, but we don't keep
-    // measurements anyway.
-  },
-} : null;
+  : null;
 
 const Systrace = {
   installReactHook() {
@@ -111,9 +114,11 @@ const Systrace = {
     if (_enabled !== enabled) {
       if (__DEV__) {
         if (enabled) {
-          global.nativeTraceBeginLegacy && global.nativeTraceBeginLegacy(TRACE_TAG_JS_VM_CALLS);
+          global.nativeTraceBeginLegacy &&
+            global.nativeTraceBeginLegacy(TRACE_TAG_JS_VM_CALLS);
         } else {
-          global.nativeTraceEndLegacy && global.nativeTraceEndLegacy(TRACE_TAG_JS_VM_CALLS);
+          global.nativeTraceEndLegacy &&
+            global.nativeTraceEndLegacy(TRACE_TAG_JS_VM_CALLS);
         }
         if (_canInstallReactHook) {
           if (enabled && global.performance === undefined) {
@@ -131,11 +136,11 @@ const Systrace = {
 
   /**
    * beginEvent/endEvent for starting and then ending a profile within the same call stack frame
-  **/
+   **/
   beginEvent(profileName?: any, args?: any) {
     if (_enabled) {
-      profileName = typeof profileName === 'function' ?
-        profileName() : profileName;
+      profileName =
+        typeof profileName === 'function' ? profileName() : profileName;
       global.nativeTraceBeginSection(TRACE_TAG_REACT_APPS, profileName, args);
     }
   },
@@ -150,33 +155,41 @@ const Systrace = {
    * beginAsyncEvent/endAsyncEvent for starting and then ending a profile where the end can either
    * occur on another thread or out of the current stack frame, eg await
    * the returned cookie variable should be used as input into the endAsyncEvent call to end the profile
-  **/
+   **/
   beginAsyncEvent(profileName?: any): any {
     const cookie = _asyncCookie;
     if (_enabled) {
       _asyncCookie++;
-      profileName = typeof profileName === 'function' ?
-        profileName() : profileName;
-      global.nativeTraceBeginAsyncSection(TRACE_TAG_REACT_APPS, profileName, cookie);
+      profileName =
+        typeof profileName === 'function' ? profileName() : profileName;
+      global.nativeTraceBeginAsyncSection(
+        TRACE_TAG_REACT_APPS,
+        profileName,
+        cookie,
+      );
     }
     return cookie;
   },
 
   endAsyncEvent(profileName?: any, cookie?: any) {
     if (_enabled) {
-      profileName = typeof profileName === 'function' ?
-        profileName() : profileName;
-      global.nativeTraceEndAsyncSection(TRACE_TAG_REACT_APPS, profileName, cookie);
+      profileName =
+        typeof profileName === 'function' ? profileName() : profileName;
+      global.nativeTraceEndAsyncSection(
+        TRACE_TAG_REACT_APPS,
+        profileName,
+        cookie,
+      );
     }
   },
 
   /**
    * counterEvent registers the value to the profileName on the systrace timeline
-  **/
+   **/
   counterEvent(profileName?: any, value?: any) {
     if (_enabled) {
-      profileName = typeof profileName === 'function' ?
-        profileName() : profileName;
+      profileName =
+        typeof profileName === 'function' ? profileName() : profileName;
       global.nativeTraceCounter &&
         global.nativeTraceCounter(TRACE_TAG_REACT_APPS, profileName, value);
     }
@@ -185,7 +198,7 @@ const Systrace = {
   /**
    * Relay profiles use await calls, so likely occur out of current stack frame
    * therefore async variant of profiling is used
-  **/
+   **/
   attachToRelayProfiler(relayProfiler: RelayProfiler) {
     relayProfiler.attachProfileHandler('*', (name, state?) => {
       if (state != null && state.queryName !== undefined) {
@@ -207,60 +220,61 @@ const Systrace = {
   /* This is not called by default due to perf overhead but it's useful
      if you want to find traces which spend too much time in JSON. */
   swizzleJSON() {
-    Systrace.measureMethods(JSON, 'JSON', [
-      'parse',
-      'stringify'
-    ]);
+    Systrace.measureMethods(JSON, 'JSON', ['parse', 'stringify']);
   },
 
- /**
-  * Measures multiple methods of a class. For example, you can do:
-  * Systrace.measureMethods(JSON, 'JSON', ['parse', 'stringify']);
-  *
-  * @param object
-  * @param objectName
-  * @param methodNames Map from method names to method display names.
-  */
- measureMethods(object: any, objectName: string, methodNames: Array<string>): void {
-   if (!__DEV__) {
-     return;
-   }
+  /**
+   * Measures multiple methods of a class. For example, you can do:
+   * Systrace.measureMethods(JSON, 'JSON', ['parse', 'stringify']);
+   *
+   * @param object
+   * @param objectName
+   * @param methodNames Map from method names to method display names.
+   */
+  measureMethods(
+    object: any,
+    objectName: string,
+    methodNames: Array<string>,
+  ): void {
+    if (!__DEV__) {
+      return;
+    }
 
-   methodNames.forEach(methodName => {
-     object[methodName] = Systrace.measure(
-       objectName,
-       methodName,
-       object[methodName]
-     );
-   });
- },
+    methodNames.forEach(methodName => {
+      object[methodName] = Systrace.measure(
+        objectName,
+        methodName,
+        object[methodName],
+      );
+    });
+  },
 
- /**
-  * Returns an profiled version of the input function. For example, you can:
-  * JSON.parse = Systrace.measure('JSON', 'parse', JSON.parse);
-  *
-  * @param objName
-  * @param fnName
-  * @param {function} func
-  * @return {function} replacement function
-  */
- measure(objName: string, fnName: string, func: any): any {
-   if (!__DEV__) {
-     return func;
-   }
+  /**
+   * Returns an profiled version of the input function. For example, you can:
+   * JSON.parse = Systrace.measure('JSON', 'parse', JSON.parse);
+   *
+   * @param objName
+   * @param fnName
+   * @param {function} func
+   * @return {function} replacement function
+   */
+  measure(objName: string, fnName: string, func: any): any {
+    if (!__DEV__) {
+      return func;
+    }
 
-   const profileName = `${objName}.${fnName}`;
-   return function() {
-     if (!_enabled) {
-       return func.apply(this, arguments);
-     }
+    const profileName = `${objName}.${fnName}`;
+    return function() {
+      if (!_enabled) {
+        return func.apply(this, arguments);
+      }
 
-     Systrace.beginEvent(profileName);
-     const ret = func.apply(this, arguments);
-     Systrace.endEvent();
-     return ret;
-   };
- },
+      Systrace.beginEvent(profileName);
+      const ret = func.apply(this, arguments);
+      Systrace.endEvent();
+      return ret;
+    };
+  },
 };
 
 if (__DEV__) {

From a8c4b630fcaee40620060c77c44ab384e9284c0f Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Thu, 8 Mar 2018 23:33:08 -0800
Subject: [PATCH 210/267] RN: Delete Systrace for RelayClassic

Reviewed By: TheSavior

Differential Revision: D7207462

fbshipit-source-id: 6dd5c5fd22c0a5a7d77331d6adf7b362c3d3e037
---
 Libraries/Performance/Systrace.js | 34 -------------------------------
 1 file changed, 34 deletions(-)

diff --git a/Libraries/Performance/Systrace.js b/Libraries/Performance/Systrace.js
index 8b4aa1fc62faec..a84de6d04b2e4e 100644
--- a/Libraries/Performance/Systrace.js
+++ b/Libraries/Performance/Systrace.js
@@ -13,18 +13,6 @@
 
 const invariant = require('fbjs/lib/invariant');
 
-type RelayProfiler = {
-  attachProfileHandler(
-    name: string,
-    handler: (name: string, state?: any) => () => void,
-  ): void,
-
-  attachAggregateHandler(
-    name: string,
-    handler: (name: string, callback: () => void) => void,
-  ): void,
-};
-
 const TRACE_TAG_REACT_APPS = 1 << 17; // eslint-disable-line no-bitwise
 const TRACE_TAG_JS_VM_CALLS = 1 << 27; // eslint-disable-line no-bitwise
 
@@ -195,28 +183,6 @@ const Systrace = {
     }
   },
 
-  /**
-   * Relay profiles use await calls, so likely occur out of current stack frame
-   * therefore async variant of profiling is used
-   **/
-  attachToRelayProfiler(relayProfiler: RelayProfiler) {
-    relayProfiler.attachProfileHandler('*', (name, state?) => {
-      if (state != null && state.queryName !== undefined) {
-        name += '_' + state.queryName;
-      }
-      const cookie = Systrace.beginAsyncEvent(name);
-      return () => {
-        Systrace.endAsyncEvent(name, cookie);
-      };
-    });
-
-    relayProfiler.attachAggregateHandler('*', (name, callback) => {
-      Systrace.beginEvent(name);
-      callback();
-      Systrace.endEvent();
-    });
-  },
-
   /* This is not called by default due to perf overhead but it's useful
      if you want to find traces which spend too much time in JSON. */
   swizzleJSON() {

From 3e141cb6c957143e998bf2926b8fe1aabccbce2d Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Thu, 8 Mar 2018 23:33:10 -0800
Subject: [PATCH 211/267] RN: Delete Systrace.swizzleJSON

Reviewed By: TheSavior

Differential Revision: D7207460

fbshipit-source-id: 14b1174d6a5c75e1acba7272376d1c462bc13cb6
---
 Libraries/Performance/Systrace.js | 59 -------------------------------
 1 file changed, 59 deletions(-)

diff --git a/Libraries/Performance/Systrace.js b/Libraries/Performance/Systrace.js
index a84de6d04b2e4e..2e38d8298d1e39 100644
--- a/Libraries/Performance/Systrace.js
+++ b/Libraries/Performance/Systrace.js
@@ -182,65 +182,6 @@ const Systrace = {
         global.nativeTraceCounter(TRACE_TAG_REACT_APPS, profileName, value);
     }
   },
-
-  /* This is not called by default due to perf overhead but it's useful
-     if you want to find traces which spend too much time in JSON. */
-  swizzleJSON() {
-    Systrace.measureMethods(JSON, 'JSON', ['parse', 'stringify']);
-  },
-
-  /**
-   * Measures multiple methods of a class. For example, you can do:
-   * Systrace.measureMethods(JSON, 'JSON', ['parse', 'stringify']);
-   *
-   * @param object
-   * @param objectName
-   * @param methodNames Map from method names to method display names.
-   */
-  measureMethods(
-    object: any,
-    objectName: string,
-    methodNames: Array<string>,
-  ): void {
-    if (!__DEV__) {
-      return;
-    }
-
-    methodNames.forEach(methodName => {
-      object[methodName] = Systrace.measure(
-        objectName,
-        methodName,
-        object[methodName],
-      );
-    });
-  },
-
-  /**
-   * Returns an profiled version of the input function. For example, you can:
-   * JSON.parse = Systrace.measure('JSON', 'parse', JSON.parse);
-   *
-   * @param objName
-   * @param fnName
-   * @param {function} func
-   * @return {function} replacement function
-   */
-  measure(objName: string, fnName: string, func: any): any {
-    if (!__DEV__) {
-      return func;
-    }
-
-    const profileName = `${objName}.${fnName}`;
-    return function() {
-      if (!_enabled) {
-        return func.apply(this, arguments);
-      }
-
-      Systrace.beginEvent(profileName);
-      const ret = func.apply(this, arguments);
-      Systrace.endEvent();
-      return ret;
-    };
-  },
 };
 
 if (__DEV__) {

From 8803ab2f11f9033ad8828c48f5c8947d1dc98f67 Mon Sep 17 00:00:00 2001
From: Alexey Lang <alexeylang@fb.com>
Date: Fri, 9 Mar 2018 04:10:00 -0800
Subject: [PATCH 212/267] Fix race condition when there're two flags next to
 each other

Reviewed By: yungsters

Differential Revision: D7194598

fbshipit-source-id: a76328d63f649403de15503596a179c7baaf7dc3
---
 Libraries/Utilities/PerformanceLogger.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Libraries/Utilities/PerformanceLogger.js b/Libraries/Utilities/PerformanceLogger.js
index 80184eda1c5c53..95b5f4924e89ef 100644
--- a/Libraries/Utilities/PerformanceLogger.js
+++ b/Libraries/Utilities/PerformanceLogger.js
@@ -109,6 +109,9 @@ const PerformanceLogger = {
   clear() {
     timespans = {};
     extras = {};
+    if (__DEV__ && PRINT_TO_CONSOLE) {
+      infoLog('PerformanceLogger.js', 'clear');
+    }
   },
 
   clearCompleted() {
@@ -118,6 +121,9 @@ const PerformanceLogger = {
       }
     }
     extras = {};
+    if (__DEV__ && PRINT_TO_CONSOLE) {
+      infoLog('PerformanceLogger.js', 'clearCompleted');
+    }
   },
 
   clearExceptTimespans(keys: Array<string>) {

From 20fcf4779c83746874cdb27132852352313fbc28 Mon Sep 17 00:00:00 2001
From: Alex Dvornikov <advornikov@fb.com>
Date: Fri, 9 Mar 2018 08:17:25 -0800
Subject: [PATCH 213/267] Make fetchSegment native hook name consistent with __
 prefix

Reviewed By: jeanlauliac

Differential Revision: D7205472

fbshipit-source-id: 4cef66539167ed47cf0ac8d3665c20114ffff375
---
 Libraries/Core/InitializeCore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Core/InitializeCore.js b/Libraries/Core/InitializeCore.js
index e2a624e468ab51..c97576397a94b6 100644
--- a/Libraries/Core/InitializeCore.js
+++ b/Libraries/Core/InitializeCore.js
@@ -161,7 +161,7 @@ BatchedBridge.registerLazyCallableModule('RCTNativeAppEventEmitter', () => requi
 BatchedBridge.registerLazyCallableModule('PerformanceLogger', () => require('PerformanceLogger'));
 BatchedBridge.registerLazyCallableModule('JSDevSupportModule', () => require('JSDevSupportModule'));
 
-global.fetchSegment = function(
+global.__fetchSegment = function(
   segmentId: number,
   callback: (?Error) => void,
 ) {

From a7558d58a08f7d1bb650574842b24e181b1bd68b Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Fri, 9 Mar 2018 09:39:38 -0800
Subject: [PATCH 214/267] Clone ReactShadowNode when Yoga clones a YogaNode
 during layout

Reviewed By: achen1

Differential Revision: D7195840

fbshipit-source-id: d596e3ada8fe48577b91295721d41c0afd33087f
---
 .../react/uimanager/ReactShadowNodeImpl.java     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index 5624324c04d24a..51846af18f2c9a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -21,6 +21,7 @@
 import com.facebook.yoga.YogaJustify;
 import com.facebook.yoga.YogaMeasureFunction;
 import com.facebook.yoga.YogaNode;
+import com.facebook.yoga.YogaNodeClonedFunction;
 import com.facebook.yoga.YogaOverflow;
 import com.facebook.yoga.YogaPositionType;
 import com.facebook.yoga.YogaValue;
@@ -58,6 +59,19 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
   private static final YogaConfig sYogaConfig;
   static {
     sYogaConfig = ReactYogaConfigProvider.get();
+    sYogaConfig.setOnNodeCloned(new YogaNodeClonedFunction() {
+      @Override
+      public void onNodeCloned(YogaNode oldYogaNode,
+          YogaNode newYogaNode,
+          YogaNode parent,
+          int childIndex) {
+        ReactShadowNode parentReactShadowNode = (ReactShadowNode) parent.getData();
+        Assertions.assertNotNull(parentReactShadowNode);
+
+        ReactShadowNode newReactShadowNode = (ReactShadowNode) newYogaNode.getData();
+        Assertions.assertNotNull(newReactShadowNode);
+      }
+    });
   }
 
   private int mReactTag;
@@ -88,6 +102,7 @@ public ReactShadowNodeImpl() {
     if (!isVirtual()) {
       YogaNode node = YogaNodePool.get().acquire();
       mYogaNode = node == null ? new YogaNode(sYogaConfig) : node;
+      mYogaNode.setData(this);
       Arrays.fill(mPadding, YogaConstants.UNDEFINED);
     } else {
       mYogaNode = null;
@@ -117,6 +132,7 @@ public ReactShadowNodeImpl(ReactShadowNodeImpl original) {
       arraycopy(original.mPadding, 0, mPadding, 0, original.mPadding.length);
       arraycopy(original.mPaddingIsPercent, 0, mPaddingIsPercent, 0, original.mPaddingIsPercent.length);
       mYogaNode = original.mYogaNode.clone();
+      mYogaNode.setData(this);
     } catch (CloneNotSupportedException e) {
       // it should never happen
       throw new IllegalArgumentException();

From e31781be612e6e2c8b911444ef0299e9d390e1b2 Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Fri, 9 Mar 2018 09:39:40 -0800
Subject: [PATCH 215/267] Add extra debug information to ReactShadowNodes
 objects

Reviewed By: achen1

Differential Revision: D7195373

fbshipit-source-id: 6611726c3e1f92f387e00e733b1b8909a3e9edc2
---
 .../com/facebook/react/uimanager/ReactShadowNodeImpl.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index 51846af18f2c9a..2390f56819a50e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -994,9 +994,10 @@ private void getHierarchyInfoWithIndentation(StringBuilder result, int level) {
       result.append("__");
     }
 
-    result.append(getClass().getSimpleName()).append(" ");
+    result.append(getClass().getSimpleName()).append(" ").append(getReactTag()).append(" ");
     if (mYogaNode != null) {
-      result.append(getLayoutWidth()).append(",").append(getLayoutHeight());
+      result.append(getScreenX()).append(";").append(getScreenY()).append(";")
+        .append(getLayoutWidth()).append(";").append(getLayoutHeight());
     } else {
       result.append("(virtual node)");
     }

From c883d4e72772d124324855148b48f0111fbb9c1e Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Fri, 9 Mar 2018 09:39:42 -0800
Subject: [PATCH 216/267] Add "newProps" map into ReactShadowNode

Reviewed By: achen1

Differential Revision: D7205127

fbshipit-source-id: 6c27070806de36cab7adf9c392a10c815aee90d4
---
 .../react/fabric/FabricUIManager.java         |  6 ++--
 .../react/uimanager/ReactShadowNode.java      |  6 ++++
 .../react/uimanager/ReactShadowNodeImpl.java  | 32 ++++++++++++++++++-
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index 2fa9557f529337..6fd4c1ae2d69db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -140,8 +140,7 @@ public ReactShadowNode cloneNodeWithNewProps(
       ReactShadowNode node,
       @Nullable ReadableNativeMap newProps) {
     try {
-      ReactShadowNode clone = node.mutableCopy();
-      updateProps(clone, newProps);
+      ReactShadowNode clone = node.mutableCopyWithNewProps(newProps == null ? null : new ReactStylesDiffMap(newProps));
       assertReactShadowNodeCopy(node, clone);
       return clone;
     } catch (Throwable t) {
@@ -161,8 +160,7 @@ public ReactShadowNode cloneNodeWithNewChildrenAndProps(
       ReactShadowNode node,
       ReadableNativeMap newProps) {
     try {
-      ReactShadowNode clone = node.mutableCopyWithNewChildren();
-      updateProps(clone, newProps);
+      ReactShadowNode clone = node.mutableCopyWithNewChildrenAndProps(newProps == null ? null : new ReactStylesDiffMap(newProps));
       assertReactShadowNodeCopy(node, clone);
       return clone;
     } catch (Throwable t) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
index 71f8d0936bd4f5..ab8e2692533ab8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
@@ -72,8 +72,12 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
    */
   T mutableCopy();
 
+  T mutableCopyWithNewProps(@Nullable ReactStylesDiffMap newProps);
+
   T mutableCopyWithNewChildren();
 
+  T mutableCopyWithNewChildrenAndProps(@Nullable ReactStylesDiffMap newProps);
+
   String getViewClass();
 
   boolean hasUpdates();
@@ -100,6 +104,8 @@ public interface ReactShadowNode<T extends ReactShadowNode> {
 
   void removeAndDisposeAllChildren();
 
+  @Nullable ReactStylesDiffMap getNewProps();
+
   /**
    * This method will be called by {@link UIManagerModule} once per batch, before calculating
    * layout. Will be only called for nodes that are marked as updated with {@link #markUpdated()} or
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
index 2390f56819a50e..664dd09729af13 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java
@@ -98,6 +98,8 @@ public void onNodeCloned(YogaNode oldYogaNode,
   private final boolean[] mPaddingIsPercent = new boolean[Spacing.ALL + 1];
   private final YogaNode mYogaNode;
 
+  private @Nullable ReactStylesDiffMap mNewProps;
+
   public ReactShadowNodeImpl() {
     if (!isVirtual()) {
       YogaNode node = YogaNodePool.get().acquire();
@@ -119,7 +121,6 @@ public ReactShadowNodeImpl(ReactShadowNodeImpl original) {
       mShouldNotifyOnLayout = original.mShouldNotifyOnLayout;
       mNodeUpdated = original.mNodeUpdated;
       mChildren = original.mChildren == null ? null : new ArrayList<>(original.mChildren);
-      mParent = null;
       mIsLayoutOnly = original.mIsLayoutOnly;
       mTotalNativeChildren = original.mTotalNativeChildren;
       mNativeParent = original.mNativeParent;
@@ -133,6 +134,8 @@ public ReactShadowNodeImpl(ReactShadowNodeImpl original) {
       arraycopy(original.mPaddingIsPercent, 0, mPaddingIsPercent, 0, original.mPaddingIsPercent.length);
       mYogaNode = original.mYogaNode.clone();
       mYogaNode.setData(this);
+      mParent = null;
+      mNewProps = null;
     } catch (CloneNotSupportedException e) {
       // it should never happen
       throw new IllegalArgumentException();
@@ -152,6 +155,27 @@ public ReactShadowNodeImpl mutableCopyWithNewChildren() {
     return copy;
   }
 
+  @Override
+  public ReactShadowNodeImpl mutableCopyWithNewProps(@Nullable ReactStylesDiffMap newProps) {
+    ReactShadowNodeImpl copy = mutableCopy();
+    if (newProps != null) {
+      copy.updateProperties(newProps);
+      copy.mNewProps = newProps;
+    }
+    return copy;
+  }
+
+  @Override
+  public ReactShadowNodeImpl mutableCopyWithNewChildrenAndProps(@Nullable ReactStylesDiffMap newProps) {
+    ReactShadowNodeImpl copy = mutableCopyWithNewChildren();
+    if (newProps != null) {
+      copy.updateProperties(newProps);
+      copy.mNewProps = newProps;
+    }
+    return copy;
+  }
+
+
   /**
    * Nodes that return {@code true} will be treated as "virtual" nodes. That is, nodes that are not
    * mapped into native views (e.g. nested text node). By default this method returns {@code false}.
@@ -360,6 +384,12 @@ public void onAfterUpdateTransaction() {
     // no-op
   }
 
+  @Override
+  @Nullable
+  public ReactStylesDiffMap getNewProps() {
+    return mNewProps;
+  }
+
   /**
    * Called after layout step at the end of the UI batch from {@link UIManagerModule}. May be used
    * to enqueue additional ui operations for the native view. Will only be called on nodes marked as

From 2520c645f863c299e8dccb844bac3dc6a9d553e0 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Fri, 9 Mar 2018 10:14:35 -0800
Subject: [PATCH 217/267] Fixing Assorted View Flow Types

Reviewed By: yungsters

Differential Revision: D7209495

fbshipit-source-id: e4b247e947b3463ea1200298e6078c7485d636e7
---
 Libraries/Components/View/ViewPropTypes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js
index 570862988d67e2..0665d6f2c5e63a 100644
--- a/Libraries/Components/View/ViewPropTypes.js
+++ b/Libraries/Components/View/ViewPropTypes.js
@@ -71,7 +71,7 @@ export type ViewProps = {
   onMoveShouldSetResponder?: Function,
   onMoveShouldSetResponderCapture?: Function,
   hitSlop?: EdgeInsetsProp,
-  pointerEvents?: 'box-none'| 'none'| 'box-only'| 'auto',
+  pointerEvents?: null | 'box-none'| 'none'| 'box-only'| 'auto',
   style?: stylePropType,
   removeClippedSubviews?: bool,
   renderToHardwareTextureAndroid?: bool,

From f1316cab6c351852ef1da9939d4c8f0244fb8a6f Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Fri, 9 Mar 2018 10:14:37 -0800
Subject: [PATCH 218/267] Making values optional in ViewPropTypes

Reviewed By: yungsters

Differential Revision: D7209560

fbshipit-source-id: fd0c55c4f69648927380d12ad9a6b9bcb98047eb
---
 Libraries/Components/View/ViewPropTypes.js | 43 +++++++++-------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js
index 0665d6f2c5e63a..574bd577cc9997 100644
--- a/Libraries/Components/View/ViewPropTypes.js
+++ b/Libraries/Components/View/ViewPropTypes.js
@@ -9,6 +9,7 @@
  */
 'use strict';
 
+const React = require('React');
 const EdgeInsetsPropType = require('EdgeInsetsPropType');
 const PlatformViewPropTypes = require('PlatformViewPropTypes');
 const PropTypes = require('prop-types');
@@ -26,21 +27,12 @@ import type {
 } from 'ViewAccessibility';
 import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
 import type {TVViewProps} from 'TVViewPropTypes';
+import type {Layout, LayoutEvent} from 'CoreEventTypes';
 
 const stylePropType = StyleSheetPropType(ViewStylePropTypes);
 
-export type ViewLayout = {
-  x: number,
-  y: number,
-  width: number,
-  height: number,
-}
-
-export type ViewLayoutEvent = {
-  nativeEvent: {
-    layout: ViewLayout,
-  }
-}
+export type ViewLayout = Layout;
+export type ViewLayoutEvent = LayoutEvent;
 
 // There's no easy way to create a different type if (Platform.isTVOS):
 // so we must include TVViewProps
@@ -54,23 +46,24 @@ export type ViewProps = {
   accessibilityTraits?: AccessibilityTrait | Array<AccessibilityTrait>,
   accessibilityViewIsModal?: bool,
   accessibilityElementsHidden?: bool,
+  children?: ?React.Node,
   onAccessibilityAction?: Function,
   onAccessibilityTap?: Function,
   onMagicTap?: Function,
-  testID?: string,
+  testID?: ?string,
   nativeID?: string,
-  onLayout?: (event: ViewLayoutEvent) => void,
-  onResponderGrant?: Function,
-  onResponderMove?: Function,
-  onResponderReject?: Function,
-  onResponderRelease?: Function,
-  onResponderTerminate?: Function,
-  onResponderTerminationRequest?: Function,
-  onStartShouldSetResponder?: Function,
-  onStartShouldSetResponderCapture?: Function,
-  onMoveShouldSetResponder?: Function,
-  onMoveShouldSetResponderCapture?: Function,
-  hitSlop?: EdgeInsetsProp,
+  onLayout?: ?(event: LayoutEvent) => void,
+  onResponderGrant?: ?Function,
+  onResponderMove?: ?Function,
+  onResponderReject?: ?Function,
+  onResponderRelease?: ?Function,
+  onResponderTerminate?: ?Function,
+  onResponderTerminationRequest?: ?Function,
+  onStartShouldSetResponder?: ?Function,
+  onStartShouldSetResponderCapture?: ?Function,
+  onMoveShouldSetResponder?: ?Function,
+  onMoveShouldSetResponderCapture?: ?Function,
+  hitSlop?: ?EdgeInsetsProp,
   pointerEvents?: null | 'box-none'| 'none'| 'box-only'| 'auto',
   style?: stylePropType,
   removeClippedSubviews?: bool,

From a48b4d5df16b20a6273e97366e97a74dd978a8b2 Mon Sep 17 00:00:00 2001
From: Caleb Meredith <calebmer@fb.com>
Date: Fri, 9 Mar 2018 11:31:25 -0800
Subject: [PATCH 219/267] Add Sonar support to Oculus Twilight Android

Reviewed By: alex1kom

Differential Revision: D7177071

fbshipit-source-id: 685d40e564d391d18592cedfcc12d8ac743a5331
---
 .../facebook/react/modules/network/OkHttpClientProvider.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
index 125059675d8883..766290c40e067b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpClientProvider.java
@@ -54,7 +54,10 @@ public static OkHttpClient createClient() {
     if (sFactory != null) {
       return sFactory.createNewNetworkModuleClient();
     }
+    return createClientBuilder().build();
+  }
 
+  public static OkHttpClient.Builder createClientBuilder() {
     // No timeouts by default
     OkHttpClient.Builder client = new OkHttpClient.Builder()
       .connectTimeout(0, TimeUnit.MILLISECONDS)
@@ -62,7 +65,7 @@ public static OkHttpClient createClient() {
       .writeTimeout(0, TimeUnit.MILLISECONDS)
       .cookieJar(new ReactCookieJarContainer());
 
-    return enableTls12OnPreLollipop(client).build();
+    return enableTls12OnPreLollipop(client);
   }
 
   /*

From 25b8ec81dfd53ac028127fe8d5f69419a1955954 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Fri, 9 Mar 2018 11:48:30 -0800
Subject: [PATCH 220/267] Adding FlowFixMe when switching between Component and
 Ref

Reviewed By: yungsters

Differential Revision: D7215800

fbshipit-source-id: 175f769a2b1fc67e72b10e113a96eb4167437ab0
---
 Libraries/Lists/VirtualizedList.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 90e978cf8e3cca..ed113acda7417e 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -748,6 +748,10 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           cellKey={this._getCellKey() + '-header'}
           key="$header">
           <View onLayout={this._onLayoutHeader} style={inversionStyle}>
+            {/*
+              Flow doesn't know this is a React.Element and not a React.Component
+              $FlowFixMe https://fburl.com/b9xmtm09
+            */}
             {element}
           </View>
         </VirtualizedCellWrapper>,
@@ -857,6 +861,10 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           key="$empty"
           onLayout={this._onLayoutEmpty}
           style={inversionStyle}>
+          {/*
+            Flow doesn't know this is a React.Element and not a React.Component
+            $FlowFixMe https://fburl.com/b9xmtm09
+          */}
           {element}
         </View>,
       );
@@ -873,6 +881,10 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           cellKey={this._getCellKey() + '-footer'}
           key="$footer">
           <View onLayout={this._onLayoutFooter} style={inversionStyle}>
+            {/*
+              Flow doesn't know this is a React.Element and not a React.Component
+              $FlowFixMe https://fburl.com/b9xmtm09
+            */}
             {element}
           </View>
         </VirtualizedCellWrapper>,

From 216c8ec04b22704f722ecaac4718157af4434a0c Mon Sep 17 00:00:00 2001
From: Alexander Tu <atu@fb.com>
Date: Fri, 9 Mar 2018 11:57:08 -0800
Subject: [PATCH 221/267] AndroidInfoModule now also returns Android ID

Summary: Added Android ID as one of the constants returned by AndroidInfoModule

Reviewed By: fkgozali

Differential Revision: D7206029

fbshipit-source-id: 110b33235d3023b4a4607d37acc3440cfe735cef
---
 .../facebook/react/modules/systeminfo/AndroidInfoModule.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
index 1037d4c5ecbdcc..bc62a544f6d347 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.java
@@ -10,6 +10,7 @@
 import android.app.UiModeManager;
 import android.content.res.Configuration;
 import android.os.Build;
+import android.provider.Settings.Secure;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -72,6 +73,7 @@ public String getName() {
     constants.put("isTesting", "true".equals(System.getProperty(IS_TESTING)));
     constants.put("reactNativeVersion", ReactNativeVersion.VERSION);
     constants.put("uiMode", uiMode());
+    constants.put("androidID", Secure.getString(getReactApplicationContext().getContentResolver(), Secure.ANDROID_ID));
     return constants;
   }
 }

From b6b80f6a70c6d790c52b58453fefc2cea6cd06fe Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Fri, 9 Mar 2018 12:23:56 -0800
Subject: [PATCH 222/267] Type VirtualizedList's ref

Reviewed By: yungsters

Differential Revision: D7215114

fbshipit-source-id: 867a7b897f27d415269c11572708afeb570b4be0
---
 Libraries/Lists/VirtualizedList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index ed113acda7417e..53475be0966668 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -974,7 +974,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     velocity: 0,
     visibleLength: 0,
   };
-  _scrollRef = (null: any);
+  _scrollRef: ?React.ElementRef<any> = null;
   _sentEndForContentLength = 0;
   _totalCellLength = 0;
   _totalCellsMeasured = 0;

From 3e9a371ace5f25b2eb7a0d30177251f8a0c10ed9 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Fri, 9 Mar 2018 13:09:12 -0800
Subject: [PATCH 223/267] Mock ReactNative.NativeComponent native methods in
 jest

Reviewed By: yungsters

Differential Revision: D7218964

fbshipit-source-id: f4b25a533b7e150c978863ff8411dc80937a4fed
---
 jest/setup.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/jest/setup.js b/jest/setup.js
index 680e391ba78bd2..0d4553b3f756f8 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -80,16 +80,10 @@ jest
     const ReactNative = require.requireActual('ReactNative');
     const NativeMethodsMixin =
       ReactNative.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.NativeMethodsMixin;
-    [
-      'measure',
-      'measureInWindow',
-      'measureLayout',
-      'setNativeProps',
-      'focus',
-      'blur',
-    ].forEach((key) => {
+
+    const mockFunction = (key) => {
       let warned = false;
-      NativeMethodsMixin[key] = function() {
+      return function() {
         if (warned) {
           return;
         }
@@ -101,6 +95,18 @@ jest
             'native environment.',
         );
       };
+    };
+
+    [
+      'measure',
+      'measureInWindow',
+      'measureLayout',
+      'setNativeProps',
+      'focus',
+      'blur',
+    ].forEach((key) => {
+      NativeMethodsMixin[key] = mockFunction(key);
+      ReactNative.NativeComponent.prototype[key] = mockFunction(key);
     });
     return ReactNative;
   })

From c9d756285ac536af978ad150ff12fe3f16a8af28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Fri, 9 Mar 2018 14:42:13 -0800
Subject: [PATCH 224/267] Clear cache to resolve iOS, tvOS workflow

Summary:
tvOS and iOS workflows were flaky, apparently due to a stale cache that contained a problematic version of the Metro dependency. Thanks to motiz88 for identifying the potential cause of flakiness in https://github.com/react-native-community/react-native-releases/issues/2#issuecomment-371905315.

https://circleci.com/workflow-run/440180a2-e888-4f27-bec9-b8e5d9be6708

[GENERAL] [MINOR] [CI] - Resolve iOS, tvOS failures in Circle
Closes https://github.com/facebook/react-native/pull/18304

Differential Revision: D7220150

Pulled By: hramos

fbshipit-source-id: 0f5e68c779dfce44e6deb8b813a3ac9e25a2ab97
---
 .circleci/config.yml            | 50 ++++++++++++++++++---------------
 scripts/circleci/check_cache.sh | 26 +++++++++++++++++
 2 files changed, 53 insertions(+), 23 deletions(-)
 create mode 100755 scripts/circleci/check_cache.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b75edce484827..e061ce1b4bd73e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,43 +2,51 @@ aliases:
   # Cache Management
   - &restore-yarn-cache
     keys:
-      - v1-yarn-{{ arch }}-{{ checksum "package.json" }}
+      - v1-yarn-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}
       # Fallback in case checksum fails
-      - v1-yarn-{{ arch }}-
+      - v1-yarn-{{ arch }}-{{ .Branch }}-
+      # Fallback in case this is a first-time run on a fork
+      - v1-yarn-{{ arch }}-master-
   - &save-yarn-cache
     paths:
       - node_modules
       - ~/.cache/yarn
-    key: v1-yarn-{{ arch }}-{{ checksum "package.json" }}
+    key: v1-yarn-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}
 
   - &restore-cache-analysis
     keys:
-      - v1-analysis-dependencies-{{ arch }}-{{ checksum "package.json" }}{{ checksum "bots/package.json" }}
+      - v1-analysis-dependencies-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}{{ checksum "bots/package.json" }}
       # Fallback in case checksum fails
-      - v1-analysis-dependencies-{{ arch }}-
+      - v1-analysis-dependencies-{{ arch }}-{{ .Branch }}-
+      # Fallback in case this is a first-time run on a fork
+      - v1-analysis-dependencies-{{ arch }}-master-
   - &save-cache-analysis
     paths:
       - bots/node_modules
       - node_modules
-    key: v1-analysis-dependencies-{{ arch }}-{{ checksum "package.json" }}{{ checksum "bots/package.json" }}
+    key: v1-analysis-dependencies-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}{{ checksum "bots/package.json" }}
 
   - &restore-cache-android-packages
     keys:
-      - v1-android-sdkmanager-packages-{{ arch }}-api-26-alpha-{{ checksum "scripts/circle-ci-android-setup.sh" }}
+      - v1-android-sdkmanager-packages-{{ arch }}-{{ .Branch }}-api-26-alpha-{{ checksum "scripts/circle-ci-android-setup.sh" }}
       # Fallback in case checksum fails
-      - v1-android-sdkmanager-packages-{{ arch }}-api-26-alpha-
+      - v1-android-sdkmanager-packages-{{ arch }}-{{ .Branch }}-api-26-alpha-
+      # Fallback in case this is a first-time run on a fork
+      - v1-android-sdkmanager-packages-{{ arch }}-master-api-26-alpha-
   - &save-cache-android-packages
     paths:
       - /opt/android/sdk
-    key: v1-android-sdkmanager-packages-{{ arch }}-api-26-alpha-{{ checksum "scripts/circle-ci-android-setup.sh" }}
+    key: v1-android-sdkmanager-packages-{{ arch }}-{{ .Branch }}-api-26-alpha-{{ checksum "scripts/circle-ci-android-setup.sh" }}
 
   - &restore-cache-ndk
     keys:
-      - v2-android-ndk-{{ arch }}-r10e-32-64
+      - v2-android-ndk-{{ arch }}-r10e-32-64-{{ checksum "scripts/circle-ci-android-setup.sh" }}
+      # Fallback in case checksum fails
+      - v2-android-ndk-{{ arch }}-r10e-32-64-
   - &save-cache-ndk
     paths:
       - /opt/ndk
-    key: v2-android-ndk-{{ arch }}-r10e-32-64
+    key: v2-android-ndk-{{ arch }}-r10e-32-64-{{ checksum "scripts/circle-ci-android-setup.sh" }}
 
   - &restore-cache-buck
     keys:
@@ -152,9 +160,11 @@ aliases:
     command: yarn flow check
     when: always
 
-  - &run-license-checks
-    name: Check license
-    command: ./scripts/circleci/check_license.sh
+  - &run-sanity-checks
+    name: Sanity checks
+    command: |
+      ./scripts/circleci/check_license.sh
+      ./scripts/circleci/check_cache.sh
     when: always
     
   - &build-android-app
@@ -209,19 +219,11 @@ aliases:
     name: Initial Setup
     command: | 
       mkdir -p ~/react-native/reports/junit/
-
-  - &build-objc-ios-test-app
-    name: Build iOS Test App
-    command: ./scripts/objc-test-ios.sh
   
   - &run-objc-ios-tests
     name: iOS Test Suite
     command: ./scripts/objc-test-ios.sh test
 
-  - &build-objc-tvos-test-app
-    name: Build tvOS Test App
-    command: ./scripts/objc-test-tvos.sh
-
   - &run-objc-tvos-tests
     name: tvOS Test Suite
     command: ./scripts/objc-test-tvos.sh test
@@ -274,6 +276,9 @@ jobs:
       - run: *yarn
       - save-cache: *save-yarn-cache
 
+      # Basic checks against the checkout, cache...
+      - run: *run-sanity-checks
+
       - persist_to_workspace:
           root: .
           paths: .
@@ -288,7 +293,6 @@ jobs:
 
       - run: *run-lint-checks
       - run: *run-flow-checks
-      - run: *run-license-checks
 
       - store_test_results:
           path: ~/react-native/reports/junit
diff --git a/scripts/circleci/check_cache.sh b/scripts/circleci/check_cache.sh
new file mode 100755
index 00000000000000..5cd3b68251eef1
--- /dev/null
+++ b/scripts/circleci/check_cache.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+# Make sure we don't accidentally restore a cache that contains the Metro
+# filename issue that was fixed in Metro 0.25, originally introduced in
+# D6752278. Once fixed, this was causing sporadic failures in the iOS
+# and tvOS workflows as the issue persisted in the cached node_modules
+#
+# The filename issue can be summarized as follows:
+# A version of Metro was published to npm with HmrClient.js and
+# HmrClient.js.flow files, while the repo contains HMRClient.js and
+# HMRClient.js.flow. This was due to a case issue in the publisher's
+# host machine.
+# The issue this is checking for is manifested by the presence of all
+# of the following files: HmrClient.js, HMRClient.js, HmrClient.js.flow,
+# HMRClient.js.flow.
+
+EXPECTED='1'
+ACTUAL=$(ls node_modules/metro/src/lib/bundle-modules/*.js | xargs | awk '{print tolower($0)}' | tr ' ' '\n' | grep hmrclient.js | wc -l | tr -d '[:space:]')
+
+if [ "$EXPECTED" != "$ACTUAL" ]; then
+  echo "HmrClient.js crept into the cache?"
+  echo $(ls node_modules/metro/src/lib/bundle-modules/H*lient.js)
+  exit 1
+fi

From 5035af80ecddb44e2a8444780f25f336b760bf32 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Fri, 9 Mar 2018 14:55:04 -0800
Subject: [PATCH 225/267] Tightening types for View and VirtualizedList

Reviewed By: yungsters

Differential Revision: D7215391

fbshipit-source-id: fa144c0dc3fd897864403b589e943ea88e78a999
---
 Libraries/Components/View/View.js  | 2 +-
 Libraries/Lists/VirtualizedList.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index 04c7bebb15eed4..787551e8d3dccb 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -104,4 +104,4 @@ if (__DEV__) {
 }
 
 // No one should depend on the DEV-mode createClass View wrapper.
-module.exports = ((ViewToExport: any): typeof RCTView);
+module.exports = ((ViewToExport: any): typeof View);
diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 53475be0966668..58fe055a373cde 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -1175,11 +1175,11 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     );
   }
 
-  _selectLength(metrics: {height: number, width: number}): number {
+  _selectLength(metrics: $ReadOnly<{height: number, width: number}>): number {
     return !this.props.horizontal ? metrics.height : metrics.width;
   }
 
-  _selectOffset(metrics: {x: number, y: number}): number {
+  _selectOffset(metrics: $ReadOnly<{x: number, y: number}>): number {
     return !this.props.horizontal ? metrics.y : metrics.x;
   }
 

From 274d6ce587839fba894d978e6767f756f24d8b5f Mon Sep 17 00:00:00 2001
From: Rafael Oleza <rafeca@fb.com>
Date: Fri, 9 Mar 2018 16:38:58 -0800
Subject: [PATCH 226/267] Bump metro@0.30.0

Reviewed By: BYK

Differential Revision: D7214924

fbshipit-source-id: 4f50ec27e2dceb18e9ef82e741675df295235d74
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d69018f16f5626..0931374a4b7bd3 100644
--- a/package.json
+++ b/package.json
@@ -175,8 +175,8 @@
     "graceful-fs": "^4.1.3",
     "inquirer": "^3.0.6",
     "lodash": "^4.17.5",
-    "metro": "^0.29.0",
-    "metro-core": "^0.29.0",
+    "metro": "^0.30.0",
+    "metro-core": "^0.30.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",

From 1ff1e573f1dd46ee987bb5a444c85c46c7abf34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Fri, 9 Mar 2018 17:06:51 -0800
Subject: [PATCH 227/267] Add existing Android checks to Circle.

Summary:
Moving towards reusing existing scripts to ensure local and CI tests are kept in sync.
Closes https://github.com/facebook/react-native/pull/18307

Differential Revision: D7222664

Pulled By: hramos

fbshipit-source-id: ecce91e32159c55b19c29eab69a6754642f02236
---
 .circleci/config.yml                 | 22 +++++++++++++++++-----
 scripts/validate-android-test-env.sh | 19 +++++++++++++++----
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e061ce1b4bd73e..100bc1276ffd33 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -89,8 +89,8 @@ aliases:
 
   # Dependency Management
   - &install-ndk
-    |
-      source scripts/circle-ci-android-setup.sh && getAndroidNDK
+    name: Install Android NDK
+    command: source scripts/circle-ci-android-setup.sh && getAndroidNDK
 
   - &yarn
     |
@@ -136,8 +136,8 @@ aliases:
       source $BASH_ENV
 
   - &install-android-packages
-    | 
-      source scripts/circle-ci-android-setup.sh && getAndroidSDK
+    name: Install Android SDK Packages
+    command: source scripts/circle-ci-android-setup.sh && getAndroidSDK
 
   - &install-android-build-dependencies
     name: Install Android Build Dependencies
@@ -145,6 +145,14 @@ aliases:
       sudo apt-get update -y
       sudo apt-get install ant autoconf automake g++ gcc libqt5widgets5 lib32z1 lib32stdc++6  make maven python-dev python3-dev qml-module-qtquick-controls qtdeclarative5-dev file -y
 
+  - &validate-android-sdk
+    name: Validate Android SDK Install
+    command: ./scripts/validate-android-sdk.sh
+
+  - &validate-android-test-env
+    name: Validate Android Test Environment
+    command: ./scripts/validate-android-test-env.sh
+
   # Test Definitions
   - &run-js-tests
     name: JavaScript Test Suite
@@ -444,6 +452,8 @@ jobs:
       - run: *install-android-packages
       - save-cache: *save-cache-android-packages
 
+      - run: *validate-android-sdk
+
       # Starting emulator in advance as it takes some time to boot.      
       - run: *create-avd
       - run: *launch-avd
@@ -461,6 +471,8 @@ jobs:
       - run: *install-buck
       - save-cache: *save-cache-buck
 
+      - run: *validate-android-test-env
+
       - run: buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
       - run: buck fetch ReactAndroid/src/main/java/com/facebook/react
       - run: buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
@@ -478,7 +490,7 @@ jobs:
 
       # Wait for AVD to finish booting before running tests
       - run: *wait-for-avd
-            
+
       # Test Suite
       - run: *run-android-unit-tests
       - run: *run-android-instrumentation-tests
diff --git a/scripts/validate-android-test-env.sh b/scripts/validate-android-test-env.sh
index 8b428e76fc4bdf..0461de767341d5 100755
--- a/scripts/validate-android-test-env.sh
+++ b/scripts/validate-android-test-env.sh
@@ -14,18 +14,23 @@ if [ -z "$(which buck)" ]; then
   exit 1
 fi
 
-if [ -z "$(buck --version)" ]; then
+BUCK_ACTUAL_COMMIT=$(buck --version)
+BUCK_SUGGESTED_V="v2018.02.16.01"
+BUCK_SUGGESTED_COMMIT="d743d2d0229852ce7c029ec257532d8916f6b2b7"
+BUCK_SUGGESTED_COMMIT_FB="b9b76a3a5a086eb440a26d1db9b0731875975099"
+
+if [ -z "$BUCK_ACTUAL_COMMIT" ]; then
   echo "Your Buck install is broken."
 
   if [ -d "/opt/facebook" ]; then
-    SUGGESTED="b9b76a3a5a086eb440a26d1db9b0731875975099"
+    BUCK_SUGGESTED_COMMIT_FB="b9b76a3a5a086eb440a26d1db9b0731875975099"
     echo "FB laptops ship with a Buck config that is not compatible with open "
     echo "source. FB Buck requires the environment to set a buck version, but "
     echo "the open source version of Buck forbids that."
     echo
     echo "You can try setting:"
     echo
-    echo "export BUCKVERSION=${SUGGESTED}"
+    echo "export BUCKVERSION=${BUCK_SUGGESTED_COMMIT_FB}"
     echo
     echo "in your .bashrc or .bash_profile to fix this."
     echo
@@ -33,12 +38,18 @@ if [ -z "$(buck --version)" ]; then
     echo "your machine, you can just scope it to a single script, for example"
     echo "by running something like:"
     echo
-    echo "BUCKVERSION=${SUGGESTED} $0"
+    echo "BUCKVERSION=${BUCK_SUGGESTED_COMMIT_FB} $0"
     echo
   else
     echo "I don't know what's wrong, but calling 'buck --version' should work."
   fi
   exit 1
+else
+  if [ "$BUCK_ACTUAL_COMMIT" == "$BUCK_SUGGESTED_COMMIT" ]; then
+    echo "${BUCK_ACTUAL_COMMIT}"
+  elif [ ! -d "/opt/facebook" ]; then
+    echo "Warn: The test suite expects buck version ${BUCK_SUGGESTED_COMMIT} (${BUCK_SUGGESTED_V}) to be installed, but found ${BUCK_ACTUAL_COMMIT} instead"
+  fi
 fi
 
 # BUILD_TOOLS_VERSION is in a format like "23.0.1"

From 26734a8473ac2f5715f2b7a016f0cc8a15c6f073 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Fri, 9 Mar 2018 18:26:58 -0800
Subject: [PATCH 228/267] Migrating View to be a Flow Typed ES6 class

Summary:
The flow type for View using createReactClass was essentially `any`, allowing any Prop to be passed in, only pseudo enforced at run time via propTypes.

This diff converts View away from createReactClass and instead uses ReactNative.NativeComponent. This was previously typed as any as well which didn't buy us much. This change converts View to be an ES6 React class component to ensure proptypechecking, and exposes the methods copied from NativeMethodsMixin.

Reviewed By: yungsters

Differential Revision: D5933888

fbshipit-source-id: eae63b818203e0e86741f9f154ec9cf3498369e2
---
 Libraries/Components/View/View.js            | 42 ++++++--------------
 Libraries/Components/View/View.js.flow       | 28 -------------
 Libraries/Renderer/shims/ReactNativeTypes.js | 17 +++++++-
 3 files changed, 29 insertions(+), 58 deletions(-)
 delete mode 100644 Libraries/Components/View/View.js.flow

diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js
index 787551e8d3dccb..0a77bff8a40766 100644
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -10,15 +10,13 @@
  */
 'use strict';
 
-const NativeMethodsMixin = require('NativeMethodsMixin');
 const Platform = require('Platform');
 const React = require('React');
+const ReactNative = require('ReactNative');
 const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 const ViewPropTypes = require('ViewPropTypes');
 const {ViewContextTypes} = require('ViewContext');
-
-const createReactClass = require('create-react-class');
 const invariant = require('fbjs/lib/invariant');
 const requireNativeComponent = require('requireNativeComponent');
 
@@ -28,40 +26,26 @@ import type {ViewChildContext} from 'ViewContext';
 export type Props = ViewProps;
 
 /**
- * The most fundamental component for building a UI.
+ * The most fundamental component for building a UI, View is a container that
+ * supports layout with flexbox, style, some touch handling, and accessibility
+ * controls.
  *
- * See http://facebook.github.io/react-native/docs/view.html
+ * @see http://facebook.github.io/react-native/docs/view.html
  */
-const View = createReactClass({
-  displayName: 'View',
-  // TODO: We should probably expose the mixins, viewConfig, and statics publicly. For example,
-  // one of the props is of type AccessibilityComponentType. That is defined as a const[] above,
-  // but it is not rendered by the docs, since `statics` below is not rendered. So its Possible
-  // values had to be hardcoded.
-  mixins: [NativeMethodsMixin],
-
-  // `propTypes` should not be accessed directly on View since this wrapper only
-  // exists for DEV mode. However it's important for them to be declared.
-  // If the object passed to `createClass` specifies `propTypes`, Flow will
-  // create a static type from it.
-  propTypes: ViewPropTypes,
+class View extends ReactNative.NativeComponent<Props> {
+  static propTypes = ViewPropTypes;
+  static childContextTypes = ViewContextTypes;
 
-  /**
-   * `NativeMethodsMixin` will look for this when invoking `setNativeProps`. We
-   * make `this` look like an actual native component class.
-   */
-  viewConfig: {
+  viewConfig = {
     uiViewClassName: 'RCTView',
     validAttributes: ReactNativeViewAttributes.RCTView,
-  },
-
-  childContextTypes: ViewContextTypes,
+  };
 
   getChildContext(): ViewChildContext {
     return {
       isInAParentText: false,
     };
-  },
+  }
 
   render() {
     invariant(
@@ -74,8 +58,8 @@ const View = createReactClass({
     // adding functionality this component that you'd want to be available in both
     // dev and prod modes.
     return <RCTView {...this.props} />;
-  },
-});
+  }
+}
 
 const RCTView = requireNativeComponent('RCTView', View, {
   nativeOnly: {
diff --git a/Libraries/Components/View/View.js.flow b/Libraries/Components/View/View.js.flow
deleted file mode 100644
index 88dffece3c06f0..00000000000000
--- a/Libraries/Components/View/View.js.flow
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @providesModule View
- * @flow
- * @format
- */
-
-'use strict';
-
-const {NativeComponent} = require('ReactNative');
-
-import type {ViewProps} from 'ViewPropTypes';
-
-export type Props = ViewProps;
-
-/**
- * Host components in React 16 are represented by strings (eg "div", "View").
- * This is inconvenient for users who want to type a ref (eg `ref: View`).
- * The following type isn't sound but it enables consistent Flow types
- * for various default React Native components, so it seems a good tradeoff.
- */
-declare class View extends NativeComponent<void, ViewProps> {}
-
-module.exports = View;
diff --git a/Libraries/Renderer/shims/ReactNativeTypes.js b/Libraries/Renderer/shims/ReactNativeTypes.js
index f20bb30faa7938..121a2fdd4d3dd3 100644
--- a/Libraries/Renderer/shims/ReactNativeTypes.js
+++ b/Libraries/Renderer/shims/ReactNativeTypes.js
@@ -86,12 +86,27 @@ type SecretInternalsType = {
   // And how much information to fill in for the above types.
 };
 
+declare class ReactNativeComponent<Props, State = void>
+  extends React$Component<Props, State> {
+
+  blur(): void,
+  focus(): void,
+  measure(callback: MeasureOnSuccessCallback): void,
+  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void,
+  measureLayout(
+    relativeToNativeNode: number,
+    onSuccess: MeasureLayoutOnSuccessCallback,
+    onFail: () => void,
+  ): void,
+  setNativeProps(nativeProps: Object): void,
+}
+
 /**
  * Flat ReactNative renderer bundles are too big for Flow to parse efficiently.
  * Provide minimal Flow typing for the high-level RN API and call it a day.
  */
 export type ReactNativeType = {
-  NativeComponent: any,
+  NativeComponent: typeof ReactNativeComponent,
   findNodeHandle(componentOrHandle: any): ?number,
   render(
     element: React$Element<any>,

From adabae2c0b222e23c0bcd2aec68a252e396a09c5 Mon Sep 17 00:00:00 2001
From: Nat Mote <nmote@fb.com>
Date: Fri, 9 Mar 2018 20:23:05 -0800
Subject: [PATCH 229/267] Upgrade to Flow v0.67

Reviewed By: gabelevi

Differential Revision: D7208080

fbshipit-source-id: 81380aca39b7a74646a4a44af1e5571bc5629b77
---
 .flowconfig                                | 2 +-
 local-cli/templates/HelloWorld/_flowconfig | 2 +-
 package.json                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index b7aa19446d88dc..361d475f24042d 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -52,4 +52,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.66.0
+^0.67.0
diff --git a/local-cli/templates/HelloWorld/_flowconfig b/local-cli/templates/HelloWorld/_flowconfig
index 080b459b22fd77..7d5e2d3362ba40 100644
--- a/local-cli/templates/HelloWorld/_flowconfig
+++ b/local-cli/templates/HelloWorld/_flowconfig
@@ -51,4 +51,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.66.0
+^0.67.0
diff --git a/package.json b/package.json
index 0931374a4b7bd3..33f5268f154280 100644
--- a/package.json
+++ b/package.json
@@ -215,7 +215,7 @@
     "eslint-plugin-jest": "21.8.0",
     "eslint-plugin-prettier": "2.6.0",
     "eslint-plugin-react": "7.6.1",
-    "flow-bin": "^0.66.0",
+    "flow-bin": "^0.67.1",
     "jest": "22.4.2",
     "jest-junit": "3.6.0",
     "prettier": "1.9.1",

From e0573225d5fe28e5ad61690eda3060289bdbf3a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Sat, 10 Mar 2018 16:03:27 -0800
Subject: [PATCH 230/267] Fix Android Sanity Buck version check

Summary:
[GENERAL] [MINOR] [./scripts/validate-android-test-env.sh] - Fix buck version check
Closes https://github.com/facebook/react-native/pull/18311

Differential Revision: D7227452

Pulled By: hramos

fbshipit-source-id: c7b32afc36821fbb2462317581ae32d3b257de03
---
 scripts/validate-android-test-env.sh | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/scripts/validate-android-test-env.sh b/scripts/validate-android-test-env.sh
index 0461de767341d5..7ec0b668c84d00 100755
--- a/scripts/validate-android-test-env.sh
+++ b/scripts/validate-android-test-env.sh
@@ -14,12 +14,7 @@ if [ -z "$(which buck)" ]; then
   exit 1
 fi
 
-BUCK_ACTUAL_COMMIT=$(buck --version)
-BUCK_SUGGESTED_V="v2018.02.16.01"
-BUCK_SUGGESTED_COMMIT="d743d2d0229852ce7c029ec257532d8916f6b2b7"
-BUCK_SUGGESTED_COMMIT_FB="b9b76a3a5a086eb440a26d1db9b0731875975099"
-
-if [ -z "$BUCK_ACTUAL_COMMIT" ]; then
+if [ -z "$(buck --version)" ]; then
   echo "Your Buck install is broken."
 
   if [ -d "/opt/facebook" ]; then
@@ -45,10 +40,11 @@ if [ -z "$BUCK_ACTUAL_COMMIT" ]; then
   fi
   exit 1
 else
-  if [ "$BUCK_ACTUAL_COMMIT" == "$BUCK_SUGGESTED_COMMIT" ]; then
-    echo "${BUCK_ACTUAL_COMMIT}"
-  elif [ ! -d "/opt/facebook" ]; then
-    echo "Warn: The test suite expects buck version ${BUCK_SUGGESTED_COMMIT} (${BUCK_SUGGESTED_V}) to be installed, but found ${BUCK_ACTUAL_COMMIT} instead"
+  BUCK_EXPECTED_VERSION="buck version d743d2d0229852ce7c029ec257532d8916f6b2b7"
+  if [ "$(buck --version)" != "$BUCK_EXPECTED_VERSION" ]; then
+    if [ ! -d "/opt/facebook" ]; then
+      echo "Warning: The test suite expects ${BUCK_EXPECTED_VERSION} to be installed"
+    fi
   fi
 fi
 

From cd8128b2eccf6898cdf798a1e1be1f7a5762a0d4 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Sat, 10 Mar 2018 18:29:05 -0800
Subject: [PATCH 231/267] Move Text PropTypes to it's own file

Reviewed By: fkgozali

Differential Revision: D7226404

fbshipit-source-id: b5637dee9a4f10daf0682e46f1ec8920ea03ae33
---
 Libraries/Text/Text.js          | 116 +----------------------------
 Libraries/Text/TextPropTypes.js | 128 ++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+), 114 deletions(-)
 create mode 100644 Libraries/Text/TextPropTypes.js

diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index 9a31838f5aa8fe..866f46819e9bce 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -10,14 +10,10 @@
  */
 'use strict';
 
-const ColorPropType = require('ColorPropType');
-const EdgeInsetsPropType = require('EdgeInsetsPropType');
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const React = require('React');
-const PropTypes = require('prop-types');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
-const StyleSheetPropType = require('StyleSheetPropType');
-const TextStylePropTypes = require('TextStylePropTypes');
+const TextPropTypes = require('TextPropTypes');
 const Touchable = require('Touchable');
 const UIManager = require('UIManager');
 
@@ -27,8 +23,6 @@ const mergeFast = require('mergeFast');
 const processColor = require('processColor');
 const {ViewContextTypes} = require('ViewContext');
 
-const stylePropType = StyleSheetPropType(TextStylePropTypes);
-
 const viewConfig = {
   validAttributes: mergeFast(ReactNativeViewAttributes.UIView, {
     isHighlighted: true,
@@ -55,113 +49,7 @@ import type {ViewChildContext} from 'ViewContext';
 
 const Text = createReactClass({
   displayName: 'Text',
-  propTypes: {
-    /**
-     * When `numberOfLines` is set, this prop defines how text will be
-     * truncated.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#ellipsizemode
-     */
-    ellipsizeMode: PropTypes.oneOf(['head', 'middle', 'tail', 'clip']),
-    /**
-     * Used to truncate the text with an ellipsis.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#numberoflines
-     */
-    numberOfLines: PropTypes.number,
-    /**
-     * Set text break strategy on Android.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#textbreakstrategy
-     */
-    textBreakStrategy: PropTypes.oneOf(['simple', 'highQuality', 'balanced']),
-    /**
-     * Invoked on mount and layout changes.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#onlayout
-     */
-    onLayout: PropTypes.func,
-    /**
-     * This function is called on press.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#onpress
-     */
-    onPress: PropTypes.func,
-    /**
-     * This function is called on long press.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#onlongpress
-     */
-    onLongPress: PropTypes.func,
-    /**
-     * Defines how far your touch may move off of the button, before
-     * deactivating the button.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#pressretentionoffset
-     */
-    pressRetentionOffset: EdgeInsetsPropType,
-    /**
-     * Lets the user select text.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#selectable
-     */
-    selectable: PropTypes.bool,
-    /**
-     * The highlight color of the text.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#selectioncolor
-     */
-    selectionColor: ColorPropType,
-    /**
-     * When `true`, no visual change is made when text is pressed down.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#supperhighlighting
-     */
-    suppressHighlighting: PropTypes.bool,
-    style: stylePropType,
-    /**
-     * Used to locate this view in end-to-end tests.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#testid
-     */
-    testID: PropTypes.string,
-    /**
-     * Used to locate this view from native code.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#nativeid
-     */
-    nativeID: PropTypes.string,
-    /**
-     * Whether fonts should scale to respect Text Size accessibility settings.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#allowfontscaling
-     */
-    allowFontScaling: PropTypes.bool,
-    /**
-     * Indicates whether the view is an accessibility element.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#accessible
-     */
-    accessible: PropTypes.bool,
-    /**
-     * Whether font should be scaled down automatically.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#adjustsfontsizetofit
-     */
-    adjustsFontSizeToFit: PropTypes.bool,
-    /**
-     * Smallest possible scale a font can reach.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#minimumfontscale
-     */
-    minimumFontScale: PropTypes.number,
-    /**
-     * Specifies the disabled state of the text view for testing purposes.
-     *
-     * See https://facebook.github.io/react-native/docs/text.html#disabled
-     */
-    disabled: PropTypes.bool,
-  },
+  propTypes: TextPropTypes,
   getDefaultProps(): Object {
     return {
       accessible: true,
diff --git a/Libraries/Text/TextPropTypes.js b/Libraries/Text/TextPropTypes.js
new file mode 100644
index 00000000000000..81a7af03f6058f
--- /dev/null
+++ b/Libraries/Text/TextPropTypes.js
@@ -0,0 +1,128 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @providesModule TextPropTypes
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+const ColorPropType = require('ColorPropType');
+const EdgeInsetsPropType = require('EdgeInsetsPropType');
+const PropTypes = require('prop-types');
+const StyleSheetPropType = require('StyleSheetPropType');
+const TextStylePropTypes = require('TextStylePropTypes');
+
+const stylePropType = StyleSheetPropType(TextStylePropTypes);
+
+module.exports = {
+  /**
+   * When `numberOfLines` is set, this prop defines how text will be
+   * truncated.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#ellipsizemode
+   */
+  ellipsizeMode: PropTypes.oneOf(['head', 'middle', 'tail', 'clip']),
+  /**
+   * Used to truncate the text with an ellipsis.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#numberoflines
+   */
+  numberOfLines: PropTypes.number,
+  /**
+   * Set text break strategy on Android.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#textbreakstrategy
+   */
+  textBreakStrategy: PropTypes.oneOf(['simple', 'highQuality', 'balanced']),
+  /**
+   * Invoked on mount and layout changes.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#onlayout
+   */
+  onLayout: PropTypes.func,
+  /**
+   * This function is called on press.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#onpress
+   */
+  onPress: PropTypes.func,
+  /**
+   * This function is called on long press.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#onlongpress
+   */
+  onLongPress: PropTypes.func,
+  /**
+   * Defines how far your touch may move off of the button, before
+   * deactivating the button.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#pressretentionoffset
+   */
+  pressRetentionOffset: EdgeInsetsPropType,
+  /**
+   * Lets the user select text.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#selectable
+   */
+  selectable: PropTypes.bool,
+  /**
+   * The highlight color of the text.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#selectioncolor
+   */
+  selectionColor: ColorPropType,
+  /**
+   * When `true`, no visual change is made when text is pressed down.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#supperhighlighting
+   */
+  suppressHighlighting: PropTypes.bool,
+  style: stylePropType,
+  /**
+   * Used to locate this view in end-to-end tests.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#testid
+   */
+  testID: PropTypes.string,
+  /**
+   * Used to locate this view from native code.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#nativeid
+   */
+  nativeID: PropTypes.string,
+  /**
+   * Whether fonts should scale to respect Text Size accessibility settings.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#allowfontscaling
+   */
+  allowFontScaling: PropTypes.bool,
+  /**
+   * Indicates whether the view is an accessibility element.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#accessible
+   */
+  accessible: PropTypes.bool,
+  /**
+   * Whether font should be scaled down automatically.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#adjustsfontsizetofit
+   */
+  adjustsFontSizeToFit: PropTypes.bool,
+  /**
+   * Smallest possible scale a font can reach.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#minimumfontscale
+   */
+  minimumFontScale: PropTypes.number,
+  /**
+   * Specifies the disabled state of the text view for testing purposes.
+   *
+   * See https://facebook.github.io/react-native/docs/text.html#disabled
+   */
+  disabled: PropTypes.bool,
+};

From 3fd82d3c89f2d7e5103b024b54250f2ded970d88 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Sat, 10 Mar 2018 18:29:06 -0800
Subject: [PATCH 232/267] Fixing misuses of the Text type

Reviewed By: fkgozali

Differential Revision: D7227752

fbshipit-source-id: 3577c86b416a7c04190063243839e98e2a80ec7f
---
 Libraries/Text/TextProps.js | 42 +++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/Libraries/Text/TextProps.js b/Libraries/Text/TextProps.js
index 770e7ec0e50113..20eb363765e215 100644
--- a/Libraries/Text/TextProps.js
+++ b/Libraries/Text/TextProps.js
@@ -13,8 +13,8 @@
 
 import type {Node} from 'react';
 
-import type {LayoutEvent} from 'CoreEventTypes';
-import type {TextStyleProp} from 'StyleSheet';
+import type {LayoutEvent, PressEvent} from 'CoreEventTypes';
+import type {DangerouslyImpreciseStyleProp} from 'StyleSheet';
 
 type PressRetentionOffset = {
   top: number,
@@ -26,28 +26,34 @@ type PressRetentionOffset = {
 /**
  * @see https://facebook.github.io/react-native/docs/text.html#reference
  */
-export type TextProps = {|
-  accessible?: boolean,
-  allowFontScaling?: boolean,
+export type TextProps = $ReadOnly<{
+  accessible?: ?boolean,
+  allowFontScaling?: ?boolean,
   children?: Node,
   ellipsizeMode?: 'clip' | 'head' | 'middle' | 'tail',
   nativeID?: string,
-  numberOfLines?: number,
-  onLayout?: ?(event: LayoutEvent) => void,
-  onLongPress?: ?() => void,
-  onPress?: ?() => void,
-  pressRetentionOffset?: PressRetentionOffset,
-  selectable?: boolean,
-  style?: TextStyleProp,
+  numberOfLines?: ?number,
+  onLayout?: ?(event: LayoutEvent) => mixed,
+  onLongPress?: ?(event: PressEvent) => mixed,
+  onPress?: ?(event: PressEvent) => mixed,
+  onResponderGrant?: ?Function,
+  onResponderMove?: ?Function,
+  onResponderRelease?: ?Function,
+  onResponderTerminate?: ?Function,
+  onResponderTerminationRequest?: ?Function,
+  onStartShouldSetResponder?: ?Function,
+  pressRetentionOffset?: ?PressRetentionOffset,
+  selectable?: ?boolean,
+  style?: ?DangerouslyImpreciseStyleProp,
   testID?: string,
 
   // Android Only
-  disabled?: boolean,
-  selectionColor?: string,
+  disabled?: ?boolean,
+  selectionColor?: ?string,
   textBreakStrategy?: 'balanced' | 'highQuality' | 'simple',
 
   // iOS Only
-  adjustsFontSizeToFit?: boolean,
-  minimumFontScale?: number,
-  suppressHighlighting?: boolean,
-|};
+  adjustsFontSizeToFit?: ?boolean,
+  minimumFontScale?: ?number,
+  suppressHighlighting?: ?boolean,
+}>;

From 01fffa245d642cae961b63e4ee0e026b6b2153d0 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Sat, 10 Mar 2018 18:41:03 -0800
Subject: [PATCH 233/267] RN: Remove DebugEnvironment from OSS

Reviewed By: TheSavior

Differential Revision: D7209266

fbshipit-source-id: 9f9ce66121ff375e5a5d965d58f4137616407853
---
 Libraries/Utilities/DebugEnvironment.js | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 Libraries/Utilities/DebugEnvironment.js

diff --git a/Libraries/Utilities/DebugEnvironment.js b/Libraries/Utilities/DebugEnvironment.js
deleted file mode 100644
index 71014d9bfdff68..00000000000000
--- a/Libraries/Utilities/DebugEnvironment.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @providesModule DebugEnvironment
- * @flow
- */
-
-'use strict';
-
-module.exports = {
-  // When crippled, synchronous JS function calls to native will fail.
-  isCrippledMode: __DEV__ && !global.nativeCallSyncHook,
-};

From 450e562727d51485b967d99439c942a00d03724a Mon Sep 17 00:00:00 2001
From: Jiajie Zhu <zhujj04@fb.com>
Date: Sat, 10 Mar 2018 20:19:07 -0800
Subject: [PATCH 234/267] export CompositeAnimation type

Differential Revision: D7216928

fbshipit-source-id: 9e8c456c7e94ec3456061ad5c699c0eae30cbe5e
---
 Libraries/Animated/src/AnimatedImplementation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Animated/src/AnimatedImplementation.js b/Libraries/Animated/src/AnimatedImplementation.js
index b23a44db0e4fc7..69a96ba1d3e6ba 100644
--- a/Libraries/Animated/src/AnimatedImplementation.js
+++ b/Libraries/Animated/src/AnimatedImplementation.js
@@ -39,7 +39,7 @@ import type {DecayAnimationConfig} from './animations/DecayAnimation';
 import type {SpringAnimationConfig} from './animations/SpringAnimation';
 import type {Mapping, EventConfig} from './AnimatedEvent';
 
-type CompositeAnimation = {
+export type CompositeAnimation = {
   start: (callback?: ?EndCallback) => void,
   stop: () => void,
   reset: () => void,

From 19dd9a2ce67f7fccc647a8c1edd554d04966236b Mon Sep 17 00:00:00 2001
From: Amir Livneh <alivneh@fb.com>
Date: Mon, 12 Mar 2018 06:31:27 -0700
Subject: [PATCH 235/267] Use -fdata-sections in mode/opt

Differential Revision: D7194366

fbshipit-source-id: 676f2db2e493230b8d9698941f003ec4e96f15ea
---
 ReactCommon/microprofiler/BUCK | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReactCommon/microprofiler/BUCK b/ReactCommon/microprofiler/BUCK
index 9be4e444e4a2bf..2b05e8e52c0593 100644
--- a/ReactCommon/microprofiler/BUCK
+++ b/ReactCommon/microprofiler/BUCK
@@ -14,6 +14,7 @@ cxx_library(
         "-Werror",
         "-std=c++11",
         "-fexceptions",
+        "-fno-data-sections",
     ],
     force_static = True,
     visibility = [

From 84affbd6a371dd865a3550b1fde1ebabee921341 Mon Sep 17 00:00:00 2001
From: Matt Hargett <matt.hargett@sony.com>
Date: Mon, 12 Mar 2018 08:40:14 -0700
Subject: [PATCH 236/267] Loosen Platform check to allow better code sharing
 for out-of-tree platforms

Summary:
Don't lock out other non-iOS platforms (e.g. Windows) with an overly
specific check. This change allows this JS file to be re-used instead of copied and modified. There was one other instance of this pattern, but I'll submit it separate for easier cherry-picking.

Tested Android and iOS playground on simulators.

 [GENERAL] [ENHANCEMENT] - some core ReactNative JS library files will be easier to re-use across RN platforms.
Closes https://github.com/facebook/react-native/pull/18308

Differential Revision: D7230803

Pulled By: hramos

fbshipit-source-id: 11e03183535a7453cee00dc1e795c27f2fd2bf5d
---
 Libraries/ReactNative/UIManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/ReactNative/UIManager.js b/Libraries/ReactNative/UIManager.js
index 0ad18a0b27dcdb..946d2233c5f132 100644
--- a/Libraries/ReactNative/UIManager.js
+++ b/Libraries/ReactNative/UIManager.js
@@ -77,7 +77,7 @@ if (Platform.OS === 'ios') {
       });
     }
   });
-} else if (Platform.OS === 'android' && UIManager.ViewManagerNames) {
+} else if (UIManager.ViewManagerNames) {
   UIManager.ViewManagerNames.forEach(viewManagerName => {
     defineLazyObjectProperty(UIManager, viewManagerName, {
       get: () => UIManager.getConstantsForViewManager(viewManagerName),

From 3002c4eb981d439f0ea304556d8dbd4ffd62a80b Mon Sep 17 00:00:00 2001
From: Douglas Lowder <dlowder@salesforce.com>
Date: Mon, 12 Mar 2018 11:45:09 -0700
Subject: [PATCH 237/267] Fix tvOS react-native init release build (#18288)

Summary:
Add correct dependencies and linker flags to the HelloWorld template Xcode project so that HelloWorld-tvOSTests builds correctly for release builds.  Fixes #18288 .

Tested with `react-native init --version=https://github.com/dlowder-salesforce/react-native#tvos-init-release-fix` .

[IOS][BUGFIX][ local-cli/templates/ios/HelloWorld ]- fix release build for tvOS
Closes https://github.com/facebook/react-native/pull/18337

Differential Revision: D7240376

Pulled By: hramos

fbshipit-source-id: a4ad219e7d6b06bd6928d55ed7398f8fc9352e72
---
 .../ios/HelloWorld.xcodeproj/project.pbxproj  | 136 +++++++++++++++++-
 1 file changed, 133 insertions(+), 3 deletions(-)

diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
index a7c51152b93bbf..d004c9c3a14d80 100644
--- a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
+++ b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
@@ -34,6 +34,7 @@
 		2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */; };
 		2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
 		2DCD954D1E0B4F2C00145EB5 /* HelloWorldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* HelloWorldTests.m */; };
+		2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
 		5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
 		ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
@@ -131,6 +132,62 @@
 			remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
 			remoteInfo = "fishhook-tvOS";
 		};
+		2DF0FFDE2056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EBF21BDC1FC498900052F4D5;
+			remoteInfo = jsinspector;
+		};
+		2DF0FFE02056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5;
+			remoteInfo = "jsinspector-tvOS";
+		};
+		2DF0FFE22056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7;
+			remoteInfo = "third-party";
+		};
+		2DF0FFE42056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3D383D3C1EBD27B6005632C8;
+			remoteInfo = "third-party-tvOS";
+		};
+		2DF0FFE62056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 139D7E881E25C6D100323FB7;
+			remoteInfo = "double-conversion";
+		};
+		2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3D383D621EBD27B9005632C8;
+			remoteInfo = "double-conversion-tvOS";
+		};
+		2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
+			remoteInfo = privatedata;
+		};
+		2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
+			remoteInfo = "privatedata-tvOS";
+		};
 		3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
@@ -336,6 +393,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -439,13 +497,21 @@
 			isa = PBXGroup;
 			children = (
 				146834041AC3E56700842450 /* libReact.a */,
+				3DAD3EA31DF850E9000B6D8A /* libReact.a */,
 				3DAD3EA51DF850E9000B6D8A /* libyoga.a */,
 				3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
 				3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
 				3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
 				3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
 				3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
-				3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */,
+				2DF0FFDF2056DD460020B375 /* libjsinspector.a */,
+				2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */,
+				2DF0FFE32056DD460020B375 /* libthird-party.a */,
+				2DF0FFE52056DD460020B375 /* libthird-party.a */,
+				2DF0FFE72056DD460020B375 /* libdouble-conversion.a */,
+				2DF0FFE92056DD460020B375 /* libdouble-conversion.a */,
+				2DF0FFEB2056DD460020B375 /* libprivatedata.a */,
+				2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -786,6 +852,62 @@
 			remoteRef = 2D16E6851FA4F8DC00B85C8A /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		2DF0FFDF2056DD460020B375 /* libjsinspector.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libjsinspector.a;
+			remoteRef = 2DF0FFDE2056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libjsinspector-tvOS.a";
+			remoteRef = 2DF0FFE02056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFE32056DD460020B375 /* libthird-party.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libthird-party.a";
+			remoteRef = 2DF0FFE22056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFE52056DD460020B375 /* libthird-party.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libthird-party.a";
+			remoteRef = 2DF0FFE42056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFE72056DD460020B375 /* libdouble-conversion.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libdouble-conversion.a";
+			remoteRef = 2DF0FFE62056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFE92056DD460020B375 /* libdouble-conversion.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libdouble-conversion.a";
+			remoteRef = 2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFEB2056DD460020B375 /* libprivatedata.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libprivatedata.a;
+			remoteRef = 2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libprivatedata-tvOS.a";
+			remoteRef = 2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -828,10 +950,10 @@
 			remoteRef = 3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */ = {
+		3DAD3EA31DF850E9000B6D8A /* libReact.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libReact-tvOS.a";
+			path = libReact.a;
 			remoteRef = 3DAD3EA21DF850E9000B6D8A /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -1179,6 +1301,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "HelloWorld-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lc++",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.HelloWorld-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
@@ -1200,6 +1326,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "HelloWorld-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lc++",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.HelloWorld-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;

From 9c8c5970002d048e8b18088f7c63b39431def50b Mon Sep 17 00:00:00 2001
From: Vince Oppedisano <vinceo@fb.com>
Date: Mon, 12 Mar 2018 12:31:45 -0700
Subject: [PATCH 238/267] Don't truncate in the middle of an emoji

Reviewed By: adiphos, mantong01

Differential Revision: D7198155

fbshipit-source-id: 360955de7ed686170a23b9883058e3137e17b277
---
 Libraries/Utilities/truncate.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Libraries/Utilities/truncate.js b/Libraries/Utilities/truncate.js
index 5ad0f86ee30db4..0e0d8c643ea55e 100644
--- a/Libraries/Utilities/truncate.js
+++ b/Libraries/Utilities/truncate.js
@@ -30,7 +30,11 @@ const truncate = function(
   options = Object.assign({}, defaultOptions, options);
   if (str && str.length &&
       str.length - options.minDelta + options.elipsis.length >= maxChars) {
-    str = str.slice(0, maxChars - options.elipsis.length + 1);
+    // If the slice is happening in the middle of a wide char, add one more char
+    var extraChar = str.charCodeAt(maxChars - options.elipsis.length) > 255
+      ? 1
+      : 0;
+    str = str.slice(0, maxChars - options.elipsis.length + 1 + extraChar);
     if (options.breakOnWords) {
       var ii = Math.max(str.lastIndexOf(' '), str.lastIndexOf('\n'));
       str = str.slice(0, ii);

From 9c29faf6a94728c4bda45171302807721c557d26 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Mon, 12 Mar 2018 23:53:13 +0100
Subject: [PATCH 239/267] [0.55.0-rc.0] Bump version numbers

---
 Libraries/Core/ReactNativeVersion.js                          | 4 ++--
 React/Base/RCTVersion.m                                       | 4 ++--
 ReactAndroid/gradle.properties                                | 2 +-
 .../facebook/react/modules/systeminfo/ReactNativeVersion.java | 4 ++--
 package.json                                                  | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index 52b8f9c47b8f26..87600621ee08f9 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -12,7 +12,7 @@
 
 exports.version = {
   major: 0,
-  minor: 0,
+  minor: 55,
   patch: 0,
-  prerelease: null,
+  prerelease: 'rc.0',
 };
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
index 41f178395c9018..3c94c6eba85ebf 100644
--- a/React/Base/RCTVersion.m
+++ b/React/Base/RCTVersion.m
@@ -21,9 +21,9 @@ static void __makeVersion()
 {
   __rnVersion = @{
                   RCTVersionMajor: @(0),
-                  RCTVersionMinor: @(0),
+                  RCTVersionMinor: @(55),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: [NSNull null],
+                  RCTVersionPrerelease: @"rc.0",
                   };
 }
 
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 9b7ac6d1254dc8..e03ce8ff66321a 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1000.0.0-master
+VERSION_NAME=0.55.0-rc.0
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
index 9e8ac43662b364..26c22826525cc6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -16,7 +16,7 @@
 public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
-      "minor", 0,
+      "minor", 55,
       "patch", 0,
-      "prerelease", null);
+      "prerelease", "rc.0");
 }
diff --git a/package.json b/package.json
index 33f5268f154280..f8a73649faf087 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "1000.0.0",
+  "version": "0.55.0-rc.0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -224,4 +224,4 @@
     "shelljs": "^0.7.8",
     "sinon": "^2.2.0"
   }
-}
+}
\ No newline at end of file

From 85b690fb22b0ad6e2936ec7729fc37849d20a4da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Wed, 14 Mar 2018 08:47:36 -0700
Subject: [PATCH 240/267] React sync for revisions ab4280b...ad9544f

Reviewed By: bvaughn

Differential Revision: D7256390

fbshipit-source-id: 9fe1324da93cb8f4a7f478e1037944774b9b95ff
---
 Libraries/Renderer/REVISION                   |   2 +-
 Libraries/Renderer/ReactFabric-dev.js         | 157 +++++++++------
 Libraries/Renderer/ReactFabric-prod.js        | 189 +++++++++++-------
 Libraries/Renderer/ReactNativeRenderer-dev.js | 157 +++++++++------
 .../Renderer/ReactNativeRenderer-prod.js      | 189 +++++++++++-------
 Libraries/Renderer/shims/ReactFabric.js       |   4 -
 Libraries/Renderer/shims/ReactNativeTypes.js  |  17 +-
 Libraries/Renderer/shims/ReactTypes.js        |  10 +-
 8 files changed, 436 insertions(+), 289 deletions(-)

diff --git a/Libraries/Renderer/REVISION b/Libraries/Renderer/REVISION
index bb434f321ae390..824ff8c33a4c4f 100644
--- a/Libraries/Renderer/REVISION
+++ b/Libraries/Renderer/REVISION
@@ -1 +1 @@
-ab4280b3e98dbb97d3e753083dab19879167c3f5
\ No newline at end of file
+ad9544f48e58f2599a8ea0de1e9f4dd104db30bb
\ No newline at end of file
diff --git a/Libraries/Renderer/ReactFabric-dev.js b/Libraries/Renderer/ReactFabric-dev.js
index 9a30ceeda7036a..867873cd41d55b 100644
--- a/Libraries/Renderer/ReactFabric-dev.js
+++ b/Libraries/Renderer/ReactFabric-dev.js
@@ -3622,6 +3622,11 @@ var ReactNativeComponent = (function(_React$Component) {
   /**
    * Removes focus. This is the opposite of `focus()`.
    */
+
+  /**
+   * Due to bugs in Flow's handling of React.createClass, some fields already
+   * declared in the base class need to be redeclared below.
+   */
   ReactNativeComponent.prototype.blur = function blur() {
     TextInputState.blurTextInput(findNumericNodeHandleFiber(this));
   };
@@ -8327,11 +8332,11 @@ var rendererSigil = void 0;
 function pushProvider(providerFiber) {
   var context = providerFiber.type.context;
   index$1 += 1;
-  changedBitsStack[index$1] = context.changedBits;
-  currentValueStack[index$1] = context.currentValue;
+  changedBitsStack[index$1] = context._changedBits;
+  currentValueStack[index$1] = context._currentValue;
   stack[index$1] = providerFiber;
-  context.currentValue = providerFiber.pendingProps.value;
-  context.changedBits = providerFiber.stateNode;
+  context._currentValue = providerFiber.pendingProps.value;
+  context._changedBits = providerFiber.stateNode;
 
   {
     warning(
@@ -8358,16 +8363,16 @@ function popProvider(providerFiber) {
   stack[index$1] = null;
   index$1 -= 1;
   var context = providerFiber.type.context;
-  context.currentValue = currentValue;
-  context.changedBits = changedBits;
+  context._currentValue = currentValue;
+  context._changedBits = changedBits;
 }
 
 function resetProviderStack() {
   for (var i = index$1; i > -1; i--) {
     var providerFiber = stack[i];
     var context = providerFiber.type.context;
-    context.currentValue = context.defaultValue;
-    context.changedBits = 0;
+    context._currentValue = context._defaultValue;
+    context._changedBits = 0;
     changedBitsStack[i] = null;
     currentValueStack[i] = null;
     stack[i] = null;
@@ -9149,48 +9154,70 @@ var ReactFiberBeginWork = function(
       pushProvider(workInProgress);
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
-    workInProgress.memoizedProps = newProps;
 
     var newValue = newProps.value;
+    workInProgress.memoizedProps = newProps;
 
     var changedBits = void 0;
     if (oldProps === null) {
       // Initial render
       changedBits = MAX_SIGNED_31_BIT_INT;
     } else {
-      var oldValue = oldProps.value;
-      // Use Object.is to compare the new context value to the old value.
-      // Inlined Object.is polyfill.
-      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
-      if (
-        (oldValue === newValue &&
-          (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
-        (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
-      ) {
-        // No change.
+      if (oldProps.value === newProps.value) {
+        // No change. Bailout early if children are the same.
+        if (oldProps.children === newProps.children) {
+          workInProgress.stateNode = 0;
+          pushProvider(workInProgress);
+          return bailoutOnAlreadyFinishedWork(current, workInProgress);
+        }
         changedBits = 0;
       } else {
-        changedBits =
-          typeof context.calculateChangedBits === "function"
-            ? context.calculateChangedBits(oldValue, newValue)
-            : MAX_SIGNED_31_BIT_INT;
-        {
-          warning(
-            (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
-            "calculateChangedBits: Expected the return value to be a " +
-              "31-bit integer. Instead received: %s",
-            changedBits
-          );
-        }
-        changedBits |= 0;
-
-        if (changedBits !== 0) {
-          propagateContextChange(
-            workInProgress,
-            context,
-            changedBits,
-            renderExpirationTime
-          );
+        var oldValue = oldProps.value;
+        // Use Object.is to compare the new context value to the old value.
+        // Inlined Object.is polyfill.
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
+        if (
+          (oldValue === newValue &&
+            (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
+          (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
+        ) {
+          // No change. Bailout early if children are the same.
+          if (oldProps.children === newProps.children) {
+            workInProgress.stateNode = 0;
+            pushProvider(workInProgress);
+            return bailoutOnAlreadyFinishedWork(current, workInProgress);
+          }
+          changedBits = 0;
+        } else {
+          changedBits =
+            typeof context._calculateChangedBits === "function"
+              ? context._calculateChangedBits(oldValue, newValue)
+              : MAX_SIGNED_31_BIT_INT;
+          {
+            warning(
+              (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
+              "calculateChangedBits: Expected the return value to be a " +
+                "31-bit integer. Instead received: %s",
+              changedBits
+            );
+          }
+          changedBits |= 0;
+
+          if (changedBits === 0) {
+            // No change. Bailout early if children are the same.
+            if (oldProps.children === newProps.children) {
+              workInProgress.stateNode = 0;
+              pushProvider(workInProgress);
+              return bailoutOnAlreadyFinishedWork(current, workInProgress);
+            }
+          } else {
+            propagateContextChange(
+              workInProgress,
+              context,
+              changedBits,
+              renderExpirationTime
+            );
+          }
         }
       }
     }
@@ -9198,9 +9225,6 @@ var ReactFiberBeginWork = function(
     workInProgress.stateNode = changedBits;
     pushProvider(workInProgress);
 
-    if (oldProps !== null && oldProps.children === newProps.children) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
     var newChildren = newProps.children;
     reconcileChildren(current, workInProgress, newChildren);
     return workInProgress.child;
@@ -9213,11 +9237,28 @@ var ReactFiberBeginWork = function(
   ) {
     var context = workInProgress.type;
     var newProps = workInProgress.pendingProps;
+    var oldProps = workInProgress.memoizedProps;
+
+    var newValue = context._currentValue;
+    var changedBits = context._changedBits;
+
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (changedBits === 0 && oldProps === newProps) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+    workInProgress.memoizedProps = newProps;
 
-    var newValue = context.currentValue;
-    var changedBits = context.changedBits;
+    var observedBits = newProps.unstable_observedBits;
+    if (observedBits === undefined || observedBits === null) {
+      // Subscribe to all changes by default
+      observedBits = MAX_SIGNED_31_BIT_INT;
+    }
+    // Store the observedBits on the fiber's stateNode for quick access.
+    workInProgress.stateNode = observedBits;
 
-    if (changedBits !== 0) {
+    if ((changedBits & observedBits) !== 0) {
       // Context change propagation stops at matching consumers, for time-
       // slicing. Continue the propagation here.
       propagateContextChange(
@@ -9226,24 +9267,20 @@ var ReactFiberBeginWork = function(
         changedBits,
         renderExpirationTime
       );
+    } else if (oldProps !== null && oldProps.children === newProps.children) {
+      // No change. Bailout early if children are the same.
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
 
-    // Store the observedBits on the fiber's stateNode for quick access.
-    var observedBits = newProps.observedBits;
-    if (observedBits === undefined || observedBits === null) {
-      // Subscribe to all changes by default
-      observedBits = MAX_SIGNED_31_BIT_INT;
-    }
-    workInProgress.stateNode = observedBits;
-
     var render = newProps.children;
 
-    if (typeof render !== "function") {
-      invariant(
-        false,
-        "A context consumer was rendered with multiple children, or a child that isn't a function. " +
-          "A context consumer expects a single child that is a function. " +
-          "If you did pass a function, make sure there is no trailing or leading whitespace around it."
+    {
+      warning(
+        typeof render === "function",
+        "A context consumer was rendered with multiple children, or a child " +
+          "that isn't a function. A context consumer expects a single child " +
+          "that is a function. If you did pass a function, make sure there " +
+          "is no trailing or leading whitespace around it."
       );
     }
 
diff --git a/Libraries/Renderer/ReactFabric-prod.js b/Libraries/Renderer/ReactFabric-prod.js
index 9605c98520cda9..950e09890f8203 100644
--- a/Libraries/Renderer/ReactFabric-prod.js
+++ b/Libraries/Renderer/ReactFabric-prod.js
@@ -3122,11 +3122,11 @@ var reconcileChildFibers = ChildReconciler(!0),
 function pushProvider(providerFiber) {
   var context = providerFiber.type.context;
   index$1 += 1;
-  changedBitsStack[index$1] = context.changedBits;
-  currentValueStack[index$1] = context.currentValue;
+  changedBitsStack[index$1] = context._changedBits;
+  currentValueStack[index$1] = context._currentValue;
   stack[index$1] = providerFiber;
-  context.currentValue = providerFiber.pendingProps.value;
-  context.changedBits = providerFiber.stateNode;
+  context._currentValue = providerFiber.pendingProps.value;
+  context._changedBits = providerFiber.stateNode;
 }
 function popProvider(providerFiber) {
   var changedBits = changedBitsStack[index$1],
@@ -3136,8 +3136,8 @@ function popProvider(providerFiber) {
   stack[index$1] = null;
   --index$1;
   providerFiber = providerFiber.type.context;
-  providerFiber.currentValue = currentValue;
-  providerFiber.changedBits = changedBits;
+  providerFiber._currentValue = currentValue;
+  providerFiber._changedBits = changedBits;
 }
 function ReactFiberBeginWork(
   config,
@@ -3289,6 +3289,72 @@ function ReactFiberBeginWork(
       fiber = nextFiber;
     }
   }
+  function updateContextProvider(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    var context = workInProgress.type.context,
+      newProps = workInProgress.pendingProps,
+      oldProps = workInProgress.memoizedProps;
+    if (!didPerformWorkStackCursor.current && oldProps === newProps)
+      return (
+        (workInProgress.stateNode = 0),
+        pushProvider(workInProgress),
+        bailoutOnAlreadyFinishedWork(current, workInProgress)
+      );
+    var newValue = newProps.value;
+    workInProgress.memoizedProps = newProps;
+    if (null === oldProps) newValue = 1073741823;
+    else if (oldProps.value === newProps.value) {
+      if (oldProps.children === newProps.children)
+        return (
+          (workInProgress.stateNode = 0),
+          pushProvider(workInProgress),
+          bailoutOnAlreadyFinishedWork(current, workInProgress)
+        );
+      newValue = 0;
+    } else {
+      var oldValue = oldProps.value;
+      if (
+        (oldValue === newValue &&
+          (0 !== oldValue || 1 / oldValue === 1 / newValue)) ||
+        (oldValue !== oldValue && newValue !== newValue)
+      ) {
+        if (oldProps.children === newProps.children)
+          return (
+            (workInProgress.stateNode = 0),
+            pushProvider(workInProgress),
+            bailoutOnAlreadyFinishedWork(current, workInProgress)
+          );
+        newValue = 0;
+      } else if (
+        ((newValue =
+          "function" === typeof context._calculateChangedBits
+            ? context._calculateChangedBits(oldValue, newValue)
+            : 1073741823),
+        (newValue |= 0),
+        0 === newValue)
+      ) {
+        if (oldProps.children === newProps.children)
+          return (
+            (workInProgress.stateNode = 0),
+            pushProvider(workInProgress),
+            bailoutOnAlreadyFinishedWork(current, workInProgress)
+          );
+      } else
+        propagateContextChange(
+          workInProgress,
+          context,
+          newValue,
+          renderExpirationTime
+        );
+    }
+    workInProgress.stateNode = newValue;
+    pushProvider(workInProgress);
+    reconcileChildren(current, workInProgress, newProps.children);
+    return workInProgress.child;
+  }
   function bailoutOnAlreadyFinishedWork(current, workInProgress) {
     invariant(
       null === current || workInProgress.child === current.child,
@@ -3641,71 +3707,50 @@ function ReactFiberBeginWork(
             current
           );
         case 13:
-          props = workInProgress.type.context;
-          fn = workInProgress.pendingProps;
-          unmaskedContext = workInProgress.memoizedProps;
-          if (didPerformWorkStackCursor.current || unmaskedContext !== fn) {
-            workInProgress.memoizedProps = fn;
-            updateQueue = fn.value;
-            if (null === unmaskedContext) updateQueue = 1073741823;
-            else {
-              var oldValue = unmaskedContext.value;
-              (oldValue === updateQueue &&
-                (0 !== oldValue || 1 / oldValue === 1 / updateQueue)) ||
-              (oldValue !== oldValue && updateQueue !== updateQueue)
-                ? (updateQueue = 0)
-                : ((updateQueue =
-                    "function" === typeof props.calculateChangedBits
-                      ? props.calculateChangedBits(oldValue, updateQueue)
-                      : 1073741823),
-                  (updateQueue |= 0),
-                  0 !== updateQueue &&
-                    propagateContextChange(
-                      workInProgress,
-                      props,
-                      updateQueue,
-                      renderExpirationTime
-                    ));
-            }
-            workInProgress.stateNode = updateQueue;
-            pushProvider(workInProgress);
-            null !== unmaskedContext && unmaskedContext.children === fn.children
-              ? (current = bailoutOnAlreadyFinishedWork(
-                  current,
-                  workInProgress
-                ))
-              : (reconcileChildren(current, workInProgress, fn.children),
-                (current = workInProgress.child));
-          } else
-            (workInProgress.stateNode = 0),
-              pushProvider(workInProgress),
-              (current = bailoutOnAlreadyFinishedWork(current, workInProgress));
-          return current;
+          return updateContextProvider(
+            current,
+            workInProgress,
+            renderExpirationTime
+          );
         case 12:
-          unmaskedContext = workInProgress.type;
-          fn = workInProgress.pendingProps;
-          props = unmaskedContext.currentValue;
-          updateQueue = unmaskedContext.changedBits;
-          0 !== updateQueue &&
-            propagateContextChange(
-              workInProgress,
-              unmaskedContext,
-              updateQueue,
-              renderExpirationTime
-            );
-          renderExpirationTime = fn.observedBits;
-          if (void 0 === renderExpirationTime || null === renderExpirationTime)
-            renderExpirationTime = 1073741823;
-          workInProgress.stateNode = renderExpirationTime;
-          renderExpirationTime = fn.children;
-          "function" !== typeof renderExpirationTime &&
-            invariant(
-              !1,
-              "A context consumer was rendered with multiple children, or a child that isn't a function. A context consumer expects a single child that is a function. If you did pass a function, make sure there is no trailing or leading whitespace around it."
-            );
-          renderExpirationTime = renderExpirationTime(props);
-          reconcileChildren(current, workInProgress, renderExpirationTime);
-          return workInProgress.child;
+          a: {
+            fn = workInProgress.type;
+            unmaskedContext = workInProgress.pendingProps;
+            updateQueue = workInProgress.memoizedProps;
+            props = fn._currentValue;
+            var changedBits = fn._changedBits;
+            if (
+              didPerformWorkStackCursor.current ||
+              0 !== changedBits ||
+              updateQueue !== unmaskedContext
+            ) {
+              workInProgress.memoizedProps = unmaskedContext;
+              var observedBits = unmaskedContext.unstable_observedBits;
+              if (void 0 === observedBits || null === observedBits)
+                observedBits = 1073741823;
+              workInProgress.stateNode = observedBits;
+              if (0 !== (changedBits & observedBits))
+                propagateContextChange(
+                  workInProgress,
+                  fn,
+                  changedBits,
+                  renderExpirationTime
+                );
+              else if (
+                null !== updateQueue &&
+                updateQueue.children === unmaskedContext.children
+              ) {
+                current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+                break a;
+              }
+              renderExpirationTime = unmaskedContext.children;
+              renderExpirationTime = renderExpirationTime(props);
+              reconcileChildren(current, workInProgress, renderExpirationTime);
+              current = workInProgress.child;
+            } else
+              current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+          }
+          return current;
         default:
           invariant(
             !1,
@@ -4581,8 +4626,8 @@ function ReactFiberScheduler(config) {
     resetHostContainer();
     for (var i = index$1; -1 < i; i--) {
       var context = stack[i].type.context;
-      context.currentValue = context.defaultValue;
-      context.changedBits = 0;
+      context._currentValue = context._defaultValue;
+      context._changedBits = 0;
       changedBitsStack[i] = null;
       currentValueStack[i] = null;
       stack[i] = null;
diff --git a/Libraries/Renderer/ReactNativeRenderer-dev.js b/Libraries/Renderer/ReactNativeRenderer-dev.js
index fc98f17e176f8b..400472d29a3875 100644
--- a/Libraries/Renderer/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/ReactNativeRenderer-dev.js
@@ -3968,6 +3968,11 @@ var ReactNativeComponent = (function(_React$Component) {
   /**
    * Removes focus. This is the opposite of `focus()`.
    */
+
+  /**
+   * Due to bugs in Flow's handling of React.createClass, some fields already
+   * declared in the base class need to be redeclared below.
+   */
   ReactNativeComponent.prototype.blur = function blur() {
     TextInputState.blurTextInput(findNumericNodeHandleFiber(this));
   };
@@ -8585,11 +8590,11 @@ var rendererSigil = void 0;
 function pushProvider(providerFiber) {
   var context = providerFiber.type.context;
   index$1 += 1;
-  changedBitsStack[index$1] = context.changedBits;
-  currentValueStack[index$1] = context.currentValue;
+  changedBitsStack[index$1] = context._changedBits;
+  currentValueStack[index$1] = context._currentValue;
   stack[index$1] = providerFiber;
-  context.currentValue = providerFiber.pendingProps.value;
-  context.changedBits = providerFiber.stateNode;
+  context._currentValue = providerFiber.pendingProps.value;
+  context._changedBits = providerFiber.stateNode;
 
   {
     warning(
@@ -8616,16 +8621,16 @@ function popProvider(providerFiber) {
   stack[index$1] = null;
   index$1 -= 1;
   var context = providerFiber.type.context;
-  context.currentValue = currentValue;
-  context.changedBits = changedBits;
+  context._currentValue = currentValue;
+  context._changedBits = changedBits;
 }
 
 function resetProviderStack() {
   for (var i = index$1; i > -1; i--) {
     var providerFiber = stack[i];
     var context = providerFiber.type.context;
-    context.currentValue = context.defaultValue;
-    context.changedBits = 0;
+    context._currentValue = context._defaultValue;
+    context._changedBits = 0;
     changedBitsStack[i] = null;
     currentValueStack[i] = null;
     stack[i] = null;
@@ -9407,48 +9412,70 @@ var ReactFiberBeginWork = function(
       pushProvider(workInProgress);
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
-    workInProgress.memoizedProps = newProps;
 
     var newValue = newProps.value;
+    workInProgress.memoizedProps = newProps;
 
     var changedBits = void 0;
     if (oldProps === null) {
       // Initial render
       changedBits = MAX_SIGNED_31_BIT_INT;
     } else {
-      var oldValue = oldProps.value;
-      // Use Object.is to compare the new context value to the old value.
-      // Inlined Object.is polyfill.
-      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
-      if (
-        (oldValue === newValue &&
-          (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
-        (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
-      ) {
-        // No change.
+      if (oldProps.value === newProps.value) {
+        // No change. Bailout early if children are the same.
+        if (oldProps.children === newProps.children) {
+          workInProgress.stateNode = 0;
+          pushProvider(workInProgress);
+          return bailoutOnAlreadyFinishedWork(current, workInProgress);
+        }
         changedBits = 0;
       } else {
-        changedBits =
-          typeof context.calculateChangedBits === "function"
-            ? context.calculateChangedBits(oldValue, newValue)
-            : MAX_SIGNED_31_BIT_INT;
-        {
-          warning(
-            (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
-            "calculateChangedBits: Expected the return value to be a " +
-              "31-bit integer. Instead received: %s",
-            changedBits
-          );
-        }
-        changedBits |= 0;
-
-        if (changedBits !== 0) {
-          propagateContextChange(
-            workInProgress,
-            context,
-            changedBits,
-            renderExpirationTime
-          );
+        var oldValue = oldProps.value;
+        // Use Object.is to compare the new context value to the old value.
+        // Inlined Object.is polyfill.
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
+        if (
+          (oldValue === newValue &&
+            (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
+          (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
+        ) {
+          // No change. Bailout early if children are the same.
+          if (oldProps.children === newProps.children) {
+            workInProgress.stateNode = 0;
+            pushProvider(workInProgress);
+            return bailoutOnAlreadyFinishedWork(current, workInProgress);
+          }
+          changedBits = 0;
+        } else {
+          changedBits =
+            typeof context._calculateChangedBits === "function"
+              ? context._calculateChangedBits(oldValue, newValue)
+              : MAX_SIGNED_31_BIT_INT;
+          {
+            warning(
+              (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
+              "calculateChangedBits: Expected the return value to be a " +
+                "31-bit integer. Instead received: %s",
+              changedBits
+            );
+          }
+          changedBits |= 0;
+
+          if (changedBits === 0) {
+            // No change. Bailout early if children are the same.
+            if (oldProps.children === newProps.children) {
+              workInProgress.stateNode = 0;
+              pushProvider(workInProgress);
+              return bailoutOnAlreadyFinishedWork(current, workInProgress);
+            }
+          } else {
+            propagateContextChange(
+              workInProgress,
+              context,
+              changedBits,
+              renderExpirationTime
+            );
+          }
         }
       }
     }
@@ -9456,9 +9483,6 @@ var ReactFiberBeginWork = function(
     workInProgress.stateNode = changedBits;
     pushProvider(workInProgress);
 
-    if (oldProps !== null && oldProps.children === newProps.children) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
     var newChildren = newProps.children;
     reconcileChildren(current, workInProgress, newChildren);
     return workInProgress.child;
@@ -9471,11 +9495,28 @@ var ReactFiberBeginWork = function(
   ) {
     var context = workInProgress.type;
     var newProps = workInProgress.pendingProps;
+    var oldProps = workInProgress.memoizedProps;
+
+    var newValue = context._currentValue;
+    var changedBits = context._changedBits;
+
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (changedBits === 0 && oldProps === newProps) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+    workInProgress.memoizedProps = newProps;
 
-    var newValue = context.currentValue;
-    var changedBits = context.changedBits;
+    var observedBits = newProps.unstable_observedBits;
+    if (observedBits === undefined || observedBits === null) {
+      // Subscribe to all changes by default
+      observedBits = MAX_SIGNED_31_BIT_INT;
+    }
+    // Store the observedBits on the fiber's stateNode for quick access.
+    workInProgress.stateNode = observedBits;
 
-    if (changedBits !== 0) {
+    if ((changedBits & observedBits) !== 0) {
       // Context change propagation stops at matching consumers, for time-
       // slicing. Continue the propagation here.
       propagateContextChange(
@@ -9484,24 +9525,20 @@ var ReactFiberBeginWork = function(
         changedBits,
         renderExpirationTime
       );
+    } else if (oldProps !== null && oldProps.children === newProps.children) {
+      // No change. Bailout early if children are the same.
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
 
-    // Store the observedBits on the fiber's stateNode for quick access.
-    var observedBits = newProps.observedBits;
-    if (observedBits === undefined || observedBits === null) {
-      // Subscribe to all changes by default
-      observedBits = MAX_SIGNED_31_BIT_INT;
-    }
-    workInProgress.stateNode = observedBits;
-
     var render = newProps.children;
 
-    if (typeof render !== "function") {
-      invariant(
-        false,
-        "A context consumer was rendered with multiple children, or a child that isn't a function. " +
-          "A context consumer expects a single child that is a function. " +
-          "If you did pass a function, make sure there is no trailing or leading whitespace around it."
+    {
+      warning(
+        typeof render === "function",
+        "A context consumer was rendered with multiple children, or a child " +
+          "that isn't a function. A context consumer expects a single child " +
+          "that is a function. If you did pass a function, make sure there " +
+          "is no trailing or leading whitespace around it."
       );
     }
 
diff --git a/Libraries/Renderer/ReactNativeRenderer-prod.js b/Libraries/Renderer/ReactNativeRenderer-prod.js
index dd0cd8b9cb5346..ca27b720b33dfe 100644
--- a/Libraries/Renderer/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/ReactNativeRenderer-prod.js
@@ -3376,11 +3376,11 @@ var reconcileChildFibers = ChildReconciler(!0),
 function pushProvider(providerFiber) {
   var context = providerFiber.type.context;
   index$1 += 1;
-  changedBitsStack[index$1] = context.changedBits;
-  currentValueStack[index$1] = context.currentValue;
+  changedBitsStack[index$1] = context._changedBits;
+  currentValueStack[index$1] = context._currentValue;
   stack[index$1] = providerFiber;
-  context.currentValue = providerFiber.pendingProps.value;
-  context.changedBits = providerFiber.stateNode;
+  context._currentValue = providerFiber.pendingProps.value;
+  context._changedBits = providerFiber.stateNode;
 }
 function popProvider(providerFiber) {
   var changedBits = changedBitsStack[index$1],
@@ -3390,8 +3390,8 @@ function popProvider(providerFiber) {
   stack[index$1] = null;
   --index$1;
   providerFiber = providerFiber.type.context;
-  providerFiber.currentValue = currentValue;
-  providerFiber.changedBits = changedBits;
+  providerFiber._currentValue = currentValue;
+  providerFiber._changedBits = changedBits;
 }
 function ReactFiberBeginWork(
   config,
@@ -3552,6 +3552,72 @@ function ReactFiberBeginWork(
       fiber = nextFiber;
     }
   }
+  function updateContextProvider(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    var context = workInProgress.type.context,
+      newProps = workInProgress.pendingProps,
+      oldProps = workInProgress.memoizedProps;
+    if (!didPerformWorkStackCursor.current && oldProps === newProps)
+      return (
+        (workInProgress.stateNode = 0),
+        pushProvider(workInProgress),
+        bailoutOnAlreadyFinishedWork(current, workInProgress)
+      );
+    var newValue = newProps.value;
+    workInProgress.memoizedProps = newProps;
+    if (null === oldProps) newValue = 1073741823;
+    else if (oldProps.value === newProps.value) {
+      if (oldProps.children === newProps.children)
+        return (
+          (workInProgress.stateNode = 0),
+          pushProvider(workInProgress),
+          bailoutOnAlreadyFinishedWork(current, workInProgress)
+        );
+      newValue = 0;
+    } else {
+      var oldValue = oldProps.value;
+      if (
+        (oldValue === newValue &&
+          (0 !== oldValue || 1 / oldValue === 1 / newValue)) ||
+        (oldValue !== oldValue && newValue !== newValue)
+      ) {
+        if (oldProps.children === newProps.children)
+          return (
+            (workInProgress.stateNode = 0),
+            pushProvider(workInProgress),
+            bailoutOnAlreadyFinishedWork(current, workInProgress)
+          );
+        newValue = 0;
+      } else if (
+        ((newValue =
+          "function" === typeof context._calculateChangedBits
+            ? context._calculateChangedBits(oldValue, newValue)
+            : 1073741823),
+        (newValue |= 0),
+        0 === newValue)
+      ) {
+        if (oldProps.children === newProps.children)
+          return (
+            (workInProgress.stateNode = 0),
+            pushProvider(workInProgress),
+            bailoutOnAlreadyFinishedWork(current, workInProgress)
+          );
+      } else
+        propagateContextChange(
+          workInProgress,
+          context,
+          newValue,
+          renderExpirationTime
+        );
+    }
+    workInProgress.stateNode = newValue;
+    pushProvider(workInProgress);
+    reconcileChildren(current, workInProgress, newProps.children);
+    return workInProgress.child;
+  }
   function bailoutOnAlreadyFinishedWork(current, workInProgress) {
     invariant(
       null === current || workInProgress.child === current.child,
@@ -3904,71 +3970,50 @@ function ReactFiberBeginWork(
             current
           );
         case 13:
-          props = workInProgress.type.context;
-          fn = workInProgress.pendingProps;
-          unmaskedContext = workInProgress.memoizedProps;
-          if (didPerformWorkStackCursor.current || unmaskedContext !== fn) {
-            workInProgress.memoizedProps = fn;
-            updateQueue = fn.value;
-            if (null === unmaskedContext) updateQueue = 1073741823;
-            else {
-              var oldValue = unmaskedContext.value;
-              (oldValue === updateQueue &&
-                (0 !== oldValue || 1 / oldValue === 1 / updateQueue)) ||
-              (oldValue !== oldValue && updateQueue !== updateQueue)
-                ? (updateQueue = 0)
-                : ((updateQueue =
-                    "function" === typeof props.calculateChangedBits
-                      ? props.calculateChangedBits(oldValue, updateQueue)
-                      : 1073741823),
-                  (updateQueue |= 0),
-                  0 !== updateQueue &&
-                    propagateContextChange(
-                      workInProgress,
-                      props,
-                      updateQueue,
-                      renderExpirationTime
-                    ));
-            }
-            workInProgress.stateNode = updateQueue;
-            pushProvider(workInProgress);
-            null !== unmaskedContext && unmaskedContext.children === fn.children
-              ? (current = bailoutOnAlreadyFinishedWork(
-                  current,
-                  workInProgress
-                ))
-              : (reconcileChildren(current, workInProgress, fn.children),
-                (current = workInProgress.child));
-          } else
-            (workInProgress.stateNode = 0),
-              pushProvider(workInProgress),
-              (current = bailoutOnAlreadyFinishedWork(current, workInProgress));
-          return current;
+          return updateContextProvider(
+            current,
+            workInProgress,
+            renderExpirationTime
+          );
         case 12:
-          unmaskedContext = workInProgress.type;
-          fn = workInProgress.pendingProps;
-          props = unmaskedContext.currentValue;
-          updateQueue = unmaskedContext.changedBits;
-          0 !== updateQueue &&
-            propagateContextChange(
-              workInProgress,
-              unmaskedContext,
-              updateQueue,
-              renderExpirationTime
-            );
-          renderExpirationTime = fn.observedBits;
-          if (void 0 === renderExpirationTime || null === renderExpirationTime)
-            renderExpirationTime = 1073741823;
-          workInProgress.stateNode = renderExpirationTime;
-          renderExpirationTime = fn.children;
-          "function" !== typeof renderExpirationTime &&
-            invariant(
-              !1,
-              "A context consumer was rendered with multiple children, or a child that isn't a function. A context consumer expects a single child that is a function. If you did pass a function, make sure there is no trailing or leading whitespace around it."
-            );
-          renderExpirationTime = renderExpirationTime(props);
-          reconcileChildren(current, workInProgress, renderExpirationTime);
-          return workInProgress.child;
+          a: {
+            fn = workInProgress.type;
+            unmaskedContext = workInProgress.pendingProps;
+            updateQueue = workInProgress.memoizedProps;
+            props = fn._currentValue;
+            var changedBits = fn._changedBits;
+            if (
+              didPerformWorkStackCursor.current ||
+              0 !== changedBits ||
+              updateQueue !== unmaskedContext
+            ) {
+              workInProgress.memoizedProps = unmaskedContext;
+              var observedBits = unmaskedContext.unstable_observedBits;
+              if (void 0 === observedBits || null === observedBits)
+                observedBits = 1073741823;
+              workInProgress.stateNode = observedBits;
+              if (0 !== (changedBits & observedBits))
+                propagateContextChange(
+                  workInProgress,
+                  fn,
+                  changedBits,
+                  renderExpirationTime
+                );
+              else if (
+                null !== updateQueue &&
+                updateQueue.children === unmaskedContext.children
+              ) {
+                current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+                break a;
+              }
+              renderExpirationTime = unmaskedContext.children;
+              renderExpirationTime = renderExpirationTime(props);
+              reconcileChildren(current, workInProgress, renderExpirationTime);
+              current = workInProgress.child;
+            } else
+              current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+          }
+          return current;
         default:
           invariant(
             !1,
@@ -4977,8 +5022,8 @@ function ReactFiberScheduler(config) {
     resetHostContainer();
     for (var i = index$1; -1 < i; i--) {
       var context = stack[i].type.context;
-      context.currentValue = context.defaultValue;
-      context.changedBits = 0;
+      context._currentValue = context._defaultValue;
+      context._changedBits = 0;
       changedBitsStack[i] = null;
       currentValueStack[i] = null;
       stack[i] = null;
diff --git a/Libraries/Renderer/shims/ReactFabric.js b/Libraries/Renderer/shims/ReactFabric.js
index 4162ca62fef73d..4a396c224cd4ff 100644
--- a/Libraries/Renderer/shims/ReactFabric.js
+++ b/Libraries/Renderer/shims/ReactFabric.js
@@ -9,8 +9,6 @@
  */
 'use strict';
 
-const BatchedBridge = require('BatchedBridge');
-
 // TODO @sema: Adjust types
 import type {ReactNativeType} from 'ReactNativeTypes';
 
@@ -22,6 +20,4 @@ if (__DEV__) {
   ReactFabric = require('ReactFabric-prod');
 }
 
-BatchedBridge.registerCallableModule('ReactFabric', ReactFabric);
-
 module.exports = (ReactFabric: ReactNativeType);
diff --git a/Libraries/Renderer/shims/ReactNativeTypes.js b/Libraries/Renderer/shims/ReactNativeTypes.js
index 121a2fdd4d3dd3..f20bb30faa7938 100644
--- a/Libraries/Renderer/shims/ReactNativeTypes.js
+++ b/Libraries/Renderer/shims/ReactNativeTypes.js
@@ -86,27 +86,12 @@ type SecretInternalsType = {
   // And how much information to fill in for the above types.
 };
 
-declare class ReactNativeComponent<Props, State = void>
-  extends React$Component<Props, State> {
-
-  blur(): void,
-  focus(): void,
-  measure(callback: MeasureOnSuccessCallback): void,
-  measureInWindow(callback: MeasureInWindowOnSuccessCallback): void,
-  measureLayout(
-    relativeToNativeNode: number,
-    onSuccess: MeasureLayoutOnSuccessCallback,
-    onFail: () => void,
-  ): void,
-  setNativeProps(nativeProps: Object): void,
-}
-
 /**
  * Flat ReactNative renderer bundles are too big for Flow to parse efficiently.
  * Provide minimal Flow typing for the high-level RN API and call it a day.
  */
 export type ReactNativeType = {
-  NativeComponent: typeof ReactNativeComponent,
+  NativeComponent: any,
   findNodeHandle(componentOrHandle: any): ?number,
   render(
     element: React$Element<any>,
diff --git a/Libraries/Renderer/shims/ReactTypes.js b/Libraries/Renderer/shims/ReactTypes.js
index 26ada3c5e842f5..bede9f00e30069 100644
--- a/Libraries/Renderer/shims/ReactTypes.js
+++ b/Libraries/Renderer/shims/ReactTypes.js
@@ -80,10 +80,12 @@ export type ReactContext<T> = {
   $$typeof: Symbol | number,
   Consumer: ReactContext<T>,
   Provider: ReactProviderType<T>,
-  calculateChangedBits: ((a: T, b: T) => number) | null,
-  defaultValue: T,
-  currentValue: T,
-  changedBits: number,
+
+  _calculateChangedBits: ((a: T, b: T) => number) | null,
+  _defaultValue: T,
+
+  _currentValue: T,
+  _changedBits: number,
 
   // DEV only
   _currentRenderer?: Object | null,

From ca8ce83cc3c38751604afce5a3e2f0473d9cba91 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Tue, 20 Mar 2018 21:43:47 +0100
Subject: [PATCH 241/267] Fix issues with pollParams and link

---
 local-cli/link/link.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/local-cli/link/link.js b/local-cli/link/link.js
index b77c135f9f470f..66e9efbf563c8e 100644
--- a/local-cli/link/link.js
+++ b/local-cli/link/link.js
@@ -37,7 +37,9 @@ log.heading = 'rnpm-link';
 
 const dedupeAssets = (assets) => uniqBy(assets, asset => path.basename(asset));
 
-const linkDependency = (platforms, project, dependency) => {
+const linkDependency = async (platforms, project, dependency) => {
+  const params = await pollParams(dependency.config.params);
+
   Object.keys(platforms || {})
     .forEach(platform => {
       if (!project[platform] || !dependency.config[platform]) {
@@ -56,18 +58,16 @@ const linkDependency = (platforms, project, dependency) => {
         return null;
       }
 
-      return pollParams(dependency.config.params).then(params => {
-        log.info(`Linking ${dependency.name} ${platform} dependency`);
+      log.info(`Linking ${dependency.name} ${platform} dependency`);
 
-        linkConfig.register(
-          dependency.name,
-          dependency.config[platform],
-          params,
-          project[platform]
-        );
+      linkConfig.register(
+        dependency.name,
+        dependency.config[platform],
+        params,
+        project[platform]
+      );
 
-        log.info(`Platform '${platform}' module ${dependency.name} has been successfully linked`);
-      });
+      log.info(`Platform '${platform}' module ${dependency.name} has been successfully linked`);
     });
 };
 

From b20827250e77e22c50b19aaa04a9603a2657756b Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Tue, 20 Mar 2018 21:50:22 +0100
Subject: [PATCH 242/267] [0.55.0-rc.1] Bump version numbers

---
 Libraries/Core/ReactNativeVersion.js                            | 2 +-
 React/Base/RCTVersion.m                                         | 2 +-
 ReactAndroid/gradle.properties                                  | 2 +-
 .../facebook/react/modules/systeminfo/ReactNativeVersion.java   | 2 +-
 package.json                                                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index 87600621ee08f9..d93822a1089822 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -14,5 +14,5 @@ exports.version = {
   major: 0,
   minor: 55,
   patch: 0,
-  prerelease: 'rc.0',
+  prerelease: 'rc.1',
 };
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
index 3c94c6eba85ebf..58c64c92ece149 100644
--- a/React/Base/RCTVersion.m
+++ b/React/Base/RCTVersion.m
@@ -23,7 +23,7 @@ static void __makeVersion()
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(55),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.0",
+                  RCTVersionPrerelease: @"rc.1",
                   };
 }
 
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index e03ce8ff66321a..26a67c1138f940 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=0.55.0-rc.0
+VERSION_NAME=0.55.0-rc.1
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
index 26c22826525cc6..73fbc1d980aa80 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 55,
       "patch", 0,
-      "prerelease", "rc.0");
+      "prerelease", "rc.1");
 }
diff --git a/package.json b/package.json
index f8a73649faf087..e6ad9d2ef5a394 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.55.0-rc.0",
+  "version": "0.55.0-rc.1",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {

From 8a6ab142006c4ab0c33b6acf2005e5c937b22cb4 Mon Sep 17 00:00:00 2001
From: Eric Samelson <samelson.e@gmail.com>
Date: Thu, 22 Mar 2018 10:47:40 -0700
Subject: [PATCH 243/267] fix ReadableNativeMap.toHashMap() for nested maps and
 arrays

Summary:
<!--
  Required: Write your motivation here.
  If this PR fixes an issue, type "Fixes #issueNumber" to automatically close the issue when the PR is merged.
-->

Commit https://github.com/facebook/react-native/commit/7891805d22e3fdc821961ff0ccc5c450c3d625c8 broke the previous behavior of `ReadableNativeMap.toHashMap()` for nested maps and arrays. Previously, all nested `ReadableNativeMap`s and `ReadableNativeArray`s were recursively converted to `HashMap`s and `ArrayList`s, but this is lost when only `getLocalMap()` is returned.

<!--
  Required: Write your test plan here. If you changed any code, please provide us with
  clear instructions on how you verified your changes work. Bonus points for screenshots and videos!
-->

Call `ReadableNativeMap.toHashMap()` on a map with values of type `ReadableNativeMap` and `ReadableNativeArray`. Verify the returned hash map has these converted to `HashMap` and `ArrayList`, respectively.

<!--
  Does this PR require a documentation change?
  Create a PR at https://github.com/facebook/react-native-website and add a link to it here.
-->

<!--
  Required.
  Help reviewers and the release process by writing your own release notes. See below for an example.
-->

[ANDROID] [BUGFIX] [ReadableNativeMap] - Fix toHashMap() for nested maps and arrays

<!--
  **INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

    CATEGORY
  [----------]      TYPE
  [ CLI      ] [-------------]    LOCATION
  [ DOCS     ] [ BREAKING    ] [-------------]
  [ GENERAL  ] [ BUGFIX      ] [ {Component} ]
  [ INTERNAL ] [ ENHANCEMENT ] [ {Filename}  ]
  [ IOS      ] [ FEATURE     ] [ {Directory} ]   |-----------|
  [ ANDROID  ] [ MINOR       ] [ {Framework} ] - | {Message} |
  [----------] [-------------] [-------------]   |-----------|

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
Closes https://github.com/facebook/react-native/pull/18455

Reviewed By: kathryngray

Differential Revision: D7347344

Pulled By: mdvacca

fbshipit-source-id: af2bca9dec6c0cb8a7da099b6757434fcc3ac785
---
 .../react/bridge/ReadableNativeMap.java       | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
index 82f7f20a0229dd..0cb9c10ef1c6f5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
@@ -11,6 +11,7 @@
 import com.facebook.proguard.annotations.DoNotStrip;
 
 import java.util.HashMap;
+import java.util.Iterator;
 
 import com.facebook.infer.annotation.Assertions;
 import javax.annotation.Nullable;
@@ -248,7 +249,31 @@ public HashMap<String, Object> toHashMap() {
         }
       return hashMap;
     }
-    return getLocalMap();
+
+    // we can almost just return getLocalMap(), but we need to convert nested arrays and maps to the
+    // correct types first
+    HashMap<String, Object> hashMap = new HashMap<>(getLocalMap());
+    Iterator iterator = hashMap.keySet().iterator();
+
+    while (iterator.hasNext()) {
+      String key = (String) iterator.next();
+      switch (getType(key)) {
+        case Null:
+        case Boolean:
+        case Number:
+        case String:
+          break;
+        case Map:
+          hashMap.put(key, Assertions.assertNotNull(getMap(key)).toHashMap());
+          break;
+        case Array:
+          hashMap.put(key, Assertions.assertNotNull(getArray(key)).toArrayList());
+          break;
+        default:
+          throw new IllegalArgumentException("Could not convert object with key: " + key + ".");
+      }
+    }
+    return hashMap;
   }
 
   /**

From 093a78d99d09b408a8261c29547c06d6796489fe Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Tue, 27 Mar 2018 10:34:09 -0700
Subject: [PATCH 244/267] Fix blob response parsing for empty body on iOS

Summary:
We currently handle empty body poorly in the iOS blob implementation, this happens because of an early return that cause the blob response to not be processed by the blob module, resulting in an empty string as the body instead of a blob object. We also need to make sure to create an empty blob object when data is nil (empty body) as per the XMLHttpRequest spec. The Android implementation was already handling this properly.

Fixes #18223

Send a HEAD request

```js
fetch('https://apipre.monkimun.com/whoami', {
  body: null,
  method: 'HEAD',
  headers: {
    Accept: 'application/json',
    'Content-Type': 'application/json',
  },
})
```

[IOS][BUGFIX][Blob] - Fix blob response parsing for empty body
Closes https://github.com/facebook/react-native/pull/18547

Differential Revision: D7415950

Pulled By: hramos

fbshipit-source-id: 56860532c6171255869f02a0960f55d155184a46
---
 Libraries/Blob/RCTBlobManager.mm   | 3 +++
 Libraries/Network/RCTNetworking.mm | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm
index 56235ee04b6dfe..7c0cbb8673f064 100755
--- a/Libraries/Blob/RCTBlobManager.mm
+++ b/Libraries/Blob/RCTBlobManager.mm
@@ -258,6 +258,9 @@ - (BOOL)canHandleNetworkingResponse:(NSString *)responseType
 
 - (id)handleNetworkingResponse:(NSURLResponse *)response data:(NSData *)data
 {
+  // An empty body will have nil for data, in this case we need to return
+  // an empty blob as per the XMLHttpRequest spec.
+  data = data ?: [NSData new];
   return @{
     @"blobId": [self store:data],
     @"offset": @0,
diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm
index fe86d31e67e0ff..f8de23abf0127f 100644
--- a/Libraries/Network/RCTNetworking.mm
+++ b/Libraries/Network/RCTNetworking.mm
@@ -439,10 +439,6 @@ - (void)sendData:(NSData *)data
 {
   RCTAssertThread(_methodQueue, @"sendData: must be called on method queue");
 
-  if (data.length == 0) {
-    return;
-  }
-
   id responseData = nil;
   for (id<RCTNetworkingResponseHandler> handler in _responseHandlers) {
     if ([handler canHandleNetworkingResponse:responseType]) {
@@ -452,6 +448,10 @@ - (void)sendData:(NSData *)data
   }
 
   if (!responseData) {
+    if (data.length == 0) {
+      return;
+    }
+
     if ([responseType isEqualToString:@"text"]) {
       // No carry storage is required here because the entire data has been loaded.
       responseData = [RCTNetworking decodeTextData:data fromResponse:task.response withCarryData:nil];

From c70578ab76153bbfdb290810a1bb9488bc979199 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Wed, 28 Mar 2018 19:12:20 +0200
Subject: [PATCH 245/267] [0.55.0-rc.2] Bump version numbers

---
 Libraries/Core/ReactNativeVersion.js                            | 2 +-
 React/Base/RCTVersion.m                                         | 2 +-
 ReactAndroid/gradle.properties                                  | 2 +-
 .../facebook/react/modules/systeminfo/ReactNativeVersion.java   | 2 +-
 package.json                                                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index d93822a1089822..b017a5155b58c3 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -14,5 +14,5 @@ exports.version = {
   major: 0,
   minor: 55,
   patch: 0,
-  prerelease: 'rc.1',
+  prerelease: 'rc.2',
 };
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
index 58c64c92ece149..11c6c86f3bd823 100644
--- a/React/Base/RCTVersion.m
+++ b/React/Base/RCTVersion.m
@@ -23,7 +23,7 @@ static void __makeVersion()
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(55),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.1",
+                  RCTVersionPrerelease: @"rc.2",
                   };
 }
 
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 26a67c1138f940..5d18d292fffe2f 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=0.55.0-rc.1
+VERSION_NAME=0.55.0-rc.2
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
index 73fbc1d980aa80..d4ace98e8b23ec 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 55,
       "patch", 0,
-      "prerelease", "rc.1");
+      "prerelease", "rc.2");
 }
diff --git a/package.json b/package.json
index e6ad9d2ef5a394..4c6e7c510dfb19 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.55.0-rc.1",
+  "version": "0.55.0-rc.2",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {

From 3d69b5ce5c1cdc576d5b0163399b0155b853ff59 Mon Sep 17 00:00:00 2001
From: Danny Cochran <daniel@cochrans.org>
Date: Fri, 23 Mar 2018 14:45:59 -0700
Subject: [PATCH 246/267] Pass invertStickyHeaders to ScrollView

Summary:
invertStickyHeaders was being set to "this.props.inverted" -- it should just inherit from the props of VirtualizedList instead, per discussion in https://github.com/facebook/react-native/issues/18471

Fixes #18471

Pass "invertStickyHeaders: false" to a SectionList (or FlatList), and expect that your sticky headers stick to the bottom of the ScrollView, instead of the top.

none

[ANDROID] [BUGFIX] [SectionList] - invertStickyHeaders can now be set from SectionList or FlatList.
Closes https://github.com/facebook/react-native/pull/18524

Differential Revision: D7386163

Pulled By: hramos

fbshipit-source-id: 3b66dfca280e657303f69f98c5a8bc0df033f9f7
---
 Libraries/Lists/VirtualizedList.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 58fe055a373cde..871d3a065ecf15 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -899,7 +899,9 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       onScrollEndDrag: this._onScrollEndDrag,
       onMomentumScrollEnd: this._onMomentumScrollEnd,
       scrollEventThrottle: this.props.scrollEventThrottle, // TODO: Android support
-      invertStickyHeaders: this.props.inverted,
+      invertStickyHeaders: this.props.invertStickyHeaders !== undefined
+        ? this.props.invertStickyHeaders
+        : this.props.inverted,	
       stickyHeaderIndices,
     };
     if (inversionStyle) {

From 2e384184bc7b3173e3bb41e2128eb75ba8aee8db Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Tue, 3 Apr 2018 16:58:34 +0200
Subject: [PATCH 247/267] [0.55.0] Bump version numbers

---
 Libraries/Core/ReactNativeVersion.js                            | 2 +-
 React/Base/RCTVersion.m                                         | 2 +-
 ReactAndroid/gradle.properties                                  | 2 +-
 .../facebook/react/modules/systeminfo/ReactNativeVersion.java   | 2 +-
 package.json                                                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index b017a5155b58c3..747108bd4a3bdd 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -14,5 +14,5 @@ exports.version = {
   major: 0,
   minor: 55,
   patch: 0,
-  prerelease: 'rc.2',
+  prerelease: null,
 };
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
index 11c6c86f3bd823..e4330579230185 100644
--- a/React/Base/RCTVersion.m
+++ b/React/Base/RCTVersion.m
@@ -23,7 +23,7 @@ static void __makeVersion()
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(55),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.2",
+                  RCTVersionPrerelease: [NSNull null],
                   };
 }
 
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 5d18d292fffe2f..dc4822f31ead55 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=0.55.0-rc.2
+VERSION_NAME=0.55.0
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
index d4ace98e8b23ec..e5ad72693918da 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 55,
       "patch", 0,
-      "prerelease", "rc.2");
+      "prerelease", null);
 }
diff --git a/package.json b/package.json
index 4c6e7c510dfb19..8dda61d84ae124 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.55.0-rc.2",
+  "version": "0.55.0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {

From 589eae1432cc4bbc16221f841e27b038099fd128 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Thu, 5 Apr 2018 23:30:39 +0200
Subject: [PATCH 248/267] Fixes runIOS regressions #18681

---
 local-cli/runIOS/runIOS.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js
index 8927be98d80226..272280115dc8e8 100644
--- a/local-cli/runIOS/runIOS.js
+++ b/local-cli/runIOS/runIOS.js
@@ -127,10 +127,10 @@ Try closing the simulator or run the command again without specifying a simulato
       }
     }
 
-    buildProject(xcodeProject, selectedSimulator.udid, scheme, args.configuration, args.packager, args.verbose)
-      .then((appName) => resolve(selectedSimulator.udid, appName));
+    buildProject(xcodeProject, selectedSimulator.udid, scheme, args.configuration, args.packager, args.verbose, args.port)
+      .then((appName) => resolve({ udid: selectedSimulator.udid, appName }));
   })
-  .then((udid, appName) => {
+  .then(({udid, appName}) => {
     if (!appName) {
       appName = scheme;
     }

From ab5db0c81cc3751c45e308c3aa91f292dddfaf5d Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Thu, 5 Apr 2018 23:36:07 +0200
Subject: [PATCH 249/267] Fix `runIOS` CFBundleIdentifier

Copying https://github.com/facebook/react-native/pull/18700
---
 local-cli/runIOS/runIOS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js
index 272280115dc8e8..569920653244bf 100644
--- a/local-cli/runIOS/runIOS.js
+++ b/local-cli/runIOS/runIOS.js
@@ -24,7 +24,7 @@ const getBuildPath = function (configuration = 'Debug', appName, isDevice) {
     device = 'iphonesimulator';
   }
 
-  return `Build/Products/${configuration}-${device}/${appName}.app`;
+  return `build/Build/Products/${configuration}-${device}/${appName}.app`;
 };
 const xcprettyAvailable = function() {
   try {

From 54f23f4b3c487cf516dc92262d0d87efaf2131dc Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Wed, 4 Apr 2018 15:11:21 -0700
Subject: [PATCH 250/267] React sync for revisions 9d484ed...1c2876d

Reviewed By: gaearon

Differential Revision: D7500761

fbshipit-source-id: 8dc1cda879942fc4990b23144a616039fdbe6dc0
---
 Libraries/Renderer/REVISION                   |    2 +-
 Libraries/Renderer/ReactFabric-dev.js         | 5652 +++++++++--------
 Libraries/Renderer/ReactFabric-prod.js        | 1023 +--
 Libraries/Renderer/ReactNativeRenderer-dev.js | 5649 ++++++++--------
 .../Renderer/ReactNativeRenderer-prod.js      | 1087 ++--
 Libraries/Renderer/shims/ReactTypes.js        |    4 +-
 package.json                                  |   32 +-
 7 files changed, 7536 insertions(+), 5913 deletions(-)

diff --git a/Libraries/Renderer/REVISION b/Libraries/Renderer/REVISION
index 824ff8c33a4c4f..fc81a7c7f28c85 100644
--- a/Libraries/Renderer/REVISION
+++ b/Libraries/Renderer/REVISION
@@ -1 +1 @@
-ad9544f48e58f2599a8ea0de1e9f4dd104db30bb
\ No newline at end of file
+1c2876d5b558b8591feb335d8d7204bc46f7da8a
\ No newline at end of file
diff --git a/Libraries/Renderer/ReactFabric-dev.js b/Libraries/Renderer/ReactFabric-dev.js
index 867873cd41d55b..0b7a78516c11ba 100644
--- a/Libraries/Renderer/ReactFabric-dev.js
+++ b/Libraries/Renderer/ReactFabric-dev.js
@@ -25,8 +25,8 @@ var deepDiffer = require("deepDiffer");
 var flattenStyle = require("flattenStyle");
 var React = require("react");
 var emptyObject = require("fbjs/lib/emptyObject");
-var checkPropTypes = require("prop-types/checkPropTypes");
 var shallowEqual = require("fbjs/lib/shallowEqual");
+var checkPropTypes = require("prop-types/checkPropTypes");
 var deepFreezeAndThrowOnMutationInDev = require("deepFreezeAndThrowOnMutationInDev");
 var FabricUIManager = require("FabricUIManager");
 
@@ -509,11 +509,13 @@ var injection$1 = {
     getNodeFromInstance = Injected.getNodeFromInstance;
 
     {
-      warning(
-        getNodeFromInstance && getInstanceFromNode,
-        "EventPluginUtils.injection.injectComponentTree(...): Injected " +
-          "module is missing getNodeFromInstance or getInstanceFromNode."
-      );
+      !(getNodeFromInstance && getInstanceFromNode)
+        ? warning(
+            false,
+            "EventPluginUtils.injection.injectComponentTree(...): Injected " +
+              "module is missing getNodeFromInstance or getInstanceFromNode."
+          )
+        : void 0;
     }
   }
 };
@@ -549,10 +551,9 @@ var validateEventDispatches = void 0;
       ? dispatchInstances.length
       : dispatchInstances ? 1 : 0;
 
-    warning(
-      instancesIsArr === listenersIsArr && instancesLen === listenersLen,
-      "EventPluginUtils: Invalid `event`."
-    );
+    !(instancesIsArr === listenersIsArr && instancesLen === listenersLen)
+      ? warning(false, "EventPluginUtils: Invalid `event`.")
+      : void 0;
   };
 }
 
@@ -810,6 +811,7 @@ var Fragment = 10;
 var Mode = 11;
 var ContextConsumer = 12;
 var ContextProvider = 13;
+var ForwardRef = 14;
 
 function getParent(inst) {
   do {
@@ -938,7 +940,7 @@ function listenerAtPhase(inst, event, propagationPhase) {
  */
 function accumulateDirectionalDispatches(inst, phase, event) {
   {
-    warning(inst, "Dispatching inst must not be null");
+    !inst ? warning(false, "Dispatching inst must not be null") : void 0;
   }
   var listener = listenerAtPhase(inst, event, phase);
   if (listener) {
@@ -1257,13 +1259,15 @@ SyntheticEvent.extend = function(Interface) {
               !target.constructor.Interface.hasOwnProperty(prop) &&
               shouldBeReleasedProperties.indexOf(prop) === -1
             ) {
-              warning(
-                didWarnForAddedNewProperty || target.isPersistent(),
-                "This synthetic event is reused for performance reasons. If you're " +
-                  "seeing this, you're adding a new property in the synthetic event object. " +
-                  "The property is never released. See " +
-                  "https://fb.me/react-event-pooling for more information."
-              );
+              !(didWarnForAddedNewProperty || target.isPersistent())
+                ? warning(
+                    false,
+                    "This synthetic event is reused for performance reasons. If you're " +
+                      "seeing this, you're adding a new property in the synthetic event object. " +
+                      "The property is never released. See " +
+                      "https://fb.me/react-event-pooling for more information."
+                  )
+                : void 0;
               didWarnForAddedNewProperty = true;
             }
             target[prop] = value;
@@ -1310,16 +1314,18 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
 
   function warn(action, result) {
     var warningCondition = false;
-    warning(
-      warningCondition,
-      "This synthetic event is reused for performance reasons. If you're seeing this, " +
-        "you're %s `%s` on a released/nullified synthetic event. %s. " +
-        "If you must keep the original synthetic event around, use event.persist(). " +
-        "See https://fb.me/react-event-pooling for more information.",
-      action,
-      propName,
-      result
-    );
+    !warningCondition
+      ? warning(
+          false,
+          "This synthetic event is reused for performance reasons. If you're seeing this, " +
+            "you're %s `%s` on a released/nullified synthetic event. %s. " +
+            "If you must keep the original synthetic event around, use event.persist(). " +
+            "See https://fb.me/react-event-pooling for more information.",
+          action,
+          propName,
+          result
+        )
+      : void 0;
   }
 }
 
@@ -1437,13 +1443,15 @@ function getTouchIdentifier(_ref) {
 
   invariant(identifier != null, "Touch object is missing identifier.");
   {
-    warning(
-      identifier <= MAX_TOUCH_BANK,
-      "Touch identifier %s is greater than maximum supported %s which causes " +
-        "performance issues backfilling array locations for all of the indices.",
-      identifier,
-      MAX_TOUCH_BANK
-    );
+    !(identifier <= MAX_TOUCH_BANK)
+      ? warning(
+          false,
+          "Touch identifier %s is greater than maximum supported %s which causes " +
+            "performance issues backfilling array locations for all of the indices.",
+          identifier,
+          MAX_TOUCH_BANK
+        )
+      : void 0;
   }
   return identifier;
 }
@@ -1542,10 +1550,9 @@ var ResponderTouchHistoryStore = {
         }
         {
           var activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
-          warning(
-            activeRecord != null && activeRecord.touchActive,
-            "Cannot find single active touch."
-          );
+          !(activeRecord != null && activeRecord.touchActive)
+            ? warning(false, "Cannot find single active touch.")
+            : void 0;
         }
       }
     }
@@ -2356,6 +2363,9 @@ var REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 0xeace;
 var REACT_ASYNC_MODE_TYPE = hasSymbol
   ? Symbol["for"]("react.async_mode")
   : 0xeacf;
+var REACT_FORWARD_REF_TYPE = hasSymbol
+  ? Symbol["for"]("react.forward_ref")
+  : 0xead0;
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
 var FAUX_ITERATOR_SYMBOL = "@@iterator";
@@ -2637,7 +2647,7 @@ var TouchHistoryMath = {
 
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.3.0-alpha.1";
+var ReactVersion = "16.3.1";
 
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -3307,15 +3317,17 @@ function findNodeHandle(componentOrHandle) {
   {
     var owner = ReactCurrentOwner.current;
     if (owner !== null && owner.stateNode !== null) {
-      warning(
-        owner.stateNode._warnedAboutRefsInRender,
-        "%s is accessing findNodeHandle inside its render(). " +
-          "render() should be a pure function of props and state. It should " +
-          "never access something that requires stale data from the previous " +
-          "render, such as refs. Move this logic to componentDidMount and " +
-          "componentDidUpdate instead.",
-        getComponentName(owner) || "A component"
-      );
+      !owner.stateNode._warnedAboutRefsInRender
+        ? warning(
+            false,
+            "%s is accessing findNodeHandle inside its render(). " +
+              "render() should be a pure function of props and state. It should " +
+              "never access something that requires stale data from the previous " +
+              "render, such as refs. Move this logic to componentDidMount and " +
+              "componentDidUpdate instead.",
+            getComponentName(owner) || "A component"
+          )
+        : void 0;
 
       owner.stateNode._warnedAboutRefsInRender = true;
     }
@@ -3773,7 +3785,8 @@ var frameDeadline = 0;
 var frameDeadlineObject = {
   timeRemaining: function() {
     return frameDeadline - now();
-  }
+  },
+  didTimeout: false
 };
 
 function setTimeoutCallback() {
@@ -3861,9 +3874,10 @@ var Callback = /*              */ 32;
 var DidCapture = /*            */ 64;
 var Ref = /*                   */ 128;
 var ErrLog = /*                */ 256;
+var Snapshot = /*              */ 2048;
 
 // Union of all host effects
-var HostEffectMask = /*        */ 511;
+var HostEffectMask = /*        */ 2559;
 
 var Incomplete = /*            */ 512;
 var ShouldCapture = /*         */ 1024;
@@ -3911,15 +3925,17 @@ function isMounted(component) {
     if (owner !== null && owner.tag === ClassComponent) {
       var ownerFiber = owner;
       var instance = ownerFiber.stateNode;
-      warning(
-        instance._warnedAboutRefsInRender,
-        "%s is accessing isMounted inside its render() function. " +
-          "render() should be a pure function of props and state. It should " +
-          "never access something that requires stale data from the previous " +
-          "render, such as refs. Move this logic to componentDidMount and " +
-          "componentDidUpdate instead.",
-        getComponentName(ownerFiber) || "A component"
-      );
+      !instance._warnedAboutRefsInRender
+        ? warning(
+            false,
+            "%s is accessing isMounted inside its render() function. " +
+              "render() should be a pure function of props and state. It should " +
+              "never access something that requires stale data from the previous " +
+              "render, such as refs. Move this logic to componentDidMount and " +
+              "componentDidUpdate instead.",
+            getComponentName(ownerFiber) || "A component"
+          )
+        : void 0;
       instance._warnedAboutRefsInRender = true;
     }
   }
@@ -4130,1741 +4146,1488 @@ function findCurrentHostFiberWithNoPortals(parent) {
   return null;
 }
 
-var valueStack = [];
+// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
+// Math.pow(2, 30) - 1
+// 0b111111111111111111111111111111
+var MAX_SIGNED_31_BIT_INT = 1073741823;
+
+// TODO: Use an opaque type once ESLint et al support the syntax
 
-var fiberStack = void 0;
+var NoWork = 0;
+var Sync = 1;
+var Never = MAX_SIGNED_31_BIT_INT;
 
-{
-  fiberStack = [];
-}
+var UNIT_SIZE = 10;
+var MAGIC_NUMBER_OFFSET = 2;
 
-var index = -1;
+// 1 unit of expiration time represents 10ms.
+function msToExpirationTime(ms) {
+  // Always add an offset so that we don't clash with the magic number for NoWork.
+  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
+}
 
-function createCursor(defaultValue) {
-  return {
-    current: defaultValue
-  };
+function expirationTimeToMs(expirationTime) {
+  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
 }
 
-function pop(cursor, fiber) {
-  if (index < 0) {
-    {
-      warning(false, "Unexpected pop.");
-    }
-    return;
-  }
+function ceiling(num, precision) {
+  return (((num / precision) | 0) + 1) * precision;
+}
 
-  {
-    if (fiber !== fiberStack[index]) {
-      warning(false, "Unexpected Fiber popped.");
-    }
-  }
+function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
+  return ceiling(
+    currentTime + expirationInMs / UNIT_SIZE,
+    bucketSizeMs / UNIT_SIZE
+  );
+}
 
-  cursor.current = valueStack[index];
+var NoContext = 0;
+var AsyncMode = 1;
+var StrictMode = 2;
 
-  valueStack[index] = null;
+var hasBadMapPolyfill = void 0;
 
-  {
-    fiberStack[index] = null;
+{
+  hasBadMapPolyfill = false;
+  try {
+    var nonExtensibleObject = Object.preventExtensions({});
+    var testMap = new Map([[nonExtensibleObject, null]]);
+    var testSet = new Set([nonExtensibleObject]);
+    // This is necessary for Rollup to not consider these unused.
+    // https://github.com/rollup/rollup/issues/1771
+    // TODO: we can remove these if Rollup fixes the bug.
+    testMap.set(0, 0);
+    testSet.add(0);
+  } catch (e) {
+    // TODO: Consider warning about bad polyfills
+    hasBadMapPolyfill = true;
   }
-
-  index--;
 }
 
-function push(cursor, value, fiber) {
-  index++;
-
-  valueStack[index] = cursor.current;
+// A Fiber is work on a Component that needs to be done or was done. There can
+// be more than one per component.
 
-  {
-    fiberStack[index] = fiber;
-  }
+var debugCounter = void 0;
 
-  cursor.current = value;
+{
+  debugCounter = 1;
 }
 
-function reset() {
-  while (index > -1) {
-    valueStack[index] = null;
+function FiberNode(tag, pendingProps, key, mode) {
+  // Instance
+  this.tag = tag;
+  this.key = key;
+  this.type = null;
+  this.stateNode = null;
 
-    {
-      fiberStack[index] = null;
-    }
+  // Fiber
+  this["return"] = null;
+  this.child = null;
+  this.sibling = null;
+  this.index = 0;
 
-    index--;
-  }
-}
+  this.ref = null;
 
-var describeComponentFrame = function(name, source, ownerName) {
-  return (
-    "\n    in " +
-    (name || "Unknown") +
-    (source
-      ? " (at " +
-        source.fileName.replace(/^.*[\\\/]/, "") +
-        ":" +
-        source.lineNumber +
-        ")"
-      : ownerName ? " (created by " + ownerName + ")" : "")
-  );
-};
+  this.pendingProps = pendingProps;
+  this.memoizedProps = null;
+  this.updateQueue = null;
+  this.memoizedState = null;
 
-function describeFiber(fiber) {
-  switch (fiber.tag) {
-    case IndeterminateComponent:
-    case FunctionalComponent:
-    case ClassComponent:
-    case HostComponent:
-      var owner = fiber._debugOwner;
-      var source = fiber._debugSource;
-      var name = getComponentName(fiber);
-      var ownerName = null;
-      if (owner) {
-        ownerName = getComponentName(owner);
-      }
-      return describeComponentFrame(name, source, ownerName);
-    default:
-      return "";
-  }
-}
+  this.mode = mode;
 
-// This function can only be called with a work-in-progress fiber and
-// only during begin or complete phase. Do not call it under any other
-// circumstances.
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  var node = workInProgress;
-  do {
-    info += describeFiber(node);
-    // Otherwise this return pointer might point to the wrong tree:
-    node = node["return"];
-  } while (node);
-  return info;
-}
+  // Effects
+  this.effectTag = NoEffect;
+  this.nextEffect = null;
 
-function getCurrentFiberOwnerName() {
-  {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    var owner = fiber._debugOwner;
-    if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner);
-    }
-  }
-  return null;
-}
+  this.firstEffect = null;
+  this.lastEffect = null;
+
+  this.expirationTime = NoWork;
+
+  this.alternate = null;
 
-function getCurrentFiberStackAddendum() {
   {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
+    this._debugID = debugCounter++;
+    this._debugSource = null;
+    this._debugOwner = null;
+    this._debugIsCurrentlyTiming = false;
+    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
+      Object.preventExtensions(this);
     }
-    // Safe because if current fiber exists, we are reconciling,
-    // and it is guaranteed to be the work-in-progress version.
-    return getStackAddendumByWorkInProgressFiber(fiber);
   }
-  return null;
-}
-
-function resetCurrentFiber() {
-  ReactDebugCurrentFrame.getCurrentStack = null;
-  ReactDebugCurrentFiber.current = null;
-  ReactDebugCurrentFiber.phase = null;
 }
 
-function setCurrentFiber(fiber) {
-  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
-  ReactDebugCurrentFiber.current = fiber;
-  ReactDebugCurrentFiber.phase = null;
-}
+// This is a constructor function, rather than a POJO constructor, still
+// please ensure we do the following:
+// 1) Nobody should add any instance methods on this. Instance methods can be
+//    more difficult to predict when they get optimized and they are almost
+//    never inlined properly in static compilers.
+// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
+//    always know when it is a fiber.
+// 3) We might want to experiment with using numeric keys since they are easier
+//    to optimize in a non-JIT environment.
+// 4) We can easily go from a constructor to a createFiber object literal if that
+//    is faster.
+// 5) It should be easy to port this to a C struct and keep a C implementation
+//    compatible.
+var createFiber = function(tag, pendingProps, key, mode) {
+  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
+  return new FiberNode(tag, pendingProps, key, mode);
+};
 
-function setCurrentPhase(phase) {
-  ReactDebugCurrentFiber.phase = phase;
+function shouldConstruct(Component) {
+  return !!(Component.prototype && Component.prototype.isReactComponent);
 }
 
-var ReactDebugCurrentFiber = {
-  current: null,
-  phase: null,
-  resetCurrentFiber: resetCurrentFiber,
-  setCurrentFiber: setCurrentFiber,
-  setCurrentPhase: setCurrentPhase,
-  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
-};
+// This is used to create an alternate fiber to do work on.
+function createWorkInProgress(current, pendingProps, expirationTime) {
+  var workInProgress = current.alternate;
+  if (workInProgress === null) {
+    // We use a double buffering pooling technique because we know that we'll
+    // only ever need at most two versions of a tree. We pool the "other" unused
+    // node that we're free to reuse. This is lazily created to avoid allocating
+    // extra objects for things that are never updated. It also allow us to
+    // reclaim the extra memory if needed.
+    workInProgress = createFiber(
+      current.tag,
+      pendingProps,
+      current.key,
+      current.mode
+    );
+    workInProgress.type = current.type;
+    workInProgress.stateNode = current.stateNode;
 
-var debugRenderPhaseSideEffects = false;
-var debugRenderPhaseSideEffectsForStrictMode = false;
-
-var enableUserTimingAPI = true;
-var enableGetDerivedStateFromCatch = false;
-var warnAboutDeprecatedLifecycles = false;
-var replayFailedUnitOfWorkWithInvokeGuardedCallback = true;
-
-// React Fabric uses persistent reconciler.
-var enableMutatingReconciler = false;
-var enableNoopReconciler = false;
-var enablePersistentReconciler = true;
+    {
+      // DEV-only fields
+      workInProgress._debugID = current._debugID;
+      workInProgress._debugSource = current._debugSource;
+      workInProgress._debugOwner = current._debugOwner;
+    }
 
-// Only used in www builds.
+    workInProgress.alternate = current;
+    current.alternate = workInProgress;
+  } else {
+    workInProgress.pendingProps = pendingProps;
 
-// Prefix measurements so that it's possible to filter them.
-// Longer prefixes are hard to read in DevTools.
-var reactEmoji = "\u269B";
-var warningEmoji = "\u26D4";
-var supportsUserTiming =
-  typeof performance !== "undefined" &&
-  typeof performance.mark === "function" &&
-  typeof performance.clearMarks === "function" &&
-  typeof performance.measure === "function" &&
-  typeof performance.clearMeasures === "function";
+    // We already have an alternate.
+    // Reset the effect tag.
+    workInProgress.effectTag = NoEffect;
 
-// Keep track of current fiber so that we know the path to unwind on pause.
-// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
-var currentFiber = null;
-// If we're in the middle of user code, which fiber and method is it?
-// Reusing `currentFiber` would be confusing for this because user code fiber
-// can change during commit phase too, but we don't need to unwind it (since
-// lifecycles in the commit phase don't resemble a tree).
-var currentPhase = null;
-var currentPhaseFiber = null;
-// Did lifecycle hook schedule an update? This is often a performance problem,
-// so we will keep track of it, and include it in the report.
-// Track commits caused by cascading updates.
-var isCommitting = false;
-var hasScheduledUpdateInCurrentCommit = false;
-var hasScheduledUpdateInCurrentPhase = false;
-var commitCountInCurrentWorkLoop = 0;
-var effectCountInCurrentCommit = 0;
-var isWaitingForCallback = false;
-// During commits, we only show a measurement once per method name
-// to avoid stretch the commit phase with measurement overhead.
-var labelsInCurrentCommit = new Set();
+    // The effect list is no longer valid.
+    workInProgress.nextEffect = null;
+    workInProgress.firstEffect = null;
+    workInProgress.lastEffect = null;
+  }
 
-var formatMarkName = function(markName) {
-  return reactEmoji + " " + markName;
-};
+  workInProgress.expirationTime = expirationTime;
 
-var formatLabel = function(label, warning$$1) {
-  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
-  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
-  return "" + prefix + label + suffix;
-};
+  workInProgress.child = current.child;
+  workInProgress.memoizedProps = current.memoizedProps;
+  workInProgress.memoizedState = current.memoizedState;
+  workInProgress.updateQueue = current.updateQueue;
 
-var beginMark = function(markName) {
-  performance.mark(formatMarkName(markName));
-};
+  // These will be overridden during the parent's reconciliation
+  workInProgress.sibling = current.sibling;
+  workInProgress.index = current.index;
+  workInProgress.ref = current.ref;
 
-var clearMark = function(markName) {
-  performance.clearMarks(formatMarkName(markName));
-};
+  return workInProgress;
+}
 
-var endMark = function(label, markName, warning$$1) {
-  var formattedMarkName = formatMarkName(markName);
-  var formattedLabel = formatLabel(label, warning$$1);
-  try {
-    performance.measure(formattedLabel, formattedMarkName);
-  } catch (err) {}
-  // If previous mark was missing for some reason, this will throw.
-  // This could only happen if React crashed in an unexpected place earlier.
-  // Don't pile on with more errors.
+function createHostRootFiber(isAsync) {
+  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
+  return createFiber(HostRoot, null, null, mode);
+}
 
-  // Clear marks immediately to avoid growing buffer.
-  performance.clearMarks(formattedMarkName);
-  performance.clearMeasures(formattedLabel);
-};
+function createFiberFromElement(element, mode, expirationTime) {
+  var owner = null;
+  {
+    owner = element._owner;
+  }
 
-var getFiberMarkName = function(label, debugID) {
-  return label + " (#" + debugID + ")";
-};
+  var fiber = void 0;
+  var type = element.type;
+  var key = element.key;
+  var pendingProps = element.props;
 
-var getFiberLabel = function(componentName, isMounted, phase) {
-  if (phase === null) {
-    // These are composite component total time measurements.
-    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
+  var fiberTag = void 0;
+  if (typeof type === "function") {
+    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
+  } else if (typeof type === "string") {
+    fiberTag = HostComponent;
   } else {
-    // Composite component methods.
-    return componentName + "." + phase;
+    switch (type) {
+      case REACT_FRAGMENT_TYPE:
+        return createFiberFromFragment(
+          pendingProps.children,
+          mode,
+          expirationTime,
+          key
+        );
+      case REACT_ASYNC_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= AsyncMode | StrictMode;
+        break;
+      case REACT_STRICT_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= StrictMode;
+        break;
+      case REACT_CALL_TYPE:
+        fiberTag = CallComponent;
+        break;
+      case REACT_RETURN_TYPE:
+        fiberTag = ReturnComponent;
+        break;
+      default: {
+        if (typeof type === "object" && type !== null) {
+          switch (type.$$typeof) {
+            case REACT_PROVIDER_TYPE:
+              fiberTag = ContextProvider;
+              break;
+            case REACT_CONTEXT_TYPE:
+              // This is a consumer
+              fiberTag = ContextConsumer;
+              break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = ForwardRef;
+              break;
+            default:
+              if (typeof type.tag === "number") {
+                // Currently assumed to be a continuation and therefore is a
+                // fiber already.
+                // TODO: The yield system is currently broken for updates in
+                // some cases. The reified yield stores a fiber, but we don't
+                // know which fiber that is; the current or a workInProgress?
+                // When the continuation gets rendered here we don't know if we
+                // can reuse that fiber or if we need to clone it. There is
+                // probably a clever way to restructure this.
+                fiber = type;
+                fiber.pendingProps = pendingProps;
+                fiber.expirationTime = expirationTime;
+                return fiber;
+              } else {
+                throwOnInvalidElementType(type, owner);
+              }
+              break;
+          }
+        } else {
+          throwOnInvalidElementType(type, owner);
+        }
+      }
+    }
   }
-};
 
-var beginFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
+  fiber = createFiber(fiberTag, pendingProps, key, mode);
+  fiber.type = type;
+  fiber.expirationTime = expirationTime;
 
-  if (isCommitting && labelsInCurrentCommit.has(label)) {
-    // During the commit phase, we don't show duplicate labels because
-    // there is a fixed overhead for every measurement, and we don't
-    // want to stretch the commit phase beyond necessary.
-    return false;
+  {
+    fiber._debugSource = element._source;
+    fiber._debugOwner = element._owner;
   }
-  labelsInCurrentCommit.add(label);
 
-  var markName = getFiberMarkName(label, debugID);
-  beginMark(markName);
-  return true;
-};
+  return fiber;
+}
 
-var clearFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  clearMark(markName);
-};
+function throwOnInvalidElementType(type, owner) {
+  var info = "";
+  {
+    if (
+      type === undefined ||
+      (typeof type === "object" &&
+        type !== null &&
+        Object.keys(type).length === 0)
+    ) {
+      info +=
+        " You likely forgot to export your component from the file " +
+        "it's defined in, or you might have mixed up default and " +
+        "named imports.";
+    }
+    var ownerName = owner ? getComponentName(owner) : null;
+    if (ownerName) {
+      info += "\n\nCheck the render method of `" + ownerName + "`.";
+    }
+  }
+  invariant(
+    false,
+    "Element type is invalid: expected a string (for built-in " +
+      "components) or a class/function (for composite components) " +
+      "but got: %s.%s",
+    type == null ? type : typeof type,
+    info
+  );
+}
 
-var endFiberMark = function(fiber, phase, warning$$1) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  endMark(label, markName, warning$$1);
-};
+function createFiberFromFragment(elements, mode, expirationTime, key) {
+  var fiber = createFiber(Fragment, elements, key, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
+}
 
-var shouldIgnoreFiber = function(fiber) {
-  // Host components should be skipped in the timeline.
-  // We could check typeof fiber.type, but does this work with RN?
-  switch (fiber.tag) {
-    case HostRoot:
-    case HostComponent:
-    case HostText:
-    case HostPortal:
-    case CallComponent:
-    case ReturnComponent:
-    case Fragment:
-    case ContextProvider:
-    case ContextConsumer:
-      return true;
-    default:
-      return false;
-  }
-};
+function createFiberFromText(content, mode, expirationTime) {
+  var fiber = createFiber(HostText, content, null, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
+}
 
-var clearPendingPhaseMeasurement = function() {
-  if (currentPhase !== null && currentPhaseFiber !== null) {
-    clearFiberMark(currentPhaseFiber, currentPhase);
-  }
-  currentPhaseFiber = null;
-  currentPhase = null;
-  hasScheduledUpdateInCurrentPhase = false;
-};
+function createFiberFromHostInstanceForDeletion() {
+  var fiber = createFiber(HostComponent, null, null, NoContext);
+  fiber.type = "DELETED";
+  return fiber;
+}
 
-var pauseTimers = function() {
-  // Stops all currently active measurements so that they can be resumed
-  // if we continue in a later deferred loop from the same unit of work.
-  var fiber = currentFiber;
-  while (fiber) {
-    if (fiber._debugIsCurrentlyTiming) {
-      endFiberMark(fiber, null, null);
-    }
-    fiber = fiber["return"];
-  }
-};
+function createFiberFromPortal(portal, mode, expirationTime) {
+  var pendingProps = portal.children !== null ? portal.children : [];
+  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
+  fiber.expirationTime = expirationTime;
+  fiber.stateNode = {
+    containerInfo: portal.containerInfo,
+    pendingChildren: null, // Used by persistent updates
+    implementation: portal.implementation
+  };
+  return fiber;
+}
 
-var resumeTimersRecursively = function(fiber) {
-  if (fiber["return"] !== null) {
-    resumeTimersRecursively(fiber["return"]);
-  }
-  if (fiber._debugIsCurrentlyTiming) {
-    beginFiberMark(fiber, null);
-  }
-};
+// Used for stashing WIP properties to replay failed work in DEV.
+function assignFiberPropertiesInDEV(target, source) {
+  if (target === null) {
+    // This Fiber's initial properties will always be overwritten.
+    // We only use a Fiber to ensure the same hidden class so DEV isn't slow.
+    target = createFiber(IndeterminateComponent, null, null, NoContext);
+  }
+
+  // This is intentionally written as a list of all properties.
+  // We tried to use Object.assign() instead but this is called in
+  // the hottest path, and Object.assign() was too slow:
+  // https://github.com/facebook/react/issues/12502
+  // This code is DEV-only so size is not a concern.
+
+  target.tag = source.tag;
+  target.key = source.key;
+  target.type = source.type;
+  target.stateNode = source.stateNode;
+  target["return"] = source["return"];
+  target.child = source.child;
+  target.sibling = source.sibling;
+  target.index = source.index;
+  target.ref = source.ref;
+  target.pendingProps = source.pendingProps;
+  target.memoizedProps = source.memoizedProps;
+  target.updateQueue = source.updateQueue;
+  target.memoizedState = source.memoizedState;
+  target.mode = source.mode;
+  target.effectTag = source.effectTag;
+  target.nextEffect = source.nextEffect;
+  target.firstEffect = source.firstEffect;
+  target.lastEffect = source.lastEffect;
+  target.expirationTime = source.expirationTime;
+  target.alternate = source.alternate;
+  target._debugID = source._debugID;
+  target._debugSource = source._debugSource;
+  target._debugOwner = source._debugOwner;
+  target._debugIsCurrentlyTiming = source._debugIsCurrentlyTiming;
+  return target;
+}
 
-var resumeTimers = function() {
-  // Resumes all measurements that were active during the last deferred loop.
-  if (currentFiber !== null) {
-    resumeTimersRecursively(currentFiber);
-  }
-};
+// TODO: This should be lifted into the renderer.
 
-function recordEffect() {
-  if (enableUserTimingAPI) {
-    effectCountInCurrentCommit++;
-  }
+function createFiberRoot(containerInfo, isAsync, hydrate) {
+  // Cyclic construction. This cheats the type system right now because
+  // stateNode is any.
+  var uninitializedFiber = createHostRootFiber(isAsync);
+  var root = {
+    current: uninitializedFiber,
+    containerInfo: containerInfo,
+    pendingChildren: null,
+    pendingCommitExpirationTime: NoWork,
+    finishedWork: null,
+    context: null,
+    pendingContext: null,
+    hydrate: hydrate,
+    remainingExpirationTime: NoWork,
+    firstBatch: null,
+    nextScheduledRoot: null
+  };
+  uninitializedFiber.stateNode = root;
+  return root;
 }
 
-function recordScheduleUpdate() {
-  if (enableUserTimingAPI) {
-    if (isCommitting) {
-      hasScheduledUpdateInCurrentCommit = true;
-    }
-    if (
-      currentPhase !== null &&
-      currentPhase !== "componentWillMount" &&
-      currentPhase !== "componentWillReceiveProps"
-    ) {
-      hasScheduledUpdateInCurrentPhase = true;
-    }
-  }
-}
+var onCommitFiberRoot = null;
+var onCommitFiberUnmount = null;
+var hasLoggedError = false;
 
-function startRequestCallbackTimer() {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming && !isWaitingForCallback) {
-      isWaitingForCallback = true;
-      beginMark("(Waiting for async callback...)");
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {
+      if (true && !hasLoggedError) {
+        hasLoggedError = true;
+        warning(false, "React DevTools encountered an error: %s", err);
+      }
     }
-  }
+  };
 }
 
-function stopRequestCallbackTimer(didExpire) {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming) {
-      isWaitingForCallback = false;
-      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
-      endMark(
-        "(Waiting for async callback...)",
-        "(Waiting for async callback...)",
-        warning$$1
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
+    return false;
+  }
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
+  }
+  if (!hook.supportsFiber) {
+    {
+      warning(
+        false,
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://fb.me/react-devtools"
       );
     }
+    // DevTools exists, even though it doesn't support Fiber.
+    return true;
   }
-}
-
-function startWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, this is the fiber to unwind from.
-    currentFiber = fiber;
-    if (!beginFiberMark(fiber, null)) {
-      return;
+  try {
+    var rendererID = hook.inject(internals);
+    // We have successfully injected, so now it is safe to set up hooks.
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      warning(false, "React DevTools encountered an error: %s.", err);
     }
-    fiber._debugIsCurrentlyTiming = true;
   }
+  // DevTools exists
+  return true;
 }
 
-function cancelWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // Remember we shouldn't complete measurement for this fiber.
-    // Otherwise flamechart will be deep even for small updates.
-    fiber._debugIsCurrentlyTiming = false;
-    clearFiberMark(fiber, null);
+function onCommitRoot(root) {
+  if (typeof onCommitFiberRoot === "function") {
+    onCommitFiberRoot(root);
   }
 }
 
-function stopWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    endFiberMark(fiber, null, null);
+function onCommitUnmount(fiber) {
+  if (typeof onCommitFiberUnmount === "function") {
+    onCommitFiberUnmount(fiber);
   }
 }
 
-function stopFailedWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    var warning$$1 = "An error was thrown inside this error boundary";
-    endFiberMark(fiber, null, warning$$1);
+var describeComponentFrame = function(name, source, ownerName) {
+  return (
+    "\n    in " +
+    (name || "Unknown") +
+    (source
+      ? " (at " +
+        source.fileName.replace(/^.*[\\\/]/, "") +
+        ":" +
+        source.lineNumber +
+        ")"
+      : ownerName ? " (created by " + ownerName + ")" : "")
+  );
+};
+
+function describeFiber(fiber) {
+  switch (fiber.tag) {
+    case IndeterminateComponent:
+    case FunctionalComponent:
+    case ClassComponent:
+    case HostComponent:
+      var owner = fiber._debugOwner;
+      var source = fiber._debugSource;
+      var name = getComponentName(fiber);
+      var ownerName = null;
+      if (owner) {
+        ownerName = getComponentName(owner);
+      }
+      return describeComponentFrame(name, source, ownerName);
+    default:
+      return "";
   }
 }
 
-function startPhaseTimer(fiber, phase) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    clearPendingPhaseMeasurement();
-    if (!beginFiberMark(fiber, phase)) {
-      return;
-    }
-    currentPhaseFiber = fiber;
-    currentPhase = phase;
-  }
-}
-
-function stopPhaseTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    if (currentPhase !== null && currentPhaseFiber !== null) {
-      var warning$$1 = hasScheduledUpdateInCurrentPhase
-        ? "Scheduled a cascading update"
-        : null;
-      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
-    }
-    currentPhase = null;
-    currentPhaseFiber = null;
-  }
-}
-
-function startWorkLoopTimer(nextUnitOfWork) {
-  if (enableUserTimingAPI) {
-    currentFiber = nextUnitOfWork;
-    if (!supportsUserTiming) {
-      return;
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // This is top level call.
-    // Any other measurements are performed within.
-    beginMark("(React Tree Reconciliation)");
-    // Resume any measurements that were in progress during the last loop.
-    resumeTimers();
-  }
-}
-
-function stopWorkLoopTimer(interruptedBy) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var warning$$1 = null;
-    if (interruptedBy !== null) {
-      if (interruptedBy.tag === HostRoot) {
-        warning$$1 = "A top-level update interrupted the previous render";
-      } else {
-        var componentName = getComponentName(interruptedBy) || "Unknown";
-        warning$$1 =
-          "An update to " + componentName + " interrupted the previous render";
-      }
-    } else if (commitCountInCurrentWorkLoop > 1) {
-      warning$$1 = "There were cascading updates";
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // Pause any measurements until the next loop.
-    pauseTimers();
-    endMark(
-      "(React Tree Reconciliation)",
-      "(React Tree Reconciliation)",
-      warning$$1
-    );
-  }
+// This function can only be called with a work-in-progress fiber and
+// only during begin or complete phase. Do not call it under any other
+// circumstances.
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  var node = workInProgress;
+  do {
+    info += describeFiber(node);
+    // Otherwise this return pointer might point to the wrong tree:
+    node = node["return"];
+  } while (node);
+  return info;
 }
 
-function startCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    isCommitting = true;
-    hasScheduledUpdateInCurrentCommit = false;
-    labelsInCurrentCommit.clear();
-    beginMark("(Committing Changes)");
-  }
-}
+/**
+ * Forked from fbjs/warning:
+ * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
+ *
+ * Only change is we use console.warn instead of console.error,
+ * and do nothing when 'console' is not supported.
+ * This really simplifies the code.
+ * ---
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
 
-function stopCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
+var lowPriorityWarning = function() {};
 
-    var warning$$1 = null;
-    if (hasScheduledUpdateInCurrentCommit) {
-      warning$$1 = "Lifecycle hook scheduled a cascading update";
-    } else if (commitCountInCurrentWorkLoop > 0) {
-      warning$$1 = "Caused by a cascading update in earlier commit";
+{
+  var printWarning = function(format) {
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 1 ? _len - 1 : 0),
+        _key = 1;
+      _key < _len;
+      _key++
+    ) {
+      args[_key - 1] = arguments[_key];
     }
-    hasScheduledUpdateInCurrentCommit = false;
-    commitCountInCurrentWorkLoop++;
-    isCommitting = false;
-    labelsInCurrentCommit.clear();
 
-    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
-  }
-}
-
-function startCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
+    var argIndex = 0;
+    var message =
+      "Warning: " +
+      format.replace(/%s/g, function() {
+        return args[argIndex++];
+      });
+    if (typeof console !== "undefined") {
+      console.warn(message);
     }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Committing Host Effects)");
-  }
-}
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      throw new Error(message);
+    } catch (x) {}
+  };
 
-function stopCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
+  lowPriorityWarning = function(condition, format) {
+    if (format === undefined) {
+      throw new Error(
+        "`warning(condition, format, ...args)` requires a warning " +
+          "message argument"
+      );
     }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Committing Host Effects: " + count + " Total)",
-      "(Committing Host Effects)",
-      null
-    );
-  }
-}
+    if (!condition) {
+      for (
+        var _len2 = arguments.length,
+          args = Array(_len2 > 2 ? _len2 - 2 : 0),
+          _key2 = 2;
+        _key2 < _len2;
+        _key2++
+      ) {
+        args[_key2 - 2] = arguments[_key2];
+      }
 
-function startCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
+      printWarning.apply(undefined, [format].concat(args));
     }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Calling Lifecycle Methods)");
-  }
+  };
 }
 
-function stopCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Calling Lifecycle Methods: " + count + " Total)",
-      "(Calling Lifecycle Methods)",
-      null
-    );
-  }
-}
+var lowPriorityWarning$1 = lowPriorityWarning;
 
-var warnedAboutMissingGetChildContext = void 0;
+var ReactStrictModeWarnings = {
+  discardPendingWarnings: function() {},
+  flushPendingDeprecationWarnings: function() {},
+  flushPendingUnsafeLifecycleWarnings: function() {},
+  recordDeprecationWarnings: function(fiber, instance) {},
+  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
+};
 
 {
-  warnedAboutMissingGetChildContext = {};
-}
-
-// A cursor to the current merged context object on the stack.
-var contextStackCursor = createCursor(emptyObject);
-// A cursor to a boolean indicating whether the context has changed.
-var didPerformWorkStackCursor = createCursor(false);
-// Keep track of the previous context object that was on the stack.
-// We use this to get access to the parent context after we have already
-// pushed the next context provider, and now need to merge their contexts.
-var previousContext = emptyObject;
-
-function getUnmaskedContext(workInProgress) {
-  var hasOwnContext = isContextProvider(workInProgress);
-  if (hasOwnContext) {
-    // If the fiber is a context provider itself, when we read its context
-    // we have already pushed its own child context on the stack. A context
-    // provider should not "see" its own child context. Therefore we read the
-    // previous (parent) context instead for a context provider.
-    return previousContext;
-  }
-  return contextStackCursor.current;
-}
+  var LIFECYCLE_SUGGESTIONS = {
+    UNSAFE_componentWillMount: "componentDidMount",
+    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
+    UNSAFE_componentWillUpdate: "componentDidUpdate"
+  };
 
-function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-  var instance = workInProgress.stateNode;
-  instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-  instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
-}
+  var pendingComponentWillMountWarnings = [];
+  var pendingComponentWillReceivePropsWarnings = [];
+  var pendingComponentWillUpdateWarnings = [];
+  var pendingUnsafeLifecycleWarnings = new Map();
 
-function getMaskedContext(workInProgress, unmaskedContext) {
-  var type = workInProgress.type;
-  var contextTypes = type.contextTypes;
-  if (!contextTypes) {
-    return emptyObject;
-  }
+  // Tracks components we have already warned about.
+  var didWarnAboutDeprecatedLifecycles = new Set();
+  var didWarnAboutUnsafeLifecycles = new Set();
 
-  // Avoid recreating masked context unless unmasked context has changed.
-  // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-  // This may trigger infinite loops if componentWillReceiveProps calls setState.
-  var instance = workInProgress.stateNode;
-  if (
-    instance &&
-    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-  ) {
-    return instance.__reactInternalMemoizedMaskedChildContext;
-  }
+  ReactStrictModeWarnings.discardPendingWarnings = function() {
+    pendingComponentWillMountWarnings = [];
+    pendingComponentWillReceivePropsWarnings = [];
+    pendingComponentWillUpdateWarnings = [];
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-  var context = {};
-  for (var key in contextTypes) {
-    context[key] = unmaskedContext[key];
-  }
+  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
+    pendingUnsafeLifecycleWarnings.forEach(function(
+      lifecycleWarningsMap,
+      strictRoot
+    ) {
+      var lifecyclesWarningMesages = [];
 
-  {
-    var name = getComponentName(workInProgress) || "Unknown";
-    checkPropTypes(
-      contextTypes,
-      context,
-      "context",
-      name,
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-    );
-  }
-
-  // Cache unmasked context so we can avoid recreating masked context unless necessary.
-  // Context is created before the class component is instantiated so check for instance.
-  if (instance) {
-    cacheContext(workInProgress, unmaskedContext, context);
-  }
-
-  return context;
-}
-
-function hasContextChanged() {
-  return didPerformWorkStackCursor.current;
-}
-
-function isContextConsumer(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
-}
-
-function isContextProvider(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
-}
-
-function popContextProvider(fiber) {
-  if (!isContextProvider(fiber)) {
-    return;
-  }
-
-  pop(didPerformWorkStackCursor, fiber);
-  pop(contextStackCursor, fiber);
-}
-
-function popTopLevelContextObject(fiber) {
-  pop(didPerformWorkStackCursor, fiber);
-  pop(contextStackCursor, fiber);
-}
-
-function pushTopLevelContextObject(fiber, context, didChange) {
-  invariant(
-    contextStackCursor.cursor == null,
-    "Unexpected context found on stack. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
+      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
+        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
+        if (lifecycleWarnings.length > 0) {
+          var componentNames = new Set();
+          lifecycleWarnings.forEach(function(fiber) {
+            componentNames.add(getComponentName(fiber) || "Component");
+            didWarnAboutUnsafeLifecycles.add(fiber.type);
+          });
 
-  push(contextStackCursor, context, fiber);
-  push(didPerformWorkStackCursor, didChange, fiber);
-}
+          var formatted = lifecycle.replace("UNSAFE_", "");
+          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
+          var sortedComponentNames = Array.from(componentNames)
+            .sort()
+            .join(", ");
 
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode;
-  var childContextTypes = fiber.type.childContextTypes;
+          lifecyclesWarningMesages.push(
+            formatted +
+              ": Please update the following components to use " +
+              (suggestion + " instead: " + sortedComponentNames)
+          );
+        }
+      });
 
-  // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-  // It has only been added in Fiber to match the (unintentional) behavior in Stack.
-  if (typeof instance.getChildContext !== "function") {
-    {
-      var componentName = getComponentName(fiber) || "Unknown";
+      if (lifecyclesWarningMesages.length > 0) {
+        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
+          strictRoot
+        );
 
-      if (!warnedAboutMissingGetChildContext[componentName]) {
-        warnedAboutMissingGetChildContext[componentName] = true;
         warning(
           false,
-          "%s.childContextTypes is specified but there is no getChildContext() method " +
-            "on the instance. You can either define getChildContext() on %s or remove " +
-            "childContextTypes from it.",
-          componentName,
-          componentName
+          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
+            "\n\n%s" +
+            "\n\nLearn more about this warning here:" +
+            "\nhttps://fb.me/react-strict-mode-warnings",
+          strictRootComponentStack,
+          lifecyclesWarningMesages.join("\n\n")
         );
       }
-    }
-    return parentContext;
-  }
-
-  var childContext = void 0;
-  {
-    ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
-  }
-  startPhaseTimer(fiber, "getChildContext");
-  childContext = instance.getChildContext();
-  stopPhaseTimer();
-  {
-    ReactDebugCurrentFiber.setCurrentPhase(null);
-  }
-  for (var contextKey in childContext) {
-    invariant(
-      contextKey in childContextTypes,
-      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
-      contextKey
-    );
-  }
-  {
-    var name = getComponentName(fiber) || "Unknown";
-    checkPropTypes(
-      childContextTypes,
-      childContext,
-      "child context",
-      name,
-      // In practice, there is one case in which we won't get a stack. It's when
-      // somebody calls unstable_renderSubtreeIntoContainer() and we process
-      // context from the parent component instance. The stack will be missing
-      // because it's outside of the reconciliation, and so the pointer has not
-      // been set. This is rare and doesn't matter. We'll also remove that API.
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-    );
-  }
+    });
 
-  return Object.assign({}, parentContext, childContext);
-}
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) {
-    return false;
-  }
+  var getStrictRoot = function(fiber) {
+    var maybeStrictRoot = null;
 
-  var instance = workInProgress.stateNode;
-  // We push the context as early as possible to ensure stack integrity.
-  // If the instance does not exist yet, we will push null at first,
-  // and replace it on the stack later when invalidating the context.
-  var memoizedMergedChildContext =
-    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
-
-  // Remember the parent context so we can merge with it later.
-  // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
-  previousContext = contextStackCursor.current;
-  push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-  push(
-    didPerformWorkStackCursor,
-    didPerformWorkStackCursor.current,
-    workInProgress
-  );
+    while (fiber !== null) {
+      if (fiber.mode & StrictMode) {
+        maybeStrictRoot = fiber;
+      }
 
-  return true;
-}
+      fiber = fiber["return"];
+    }
 
-function invalidateContextProvider(workInProgress, didChange) {
-  var instance = workInProgress.stateNode;
-  invariant(
-    instance,
-    "Expected to have an instance by this point. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
+    return maybeStrictRoot;
+  };
 
-  if (didChange) {
-    // Merge parent and own context.
-    // Skip this if we're not updating due to sCU.
-    // This avoids unnecessarily recomputing memoized values.
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-
-    // Replace the old (or empty) context with the new one.
-    // It is important to unwind the context in the reverse order.
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    // Now push the new context and mark that it has changed.
-    push(contextStackCursor, mergedContext, workInProgress);
-    push(didPerformWorkStackCursor, didChange, workInProgress);
-  } else {
-    pop(didPerformWorkStackCursor, workInProgress);
-    push(didPerformWorkStackCursor, didChange, workInProgress);
-  }
-}
+  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
+    if (pendingComponentWillMountWarnings.length > 0) {
+      var uniqueNames = new Set();
+      pendingComponentWillMountWarnings.forEach(function(fiber) {
+        uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-function resetContext() {
-  previousContext = emptyObject;
-  contextStackCursor.current = emptyObject;
-  didPerformWorkStackCursor.current = false;
-}
+      var sortedNames = Array.from(uniqueNames)
+        .sort()
+        .join(", ");
 
-function findCurrentUnmaskedContext(fiber) {
-  // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-  // makes sense elsewhere
-  invariant(
-    isFiberMounted(fiber) && fiber.tag === ClassComponent,
-    "Expected subtree parent to be a mounted class component. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
+      lowPriorityWarning$1(
+        false,
+        "componentWillMount is deprecated and will be removed in the next major version. " +
+          "Use componentDidMount instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillMount." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        sortedNames
+      );
 
-  var node = fiber;
-  while (node.tag !== HostRoot) {
-    if (isContextProvider(node)) {
-      return node.stateNode.__reactInternalMemoizedMergedChildContext;
+      pendingComponentWillMountWarnings = [];
     }
-    var parent = node["return"];
-    invariant(
-      parent,
-      "Found unexpected detached subtree parent. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
-    node = parent;
-  }
-  return node.stateNode.context;
-}
-
-// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
-// Math.pow(2, 30) - 1
-// 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
 
-// TODO: Use an opaque type once ESLint et al support the syntax
+    if (pendingComponentWillReceivePropsWarnings.length > 0) {
+      var _uniqueNames = new Set();
+      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
+        _uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-var NoWork = 0;
-var Sync = 1;
-var Never = MAX_SIGNED_31_BIT_INT;
+      var _sortedNames = Array.from(_uniqueNames)
+        .sort()
+        .join(", ");
 
-var UNIT_SIZE = 10;
-var MAGIC_NUMBER_OFFSET = 2;
+      lowPriorityWarning$1(
+        false,
+        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
+          "Use static getDerivedStateFromProps instead." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames
+      );
 
-// 1 unit of expiration time represents 10ms.
-function msToExpirationTime(ms) {
-  // Always add an offset so that we don't clash with the magic number for NoWork.
-  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
-}
+      pendingComponentWillReceivePropsWarnings = [];
+    }
 
-function expirationTimeToMs(expirationTime) {
-  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
-}
+    if (pendingComponentWillUpdateWarnings.length > 0) {
+      var _uniqueNames2 = new Set();
+      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
+        _uniqueNames2.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-function ceiling(num, precision) {
-  return (((num / precision) | 0) + 1) * precision;
-}
+      var _sortedNames2 = Array.from(_uniqueNames2)
+        .sort()
+        .join(", ");
 
-function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
-  return ceiling(
-    currentTime + expirationInMs / UNIT_SIZE,
-    bucketSizeMs / UNIT_SIZE
-  );
-}
+      lowPriorityWarning$1(
+        false,
+        "componentWillUpdate is deprecated and will be removed in the next major version. " +
+          "Use componentDidUpdate instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillUpdate." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames2
+      );
 
-var NoContext = 0;
-var AsyncMode = 1;
-var StrictMode = 2;
+      pendingComponentWillUpdateWarnings = [];
+    }
+  };
 
-var hasBadMapPolyfill = void 0;
+  ReactStrictModeWarnings.recordDeprecationWarnings = function(
+    fiber,
+    instance
+  ) {
+    // Dedup strategy: Warn once per component.
+    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+      return;
+    }
 
-{
-  hasBadMapPolyfill = false;
-  try {
-    var nonExtensibleObject = Object.preventExtensions({});
-    var testMap = new Map([[nonExtensibleObject, null]]);
-    var testSet = new Set([nonExtensibleObject]);
-    // This is necessary for Rollup to not consider these unused.
-    // https://github.com/rollup/rollup/issues/1771
-    // TODO: we can remove these if Rollup fixes the bug.
-    testMap.set(0, 0);
-    testSet.add(0);
-  } catch (e) {
-    // TODO: Consider warning about bad polyfills
-    hasBadMapPolyfill = true;
-  }
-}
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillMountWarnings.push(fiber);
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" &&
+      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillReceivePropsWarnings.push(fiber);
+    }
+    if (
+      typeof instance.componentWillUpdate === "function" &&
+      instance.componentWillUpdate.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillUpdateWarnings.push(fiber);
+    }
+  };
 
-// A Fiber is work on a Component that needs to be done or was done. There can
-// be more than one per component.
+  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
+    fiber,
+    instance
+  ) {
+    var strictRoot = getStrictRoot(fiber);
 
-var debugCounter = void 0;
+    // Dedup strategy: Warn once per component.
+    // This is difficult to track any other way since component names
+    // are often vague and are likely to collide between 3rd party libraries.
+    // An expand property is probably okay to use here since it's DEV-only,
+    // and will only be set in the event of serious warnings.
+    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+      return;
+    }
 
-{
-  debugCounter = 1;
-}
-
-function FiberNode(tag, pendingProps, key, mode) {
-  // Instance
-  this.tag = tag;
-  this.key = key;
-  this.type = null;
-  this.stateNode = null;
-
-  // Fiber
-  this["return"] = null;
-  this.child = null;
-  this.sibling = null;
-  this.index = 0;
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    // Note that it is sufficient to check for the presence of a
+    // single lifecycle, componentWillMount, with the polyfill flag.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning === true
+    ) {
+      return;
+    }
 
-  this.ref = null;
+    var warningsForRoot = void 0;
+    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
+      warningsForRoot = {
+        UNSAFE_componentWillMount: [],
+        UNSAFE_componentWillReceiveProps: [],
+        UNSAFE_componentWillUpdate: []
+      };
 
-  this.pendingProps = pendingProps;
-  this.memoizedProps = null;
-  this.updateQueue = null;
-  this.memoizedState = null;
+      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
+    } else {
+      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
+    }
 
-  this.mode = mode;
+    var unsafeLifecycles = [];
+    if (
+      typeof instance.componentWillMount === "function" ||
+      typeof instance.UNSAFE_componentWillMount === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillMount");
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" ||
+      typeof instance.UNSAFE_componentWillReceiveProps === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
+    }
+    if (
+      typeof instance.componentWillUpdate === "function" ||
+      typeof instance.UNSAFE_componentWillUpdate === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
+    }
 
-  // Effects
-  this.effectTag = NoEffect;
-  this.nextEffect = null;
+    if (unsafeLifecycles.length > 0) {
+      unsafeLifecycles.forEach(function(lifecycle) {
+        warningsForRoot[lifecycle].push(fiber);
+      });
+    }
+  };
+}
 
-  this.firstEffect = null;
-  this.lastEffect = null;
+var debugRenderPhaseSideEffects = false;
+var debugRenderPhaseSideEffectsForStrictMode = false;
+var enableUserTimingAPI = true;
+var enableGetDerivedStateFromCatch = false;
+var warnAboutDeprecatedLifecycles = false;
+var replayFailedUnitOfWorkWithInvokeGuardedCallback = true;
 
-  this.expirationTime = NoWork;
+// React Fabric uses persistent reconciler.
+var enableMutatingReconciler = false;
+var enableNoopReconciler = false;
+var enablePersistentReconciler = true;
 
-  this.alternate = null;
+// Only used in www builds.
 
+function getCurrentFiberOwnerName() {
   {
-    this._debugID = debugCounter++;
-    this._debugSource = null;
-    this._debugOwner = null;
-    this._debugIsCurrentlyTiming = false;
-    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
-      Object.preventExtensions(this);
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
+    }
+    var owner = fiber._debugOwner;
+    if (owner !== null && typeof owner !== "undefined") {
+      return getComponentName(owner);
     }
   }
+  return null;
 }
 
-// This is a constructor function, rather than a POJO constructor, still
-// please ensure we do the following:
-// 1) Nobody should add any instance methods on this. Instance methods can be
-//    more difficult to predict when they get optimized and they are almost
-//    never inlined properly in static compilers.
-// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
-//    always know when it is a fiber.
-// 3) We might want to experiment with using numeric keys since they are easier
-//    to optimize in a non-JIT environment.
-// 4) We can easily go from a constructor to a createFiber object literal if that
-//    is faster.
-// 5) It should be easy to port this to a C struct and keep a C implementation
-//    compatible.
-var createFiber = function(tag, pendingProps, key, mode) {
-  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
-  return new FiberNode(tag, pendingProps, key, mode);
-};
+function getCurrentFiberStackAddendum() {
+  {
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
+    }
+    // Safe because if current fiber exists, we are reconciling,
+    // and it is guaranteed to be the work-in-progress version.
+    return getStackAddendumByWorkInProgressFiber(fiber);
+  }
+  return null;
+}
 
-function shouldConstruct(Component) {
-  return !!(Component.prototype && Component.prototype.isReactComponent);
+function resetCurrentFiber() {
+  ReactDebugCurrentFrame.getCurrentStack = null;
+  ReactDebugCurrentFiber.current = null;
+  ReactDebugCurrentFiber.phase = null;
 }
 
-// This is used to create an alternate fiber to do work on.
-function createWorkInProgress(current, pendingProps, expirationTime) {
-  var workInProgress = current.alternate;
-  if (workInProgress === null) {
-    // We use a double buffering pooling technique because we know that we'll
-    // only ever need at most two versions of a tree. We pool the "other" unused
-    // node that we're free to reuse. This is lazily created to avoid allocating
-    // extra objects for things that are never updated. It also allow us to
-    // reclaim the extra memory if needed.
-    workInProgress = createFiber(
-      current.tag,
-      pendingProps,
-      current.key,
-      current.mode
-    );
-    workInProgress.type = current.type;
-    workInProgress.stateNode = current.stateNode;
+function setCurrentFiber(fiber) {
+  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
+  ReactDebugCurrentFiber.current = fiber;
+  ReactDebugCurrentFiber.phase = null;
+}
 
-    {
-      // DEV-only fields
-      workInProgress._debugID = current._debugID;
-      workInProgress._debugSource = current._debugSource;
-      workInProgress._debugOwner = current._debugOwner;
-    }
+function setCurrentPhase(phase) {
+  ReactDebugCurrentFiber.phase = phase;
+}
 
-    workInProgress.alternate = current;
-    current.alternate = workInProgress;
-  } else {
-    workInProgress.pendingProps = pendingProps;
+var ReactDebugCurrentFiber = {
+  current: null,
+  phase: null,
+  resetCurrentFiber: resetCurrentFiber,
+  setCurrentFiber: setCurrentFiber,
+  setCurrentPhase: setCurrentPhase,
+  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
+  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
+};
 
-    // We already have an alternate.
-    // Reset the effect tag.
-    workInProgress.effectTag = NoEffect;
+// Prefix measurements so that it's possible to filter them.
+// Longer prefixes are hard to read in DevTools.
+var reactEmoji = "\u269B";
+var warningEmoji = "\u26D4";
+var supportsUserTiming =
+  typeof performance !== "undefined" &&
+  typeof performance.mark === "function" &&
+  typeof performance.clearMarks === "function" &&
+  typeof performance.measure === "function" &&
+  typeof performance.clearMeasures === "function";
 
-    // The effect list is no longer valid.
-    workInProgress.nextEffect = null;
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
-  }
+// Keep track of current fiber so that we know the path to unwind on pause.
+// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
+var currentFiber = null;
+// If we're in the middle of user code, which fiber and method is it?
+// Reusing `currentFiber` would be confusing for this because user code fiber
+// can change during commit phase too, but we don't need to unwind it (since
+// lifecycles in the commit phase don't resemble a tree).
+var currentPhase = null;
+var currentPhaseFiber = null;
+// Did lifecycle hook schedule an update? This is often a performance problem,
+// so we will keep track of it, and include it in the report.
+// Track commits caused by cascading updates.
+var isCommitting = false;
+var hasScheduledUpdateInCurrentCommit = false;
+var hasScheduledUpdateInCurrentPhase = false;
+var commitCountInCurrentWorkLoop = 0;
+var effectCountInCurrentCommit = 0;
+var isWaitingForCallback = false;
+// During commits, we only show a measurement once per method name
+// to avoid stretch the commit phase with measurement overhead.
+var labelsInCurrentCommit = new Set();
 
-  workInProgress.expirationTime = expirationTime;
+var formatMarkName = function(markName) {
+  return reactEmoji + " " + markName;
+};
 
-  workInProgress.child = current.child;
-  workInProgress.memoizedProps = current.memoizedProps;
-  workInProgress.memoizedState = current.memoizedState;
-  workInProgress.updateQueue = current.updateQueue;
+var formatLabel = function(label, warning$$1) {
+  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
+  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
+  return "" + prefix + label + suffix;
+};
 
-  // These will be overridden during the parent's reconciliation
-  workInProgress.sibling = current.sibling;
-  workInProgress.index = current.index;
-  workInProgress.ref = current.ref;
+var beginMark = function(markName) {
+  performance.mark(formatMarkName(markName));
+};
 
-  return workInProgress;
-}
+var clearMark = function(markName) {
+  performance.clearMarks(formatMarkName(markName));
+};
 
-function createHostRootFiber(isAsync) {
-  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
-  return createFiber(HostRoot, null, null, mode);
-}
+var endMark = function(label, markName, warning$$1) {
+  var formattedMarkName = formatMarkName(markName);
+  var formattedLabel = formatLabel(label, warning$$1);
+  try {
+    performance.measure(formattedLabel, formattedMarkName);
+  } catch (err) {}
+  // If previous mark was missing for some reason, this will throw.
+  // This could only happen if React crashed in an unexpected place earlier.
+  // Don't pile on with more errors.
 
-function createFiberFromElement(element, mode, expirationTime) {
-  var owner = null;
-  {
-    owner = element._owner;
-  }
+  // Clear marks immediately to avoid growing buffer.
+  performance.clearMarks(formattedMarkName);
+  performance.clearMeasures(formattedLabel);
+};
 
-  var fiber = void 0;
-  var type = element.type;
-  var key = element.key;
-  var pendingProps = element.props;
+var getFiberMarkName = function(label, debugID) {
+  return label + " (#" + debugID + ")";
+};
 
-  var fiberTag = void 0;
-  if (typeof type === "function") {
-    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
-  } else if (typeof type === "string") {
-    fiberTag = HostComponent;
+var getFiberLabel = function(componentName, isMounted, phase) {
+  if (phase === null) {
+    // These are composite component total time measurements.
+    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
   } else {
-    switch (type) {
-      case REACT_FRAGMENT_TYPE:
-        return createFiberFromFragment(
-          pendingProps.children,
-          mode,
-          expirationTime,
-          key
-        );
-      case REACT_ASYNC_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= AsyncMode | StrictMode;
-        break;
-      case REACT_STRICT_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= StrictMode;
-        break;
-      case REACT_CALL_TYPE:
-        fiberTag = CallComponent;
-        break;
-      case REACT_RETURN_TYPE:
-        fiberTag = ReturnComponent;
-        break;
-      default: {
-        if (typeof type === "object" && type !== null) {
-          switch (type.$$typeof) {
-            case REACT_PROVIDER_TYPE:
-              fiberTag = ContextProvider;
-              break;
-            case REACT_CONTEXT_TYPE:
-              // This is a consumer
-              fiberTag = ContextConsumer;
-              break;
-            default:
-              if (typeof type.tag === "number") {
-                // Currently assumed to be a continuation and therefore is a
-                // fiber already.
-                // TODO: The yield system is currently broken for updates in
-                // some cases. The reified yield stores a fiber, but we don't
-                // know which fiber that is; the current or a workInProgress?
-                // When the continuation gets rendered here we don't know if we
-                // can reuse that fiber or if we need to clone it. There is
-                // probably a clever way to restructure this.
-                fiber = type;
-                fiber.pendingProps = pendingProps;
-                fiber.expirationTime = expirationTime;
-                return fiber;
-              } else {
-                throwOnInvalidElementType(type, owner);
-              }
-              break;
-          }
-        } else {
-          throwOnInvalidElementType(type, owner);
-        }
-      }
+    // Composite component methods.
+    return componentName + "." + phase;
+  }
+};
+
+var beginFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+
+  if (isCommitting && labelsInCurrentCommit.has(label)) {
+    // During the commit phase, we don't show duplicate labels because
+    // there is a fixed overhead for every measurement, and we don't
+    // want to stretch the commit phase beyond necessary.
+    return false;
+  }
+  labelsInCurrentCommit.add(label);
+
+  var markName = getFiberMarkName(label, debugID);
+  beginMark(markName);
+  return true;
+};
+
+var clearFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  clearMark(markName);
+};
+
+var endFiberMark = function(fiber, phase, warning$$1) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  endMark(label, markName, warning$$1);
+};
+
+var shouldIgnoreFiber = function(fiber) {
+  // Host components should be skipped in the timeline.
+  // We could check typeof fiber.type, but does this work with RN?
+  switch (fiber.tag) {
+    case HostRoot:
+    case HostComponent:
+    case HostText:
+    case HostPortal:
+    case CallComponent:
+    case ReturnComponent:
+    case Fragment:
+    case ContextProvider:
+    case ContextConsumer:
+      return true;
+    default:
+      return false;
+  }
+};
+
+var clearPendingPhaseMeasurement = function() {
+  if (currentPhase !== null && currentPhaseFiber !== null) {
+    clearFiberMark(currentPhaseFiber, currentPhase);
+  }
+  currentPhaseFiber = null;
+  currentPhase = null;
+  hasScheduledUpdateInCurrentPhase = false;
+};
+
+var pauseTimers = function() {
+  // Stops all currently active measurements so that they can be resumed
+  // if we continue in a later deferred loop from the same unit of work.
+  var fiber = currentFiber;
+  while (fiber) {
+    if (fiber._debugIsCurrentlyTiming) {
+      endFiberMark(fiber, null, null);
     }
+    fiber = fiber["return"];
   }
+};
 
-  fiber = createFiber(fiberTag, pendingProps, key, mode);
-  fiber.type = type;
-  fiber.expirationTime = expirationTime;
+var resumeTimersRecursively = function(fiber) {
+  if (fiber["return"] !== null) {
+    resumeTimersRecursively(fiber["return"]);
+  }
+  if (fiber._debugIsCurrentlyTiming) {
+    beginFiberMark(fiber, null);
+  }
+};
 
-  {
-    fiber._debugSource = element._source;
-    fiber._debugOwner = element._owner;
+var resumeTimers = function() {
+  // Resumes all measurements that were active during the last deferred loop.
+  if (currentFiber !== null) {
+    resumeTimersRecursively(currentFiber);
   }
+};
 
-  return fiber;
+function recordEffect() {
+  if (enableUserTimingAPI) {
+    effectCountInCurrentCommit++;
+  }
 }
 
-function throwOnInvalidElementType(type, owner) {
-  var info = "";
-  {
+function recordScheduleUpdate() {
+  if (enableUserTimingAPI) {
+    if (isCommitting) {
+      hasScheduledUpdateInCurrentCommit = true;
+    }
     if (
-      type === undefined ||
-      (typeof type === "object" &&
-        type !== null &&
-        Object.keys(type).length === 0)
+      currentPhase !== null &&
+      currentPhase !== "componentWillMount" &&
+      currentPhase !== "componentWillReceiveProps"
     ) {
-      info +=
-        " You likely forgot to export your component from the file " +
-        "it's defined in, or you might have mixed up default and " +
-        "named imports.";
-    }
-    var ownerName = owner ? getComponentName(owner) : null;
-    if (ownerName) {
-      info += "\n\nCheck the render method of `" + ownerName + "`.";
+      hasScheduledUpdateInCurrentPhase = true;
     }
   }
-  invariant(
-    false,
-    "Element type is invalid: expected a string (for built-in " +
-      "components) or a class/function (for composite components) " +
-      "but got: %s.%s",
-    type == null ? type : typeof type,
-    info
-  );
 }
 
-function createFiberFromFragment(elements, mode, expirationTime, key) {
-  var fiber = createFiber(Fragment, elements, key, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
+function startRequestCallbackTimer() {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming && !isWaitingForCallback) {
+      isWaitingForCallback = true;
+      beginMark("(Waiting for async callback...)");
+    }
+  }
 }
 
-function createFiberFromText(content, mode, expirationTime) {
-  var fiber = createFiber(HostText, content, null, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
+function stopRequestCallbackTimer(didExpire, expirationTime) {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming) {
+      isWaitingForCallback = false;
+      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
+      endMark(
+        "(Waiting for async callback... will force flush in " +
+          expirationTime +
+          " ms)",
+        "(Waiting for async callback...)",
+        warning$$1
+      );
+    }
+  }
 }
 
-function createFiberFromHostInstanceForDeletion() {
-  var fiber = createFiber(HostComponent, null, null, NoContext);
-  fiber.type = "DELETED";
-  return fiber;
+function startWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, this is the fiber to unwind from.
+    currentFiber = fiber;
+    if (!beginFiberMark(fiber, null)) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = true;
+  }
 }
 
-function createFiberFromPortal(portal, mode, expirationTime) {
-  var pendingProps = portal.children !== null ? portal.children : [];
-  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
-  fiber.expirationTime = expirationTime;
-  fiber.stateNode = {
-    containerInfo: portal.containerInfo,
-    pendingChildren: null, // Used by persistent updates
-    implementation: portal.implementation
-  };
-  return fiber;
-}
-
-// TODO: This should be lifted into the renderer.
-
-function createFiberRoot(containerInfo, isAsync, hydrate) {
-  // Cyclic construction. This cheats the type system right now because
-  // stateNode is any.
-  var uninitializedFiber = createHostRootFiber(isAsync);
-  var root = {
-    current: uninitializedFiber,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-    pendingCommitExpirationTime: NoWork,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    remainingExpirationTime: NoWork,
-    firstBatch: null,
-    nextScheduledRoot: null
-  };
-  uninitializedFiber.stateNode = root;
-  return root;
-}
-
-var onCommitFiberRoot = null;
-var onCommitFiberUnmount = null;
-var hasLoggedError = false;
-
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {
-      if (true && !hasLoggedError) {
-        hasLoggedError = true;
-        warning(false, "React DevTools encountered an error: %s", err);
-      }
+function cancelWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
     }
-  };
+    // Remember we shouldn't complete measurement for this fiber.
+    // Otherwise flamechart will be deep even for small updates.
+    fiber._debugIsCurrentlyTiming = false;
+    clearFiberMark(fiber, null);
+  }
 }
 
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
-  }
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
-  }
-  if (!hook.supportsFiber) {
-    {
-      warning(
-        false,
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://fb.me/react-devtools"
-      );
+function stopWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
     }
-    // DevTools exists, even though it doesn't support Fiber.
-    return true;
-  }
-  try {
-    var rendererID = hook.inject(internals);
-    // We have successfully injected, so now it is safe to set up hooks.
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
-    {
-      warning(false, "React DevTools encountered an error: %s.", err);
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
     }
+    fiber._debugIsCurrentlyTiming = false;
+    endFiberMark(fiber, null, null);
   }
-  // DevTools exists
-  return true;
 }
 
-function onCommitRoot(root) {
-  if (typeof onCommitFiberRoot === "function") {
-    onCommitFiberRoot(root);
+function stopFailedWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = false;
+    var warning$$1 = "An error was thrown inside this error boundary";
+    endFiberMark(fiber, null, warning$$1);
   }
 }
 
-function onCommitUnmount(fiber) {
-  if (typeof onCommitFiberUnmount === "function") {
-    onCommitFiberUnmount(fiber);
+function startPhaseTimer(fiber, phase) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    clearPendingPhaseMeasurement();
+    if (!beginFiberMark(fiber, phase)) {
+      return;
+    }
+    currentPhaseFiber = fiber;
+    currentPhase = phase;
   }
 }
 
-/**
- * Forked from fbjs/warning:
- * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
- *
- * Only change is we use console.warn instead of console.error,
- * and do nothing when 'console' is not supported.
- * This really simplifies the code.
- * ---
- * Similar to invariant but only logs a warning if the condition is not met.
- * This can be used to log issues in development environments in critical
- * paths. Removing the logging code for production environments will keep the
- * same logic and follow the same code paths.
- */
-
-var lowPriorityWarning = function() {};
-
-{
-  var printWarning = function(format) {
-    for (
-      var _len = arguments.length,
-        args = Array(_len > 1 ? _len - 1 : 0),
-        _key = 1;
-      _key < _len;
-      _key++
-    ) {
-      args[_key - 1] = arguments[_key];
+function stopPhaseTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    if (currentPhase !== null && currentPhaseFiber !== null) {
+      var warning$$1 = hasScheduledUpdateInCurrentPhase
+        ? "Scheduled a cascading update"
+        : null;
+      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
     }
+    currentPhase = null;
+    currentPhaseFiber = null;
+  }
+}
 
-    var argIndex = 0;
-    var message =
-      "Warning: " +
-      format.replace(/%s/g, function() {
-        return args[argIndex++];
-      });
-    if (typeof console !== "undefined") {
-      console.warn(message);
+function startWorkLoopTimer(nextUnitOfWork) {
+  if (enableUserTimingAPI) {
+    currentFiber = nextUnitOfWork;
+    if (!supportsUserTiming) {
+      return;
     }
-    try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
-      throw new Error(message);
-    } catch (x) {}
-  };
+    commitCountInCurrentWorkLoop = 0;
+    // This is top level call.
+    // Any other measurements are performed within.
+    beginMark("(React Tree Reconciliation)");
+    // Resume any measurements that were in progress during the last loop.
+    resumeTimers();
+  }
+}
 
-  lowPriorityWarning = function(condition, format) {
-    if (format === undefined) {
-      throw new Error(
-        "`warning(condition, format, ...args)` requires a warning " +
-          "message argument"
-      );
+function stopWorkLoopTimer(interruptedBy, didCompleteRoot) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (!condition) {
-      for (
-        var _len2 = arguments.length,
-          args = Array(_len2 > 2 ? _len2 - 2 : 0),
-          _key2 = 2;
-        _key2 < _len2;
-        _key2++
-      ) {
-        args[_key2 - 2] = arguments[_key2];
+    var warning$$1 = null;
+    if (interruptedBy !== null) {
+      if (interruptedBy.tag === HostRoot) {
+        warning$$1 = "A top-level update interrupted the previous render";
+      } else {
+        var componentName = getComponentName(interruptedBy) || "Unknown";
+        warning$$1 =
+          "An update to " + componentName + " interrupted the previous render";
       }
+    } else if (commitCountInCurrentWorkLoop > 1) {
+      warning$$1 = "There were cascading updates";
+    }
+    commitCountInCurrentWorkLoop = 0;
+    var label = didCompleteRoot
+      ? "(React Tree Reconciliation: Completed Root)"
+      : "(React Tree Reconciliation: Yielded)";
+    // Pause any measurements until the next loop.
+    pauseTimers();
+    endMark(label, "(React Tree Reconciliation)", warning$$1);
+  }
+}
 
-      printWarning.apply(undefined, [format].concat(args));
+function startCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-  };
+    isCommitting = true;
+    hasScheduledUpdateInCurrentCommit = false;
+    labelsInCurrentCommit.clear();
+    beginMark("(Committing Changes)");
+  }
 }
 
-var lowPriorityWarning$1 = lowPriorityWarning;
+function stopCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
 
-var ReactStrictModeWarnings = {
-  discardPendingWarnings: function() {},
-  flushPendingDeprecationWarnings: function() {},
-  flushPendingUnsafeLifecycleWarnings: function() {},
-  recordDeprecationWarnings: function(fiber, instance) {},
-  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
-};
+    var warning$$1 = null;
+    if (hasScheduledUpdateInCurrentCommit) {
+      warning$$1 = "Lifecycle hook scheduled a cascading update";
+    } else if (commitCountInCurrentWorkLoop > 0) {
+      warning$$1 = "Caused by a cascading update in earlier commit";
+    }
+    hasScheduledUpdateInCurrentCommit = false;
+    commitCountInCurrentWorkLoop++;
+    isCommitting = false;
+    labelsInCurrentCommit.clear();
 
-{
-  var LIFECYCLE_SUGGESTIONS = {
-    UNSAFE_componentWillMount: "componentDidMount",
-    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
-    UNSAFE_componentWillUpdate: "componentDidUpdate"
-  };
+    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
+  }
+}
 
-  var pendingComponentWillMountWarnings = [];
-  var pendingComponentWillReceivePropsWarnings = [];
-  var pendingComponentWillUpdateWarnings = [];
-  var pendingUnsafeLifecycleWarnings = new Map();
+function startCommitSnapshotEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Snapshot Effects)");
+  }
+}
 
-  // Tracks components we have already warned about.
-  var didWarnAboutDeprecatedLifecycles = new Set();
-  var didWarnAboutUnsafeLifecycles = new Set();
+function stopCommitSnapshotEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Snapshot Effects: " + count + " Total)",
+      "(Committing Snapshot Effects)",
+      null
+    );
+  }
+}
 
-  ReactStrictModeWarnings.discardPendingWarnings = function() {
-    pendingComponentWillMountWarnings = [];
-    pendingComponentWillReceivePropsWarnings = [];
-    pendingComponentWillUpdateWarnings = [];
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+function startCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Host Effects)");
+  }
+}
 
-  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
-    pendingUnsafeLifecycleWarnings.forEach(function(
-      lifecycleWarningsMap,
-      strictRoot
-    ) {
-      var lifecyclesWarningMesages = [];
+function stopCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Host Effects: " + count + " Total)",
+      "(Committing Host Effects)",
+      null
+    );
+  }
+}
 
-      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
-        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
-        if (lifecycleWarnings.length > 0) {
-          var componentNames = new Set();
-          lifecycleWarnings.forEach(function(fiber) {
-            componentNames.add(getComponentName(fiber) || "Component");
-            didWarnAboutUnsafeLifecycles.add(fiber.type);
-          });
+function startCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Calling Lifecycle Methods)");
+  }
+}
 
-          var formatted = lifecycle.replace("UNSAFE_", "");
-          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
-          var sortedComponentNames = Array.from(componentNames)
-            .sort()
-            .join(", ");
+function stopCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Calling Lifecycle Methods: " + count + " Total)",
+      "(Calling Lifecycle Methods)",
+      null
+    );
+  }
+}
 
-          lifecyclesWarningMesages.push(
-            formatted +
-              ": Please update the following components to use " +
-              (suggestion + " instead: " + sortedComponentNames)
-          );
-        }
-      });
+var didWarnUpdateInsideUpdate = void 0;
 
-      if (lifecyclesWarningMesages.length > 0) {
-        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
-          strictRoot
-        );
+{
+  didWarnUpdateInsideUpdate = false;
+}
 
-        warning(
-          false,
-          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
-            "\n\n%s" +
-            "\n\nLearn more about this warning here:" +
-            "\nhttps://fb.me/react-strict-mode-warnings",
-          strictRootComponentStack,
-          lifecyclesWarningMesages.join("\n\n")
-        );
-      }
-    });
+// Callbacks are not validated until invocation
 
-    pendingUnsafeLifecycleWarnings = new Map();
+// Singly linked-list of updates. When an update is scheduled, it is added to
+// the queue of the current fiber and the work-in-progress fiber. The two queues
+// are separate but they share a persistent structure.
+//
+// During reconciliation, updates are removed from the work-in-progress fiber,
+// but they remain on the current fiber. That ensures that if a work-in-progress
+// is aborted, the aborted updates are recovered by cloning from current.
+//
+// The work-in-progress queue is always a subset of the current queue.
+//
+// When the tree is committed, the work-in-progress becomes the current.
+
+function createUpdateQueue(baseState) {
+  var queue = {
+    baseState: baseState,
+    expirationTime: NoWork,
+    first: null,
+    last: null,
+    callbackList: null,
+    hasForceUpdate: false,
+    isInitialized: false,
+    capturedValues: null
   };
+  {
+    queue.isProcessing = false;
+  }
+  return queue;
+}
 
-  var getStrictRoot = function(fiber) {
-    var maybeStrictRoot = null;
+function insertUpdateIntoQueue(queue, update) {
+  // Append the update to the end of the list.
+  if (queue.last === null) {
+    // Queue is empty
+    queue.first = queue.last = update;
+  } else {
+    queue.last.next = update;
+    queue.last = update;
+  }
+  if (
+    queue.expirationTime === NoWork ||
+    queue.expirationTime > update.expirationTime
+  ) {
+    queue.expirationTime = update.expirationTime;
+  }
+}
 
-    while (fiber !== null) {
-      if (fiber.mode & StrictMode) {
-        maybeStrictRoot = fiber;
-      }
+var q1 = void 0;
+var q2 = void 0;
+function ensureUpdateQueues(fiber) {
+  q1 = q2 = null;
+  // We'll have at least one and at most two distinct update queues.
+  var alternateFiber = fiber.alternate;
+  var queue1 = fiber.updateQueue;
+  if (queue1 === null) {
+    // TODO: We don't know what the base state will be until we begin work.
+    // It depends on which fiber is the next current. Initialize with an empty
+    // base state, then set to the memoizedState when rendering. Not super
+    // happy with this approach.
+    queue1 = fiber.updateQueue = createUpdateQueue(null);
+  }
 
-      fiber = fiber["return"];
+  var queue2 = void 0;
+  if (alternateFiber !== null) {
+    queue2 = alternateFiber.updateQueue;
+    if (queue2 === null) {
+      queue2 = alternateFiber.updateQueue = createUpdateQueue(null);
     }
+  } else {
+    queue2 = null;
+  }
+  queue2 = queue2 !== queue1 ? queue2 : null;
 
-    return maybeStrictRoot;
-  };
-
-  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
-    if (pendingComponentWillMountWarnings.length > 0) {
-      var uniqueNames = new Set();
-      pendingComponentWillMountWarnings.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
+  // Use module variables instead of returning a tuple
+  q1 = queue1;
+  q2 = queue2;
+}
 
-      var sortedNames = Array.from(uniqueNames)
-        .sort()
-        .join(", ");
+function insertUpdateIntoFiber(fiber, update) {
+  ensureUpdateQueues(fiber);
+  var queue1 = q1;
+  var queue2 = q2;
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillMount is deprecated and will be removed in the next major version. " +
-          "Use componentDidMount instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillMount." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        sortedNames
-      );
-
-      pendingComponentWillMountWarnings = [];
-    }
-
-    if (pendingComponentWillReceivePropsWarnings.length > 0) {
-      var _uniqueNames = new Set();
-      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
-        _uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames = Array.from(_uniqueNames)
-        .sort()
-        .join(", ");
-
-      lowPriorityWarning$1(
-        false,
-        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
-          "Use static getDerivedStateFromProps instead." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames
-      );
-
-      pendingComponentWillReceivePropsWarnings = [];
-    }
-
-    if (pendingComponentWillUpdateWarnings.length > 0) {
-      var _uniqueNames2 = new Set();
-      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
-        _uniqueNames2.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames2 = Array.from(_uniqueNames2)
-        .sort()
-        .join(", ");
-
-      lowPriorityWarning$1(
-        false,
-        "componentWillUpdate is deprecated and will be removed in the next major version. " +
-          "Use componentDidUpdate instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillUpdate." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames2
-      );
-
-      pendingComponentWillUpdateWarnings = [];
-    }
-  };
-
-  ReactStrictModeWarnings.recordDeprecationWarnings = function(
-    fiber,
-    instance
-  ) {
-    // Dedup strategy: Warn once per component.
-    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
-      return;
-    }
-
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillMountWarnings.push(fiber);
-    }
-    if (
-      typeof instance.componentWillReceiveProps === "function" &&
-      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillReceivePropsWarnings.push(fiber);
-    }
-    if (typeof instance.componentWillUpdate === "function") {
-      pendingComponentWillUpdateWarnings.push(fiber);
-    }
-  };
-
-  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
-    fiber,
-    instance
-  ) {
-    var strictRoot = getStrictRoot(fiber);
-
-    // Dedup strategy: Warn once per component.
-    // This is difficult to track any other way since component names
-    // are often vague and are likely to collide between 3rd party libraries.
-    // An expand property is probably okay to use here since it's DEV-only,
-    // and will only be set in the event of serious warnings.
-    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
-      return;
-    }
-
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
-    ) {
-      return;
-    }
-
-    var warningsForRoot = void 0;
-    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
-      warningsForRoot = {
-        UNSAFE_componentWillMount: [],
-        UNSAFE_componentWillReceiveProps: [],
-        UNSAFE_componentWillUpdate: []
-      };
-
-      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
-    } else {
-      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
-    }
-
-    var unsafeLifecycles = [];
-    if (
-      typeof instance.componentWillMount === "function" ||
-      typeof instance.UNSAFE_componentWillMount === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillMount");
-    }
-    if (
-      typeof instance.componentWillReceiveProps === "function" ||
-      typeof instance.UNSAFE_componentWillReceiveProps === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
-    }
-    if (
-      typeof instance.componentWillUpdate === "function" ||
-      typeof instance.UNSAFE_componentWillUpdate === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
-    }
-
-    if (unsafeLifecycles.length > 0) {
-      unsafeLifecycles.forEach(function(lifecycle) {
-        warningsForRoot[lifecycle].push(fiber);
-      });
-    }
-  };
-}
-
-var didWarnUpdateInsideUpdate = void 0;
-
-{
-  didWarnUpdateInsideUpdate = false;
-}
-
-// Callbacks are not validated until invocation
-
-// Singly linked-list of updates. When an update is scheduled, it is added to
-// the queue of the current fiber and the work-in-progress fiber. The two queues
-// are separate but they share a persistent structure.
-//
-// During reconciliation, updates are removed from the work-in-progress fiber,
-// but they remain on the current fiber. That ensures that if a work-in-progress
-// is aborted, the aborted updates are recovered by cloning from current.
-//
-// The work-in-progress queue is always a subset of the current queue.
-//
-// When the tree is committed, the work-in-progress becomes the current.
-
-function createUpdateQueue(baseState) {
-  var queue = {
-    baseState: baseState,
-    expirationTime: NoWork,
-    first: null,
-    last: null,
-    callbackList: null,
-    hasForceUpdate: false,
-    isInitialized: false,
-    capturedValues: null
-  };
-  {
-    queue.isProcessing = false;
-  }
-  return queue;
-}
-
-function insertUpdateIntoQueue(queue, update) {
-  // Append the update to the end of the list.
-  if (queue.last === null) {
-    // Queue is empty
-    queue.first = queue.last = update;
-  } else {
-    queue.last.next = update;
-    queue.last = update;
-  }
-  if (
-    queue.expirationTime === NoWork ||
-    queue.expirationTime > update.expirationTime
-  ) {
-    queue.expirationTime = update.expirationTime;
-  }
-}
-
-var q1 = void 0;
-var q2 = void 0;
-function ensureUpdateQueues(fiber) {
-  q1 = q2 = null;
-  // We'll have at least one and at most two distinct update queues.
-  var alternateFiber = fiber.alternate;
-  var queue1 = fiber.updateQueue;
-  if (queue1 === null) {
-    // TODO: We don't know what the base state will be until we begin work.
-    // It depends on which fiber is the next current. Initialize with an empty
-    // base state, then set to the memoizedState when rendering. Not super
-    // happy with this approach.
-    queue1 = fiber.updateQueue = createUpdateQueue(null);
-  }
-
-  var queue2 = void 0;
-  if (alternateFiber !== null) {
-    queue2 = alternateFiber.updateQueue;
-    if (queue2 === null) {
-      queue2 = alternateFiber.updateQueue = createUpdateQueue(null);
-    }
-  } else {
-    queue2 = null;
-  }
-  queue2 = queue2 !== queue1 ? queue2 : null;
-
-  // Use module variables instead of returning a tuple
-  q1 = queue1;
-  q2 = queue2;
-}
-
-function insertUpdateIntoFiber(fiber, update) {
-  ensureUpdateQueues(fiber);
-  var queue1 = q1;
-  var queue2 = q2;
-
-  // Warn if an update is scheduled from inside an updater function.
-  {
-    if (
-      (queue1.isProcessing || (queue2 !== null && queue2.isProcessing)) &&
-      !didWarnUpdateInsideUpdate
-    ) {
-      warning(
+  // Warn if an update is scheduled from inside an updater function.
+  {
+    if (
+      (queue1.isProcessing || (queue2 !== null && queue2.isProcessing)) &&
+      !didWarnUpdateInsideUpdate
+    ) {
+      warning(
         false,
         "An update (setState, replaceState, or forceUpdate) was scheduled " +
           "from inside an update function. Update functions should be pure, " +
@@ -6102,23 +5865,26 @@ var isArray = Array.isArray;
 var didWarnAboutStateAssignmentForComponent = void 0;
 var didWarnAboutUndefinedDerivedState = void 0;
 var didWarnAboutUninitializedState = void 0;
-var didWarnAboutWillReceivePropsAndDerivedState = void 0;
+var didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = void 0;
+var didWarnAboutLegacyLifecyclesAndDerivedState = void 0;
 var warnOnInvalidCallback = void 0;
 
 {
-  didWarnAboutStateAssignmentForComponent = {};
-  didWarnAboutUndefinedDerivedState = {};
-  didWarnAboutUninitializedState = {};
-  didWarnAboutWillReceivePropsAndDerivedState = {};
+  didWarnAboutStateAssignmentForComponent = new Set();
+  didWarnAboutUndefinedDerivedState = new Set();
+  didWarnAboutUninitializedState = new Set();
+  didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = new Set();
+  didWarnAboutLegacyLifecyclesAndDerivedState = new Set();
 
-  var didWarnOnInvalidCallback = {};
+  var didWarnOnInvalidCallback = new Set();
 
   warnOnInvalidCallback = function(callback, callerName) {
     if (callback === null || typeof callback === "function") {
       return;
     }
     var key = callerName + "_" + callback;
-    if (!didWarnOnInvalidCallback[key]) {
+    if (!didWarnOnInvalidCallback.has(key)) {
+      didWarnOnInvalidCallback.add(key);
       warning(
         false,
         "%s(...): Expected the last optional `callback` argument to be a " +
@@ -6126,7 +5892,6 @@ var warnOnInvalidCallback = void 0;
         callerName,
         callback
       );
-      didWarnOnInvalidCallback[key] = true;
     }
   };
 
@@ -6165,12 +5930,20 @@ function callGetDerivedStateFromCatch(ctor, capturedValues) {
 }
 
 var ReactFiberClassComponent = function(
+  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
   memoizeState
 ) {
+  var cacheContext = legacyContext.cacheContext,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    isContextConsumer = legacyContext.isContextConsumer,
+    hasContextChanged = legacyContext.hasContextChanged;
+
   // Class component state updater
+
   var updater = {
     isMounted: isMounted,
     enqueueSetState: function(instance, partialState, callback) {
@@ -6261,12 +6034,14 @@ var ReactFiberClassComponent = function(
       stopPhaseTimer();
 
       {
-        warning(
-          shouldUpdate !== undefined,
-          "%s.shouldComponentUpdate(): Returned undefined instead of a " +
-            "boolean value. Make sure to return true or false.",
-          getComponentName(workInProgress) || "Unknown"
-        );
+        !(shouldUpdate !== undefined)
+          ? warning(
+              false,
+              "%s.shouldComponentUpdate(): Returned undefined instead of a " +
+                "boolean value. Make sure to return true or false.",
+              getComponentName(workInProgress) || "Component"
+            )
+          : void 0;
       }
 
       return shouldUpdate;
@@ -6285,7 +6060,7 @@ var ReactFiberClassComponent = function(
     var instance = workInProgress.stateNode;
     var type = workInProgress.type;
     {
-      var name = getComponentName(workInProgress);
+      var name = getComponentName(workInProgress) || "Component";
       var renderPresent = instance.render;
 
       if (!renderPresent) {
@@ -6310,47 +6085,57 @@ var ReactFiberClassComponent = function(
         !instance.getInitialState ||
         instance.getInitialState.isReactClassApproved ||
         instance.state;
-      warning(
-        noGetInitialStateOnES6,
-        "getInitialState was defined on %s, a plain JavaScript class. " +
-          "This is only supported for classes created using React.createClass. " +
-          "Did you mean to define a state property instead?",
-        name
-      );
-      var noGetDefaultPropsOnES6 =
+      !noGetInitialStateOnES6
+        ? warning(
+            false,
+            "getInitialState was defined on %s, a plain JavaScript class. " +
+              "This is only supported for classes created using React.createClass. " +
+              "Did you mean to define a state property instead?",
+            name
+          )
+        : void 0;
+      var noGetDefaultPropsOnES6 =
         !instance.getDefaultProps ||
         instance.getDefaultProps.isReactClassApproved;
-      warning(
-        noGetDefaultPropsOnES6,
-        "getDefaultProps was defined on %s, a plain JavaScript class. " +
-          "This is only supported for classes created using React.createClass. " +
-          "Use a static property to define defaultProps instead.",
-        name
-      );
+      !noGetDefaultPropsOnES6
+        ? warning(
+            false,
+            "getDefaultProps was defined on %s, a plain JavaScript class. " +
+              "This is only supported for classes created using React.createClass. " +
+              "Use a static property to define defaultProps instead.",
+            name
+          )
+        : void 0;
       var noInstancePropTypes = !instance.propTypes;
-      warning(
-        noInstancePropTypes,
-        "propTypes was defined as an instance property on %s. Use a static " +
-          "property to define propTypes instead.",
-        name
-      );
+      !noInstancePropTypes
+        ? warning(
+            false,
+            "propTypes was defined as an instance property on %s. Use a static " +
+              "property to define propTypes instead.",
+            name
+          )
+        : void 0;
       var noInstanceContextTypes = !instance.contextTypes;
-      warning(
-        noInstanceContextTypes,
-        "contextTypes was defined as an instance property on %s. Use a static " +
-          "property to define contextTypes instead.",
-        name
-      );
+      !noInstanceContextTypes
+        ? warning(
+            false,
+            "contextTypes was defined as an instance property on %s. Use a static " +
+              "property to define contextTypes instead.",
+            name
+          )
+        : void 0;
       var noComponentShouldUpdate =
         typeof instance.componentShouldUpdate !== "function";
-      warning(
-        noComponentShouldUpdate,
-        "%s has a method called " +
-          "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
-          "The name is phrased as a question because the function is " +
-          "expected to return a value.",
-        name
-      );
+      !noComponentShouldUpdate
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
+              "The name is phrased as a question because the function is " +
+              "expected to return a value.",
+            name
+          )
+        : void 0;
       if (
         type.prototype &&
         type.prototype.isPureReactComponent &&
@@ -6366,73 +6151,128 @@ var ReactFiberClassComponent = function(
       }
       var noComponentDidUnmount =
         typeof instance.componentDidUnmount !== "function";
-      warning(
-        noComponentDidUnmount,
-        "%s has a method called " +
-          "componentDidUnmount(). But there is no such lifecycle method. " +
-          "Did you mean componentWillUnmount()?",
-        name
-      );
+      !noComponentDidUnmount
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentDidUnmount(). But there is no such lifecycle method. " +
+              "Did you mean componentWillUnmount()?",
+            name
+          )
+        : void 0;
       var noComponentDidReceiveProps =
         typeof instance.componentDidReceiveProps !== "function";
-      warning(
-        noComponentDidReceiveProps,
-        "%s has a method called " +
-          "componentDidReceiveProps(). But there is no such lifecycle method. " +
-          "If you meant to update the state in response to changing props, " +
-          "use componentWillReceiveProps(). If you meant to fetch data or " +
-          "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
-        name
-      );
+      !noComponentDidReceiveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentDidReceiveProps(). But there is no such lifecycle method. " +
+              "If you meant to update the state in response to changing props, " +
+              "use componentWillReceiveProps(). If you meant to fetch data or " +
+              "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
+            name
+          )
+        : void 0;
       var noComponentWillRecieveProps =
         typeof instance.componentWillRecieveProps !== "function";
-      warning(
-        noComponentWillRecieveProps,
-        "%s has a method called " +
-          "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
-        name
-      );
+      !noComponentWillRecieveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
+            name
+          )
+        : void 0;
       var noUnsafeComponentWillRecieveProps =
         typeof instance.UNSAFE_componentWillRecieveProps !== "function";
-      warning(
-        noUnsafeComponentWillRecieveProps,
-        "%s has a method called " +
-          "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
-        name
-      );
+      !noUnsafeComponentWillRecieveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
+            name
+          )
+        : void 0;
       var hasMutatedProps = instance.props !== workInProgress.pendingProps;
-      warning(
-        instance.props === undefined || !hasMutatedProps,
-        "%s(...): When calling super() in `%s`, make sure to pass " +
-          "up the same props that your component's constructor was passed.",
-        name,
-        name
-      );
+      !(instance.props === undefined || !hasMutatedProps)
+        ? warning(
+            false,
+            "%s(...): When calling super() in `%s`, make sure to pass " +
+              "up the same props that your component's constructor was passed.",
+            name,
+            name
+          )
+        : void 0;
       var noInstanceDefaultProps = !instance.defaultProps;
-      warning(
-        noInstanceDefaultProps,
-        "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
-          " Instead, define defaultProps as a static property on %s.",
-        name,
-        name
-      );
-    }
+      !noInstanceDefaultProps
+        ? warning(
+            false,
+            "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
+              " Instead, define defaultProps as a static property on %s.",
+            name,
+            name
+          )
+        : void 0;
 
-    var state = instance.state;
-    if (state && (typeof state !== "object" || isArray(state))) {
-      warning(
-        false,
-        "%s.state: must be set to an object or null",
-        getComponentName(workInProgress)
-      );
-    }
-    if (typeof instance.getChildContext === "function") {
-      warning(
-        typeof type.childContextTypes === "object",
-        "%s.getChildContext(): childContextTypes must be defined in order to " +
-          "use getChildContext().",
-        getComponentName(workInProgress)
-      );
+      if (
+        typeof instance.getSnapshotBeforeUpdate === "function" &&
+        typeof instance.componentDidUpdate !== "function" &&
+        typeof instance.componentDidUpdate !== "function" &&
+        !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
+      ) {
+        didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
+        warning(
+          false,
+          "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
+            "This component defines getSnapshotBeforeUpdate() only.",
+          getComponentName(workInProgress)
+        );
+      }
+
+      var noInstanceGetDerivedStateFromProps =
+        typeof instance.getDerivedStateFromProps !== "function";
+      !noInstanceGetDerivedStateFromProps
+        ? warning(
+            false,
+            "%s: getDerivedStateFromProps() is defined as an instance method " +
+              "and will be ignored. Instead, declare it as a static method.",
+            name
+          )
+        : void 0;
+      var noInstanceGetDerivedStateFromCatch =
+        typeof instance.getDerivedStateFromCatch !== "function";
+      !noInstanceGetDerivedStateFromCatch
+        ? warning(
+            false,
+            "%s: getDerivedStateFromCatch() is defined as an instance method " +
+              "and will be ignored. Instead, declare it as a static method.",
+            name
+          )
+        : void 0;
+      var noStaticGetSnapshotBeforeUpdate =
+        typeof type.getSnapshotBeforeUpdate !== "function";
+      !noStaticGetSnapshotBeforeUpdate
+        ? warning(
+            false,
+            "%s: getSnapshotBeforeUpdate() is defined as a static method " +
+              "and will be ignored. Instead, declare it as an instance method.",
+            name
+          )
+        : void 0;
+      var _state = instance.state;
+      if (_state && (typeof _state !== "object" || isArray(_state))) {
+        warning(false, "%s.state: must be set to an object or null", name);
+      }
+      if (typeof instance.getChildContext === "function") {
+        !(typeof type.childContextTypes === "object")
+          ? warning(
+              false,
+              "%s.getChildContext(): childContextTypes must be defined in order to " +
+                "use getChildContext().",
+              name
+            )
+          : void 0;
+      }
     }
   }
 
@@ -6480,8 +6320,9 @@ var ReactFiberClassComponent = function(
         typeof ctor.getDerivedStateFromProps === "function" &&
         state === null
       ) {
-        var componentName = getComponentName(workInProgress) || "Unknown";
-        if (!didWarnAboutUninitializedState[componentName]) {
+        var componentName = getComponentName(workInProgress) || "Component";
+        if (!didWarnAboutUninitializedState.has(componentName)) {
+          didWarnAboutUninitializedState.add(componentName);
           warning(
             false,
             "%s: Did not properly initialize state during construction. " +
@@ -6489,7 +6330,75 @@ var ReactFiberClassComponent = function(
             componentName,
             instance.state === null ? "null" : "undefined"
           );
-          didWarnAboutUninitializedState[componentName] = true;
+        }
+      }
+
+      // If new component APIs are defined, "unsafe" lifecycles won't be called.
+      // Warn about these lifecycles if they are present.
+      // Don't warn about react-lifecycles-compat polyfilled methods though.
+      if (
+        typeof ctor.getDerivedStateFromProps === "function" ||
+        typeof instance.getSnapshotBeforeUpdate === "function"
+      ) {
+        var foundWillMountName = null;
+        var foundWillReceivePropsName = null;
+        var foundWillUpdateName = null;
+        if (
+          typeof instance.componentWillMount === "function" &&
+          instance.componentWillMount.__suppressDeprecationWarning !== true
+        ) {
+          foundWillMountName = "componentWillMount";
+        } else if (typeof instance.UNSAFE_componentWillMount === "function") {
+          foundWillMountName = "UNSAFE_componentWillMount";
+        }
+        if (
+          typeof instance.componentWillReceiveProps === "function" &&
+          instance.componentWillReceiveProps.__suppressDeprecationWarning !==
+            true
+        ) {
+          foundWillReceivePropsName = "componentWillReceiveProps";
+        } else if (
+          typeof instance.UNSAFE_componentWillReceiveProps === "function"
+        ) {
+          foundWillReceivePropsName = "UNSAFE_componentWillReceiveProps";
+        }
+        if (
+          typeof instance.componentWillUpdate === "function" &&
+          instance.componentWillUpdate.__suppressDeprecationWarning !== true
+        ) {
+          foundWillUpdateName = "componentWillUpdate";
+        } else if (typeof instance.UNSAFE_componentWillUpdate === "function") {
+          foundWillUpdateName = "UNSAFE_componentWillUpdate";
+        }
+        if (
+          foundWillMountName !== null ||
+          foundWillReceivePropsName !== null ||
+          foundWillUpdateName !== null
+        ) {
+          var _componentName = getComponentName(workInProgress) || "Component";
+          var newApiName =
+            typeof ctor.getDerivedStateFromProps === "function"
+              ? "getDerivedStateFromProps()"
+              : "getSnapshotBeforeUpdate()";
+          if (
+            !didWarnAboutLegacyLifecyclesAndDerivedState.has(_componentName)
+          ) {
+            didWarnAboutLegacyLifecyclesAndDerivedState.add(_componentName);
+            warning(
+              false,
+              "Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n" +
+                "%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n" +
+                "The above lifecycles should be removed. Learn more about this warning here:\n" +
+                "https://fb.me/react-async-component-lifecycle-hooks",
+              _componentName,
+              newApiName,
+              foundWillMountName !== null ? "\n  " + foundWillMountName : "",
+              foundWillReceivePropsName !== null
+                ? "\n  " + foundWillReceivePropsName
+                : "",
+              foundWillUpdateName !== null ? "\n  " + foundWillUpdateName : ""
+            );
+          }
         }
       }
     }
@@ -6499,7 +6408,8 @@ var ReactFiberClassComponent = function(
     var partialState = callGetDerivedStateFromProps(
       workInProgress,
       instance,
-      props
+      props,
+      state
     );
 
     if (partialState !== null && partialState !== undefined) {
@@ -6542,7 +6452,7 @@ var ReactFiberClassComponent = function(
           "%s.componentWillMount(): Assigning directly to this.state is " +
             "deprecated (except inside a component's " +
             "constructor). Use setState instead.",
-          getComponentName(workInProgress)
+          getComponentName(workInProgress) || "Component"
         );
       }
       updater.enqueueReplaceState(instance, instance.state, null);
@@ -6568,7 +6478,8 @@ var ReactFiberClassComponent = function(
     if (instance.state !== oldState) {
       {
         var componentName = getComponentName(workInProgress) || "Component";
-        if (!didWarnAboutStateAssignmentForComponent[componentName]) {
+        if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
+          didWarnAboutStateAssignmentForComponent.add(componentName);
           warning(
             false,
             "%s.componentWillReceiveProps(): Assigning directly to " +
@@ -6576,69 +6487,47 @@ var ReactFiberClassComponent = function(
               "constructor). Use setState instead.",
             componentName
           );
-          didWarnAboutStateAssignmentForComponent[componentName] = true;
         }
       }
       updater.enqueueReplaceState(instance, instance.state, null);
     }
   }
 
-  function callGetDerivedStateFromProps(workInProgress, instance, props) {
+  function callGetDerivedStateFromProps(
+    workInProgress,
+    instance,
+    nextProps,
+    prevState
+  ) {
     var type = workInProgress.type;
 
     if (typeof type.getDerivedStateFromProps === "function") {
-      {
-        // Don't warn about react-lifecycles-compat polyfilled components
-        if (
-          (typeof instance.componentWillReceiveProps === "function" &&
-            instance.componentWillReceiveProps.__suppressDeprecationWarning !==
-              true) ||
-          typeof instance.UNSAFE_componentWillReceiveProps === "function"
-        ) {
-          var componentName = getComponentName(workInProgress) || "Unknown";
-          if (!didWarnAboutWillReceivePropsAndDerivedState[componentName]) {
-            warning(
-              false,
-              "%s: Defines both componentWillReceiveProps() and static " +
-                "getDerivedStateFromProps() methods. We recommend using " +
-                "only getDerivedStateFromProps().",
-              componentName
-            );
-            didWarnAboutWillReceivePropsAndDerivedState[componentName] = true;
-          }
-        }
-      }
-
       if (
         debugRenderPhaseSideEffects ||
         (debugRenderPhaseSideEffectsForStrictMode &&
           workInProgress.mode & StrictMode)
       ) {
         // Invoke method an extra time to help detect side-effects.
-        type.getDerivedStateFromProps.call(
-          null,
-          props,
-          workInProgress.memoizedState
-        );
+        type.getDerivedStateFromProps.call(null, nextProps, prevState);
       }
 
       var partialState = type.getDerivedStateFromProps.call(
         null,
-        props,
-        workInProgress.memoizedState
+        nextProps,
+        prevState
       );
 
       {
         if (partialState === undefined) {
-          var _componentName = getComponentName(workInProgress) || "Unknown";
-          if (!didWarnAboutUndefinedDerivedState[_componentName]) {
+          var componentName = getComponentName(workInProgress) || "Component";
+          if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
+            didWarnAboutUndefinedDerivedState.add(componentName);
             warning(
               false,
               "%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. " +
                 "You have returned undefined.",
-              _componentName
+              componentName
             );
-            didWarnAboutUndefinedDerivedState[_componentName] = _componentName;
           }
         }
       }
@@ -6682,11 +6571,12 @@ var ReactFiberClassComponent = function(
     }
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      typeof ctor.getDerivedStateFromProps !== "function" &&
+      typeof instance.getSnapshotBeforeUpdate !== "function" &&
       (typeof instance.UNSAFE_componentWillMount === "function" ||
-        typeof instance.componentWillMount === "function") &&
-      typeof ctor.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillMount === "function")
     ) {
       callComponentWillMount(workInProgress, instance);
       // If we had additional state updates during this life-cycle, let's
@@ -6719,16 +6609,20 @@ var ReactFiberClassComponent = function(
     var newUnmaskedContext = getUnmaskedContext(workInProgress);
     var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
+    var hasNewLifecycles =
+      typeof ctor.getDerivedStateFromProps === "function" ||
+      typeof instance.getSnapshotBeforeUpdate === "function";
+
     // Note: During these life-cycles, instance.props/instance.state are what
     // ever the previously attempted to render - not the "current". However,
     // during componentDidUpdate we pass the "current" props.
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      !hasNewLifecycles &&
       (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function") &&
-      typeof ctor.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillReceiveProps === "function")
     ) {
       if (oldProps !== newProps || oldContext !== newContext) {
         callComponentWillReceiveProps(
@@ -6740,15 +6634,6 @@ var ReactFiberClassComponent = function(
       }
     }
 
-    var derivedStateFromProps = void 0;
-    if (oldProps !== newProps) {
-      derivedStateFromProps = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps
-      );
-    }
-
     // Compute the next state using the memoized state and the update queue.
     var oldState = workInProgress.memoizedState;
     // TODO: Previous state can be null.
@@ -6785,6 +6670,18 @@ var ReactFiberClassComponent = function(
       newState = oldState;
     }
 
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      // The prevState parameter should be the partially updated state.
+      // Otherwise, spreading state in return values could override updates.
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps,
+        newState
+      );
+    }
+
     if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
       // So that multiple render passes do not enqueue multiple updates.
@@ -6793,6 +6690,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromProps
           : Object.assign({}, newState, derivedStateFromProps);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue = workInProgress.updateQueue;
+      if (_updateQueue !== null) {
+        _updateQueue.baseState = Object.assign(
+          {},
+          _updateQueue.baseState,
+          derivedStateFromProps
+        );
+      }
     }
     if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
@@ -6802,6 +6710,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromCatch
           : Object.assign({}, newState, derivedStateFromCatch);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue2 = workInProgress.updateQueue;
+      if (_updateQueue2 !== null) {
+        _updateQueue2.baseState = Object.assign(
+          {},
+          _updateQueue2.baseState,
+          derivedStateFromCatch
+        );
+      }
     }
 
     if (
@@ -6832,22 +6751,22 @@ var ReactFiberClassComponent = function(
 
     if (shouldUpdate) {
       // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      // Unsafe lifecycles should not be invoked for components using the new APIs.
       if (
-        (typeof instance.UNSAFE_componentWillUpdate === "function" ||
-          typeof instance.componentWillUpdate === "function") &&
-        typeof ctor.getDerivedStateFromProps !== "function"
+        !hasNewLifecycles &&
+        (typeof instance.UNSAFE_componentWillMount === "function" ||
+          typeof instance.componentWillMount === "function")
       ) {
-        startPhaseTimer(workInProgress, "componentWillUpdate");
-        if (typeof instance.componentWillUpdate === "function") {
-          instance.componentWillUpdate(newProps, newState, newContext);
+        startPhaseTimer(workInProgress, "componentWillMount");
+        if (typeof instance.componentWillMount === "function") {
+          instance.componentWillMount();
         }
-        if (typeof instance.UNSAFE_componentWillUpdate === "function") {
-          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
+        if (typeof instance.UNSAFE_componentWillMount === "function") {
+          instance.UNSAFE_componentWillMount();
         }
         stopPhaseTimer();
       }
-      if (typeof instance.componentDidUpdate === "function") {
+      if (typeof instance.componentDidMount === "function") {
         workInProgress.effectTag |= Update;
       }
     } else {
@@ -6884,16 +6803,20 @@ var ReactFiberClassComponent = function(
     var newUnmaskedContext = getUnmaskedContext(workInProgress);
     var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
+    var hasNewLifecycles =
+      typeof ctor.getDerivedStateFromProps === "function" ||
+      typeof instance.getSnapshotBeforeUpdate === "function";
+
     // Note: During these life-cycles, instance.props/instance.state are what
     // ever the previously attempted to render - not the "current". However,
     // during componentDidUpdate we pass the "current" props.
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      !hasNewLifecycles &&
       (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function") &&
-      typeof ctor.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillReceiveProps === "function")
     ) {
       if (oldProps !== newProps || oldContext !== newContext) {
         callComponentWillReceiveProps(
@@ -6905,20 +6828,12 @@ var ReactFiberClassComponent = function(
       }
     }
 
-    var derivedStateFromProps = void 0;
-    if (oldProps !== newProps) {
-      derivedStateFromProps = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps
-      );
-    }
-
     // Compute the next state using the memoized state and the update queue.
     var oldState = workInProgress.memoizedState;
     // TODO: Previous state can be null.
     var newState = void 0;
     var derivedStateFromCatch = void 0;
+
     if (workInProgress.updateQueue !== null) {
       newState = processUpdateQueue(
         current,
@@ -6950,6 +6865,18 @@ var ReactFiberClassComponent = function(
       newState = oldState;
     }
 
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      // The prevState parameter should be the partially updated state.
+      // Otherwise, spreading state in return values could override updates.
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps,
+        newState
+      );
+    }
+
     if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
       // So that multiple render passes do not enqueue multiple updates.
@@ -6958,6 +6885,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromProps
           : Object.assign({}, newState, derivedStateFromProps);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue3 = workInProgress.updateQueue;
+      if (_updateQueue3 !== null) {
+        _updateQueue3.baseState = Object.assign(
+          {},
+          _updateQueue3.baseState,
+          derivedStateFromProps
+        );
+      }
     }
     if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
@@ -6967,6 +6905,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromCatch
           : Object.assign({}, newState, derivedStateFromCatch);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue4 = workInProgress.updateQueue;
+      if (_updateQueue4 !== null) {
+        _updateQueue4.baseState = Object.assign(
+          {},
+          _updateQueue4.baseState,
+          derivedStateFromCatch
+        );
+      }
     }
 
     if (
@@ -6988,6 +6937,14 @@ var ReactFiberClassComponent = function(
           workInProgress.effectTag |= Update;
         }
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Snapshot;
+        }
+      }
       return false;
     }
 
@@ -7002,11 +6959,11 @@ var ReactFiberClassComponent = function(
 
     if (shouldUpdate) {
       // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      // Unsafe lifecycles should not be invoked for components using the new APIs.
       if (
+        !hasNewLifecycles &&
         (typeof instance.UNSAFE_componentWillUpdate === "function" ||
-          typeof instance.componentWillUpdate === "function") &&
-        typeof ctor.getDerivedStateFromProps !== "function"
+          typeof instance.componentWillUpdate === "function")
       ) {
         startPhaseTimer(workInProgress, "componentWillUpdate");
         if (typeof instance.componentWillUpdate === "function") {
@@ -7020,6 +6977,9 @@ var ReactFiberClassComponent = function(
       if (typeof instance.componentDidUpdate === "function") {
         workInProgress.effectTag |= Update;
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        workInProgress.effectTag |= Snapshot;
+      }
     } else {
       // If an update was already in progress, we should schedule an Update
       // effect even though we're bailing out, so that cWU/cDU are called.
@@ -7031,6 +6991,14 @@ var ReactFiberClassComponent = function(
           workInProgress.effectTag |= Update;
         }
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Snapshot;
+        }
+      }
 
       // If shouldComponentUpdate returned false, we should still update the
       // memoized props/state to indicate that this work can be reused.
@@ -7870,13 +7838,15 @@ function ChildReconciler(shouldTrackSideEffects) {
       if (typeof newChildrenIterable.entries === "function") {
         var possibleMap = newChildrenIterable;
         if (possibleMap.entries === iteratorFn) {
-          warning(
-            didWarnAboutMaps,
-            "Using Maps as children is unsupported and will likely yield " +
-              "unexpected results. Convert it to a sequence/iterable of keyed " +
-              "ReactElements instead.%s",
-            getCurrentFiberStackAddendum$1()
-          );
+          !didWarnAboutMaps
+            ? warning(
+                false,
+                "Using Maps as children is unsupported and will likely yield " +
+                  "unexpected results. Convert it to a sequence/iterable of keyed " +
+                  "ReactElements instead.%s",
+                getCurrentFiberStackAddendum$1()
+              )
+            : void 0;
           didWarnAboutMaps = true;
         }
       }
@@ -8318,71 +8288,6 @@ function cloneChildFibers(current, workInProgress) {
   newChild.sibling = null;
 }
 
-var changedBitsStack = [];
-var currentValueStack = [];
-var stack = [];
-var index$1 = -1;
-
-var rendererSigil = void 0;
-{
-  // Use this to detect multiple renderers using the same context
-  rendererSigil = {};
-}
-
-function pushProvider(providerFiber) {
-  var context = providerFiber.type.context;
-  index$1 += 1;
-  changedBitsStack[index$1] = context._changedBits;
-  currentValueStack[index$1] = context._currentValue;
-  stack[index$1] = providerFiber;
-  context._currentValue = providerFiber.pendingProps.value;
-  context._changedBits = providerFiber.stateNode;
-
-  {
-    warning(
-      context._currentRenderer === null ||
-        context._currentRenderer === rendererSigil,
-      "Detected multiple renderers concurrently rendering the " +
-        "same context provider. This is currently unsupported."
-    );
-    context._currentRenderer = rendererSigil;
-  }
-}
-
-function popProvider(providerFiber) {
-  {
-    warning(
-      index$1 > -1 && providerFiber === stack[index$1],
-      "Unexpected pop."
-    );
-  }
-  var changedBits = changedBitsStack[index$1];
-  var currentValue = currentValueStack[index$1];
-  changedBitsStack[index$1] = null;
-  currentValueStack[index$1] = null;
-  stack[index$1] = null;
-  index$1 -= 1;
-  var context = providerFiber.type.context;
-  context._currentValue = currentValue;
-  context._changedBits = changedBits;
-}
-
-function resetProviderStack() {
-  for (var i = index$1; i > -1; i--) {
-    var providerFiber = stack[i];
-    var context = providerFiber.type.context;
-    context._currentValue = context._defaultValue;
-    context._changedBits = 0;
-    changedBitsStack[i] = null;
-    currentValueStack[i] = null;
-    stack[i] = null;
-    {
-      context._currentRenderer = null;
-    }
-  }
-  index$1 = -1;
-}
-
 var didWarnAboutBadClass = void 0;
 var didWarnAboutGetDerivedStateOnFunctionalComponent = void 0;
 var didWarnAboutStatelessRefs = void 0;
@@ -8396,6 +8301,8 @@ var didWarnAboutStatelessRefs = void 0;
 var ReactFiberBeginWork = function(
   config,
   hostContext,
+  legacyContext,
+  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
@@ -8404,12 +8311,20 @@ var ReactFiberBeginWork = function(
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree;
   var pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer;
+  var pushProvider = newContext.pushProvider;
+  var getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    hasLegacyContextChanged = legacyContext.hasContextChanged,
+    pushLegacyContextProvider = legacyContext.pushContextProvider,
+    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
+    invalidateContextProvider = legacyContext.invalidateContextProvider;
   var enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
 
   var _ReactFiberClassCompo = ReactFiberClassComponent(
+      legacyContext,
       scheduleWork,
       computeExpirationForFiber,
       memoizeProps,
@@ -8467,9 +8382,17 @@ var ReactFiberBeginWork = function(
     }
   }
 
+  function updateForwardRef(current, workInProgress) {
+    var render = workInProgress.type.render;
+    var nextChildren = render(workInProgress.pendingProps, workInProgress.ref);
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextChildren);
+    return workInProgress.child;
+  }
+
   function updateFragment(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextChildren) {
@@ -8482,7 +8405,7 @@ var ReactFiberBeginWork = function(
 
   function updateMode(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps.children;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (
@@ -8511,7 +8434,7 @@ var ReactFiberBeginWork = function(
     var fn = workInProgress.type;
     var nextProps = workInProgress.pendingProps;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else {
@@ -8544,7 +8467,7 @@ var ReactFiberBeginWork = function(
     // Push context providers early to prevent context stack mismatches.
     // During mounting we don't know the child context yet as the instance doesn't exist.
     // We will invalidate the child context in finishClassComponent() right after rendering.
-    var hasContext = pushContextProvider(workInProgress);
+    var hasContext = pushLegacyContextProvider(workInProgress);
     var shouldUpdate = void 0;
     if (current === null) {
       if (workInProgress.stateNode === null) {
@@ -8769,7 +8692,7 @@ var ReactFiberBeginWork = function(
     var nextProps = workInProgress.pendingProps;
     var prevProps = current !== null ? current.memoizedProps : null;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (memoizedProps === nextProps) {
@@ -8889,7 +8812,8 @@ var ReactFiberBeginWork = function(
         var partialState = callGetDerivedStateFromProps(
           workInProgress,
           value,
-          props
+          props,
+          workInProgress.memoizedState
         );
 
         if (partialState !== null && partialState !== undefined) {
@@ -8904,7 +8828,7 @@ var ReactFiberBeginWork = function(
       // Push context providers early to prevent context stack mismatches.
       // During mounting we don't know the child context yet as the instance doesn't exist.
       // We will invalidate the child context in finishClassComponent() right after rendering.
-      var hasContext = pushContextProvider(workInProgress);
+      var hasContext = pushLegacyContextProvider(workInProgress);
       adoptClassInstance(workInProgress, value);
       mountClassInstance(workInProgress, renderExpirationTime);
       return finishClassComponent(
@@ -8922,11 +8846,13 @@ var ReactFiberBeginWork = function(
         var _Component = workInProgress.type;
 
         if (_Component) {
-          warning(
-            !_Component.childContextTypes,
-            "%s(...): childContextTypes cannot be defined on a functional component.",
-            _Component.displayName || _Component.name || "Component"
-          );
+          !!_Component.childContextTypes
+            ? warning(
+                false,
+                "%s(...): childContextTypes cannot be defined on a functional component.",
+                _Component.displayName || _Component.name || "Component"
+              )
+            : void 0;
         }
         if (workInProgress.ref !== null) {
           var info = "";
@@ -8977,7 +8903,7 @@ var ReactFiberBeginWork = function(
 
   function updateCallComponent(current, workInProgress, renderExpirationTime) {
     var nextProps = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextProps) {
@@ -9020,7 +8946,7 @@ var ReactFiberBeginWork = function(
   ) {
     pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
     var nextChildren = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextChildren) {
@@ -9054,6 +8980,10 @@ var ReactFiberBeginWork = function(
     renderExpirationTime
   ) {
     var fiber = workInProgress.child;
+    if (fiber !== null) {
+      // Set the return pointer of the child to the work-in-progress fiber.
+      fiber["return"] = workInProgress;
+    }
     while (fiber !== null) {
       var nextFiber = void 0;
       // Visit this fiber.
@@ -9141,12 +9071,12 @@ var ReactFiberBeginWork = function(
     renderExpirationTime
   ) {
     var providerType = workInProgress.type;
-    var context = providerType.context;
+    var context = providerType._context;
 
     var newProps = workInProgress.pendingProps;
     var oldProps = workInProgress.memoizedProps;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (oldProps === newProps) {
@@ -9194,12 +9124,14 @@ var ReactFiberBeginWork = function(
               ? context._calculateChangedBits(oldValue, newValue)
               : MAX_SIGNED_31_BIT_INT;
           {
-            warning(
-              (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
-              "calculateChangedBits: Expected the return value to be a " +
-                "31-bit integer. Instead received: %s",
-              changedBits
-            );
+            !((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits)
+              ? warning(
+                  false,
+                  "calculateChangedBits: Expected the return value to be a " +
+                    "31-bit integer. Instead received: %s",
+                  changedBits
+                )
+              : void 0;
           }
           changedBits |= 0;
 
@@ -9242,7 +9174,7 @@ var ReactFiberBeginWork = function(
     var newValue = context._currentValue;
     var changedBits = context._changedBits;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (changedBits === 0 && oldProps === newProps) {
@@ -9267,21 +9199,23 @@ var ReactFiberBeginWork = function(
         changedBits,
         renderExpirationTime
       );
-    } else if (oldProps !== null && oldProps.children === newProps.children) {
-      // No change. Bailout early if children are the same.
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
+    // There is no bailout on `children` equality because we expect people
+    // to often pass a bound method as a child, but it may reference
+    // `this.state` or `this.props` (and thus needs to re-render on `setState`).
 
     var render = newProps.children;
 
     {
-      warning(
-        typeof render === "function",
-        "A context consumer was rendered with multiple children, or a child " +
-          "that isn't a function. A context consumer expects a single child " +
-          "that is a function. If you did pass a function, make sure there " +
-          "is no trailing or leading whitespace around it."
-      );
+      !(typeof render === "function")
+        ? warning(
+            false,
+            "A context consumer was rendered with multiple children, or a child " +
+              "that isn't a function. A context consumer expects a single child " +
+              "that is a function. If you did pass a function, make sure there " +
+              "is no trailing or leading whitespace around it."
+          )
+        : void 0;
     }
 
     var newChildren = render(newValue);
@@ -9339,7 +9273,7 @@ var ReactFiberBeginWork = function(
         pushHostRootContext(workInProgress);
         break;
       case ClassComponent:
-        pushContextProvider(workInProgress);
+        pushLegacyContextProvider(workInProgress);
         break;
       case HostPortal:
         pushHostContainer(
@@ -9420,6 +9354,8 @@ var ReactFiberBeginWork = function(
           workInProgress,
           renderExpirationTime
         );
+      case ForwardRef:
+        return updateForwardRef(current, workInProgress);
       case Fragment:
         return updateFragment(current, workInProgress);
       case Mode:
@@ -9450,7 +9386,13 @@ var ReactFiberBeginWork = function(
   };
 };
 
-var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
+var ReactFiberCompleteWork = function(
+  config,
+  hostContext,
+  legacyContext,
+  newContext,
+  hydrationContext
+) {
   var createInstance = config.createInstance,
     createTextInstance = config.createTextInstance,
     appendInitialChild = config.appendInitialChild,
@@ -9462,6 +9404,9 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer;
+  var popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
+  var popProvider = newContext.popProvider;
   var prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -9777,7 +9722,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
         return null;
       case ClassComponent: {
         // We are leaving this subtree, so pop context if any.
-        popContextProvider(workInProgress);
+        popLegacyContextProvider(workInProgress);
 
         // If this component caught an error, schedule an error log effect.
         var instance = workInProgress.stateNode;
@@ -9796,7 +9741,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
       }
       case HostRoot: {
         popHostContainer(workInProgress);
-        popTopLevelContextObject(workInProgress);
+        popTopLevelLegacyContextObject(workInProgress);
         var fiberRoot = workInProgress.stateNode;
         if (fiberRoot.pendingContext) {
           fiberRoot.context = fiberRoot.pendingContext;
@@ -9972,6 +9917,8 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
       case ReturnComponent:
         // Does nothing.
         return null;
+      case ForwardRef:
+        return null;
       case Fragment:
         return null;
       case Mode:
@@ -10021,11 +9968,16 @@ function createCapturedValue(value, source) {
 
 var ReactFiberUnwindWork = function(
   hostContext,
+  legacyContext,
+  newContext,
   scheduleWork,
   isAlreadyFailedLegacyErrorBoundary
 ) {
   var popHostContainer = hostContext.popHostContainer,
     popHostContext = hostContext.popHostContext;
+  var popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
+  var popProvider = newContext.popProvider;
 
   function throwException(returnFiber, sourceFiber, rawValue) {
     // The source fiber did not complete.
@@ -10081,7 +10033,7 @@ var ReactFiberUnwindWork = function(
   function unwindWork(workInProgress) {
     switch (workInProgress.tag) {
       case ClassComponent: {
-        popContextProvider(workInProgress);
+        popLegacyContextProvider(workInProgress);
         var effectTag = workInProgress.effectTag;
         if (effectTag & ShouldCapture) {
           workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
@@ -10091,7 +10043,7 @@ var ReactFiberUnwindWork = function(
       }
       case HostRoot: {
         popHostContainer(workInProgress);
-        popTopLevelContextObject(workInProgress);
+        popTopLevelLegacyContextObject(workInProgress);
         var _effectTag = workInProgress.effectTag;
         if (_effectTag & ShouldCapture) {
           workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
@@ -10113,9 +10065,37 @@ var ReactFiberUnwindWork = function(
         return null;
     }
   }
+
+  function unwindInterruptedWork(interruptedWork) {
+    switch (interruptedWork.tag) {
+      case ClassComponent: {
+        popLegacyContextProvider(interruptedWork);
+        break;
+      }
+      case HostRoot: {
+        popHostContainer(interruptedWork);
+        popTopLevelLegacyContextObject(interruptedWork);
+        break;
+      }
+      case HostComponent: {
+        popHostContext(interruptedWork);
+        break;
+      }
+      case HostPortal:
+        popHostContainer(interruptedWork);
+        break;
+      case ContextProvider:
+        popProvider(interruptedWork);
+        break;
+      default:
+        break;
+    }
+  }
+
   return {
     throwException: throwException,
-    unwindWork: unwindWork
+    unwindWork: unwindWork,
+    unwindInterruptedWork: unwindInterruptedWork
   };
 };
 
@@ -10190,8 +10170,13 @@ var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
 var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
 
-function logError(boundary, errorInfo) {
-  var source = errorInfo.source;
+var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
+{
+  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
+}
+
+function logError(boundary, errorInfo) {
+  var source = errorInfo.source;
   var stack = errorInfo.stack;
   if (stack === null) {
     stack = getStackAddendumByWorkInProgressFiber(source);
@@ -10199,21 +10184,19 @@ function logError(boundary, errorInfo) {
 
   var capturedError = {
     componentName: source !== null ? getComponentName(source) : null,
-    error: errorInfo.value,
-    errorBoundary: boundary,
     componentStack: stack !== null ? stack : "",
+    error: errorInfo.value,
+    errorBoundary: null,
     errorBoundaryName: null,
     errorBoundaryFound: false,
     willRetry: false
   };
 
-  if (boundary !== null) {
+  if (boundary !== null && boundary.tag === ClassComponent) {
+    capturedError.errorBoundary = boundary.stateNode;
     capturedError.errorBoundaryName = getComponentName(boundary);
-    capturedError.errorBoundaryFound = capturedError.willRetry =
-      boundary.tag === ClassComponent;
-  } else {
-    capturedError.errorBoundaryName = null;
-    capturedError.errorBoundaryFound = capturedError.willRetry = false;
+    capturedError.errorBoundaryFound = true;
+    capturedError.willRetry = true;
   }
 
   try {
@@ -10277,7 +10260,59 @@ var ReactFiberCommitWork = function(
           }
         }
       } else {
-        ref.value = null;
+        ref.current = null;
+      }
+    }
+  }
+
+  function commitBeforeMutationLifeCycles(current, finishedWork) {
+    switch (finishedWork.tag) {
+      case ClassComponent: {
+        if (finishedWork.effectTag & Snapshot) {
+          if (current !== null) {
+            var prevProps = current.memoizedProps;
+            var prevState = current.memoizedState;
+            startPhaseTimer(finishedWork, "getSnapshotBeforeUpdate");
+            var _instance = finishedWork.stateNode;
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            var snapshot = _instance.getSnapshotBeforeUpdate(
+              prevProps,
+              prevState
+            );
+            {
+              var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
+              if (
+                snapshot === undefined &&
+                !didWarnSet.has(finishedWork.type)
+              ) {
+                didWarnSet.add(finishedWork.type);
+                warning(
+                  false,
+                  "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
+                    "must be returned. You have returned undefined.",
+                  getComponentName(finishedWork)
+                );
+              }
+            }
+            _instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+            stopPhaseTimer();
+          }
+        }
+        return;
+      }
+      case HostRoot:
+      case HostComponent:
+      case HostText:
+      case HostPortal:
+        // Nothing to do for these component types
+        return;
+      default: {
+        invariant(
+          false,
+          "This unit of work tag should not have side-effects. This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
       }
     }
   }
@@ -10291,50 +10326,54 @@ var ReactFiberCommitWork = function(
   ) {
     switch (finishedWork.tag) {
       case ClassComponent: {
-        var _instance = finishedWork.stateNode;
+        var _instance2 = finishedWork.stateNode;
         if (finishedWork.effectTag & Update) {
           if (current === null) {
             startPhaseTimer(finishedWork, "componentDidMount");
-            _instance.props = finishedWork.memoizedProps;
-            _instance.state = finishedWork.memoizedState;
-            _instance.componentDidMount();
+            _instance2.props = finishedWork.memoizedProps;
+            _instance2.state = finishedWork.memoizedState;
+            _instance2.componentDidMount();
             stopPhaseTimer();
           } else {
             var prevProps = current.memoizedProps;
             var prevState = current.memoizedState;
             startPhaseTimer(finishedWork, "componentDidUpdate");
-            _instance.props = finishedWork.memoizedProps;
-            _instance.state = finishedWork.memoizedState;
-            _instance.componentDidUpdate(prevProps, prevState);
+            _instance2.props = finishedWork.memoizedProps;
+            _instance2.state = finishedWork.memoizedState;
+            _instance2.componentDidUpdate(
+              prevProps,
+              prevState,
+              _instance2.__reactInternalSnapshotBeforeUpdate
+            );
             stopPhaseTimer();
           }
         }
         var updateQueue = finishedWork.updateQueue;
         if (updateQueue !== null) {
-          commitCallbacks(updateQueue, _instance);
+          commitCallbacks(updateQueue, _instance2);
         }
         return;
       }
       case HostRoot: {
         var _updateQueue = finishedWork.updateQueue;
         if (_updateQueue !== null) {
-          var _instance2 = null;
+          var _instance3 = null;
           if (finishedWork.child !== null) {
             switch (finishedWork.child.tag) {
               case HostComponent:
-                _instance2 = getPublicInstance(finishedWork.child.stateNode);
+                _instance3 = getPublicInstance(finishedWork.child.stateNode);
                 break;
               case ClassComponent:
-                _instance2 = finishedWork.child.stateNode;
+                _instance3 = finishedWork.child.stateNode;
                 break;
             }
           }
-          commitCallbacks(_updateQueue, _instance2);
+          commitCallbacks(_updateQueue, _instance3);
         }
         return;
       }
       case HostComponent: {
-        var _instance3 = finishedWork.stateNode;
+        var _instance4 = finishedWork.stateNode;
 
         // Renderers may schedule work to be done after host components are mounted
         // (eg DOM renderer may schedule auto-focus for inputs and form controls).
@@ -10343,7 +10382,7 @@ var ReactFiberCommitWork = function(
         if (current === null && finishedWork.effectTag & Update) {
           var type = finishedWork.type;
           var props = finishedWork.memoizedProps;
-          commitMount(_instance3, type, props, finishedWork);
+          commitMount(_instance4, type, props, finishedWork);
         }
 
         return;
@@ -10371,7 +10410,7 @@ var ReactFiberCommitWork = function(
       case ClassComponent:
         {
           var ctor = finishedWork.type;
-          var _instance4 = finishedWork.stateNode;
+          var _instance5 = finishedWork.stateNode;
           var updateQueue = finishedWork.updateQueue;
           invariant(
             updateQueue !== null && updateQueue.capturedValues !== null,
@@ -10388,16 +10427,19 @@ var ReactFiberCommitWork = function(
             // This gets reset before we yield back to the browser.
             // TODO: Warn in strict mode if getDerivedStateFromCatch is
             // not defined.
-            markLegacyErrorBoundaryAsFailed(_instance4);
+            markLegacyErrorBoundaryAsFailed(_instance5);
           }
 
-          _instance4.props = finishedWork.memoizedProps;
-          _instance4.state = finishedWork.memoizedState;
+          _instance5.props = finishedWork.memoizedProps;
+          _instance5.state = finishedWork.memoizedState;
           for (var i = 0; i < capturedErrors.length; i++) {
             var errorInfo = capturedErrors[i];
             var _error = errorInfo.value;
+            var stack = errorInfo.stack;
             logError(finishedWork, errorInfo);
-            _instance4.componentDidCatch(_error);
+            _instance5.componentDidCatch(_error, {
+              componentStack: stack !== null ? stack : ""
+            });
           }
         }
         break;
@@ -10430,19 +10472,31 @@ var ReactFiberCommitWork = function(
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (ref !== null) {
-      var _instance5 = finishedWork.stateNode;
+      var _instance6 = finishedWork.stateNode;
       var instanceToUse = void 0;
       switch (finishedWork.tag) {
         case HostComponent:
-          instanceToUse = getPublicInstance(_instance5);
+          instanceToUse = getPublicInstance(_instance6);
           break;
         default:
-          instanceToUse = _instance5;
+          instanceToUse = _instance6;
       }
       if (typeof ref === "function") {
         ref(instanceToUse);
       } else {
-        ref.value = instanceToUse;
+        {
+          if (!ref.hasOwnProperty("current")) {
+            warning(
+              false,
+              "Unexpected ref object provided for %s. " +
+                "Use either a ref-setter function or React.createRef().%s",
+              getComponentName(finishedWork),
+              getStackAddendumByWorkInProgressFiber(finishedWork)
+            );
+          }
+        }
+
+        ref.current = instanceToUse;
       }
     }
   }
@@ -10453,7 +10507,7 @@ var ReactFiberCommitWork = function(
       if (typeof currentRef === "function") {
         currentRef(null);
       } else {
-        currentRef.value = null;
+        currentRef.current = null;
       }
     }
   }
@@ -10469,9 +10523,9 @@ var ReactFiberCommitWork = function(
     switch (current.tag) {
       case ClassComponent: {
         safelyDetachRef(current);
-        var _instance6 = current.stateNode;
-        if (typeof _instance6.componentWillUnmount === "function") {
-          safelyCallComponentWillUnmount(current, _instance6);
+        var _instance7 = current.stateNode;
+        if (typeof _instance7.componentWillUnmount === "function") {
+          safelyCallComponentWillUnmount(current, _instance7);
         }
         return;
       }
@@ -10608,6 +10662,7 @@ var ReactFiberCommitWork = function(
         },
 
         commitLifeCycles: commitLifeCycles,
+        commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
         commitErrorLogging: commitErrorLogging,
         commitAttachRef: commitAttachRef,
         commitDetachRef: commitDetachRef
@@ -10767,635 +10822,1063 @@ var ReactFiberCommitWork = function(
     }
   }
 
-  function unmountHostComponents(current) {
-    // We only have the top Fiber that was inserted but we need recurse down its
-    var node = current;
+  function unmountHostComponents(current) {
+    // We only have the top Fiber that was inserted but we need recurse down its
+    var node = current;
+
+    // Each iteration, currentParent is populated with node's host parent if not
+    // currentParentIsValid.
+    var currentParentIsValid = false;
+    var currentParent = void 0;
+    var currentParentIsContainer = void 0;
+
+    while (true) {
+      if (!currentParentIsValid) {
+        var parent = node["return"];
+        findParent: while (true) {
+          invariant(
+            parent !== null,
+            "Expected to find a host parent. This error is likely caused by " +
+              "a bug in React. Please file an issue."
+          );
+          switch (parent.tag) {
+            case HostComponent:
+              currentParent = parent.stateNode;
+              currentParentIsContainer = false;
+              break findParent;
+            case HostRoot:
+              currentParent = parent.stateNode.containerInfo;
+              currentParentIsContainer = true;
+              break findParent;
+            case HostPortal:
+              currentParent = parent.stateNode.containerInfo;
+              currentParentIsContainer = true;
+              break findParent;
+          }
+          parent = parent["return"];
+        }
+        currentParentIsValid = true;
+      }
+
+      if (node.tag === HostComponent || node.tag === HostText) {
+        commitNestedUnmounts(node);
+        // After all the children have unmounted, it is now safe to remove the
+        // node from the tree.
+        if (currentParentIsContainer) {
+          removeChildFromContainer(currentParent, node.stateNode);
+        } else {
+          removeChild(currentParent, node.stateNode);
+        }
+        // Don't visit children because we already visited them.
+      } else if (node.tag === HostPortal) {
+        // When we go into a portal, it becomes the parent to remove from.
+        // We will reassign it back when we pop the portal on the way up.
+        currentParent = node.stateNode.containerInfo;
+        // Visit children because portals might contain host components.
+        if (node.child !== null) {
+          node.child["return"] = node;
+          node = node.child;
+          continue;
+        }
+      } else {
+        commitUnmount(node);
+        // Visit children because we may find more host components below.
+        if (node.child !== null) {
+          node.child["return"] = node;
+          node = node.child;
+          continue;
+        }
+      }
+      if (node === current) {
+        return;
+      }
+      while (node.sibling === null) {
+        if (node["return"] === null || node["return"] === current) {
+          return;
+        }
+        node = node["return"];
+        if (node.tag === HostPortal) {
+          // When we go out of the portal, we need to restore the parent.
+          // Since we don't keep a stack of them, we will search for it.
+          currentParentIsValid = false;
+        }
+      }
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
+    }
+  }
+
+  function commitDeletion(current) {
+    // Recursively delete all host nodes from the parent.
+    // Detach refs and call componentWillUnmount() on the whole subtree.
+    unmountHostComponents(current);
+    detachFiber(current);
+  }
+
+  function commitWork(current, finishedWork) {
+    switch (finishedWork.tag) {
+      case ClassComponent: {
+        return;
+      }
+      case HostComponent: {
+        var _instance8 = finishedWork.stateNode;
+        if (_instance8 != null) {
+          // Commit the work prepared earlier.
+          var newProps = finishedWork.memoizedProps;
+          // For hydration we reuse the update path but we treat the oldProps
+          // as the newProps. The updatePayload will contain the real change in
+          // this case.
+          var oldProps = current !== null ? current.memoizedProps : newProps;
+          var type = finishedWork.type;
+          // TODO: Type the updateQueue to be specific to host components.
+          var updatePayload = finishedWork.updateQueue;
+          finishedWork.updateQueue = null;
+          if (updatePayload !== null) {
+            commitUpdate(
+              _instance8,
+              updatePayload,
+              type,
+              oldProps,
+              newProps,
+              finishedWork
+            );
+          }
+        }
+        return;
+      }
+      case HostText: {
+        invariant(
+          finishedWork.stateNode !== null,
+          "This should have a text node initialized. This error is likely " +
+            "caused by a bug in React. Please file an issue."
+        );
+        var textInstance = finishedWork.stateNode;
+        var newText = finishedWork.memoizedProps;
+        // For hydration we reuse the update path but we treat the oldProps
+        // as the newProps. The updatePayload will contain the real change in
+        // this case.
+        var oldText = current !== null ? current.memoizedProps : newText;
+        commitTextUpdate(textInstance, oldText, newText);
+        return;
+      }
+      case HostRoot: {
+        return;
+      }
+      default: {
+        invariant(
+          false,
+          "This unit of work tag should not have side-effects. This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
+      }
+    }
+  }
+
+  function commitResetTextContent(current) {
+    resetTextContent(current.stateNode);
+  }
+
+  if (enableMutatingReconciler) {
+    return {
+      commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
+      commitResetTextContent: commitResetTextContent,
+      commitPlacement: commitPlacement,
+      commitDeletion: commitDeletion,
+      commitWork: commitWork,
+      commitLifeCycles: commitLifeCycles,
+      commitErrorLogging: commitErrorLogging,
+      commitAttachRef: commitAttachRef,
+      commitDetachRef: commitDetachRef
+    };
+  } else {
+    invariant(false, "Mutating reconciler is disabled.");
+  }
+};
+
+var NO_CONTEXT = {};
+
+var ReactFiberHostContext = function(config, stack) {
+  var getChildHostContext = config.getChildHostContext,
+    getRootHostContext = config.getRootHostContext;
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
+
+  var contextStackCursor = createCursor(NO_CONTEXT);
+  var contextFiberStackCursor = createCursor(NO_CONTEXT);
+  var rootInstanceStackCursor = createCursor(NO_CONTEXT);
+
+  function requiredContext(c) {
+    invariant(
+      c !== NO_CONTEXT,
+      "Expected host context to exist. This error is likely caused by a bug " +
+        "in React. Please file an issue."
+    );
+    return c;
+  }
+
+  function getRootHostContainer() {
+    var rootInstance = requiredContext(rootInstanceStackCursor.current);
+    return rootInstance;
+  }
+
+  function pushHostContainer(fiber, nextRootInstance) {
+    // Push current root instance onto the stack;
+    // This allows us to reset root when portals are popped.
+    push(rootInstanceStackCursor, nextRootInstance, fiber);
+    // Track the context and the Fiber that provided it.
+    // This enables us to pop only Fibers that provide unique contexts.
+    push(contextFiberStackCursor, fiber, fiber);
+
+    // Finally, we need to push the host context to the stack.
+    // However, we can't just call getRootHostContext() and push it because
+    // we'd have a different number of entries on the stack depending on
+    // whether getRootHostContext() throws somewhere in renderer code or not.
+    // So we push an empty value first. This lets us safely unwind on errors.
+    push(contextStackCursor, NO_CONTEXT, fiber);
+    var nextRootContext = getRootHostContext(nextRootInstance);
+    // Now that we know this function doesn't throw, replace it.
+    pop(contextStackCursor, fiber);
+    push(contextStackCursor, nextRootContext, fiber);
+  }
+
+  function popHostContainer(fiber) {
+    pop(contextStackCursor, fiber);
+    pop(contextFiberStackCursor, fiber);
+    pop(rootInstanceStackCursor, fiber);
+  }
+
+  function getHostContext() {
+    var context = requiredContext(contextStackCursor.current);
+    return context;
+  }
+
+  function pushHostContext(fiber) {
+    var rootInstance = requiredContext(rootInstanceStackCursor.current);
+    var context = requiredContext(contextStackCursor.current);
+    var nextContext = getChildHostContext(context, fiber.type, rootInstance);
+
+    // Don't push this Fiber's context unless it's unique.
+    if (context === nextContext) {
+      return;
+    }
+
+    // Track the context and the Fiber that provided it.
+    // This enables us to pop only Fibers that provide unique contexts.
+    push(contextFiberStackCursor, fiber, fiber);
+    push(contextStackCursor, nextContext, fiber);
+  }
+
+  function popHostContext(fiber) {
+    // Do not pop unless this Fiber provided the current context.
+    // pushHostContext() only pushes Fibers that provide unique contexts.
+    if (contextFiberStackCursor.current !== fiber) {
+      return;
+    }
+
+    pop(contextStackCursor, fiber);
+    pop(contextFiberStackCursor, fiber);
+  }
+
+  return {
+    getHostContext: getHostContext,
+    getRootHostContainer: getRootHostContainer,
+    popHostContainer: popHostContainer,
+    popHostContext: popHostContext,
+    pushHostContainer: pushHostContainer,
+    pushHostContext: pushHostContext
+  };
+};
+
+var ReactFiberHydrationContext = function(config) {
+  var shouldSetTextContent = config.shouldSetTextContent,
+    hydration = config.hydration;
+
+  // If this doesn't have hydration mode.
+
+  if (!hydration) {
+    return {
+      enterHydrationState: function() {
+        return false;
+      },
+      resetHydrationState: function() {},
+      tryToClaimNextHydratableInstance: function() {},
+      prepareToHydrateHostInstance: function() {
+        invariant(
+          false,
+          "Expected prepareToHydrateHostInstance() to never be called. " +
+            "This error is likely caused by a bug in React. Please file an issue."
+        );
+      },
+      prepareToHydrateHostTextInstance: function() {
+        invariant(
+          false,
+          "Expected prepareToHydrateHostTextInstance() to never be called. " +
+            "This error is likely caused by a bug in React. Please file an issue."
+        );
+      },
+      popHydrationState: function(fiber) {
+        return false;
+      }
+    };
+  }
+
+  var canHydrateInstance = hydration.canHydrateInstance,
+    canHydrateTextInstance = hydration.canHydrateTextInstance,
+    getNextHydratableSibling = hydration.getNextHydratableSibling,
+    getFirstHydratableChild = hydration.getFirstHydratableChild,
+    hydrateInstance = hydration.hydrateInstance,
+    hydrateTextInstance = hydration.hydrateTextInstance,
+    didNotMatchHydratedContainerTextInstance =
+      hydration.didNotMatchHydratedContainerTextInstance,
+    didNotMatchHydratedTextInstance = hydration.didNotMatchHydratedTextInstance,
+    didNotHydrateContainerInstance = hydration.didNotHydrateContainerInstance,
+    didNotHydrateInstance = hydration.didNotHydrateInstance,
+    didNotFindHydratableContainerInstance =
+      hydration.didNotFindHydratableContainerInstance,
+    didNotFindHydratableContainerTextInstance =
+      hydration.didNotFindHydratableContainerTextInstance,
+    didNotFindHydratableInstance = hydration.didNotFindHydratableInstance,
+    didNotFindHydratableTextInstance =
+      hydration.didNotFindHydratableTextInstance;
+
+  // The deepest Fiber on the stack involved in a hydration context.
+  // This may have been an insertion or a hydration.
+
+  var hydrationParentFiber = null;
+  var nextHydratableInstance = null;
+  var isHydrating = false;
+
+  function enterHydrationState(fiber) {
+    var parentInstance = fiber.stateNode.containerInfo;
+    nextHydratableInstance = getFirstHydratableChild(parentInstance);
+    hydrationParentFiber = fiber;
+    isHydrating = true;
+    return true;
+  }
+
+  function deleteHydratableInstance(returnFiber, instance) {
+    {
+      switch (returnFiber.tag) {
+        case HostRoot:
+          didNotHydrateContainerInstance(
+            returnFiber.stateNode.containerInfo,
+            instance
+          );
+          break;
+        case HostComponent:
+          didNotHydrateInstance(
+            returnFiber.type,
+            returnFiber.memoizedProps,
+            returnFiber.stateNode,
+            instance
+          );
+          break;
+      }
+    }
+
+    var childToDelete = createFiberFromHostInstanceForDeletion();
+    childToDelete.stateNode = instance;
+    childToDelete["return"] = returnFiber;
+    childToDelete.effectTag = Deletion;
+
+    // This might seem like it belongs on progressedFirstDeletion. However,
+    // these children are not part of the reconciliation list of children.
+    // Even if we abort and rereconcile the children, that will try to hydrate
+    // again and the nodes are still in the host tree so these will be
+    // recreated.
+    if (returnFiber.lastEffect !== null) {
+      returnFiber.lastEffect.nextEffect = childToDelete;
+      returnFiber.lastEffect = childToDelete;
+    } else {
+      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+    }
+  }
+
+  function insertNonHydratedInstance(returnFiber, fiber) {
+    fiber.effectTag |= Placement;
+    {
+      switch (returnFiber.tag) {
+        case HostRoot: {
+          var parentContainer = returnFiber.stateNode.containerInfo;
+          switch (fiber.tag) {
+            case HostComponent:
+              var type = fiber.type;
+              var props = fiber.pendingProps;
+              didNotFindHydratableContainerInstance(
+                parentContainer,
+                type,
+                props
+              );
+              break;
+            case HostText:
+              var text = fiber.pendingProps;
+              didNotFindHydratableContainerTextInstance(parentContainer, text);
+              break;
+          }
+          break;
+        }
+        case HostComponent: {
+          var parentType = returnFiber.type;
+          var parentProps = returnFiber.memoizedProps;
+          var parentInstance = returnFiber.stateNode;
+          switch (fiber.tag) {
+            case HostComponent:
+              var _type = fiber.type;
+              var _props = fiber.pendingProps;
+              didNotFindHydratableInstance(
+                parentType,
+                parentProps,
+                parentInstance,
+                _type,
+                _props
+              );
+              break;
+            case HostText:
+              var _text = fiber.pendingProps;
+              didNotFindHydratableTextInstance(
+                parentType,
+                parentProps,
+                parentInstance,
+                _text
+              );
+              break;
+          }
+          break;
+        }
+        default:
+          return;
+      }
+    }
+  }
+
+  function tryHydrate(fiber, nextInstance) {
+    switch (fiber.tag) {
+      case HostComponent: {
+        var type = fiber.type;
+        var props = fiber.pendingProps;
+        var instance = canHydrateInstance(nextInstance, type, props);
+        if (instance !== null) {
+          fiber.stateNode = instance;
+          return true;
+        }
+        return false;
+      }
+      case HostText: {
+        var text = fiber.pendingProps;
+        var textInstance = canHydrateTextInstance(nextInstance, text);
+        if (textInstance !== null) {
+          fiber.stateNode = textInstance;
+          return true;
+        }
+        return false;
+      }
+      default:
+        return false;
+    }
+  }
+
+  function tryToClaimNextHydratableInstance(fiber) {
+    if (!isHydrating) {
+      return;
+    }
+    var nextInstance = nextHydratableInstance;
+    if (!nextInstance) {
+      // Nothing to hydrate. Make it an insertion.
+      insertNonHydratedInstance(hydrationParentFiber, fiber);
+      isHydrating = false;
+      hydrationParentFiber = fiber;
+      return;
+    }
+    if (!tryHydrate(fiber, nextInstance)) {
+      // If we can't hydrate this instance let's try the next one.
+      // We use this as a heuristic. It's based on intuition and not data so it
+      // might be flawed or unnecessary.
+      nextInstance = getNextHydratableSibling(nextInstance);
+      if (!nextInstance || !tryHydrate(fiber, nextInstance)) {
+        // Nothing to hydrate. Make it an insertion.
+        insertNonHydratedInstance(hydrationParentFiber, fiber);
+        isHydrating = false;
+        hydrationParentFiber = fiber;
+        return;
+      }
+      // We matched the next one, we'll now assume that the first one was
+      // superfluous and we'll delete it. Since we can't eagerly delete it
+      // we'll have to schedule a deletion. To do that, this node needs a dummy
+      // fiber associated with it.
+      deleteHydratableInstance(hydrationParentFiber, nextHydratableInstance);
+    }
+    hydrationParentFiber = fiber;
+    nextHydratableInstance = getFirstHydratableChild(nextInstance);
+  }
+
+  function prepareToHydrateHostInstance(
+    fiber,
+    rootContainerInstance,
+    hostContext
+  ) {
+    var instance = fiber.stateNode;
+    var updatePayload = hydrateInstance(
+      instance,
+      fiber.type,
+      fiber.memoizedProps,
+      rootContainerInstance,
+      hostContext,
+      fiber
+    );
+    // TODO: Type this specific to this type of component.
+    fiber.updateQueue = updatePayload;
+    // If the update payload indicates that there is a change or if there
+    // is a new ref we mark this as an update.
+    if (updatePayload !== null) {
+      return true;
+    }
+    return false;
+  }
+
+  function prepareToHydrateHostTextInstance(fiber) {
+    var textInstance = fiber.stateNode;
+    var textContent = fiber.memoizedProps;
+    var shouldUpdate = hydrateTextInstance(textInstance, textContent, fiber);
+    {
+      if (shouldUpdate) {
+        // We assume that prepareToHydrateHostTextInstance is called in a context where the
+        // hydration parent is the parent host component of this host text.
+        var returnFiber = hydrationParentFiber;
+        if (returnFiber !== null) {
+          switch (returnFiber.tag) {
+            case HostRoot: {
+              var parentContainer = returnFiber.stateNode.containerInfo;
+              didNotMatchHydratedContainerTextInstance(
+                parentContainer,
+                textInstance,
+                textContent
+              );
+              break;
+            }
+            case HostComponent: {
+              var parentType = returnFiber.type;
+              var parentProps = returnFiber.memoizedProps;
+              var parentInstance = returnFiber.stateNode;
+              didNotMatchHydratedTextInstance(
+                parentType,
+                parentProps,
+                parentInstance,
+                textInstance,
+                textContent
+              );
+              break;
+            }
+          }
+        }
+      }
+    }
+    return shouldUpdate;
+  }
+
+  function popToNextHostParent(fiber) {
+    var parent = fiber["return"];
+    while (
+      parent !== null &&
+      parent.tag !== HostComponent &&
+      parent.tag !== HostRoot
+    ) {
+      parent = parent["return"];
+    }
+    hydrationParentFiber = parent;
+  }
+
+  function popHydrationState(fiber) {
+    if (fiber !== hydrationParentFiber) {
+      // We're deeper than the current hydration context, inside an inserted
+      // tree.
+      return false;
+    }
+    if (!isHydrating) {
+      // If we're not currently hydrating but we're in a hydration context, then
+      // we were an insertion and now need to pop up reenter hydration of our
+      // siblings.
+      popToNextHostParent(fiber);
+      isHydrating = true;
+      return false;
+    }
+
+    var type = fiber.type;
+
+    // If we have any remaining hydratable nodes, we need to delete them now.
+    // We only do this deeper than head and body since they tend to have random
+    // other nodes in them. We also ignore components with pure text content in
+    // side of them.
+    // TODO: Better heuristic.
+    if (
+      fiber.tag !== HostComponent ||
+      (type !== "head" &&
+        type !== "body" &&
+        !shouldSetTextContent(type, fiber.memoizedProps))
+    ) {
+      var nextInstance = nextHydratableInstance;
+      while (nextInstance) {
+        deleteHydratableInstance(fiber, nextInstance);
+        nextInstance = getNextHydratableSibling(nextInstance);
+      }
+    }
+
+    popToNextHostParent(fiber);
+    nextHydratableInstance = hydrationParentFiber
+      ? getNextHydratableSibling(fiber.stateNode)
+      : null;
+    return true;
+  }
+
+  function resetHydrationState() {
+    hydrationParentFiber = null;
+    nextHydratableInstance = null;
+    isHydrating = false;
+  }
 
-    // Each iteration, currentParent is populated with node's host parent if not
-    // currentParentIsValid.
-    var currentParentIsValid = false;
-    var currentParent = void 0;
-    var currentParentIsContainer = void 0;
+  return {
+    enterHydrationState: enterHydrationState,
+    resetHydrationState: resetHydrationState,
+    tryToClaimNextHydratableInstance: tryToClaimNextHydratableInstance,
+    prepareToHydrateHostInstance: prepareToHydrateHostInstance,
+    prepareToHydrateHostTextInstance: prepareToHydrateHostTextInstance,
+    popHydrationState: popHydrationState
+  };
+};
 
-    while (true) {
-      if (!currentParentIsValid) {
-        var parent = node["return"];
-        findParent: while (true) {
-          invariant(
-            parent !== null,
-            "Expected to find a host parent. This error is likely caused by " +
-              "a bug in React. Please file an issue."
-          );
-          switch (parent.tag) {
-            case HostComponent:
-              currentParent = parent.stateNode;
-              currentParentIsContainer = false;
-              break findParent;
-            case HostRoot:
-              currentParent = parent.stateNode.containerInfo;
-              currentParentIsContainer = true;
-              break findParent;
-            case HostPortal:
-              currentParent = parent.stateNode.containerInfo;
-              currentParentIsContainer = true;
-              break findParent;
-          }
-          parent = parent["return"];
-        }
-        currentParentIsValid = true;
-      }
+// This lets us hook into Fiber to debug what it's doing.
+// See https://github.com/facebook/react/pull/8033.
+// This is not part of the public API, not even for React DevTools.
+// You may only inject a debugTool if you work on React Fiber itself.
+var ReactFiberInstrumentation = {
+  debugTool: null
+};
 
-      if (node.tag === HostComponent || node.tag === HostText) {
-        commitNestedUnmounts(node);
-        // After all the children have unmounted, it is now safe to remove the
-        // node from the tree.
-        if (currentParentIsContainer) {
-          removeChildFromContainer(currentParent, node.stateNode);
-        } else {
-          removeChild(currentParent, node.stateNode);
-        }
-        // Don't visit children because we already visited them.
-      } else if (node.tag === HostPortal) {
-        // When we go into a portal, it becomes the parent to remove from.
-        // We will reassign it back when we pop the portal on the way up.
-        currentParent = node.stateNode.containerInfo;
-        // Visit children because portals might contain host components.
-        if (node.child !== null) {
-          node.child["return"] = node;
-          node = node.child;
-          continue;
-        }
-      } else {
-        commitUnmount(node);
-        // Visit children because we may find more host components below.
-        if (node.child !== null) {
-          node.child["return"] = node;
-          node = node.child;
-          continue;
-        }
-      }
-      if (node === current) {
-        return;
-      }
-      while (node.sibling === null) {
-        if (node["return"] === null || node["return"] === current) {
-          return;
-        }
-        node = node["return"];
-        if (node.tag === HostPortal) {
-          // When we go out of the portal, we need to restore the parent.
-          // Since we don't keep a stack of them, we will search for it.
-          currentParentIsValid = false;
-        }
-      }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
+var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
+
+var warnedAboutMissingGetChildContext = void 0;
+
+{
+  warnedAboutMissingGetChildContext = {};
+}
+
+var ReactFiberLegacyContext = function(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
+
+  // A cursor to the current merged context object on the stack.
+
+  var contextStackCursor = createCursor(emptyObject);
+  // A cursor to a boolean indicating whether the context has changed.
+  var didPerformWorkStackCursor = createCursor(false);
+  // Keep track of the previous context object that was on the stack.
+  // We use this to get access to the parent context after we have already
+  // pushed the next context provider, and now need to merge their contexts.
+  var previousContext = emptyObject;
+
+  function getUnmaskedContext(workInProgress) {
+    var hasOwnContext = isContextProvider(workInProgress);
+    if (hasOwnContext) {
+      // If the fiber is a context provider itself, when we read its context
+      // we have already pushed its own child context on the stack. A context
+      // provider should not "see" its own child context. Therefore we read the
+      // previous (parent) context instead for a context provider.
+      return previousContext;
     }
+    return contextStackCursor.current;
   }
 
-  function commitDeletion(current) {
-    // Recursively delete all host nodes from the parent.
-    // Detach refs and call componentWillUnmount() on the whole subtree.
-    unmountHostComponents(current);
-    detachFiber(current);
+  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+    var instance = workInProgress.stateNode;
+    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
   }
 
-  function commitWork(current, finishedWork) {
-    switch (finishedWork.tag) {
-      case ClassComponent: {
-        return;
-      }
-      case HostComponent: {
-        var _instance7 = finishedWork.stateNode;
-        if (_instance7 != null) {
-          // Commit the work prepared earlier.
-          var newProps = finishedWork.memoizedProps;
-          // For hydration we reuse the update path but we treat the oldProps
-          // as the newProps. The updatePayload will contain the real change in
-          // this case.
-          var oldProps = current !== null ? current.memoizedProps : newProps;
-          var type = finishedWork.type;
-          // TODO: Type the updateQueue to be specific to host components.
-          var updatePayload = finishedWork.updateQueue;
-          finishedWork.updateQueue = null;
-          if (updatePayload !== null) {
-            commitUpdate(
-              _instance7,
-              updatePayload,
-              type,
-              oldProps,
-              newProps,
-              finishedWork
-            );
-          }
-        }
-        return;
-      }
-      case HostText: {
-        invariant(
-          finishedWork.stateNode !== null,
-          "This should have a text node initialized. This error is likely " +
-            "caused by a bug in React. Please file an issue."
-        );
-        var textInstance = finishedWork.stateNode;
-        var newText = finishedWork.memoizedProps;
-        // For hydration we reuse the update path but we treat the oldProps
-        // as the newProps. The updatePayload will contain the real change in
-        // this case.
-        var oldText = current !== null ? current.memoizedProps : newText;
-        commitTextUpdate(textInstance, oldText, newText);
-        return;
-      }
-      case HostRoot: {
-        return;
-      }
-      default: {
-        invariant(
-          false,
-          "This unit of work tag should not have side-effects. This error is " +
-            "likely caused by a bug in React. Please file an issue."
-        );
-      }
+  function getMaskedContext(workInProgress, unmaskedContext) {
+    var type = workInProgress.type;
+    var contextTypes = type.contextTypes;
+    if (!contextTypes) {
+      return emptyObject;
+    }
+
+    // Avoid recreating masked context unless unmasked context has changed.
+    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+    // This may trigger infinite loops if componentWillReceiveProps calls setState.
+    var instance = workInProgress.stateNode;
+    if (
+      instance &&
+      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+    ) {
+      return instance.__reactInternalMemoizedMaskedChildContext;
+    }
+
+    var context = {};
+    for (var key in contextTypes) {
+      context[key] = unmaskedContext[key];
+    }
+
+    {
+      var name = getComponentName(workInProgress) || "Unknown";
+      checkPropTypes(
+        contextTypes,
+        context,
+        "context",
+        name,
+        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      );
+    }
+
+    // Cache unmasked context so we can avoid recreating masked context unless necessary.
+    // Context is created before the class component is instantiated so check for instance.
+    if (instance) {
+      cacheContext(workInProgress, unmaskedContext, context);
     }
+
+    return context;
   }
 
-  function commitResetTextContent(current) {
-    resetTextContent(current.stateNode);
+  function hasContextChanged() {
+    return didPerformWorkStackCursor.current;
   }
 
-  if (enableMutatingReconciler) {
-    return {
-      commitResetTextContent: commitResetTextContent,
-      commitPlacement: commitPlacement,
-      commitDeletion: commitDeletion,
-      commitWork: commitWork,
-      commitLifeCycles: commitLifeCycles,
-      commitErrorLogging: commitErrorLogging,
-      commitAttachRef: commitAttachRef,
-      commitDetachRef: commitDetachRef
-    };
-  } else {
-    invariant(false, "Mutating reconciler is disabled.");
+  function isContextConsumer(fiber) {
+    return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
   }
-};
 
-var NO_CONTEXT = {};
+  function isContextProvider(fiber) {
+    return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
+  }
 
-var ReactFiberHostContext = function(config) {
-  var getChildHostContext = config.getChildHostContext,
-    getRootHostContext = config.getRootHostContext;
+  function popContextProvider(fiber) {
+    if (!isContextProvider(fiber)) {
+      return;
+    }
 
-  var contextStackCursor = createCursor(NO_CONTEXT);
-  var contextFiberStackCursor = createCursor(NO_CONTEXT);
-  var rootInstanceStackCursor = createCursor(NO_CONTEXT);
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
 
-  function requiredContext(c) {
+  function popTopLevelContextObject(fiber) {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
+
+  function pushTopLevelContextObject(fiber, context, didChange) {
     invariant(
-      c !== NO_CONTEXT,
-      "Expected host context to exist. This error is likely caused by a bug " +
-        "in React. Please file an issue."
+      contextStackCursor.cursor == null,
+      "Unexpected context found on stack. " +
+        "This error is likely caused by a bug in React. Please file an issue."
     );
-    return c;
+
+    push(contextStackCursor, context, fiber);
+    push(didPerformWorkStackCursor, didChange, fiber);
   }
 
-  function getRootHostContainer() {
-    var rootInstance = requiredContext(rootInstanceStackCursor.current);
-    return rootInstance;
+  function processChildContext(fiber, parentContext) {
+    var instance = fiber.stateNode;
+    var childContextTypes = fiber.type.childContextTypes;
+
+    // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
+    if (typeof instance.getChildContext !== "function") {
+      {
+        var componentName = getComponentName(fiber) || "Unknown";
+
+        if (!warnedAboutMissingGetChildContext[componentName]) {
+          warnedAboutMissingGetChildContext[componentName] = true;
+          warning(
+            false,
+            "%s.childContextTypes is specified but there is no getChildContext() method " +
+              "on the instance. You can either define getChildContext() on %s or remove " +
+              "childContextTypes from it.",
+            componentName,
+            componentName
+          );
+        }
+      }
+      return parentContext;
+    }
+
+    var childContext = void 0;
+    {
+      ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
+    }
+    startPhaseTimer(fiber, "getChildContext");
+    childContext = instance.getChildContext();
+    stopPhaseTimer();
+    {
+      ReactDebugCurrentFiber.setCurrentPhase(null);
+    }
+    for (var contextKey in childContext) {
+      invariant(
+        contextKey in childContextTypes,
+        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+        getComponentName(fiber) || "Unknown",
+        contextKey
+      );
+    }
+    {
+      var name = getComponentName(fiber) || "Unknown";
+      checkPropTypes(
+        childContextTypes,
+        childContext,
+        "child context",
+        name,
+        // In practice, there is one case in which we won't get a stack. It's when
+        // somebody calls unstable_renderSubtreeIntoContainer() and we process
+        // context from the parent component instance. The stack will be missing
+        // because it's outside of the reconciliation, and so the pointer has not
+        // been set. This is rare and doesn't matter. We'll also remove that API.
+        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      );
+    }
+
+    return Object.assign({}, parentContext, childContext);
   }
 
-  function pushHostContainer(fiber, nextRootInstance) {
-    // Push current root instance onto the stack;
-    // This allows us to reset root when portals are popped.
-    push(rootInstanceStackCursor, nextRootInstance, fiber);
-
-    var nextRootContext = getRootHostContext(nextRootInstance);
-
-    // Track the context and the Fiber that provided it.
-    // This enables us to pop only Fibers that provide unique contexts.
-    push(contextFiberStackCursor, fiber, fiber);
-    push(contextStackCursor, nextRootContext, fiber);
-  }
+  function pushContextProvider(workInProgress) {
+    if (!isContextProvider(workInProgress)) {
+      return false;
+    }
 
-  function popHostContainer(fiber) {
-    pop(contextStackCursor, fiber);
-    pop(contextFiberStackCursor, fiber);
-    pop(rootInstanceStackCursor, fiber);
-  }
+    var instance = workInProgress.stateNode;
+    // We push the context as early as possible to ensure stack integrity.
+    // If the instance does not exist yet, we will push null at first,
+    // and replace it on the stack later when invalidating the context.
+    var memoizedMergedChildContext =
+      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+      emptyObject;
+
+    // Remember the parent context so we can merge with it later.
+    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+    previousContext = contextStackCursor.current;
+    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+    push(
+      didPerformWorkStackCursor,
+      didPerformWorkStackCursor.current,
+      workInProgress
+    );
 
-  function getHostContext() {
-    var context = requiredContext(contextStackCursor.current);
-    return context;
+    return true;
   }
 
-  function pushHostContext(fiber) {
-    var rootInstance = requiredContext(rootInstanceStackCursor.current);
-    var context = requiredContext(contextStackCursor.current);
-    var nextContext = getChildHostContext(context, fiber.type, rootInstance);
+  function invalidateContextProvider(workInProgress, didChange) {
+    var instance = workInProgress.stateNode;
+    invariant(
+      instance,
+      "Expected to have an instance by this point. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
 
-    // Don't push this Fiber's context unless it's unique.
-    if (context === nextContext) {
-      return;
+    if (didChange) {
+      // Merge parent and own context.
+      // Skip this if we're not updating due to sCU.
+      // This avoids unnecessarily recomputing memoized values.
+      var mergedContext = processChildContext(workInProgress, previousContext);
+      instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+
+      // Replace the old (or empty) context with the new one.
+      // It is important to unwind the context in the reverse order.
+      pop(didPerformWorkStackCursor, workInProgress);
+      pop(contextStackCursor, workInProgress);
+      // Now push the new context and mark that it has changed.
+      push(contextStackCursor, mergedContext, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    } else {
+      pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
     }
-
-    // Track the context and the Fiber that provided it.
-    // This enables us to pop only Fibers that provide unique contexts.
-    push(contextFiberStackCursor, fiber, fiber);
-    push(contextStackCursor, nextContext, fiber);
   }
 
-  function popHostContext(fiber) {
-    // Do not pop unless this Fiber provided the current context.
-    // pushHostContext() only pushes Fibers that provide unique contexts.
-    if (contextFiberStackCursor.current !== fiber) {
-      return;
-    }
-
-    pop(contextStackCursor, fiber);
-    pop(contextFiberStackCursor, fiber);
-  }
+  function findCurrentUnmaskedContext(fiber) {
+    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+    // makes sense elsewhere
+    invariant(
+      isFiberMounted(fiber) && fiber.tag === ClassComponent,
+      "Expected subtree parent to be a mounted class component. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
 
-  function resetHostContainer() {
-    contextStackCursor.current = NO_CONTEXT;
-    rootInstanceStackCursor.current = NO_CONTEXT;
+    var node = fiber;
+    while (node.tag !== HostRoot) {
+      if (isContextProvider(node)) {
+        return node.stateNode.__reactInternalMemoizedMergedChildContext;
+      }
+      var parent = node["return"];
+      invariant(
+        parent,
+        "Found unexpected detached subtree parent. " +
+          "This error is likely caused by a bug in React. Please file an issue."
+      );
+      node = parent;
+    }
+    return node.stateNode.context;
   }
 
   return {
-    getHostContext: getHostContext,
-    getRootHostContainer: getRootHostContainer,
-    popHostContainer: popHostContainer,
-    popHostContext: popHostContext,
-    pushHostContainer: pushHostContainer,
-    pushHostContext: pushHostContext,
-    resetHostContainer: resetHostContainer
+    getUnmaskedContext: getUnmaskedContext,
+    cacheContext: cacheContext,
+    getMaskedContext: getMaskedContext,
+    hasContextChanged: hasContextChanged,
+    isContextConsumer: isContextConsumer,
+    isContextProvider: isContextProvider,
+    popContextProvider: popContextProvider,
+    popTopLevelContextObject: popTopLevelContextObject,
+    pushTopLevelContextObject: pushTopLevelContextObject,
+    processChildContext: processChildContext,
+    pushContextProvider: pushContextProvider,
+    invalidateContextProvider: invalidateContextProvider,
+    findCurrentUnmaskedContext: findCurrentUnmaskedContext
   };
 };
 
-var ReactFiberHydrationContext = function(config) {
-  var shouldSetTextContent = config.shouldSetTextContent,
-    hydration = config.hydration;
+var ReactFiberNewContext = function(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
 
-  // If this doesn't have hydration mode.
+  var providerCursor = createCursor(null);
+  var valueCursor = createCursor(null);
+  var changedBitsCursor = createCursor(0);
 
-  if (!hydration) {
-    return {
-      enterHydrationState: function() {
-        return false;
-      },
-      resetHydrationState: function() {},
-      tryToClaimNextHydratableInstance: function() {},
-      prepareToHydrateHostInstance: function() {
-        invariant(
-          false,
-          "Expected prepareToHydrateHostInstance() to never be called. " +
-            "This error is likely caused by a bug in React. Please file an issue."
-        );
-      },
-      prepareToHydrateHostTextInstance: function() {
-        invariant(
-          false,
-          "Expected prepareToHydrateHostTextInstance() to never be called. " +
-            "This error is likely caused by a bug in React. Please file an issue."
-        );
-      },
-      popHydrationState: function(fiber) {
-        return false;
-      }
-    };
+  var rendererSigil = void 0;
+  {
+    // Use this to detect multiple renderers using the same context
+    rendererSigil = {};
   }
 
-  var canHydrateInstance = hydration.canHydrateInstance,
-    canHydrateTextInstance = hydration.canHydrateTextInstance,
-    getNextHydratableSibling = hydration.getNextHydratableSibling,
-    getFirstHydratableChild = hydration.getFirstHydratableChild,
-    hydrateInstance = hydration.hydrateInstance,
-    hydrateTextInstance = hydration.hydrateTextInstance,
-    didNotMatchHydratedContainerTextInstance =
-      hydration.didNotMatchHydratedContainerTextInstance,
-    didNotMatchHydratedTextInstance = hydration.didNotMatchHydratedTextInstance,
-    didNotHydrateContainerInstance = hydration.didNotHydrateContainerInstance,
-    didNotHydrateInstance = hydration.didNotHydrateInstance,
-    didNotFindHydratableContainerInstance =
-      hydration.didNotFindHydratableContainerInstance,
-    didNotFindHydratableContainerTextInstance =
-      hydration.didNotFindHydratableContainerTextInstance,
-    didNotFindHydratableInstance = hydration.didNotFindHydratableInstance,
-    didNotFindHydratableTextInstance =
-      hydration.didNotFindHydratableTextInstance;
-
-  // The deepest Fiber on the stack involved in a hydration context.
-  // This may have been an insertion or a hydration.
+  function pushProvider(providerFiber) {
+    var context = providerFiber.type._context;
 
-  var hydrationParentFiber = null;
-  var nextHydratableInstance = null;
-  var isHydrating = false;
+    push(changedBitsCursor, context._changedBits, providerFiber);
+    push(valueCursor, context._currentValue, providerFiber);
+    push(providerCursor, providerFiber, providerFiber);
 
-  function enterHydrationState(fiber) {
-    var parentInstance = fiber.stateNode.containerInfo;
-    nextHydratableInstance = getFirstHydratableChild(parentInstance);
-    hydrationParentFiber = fiber;
-    isHydrating = true;
-    return true;
-  }
+    context._currentValue = providerFiber.pendingProps.value;
+    context._changedBits = providerFiber.stateNode;
 
-  function deleteHydratableInstance(returnFiber, instance) {
     {
-      switch (returnFiber.tag) {
-        case HostRoot:
-          didNotHydrateContainerInstance(
-            returnFiber.stateNode.containerInfo,
-            instance
-          );
-          break;
-        case HostComponent:
-          didNotHydrateInstance(
-            returnFiber.type,
-            returnFiber.memoizedProps,
-            returnFiber.stateNode,
-            instance
-          );
-          break;
-      }
+      !(
+        context._currentRenderer === null ||
+        context._currentRenderer === rendererSigil
+      )
+        ? warning(
+            false,
+            "Detected multiple renderers concurrently rendering the " +
+              "same context provider. This is currently unsupported."
+          )
+        : void 0;
+      context._currentRenderer = rendererSigil;
     }
+  }
 
-    var childToDelete = createFiberFromHostInstanceForDeletion();
-    childToDelete.stateNode = instance;
-    childToDelete["return"] = returnFiber;
-    childToDelete.effectTag = Deletion;
+  function popProvider(providerFiber) {
+    var changedBits = changedBitsCursor.current;
+    var currentValue = valueCursor.current;
 
-    // This might seem like it belongs on progressedFirstDeletion. However,
-    // these children are not part of the reconciliation list of children.
-    // Even if we abort and rereconcile the children, that will try to hydrate
-    // again and the nodes are still in the host tree so these will be
-    // recreated.
-    if (returnFiber.lastEffect !== null) {
-      returnFiber.lastEffect.nextEffect = childToDelete;
-      returnFiber.lastEffect = childToDelete;
-    } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
-    }
+    pop(providerCursor, providerFiber);
+    pop(valueCursor, providerFiber);
+    pop(changedBitsCursor, providerFiber);
+
+    var context = providerFiber.type._context;
+    context._currentValue = currentValue;
+    context._changedBits = changedBits;
   }
 
-  function insertNonHydratedInstance(returnFiber, fiber) {
-    fiber.effectTag |= Placement;
-    {
-      switch (returnFiber.tag) {
-        case HostRoot: {
-          var parentContainer = returnFiber.stateNode.containerInfo;
-          switch (fiber.tag) {
-            case HostComponent:
-              var type = fiber.type;
-              var props = fiber.pendingProps;
-              didNotFindHydratableContainerInstance(
-                parentContainer,
-                type,
-                props
-              );
-              break;
-            case HostText:
-              var text = fiber.pendingProps;
-              didNotFindHydratableContainerTextInstance(parentContainer, text);
-              break;
-          }
-          break;
-        }
-        case HostComponent: {
-          var parentType = returnFiber.type;
-          var parentProps = returnFiber.memoizedProps;
-          var parentInstance = returnFiber.stateNode;
-          switch (fiber.tag) {
-            case HostComponent:
-              var _type = fiber.type;
-              var _props = fiber.pendingProps;
-              didNotFindHydratableInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                _type,
-                _props
-              );
-              break;
-            case HostText:
-              var _text = fiber.pendingProps;
-              didNotFindHydratableTextInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                _text
-              );
-              break;
-          }
-          break;
-        }
-        default:
-          return;
-      }
-    }
+  return {
+    pushProvider: pushProvider,
+    popProvider: popProvider
+  };
+};
+
+var ReactFiberStack = function() {
+  var valueStack = [];
+
+  var fiberStack = void 0;
+
+  {
+    fiberStack = [];
   }
 
-  function tryHydrate(fiber, nextInstance) {
-    switch (fiber.tag) {
-      case HostComponent: {
-        var type = fiber.type;
-        var props = fiber.pendingProps;
-        var instance = canHydrateInstance(nextInstance, type, props);
-        if (instance !== null) {
-          fiber.stateNode = instance;
-          return true;
-        }
-        return false;
-      }
-      case HostText: {
-        var text = fiber.pendingProps;
-        var textInstance = canHydrateTextInstance(nextInstance, text);
-        if (textInstance !== null) {
-          fiber.stateNode = textInstance;
-          return true;
-        }
-        return false;
-      }
-      default:
-        return false;
-    }
+  var index = -1;
+
+  function createCursor(defaultValue) {
+    return {
+      current: defaultValue
+    };
   }
 
-  function tryToClaimNextHydratableInstance(fiber) {
-    if (!isHydrating) {
-      return;
-    }
-    var nextInstance = nextHydratableInstance;
-    if (!nextInstance) {
-      // Nothing to hydrate. Make it an insertion.
-      insertNonHydratedInstance(hydrationParentFiber, fiber);
-      isHydrating = false;
-      hydrationParentFiber = fiber;
-      return;
-    }
-    if (!tryHydrate(fiber, nextInstance)) {
-      // If we can't hydrate this instance let's try the next one.
-      // We use this as a heuristic. It's based on intuition and not data so it
-      // might be flawed or unnecessary.
-      nextInstance = getNextHydratableSibling(nextInstance);
-      if (!nextInstance || !tryHydrate(fiber, nextInstance)) {
-        // Nothing to hydrate. Make it an insertion.
-        insertNonHydratedInstance(hydrationParentFiber, fiber);
-        isHydrating = false;
-        hydrationParentFiber = fiber;
-        return;
-      }
-      // We matched the next one, we'll now assume that the first one was
-      // superfluous and we'll delete it. Since we can't eagerly delete it
-      // we'll have to schedule a deletion. To do that, this node needs a dummy
-      // fiber associated with it.
-      deleteHydratableInstance(hydrationParentFiber, nextHydratableInstance);
-    }
-    hydrationParentFiber = fiber;
-    nextHydratableInstance = getFirstHydratableChild(nextInstance);
+  function isEmpty() {
+    return index === -1;
   }
 
-  function prepareToHydrateHostInstance(
-    fiber,
-    rootContainerInstance,
-    hostContext
-  ) {
-    var instance = fiber.stateNode;
-    var updatePayload = hydrateInstance(
-      instance,
-      fiber.type,
-      fiber.memoizedProps,
-      rootContainerInstance,
-      hostContext,
-      fiber
-    );
-    // TODO: Type this specific to this type of component.
-    fiber.updateQueue = updatePayload;
-    // If the update payload indicates that there is a change or if there
-    // is a new ref we mark this as an update.
-    if (updatePayload !== null) {
-      return true;
+  function pop(cursor, fiber) {
+    if (index < 0) {
+      {
+        warning(false, "Unexpected pop.");
+      }
+      return;
     }
-    return false;
-  }
 
-  function prepareToHydrateHostTextInstance(fiber) {
-    var textInstance = fiber.stateNode;
-    var textContent = fiber.memoizedProps;
-    var shouldUpdate = hydrateTextInstance(textInstance, textContent, fiber);
     {
-      if (shouldUpdate) {
-        // We assume that prepareToHydrateHostTextInstance is called in a context where the
-        // hydration parent is the parent host component of this host text.
-        var returnFiber = hydrationParentFiber;
-        if (returnFiber !== null) {
-          switch (returnFiber.tag) {
-            case HostRoot: {
-              var parentContainer = returnFiber.stateNode.containerInfo;
-              didNotMatchHydratedContainerTextInstance(
-                parentContainer,
-                textInstance,
-                textContent
-              );
-              break;
-            }
-            case HostComponent: {
-              var parentType = returnFiber.type;
-              var parentProps = returnFiber.memoizedProps;
-              var parentInstance = returnFiber.stateNode;
-              didNotMatchHydratedTextInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                textInstance,
-                textContent
-              );
-              break;
-            }
-          }
-        }
+      if (fiber !== fiberStack[index]) {
+        warning(false, "Unexpected Fiber popped.");
       }
     }
-    return shouldUpdate;
-  }
 
-  function popToNextHostParent(fiber) {
-    var parent = fiber["return"];
-    while (
-      parent !== null &&
-      parent.tag !== HostComponent &&
-      parent.tag !== HostRoot
-    ) {
-      parent = parent["return"];
+    cursor.current = valueStack[index];
+
+    valueStack[index] = null;
+
+    {
+      fiberStack[index] = null;
     }
-    hydrationParentFiber = parent;
+
+    index--;
   }
 
-  function popHydrationState(fiber) {
-    if (fiber !== hydrationParentFiber) {
-      // We're deeper than the current hydration context, inside an inserted
-      // tree.
-      return false;
-    }
-    if (!isHydrating) {
-      // If we're not currently hydrating but we're in a hydration context, then
-      // we were an insertion and now need to pop up reenter hydration of our
-      // siblings.
-      popToNextHostParent(fiber);
-      isHydrating = true;
-      return false;
+  function push(cursor, value, fiber) {
+    index++;
+
+    valueStack[index] = cursor.current;
+
+    {
+      fiberStack[index] = fiber;
     }
 
-    var type = fiber.type;
+    cursor.current = value;
+  }
 
-    // If we have any remaining hydratable nodes, we need to delete them now.
-    // We only do this deeper than head and body since they tend to have random
-    // other nodes in them. We also ignore components with pure text content in
-    // side of them.
-    // TODO: Better heuristic.
-    if (
-      fiber.tag !== HostComponent ||
-      (type !== "head" &&
-        type !== "body" &&
-        !shouldSetTextContent(type, fiber.memoizedProps))
-    ) {
-      var nextInstance = nextHydratableInstance;
-      while (nextInstance) {
-        deleteHydratableInstance(fiber, nextInstance);
-        nextInstance = getNextHydratableSibling(nextInstance);
+  function checkThatStackIsEmpty() {
+    {
+      if (index !== -1) {
+        warning(
+          false,
+          "Expected an empty stack. Something was not reset properly."
+        );
       }
     }
-
-    popToNextHostParent(fiber);
-    nextHydratableInstance = hydrationParentFiber
-      ? getNextHydratableSibling(fiber.stateNode)
-      : null;
-    return true;
   }
 
-  function resetHydrationState() {
-    hydrationParentFiber = null;
-    nextHydratableInstance = null;
-    isHydrating = false;
+  function resetStackAfterFatalErrorInDev() {
+    {
+      index = -1;
+      valueStack.length = 0;
+      fiberStack.length = 0;
+    }
   }
 
   return {
-    enterHydrationState: enterHydrationState,
-    resetHydrationState: resetHydrationState,
-    tryToClaimNextHydratableInstance: tryToClaimNextHydratableInstance,
-    prepareToHydrateHostInstance: prepareToHydrateHostInstance,
-    prepareToHydrateHostTextInstance: prepareToHydrateHostTextInstance,
-    popHydrationState: popHydrationState
+    createCursor: createCursor,
+    isEmpty: isEmpty,
+    pop: pop,
+    push: push,
+    checkThatStackIsEmpty: checkThatStackIsEmpty,
+    resetStackAfterFatalErrorInDev: resetStackAfterFatalErrorInDev
   };
 };
 
-// This lets us hook into Fiber to debug what it's doing.
-// See https://github.com/facebook/react/pull/8033.
-// This is not part of the public API, not even for React DevTools.
-// You may only inject a debugTool if you work on React Fiber itself.
-var ReactFiberInstrumentation = {
-  debugTool: null
-};
-
-var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
-
 var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError = ReactErrorUtils.hasCaughtError;
 var clearCaughtError = ReactErrorUtils.clearCaughtError;
@@ -11411,17 +11894,19 @@ var warnAboutInvalidUpdates = void 0;
   var didWarnStateUpdateForUnmountedComponent = {};
 
   warnAboutUpdateOnUnmounted = function(fiber) {
+    // We show the whole stack but dedupe on the top component's name because
+    // the problematic code almost always lies inside that component.
     var componentName = getComponentName(fiber) || "ReactClass";
     if (didWarnStateUpdateForUnmountedComponent[componentName]) {
       return;
     }
     warning(
       false,
-      "Can only update a mounted or mounting " +
-        "component. This usually means you called setState, replaceState, " +
-        "or forceUpdate on an unmounted component. This is a no-op.\n\nPlease " +
-        "check the code for the %s component.",
-      componentName
+      "Can't call setState (or forceUpdate) on an unmounted component. This " +
+        "is a no-op, but it indicates a memory leak in your application. To " +
+        "fix, cancel all subscriptions and asynchronous tasks in the " +
+        "componentWillUnmount method.%s",
+      getStackAddendumByWorkInProgressFiber(fiber)
     );
     didWarnStateUpdateForUnmountedComponent[componentName] = true;
   };
@@ -11456,16 +11941,23 @@ var warnAboutInvalidUpdates = void 0;
 }
 
 var ReactFiberScheduler = function(config) {
-  var hostContext = ReactFiberHostContext(config);
+  var stack = ReactFiberStack();
+  var hostContext = ReactFiberHostContext(config, stack);
+  var legacyContext = ReactFiberLegacyContext(stack);
+  var newContext = ReactFiberNewContext(stack);
   var popHostContext = hostContext.popHostContext,
     popHostContainer = hostContext.popHostContainer;
+  var popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popLegacyContextProvider = legacyContext.popContextProvider;
+  var popProvider = newContext.popProvider;
 
   var hydrationContext = ReactFiberHydrationContext(config);
-  var resetHostContainer = hostContext.resetHostContainer;
 
   var _ReactFiberBeginWork = ReactFiberBeginWork(
       config,
       hostContext,
+      legacyContext,
+      newContext,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
@@ -11475,17 +11967,22 @@ var ReactFiberScheduler = function(config) {
   var _ReactFiberCompleteWo = ReactFiberCompleteWork(
       config,
       hostContext,
+      legacyContext,
+      newContext,
       hydrationContext
     ),
     completeWork = _ReactFiberCompleteWo.completeWork;
 
   var _ReactFiberUnwindWork = ReactFiberUnwindWork(
       hostContext,
+      legacyContext,
+      newContext,
       scheduleWork,
       isAlreadyFailedLegacyErrorBoundary
     ),
     throwException = _ReactFiberUnwindWork.throwException,
-    unwindWork = _ReactFiberUnwindWork.unwindWork;
+    unwindWork = _ReactFiberUnwindWork.unwindWork,
+    unwindInterruptedWork = _ReactFiberUnwindWork.unwindInterruptedWork;
 
   var _ReactFiberCommitWork = ReactFiberCommitWork(
       config,
@@ -11495,6 +11992,8 @@ var ReactFiberScheduler = function(config) {
       markLegacyErrorBoundaryAsFailed,
       recalculateCurrentTime
     ),
+    commitBeforeMutationLifeCycles =
+      _ReactFiberCommitWork.commitBeforeMutationLifeCycles,
     commitResetTextContent = _ReactFiberCommitWork.commitResetTextContent,
     commitPlacement = _ReactFiberCommitWork.commitPlacement,
     commitDeletion = _ReactFiberCommitWork.commitDeletion,
@@ -11546,21 +12045,29 @@ var ReactFiberScheduler = function(config) {
 
   var stashedWorkInProgressProperties = void 0;
   var replayUnitOfWork = void 0;
+  var isReplayingFailedUnitOfWork = void 0;
+  var originalReplayError = void 0;
+  var rethrowOriginalError = void 0;
   if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
     stashedWorkInProgressProperties = null;
-    replayUnitOfWork = function(failedUnitOfWork, isAsync) {
-      // Retore the original state of the work-in-progress
-      Object.assign(failedUnitOfWork, stashedWorkInProgressProperties);
+    isReplayingFailedUnitOfWork = false;
+    originalReplayError = null;
+    replayUnitOfWork = function(failedUnitOfWork, error, isAsync) {
+      // Restore the original state of the work-in-progress
+      assignFiberPropertiesInDEV(
+        failedUnitOfWork,
+        stashedWorkInProgressProperties
+      );
       switch (failedUnitOfWork.tag) {
         case HostRoot:
           popHostContainer(failedUnitOfWork);
-          popTopLevelContextObject(failedUnitOfWork);
+          popTopLevelLegacyContextObject(failedUnitOfWork);
           break;
         case HostComponent:
           popHostContext(failedUnitOfWork);
           break;
         case ClassComponent:
-          popContextProvider(failedUnitOfWork);
+          popLegacyContextProvider(failedUnitOfWork);
           break;
         case HostPortal:
           popHostContainer(failedUnitOfWork);
@@ -11570,28 +12077,36 @@ var ReactFiberScheduler = function(config) {
           break;
       }
       // Replay the begin phase.
+      isReplayingFailedUnitOfWork = true;
+      originalReplayError = error;
       invokeGuardedCallback$2(null, workLoop, null, isAsync);
+      isReplayingFailedUnitOfWork = false;
+      originalReplayError = null;
       if (hasCaughtError()) {
         clearCaughtError();
       } else {
-        // This should be unreachable because the render phase is
-        // idempotent
+        // If the begin phase did not fail the second time, set this pointer
+        // back to the original value.
+        nextUnitOfWork = failedUnitOfWork;
       }
     };
+    rethrowOriginalError = function() {
+      throw originalReplayError;
+    };
   }
 
-  function resetContextStack() {
-    // Reset the stack
-    reset();
-    // Reset the cursors
-    resetContext();
-    resetHostContainer();
-
-    // TODO: Unify new context implementation with other stacks
-    resetProviderStack();
+  function resetStack() {
+    if (nextUnitOfWork !== null) {
+      var interruptedWork = nextUnitOfWork["return"];
+      while (interruptedWork !== null) {
+        unwindInterruptedWork(interruptedWork);
+        interruptedWork = interruptedWork["return"];
+      }
+    }
 
     {
       ReactStrictModeWarnings.discardPendingWarnings();
+      stack.checkThatStackIsEmpty();
     }
 
     nextRoot = null;
@@ -11609,6 +12124,7 @@ var ReactFiberScheduler = function(config) {
       recordEffect();
 
       var effectTag = nextEffect.effectTag;
+
       if (effectTag & ContentReset) {
         commitResetTextContent(nextEffect);
       }
@@ -11666,6 +12182,22 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
+  function commitBeforeMutationLifecycles() {
+    while (nextEffect !== null) {
+      var effectTag = nextEffect.effectTag;
+
+      if (effectTag & Snapshot) {
+        recordEffect();
+        var current = nextEffect.alternate;
+        commitBeforeMutationLifeCycles(current, nextEffect);
+      }
+
+      // Don't cleanup effects yet;
+      // This will be done by commitAllLifeCycles()
+      nextEffect = nextEffect.nextEffect;
+    }
+  }
+
   function commitAllLifeCycles(
     finishedRoot,
     currentTime,
@@ -11773,16 +12305,14 @@ var ReactFiberScheduler = function(config) {
 
     prepareForCommit(root.containerInfo);
 
-    // Commit all the side-effects within a tree. We'll do this in two passes.
-    // The first pass performs all the host insertions, updates, deletions and
-    // ref unmounts.
+    // Invoke instances of getSnapshotBeforeUpdate before mutation.
     nextEffect = firstEffect;
-    startCommitHostEffectsTimer();
+    startCommitSnapshotEffectsTimer();
     while (nextEffect !== null) {
       var didError = false;
       var error = void 0;
       {
-        invokeGuardedCallback$2(null, commitAllHostEffects, null);
+        invokeGuardedCallback$2(null, commitBeforeMutationLifecycles, null);
         if (hasCaughtError()) {
           didError = true;
           error = clearCaughtError();
@@ -11801,6 +12331,36 @@ var ReactFiberScheduler = function(config) {
         }
       }
     }
+    stopCommitSnapshotEffectsTimer();
+
+    // Commit all the side-effects within a tree. We'll do this in two passes.
+    // The first pass performs all the host insertions, updates, deletions and
+    // ref unmounts.
+    nextEffect = firstEffect;
+    startCommitHostEffectsTimer();
+    while (nextEffect !== null) {
+      var _didError = false;
+      var _error = void 0;
+      {
+        invokeGuardedCallback$2(null, commitAllHostEffects, null);
+        if (hasCaughtError()) {
+          _didError = true;
+          _error = clearCaughtError();
+        }
+      }
+      if (_didError) {
+        invariant(
+          nextEffect !== null,
+          "Should have next effect. This error is likely caused by a bug " +
+            "in React. Please file an issue."
+        );
+        onCommitPhaseError(nextEffect, _error);
+        // Clean-up
+        if (nextEffect !== null) {
+          nextEffect = nextEffect.nextEffect;
+        }
+      }
+    }
     stopCommitHostEffectsTimer();
 
     resetAfterCommit(root.containerInfo);
@@ -11818,8 +12378,8 @@ var ReactFiberScheduler = function(config) {
     nextEffect = firstEffect;
     startCommitLifeCyclesTimer();
     while (nextEffect !== null) {
-      var _didError = false;
-      var _error = void 0;
+      var _didError2 = false;
+      var _error2 = void 0;
       {
         invokeGuardedCallback$2(
           null,
@@ -11830,17 +12390,17 @@ var ReactFiberScheduler = function(config) {
           committedExpirationTime
         );
         if (hasCaughtError()) {
-          _didError = true;
-          _error = clearCaughtError();
+          _didError2 = true;
+          _error2 = clearCaughtError();
         }
       }
-      if (_didError) {
+      if (_didError2) {
         invariant(
           nextEffect !== null,
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        onCommitPhaseError(nextEffect, _error);
+        onCommitPhaseError(nextEffect, _error2);
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
         }
@@ -12064,12 +12624,21 @@ var ReactFiberScheduler = function(config) {
     }
 
     if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-      stashedWorkInProgressProperties = Object.assign({}, workInProgress);
+      stashedWorkInProgressProperties = assignFiberPropertiesInDEV(
+        stashedWorkInProgressProperties,
+        workInProgress
+      );
     }
     var next = beginWork(current, workInProgress, nextRenderExpirationTime);
-
     {
       ReactDebugCurrentFiber.resetCurrentFiber();
+      if (isReplayingFailedUnitOfWork) {
+        // Currently replaying a failed unit of work. This should be unreachable,
+        // because the render phase is meant to be idempotent, and it should
+        // have thrown again. Since it didn't, rethrow the original error, so
+        // React's internal stack is not misaligned.
+        rethrowOriginalError();
+      }
     }
     if (true && ReactFiberInstrumentation_1.debugTool) {
       ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
@@ -12115,7 +12684,7 @@ var ReactFiberScheduler = function(config) {
       nextUnitOfWork === null
     ) {
       // Reset the stack and start working from the root.
-      resetContextStack();
+      resetStack();
       nextRoot = root;
       nextRenderExpirationTime = expirationTime;
       nextUnitOfWork = createWorkInProgress(
@@ -12143,13 +12712,18 @@ var ReactFiberScheduler = function(config) {
 
         if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
           var failedUnitOfWork = nextUnitOfWork;
-          replayUnitOfWork(failedUnitOfWork, isAsync);
+          replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
         }
 
         var sourceFiber = nextUnitOfWork;
         var returnFiber = sourceFiber["return"];
         if (returnFiber === null) {
-          // This is a fatal error.
+          // This is the root. The root could capture its own errors. However,
+          // we don't know if it errors before or after we pushed the host
+          // context. This information is needed to avoid a stack mismatch.
+          // Because we're not sure, treat this as a fatal error. We could track
+          // which phase it fails in, but doesn't seem worth it. At least
+          // for now.
           didFatal = true;
           onUncaughtError(thrownValue);
           break;
@@ -12161,23 +12735,32 @@ var ReactFiberScheduler = function(config) {
     } while (true);
 
     // We're done performing work. Time to clean up.
-    stopWorkLoopTimer(interruptedBy);
-    interruptedBy = null;
+    var didCompleteRoot = false;
     isWorking = false;
 
     // Yield back to main thread.
     if (didFatal) {
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
       // There was a fatal error.
+      {
+        stack.resetStackAfterFatalErrorInDev();
+      }
       return null;
     } else if (nextUnitOfWork === null) {
       // We reached the root.
       if (isRootReadyForCommit) {
+        didCompleteRoot = true;
+        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+        interruptedBy = null;
         // The root successfully completed. It's ready for commit.
         root.pendingCommitExpirationTime = expirationTime;
         var finishedWork = root.current.alternate;
         return finishedWork;
       } else {
         // The root did not complete.
+        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+        interruptedBy = null;
         invariant(
           false,
           "Expired work should have completed. This error is likely caused " +
@@ -12185,6 +12768,8 @@ var ReactFiberScheduler = function(config) {
         );
       }
     } else {
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
       // There's more work to do, but we ran out of time. Yield back to
       // the renderer.
       return null;
@@ -12368,9 +12953,17 @@ var ReactFiberScheduler = function(config) {
           ) {
             // This is an interruption. (Used for performance tracking.)
             interruptedBy = fiber;
-            resetContextStack();
+            resetStack();
           }
-          if (nextRoot !== root || !isWorking) {
+          if (
+            // If we're in the render phase, we don't need to schedule this root
+            // for an update, because we'll do it before we exit...
+            !isWorking ||
+            isCommitting ||
+            // ...unless this is a different root than the one we're rendering.
+            nextRoot !== root
+          ) {
+            // Add this root to the root schedule.
             requestWork(root, expirationTime);
           }
           if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
@@ -12630,7 +13223,8 @@ var ReactFiberScheduler = function(config) {
 
     if (enableUserTimingAPI && deadline !== null) {
       var didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
-      stopRequestCallbackTimer(didExpire);
+      var timeout = expirationTimeToMs(nextFlushedExpirationTime);
+      stopRequestCallbackTimer(didExpire, timeout);
     }
 
     if (isAsync) {
@@ -12690,7 +13284,11 @@ var ReactFiberScheduler = function(config) {
     // Perform work on root as if the given expiration time is the current time.
     // This has the effect of synchronously flushing all work up to and
     // including the given time.
+    nextFlushedRoot = root;
+    nextFlushedExpirationTime = expirationTime;
     performWorkOnRoot(root, expirationTime, false);
+    // Flush any sync work that was scheduled by lifecycles
+    performSyncWork();
     finishRendering();
   }
 
@@ -12939,7 +13537,8 @@ var ReactFiberScheduler = function(config) {
     syncUpdates: syncUpdates,
     interactiveUpdates: interactiveUpdates,
     flushInteractiveUpdates: flushInteractiveUpdates,
-    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration
+    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration,
+    legacyContext: legacyContext
   };
 };
 
@@ -12952,18 +13551,6 @@ var didWarnAboutNestedUpdates = void 0;
 // 0 is PROD, 1 is DEV.
 // Might add PROFILE later.
 
-function getContextForSubtree(parentComponent) {
-  if (!parentComponent) {
-    return emptyObject;
-  }
-
-  var fiber = get(parentComponent);
-  var parentContext = findCurrentUnmaskedContext(fiber);
-  return isContextProvider(fiber)
-    ? processChildContext(fiber, parentContext)
-    : parentContext;
-}
-
 var ReactFiberReconciler$1 = function(config) {
   var getPublicInstance = config.getPublicInstance;
 
@@ -12982,7 +13569,24 @@ var ReactFiberReconciler$1 = function(config) {
     deferredUpdates = _ReactFiberScheduler.deferredUpdates,
     syncUpdates = _ReactFiberScheduler.syncUpdates,
     interactiveUpdates = _ReactFiberScheduler.interactiveUpdates,
-    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates;
+    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates,
+    legacyContext = _ReactFiberScheduler.legacyContext;
+
+  var findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
+    isContextProvider = legacyContext.isContextProvider,
+    processChildContext = legacyContext.processChildContext;
+
+  function getContextForSubtree(parentComponent) {
+    if (!parentComponent) {
+      return emptyObject;
+    }
+
+    var fiber = get(parentComponent);
+    var parentContext = findCurrentUnmaskedContext(fiber);
+    return isContextProvider(fiber)
+      ? processChildContext(fiber, parentContext)
+      : parentContext;
+  }
 
   function scheduleRootUpdate(
     current,
@@ -13011,12 +13615,14 @@ var ReactFiberReconciler$1 = function(config) {
 
     callback = callback === undefined ? null : callback;
     {
-      warning(
-        callback === null || typeof callback === "function",
-        "render(...): Expected the last optional `callback` argument to be a " +
-          "function. Instead received: %s.",
-        callback
-      );
+      !(callback === null || typeof callback === "function")
+        ? warning(
+            false,
+            "render(...): Expected the last optional `callback` argument to be a " +
+              "function. Instead received: %s.",
+            callback
+          )
+        : void 0;
     }
 
     var update = {
diff --git a/Libraries/Renderer/ReactFabric-prod.js b/Libraries/Renderer/ReactFabric-prod.js
index 950e09890f8203..c12ebd601c84d0 100644
--- a/Libraries/Renderer/ReactFabric-prod.js
+++ b/Libraries/Renderer/ReactFabric-prod.js
@@ -945,6 +945,9 @@ var hasSymbol = "function" === typeof Symbol && Symbol["for"],
   REACT_PROVIDER_TYPE = hasSymbol ? Symbol["for"]("react.provider") : 60109,
   REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 60110,
   REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol["for"]("react.async_mode") : 60111,
+  REACT_FORWARD_REF_TYPE = hasSymbol
+    ? Symbol["for"]("react.forward_ref")
+    : 60112,
   MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
   if (null === maybeIterable || "undefined" === typeof maybeIterable)
@@ -1491,7 +1494,8 @@ var ReactNativeComponent = (function(_React$Component) {
   frameDeadlineObject = {
     timeRemaining: function() {
       return frameDeadline - now();
-    }
+    },
+    didTimeout: !1
   };
 function setTimeoutCallback() {
   frameDeadline = now() + 5;
@@ -1630,136 +1634,6 @@ function findCurrentHostFiberWithNoPortals(parent) {
   }
   return null;
 }
-var valueStack = [],
-  index = -1;
-function pop(cursor) {
-  0 > index ||
-    ((cursor.current = valueStack[index]), (valueStack[index] = null), index--);
-}
-function push(cursor, value) {
-  index++;
-  valueStack[index] = cursor.current;
-  cursor.current = value;
-}
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  do {
-    a: switch (workInProgress.tag) {
-      case 0:
-      case 1:
-      case 2:
-      case 5:
-        var owner = workInProgress._debugOwner,
-          source = workInProgress._debugSource;
-        var JSCompiler_inline_result = getComponentName(workInProgress);
-        var ownerName = null;
-        owner && (ownerName = getComponentName(owner));
-        owner = source;
-        JSCompiler_inline_result =
-          "\n    in " +
-          (JSCompiler_inline_result || "Unknown") +
-          (owner
-            ? " (at " +
-              owner.fileName.replace(/^.*[\\\/]/, "") +
-              ":" +
-              owner.lineNumber +
-              ")"
-            : ownerName ? " (created by " + ownerName + ")" : "");
-        break a;
-      default:
-        JSCompiler_inline_result = "";
-    }
-    info += JSCompiler_inline_result;
-    workInProgress = workInProgress["return"];
-  } while (workInProgress);
-  return info;
-}
-new Set();
-var contextStackCursor = { current: emptyObject },
-  didPerformWorkStackCursor = { current: !1 },
-  previousContext = emptyObject;
-function getUnmaskedContext(workInProgress) {
-  return isContextProvider(workInProgress)
-    ? previousContext
-    : contextStackCursor.current;
-}
-function getMaskedContext(workInProgress, unmaskedContext) {
-  var contextTypes = workInProgress.type.contextTypes;
-  if (!contextTypes) return emptyObject;
-  var instance = workInProgress.stateNode;
-  if (
-    instance &&
-    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-  )
-    return instance.__reactInternalMemoizedMaskedChildContext;
-  var context = {},
-    key;
-  for (key in contextTypes) context[key] = unmaskedContext[key];
-  instance &&
-    ((workInProgress = workInProgress.stateNode),
-    (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
-    (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
-  return context;
-}
-function isContextProvider(fiber) {
-  return 2 === fiber.tag && null != fiber.type.childContextTypes;
-}
-function popContextProvider(fiber) {
-  isContextProvider(fiber) &&
-    (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
-}
-function pushTopLevelContextObject(fiber, context, didChange) {
-  invariant(
-    null == contextStackCursor.cursor,
-    "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
-  );
-  push(contextStackCursor, context, fiber);
-  push(didPerformWorkStackCursor, didChange, fiber);
-}
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode,
-    childContextTypes = fiber.type.childContextTypes;
-  if ("function" !== typeof instance.getChildContext) return parentContext;
-  instance = instance.getChildContext();
-  for (var contextKey in instance)
-    invariant(
-      contextKey in childContextTypes,
-      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
-      contextKey
-    );
-  return Object.assign({}, parentContext, instance);
-}
-function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) return !1;
-  var instance = workInProgress.stateNode;
-  instance =
-    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
-  previousContext = contextStackCursor.current;
-  push(contextStackCursor, instance, workInProgress);
-  push(
-    didPerformWorkStackCursor,
-    didPerformWorkStackCursor.current,
-    workInProgress
-  );
-  return !0;
-}
-function invalidateContextProvider(workInProgress, didChange) {
-  var instance = workInProgress.stateNode;
-  invariant(
-    instance,
-    "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
-  );
-  if (didChange) {
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    push(contextStackCursor, mergedContext, workInProgress);
-  } else pop(didPerformWorkStackCursor, workInProgress);
-  push(didPerformWorkStackCursor, didChange, workInProgress);
-}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -1843,6 +1717,9 @@ function createFiberFromElement(element, mode, expirationTime) {
             case REACT_CONTEXT_TYPE:
               fiberTag = 12;
               break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = 14;
+              break;
             default:
               if ("number" === typeof type.tag)
                 return (
@@ -1923,6 +1800,40 @@ function onCommitRoot(root) {
 function onCommitUnmount(fiber) {
   "function" === typeof onCommitFiberUnmount && onCommitFiberUnmount(fiber);
 }
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  do {
+    a: switch (workInProgress.tag) {
+      case 0:
+      case 1:
+      case 2:
+      case 5:
+        var owner = workInProgress._debugOwner,
+          source = workInProgress._debugSource;
+        var JSCompiler_inline_result = getComponentName(workInProgress);
+        var ownerName = null;
+        owner && (ownerName = getComponentName(owner));
+        owner = source;
+        JSCompiler_inline_result =
+          "\n    in " +
+          (JSCompiler_inline_result || "Unknown") +
+          (owner
+            ? " (at " +
+              owner.fileName.replace(/^.*[\\\/]/, "") +
+              ":" +
+              owner.lineNumber +
+              ")"
+            : ownerName ? " (created by " + ownerName + ")" : "");
+        break a;
+      default:
+        JSCompiler_inline_result = "";
+    }
+    info += JSCompiler_inline_result;
+    workInProgress = workInProgress["return"];
+  } while (workInProgress);
+  return info;
+}
+new Set();
 function createUpdateQueue(baseState) {
   return {
     baseState: baseState,
@@ -2078,6 +1989,7 @@ function commitCallbacks(queue, context) {
     }
 }
 function ReactFiberClassComponent(
+  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
@@ -2125,71 +2037,80 @@ function ReactFiberClassComponent(
     instance.state !== workInProgress &&
       updater.enqueueReplaceState(instance, instance.state, null);
   }
-  function callGetDerivedStateFromProps(workInProgress, instance, props) {
-    instance = workInProgress.type;
-    if ("function" === typeof instance.getDerivedStateFromProps)
-      return instance.getDerivedStateFromProps.call(
+  function callGetDerivedStateFromProps(
+    workInProgress,
+    instance,
+    nextProps,
+    prevState
+  ) {
+    workInProgress = workInProgress.type;
+    if ("function" === typeof workInProgress.getDerivedStateFromProps)
+      return workInProgress.getDerivedStateFromProps.call(
         null,
-        props,
-        workInProgress.memoizedState
+        nextProps,
+        prevState
       );
   }
-  var updater = {
-    isMounted: isMounted,
-    enqueueSetState: function(instance, partialState, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: partialState,
-        callback: callback,
-        isReplace: !1,
-        isForced: !1,
-        capturedValue: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    },
-    enqueueReplaceState: function(instance, state, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: state,
-        callback: callback,
-        isReplace: !0,
-        isForced: !1,
-        capturedValue: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    },
-    enqueueForceUpdate: function(instance, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: null,
-        callback: callback,
-        isReplace: !1,
-        isForced: !0,
-        capturedValue: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    }
-  };
+  var cacheContext = legacyContext.cacheContext,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    isContextConsumer = legacyContext.isContextConsumer,
+    hasContextChanged = legacyContext.hasContextChanged,
+    updater = {
+      isMounted: isMounted,
+      enqueueSetState: function(instance, partialState, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: partialState,
+          callback: callback,
+          isReplace: !1,
+          isForced: !1,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      },
+      enqueueReplaceState: function(instance, state, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: state,
+          callback: callback,
+          isReplace: !0,
+          isForced: !1,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      },
+      enqueueForceUpdate: function(instance, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: null,
+          callback: callback,
+          isReplace: !1,
+          isForced: !0,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      }
+    };
   return {
     adoptClassInstance: adoptClassInstance,
     callGetDerivedStateFromProps: callGetDerivedStateFromProps,
     constructClassInstance: function(workInProgress, props) {
       var ctor = workInProgress.type,
         unmaskedContext = getUnmaskedContext(workInProgress),
-        needsContext =
-          2 === workInProgress.tag && null != workInProgress.type.contextTypes,
+        needsContext = isContextConsumer(workInProgress),
         context = needsContext
           ? getMaskedContext(workInProgress, unmaskedContext)
           : emptyObject;
@@ -2198,7 +2119,7 @@ function ReactFiberClassComponent(
         null !== ctor.state && void 0 !== ctor.state ? ctor.state : null;
       adoptClassInstance(workInProgress, ctor);
       workInProgress.memoizedState = state;
-      props = callGetDerivedStateFromProps(workInProgress, ctor, props);
+      props = callGetDerivedStateFromProps(workInProgress, ctor, props, state);
       null !== props &&
         void 0 !== props &&
         (workInProgress.memoizedState = Object.assign(
@@ -2206,10 +2127,7 @@ function ReactFiberClassComponent(
           workInProgress.memoizedState,
           props
         ));
-      needsContext &&
-        ((workInProgress = workInProgress.stateNode),
-        (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
-        (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
+      needsContext && cacheContext(workInProgress, unmaskedContext, context);
       return ctor;
     },
     mountClassInstance: function(workInProgress, renderExpirationTime) {
@@ -2222,9 +2140,10 @@ function ReactFiberClassComponent(
       instance.state = workInProgress.memoizedState;
       instance.refs = emptyObject;
       instance.context = getMaskedContext(workInProgress, unmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillMount &&
-        "function" !== typeof instance.componentWillMount) ||
-        "function" === typeof ctor.getDerivedStateFromProps ||
+      "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate ||
+        ("function" !== typeof instance.UNSAFE_componentWillMount &&
+          "function" !== typeof instance.componentWillMount) ||
         ((ctor = instance.state),
         "function" === typeof instance.componentWillMount &&
           instance.componentWillMount(),
@@ -2255,9 +2174,11 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-        "function" !== typeof instance.componentWillReceiveProps) ||
+      (ctor =
         "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate) ||
+        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof instance.componentWillReceiveProps) ||
         ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
           callComponentWillReceiveProps(
             workInProgress,
@@ -2265,14 +2186,7 @@ function ReactFiberClassComponent(
             newProps,
             newUnmaskedContext
           ));
-      oldContext = void 0;
-      oldProps !== newProps &&
-        (oldContext = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps
-        ));
-      var oldState = workInProgress.memoizedState;
+      oldContext = workInProgress.memoizedState;
       renderExpirationTime =
         null !== workInProgress.updateQueue
           ? processUpdateQueue(
@@ -2283,18 +2197,33 @@ function ReactFiberClassComponent(
               newProps,
               renderExpirationTime
             )
-          : oldState;
-      null !== oldContext &&
-        void 0 !== oldContext &&
-        (renderExpirationTime =
+          : oldContext;
+      var derivedStateFromProps = void 0;
+      oldProps !== newProps &&
+        (derivedStateFromProps = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps,
+          renderExpirationTime
+        ));
+      if (null !== derivedStateFromProps && void 0 !== derivedStateFromProps) {
+        renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? oldContext
-            : Object.assign({}, renderExpirationTime, oldContext));
+            ? derivedStateFromProps
+            : Object.assign({}, renderExpirationTime, derivedStateFromProps);
+        var _updateQueue = workInProgress.updateQueue;
+        null !== _updateQueue &&
+          (_updateQueue.baseState = Object.assign(
+            {},
+            _updateQueue.baseState,
+            derivedStateFromProps
+          ));
+      }
       if (
         !(
           oldProps !== newProps ||
-          oldState !== renderExpirationTime ||
-          didPerformWorkStackCursor.current ||
+          oldContext !== renderExpirationTime ||
+          hasContextChanged() ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -2308,26 +2237,18 @@ function ReactFiberClassComponent(
         workInProgress,
         oldProps,
         newProps,
-        oldState,
+        oldContext,
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
-            "function" !== typeof instance.componentWillUpdate) ||
-            "function" === typeof ctor.getDerivedStateFromProps ||
-            ("function" === typeof instance.componentWillUpdate &&
-              instance.componentWillUpdate(
-                newProps,
-                renderExpirationTime,
-                newUnmaskedContext
-              ),
-            "function" === typeof instance.UNSAFE_componentWillUpdate &&
-              instance.UNSAFE_componentWillUpdate(
-                newProps,
-                renderExpirationTime,
-                newUnmaskedContext
-              )),
-          "function" === typeof instance.componentDidUpdate &&
+        ? (ctor ||
+            ("function" !== typeof instance.UNSAFE_componentWillMount &&
+              "function" !== typeof instance.componentWillMount) ||
+            ("function" === typeof instance.componentWillMount &&
+              instance.componentWillMount(),
+            "function" === typeof instance.UNSAFE_componentWillMount &&
+              instance.UNSAFE_componentWillMount()),
+          "function" === typeof instance.componentDidMount &&
             (workInProgress.effectTag |= 4))
         : ("function" === typeof instance.componentDidMount &&
             (workInProgress.effectTag |= 4),
@@ -2352,9 +2273,11 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-        "function" !== typeof instance.componentWillReceiveProps) ||
+      (ctor =
         "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate) ||
+        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof instance.componentWillReceiveProps) ||
         ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
           callComponentWillReceiveProps(
             workInProgress,
@@ -2362,13 +2285,6 @@ function ReactFiberClassComponent(
             newProps,
             newUnmaskedContext
           ));
-      var derivedStateFromProps = void 0;
-      oldProps !== newProps &&
-        (derivedStateFromProps = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps
-        ));
       oldContext = workInProgress.memoizedState;
       renderExpirationTime =
         null !== workInProgress.updateQueue
@@ -2381,17 +2297,32 @@ function ReactFiberClassComponent(
               renderExpirationTime
             )
           : oldContext;
-      null !== derivedStateFromProps &&
-        void 0 !== derivedStateFromProps &&
-        (renderExpirationTime =
+      var derivedStateFromProps = void 0;
+      oldProps !== newProps &&
+        (derivedStateFromProps = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps,
+          renderExpirationTime
+        ));
+      if (null !== derivedStateFromProps && void 0 !== derivedStateFromProps) {
+        renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
             ? derivedStateFromProps
-            : Object.assign({}, renderExpirationTime, derivedStateFromProps));
+            : Object.assign({}, renderExpirationTime, derivedStateFromProps);
+        var _updateQueue3 = workInProgress.updateQueue;
+        null !== _updateQueue3 &&
+          (_updateQueue3.baseState = Object.assign(
+            {},
+            _updateQueue3.baseState,
+            derivedStateFromProps
+          ));
+      }
       if (
         !(
           oldProps !== newProps ||
           oldContext !== renderExpirationTime ||
-          didPerformWorkStackCursor.current ||
+          hasContextChanged() ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -2401,6 +2332,10 @@ function ReactFiberClassComponent(
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
+          "function" !== typeof instance.getSnapshotBeforeUpdate ||
+            (oldProps === current.memoizedProps &&
+              oldContext === current.memoizedState) ||
+            (workInProgress.effectTag |= 2048),
           !1
         );
       (derivedStateFromProps = checkShouldComponentUpdate(
@@ -2411,9 +2346,9 @@ function ReactFiberClassComponent(
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
-            "function" !== typeof instance.componentWillUpdate) ||
-            "function" === typeof ctor.getDerivedStateFromProps ||
+        ? (ctor ||
+            ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
+              "function" !== typeof instance.componentWillUpdate) ||
             ("function" === typeof instance.componentWillUpdate &&
               instance.componentWillUpdate(
                 newProps,
@@ -2427,11 +2362,17 @@ function ReactFiberClassComponent(
                 newUnmaskedContext
               )),
           "function" === typeof instance.componentDidUpdate &&
-            (workInProgress.effectTag |= 4))
+            (workInProgress.effectTag |= 4),
+          "function" === typeof instance.getSnapshotBeforeUpdate &&
+            (workInProgress.effectTag |= 2048))
         : ("function" !== typeof instance.componentDidUpdate ||
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
+          "function" !== typeof instance.getSnapshotBeforeUpdate ||
+            (oldProps === current.memoizedProps &&
+              oldContext === current.memoizedState) ||
+            (workInProgress.effectTag |= 2048),
           memoizeProps(workInProgress, newProps),
           memoizeState(workInProgress, renderExpirationTime));
       instance.props = newProps;
@@ -3114,34 +3055,12 @@ function ChildReconciler(shouldTrackSideEffects) {
   };
 }
 var reconcileChildFibers = ChildReconciler(!0),
-  mountChildFibers = ChildReconciler(!1),
-  changedBitsStack = [],
-  currentValueStack = [],
-  stack = [],
-  index$1 = -1;
-function pushProvider(providerFiber) {
-  var context = providerFiber.type.context;
-  index$1 += 1;
-  changedBitsStack[index$1] = context._changedBits;
-  currentValueStack[index$1] = context._currentValue;
-  stack[index$1] = providerFiber;
-  context._currentValue = providerFiber.pendingProps.value;
-  context._changedBits = providerFiber.stateNode;
-}
-function popProvider(providerFiber) {
-  var changedBits = changedBitsStack[index$1],
-    currentValue = currentValueStack[index$1];
-  changedBitsStack[index$1] = null;
-  currentValueStack[index$1] = null;
-  stack[index$1] = null;
-  --index$1;
-  providerFiber = providerFiber.type.context;
-  providerFiber._currentValue = currentValue;
-  providerFiber._changedBits = changedBits;
-}
+  mountChildFibers = ChildReconciler(!1);
 function ReactFiberBeginWork(
   config,
   hostContext,
+  legacyContext,
+  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
@@ -3238,7 +3157,12 @@ function ReactFiberBeginWork(
     changedBits,
     renderExpirationTime
   ) {
-    for (var fiber = workInProgress.child; null !== fiber; ) {
+    var fiber = workInProgress.child;
+    for (
+      null !== fiber && (fiber["return"] = workInProgress);
+      null !== fiber;
+
+    ) {
       switch (fiber.tag) {
         case 12:
           var nextFiber = fiber.stateNode | 0;
@@ -3294,10 +3218,10 @@ function ReactFiberBeginWork(
     workInProgress,
     renderExpirationTime
   ) {
-    var context = workInProgress.type.context,
+    var context = workInProgress.type._context,
       newProps = workInProgress.pendingProps,
       oldProps = workInProgress.memoizedProps;
-    if (!didPerformWorkStackCursor.current && oldProps === newProps)
+    if (!hasLegacyContextChanged() && oldProps === newProps)
       return (
         (workInProgress.stateNode = 0),
         pushProvider(workInProgress),
@@ -3384,11 +3308,19 @@ function ReactFiberBeginWork(
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree,
     pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer,
+    pushProvider = newContext.pushProvider,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    hasLegacyContextChanged = legacyContext.hasContextChanged,
+    pushLegacyContextProvider = legacyContext.pushContextProvider,
+    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
+    invalidateContextProvider = legacyContext.invalidateContextProvider,
     enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
   config = ReactFiberClassComponent(
+    legacyContext,
     scheduleWork,
     computeExpirationForFiber,
     function(workInProgress, nextProps) {
@@ -3415,7 +3347,7 @@ function ReactFiberBeginWork(
             pushHostRootContext(workInProgress);
             break;
           case 2:
-            pushContextProvider(workInProgress);
+            pushLegacyContextProvider(workInProgress);
             break;
           case 4:
             pushHostContainer(
@@ -3452,7 +3384,8 @@ function ReactFiberBeginWork(
                 ((props = callGetDerivedStateFromProps(
                   workInProgress,
                   fn,
-                  props
+                  props,
+                  workInProgress.memoizedState
                 )),
                 null !== props &&
                   void 0 !== props &&
@@ -3461,7 +3394,7 @@ function ReactFiberBeginWork(
                     workInProgress.memoizedState,
                     props
                   ))),
-              (props = pushContextProvider(workInProgress)),
+              (props = pushLegacyContextProvider(workInProgress)),
               adoptClassInstance(workInProgress, fn),
               mountClassInstance(workInProgress, renderExpirationTime),
               (current = finishClassComponent(
@@ -3481,7 +3414,7 @@ function ReactFiberBeginWork(
           return (
             (props = workInProgress.type),
             (renderExpirationTime = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? ((fn = getUnmaskedContext(workInProgress)),
                 (fn = getMaskedContext(workInProgress, fn)),
@@ -3497,7 +3430,7 @@ function ReactFiberBeginWork(
             current
           );
         case 2:
-          props = pushContextProvider(workInProgress);
+          props = pushLegacyContextProvider(workInProgress);
           null === current
             ? null === workInProgress.stateNode
               ? (constructClassInstance(
@@ -3579,7 +3512,7 @@ function ReactFiberBeginWork(
             updateQueue = workInProgress.memoizedProps;
             fn = workInProgress.pendingProps;
             unmaskedContext = null !== current ? current.memoizedProps : null;
-            if (!didPerformWorkStackCursor.current && updateQueue === fn) {
+            if (!hasLegacyContextChanged() && updateQueue === fn) {
               if (
                 (updateQueue =
                   workInProgress.mode & 1 &&
@@ -3621,7 +3554,7 @@ function ReactFiberBeginWork(
         case 7:
           return (
             (props = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
               workInProgress.memoizedProps !== props ||
               (props = workInProgress.memoizedProps),
             (fn = props.children),
@@ -3651,8 +3584,7 @@ function ReactFiberBeginWork(
               workInProgress.stateNode.containerInfo
             ),
             (props = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
-            workInProgress.memoizedProps !== props
+            hasLegacyContextChanged() || workInProgress.memoizedProps !== props
               ? (null === current
                   ? (workInProgress.child = reconcileChildFibers(
                       workInProgress,
@@ -3669,10 +3601,21 @@ function ReactFiberBeginWork(
                 )),
             current
           );
+        case 14:
+          return (
+            (renderExpirationTime = workInProgress.type.render),
+            (renderExpirationTime = renderExpirationTime(
+              workInProgress.pendingProps,
+              workInProgress.ref
+            )),
+            reconcileChildren(current, workInProgress, renderExpirationTime),
+            (workInProgress.memoizedProps = renderExpirationTime),
+            workInProgress.child
+          );
         case 10:
           return (
             (renderExpirationTime = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? (reconcileChildren(
                   current,
@@ -3690,7 +3633,7 @@ function ReactFiberBeginWork(
         case 11:
           return (
             (renderExpirationTime = workInProgress.pendingProps.children),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             (null !== renderExpirationTime &&
               workInProgress.memoizedProps !== renderExpirationTime)
               ? (reconcileChildren(
@@ -3713,43 +3656,33 @@ function ReactFiberBeginWork(
             renderExpirationTime
           );
         case 12:
-          a: {
-            fn = workInProgress.type;
-            unmaskedContext = workInProgress.pendingProps;
-            updateQueue = workInProgress.memoizedProps;
-            props = fn._currentValue;
-            var changedBits = fn._changedBits;
-            if (
-              didPerformWorkStackCursor.current ||
-              0 !== changedBits ||
-              updateQueue !== unmaskedContext
-            ) {
-              workInProgress.memoizedProps = unmaskedContext;
-              var observedBits = unmaskedContext.unstable_observedBits;
-              if (void 0 === observedBits || null === observedBits)
-                observedBits = 1073741823;
-              workInProgress.stateNode = observedBits;
-              if (0 !== (changedBits & observedBits))
-                propagateContextChange(
-                  workInProgress,
-                  fn,
-                  changedBits,
-                  renderExpirationTime
-                );
-              else if (
-                null !== updateQueue &&
-                updateQueue.children === unmaskedContext.children
-              ) {
-                current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-                break a;
-              }
-              renderExpirationTime = unmaskedContext.children;
-              renderExpirationTime = renderExpirationTime(props);
-              reconcileChildren(current, workInProgress, renderExpirationTime);
-              current = workInProgress.child;
-            } else
-              current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-          }
+          fn = workInProgress.type;
+          unmaskedContext = workInProgress.pendingProps;
+          var oldProps = workInProgress.memoizedProps;
+          props = fn._currentValue;
+          updateQueue = fn._changedBits;
+          if (
+            hasLegacyContextChanged() ||
+            0 !== updateQueue ||
+            oldProps !== unmaskedContext
+          ) {
+            workInProgress.memoizedProps = unmaskedContext;
+            oldProps = unmaskedContext.unstable_observedBits;
+            if (void 0 === oldProps || null === oldProps) oldProps = 1073741823;
+            workInProgress.stateNode = oldProps;
+            0 !== (updateQueue & oldProps) &&
+              propagateContextChange(
+                workInProgress,
+                fn,
+                updateQueue,
+                renderExpirationTime
+              );
+            renderExpirationTime = unmaskedContext.children;
+            renderExpirationTime = renderExpirationTime(props);
+            reconcileChildren(current, workInProgress, renderExpirationTime);
+            current = workInProgress.child;
+          } else
+            current = bailoutOnAlreadyFinishedWork(current, workInProgress);
           return current;
         default:
           invariant(
@@ -3760,7 +3693,13 @@ function ReactFiberBeginWork(
     }
   };
 }
-function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
+function ReactFiberCompleteWork(
+  config,
+  hostContext,
+  legacyContext,
+  newContext,
+  hydrationContext
+) {
   function markUpdate(workInProgress) {
     workInProgress.effectTag |= 4;
   }
@@ -3793,6 +3732,9 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer,
+    popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popProvider = newContext.popProvider,
     prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -3892,7 +3834,7 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           return null;
         case 2:
           return (
-            popContextProvider(workInProgress),
+            popLegacyContextProvider(workInProgress),
             (current = workInProgress.stateNode),
             (newProps = workInProgress.updateQueue),
             null !== newProps &&
@@ -3905,8 +3847,7 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           );
         case 3:
           popHostContainer(workInProgress);
-          pop(didPerformWorkStackCursor, workInProgress);
-          pop(contextStackCursor, workInProgress);
+          popTopLevelLegacyContextObject(workInProgress);
           newProps = workInProgress.stateNode;
           newProps.pendingContext &&
             ((newProps.context = newProps.pendingContext),
@@ -4058,6 +3999,8 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           return (workInProgress.tag = 7), null;
         case 9:
           return null;
+        case 14:
+          return null;
         case 10:
           return null;
         case 11:
@@ -4088,11 +4031,16 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
 }
 function ReactFiberUnwindWork(
   hostContext,
+  legacyContext,
+  newContext,
   scheduleWork,
   isAlreadyFailedLegacyErrorBoundary
 ) {
   var popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext;
+    popHostContext = hostContext.popHostContext,
+    popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popProvider = newContext.popProvider;
   return {
     throwException: function(returnFiber, sourceFiber, rawValue) {
       sourceFiber.effectTag |= 512;
@@ -4133,7 +4081,7 @@ function ReactFiberUnwindWork(
     unwindWork: function(workInProgress) {
       switch (workInProgress.tag) {
         case 2:
-          popContextProvider(workInProgress);
+          popLegacyContextProvider(workInProgress);
           var effectTag = workInProgress.effectTag;
           return effectTag & 1024
             ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4142,8 +4090,7 @@ function ReactFiberUnwindWork(
         case 3:
           return (
             popHostContainer(workInProgress),
-            pop(didPerformWorkStackCursor, workInProgress),
-            pop(contextStackCursor, workInProgress),
+            popTopLevelLegacyContextObject(workInProgress),
             (effectTag = workInProgress.effectTag),
             effectTag & 1024
               ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4159,6 +4106,25 @@ function ReactFiberUnwindWork(
         default:
           return null;
       }
+    },
+    unwindInterruptedWork: function(interruptedWork) {
+      switch (interruptedWork.tag) {
+        case 2:
+          popLegacyContextProvider(interruptedWork);
+          break;
+        case 3:
+          popHostContainer(interruptedWork);
+          popTopLevelLegacyContextObject(interruptedWork);
+          break;
+        case 5:
+          popHostContext(interruptedWork);
+          break;
+        case 4:
+          popHostContainer(interruptedWork);
+          break;
+        case 13:
+          popProvider(interruptedWork);
+      }
     }
   };
 }
@@ -4167,7 +4133,7 @@ function logError(boundary, errorInfo) {
   null === errorInfo.stack && getStackAddendumByWorkInProgressFiber(source);
   null !== source && getComponentName(source);
   errorInfo = errorInfo.value;
-  null !== boundary && getComponentName(boundary);
+  null !== boundary && 2 === boundary.tag && getComponentName(boundary);
   try {
     (errorInfo && errorInfo.suppressReactErrorLogging) ||
       console.error(errorInfo);
@@ -4191,7 +4157,32 @@ function ReactFiberCommitWork(
         } catch (refError) {
           captureError(current, refError);
         }
-      else ref.value = null;
+      else ref.current = null;
+  }
+  function commitBeforeMutationLifeCycles(current, finishedWork) {
+    switch (finishedWork.tag) {
+      case 2:
+        if (finishedWork.effectTag & 2048 && null !== current) {
+          var prevProps = current.memoizedProps,
+            prevState = current.memoizedState;
+          current = finishedWork.stateNode;
+          current.props = finishedWork.memoizedProps;
+          current.state = finishedWork.memoizedState;
+          finishedWork = current.getSnapshotBeforeUpdate(prevProps, prevState);
+          current.__reactInternalSnapshotBeforeUpdate = finishedWork;
+        }
+        break;
+      case 3:
+      case 5:
+      case 6:
+      case 4:
+        break;
+      default:
+        invariant(
+          !1,
+          "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+        );
+    }
   }
   function commitLifeCycles(finishedRoot, current, finishedWork) {
     switch (finishedWork.tag) {
@@ -4207,7 +4198,11 @@ function ReactFiberCommitWork(
             current = current.memoizedState;
             finishedRoot.props = finishedWork.memoizedProps;
             finishedRoot.state = finishedWork.memoizedState;
-            finishedRoot.componentDidUpdate(prevProps, current);
+            finishedRoot.componentDidUpdate(
+              prevProps,
+              current,
+              finishedRoot.__reactInternalSnapshotBeforeUpdate
+            );
           }
         finishedWork = finishedWork.updateQueue;
         null !== finishedWork && commitCallbacks(finishedWork, finishedRoot);
@@ -4267,9 +4262,12 @@ function ReactFiberCommitWork(
         onUncaughtError.state = finishedWork.memoizedState;
         for (ctor = 0; ctor < capturedErrors.length; ctor++) {
           updateQueue = capturedErrors[ctor];
-          var _error = updateQueue.value;
+          var _error = updateQueue.value,
+            stack = updateQueue.stack;
           logError(finishedWork, updateQueue);
-          onUncaughtError.componentDidCatch(_error);
+          onUncaughtError.componentDidCatch(_error, {
+            componentStack: null !== stack ? stack : ""
+          });
         }
         break;
       case 3:
@@ -4295,23 +4293,25 @@ function ReactFiberCommitWork(
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (null !== ref) {
-      var _instance5 = finishedWork.stateNode;
+      var _instance6 = finishedWork.stateNode;
       switch (finishedWork.tag) {
         case 5:
-          finishedWork = getPublicInstance(_instance5);
+          finishedWork = getPublicInstance(_instance6);
           break;
         default:
-          finishedWork = _instance5;
+          finishedWork = _instance6;
       }
       "function" === typeof ref
         ? ref(finishedWork)
-        : (ref.value = finishedWork);
+        : (ref.current = finishedWork);
     }
   }
   function commitDetachRef(current) {
     current = current.ref;
     null !== current &&
-      ("function" === typeof current ? current(null) : (current.value = null));
+      ("function" === typeof current
+        ? current(null)
+        : (current.current = null));
   }
   function commitNestedUnmounts(root) {
     for (var node = root; ; ) {
@@ -4320,12 +4320,12 @@ function ReactFiberCommitWork(
       switch (current.tag) {
         case 2:
           safelyDetachRef(current);
-          var _instance6 = current.stateNode;
-          if ("function" === typeof _instance6.componentWillUnmount)
+          var _instance7 = current.stateNode;
+          if ("function" === typeof _instance7.componentWillUnmount)
             try {
-              (_instance6.props = current.memoizedProps),
-                (_instance6.state = current.memoizedState),
-                _instance6.componentWillUnmount();
+              (_instance7.props = current.memoizedProps),
+                (_instance7.state = current.memoizedState),
+                _instance7.componentWillUnmount();
             } catch (unmountError) {
               captureError(current, unmountError);
             }
@@ -4403,6 +4403,7 @@ function ReactFiberCommitWork(
         commitContainer(finishedWork);
       },
       commitLifeCycles: commitLifeCycles,
+      commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
       commitErrorLogging: commitErrorLogging,
       commitAttachRef: commitAttachRef,
       commitDetachRef: commitDetachRef
@@ -4412,7 +4413,7 @@ function ReactFiberCommitWork(
   invariant(!1, "Mutating reconciler is disabled.");
 }
 var NO_CONTEXT = {};
-function ReactFiberHostContext(config) {
+function ReactFiberHostContext(config, stack) {
   function requiredContext(c) {
     invariant(
       c !== NO_CONTEXT,
@@ -4421,10 +4422,13 @@ function ReactFiberHostContext(config) {
     return c;
   }
   var getChildHostContext = config.getChildHostContext,
-    getRootHostContext = config.getRootHostContext,
-    contextStackCursor = { current: NO_CONTEXT },
-    contextFiberStackCursor = { current: NO_CONTEXT },
-    rootInstanceStackCursor = { current: NO_CONTEXT };
+    getRootHostContext = config.getRootHostContext;
+  config = stack.createCursor;
+  var push = stack.push,
+    pop = stack.pop,
+    contextStackCursor = config(NO_CONTEXT),
+    contextFiberStackCursor = config(NO_CONTEXT),
+    rootInstanceStackCursor = config(NO_CONTEXT);
   return {
     getHostContext: function() {
       return requiredContext(contextStackCursor.current);
@@ -4443,8 +4447,10 @@ function ReactFiberHostContext(config) {
     },
     pushHostContainer: function(fiber, nextRootInstance) {
       push(rootInstanceStackCursor, nextRootInstance, fiber);
-      nextRootInstance = getRootHostContext(nextRootInstance);
       push(contextFiberStackCursor, fiber, fiber);
+      push(contextStackCursor, NO_CONTEXT, fiber);
+      nextRootInstance = getRootHostContext(nextRootInstance);
+      pop(contextStackCursor, fiber);
       push(contextStackCursor, nextRootInstance, fiber);
     },
     pushHostContext: function(fiber) {
@@ -4454,10 +4460,6 @@ function ReactFiberHostContext(config) {
       context !== rootInstance &&
         (push(contextFiberStackCursor, fiber, fiber),
         push(contextStackCursor, rootInstance, fiber));
-    },
-    resetHostContainer: function() {
-      contextStackCursor.current = NO_CONTEXT;
-      rootInstanceStackCursor.current = NO_CONTEXT;
     }
   };
 }
@@ -4617,22 +4619,198 @@ function ReactFiberHydrationContext(config) {
     }
   };
 }
-function ReactFiberScheduler(config) {
-  function resetContextStack() {
-    for (; -1 < index; ) (valueStack[index] = null), index--;
+function ReactFiberLegacyContext(stack) {
+  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+    workInProgress = workInProgress.stateNode;
+    workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    workInProgress.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  }
+  function isContextProvider(fiber) {
+    return 2 === fiber.tag && null != fiber.type.childContextTypes;
+  }
+  function processChildContext(fiber, parentContext) {
+    var instance = fiber.stateNode,
+      childContextTypes = fiber.type.childContextTypes;
+    if ("function" !== typeof instance.getChildContext) return parentContext;
+    instance = instance.getChildContext();
+    for (var contextKey in instance)
+      invariant(
+        contextKey in childContextTypes,
+        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+        getComponentName(fiber) || "Unknown",
+        contextKey
+      );
+    return Object.assign({}, parentContext, instance);
+  }
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop,
+    contextStackCursor = createCursor(emptyObject),
+    didPerformWorkStackCursor = createCursor(!1),
     previousContext = emptyObject;
-    contextStackCursor.current = emptyObject;
-    didPerformWorkStackCursor.current = !1;
-    resetHostContainer();
-    for (var i = index$1; -1 < i; i--) {
-      var context = stack[i].type.context;
-      context._currentValue = context._defaultValue;
-      context._changedBits = 0;
-      changedBitsStack[i] = null;
-      currentValueStack[i] = null;
-      stack[i] = null;
+  return {
+    getUnmaskedContext: function(workInProgress) {
+      return isContextProvider(workInProgress)
+        ? previousContext
+        : contextStackCursor.current;
+    },
+    cacheContext: cacheContext,
+    getMaskedContext: function(workInProgress, unmaskedContext) {
+      var contextTypes = workInProgress.type.contextTypes;
+      if (!contextTypes) return emptyObject;
+      var instance = workInProgress.stateNode;
+      if (
+        instance &&
+        instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+      )
+        return instance.__reactInternalMemoizedMaskedChildContext;
+      var context = {},
+        key;
+      for (key in contextTypes) context[key] = unmaskedContext[key];
+      instance && cacheContext(workInProgress, unmaskedContext, context);
+      return context;
+    },
+    hasContextChanged: function() {
+      return didPerformWorkStackCursor.current;
+    },
+    isContextConsumer: function(fiber) {
+      return 2 === fiber.tag && null != fiber.type.contextTypes;
+    },
+    isContextProvider: isContextProvider,
+    popContextProvider: function(fiber) {
+      isContextProvider(fiber) &&
+        (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
+    },
+    popTopLevelContextObject: function(fiber) {
+      pop(didPerformWorkStackCursor, fiber);
+      pop(contextStackCursor, fiber);
+    },
+    pushTopLevelContextObject: function(fiber, context, didChange) {
+      invariant(
+        null == contextStackCursor.cursor,
+        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
+      );
+      push(contextStackCursor, context, fiber);
+      push(didPerformWorkStackCursor, didChange, fiber);
+    },
+    processChildContext: processChildContext,
+    pushContextProvider: function(workInProgress) {
+      if (!isContextProvider(workInProgress)) return !1;
+      var instance = workInProgress.stateNode;
+      instance =
+        (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+        emptyObject;
+      previousContext = contextStackCursor.current;
+      push(contextStackCursor, instance, workInProgress);
+      push(
+        didPerformWorkStackCursor,
+        didPerformWorkStackCursor.current,
+        workInProgress
+      );
+      return !0;
+    },
+    invalidateContextProvider: function(workInProgress, didChange) {
+      var instance = workInProgress.stateNode;
+      invariant(
+        instance,
+        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+      );
+      if (didChange) {
+        var mergedContext = processChildContext(
+          workInProgress,
+          previousContext
+        );
+        instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+        pop(didPerformWorkStackCursor, workInProgress);
+        pop(contextStackCursor, workInProgress);
+        push(contextStackCursor, mergedContext, workInProgress);
+      } else pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    },
+    findCurrentUnmaskedContext: function(fiber) {
+      for (
+        invariant(
+          2 === isFiberMountedImpl(fiber) && 2 === fiber.tag,
+          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+        );
+        3 !== fiber.tag;
+
+      ) {
+        if (isContextProvider(fiber))
+          return fiber.stateNode.__reactInternalMemoizedMergedChildContext;
+        fiber = fiber["return"];
+        invariant(
+          fiber,
+          "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
+      return fiber.stateNode.context;
+    }
+  };
+}
+function ReactFiberNewContext(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop,
+    providerCursor = createCursor(null),
+    valueCursor = createCursor(null),
+    changedBitsCursor = createCursor(0);
+  return {
+    pushProvider: function(providerFiber) {
+      var context = providerFiber.type._context;
+      push(changedBitsCursor, context._changedBits, providerFiber);
+      push(valueCursor, context._currentValue, providerFiber);
+      push(providerCursor, providerFiber, providerFiber);
+      context._currentValue = providerFiber.pendingProps.value;
+      context._changedBits = providerFiber.stateNode;
+    },
+    popProvider: function(providerFiber) {
+      var changedBits = changedBitsCursor.current,
+        currentValue = valueCursor.current;
+      pop(providerCursor, providerFiber);
+      pop(valueCursor, providerFiber);
+      pop(changedBitsCursor, providerFiber);
+      providerFiber = providerFiber.type._context;
+      providerFiber._currentValue = currentValue;
+      providerFiber._changedBits = changedBits;
     }
-    index$1 = -1;
+  };
+}
+function ReactFiberStack() {
+  var valueStack = [],
+    index = -1;
+  return {
+    createCursor: function(defaultValue) {
+      return { current: defaultValue };
+    },
+    isEmpty: function() {
+      return -1 === index;
+    },
+    pop: function(cursor) {
+      0 > index ||
+        ((cursor.current = valueStack[index]),
+        (valueStack[index] = null),
+        index--);
+    },
+    push: function(cursor, value) {
+      index++;
+      valueStack[index] = cursor.current;
+      cursor.current = value;
+    },
+    checkThatStackIsEmpty: function() {},
+    resetStackAfterFatalErrorInDev: function() {}
+  };
+}
+function ReactFiberScheduler(config) {
+  function resetStack() {
+    if (null !== nextUnitOfWork)
+      for (
+        var interruptedWork = nextUnitOfWork["return"];
+        null !== interruptedWork;
+
+      )
+        unwindInterruptedWork(interruptedWork),
+          (interruptedWork = interruptedWork["return"]);
     nextRoot = null;
     nextRenderExpirationTime = 0;
     nextUnitOfWork = null;
@@ -4705,7 +4883,7 @@ function ReactFiberScheduler(config) {
         workInProgress$jscomp$0 = unwindWork(workInProgress$jscomp$0);
         if (null !== workInProgress$jscomp$0)
           return (
-            (workInProgress$jscomp$0.effectTag &= 511), workInProgress$jscomp$0
+            (workInProgress$jscomp$0.effectTag &= 2559), workInProgress$jscomp$0
           );
         null !== returnFiber &&
           ((returnFiber.firstEffect = returnFiber.lastEffect = null),
@@ -4738,7 +4916,7 @@ function ReactFiberScheduler(config) {
       root !== nextRoot ||
       null === nextUnitOfWork
     )
-      resetContextStack(),
+      resetStack(),
         (nextRoot = root),
         (nextRenderExpirationTime = expirationTime),
         (nextUnitOfWork = createWorkInProgress(
@@ -4868,8 +5046,8 @@ function ReactFiberScheduler(config) {
             !isWorking &&
               0 !== nextRenderExpirationTime &&
               expirationTime < nextRenderExpirationTime &&
-              resetContextStack();
-            (nextRoot === root && isWorking) ||
+              resetStack();
+            (isWorking && !isCommitting && nextRoot === root) ||
               requestWork(root, expirationTime);
             nestedUpdateCount > NESTED_UPDATE_LIMIT &&
               invariant(
@@ -4933,7 +5111,7 @@ function ReactFiberScheduler(config) {
           (nextFlushedExpirationTime = 1),
           performWorkOnRoot(root, 1, !1))
         : 1 === expirationTime
-          ? performWork(1, !1, null)
+          ? performSyncWork()
           : scheduleCallbackWithExpiration(expirationTime));
   }
   function findHighestPriorityRoot() {
@@ -4993,6 +5171,9 @@ function ReactFiberScheduler(config) {
   function performAsyncWork(dl) {
     performWork(0, !0, dl);
   }
+  function performSyncWork() {
+    performWork(1, !1, null);
+  }
   function performWork(minExpirationTime, isAsync, dl) {
     deadline = dl;
     findHighestPriorityRoot();
@@ -5115,6 +5296,25 @@ function ReactFiberScheduler(config) {
     for (nextEffect = firstEffect; null !== nextEffect; ) {
       var didError = !1,
         error = void 0;
+      try {
+        for (; null !== nextEffect; )
+          nextEffect.effectTag & 2048 &&
+            commitBeforeMutationLifeCycles(nextEffect.alternate, nextEffect),
+            (nextEffect = nextEffect.nextEffect);
+      } catch (e) {
+        (didError = !0), (error = e);
+      }
+      didError &&
+        (invariant(
+          null !== nextEffect,
+          "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
+        ),
+        onCommitPhaseError(nextEffect, error),
+        null !== nextEffect && (nextEffect = nextEffect.nextEffect));
+    }
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
+      didError = !1;
+      error = void 0;
       try {
         for (; null !== nextEffect; ) {
           var effectTag = nextEffect.effectTag;
@@ -5212,25 +5412,37 @@ function ReactFiberScheduler(config) {
     nextFlushedRoot.remainingExpirationTime = 0;
     hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
   }
-  var hostContext = ReactFiberHostContext(config),
-    hydrationContext = ReactFiberHydrationContext(config),
-    resetHostContainer = hostContext.resetHostContainer,
+  var stack = ReactFiberStack(),
+    hostContext = ReactFiberHostContext(config, stack),
+    legacyContext = ReactFiberLegacyContext(stack);
+  stack = ReactFiberNewContext(stack);
+  var hydrationContext = ReactFiberHydrationContext(config),
     beginWork = ReactFiberBeginWork(
       config,
       hostContext,
+      legacyContext,
+      stack,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
     ).beginWork,
-    completeWork = ReactFiberCompleteWork(config, hostContext, hydrationContext)
-      .completeWork;
+    completeWork = ReactFiberCompleteWork(
+      config,
+      hostContext,
+      legacyContext,
+      stack,
+      hydrationContext
+    ).completeWork;
   hostContext = ReactFiberUnwindWork(
     hostContext,
+    legacyContext,
+    stack,
     scheduleWork,
     isAlreadyFailedLegacyErrorBoundary
   );
   var throwException = hostContext.throwException,
-    unwindWork = hostContext.unwindWork;
+    unwindWork = hostContext.unwindWork,
+    unwindInterruptedWork = hostContext.unwindInterruptedWork;
   hostContext = ReactFiberCommitWork(
     config,
     onCommitPhaseError,
@@ -5243,7 +5455,9 @@ function ReactFiberScheduler(config) {
     },
     recalculateCurrentTime
   );
-  var commitResetTextContent = hostContext.commitResetTextContent,
+  var commitBeforeMutationLifeCycles =
+      hostContext.commitBeforeMutationLifeCycles,
+    commitResetTextContent = hostContext.commitResetTextContent,
     commitPlacement = hostContext.commitPlacement,
     commitDeletion = hostContext.commitDeletion,
     commitWork = hostContext.commitWork,
@@ -5298,7 +5512,10 @@ function ReactFiberScheduler(config) {
         !isRendering,
         "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
       );
+      nextFlushedRoot = root;
+      nextFlushedExpirationTime = expirationTime;
       performWorkOnRoot(root, expirationTime, !1);
+      performSyncWork();
       finishRendering();
     },
     batchedUpdates: function(fn, a) {
@@ -5309,7 +5526,7 @@ function ReactFiberScheduler(config) {
       } finally {
         (isBatchingUpdates = previousIsBatchingUpdates) ||
           isRendering ||
-          performWork(1, !1, null);
+          performSyncWork();
       }
     },
     unbatchedUpdates: function(fn, a) {
@@ -5333,8 +5550,7 @@ function ReactFiberScheduler(config) {
       try {
         return syncUpdates(fn, a);
       } finally {
-        (isBatchingUpdates = previousIsBatchingUpdates),
-          performWork(1, !1, null);
+        (isBatchingUpdates = previousIsBatchingUpdates), performSyncWork();
       }
     },
     flushControlled: function(fn) {
@@ -5375,7 +5591,7 @@ function ReactFiberScheduler(config) {
         (isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates),
           (isBatchingUpdates = previousIsBatchingUpdates) ||
             isRendering ||
-            performWork(1, !1, null);
+            performSyncWork();
       }
     },
     flushInteractiveUpdates: function() {
@@ -5389,7 +5605,8 @@ function ReactFiberScheduler(config) {
       result <= lastUniqueAsyncExpiration &&
         (result = lastUniqueAsyncExpiration + 1);
       return (lastUniqueAsyncExpiration = result);
-    }
+    },
+    legacyContext: legacyContext
   };
 }
 function ReactFiberReconciler$1(config) {
@@ -5404,27 +5621,7 @@ function ReactFiberReconciler$1(config) {
     currentTime = container.current;
     if (parentComponent) {
       parentComponent = parentComponent._reactInternalFiber;
-      var parentContext;
-      b: {
-        invariant(
-          2 === isFiberMountedImpl(parentComponent) &&
-            2 === parentComponent.tag,
-          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-        );
-        for (parentContext = parentComponent; 3 !== parentContext.tag; ) {
-          if (isContextProvider(parentContext)) {
-            parentContext =
-              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
-            break b;
-          }
-          parentContext = parentContext["return"];
-          invariant(
-            parentContext,
-            "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-          );
-        }
-        parentContext = parentContext.stateNode.context;
-      }
+      var parentContext = findCurrentUnmaskedContext(parentComponent);
       parentComponent = isContextProvider(parentComponent)
         ? processChildContext(parentComponent, parentContext)
         : parentContext;
@@ -5453,7 +5650,11 @@ function ReactFiberReconciler$1(config) {
   config = ReactFiberScheduler(config);
   var recalculateCurrentTime = config.recalculateCurrentTime,
     computeExpirationForFiber = config.computeExpirationForFiber,
-    scheduleWork = config.scheduleWork;
+    scheduleWork = config.scheduleWork,
+    legacyContext = config.legacyContext,
+    findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
+    isContextProvider = legacyContext.isContextProvider,
+    processChildContext = legacyContext.processChildContext;
   return {
     createContainer: function(containerInfo, isAsync, hydrate) {
       isAsync = new FiberNode(3, null, null, isAsync ? 3 : 0);
@@ -5891,7 +6092,7 @@ ReactFabricRenderer.injectIntoDevTools({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.3.0-alpha.1",
+  version: "16.3.1",
   rendererPackageName: "react-native-renderer"
 });
 var ReactFabric$2 = Object.freeze({ default: ReactFabric }),
diff --git a/Libraries/Renderer/ReactNativeRenderer-dev.js b/Libraries/Renderer/ReactNativeRenderer-dev.js
index 400472d29a3875..7fd62f11ca6ae4 100644
--- a/Libraries/Renderer/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/ReactNativeRenderer-dev.js
@@ -26,9 +26,9 @@ var deepDiffer = require("deepDiffer");
 var flattenStyle = require("flattenStyle");
 var React = require("react");
 var emptyObject = require("fbjs/lib/emptyObject");
-var checkPropTypes = require("prop-types/checkPropTypes");
 var shallowEqual = require("fbjs/lib/shallowEqual");
 var ExceptionsManager = require("ExceptionsManager");
+var checkPropTypes = require("prop-types/checkPropTypes");
 var deepFreezeAndThrowOnMutationInDev = require("deepFreezeAndThrowOnMutationInDev");
 
 var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
@@ -510,11 +510,13 @@ var injection$1 = {
     getNodeFromInstance = Injected.getNodeFromInstance;
 
     {
-      warning(
-        getNodeFromInstance && getInstanceFromNode,
-        "EventPluginUtils.injection.injectComponentTree(...): Injected " +
-          "module is missing getNodeFromInstance or getInstanceFromNode."
-      );
+      !(getNodeFromInstance && getInstanceFromNode)
+        ? warning(
+            false,
+            "EventPluginUtils.injection.injectComponentTree(...): Injected " +
+              "module is missing getNodeFromInstance or getInstanceFromNode."
+          )
+        : void 0;
     }
   }
 };
@@ -550,10 +552,9 @@ var validateEventDispatches = void 0;
       ? dispatchInstances.length
       : dispatchInstances ? 1 : 0;
 
-    warning(
-      instancesIsArr === listenersIsArr && instancesLen === listenersLen,
-      "EventPluginUtils: Invalid `event`."
-    );
+    !(instancesIsArr === listenersIsArr && instancesLen === listenersLen)
+      ? warning(false, "EventPluginUtils: Invalid `event`.")
+      : void 0;
   };
 }
 
@@ -965,6 +966,7 @@ var Fragment = 10;
 var Mode = 11;
 var ContextConsumer = 12;
 var ContextProvider = 13;
+var ForwardRef = 14;
 
 function getParent(inst) {
   do {
@@ -1093,7 +1095,7 @@ function listenerAtPhase(inst, event, propagationPhase) {
  */
 function accumulateDirectionalDispatches(inst, phase, event) {
   {
-    warning(inst, "Dispatching inst must not be null");
+    !inst ? warning(false, "Dispatching inst must not be null") : void 0;
   }
   var listener = listenerAtPhase(inst, event, phase);
   if (listener) {
@@ -1412,13 +1414,15 @@ SyntheticEvent.extend = function(Interface) {
               !target.constructor.Interface.hasOwnProperty(prop) &&
               shouldBeReleasedProperties.indexOf(prop) === -1
             ) {
-              warning(
-                didWarnForAddedNewProperty || target.isPersistent(),
-                "This synthetic event is reused for performance reasons. If you're " +
-                  "seeing this, you're adding a new property in the synthetic event object. " +
-                  "The property is never released. See " +
-                  "https://fb.me/react-event-pooling for more information."
-              );
+              !(didWarnForAddedNewProperty || target.isPersistent())
+                ? warning(
+                    false,
+                    "This synthetic event is reused for performance reasons. If you're " +
+                      "seeing this, you're adding a new property in the synthetic event object. " +
+                      "The property is never released. See " +
+                      "https://fb.me/react-event-pooling for more information."
+                  )
+                : void 0;
               didWarnForAddedNewProperty = true;
             }
             target[prop] = value;
@@ -1465,16 +1469,18 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
 
   function warn(action, result) {
     var warningCondition = false;
-    warning(
-      warningCondition,
-      "This synthetic event is reused for performance reasons. If you're seeing this, " +
-        "you're %s `%s` on a released/nullified synthetic event. %s. " +
-        "If you must keep the original synthetic event around, use event.persist(). " +
-        "See https://fb.me/react-event-pooling for more information.",
-      action,
-      propName,
-      result
-    );
+    !warningCondition
+      ? warning(
+          false,
+          "This synthetic event is reused for performance reasons. If you're seeing this, " +
+            "you're %s `%s` on a released/nullified synthetic event. %s. " +
+            "If you must keep the original synthetic event around, use event.persist(). " +
+            "See https://fb.me/react-event-pooling for more information.",
+          action,
+          propName,
+          result
+        )
+      : void 0;
   }
 }
 
@@ -1592,13 +1598,15 @@ function getTouchIdentifier(_ref) {
 
   invariant(identifier != null, "Touch object is missing identifier.");
   {
-    warning(
-      identifier <= MAX_TOUCH_BANK,
-      "Touch identifier %s is greater than maximum supported %s which causes " +
-        "performance issues backfilling array locations for all of the indices.",
-      identifier,
-      MAX_TOUCH_BANK
-    );
+    !(identifier <= MAX_TOUCH_BANK)
+      ? warning(
+          false,
+          "Touch identifier %s is greater than maximum supported %s which causes " +
+            "performance issues backfilling array locations for all of the indices.",
+          identifier,
+          MAX_TOUCH_BANK
+        )
+      : void 0;
   }
   return identifier;
 }
@@ -1697,10 +1705,9 @@ var ResponderTouchHistoryStore = {
         }
         {
           var activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
-          warning(
-            activeRecord != null && activeRecord.touchActive,
-            "Cannot find single active touch."
-          );
+          !(activeRecord != null && activeRecord.touchActive)
+            ? warning(false, "Cannot find single active touch.")
+            : void 0;
         }
       }
     }
@@ -2802,6 +2809,9 @@ var REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 0xeace;
 var REACT_ASYNC_MODE_TYPE = hasSymbol
   ? Symbol["for"]("react.async_mode")
   : 0xeacf;
+var REACT_FORWARD_REF_TYPE = hasSymbol
+  ? Symbol["for"]("react.forward_ref")
+  : 0xead0;
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
 var FAUX_ITERATOR_SYMBOL = "@@iterator";
@@ -2983,7 +2993,7 @@ var TouchHistoryMath = {
 
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.3.0-alpha.1";
+var ReactVersion = "16.3.1";
 
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -3653,15 +3663,17 @@ function findNodeHandle(componentOrHandle) {
   {
     var owner = ReactCurrentOwner.current;
     if (owner !== null && owner.stateNode !== null) {
-      warning(
-        owner.stateNode._warnedAboutRefsInRender,
-        "%s is accessing findNodeHandle inside its render(). " +
-          "render() should be a pure function of props and state. It should " +
-          "never access something that requires stale data from the previous " +
-          "render, such as refs. Move this logic to componentDidMount and " +
-          "componentDidUpdate instead.",
-        getComponentName(owner) || "A component"
-      );
+      !owner.stateNode._warnedAboutRefsInRender
+        ? warning(
+            false,
+            "%s is accessing findNodeHandle inside its render(). " +
+              "render() should be a pure function of props and state. It should " +
+              "never access something that requires stale data from the previous " +
+              "render, such as refs. Move this logic to componentDidMount and " +
+              "componentDidUpdate instead.",
+            getComponentName(owner) || "A component"
+          )
+        : void 0;
 
       owner.stateNode._warnedAboutRefsInRender = true;
     }
@@ -4116,9 +4128,10 @@ var Callback = /*              */ 32;
 var DidCapture = /*            */ 64;
 var Ref = /*                   */ 128;
 var ErrLog = /*                */ 256;
+var Snapshot = /*              */ 2048;
 
 // Union of all host effects
-var HostEffectMask = /*        */ 511;
+var HostEffectMask = /*        */ 2559;
 
 var Incomplete = /*            */ 512;
 var ShouldCapture = /*         */ 1024;
@@ -4166,15 +4179,17 @@ function isMounted(component) {
     if (owner !== null && owner.tag === ClassComponent) {
       var ownerFiber = owner;
       var instance = ownerFiber.stateNode;
-      warning(
-        instance._warnedAboutRefsInRender,
-        "%s is accessing isMounted inside its render() function. " +
-          "render() should be a pure function of props and state. It should " +
-          "never access something that requires stale data from the previous " +
-          "render, such as refs. Move this logic to componentDidMount and " +
-          "componentDidUpdate instead.",
-        getComponentName(ownerFiber) || "A component"
-      );
+      !instance._warnedAboutRefsInRender
+        ? warning(
+            false,
+            "%s is accessing isMounted inside its render() function. " +
+              "render() should be a pure function of props and state. It should " +
+              "never access something that requires stale data from the previous " +
+              "render, such as refs. Move this logic to componentDidMount and " +
+              "componentDidUpdate instead.",
+            getComponentName(ownerFiber) || "A component"
+          )
+        : void 0;
       instance._warnedAboutRefsInRender = true;
     }
   }
@@ -4385,1721 +4400,1469 @@ function findCurrentHostFiberWithNoPortals(parent) {
   return null;
 }
 
-var valueStack = [];
+// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
+// Math.pow(2, 30) - 1
+// 0b111111111111111111111111111111
+var MAX_SIGNED_31_BIT_INT = 1073741823;
 
-var fiberStack = void 0;
+// TODO: Use an opaque type once ESLint et al support the syntax
 
-{
-  fiberStack = [];
-}
+var NoWork = 0;
+var Sync = 1;
+var Never = MAX_SIGNED_31_BIT_INT;
 
-var index = -1;
+var UNIT_SIZE = 10;
+var MAGIC_NUMBER_OFFSET = 2;
 
-function createCursor(defaultValue) {
-  return {
-    current: defaultValue
-  };
+// 1 unit of expiration time represents 10ms.
+function msToExpirationTime(ms) {
+  // Always add an offset so that we don't clash with the magic number for NoWork.
+  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
 }
 
-function pop(cursor, fiber) {
-  if (index < 0) {
-    {
-      warning(false, "Unexpected pop.");
-    }
-    return;
-  }
+function expirationTimeToMs(expirationTime) {
+  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
+}
 
-  {
-    if (fiber !== fiberStack[index]) {
-      warning(false, "Unexpected Fiber popped.");
-    }
-  }
+function ceiling(num, precision) {
+  return (((num / precision) | 0) + 1) * precision;
+}
 
-  cursor.current = valueStack[index];
+function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
+  return ceiling(
+    currentTime + expirationInMs / UNIT_SIZE,
+    bucketSizeMs / UNIT_SIZE
+  );
+}
+
+var NoContext = 0;
+var AsyncMode = 1;
+var StrictMode = 2;
 
-  valueStack[index] = null;
+var hasBadMapPolyfill = void 0;
 
-  {
-    fiberStack[index] = null;
+{
+  hasBadMapPolyfill = false;
+  try {
+    var nonExtensibleObject = Object.preventExtensions({});
+    var testMap = new Map([[nonExtensibleObject, null]]);
+    var testSet = new Set([nonExtensibleObject]);
+    // This is necessary for Rollup to not consider these unused.
+    // https://github.com/rollup/rollup/issues/1771
+    // TODO: we can remove these if Rollup fixes the bug.
+    testMap.set(0, 0);
+    testSet.add(0);
+  } catch (e) {
+    // TODO: Consider warning about bad polyfills
+    hasBadMapPolyfill = true;
   }
+}
+
+// A Fiber is work on a Component that needs to be done or was done. There can
+// be more than one per component.
+
+var debugCounter = void 0;
 
-  index--;
+{
+  debugCounter = 1;
 }
 
-function push(cursor, value, fiber) {
-  index++;
+function FiberNode(tag, pendingProps, key, mode) {
+  // Instance
+  this.tag = tag;
+  this.key = key;
+  this.type = null;
+  this.stateNode = null;
+
+  // Fiber
+  this["return"] = null;
+  this.child = null;
+  this.sibling = null;
+  this.index = 0;
+
+  this.ref = null;
+
+  this.pendingProps = pendingProps;
+  this.memoizedProps = null;
+  this.updateQueue = null;
+  this.memoizedState = null;
+
+  this.mode = mode;
+
+  // Effects
+  this.effectTag = NoEffect;
+  this.nextEffect = null;
+
+  this.firstEffect = null;
+  this.lastEffect = null;
+
+  this.expirationTime = NoWork;
 
-  valueStack[index] = cursor.current;
+  this.alternate = null;
 
   {
-    fiberStack[index] = fiber;
+    this._debugID = debugCounter++;
+    this._debugSource = null;
+    this._debugOwner = null;
+    this._debugIsCurrentlyTiming = false;
+    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
+      Object.preventExtensions(this);
+    }
   }
+}
+
+// This is a constructor function, rather than a POJO constructor, still
+// please ensure we do the following:
+// 1) Nobody should add any instance methods on this. Instance methods can be
+//    more difficult to predict when they get optimized and they are almost
+//    never inlined properly in static compilers.
+// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
+//    always know when it is a fiber.
+// 3) We might want to experiment with using numeric keys since they are easier
+//    to optimize in a non-JIT environment.
+// 4) We can easily go from a constructor to a createFiber object literal if that
+//    is faster.
+// 5) It should be easy to port this to a C struct and keep a C implementation
+//    compatible.
+var createFiber = function(tag, pendingProps, key, mode) {
+  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
+  return new FiberNode(tag, pendingProps, key, mode);
+};
 
-  cursor.current = value;
+function shouldConstruct(Component) {
+  return !!(Component.prototype && Component.prototype.isReactComponent);
 }
 
-function reset() {
-  while (index > -1) {
-    valueStack[index] = null;
+// This is used to create an alternate fiber to do work on.
+function createWorkInProgress(current, pendingProps, expirationTime) {
+  var workInProgress = current.alternate;
+  if (workInProgress === null) {
+    // We use a double buffering pooling technique because we know that we'll
+    // only ever need at most two versions of a tree. We pool the "other" unused
+    // node that we're free to reuse. This is lazily created to avoid allocating
+    // extra objects for things that are never updated. It also allow us to
+    // reclaim the extra memory if needed.
+    workInProgress = createFiber(
+      current.tag,
+      pendingProps,
+      current.key,
+      current.mode
+    );
+    workInProgress.type = current.type;
+    workInProgress.stateNode = current.stateNode;
 
     {
-      fiberStack[index] = null;
+      // DEV-only fields
+      workInProgress._debugID = current._debugID;
+      workInProgress._debugSource = current._debugSource;
+      workInProgress._debugOwner = current._debugOwner;
     }
 
-    index--;
-  }
-}
+    workInProgress.alternate = current;
+    current.alternate = workInProgress;
+  } else {
+    workInProgress.pendingProps = pendingProps;
 
-var describeComponentFrame = function(name, source, ownerName) {
-  return (
-    "\n    in " +
-    (name || "Unknown") +
-    (source
-      ? " (at " +
-        source.fileName.replace(/^.*[\\\/]/, "") +
-        ":" +
-        source.lineNumber +
-        ")"
-      : ownerName ? " (created by " + ownerName + ")" : "")
-  );
-};
+    // We already have an alternate.
+    // Reset the effect tag.
+    workInProgress.effectTag = NoEffect;
 
-function describeFiber(fiber) {
-  switch (fiber.tag) {
-    case IndeterminateComponent:
-    case FunctionalComponent:
-    case ClassComponent:
-    case HostComponent:
-      var owner = fiber._debugOwner;
-      var source = fiber._debugSource;
-      var name = getComponentName(fiber);
-      var ownerName = null;
-      if (owner) {
-        ownerName = getComponentName(owner);
-      }
-      return describeComponentFrame(name, source, ownerName);
-    default:
-      return "";
+    // The effect list is no longer valid.
+    workInProgress.nextEffect = null;
+    workInProgress.firstEffect = null;
+    workInProgress.lastEffect = null;
   }
+
+  workInProgress.expirationTime = expirationTime;
+
+  workInProgress.child = current.child;
+  workInProgress.memoizedProps = current.memoizedProps;
+  workInProgress.memoizedState = current.memoizedState;
+  workInProgress.updateQueue = current.updateQueue;
+
+  // These will be overridden during the parent's reconciliation
+  workInProgress.sibling = current.sibling;
+  workInProgress.index = current.index;
+  workInProgress.ref = current.ref;
+
+  return workInProgress;
 }
 
-// This function can only be called with a work-in-progress fiber and
-// only during begin or complete phase. Do not call it under any other
-// circumstances.
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  var node = workInProgress;
-  do {
-    info += describeFiber(node);
-    // Otherwise this return pointer might point to the wrong tree:
-    node = node["return"];
-  } while (node);
-  return info;
+function createHostRootFiber(isAsync) {
+  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
+  return createFiber(HostRoot, null, null, mode);
 }
 
-function getCurrentFiberOwnerName() {
+function createFiberFromElement(element, mode, expirationTime) {
+  var owner = null;
   {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    var owner = fiber._debugOwner;
-    if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner);
-    }
+    owner = element._owner;
   }
-  return null;
+
+  var fiber = void 0;
+  var type = element.type;
+  var key = element.key;
+  var pendingProps = element.props;
+
+  var fiberTag = void 0;
+  if (typeof type === "function") {
+    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
+  } else if (typeof type === "string") {
+    fiberTag = HostComponent;
+  } else {
+    switch (type) {
+      case REACT_FRAGMENT_TYPE:
+        return createFiberFromFragment(
+          pendingProps.children,
+          mode,
+          expirationTime,
+          key
+        );
+      case REACT_ASYNC_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= AsyncMode | StrictMode;
+        break;
+      case REACT_STRICT_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= StrictMode;
+        break;
+      case REACT_CALL_TYPE:
+        fiberTag = CallComponent;
+        break;
+      case REACT_RETURN_TYPE:
+        fiberTag = ReturnComponent;
+        break;
+      default: {
+        if (typeof type === "object" && type !== null) {
+          switch (type.$$typeof) {
+            case REACT_PROVIDER_TYPE:
+              fiberTag = ContextProvider;
+              break;
+            case REACT_CONTEXT_TYPE:
+              // This is a consumer
+              fiberTag = ContextConsumer;
+              break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = ForwardRef;
+              break;
+            default:
+              if (typeof type.tag === "number") {
+                // Currently assumed to be a continuation and therefore is a
+                // fiber already.
+                // TODO: The yield system is currently broken for updates in
+                // some cases. The reified yield stores a fiber, but we don't
+                // know which fiber that is; the current or a workInProgress?
+                // When the continuation gets rendered here we don't know if we
+                // can reuse that fiber or if we need to clone it. There is
+                // probably a clever way to restructure this.
+                fiber = type;
+                fiber.pendingProps = pendingProps;
+                fiber.expirationTime = expirationTime;
+                return fiber;
+              } else {
+                throwOnInvalidElementType(type, owner);
+              }
+              break;
+          }
+        } else {
+          throwOnInvalidElementType(type, owner);
+        }
+      }
+    }
+  }
+
+  fiber = createFiber(fiberTag, pendingProps, key, mode);
+  fiber.type = type;
+  fiber.expirationTime = expirationTime;
+
+  {
+    fiber._debugSource = element._source;
+    fiber._debugOwner = element._owner;
+  }
+
+  return fiber;
 }
 
-function getCurrentFiberStackAddendum() {
+function throwOnInvalidElementType(type, owner) {
+  var info = "";
   {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
+    if (
+      type === undefined ||
+      (typeof type === "object" &&
+        type !== null &&
+        Object.keys(type).length === 0)
+    ) {
+      info +=
+        " You likely forgot to export your component from the file " +
+        "it's defined in, or you might have mixed up default and " +
+        "named imports.";
+    }
+    var ownerName = owner ? getComponentName(owner) : null;
+    if (ownerName) {
+      info += "\n\nCheck the render method of `" + ownerName + "`.";
     }
-    // Safe because if current fiber exists, we are reconciling,
-    // and it is guaranteed to be the work-in-progress version.
-    return getStackAddendumByWorkInProgressFiber(fiber);
   }
-  return null;
+  invariant(
+    false,
+    "Element type is invalid: expected a string (for built-in " +
+      "components) or a class/function (for composite components) " +
+      "but got: %s.%s",
+    type == null ? type : typeof type,
+    info
+  );
 }
 
-function resetCurrentFiber() {
-  ReactDebugCurrentFrame.getCurrentStack = null;
-  ReactDebugCurrentFiber.current = null;
-  ReactDebugCurrentFiber.phase = null;
+function createFiberFromFragment(elements, mode, expirationTime, key) {
+  var fiber = createFiber(Fragment, elements, key, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
 }
 
-function setCurrentFiber(fiber) {
-  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
-  ReactDebugCurrentFiber.current = fiber;
-  ReactDebugCurrentFiber.phase = null;
+function createFiberFromText(content, mode, expirationTime) {
+  var fiber = createFiber(HostText, content, null, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
 }
 
-function setCurrentPhase(phase) {
-  ReactDebugCurrentFiber.phase = phase;
+function createFiberFromHostInstanceForDeletion() {
+  var fiber = createFiber(HostComponent, null, null, NoContext);
+  fiber.type = "DELETED";
+  return fiber;
 }
 
-var ReactDebugCurrentFiber = {
-  current: null,
-  phase: null,
-  resetCurrentFiber: resetCurrentFiber,
-  setCurrentFiber: setCurrentFiber,
-  setCurrentPhase: setCurrentPhase,
-  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
-};
-
-// Re-export dynamic flags from the fbsource version.
-var _require = require("ReactFeatureFlags");
-
-var enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch;
-var debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects;
-var debugRenderPhaseSideEffectsForStrictMode =
-  _require.debugRenderPhaseSideEffectsForStrictMode;
-var warnAboutDeprecatedLifecycles = _require.warnAboutDeprecatedLifecycles;
-var replayFailedUnitOfWorkWithInvokeGuardedCallback =
-  _require.replayFailedUnitOfWorkWithInvokeGuardedCallback;
-
-var enableUserTimingAPI = true;
-var enableMutatingReconciler = true;
-var enableNoopReconciler = false;
-var enablePersistentReconciler = false;
-
-// Only used in www builds.
+function createFiberFromPortal(portal, mode, expirationTime) {
+  var pendingProps = portal.children !== null ? portal.children : [];
+  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
+  fiber.expirationTime = expirationTime;
+  fiber.stateNode = {
+    containerInfo: portal.containerInfo,
+    pendingChildren: null, // Used by persistent updates
+    implementation: portal.implementation
+  };
+  return fiber;
+}
 
-// Prefix measurements so that it's possible to filter them.
-// Longer prefixes are hard to read in DevTools.
-var reactEmoji = "\u269B";
-var warningEmoji = "\u26D4";
-var supportsUserTiming =
-  typeof performance !== "undefined" &&
-  typeof performance.mark === "function" &&
-  typeof performance.clearMarks === "function" &&
-  typeof performance.measure === "function" &&
-  typeof performance.clearMeasures === "function";
+// Used for stashing WIP properties to replay failed work in DEV.
+function assignFiberPropertiesInDEV(target, source) {
+  if (target === null) {
+    // This Fiber's initial properties will always be overwritten.
+    // We only use a Fiber to ensure the same hidden class so DEV isn't slow.
+    target = createFiber(IndeterminateComponent, null, null, NoContext);
+  }
+
+  // This is intentionally written as a list of all properties.
+  // We tried to use Object.assign() instead but this is called in
+  // the hottest path, and Object.assign() was too slow:
+  // https://github.com/facebook/react/issues/12502
+  // This code is DEV-only so size is not a concern.
+
+  target.tag = source.tag;
+  target.key = source.key;
+  target.type = source.type;
+  target.stateNode = source.stateNode;
+  target["return"] = source["return"];
+  target.child = source.child;
+  target.sibling = source.sibling;
+  target.index = source.index;
+  target.ref = source.ref;
+  target.pendingProps = source.pendingProps;
+  target.memoizedProps = source.memoizedProps;
+  target.updateQueue = source.updateQueue;
+  target.memoizedState = source.memoizedState;
+  target.mode = source.mode;
+  target.effectTag = source.effectTag;
+  target.nextEffect = source.nextEffect;
+  target.firstEffect = source.firstEffect;
+  target.lastEffect = source.lastEffect;
+  target.expirationTime = source.expirationTime;
+  target.alternate = source.alternate;
+  target._debugID = source._debugID;
+  target._debugSource = source._debugSource;
+  target._debugOwner = source._debugOwner;
+  target._debugIsCurrentlyTiming = source._debugIsCurrentlyTiming;
+  return target;
+}
 
-// Keep track of current fiber so that we know the path to unwind on pause.
-// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
-var currentFiber = null;
-// If we're in the middle of user code, which fiber and method is it?
-// Reusing `currentFiber` would be confusing for this because user code fiber
-// can change during commit phase too, but we don't need to unwind it (since
-// lifecycles in the commit phase don't resemble a tree).
-var currentPhase = null;
-var currentPhaseFiber = null;
-// Did lifecycle hook schedule an update? This is often a performance problem,
-// so we will keep track of it, and include it in the report.
-// Track commits caused by cascading updates.
-var isCommitting = false;
-var hasScheduledUpdateInCurrentCommit = false;
-var hasScheduledUpdateInCurrentPhase = false;
-var commitCountInCurrentWorkLoop = 0;
-var effectCountInCurrentCommit = 0;
-var isWaitingForCallback = false;
-// During commits, we only show a measurement once per method name
-// to avoid stretch the commit phase with measurement overhead.
-var labelsInCurrentCommit = new Set();
+// TODO: This should be lifted into the renderer.
 
-var formatMarkName = function(markName) {
-  return reactEmoji + " " + markName;
-};
+function createFiberRoot(containerInfo, isAsync, hydrate) {
+  // Cyclic construction. This cheats the type system right now because
+  // stateNode is any.
+  var uninitializedFiber = createHostRootFiber(isAsync);
+  var root = {
+    current: uninitializedFiber,
+    containerInfo: containerInfo,
+    pendingChildren: null,
+    pendingCommitExpirationTime: NoWork,
+    finishedWork: null,
+    context: null,
+    pendingContext: null,
+    hydrate: hydrate,
+    remainingExpirationTime: NoWork,
+    firstBatch: null,
+    nextScheduledRoot: null
+  };
+  uninitializedFiber.stateNode = root;
+  return root;
+}
 
-var formatLabel = function(label, warning$$1) {
-  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
-  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
-  return "" + prefix + label + suffix;
-};
+var onCommitFiberRoot = null;
+var onCommitFiberUnmount = null;
+var hasLoggedError = false;
 
-var beginMark = function(markName) {
-  performance.mark(formatMarkName(markName));
-};
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {
+      if (true && !hasLoggedError) {
+        hasLoggedError = true;
+        warning(false, "React DevTools encountered an error: %s", err);
+      }
+    }
+  };
+}
 
-var clearMark = function(markName) {
-  performance.clearMarks(formatMarkName(markName));
-};
-
-var endMark = function(label, markName, warning$$1) {
-  var formattedMarkName = formatMarkName(markName);
-  var formattedLabel = formatLabel(label, warning$$1);
-  try {
-    performance.measure(formattedLabel, formattedMarkName);
-  } catch (err) {}
-  // If previous mark was missing for some reason, this will throw.
-  // This could only happen if React crashed in an unexpected place earlier.
-  // Don't pile on with more errors.
-
-  // Clear marks immediately to avoid growing buffer.
-  performance.clearMarks(formattedMarkName);
-  performance.clearMeasures(formattedLabel);
-};
-
-var getFiberMarkName = function(label, debugID) {
-  return label + " (#" + debugID + ")";
-};
-
-var getFiberLabel = function(componentName, isMounted, phase) {
-  if (phase === null) {
-    // These are composite component total time measurements.
-    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
-  } else {
-    // Composite component methods.
-    return componentName + "." + phase;
-  }
-};
-
-var beginFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-
-  if (isCommitting && labelsInCurrentCommit.has(label)) {
-    // During the commit phase, we don't show duplicate labels because
-    // there is a fixed overhead for every measurement, and we don't
-    // want to stretch the commit phase beyond necessary.
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
     return false;
   }
-  labelsInCurrentCommit.add(label);
-
-  var markName = getFiberMarkName(label, debugID);
-  beginMark(markName);
-  return true;
-};
-
-var clearFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  clearMark(markName);
-};
-
-var endFiberMark = function(fiber, phase, warning$$1) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  endMark(label, markName, warning$$1);
-};
-
-var shouldIgnoreFiber = function(fiber) {
-  // Host components should be skipped in the timeline.
-  // We could check typeof fiber.type, but does this work with RN?
-  switch (fiber.tag) {
-    case HostRoot:
-    case HostComponent:
-    case HostText:
-    case HostPortal:
-    case CallComponent:
-    case ReturnComponent:
-    case Fragment:
-    case ContextProvider:
-    case ContextConsumer:
-      return true;
-    default:
-      return false;
-  }
-};
-
-var clearPendingPhaseMeasurement = function() {
-  if (currentPhase !== null && currentPhaseFiber !== null) {
-    clearFiberMark(currentPhaseFiber, currentPhase);
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
   }
-  currentPhaseFiber = null;
-  currentPhase = null;
-  hasScheduledUpdateInCurrentPhase = false;
-};
-
-var pauseTimers = function() {
-  // Stops all currently active measurements so that they can be resumed
-  // if we continue in a later deferred loop from the same unit of work.
-  var fiber = currentFiber;
-  while (fiber) {
-    if (fiber._debugIsCurrentlyTiming) {
-      endFiberMark(fiber, null, null);
+  if (!hook.supportsFiber) {
+    {
+      warning(
+        false,
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://fb.me/react-devtools"
+      );
     }
-    fiber = fiber["return"];
-  }
-};
-
-var resumeTimersRecursively = function(fiber) {
-  if (fiber["return"] !== null) {
-    resumeTimersRecursively(fiber["return"]);
-  }
-  if (fiber._debugIsCurrentlyTiming) {
-    beginFiberMark(fiber, null);
-  }
-};
-
-var resumeTimers = function() {
-  // Resumes all measurements that were active during the last deferred loop.
-  if (currentFiber !== null) {
-    resumeTimersRecursively(currentFiber);
-  }
-};
-
-function recordEffect() {
-  if (enableUserTimingAPI) {
-    effectCountInCurrentCommit++;
+    // DevTools exists, even though it doesn't support Fiber.
+    return true;
   }
-}
-
-function recordScheduleUpdate() {
-  if (enableUserTimingAPI) {
-    if (isCommitting) {
-      hasScheduledUpdateInCurrentCommit = true;
-    }
-    if (
-      currentPhase !== null &&
-      currentPhase !== "componentWillMount" &&
-      currentPhase !== "componentWillReceiveProps"
-    ) {
-      hasScheduledUpdateInCurrentPhase = true;
+  try {
+    var rendererID = hook.inject(internals);
+    // We have successfully injected, so now it is safe to set up hooks.
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      warning(false, "React DevTools encountered an error: %s.", err);
     }
   }
+  // DevTools exists
+  return true;
 }
 
-function startRequestCallbackTimer() {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming && !isWaitingForCallback) {
-      isWaitingForCallback = true;
-      beginMark("(Waiting for async callback...)");
-    }
+function onCommitRoot(root) {
+  if (typeof onCommitFiberRoot === "function") {
+    onCommitFiberRoot(root);
   }
 }
 
-function stopRequestCallbackTimer(didExpire) {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming) {
-      isWaitingForCallback = false;
-      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
-      endMark(
-        "(Waiting for async callback...)",
-        "(Waiting for async callback...)",
-        warning$$1
-      );
-    }
+function onCommitUnmount(fiber) {
+  if (typeof onCommitFiberUnmount === "function") {
+    onCommitFiberUnmount(fiber);
   }
 }
 
-function startWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, this is the fiber to unwind from.
-    currentFiber = fiber;
-    if (!beginFiberMark(fiber, null)) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = true;
+var describeComponentFrame = function(name, source, ownerName) {
+  return (
+    "\n    in " +
+    (name || "Unknown") +
+    (source
+      ? " (at " +
+        source.fileName.replace(/^.*[\\\/]/, "") +
+        ":" +
+        source.lineNumber +
+        ")"
+      : ownerName ? " (created by " + ownerName + ")" : "")
+  );
+};
+
+function describeFiber(fiber) {
+  switch (fiber.tag) {
+    case IndeterminateComponent:
+    case FunctionalComponent:
+    case ClassComponent:
+    case HostComponent:
+      var owner = fiber._debugOwner;
+      var source = fiber._debugSource;
+      var name = getComponentName(fiber);
+      var ownerName = null;
+      if (owner) {
+        ownerName = getComponentName(owner);
+      }
+      return describeComponentFrame(name, source, ownerName);
+    default:
+      return "";
   }
 }
 
-function cancelWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // Remember we shouldn't complete measurement for this fiber.
-    // Otherwise flamechart will be deep even for small updates.
-    fiber._debugIsCurrentlyTiming = false;
-    clearFiberMark(fiber, null);
-  }
+// This function can only be called with a work-in-progress fiber and
+// only during begin or complete phase. Do not call it under any other
+// circumstances.
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  var node = workInProgress;
+  do {
+    info += describeFiber(node);
+    // Otherwise this return pointer might point to the wrong tree:
+    node = node["return"];
+  } while (node);
+  return info;
 }
 
-function stopWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    endFiberMark(fiber, null, null);
-  }
-}
-
-function stopFailedWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    var warning$$1 = "An error was thrown inside this error boundary";
-    endFiberMark(fiber, null, warning$$1);
-  }
-}
+/**
+ * Forked from fbjs/warning:
+ * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
+ *
+ * Only change is we use console.warn instead of console.error,
+ * and do nothing when 'console' is not supported.
+ * This really simplifies the code.
+ * ---
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
 
-function startPhaseTimer(fiber, phase) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    clearPendingPhaseMeasurement();
-    if (!beginFiberMark(fiber, phase)) {
-      return;
-    }
-    currentPhaseFiber = fiber;
-    currentPhase = phase;
-  }
-}
+var lowPriorityWarning = function() {};
 
-function stopPhaseTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    if (currentPhase !== null && currentPhaseFiber !== null) {
-      var warning$$1 = hasScheduledUpdateInCurrentPhase
-        ? "Scheduled a cascading update"
-        : null;
-      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
+{
+  var printWarning = function(format) {
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 1 ? _len - 1 : 0),
+        _key = 1;
+      _key < _len;
+      _key++
+    ) {
+      args[_key - 1] = arguments[_key];
     }
-    currentPhase = null;
-    currentPhaseFiber = null;
-  }
-}
 
-function startWorkLoopTimer(nextUnitOfWork) {
-  if (enableUserTimingAPI) {
-    currentFiber = nextUnitOfWork;
-    if (!supportsUserTiming) {
-      return;
+    var argIndex = 0;
+    var message =
+      "Warning: " +
+      format.replace(/%s/g, function() {
+        return args[argIndex++];
+      });
+    if (typeof console !== "undefined") {
+      console.warn(message);
     }
-    commitCountInCurrentWorkLoop = 0;
-    // This is top level call.
-    // Any other measurements are performed within.
-    beginMark("(React Tree Reconciliation)");
-    // Resume any measurements that were in progress during the last loop.
-    resumeTimers();
-  }
-}
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      throw new Error(message);
+    } catch (x) {}
+  };
 
-function stopWorkLoopTimer(interruptedBy) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
+  lowPriorityWarning = function(condition, format) {
+    if (format === undefined) {
+      throw new Error(
+        "`warning(condition, format, ...args)` requires a warning " +
+          "message argument"
+      );
     }
-    var warning$$1 = null;
-    if (interruptedBy !== null) {
-      if (interruptedBy.tag === HostRoot) {
-        warning$$1 = "A top-level update interrupted the previous render";
-      } else {
-        var componentName = getComponentName(interruptedBy) || "Unknown";
-        warning$$1 =
-          "An update to " + componentName + " interrupted the previous render";
+    if (!condition) {
+      for (
+        var _len2 = arguments.length,
+          args = Array(_len2 > 2 ? _len2 - 2 : 0),
+          _key2 = 2;
+        _key2 < _len2;
+        _key2++
+      ) {
+        args[_key2 - 2] = arguments[_key2];
       }
-    } else if (commitCountInCurrentWorkLoop > 1) {
-      warning$$1 = "There were cascading updates";
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // Pause any measurements until the next loop.
-    pauseTimers();
-    endMark(
-      "(React Tree Reconciliation)",
-      "(React Tree Reconciliation)",
-      warning$$1
-    );
-  }
-}
-
-function startCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    isCommitting = true;
-    hasScheduledUpdateInCurrentCommit = false;
-    labelsInCurrentCommit.clear();
-    beginMark("(Committing Changes)");
-  }
-}
-
-function stopCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-
-    var warning$$1 = null;
-    if (hasScheduledUpdateInCurrentCommit) {
-      warning$$1 = "Lifecycle hook scheduled a cascading update";
-    } else if (commitCountInCurrentWorkLoop > 0) {
-      warning$$1 = "Caused by a cascading update in earlier commit";
-    }
-    hasScheduledUpdateInCurrentCommit = false;
-    commitCountInCurrentWorkLoop++;
-    isCommitting = false;
-    labelsInCurrentCommit.clear();
-
-    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
-  }
-}
-
-function startCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Committing Host Effects)");
-  }
-}
-
-function stopCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Committing Host Effects: " + count + " Total)",
-      "(Committing Host Effects)",
-      null
-    );
-  }
-}
 
-function startCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
+      printWarning.apply(undefined, [format].concat(args));
     }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Calling Lifecycle Methods)");
-  }
+  };
 }
 
-function stopCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Calling Lifecycle Methods: " + count + " Total)",
-      "(Calling Lifecycle Methods)",
-      null
-    );
-  }
-}
+var lowPriorityWarning$1 = lowPriorityWarning;
 
-var warnedAboutMissingGetChildContext = void 0;
+var ReactStrictModeWarnings = {
+  discardPendingWarnings: function() {},
+  flushPendingDeprecationWarnings: function() {},
+  flushPendingUnsafeLifecycleWarnings: function() {},
+  recordDeprecationWarnings: function(fiber, instance) {},
+  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
+};
 
 {
-  warnedAboutMissingGetChildContext = {};
-}
+  var LIFECYCLE_SUGGESTIONS = {
+    UNSAFE_componentWillMount: "componentDidMount",
+    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
+    UNSAFE_componentWillUpdate: "componentDidUpdate"
+  };
 
-// A cursor to the current merged context object on the stack.
-var contextStackCursor = createCursor(emptyObject);
-// A cursor to a boolean indicating whether the context has changed.
-var didPerformWorkStackCursor = createCursor(false);
-// Keep track of the previous context object that was on the stack.
-// We use this to get access to the parent context after we have already
-// pushed the next context provider, and now need to merge their contexts.
-var previousContext = emptyObject;
+  var pendingComponentWillMountWarnings = [];
+  var pendingComponentWillReceivePropsWarnings = [];
+  var pendingComponentWillUpdateWarnings = [];
+  var pendingUnsafeLifecycleWarnings = new Map();
 
-function getUnmaskedContext(workInProgress) {
-  var hasOwnContext = isContextProvider(workInProgress);
-  if (hasOwnContext) {
-    // If the fiber is a context provider itself, when we read its context
-    // we have already pushed its own child context on the stack. A context
-    // provider should not "see" its own child context. Therefore we read the
-    // previous (parent) context instead for a context provider.
-    return previousContext;
-  }
-  return contextStackCursor.current;
-}
+  // Tracks components we have already warned about.
+  var didWarnAboutDeprecatedLifecycles = new Set();
+  var didWarnAboutUnsafeLifecycles = new Set();
 
-function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-  var instance = workInProgress.stateNode;
-  instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-  instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
-}
+  ReactStrictModeWarnings.discardPendingWarnings = function() {
+    pendingComponentWillMountWarnings = [];
+    pendingComponentWillReceivePropsWarnings = [];
+    pendingComponentWillUpdateWarnings = [];
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-function getMaskedContext(workInProgress, unmaskedContext) {
-  var type = workInProgress.type;
-  var contextTypes = type.contextTypes;
-  if (!contextTypes) {
-    return emptyObject;
-  }
-
-  // Avoid recreating masked context unless unmasked context has changed.
-  // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-  // This may trigger infinite loops if componentWillReceiveProps calls setState.
-  var instance = workInProgress.stateNode;
-  if (
-    instance &&
-    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-  ) {
-    return instance.__reactInternalMemoizedMaskedChildContext;
-  }
-
-  var context = {};
-  for (var key in contextTypes) {
-    context[key] = unmaskedContext[key];
-  }
+  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
+    pendingUnsafeLifecycleWarnings.forEach(function(
+      lifecycleWarningsMap,
+      strictRoot
+    ) {
+      var lifecyclesWarningMesages = [];
 
-  {
-    var name = getComponentName(workInProgress) || "Unknown";
-    checkPropTypes(
-      contextTypes,
-      context,
-      "context",
-      name,
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-    );
-  }
+      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
+        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
+        if (lifecycleWarnings.length > 0) {
+          var componentNames = new Set();
+          lifecycleWarnings.forEach(function(fiber) {
+            componentNames.add(getComponentName(fiber) || "Component");
+            didWarnAboutUnsafeLifecycles.add(fiber.type);
+          });
 
-  // Cache unmasked context so we can avoid recreating masked context unless necessary.
-  // Context is created before the class component is instantiated so check for instance.
-  if (instance) {
-    cacheContext(workInProgress, unmaskedContext, context);
-  }
+          var formatted = lifecycle.replace("UNSAFE_", "");
+          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
+          var sortedComponentNames = Array.from(componentNames)
+            .sort()
+            .join(", ");
 
-  return context;
-}
+          lifecyclesWarningMesages.push(
+            formatted +
+              ": Please update the following components to use " +
+              (suggestion + " instead: " + sortedComponentNames)
+          );
+        }
+      });
 
-function hasContextChanged() {
-  return didPerformWorkStackCursor.current;
-}
+      if (lifecyclesWarningMesages.length > 0) {
+        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
+          strictRoot
+        );
 
-function isContextConsumer(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
-}
+        warning(
+          false,
+          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
+            "\n\n%s" +
+            "\n\nLearn more about this warning here:" +
+            "\nhttps://fb.me/react-strict-mode-warnings",
+          strictRootComponentStack,
+          lifecyclesWarningMesages.join("\n\n")
+        );
+      }
+    });
 
-function isContextProvider(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
-}
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-function popContextProvider(fiber) {
-  if (!isContextProvider(fiber)) {
-    return;
-  }
+  var getStrictRoot = function(fiber) {
+    var maybeStrictRoot = null;
 
-  pop(didPerformWorkStackCursor, fiber);
-  pop(contextStackCursor, fiber);
-}
+    while (fiber !== null) {
+      if (fiber.mode & StrictMode) {
+        maybeStrictRoot = fiber;
+      }
 
-function popTopLevelContextObject(fiber) {
-  pop(didPerformWorkStackCursor, fiber);
-  pop(contextStackCursor, fiber);
-}
+      fiber = fiber["return"];
+    }
 
-function pushTopLevelContextObject(fiber, context, didChange) {
-  invariant(
-    contextStackCursor.cursor == null,
-    "Unexpected context found on stack. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
+    return maybeStrictRoot;
+  };
 
-  push(contextStackCursor, context, fiber);
-  push(didPerformWorkStackCursor, didChange, fiber);
-}
+  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
+    if (pendingComponentWillMountWarnings.length > 0) {
+      var uniqueNames = new Set();
+      pendingComponentWillMountWarnings.forEach(function(fiber) {
+        uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode;
-  var childContextTypes = fiber.type.childContextTypes;
+      var sortedNames = Array.from(uniqueNames)
+        .sort()
+        .join(", ");
 
-  // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-  // It has only been added in Fiber to match the (unintentional) behavior in Stack.
-  if (typeof instance.getChildContext !== "function") {
-    {
-      var componentName = getComponentName(fiber) || "Unknown";
+      lowPriorityWarning$1(
+        false,
+        "componentWillMount is deprecated and will be removed in the next major version. " +
+          "Use componentDidMount instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillMount." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        sortedNames
+      );
 
-      if (!warnedAboutMissingGetChildContext[componentName]) {
-        warnedAboutMissingGetChildContext[componentName] = true;
-        warning(
-          false,
-          "%s.childContextTypes is specified but there is no getChildContext() method " +
-            "on the instance. You can either define getChildContext() on %s or remove " +
-            "childContextTypes from it.",
-          componentName,
-          componentName
-        );
-      }
+      pendingComponentWillMountWarnings = [];
     }
-    return parentContext;
-  }
-
-  var childContext = void 0;
-  {
-    ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
-  }
-  startPhaseTimer(fiber, "getChildContext");
-  childContext = instance.getChildContext();
-  stopPhaseTimer();
-  {
-    ReactDebugCurrentFiber.setCurrentPhase(null);
-  }
-  for (var contextKey in childContext) {
-    invariant(
-      contextKey in childContextTypes,
-      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
-      contextKey
-    );
-  }
-  {
-    var name = getComponentName(fiber) || "Unknown";
-    checkPropTypes(
-      childContextTypes,
-      childContext,
-      "child context",
-      name,
-      // In practice, there is one case in which we won't get a stack. It's when
-      // somebody calls unstable_renderSubtreeIntoContainer() and we process
-      // context from the parent component instance. The stack will be missing
-      // because it's outside of the reconciliation, and so the pointer has not
-      // been set. This is rare and doesn't matter. We'll also remove that API.
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-    );
-  }
 
-  return Object.assign({}, parentContext, childContext);
-}
+    if (pendingComponentWillReceivePropsWarnings.length > 0) {
+      var _uniqueNames = new Set();
+      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
+        _uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) {
-    return false;
-  }
+      var _sortedNames = Array.from(_uniqueNames)
+        .sort()
+        .join(", ");
 
-  var instance = workInProgress.stateNode;
-  // We push the context as early as possible to ensure stack integrity.
-  // If the instance does not exist yet, we will push null at first,
-  // and replace it on the stack later when invalidating the context.
-  var memoizedMergedChildContext =
-    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
-
-  // Remember the parent context so we can merge with it later.
-  // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
-  previousContext = contextStackCursor.current;
-  push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-  push(
-    didPerformWorkStackCursor,
-    didPerformWorkStackCursor.current,
-    workInProgress
-  );
+      lowPriorityWarning$1(
+        false,
+        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
+          "Use static getDerivedStateFromProps instead." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames
+      );
 
-  return true;
-}
+      pendingComponentWillReceivePropsWarnings = [];
+    }
 
-function invalidateContextProvider(workInProgress, didChange) {
-  var instance = workInProgress.stateNode;
-  invariant(
-    instance,
-    "Expected to have an instance by this point. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
+    if (pendingComponentWillUpdateWarnings.length > 0) {
+      var _uniqueNames2 = new Set();
+      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
+        _uniqueNames2.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-  if (didChange) {
-    // Merge parent and own context.
-    // Skip this if we're not updating due to sCU.
-    // This avoids unnecessarily recomputing memoized values.
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-
-    // Replace the old (or empty) context with the new one.
-    // It is important to unwind the context in the reverse order.
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    // Now push the new context and mark that it has changed.
-    push(contextStackCursor, mergedContext, workInProgress);
-    push(didPerformWorkStackCursor, didChange, workInProgress);
-  } else {
-    pop(didPerformWorkStackCursor, workInProgress);
-    push(didPerformWorkStackCursor, didChange, workInProgress);
-  }
-}
+      var _sortedNames2 = Array.from(_uniqueNames2)
+        .sort()
+        .join(", ");
 
-function resetContext() {
-  previousContext = emptyObject;
-  contextStackCursor.current = emptyObject;
-  didPerformWorkStackCursor.current = false;
-}
+      lowPriorityWarning$1(
+        false,
+        "componentWillUpdate is deprecated and will be removed in the next major version. " +
+          "Use componentDidUpdate instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillUpdate." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames2
+      );
 
-function findCurrentUnmaskedContext(fiber) {
-  // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-  // makes sense elsewhere
-  invariant(
-    isFiberMounted(fiber) && fiber.tag === ClassComponent,
-    "Expected subtree parent to be a mounted class component. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
+      pendingComponentWillUpdateWarnings = [];
+    }
+  };
 
-  var node = fiber;
-  while (node.tag !== HostRoot) {
-    if (isContextProvider(node)) {
-      return node.stateNode.__reactInternalMemoizedMergedChildContext;
+  ReactStrictModeWarnings.recordDeprecationWarnings = function(
+    fiber,
+    instance
+  ) {
+    // Dedup strategy: Warn once per component.
+    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+      return;
     }
-    var parent = node["return"];
-    invariant(
-      parent,
-      "Found unexpected detached subtree parent. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
-    node = parent;
-  }
-  return node.stateNode.context;
-}
 
-// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
-// Math.pow(2, 30) - 1
-// 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillMountWarnings.push(fiber);
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" &&
+      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillReceivePropsWarnings.push(fiber);
+    }
+    if (
+      typeof instance.componentWillUpdate === "function" &&
+      instance.componentWillUpdate.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillUpdateWarnings.push(fiber);
+    }
+  };
 
-// TODO: Use an opaque type once ESLint et al support the syntax
+  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
+    fiber,
+    instance
+  ) {
+    var strictRoot = getStrictRoot(fiber);
 
-var NoWork = 0;
-var Sync = 1;
-var Never = MAX_SIGNED_31_BIT_INT;
+    // Dedup strategy: Warn once per component.
+    // This is difficult to track any other way since component names
+    // are often vague and are likely to collide between 3rd party libraries.
+    // An expand property is probably okay to use here since it's DEV-only,
+    // and will only be set in the event of serious warnings.
+    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+      return;
+    }
 
-var UNIT_SIZE = 10;
-var MAGIC_NUMBER_OFFSET = 2;
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    // Note that it is sufficient to check for the presence of a
+    // single lifecycle, componentWillMount, with the polyfill flag.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning === true
+    ) {
+      return;
+    }
 
-// 1 unit of expiration time represents 10ms.
-function msToExpirationTime(ms) {
-  // Always add an offset so that we don't clash with the magic number for NoWork.
-  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
-}
+    var warningsForRoot = void 0;
+    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
+      warningsForRoot = {
+        UNSAFE_componentWillMount: [],
+        UNSAFE_componentWillReceiveProps: [],
+        UNSAFE_componentWillUpdate: []
+      };
 
-function expirationTimeToMs(expirationTime) {
-  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
-}
+      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
+    } else {
+      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
+    }
 
-function ceiling(num, precision) {
-  return (((num / precision) | 0) + 1) * precision;
-}
+    var unsafeLifecycles = [];
+    if (
+      typeof instance.componentWillMount === "function" ||
+      typeof instance.UNSAFE_componentWillMount === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillMount");
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" ||
+      typeof instance.UNSAFE_componentWillReceiveProps === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
+    }
+    if (
+      typeof instance.componentWillUpdate === "function" ||
+      typeof instance.UNSAFE_componentWillUpdate === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
+    }
 
-function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
-  return ceiling(
-    currentTime + expirationInMs / UNIT_SIZE,
-    bucketSizeMs / UNIT_SIZE
-  );
+    if (unsafeLifecycles.length > 0) {
+      unsafeLifecycles.forEach(function(lifecycle) {
+        warningsForRoot[lifecycle].push(fiber);
+      });
+    }
+  };
 }
 
-var NoContext = 0;
-var AsyncMode = 1;
-var StrictMode = 2;
+// Re-export dynamic flags from the fbsource version.
+var _require = require("ReactFeatureFlags");
 
-var hasBadMapPolyfill = void 0;
+var enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch;
+var debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects;
+var debugRenderPhaseSideEffectsForStrictMode =
+  _require.debugRenderPhaseSideEffectsForStrictMode;
+var warnAboutDeprecatedLifecycles = _require.warnAboutDeprecatedLifecycles;
+var replayFailedUnitOfWorkWithInvokeGuardedCallback =
+  _require.replayFailedUnitOfWorkWithInvokeGuardedCallback;
 
-{
-  hasBadMapPolyfill = false;
-  try {
-    var nonExtensibleObject = Object.preventExtensions({});
-    var testMap = new Map([[nonExtensibleObject, null]]);
-    var testSet = new Set([nonExtensibleObject]);
-    // This is necessary for Rollup to not consider these unused.
-    // https://github.com/rollup/rollup/issues/1771
-    // TODO: we can remove these if Rollup fixes the bug.
-    testMap.set(0, 0);
-    testSet.add(0);
-  } catch (e) {
-    // TODO: Consider warning about bad polyfills
-    hasBadMapPolyfill = true;
+var enableUserTimingAPI = true;
+var enableMutatingReconciler = true;
+var enableNoopReconciler = false;
+var enablePersistentReconciler = false;
+
+// Only used in www builds.
+
+function getCurrentFiberOwnerName() {
+  {
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
+    }
+    var owner = fiber._debugOwner;
+    if (owner !== null && typeof owner !== "undefined") {
+      return getComponentName(owner);
+    }
   }
+  return null;
 }
 
-// A Fiber is work on a Component that needs to be done or was done. There can
-// be more than one per component.
-
-var debugCounter = void 0;
+function getCurrentFiberStackAddendum() {
+  {
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
+    }
+    // Safe because if current fiber exists, we are reconciling,
+    // and it is guaranteed to be the work-in-progress version.
+    return getStackAddendumByWorkInProgressFiber(fiber);
+  }
+  return null;
+}
 
-{
-  debugCounter = 1;
+function resetCurrentFiber() {
+  ReactDebugCurrentFrame.getCurrentStack = null;
+  ReactDebugCurrentFiber.current = null;
+  ReactDebugCurrentFiber.phase = null;
 }
 
-function FiberNode(tag, pendingProps, key, mode) {
-  // Instance
-  this.tag = tag;
-  this.key = key;
-  this.type = null;
-  this.stateNode = null;
+function setCurrentFiber(fiber) {
+  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
+  ReactDebugCurrentFiber.current = fiber;
+  ReactDebugCurrentFiber.phase = null;
+}
 
-  // Fiber
-  this["return"] = null;
-  this.child = null;
-  this.sibling = null;
-  this.index = 0;
+function setCurrentPhase(phase) {
+  ReactDebugCurrentFiber.phase = phase;
+}
 
-  this.ref = null;
+var ReactDebugCurrentFiber = {
+  current: null,
+  phase: null,
+  resetCurrentFiber: resetCurrentFiber,
+  setCurrentFiber: setCurrentFiber,
+  setCurrentPhase: setCurrentPhase,
+  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
+  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
+};
 
-  this.pendingProps = pendingProps;
-  this.memoizedProps = null;
-  this.updateQueue = null;
-  this.memoizedState = null;
+// Prefix measurements so that it's possible to filter them.
+// Longer prefixes are hard to read in DevTools.
+var reactEmoji = "\u269B";
+var warningEmoji = "\u26D4";
+var supportsUserTiming =
+  typeof performance !== "undefined" &&
+  typeof performance.mark === "function" &&
+  typeof performance.clearMarks === "function" &&
+  typeof performance.measure === "function" &&
+  typeof performance.clearMeasures === "function";
 
-  this.mode = mode;
+// Keep track of current fiber so that we know the path to unwind on pause.
+// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
+var currentFiber = null;
+// If we're in the middle of user code, which fiber and method is it?
+// Reusing `currentFiber` would be confusing for this because user code fiber
+// can change during commit phase too, but we don't need to unwind it (since
+// lifecycles in the commit phase don't resemble a tree).
+var currentPhase = null;
+var currentPhaseFiber = null;
+// Did lifecycle hook schedule an update? This is often a performance problem,
+// so we will keep track of it, and include it in the report.
+// Track commits caused by cascading updates.
+var isCommitting = false;
+var hasScheduledUpdateInCurrentCommit = false;
+var hasScheduledUpdateInCurrentPhase = false;
+var commitCountInCurrentWorkLoop = 0;
+var effectCountInCurrentCommit = 0;
+var isWaitingForCallback = false;
+// During commits, we only show a measurement once per method name
+// to avoid stretch the commit phase with measurement overhead.
+var labelsInCurrentCommit = new Set();
 
-  // Effects
-  this.effectTag = NoEffect;
-  this.nextEffect = null;
+var formatMarkName = function(markName) {
+  return reactEmoji + " " + markName;
+};
 
-  this.firstEffect = null;
-  this.lastEffect = null;
+var formatLabel = function(label, warning$$1) {
+  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
+  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
+  return "" + prefix + label + suffix;
+};
 
-  this.expirationTime = NoWork;
+var beginMark = function(markName) {
+  performance.mark(formatMarkName(markName));
+};
 
-  this.alternate = null;
+var clearMark = function(markName) {
+  performance.clearMarks(formatMarkName(markName));
+};
 
-  {
-    this._debugID = debugCounter++;
-    this._debugSource = null;
-    this._debugOwner = null;
-    this._debugIsCurrentlyTiming = false;
-    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
-      Object.preventExtensions(this);
-    }
-  }
-}
+var endMark = function(label, markName, warning$$1) {
+  var formattedMarkName = formatMarkName(markName);
+  var formattedLabel = formatLabel(label, warning$$1);
+  try {
+    performance.measure(formattedLabel, formattedMarkName);
+  } catch (err) {}
+  // If previous mark was missing for some reason, this will throw.
+  // This could only happen if React crashed in an unexpected place earlier.
+  // Don't pile on with more errors.
 
-// This is a constructor function, rather than a POJO constructor, still
-// please ensure we do the following:
-// 1) Nobody should add any instance methods on this. Instance methods can be
-//    more difficult to predict when they get optimized and they are almost
-//    never inlined properly in static compilers.
-// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
-//    always know when it is a fiber.
-// 3) We might want to experiment with using numeric keys since they are easier
-//    to optimize in a non-JIT environment.
-// 4) We can easily go from a constructor to a createFiber object literal if that
-//    is faster.
-// 5) It should be easy to port this to a C struct and keep a C implementation
-//    compatible.
-var createFiber = function(tag, pendingProps, key, mode) {
-  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
-  return new FiberNode(tag, pendingProps, key, mode);
+  // Clear marks immediately to avoid growing buffer.
+  performance.clearMarks(formattedMarkName);
+  performance.clearMeasures(formattedLabel);
 };
 
-function shouldConstruct(Component) {
-  return !!(Component.prototype && Component.prototype.isReactComponent);
-}
+var getFiberMarkName = function(label, debugID) {
+  return label + " (#" + debugID + ")";
+};
 
-// This is used to create an alternate fiber to do work on.
-function createWorkInProgress(current, pendingProps, expirationTime) {
-  var workInProgress = current.alternate;
-  if (workInProgress === null) {
-    // We use a double buffering pooling technique because we know that we'll
-    // only ever need at most two versions of a tree. We pool the "other" unused
-    // node that we're free to reuse. This is lazily created to avoid allocating
-    // extra objects for things that are never updated. It also allow us to
-    // reclaim the extra memory if needed.
-    workInProgress = createFiber(
-      current.tag,
-      pendingProps,
-      current.key,
-      current.mode
-    );
-    workInProgress.type = current.type;
-    workInProgress.stateNode = current.stateNode;
+var getFiberLabel = function(componentName, isMounted, phase) {
+  if (phase === null) {
+    // These are composite component total time measurements.
+    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
+  } else {
+    // Composite component methods.
+    return componentName + "." + phase;
+  }
+};
 
-    {
-      // DEV-only fields
-      workInProgress._debugID = current._debugID;
-      workInProgress._debugSource = current._debugSource;
-      workInProgress._debugOwner = current._debugOwner;
-    }
-
-    workInProgress.alternate = current;
-    current.alternate = workInProgress;
-  } else {
-    workInProgress.pendingProps = pendingProps;
-
-    // We already have an alternate.
-    // Reset the effect tag.
-    workInProgress.effectTag = NoEffect;
+var beginFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
 
-    // The effect list is no longer valid.
-    workInProgress.nextEffect = null;
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
+  if (isCommitting && labelsInCurrentCommit.has(label)) {
+    // During the commit phase, we don't show duplicate labels because
+    // there is a fixed overhead for every measurement, and we don't
+    // want to stretch the commit phase beyond necessary.
+    return false;
   }
+  labelsInCurrentCommit.add(label);
 
-  workInProgress.expirationTime = expirationTime;
-
-  workInProgress.child = current.child;
-  workInProgress.memoizedProps = current.memoizedProps;
-  workInProgress.memoizedState = current.memoizedState;
-  workInProgress.updateQueue = current.updateQueue;
-
-  // These will be overridden during the parent's reconciliation
-  workInProgress.sibling = current.sibling;
-  workInProgress.index = current.index;
-  workInProgress.ref = current.ref;
+  var markName = getFiberMarkName(label, debugID);
+  beginMark(markName);
+  return true;
+};
 
-  return workInProgress;
-}
+var clearFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  clearMark(markName);
+};
 
-function createHostRootFiber(isAsync) {
-  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
-  return createFiber(HostRoot, null, null, mode);
-}
+var endFiberMark = function(fiber, phase, warning$$1) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  endMark(label, markName, warning$$1);
+};
 
-function createFiberFromElement(element, mode, expirationTime) {
-  var owner = null;
-  {
-    owner = element._owner;
+var shouldIgnoreFiber = function(fiber) {
+  // Host components should be skipped in the timeline.
+  // We could check typeof fiber.type, but does this work with RN?
+  switch (fiber.tag) {
+    case HostRoot:
+    case HostComponent:
+    case HostText:
+    case HostPortal:
+    case CallComponent:
+    case ReturnComponent:
+    case Fragment:
+    case ContextProvider:
+    case ContextConsumer:
+      return true;
+    default:
+      return false;
   }
+};
 
-  var fiber = void 0;
-  var type = element.type;
-  var key = element.key;
-  var pendingProps = element.props;
+var clearPendingPhaseMeasurement = function() {
+  if (currentPhase !== null && currentPhaseFiber !== null) {
+    clearFiberMark(currentPhaseFiber, currentPhase);
+  }
+  currentPhaseFiber = null;
+  currentPhase = null;
+  hasScheduledUpdateInCurrentPhase = false;
+};
 
-  var fiberTag = void 0;
-  if (typeof type === "function") {
-    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
-  } else if (typeof type === "string") {
-    fiberTag = HostComponent;
-  } else {
-    switch (type) {
-      case REACT_FRAGMENT_TYPE:
-        return createFiberFromFragment(
-          pendingProps.children,
-          mode,
-          expirationTime,
-          key
-        );
-      case REACT_ASYNC_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= AsyncMode | StrictMode;
-        break;
-      case REACT_STRICT_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= StrictMode;
-        break;
-      case REACT_CALL_TYPE:
-        fiberTag = CallComponent;
-        break;
-      case REACT_RETURN_TYPE:
-        fiberTag = ReturnComponent;
-        break;
-      default: {
-        if (typeof type === "object" && type !== null) {
-          switch (type.$$typeof) {
-            case REACT_PROVIDER_TYPE:
-              fiberTag = ContextProvider;
-              break;
-            case REACT_CONTEXT_TYPE:
-              // This is a consumer
-              fiberTag = ContextConsumer;
-              break;
-            default:
-              if (typeof type.tag === "number") {
-                // Currently assumed to be a continuation and therefore is a
-                // fiber already.
-                // TODO: The yield system is currently broken for updates in
-                // some cases. The reified yield stores a fiber, but we don't
-                // know which fiber that is; the current or a workInProgress?
-                // When the continuation gets rendered here we don't know if we
-                // can reuse that fiber or if we need to clone it. There is
-                // probably a clever way to restructure this.
-                fiber = type;
-                fiber.pendingProps = pendingProps;
-                fiber.expirationTime = expirationTime;
-                return fiber;
-              } else {
-                throwOnInvalidElementType(type, owner);
-              }
-              break;
-          }
-        } else {
-          throwOnInvalidElementType(type, owner);
-        }
-      }
+var pauseTimers = function() {
+  // Stops all currently active measurements so that they can be resumed
+  // if we continue in a later deferred loop from the same unit of work.
+  var fiber = currentFiber;
+  while (fiber) {
+    if (fiber._debugIsCurrentlyTiming) {
+      endFiberMark(fiber, null, null);
     }
+    fiber = fiber["return"];
   }
+};
 
-  fiber = createFiber(fiberTag, pendingProps, key, mode);
-  fiber.type = type;
-  fiber.expirationTime = expirationTime;
+var resumeTimersRecursively = function(fiber) {
+  if (fiber["return"] !== null) {
+    resumeTimersRecursively(fiber["return"]);
+  }
+  if (fiber._debugIsCurrentlyTiming) {
+    beginFiberMark(fiber, null);
+  }
+};
 
-  {
-    fiber._debugSource = element._source;
-    fiber._debugOwner = element._owner;
+var resumeTimers = function() {
+  // Resumes all measurements that were active during the last deferred loop.
+  if (currentFiber !== null) {
+    resumeTimersRecursively(currentFiber);
   }
+};
 
-  return fiber;
+function recordEffect() {
+  if (enableUserTimingAPI) {
+    effectCountInCurrentCommit++;
+  }
 }
 
-function throwOnInvalidElementType(type, owner) {
-  var info = "";
-  {
+function recordScheduleUpdate() {
+  if (enableUserTimingAPI) {
+    if (isCommitting) {
+      hasScheduledUpdateInCurrentCommit = true;
+    }
     if (
-      type === undefined ||
-      (typeof type === "object" &&
-        type !== null &&
-        Object.keys(type).length === 0)
+      currentPhase !== null &&
+      currentPhase !== "componentWillMount" &&
+      currentPhase !== "componentWillReceiveProps"
     ) {
-      info +=
-        " You likely forgot to export your component from the file " +
-        "it's defined in, or you might have mixed up default and " +
-        "named imports.";
-    }
-    var ownerName = owner ? getComponentName(owner) : null;
-    if (ownerName) {
-      info += "\n\nCheck the render method of `" + ownerName + "`.";
+      hasScheduledUpdateInCurrentPhase = true;
     }
   }
-  invariant(
-    false,
-    "Element type is invalid: expected a string (for built-in " +
-      "components) or a class/function (for composite components) " +
-      "but got: %s.%s",
-    type == null ? type : typeof type,
-    info
-  );
 }
 
-function createFiberFromFragment(elements, mode, expirationTime, key) {
-  var fiber = createFiber(Fragment, elements, key, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
+function startRequestCallbackTimer() {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming && !isWaitingForCallback) {
+      isWaitingForCallback = true;
+      beginMark("(Waiting for async callback...)");
+    }
+  }
 }
 
-function createFiberFromText(content, mode, expirationTime) {
-  var fiber = createFiber(HostText, content, null, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
+function stopRequestCallbackTimer(didExpire, expirationTime) {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming) {
+      isWaitingForCallback = false;
+      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
+      endMark(
+        "(Waiting for async callback... will force flush in " +
+          expirationTime +
+          " ms)",
+        "(Waiting for async callback...)",
+        warning$$1
+      );
+    }
+  }
 }
 
-function createFiberFromHostInstanceForDeletion() {
-  var fiber = createFiber(HostComponent, null, null, NoContext);
-  fiber.type = "DELETED";
-  return fiber;
-}
-
-function createFiberFromPortal(portal, mode, expirationTime) {
-  var pendingProps = portal.children !== null ? portal.children : [];
-  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
-  fiber.expirationTime = expirationTime;
-  fiber.stateNode = {
-    containerInfo: portal.containerInfo,
-    pendingChildren: null, // Used by persistent updates
-    implementation: portal.implementation
-  };
-  return fiber;
-}
-
-// TODO: This should be lifted into the renderer.
-
-function createFiberRoot(containerInfo, isAsync, hydrate) {
-  // Cyclic construction. This cheats the type system right now because
-  // stateNode is any.
-  var uninitializedFiber = createHostRootFiber(isAsync);
-  var root = {
-    current: uninitializedFiber,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-    pendingCommitExpirationTime: NoWork,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    remainingExpirationTime: NoWork,
-    firstBatch: null,
-    nextScheduledRoot: null
-  };
-  uninitializedFiber.stateNode = root;
-  return root;
+function startWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, this is the fiber to unwind from.
+    currentFiber = fiber;
+    if (!beginFiberMark(fiber, null)) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = true;
+  }
 }
 
-var onCommitFiberRoot = null;
-var onCommitFiberUnmount = null;
-var hasLoggedError = false;
-
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {
-      if (true && !hasLoggedError) {
-        hasLoggedError = true;
-        warning(false, "React DevTools encountered an error: %s", err);
-      }
+function cancelWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
     }
-  };
+    // Remember we shouldn't complete measurement for this fiber.
+    // Otherwise flamechart will be deep even for small updates.
+    fiber._debugIsCurrentlyTiming = false;
+    clearFiberMark(fiber, null);
+  }
 }
 
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
-  }
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
-  }
-  if (!hook.supportsFiber) {
-    {
-      warning(
-        false,
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://fb.me/react-devtools"
-      );
+function stopWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
     }
-    // DevTools exists, even though it doesn't support Fiber.
-    return true;
-  }
-  try {
-    var rendererID = hook.inject(internals);
-    // We have successfully injected, so now it is safe to set up hooks.
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
-    {
-      warning(false, "React DevTools encountered an error: %s.", err);
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
     }
+    fiber._debugIsCurrentlyTiming = false;
+    endFiberMark(fiber, null, null);
   }
-  // DevTools exists
-  return true;
 }
 
-function onCommitRoot(root) {
-  if (typeof onCommitFiberRoot === "function") {
-    onCommitFiberRoot(root);
+function stopFailedWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = false;
+    var warning$$1 = "An error was thrown inside this error boundary";
+    endFiberMark(fiber, null, warning$$1);
   }
 }
 
-function onCommitUnmount(fiber) {
-  if (typeof onCommitFiberUnmount === "function") {
-    onCommitFiberUnmount(fiber);
+function startPhaseTimer(fiber, phase) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    clearPendingPhaseMeasurement();
+    if (!beginFiberMark(fiber, phase)) {
+      return;
+    }
+    currentPhaseFiber = fiber;
+    currentPhase = phase;
   }
 }
 
-/**
- * Forked from fbjs/warning:
- * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
- *
- * Only change is we use console.warn instead of console.error,
- * and do nothing when 'console' is not supported.
- * This really simplifies the code.
- * ---
- * Similar to invariant but only logs a warning if the condition is not met.
- * This can be used to log issues in development environments in critical
- * paths. Removing the logging code for production environments will keep the
- * same logic and follow the same code paths.
- */
-
-var lowPriorityWarning = function() {};
-
-{
-  var printWarning = function(format) {
-    for (
-      var _len = arguments.length,
-        args = Array(_len > 1 ? _len - 1 : 0),
-        _key = 1;
-      _key < _len;
-      _key++
-    ) {
-      args[_key - 1] = arguments[_key];
+function stopPhaseTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    if (currentPhase !== null && currentPhaseFiber !== null) {
+      var warning$$1 = hasScheduledUpdateInCurrentPhase
+        ? "Scheduled a cascading update"
+        : null;
+      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
     }
+    currentPhase = null;
+    currentPhaseFiber = null;
+  }
+}
 
-    var argIndex = 0;
-    var message =
-      "Warning: " +
-      format.replace(/%s/g, function() {
-        return args[argIndex++];
-      });
-    if (typeof console !== "undefined") {
-      console.warn(message);
+function startWorkLoopTimer(nextUnitOfWork) {
+  if (enableUserTimingAPI) {
+    currentFiber = nextUnitOfWork;
+    if (!supportsUserTiming) {
+      return;
     }
-    try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
-      throw new Error(message);
-    } catch (x) {}
-  };
+    commitCountInCurrentWorkLoop = 0;
+    // This is top level call.
+    // Any other measurements are performed within.
+    beginMark("(React Tree Reconciliation)");
+    // Resume any measurements that were in progress during the last loop.
+    resumeTimers();
+  }
+}
 
-  lowPriorityWarning = function(condition, format) {
-    if (format === undefined) {
-      throw new Error(
-        "`warning(condition, format, ...args)` requires a warning " +
-          "message argument"
-      );
+function stopWorkLoopTimer(interruptedBy, didCompleteRoot) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (!condition) {
-      for (
-        var _len2 = arguments.length,
-          args = Array(_len2 > 2 ? _len2 - 2 : 0),
-          _key2 = 2;
-        _key2 < _len2;
-        _key2++
-      ) {
-        args[_key2 - 2] = arguments[_key2];
+    var warning$$1 = null;
+    if (interruptedBy !== null) {
+      if (interruptedBy.tag === HostRoot) {
+        warning$$1 = "A top-level update interrupted the previous render";
+      } else {
+        var componentName = getComponentName(interruptedBy) || "Unknown";
+        warning$$1 =
+          "An update to " + componentName + " interrupted the previous render";
       }
-
-      printWarning.apply(undefined, [format].concat(args));
+    } else if (commitCountInCurrentWorkLoop > 1) {
+      warning$$1 = "There were cascading updates";
     }
-  };
+    commitCountInCurrentWorkLoop = 0;
+    var label = didCompleteRoot
+      ? "(React Tree Reconciliation: Completed Root)"
+      : "(React Tree Reconciliation: Yielded)";
+    // Pause any measurements until the next loop.
+    pauseTimers();
+    endMark(label, "(React Tree Reconciliation)", warning$$1);
+  }
 }
 
-var lowPriorityWarning$1 = lowPriorityWarning;
-
-var ReactStrictModeWarnings = {
-  discardPendingWarnings: function() {},
-  flushPendingDeprecationWarnings: function() {},
-  flushPendingUnsafeLifecycleWarnings: function() {},
-  recordDeprecationWarnings: function(fiber, instance) {},
-  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
-};
-
-{
-  var LIFECYCLE_SUGGESTIONS = {
-    UNSAFE_componentWillMount: "componentDidMount",
-    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
-    UNSAFE_componentWillUpdate: "componentDidUpdate"
-  };
+function startCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    isCommitting = true;
+    hasScheduledUpdateInCurrentCommit = false;
+    labelsInCurrentCommit.clear();
+    beginMark("(Committing Changes)");
+  }
+}
 
-  var pendingComponentWillMountWarnings = [];
-  var pendingComponentWillReceivePropsWarnings = [];
-  var pendingComponentWillUpdateWarnings = [];
-  var pendingUnsafeLifecycleWarnings = new Map();
+function stopCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
 
-  // Tracks components we have already warned about.
-  var didWarnAboutDeprecatedLifecycles = new Set();
-  var didWarnAboutUnsafeLifecycles = new Set();
+    var warning$$1 = null;
+    if (hasScheduledUpdateInCurrentCommit) {
+      warning$$1 = "Lifecycle hook scheduled a cascading update";
+    } else if (commitCountInCurrentWorkLoop > 0) {
+      warning$$1 = "Caused by a cascading update in earlier commit";
+    }
+    hasScheduledUpdateInCurrentCommit = false;
+    commitCountInCurrentWorkLoop++;
+    isCommitting = false;
+    labelsInCurrentCommit.clear();
 
-  ReactStrictModeWarnings.discardPendingWarnings = function() {
-    pendingComponentWillMountWarnings = [];
-    pendingComponentWillReceivePropsWarnings = [];
-    pendingComponentWillUpdateWarnings = [];
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
+  }
+}
 
-  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
-    pendingUnsafeLifecycleWarnings.forEach(function(
-      lifecycleWarningsMap,
-      strictRoot
-    ) {
-      var lifecyclesWarningMesages = [];
+function startCommitSnapshotEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Snapshot Effects)");
+  }
+}
 
-      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
-        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
-        if (lifecycleWarnings.length > 0) {
-          var componentNames = new Set();
-          lifecycleWarnings.forEach(function(fiber) {
-            componentNames.add(getComponentName(fiber) || "Component");
-            didWarnAboutUnsafeLifecycles.add(fiber.type);
-          });
+function stopCommitSnapshotEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Snapshot Effects: " + count + " Total)",
+      "(Committing Snapshot Effects)",
+      null
+    );
+  }
+}
 
-          var formatted = lifecycle.replace("UNSAFE_", "");
-          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
-          var sortedComponentNames = Array.from(componentNames)
-            .sort()
-            .join(", ");
+function startCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Host Effects)");
+  }
+}
 
-          lifecyclesWarningMesages.push(
-            formatted +
-              ": Please update the following components to use " +
-              (suggestion + " instead: " + sortedComponentNames)
-          );
-        }
-      });
+function stopCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Host Effects: " + count + " Total)",
+      "(Committing Host Effects)",
+      null
+    );
+  }
+}
 
-      if (lifecyclesWarningMesages.length > 0) {
-        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
-          strictRoot
-        );
+function startCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Calling Lifecycle Methods)");
+  }
+}
 
-        warning(
-          false,
-          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
-            "\n\n%s" +
-            "\n\nLearn more about this warning here:" +
-            "\nhttps://fb.me/react-strict-mode-warnings",
-          strictRootComponentStack,
-          lifecyclesWarningMesages.join("\n\n")
-        );
-      }
-    });
+function stopCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Calling Lifecycle Methods: " + count + " Total)",
+      "(Calling Lifecycle Methods)",
+      null
+    );
+  }
+}
 
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+var didWarnUpdateInsideUpdate = void 0;
 
-  var getStrictRoot = function(fiber) {
-    var maybeStrictRoot = null;
+{
+  didWarnUpdateInsideUpdate = false;
+}
 
-    while (fiber !== null) {
-      if (fiber.mode & StrictMode) {
-        maybeStrictRoot = fiber;
-      }
+// Callbacks are not validated until invocation
 
-      fiber = fiber["return"];
-    }
+// Singly linked-list of updates. When an update is scheduled, it is added to
+// the queue of the current fiber and the work-in-progress fiber. The two queues
+// are separate but they share a persistent structure.
+//
+// During reconciliation, updates are removed from the work-in-progress fiber,
+// but they remain on the current fiber. That ensures that if a work-in-progress
+// is aborted, the aborted updates are recovered by cloning from current.
+//
+// The work-in-progress queue is always a subset of the current queue.
+//
+// When the tree is committed, the work-in-progress becomes the current.
 
-    return maybeStrictRoot;
+function createUpdateQueue(baseState) {
+  var queue = {
+    baseState: baseState,
+    expirationTime: NoWork,
+    first: null,
+    last: null,
+    callbackList: null,
+    hasForceUpdate: false,
+    isInitialized: false,
+    capturedValues: null
   };
+  {
+    queue.isProcessing = false;
+  }
+  return queue;
+}
 
-  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
-    if (pendingComponentWillMountWarnings.length > 0) {
-      var uniqueNames = new Set();
-      pendingComponentWillMountWarnings.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var sortedNames = Array.from(uniqueNames)
-        .sort()
-        .join(", ");
+function insertUpdateIntoQueue(queue, update) {
+  // Append the update to the end of the list.
+  if (queue.last === null) {
+    // Queue is empty
+    queue.first = queue.last = update;
+  } else {
+    queue.last.next = update;
+    queue.last = update;
+  }
+  if (
+    queue.expirationTime === NoWork ||
+    queue.expirationTime > update.expirationTime
+  ) {
+    queue.expirationTime = update.expirationTime;
+  }
+}
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillMount is deprecated and will be removed in the next major version. " +
-          "Use componentDidMount instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillMount." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        sortedNames
-      );
+var q1 = void 0;
+var q2 = void 0;
+function ensureUpdateQueues(fiber) {
+  q1 = q2 = null;
+  // We'll have at least one and at most two distinct update queues.
+  var alternateFiber = fiber.alternate;
+  var queue1 = fiber.updateQueue;
+  if (queue1 === null) {
+    // TODO: We don't know what the base state will be until we begin work.
+    // It depends on which fiber is the next current. Initialize with an empty
+    // base state, then set to the memoizedState when rendering. Not super
+    // happy with this approach.
+    queue1 = fiber.updateQueue = createUpdateQueue(null);
+  }
 
-      pendingComponentWillMountWarnings = [];
-    }
-
-    if (pendingComponentWillReceivePropsWarnings.length > 0) {
-      var _uniqueNames = new Set();
-      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
-        _uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames = Array.from(_uniqueNames)
-        .sort()
-        .join(", ");
-
-      lowPriorityWarning$1(
-        false,
-        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
-          "Use static getDerivedStateFromProps instead." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames
-      );
-
-      pendingComponentWillReceivePropsWarnings = [];
-    }
-
-    if (pendingComponentWillUpdateWarnings.length > 0) {
-      var _uniqueNames2 = new Set();
-      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
-        _uniqueNames2.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames2 = Array.from(_uniqueNames2)
-        .sort()
-        .join(", ");
-
-      lowPriorityWarning$1(
-        false,
-        "componentWillUpdate is deprecated and will be removed in the next major version. " +
-          "Use componentDidUpdate instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillUpdate." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames2
-      );
-
-      pendingComponentWillUpdateWarnings = [];
-    }
-  };
-
-  ReactStrictModeWarnings.recordDeprecationWarnings = function(
-    fiber,
-    instance
-  ) {
-    // Dedup strategy: Warn once per component.
-    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
-      return;
-    }
-
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillMountWarnings.push(fiber);
-    }
-    if (
-      typeof instance.componentWillReceiveProps === "function" &&
-      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillReceivePropsWarnings.push(fiber);
-    }
-    if (typeof instance.componentWillUpdate === "function") {
-      pendingComponentWillUpdateWarnings.push(fiber);
-    }
-  };
-
-  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
-    fiber,
-    instance
-  ) {
-    var strictRoot = getStrictRoot(fiber);
-
-    // Dedup strategy: Warn once per component.
-    // This is difficult to track any other way since component names
-    // are often vague and are likely to collide between 3rd party libraries.
-    // An expand property is probably okay to use here since it's DEV-only,
-    // and will only be set in the event of serious warnings.
-    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
-      return;
-    }
-
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
-    ) {
-      return;
-    }
-
-    var warningsForRoot = void 0;
-    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
-      warningsForRoot = {
-        UNSAFE_componentWillMount: [],
-        UNSAFE_componentWillReceiveProps: [],
-        UNSAFE_componentWillUpdate: []
-      };
-
-      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
-    } else {
-      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
-    }
-
-    var unsafeLifecycles = [];
-    if (
-      typeof instance.componentWillMount === "function" ||
-      typeof instance.UNSAFE_componentWillMount === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillMount");
-    }
-    if (
-      typeof instance.componentWillReceiveProps === "function" ||
-      typeof instance.UNSAFE_componentWillReceiveProps === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
-    }
-    if (
-      typeof instance.componentWillUpdate === "function" ||
-      typeof instance.UNSAFE_componentWillUpdate === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
-    }
-
-    if (unsafeLifecycles.length > 0) {
-      unsafeLifecycles.forEach(function(lifecycle) {
-        warningsForRoot[lifecycle].push(fiber);
-      });
-    }
-  };
-}
-
-var didWarnUpdateInsideUpdate = void 0;
-
-{
-  didWarnUpdateInsideUpdate = false;
-}
-
-// Callbacks are not validated until invocation
-
-// Singly linked-list of updates. When an update is scheduled, it is added to
-// the queue of the current fiber and the work-in-progress fiber. The two queues
-// are separate but they share a persistent structure.
-//
-// During reconciliation, updates are removed from the work-in-progress fiber,
-// but they remain on the current fiber. That ensures that if a work-in-progress
-// is aborted, the aborted updates are recovered by cloning from current.
-//
-// The work-in-progress queue is always a subset of the current queue.
-//
-// When the tree is committed, the work-in-progress becomes the current.
-
-function createUpdateQueue(baseState) {
-  var queue = {
-    baseState: baseState,
-    expirationTime: NoWork,
-    first: null,
-    last: null,
-    callbackList: null,
-    hasForceUpdate: false,
-    isInitialized: false,
-    capturedValues: null
-  };
-  {
-    queue.isProcessing = false;
-  }
-  return queue;
-}
-
-function insertUpdateIntoQueue(queue, update) {
-  // Append the update to the end of the list.
-  if (queue.last === null) {
-    // Queue is empty
-    queue.first = queue.last = update;
-  } else {
-    queue.last.next = update;
-    queue.last = update;
-  }
-  if (
-    queue.expirationTime === NoWork ||
-    queue.expirationTime > update.expirationTime
-  ) {
-    queue.expirationTime = update.expirationTime;
-  }
-}
-
-var q1 = void 0;
-var q2 = void 0;
-function ensureUpdateQueues(fiber) {
-  q1 = q2 = null;
-  // We'll have at least one and at most two distinct update queues.
-  var alternateFiber = fiber.alternate;
-  var queue1 = fiber.updateQueue;
-  if (queue1 === null) {
-    // TODO: We don't know what the base state will be until we begin work.
-    // It depends on which fiber is the next current. Initialize with an empty
-    // base state, then set to the memoizedState when rendering. Not super
-    // happy with this approach.
-    queue1 = fiber.updateQueue = createUpdateQueue(null);
-  }
-
-  var queue2 = void 0;
-  if (alternateFiber !== null) {
-    queue2 = alternateFiber.updateQueue;
-    if (queue2 === null) {
-      queue2 = alternateFiber.updateQueue = createUpdateQueue(null);
+  var queue2 = void 0;
+  if (alternateFiber !== null) {
+    queue2 = alternateFiber.updateQueue;
+    if (queue2 === null) {
+      queue2 = alternateFiber.updateQueue = createUpdateQueue(null);
     }
   } else {
     queue2 = null;
@@ -6360,23 +6123,26 @@ var isArray = Array.isArray;
 var didWarnAboutStateAssignmentForComponent = void 0;
 var didWarnAboutUndefinedDerivedState = void 0;
 var didWarnAboutUninitializedState = void 0;
-var didWarnAboutWillReceivePropsAndDerivedState = void 0;
+var didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = void 0;
+var didWarnAboutLegacyLifecyclesAndDerivedState = void 0;
 var warnOnInvalidCallback = void 0;
 
 {
-  didWarnAboutStateAssignmentForComponent = {};
-  didWarnAboutUndefinedDerivedState = {};
-  didWarnAboutUninitializedState = {};
-  didWarnAboutWillReceivePropsAndDerivedState = {};
+  didWarnAboutStateAssignmentForComponent = new Set();
+  didWarnAboutUndefinedDerivedState = new Set();
+  didWarnAboutUninitializedState = new Set();
+  didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = new Set();
+  didWarnAboutLegacyLifecyclesAndDerivedState = new Set();
 
-  var didWarnOnInvalidCallback = {};
+  var didWarnOnInvalidCallback = new Set();
 
   warnOnInvalidCallback = function(callback, callerName) {
     if (callback === null || typeof callback === "function") {
       return;
     }
     var key = callerName + "_" + callback;
-    if (!didWarnOnInvalidCallback[key]) {
+    if (!didWarnOnInvalidCallback.has(key)) {
+      didWarnOnInvalidCallback.add(key);
       warning(
         false,
         "%s(...): Expected the last optional `callback` argument to be a " +
@@ -6384,7 +6150,6 @@ var warnOnInvalidCallback = void 0;
         callerName,
         callback
       );
-      didWarnOnInvalidCallback[key] = true;
     }
   };
 
@@ -6423,12 +6188,20 @@ function callGetDerivedStateFromCatch(ctor, capturedValues) {
 }
 
 var ReactFiberClassComponent = function(
+  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
   memoizeState
 ) {
+  var cacheContext = legacyContext.cacheContext,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    isContextConsumer = legacyContext.isContextConsumer,
+    hasContextChanged = legacyContext.hasContextChanged;
+
   // Class component state updater
+
   var updater = {
     isMounted: isMounted,
     enqueueSetState: function(instance, partialState, callback) {
@@ -6519,12 +6292,14 @@ var ReactFiberClassComponent = function(
       stopPhaseTimer();
 
       {
-        warning(
-          shouldUpdate !== undefined,
-          "%s.shouldComponentUpdate(): Returned undefined instead of a " +
-            "boolean value. Make sure to return true or false.",
-          getComponentName(workInProgress) || "Unknown"
-        );
+        !(shouldUpdate !== undefined)
+          ? warning(
+              false,
+              "%s.shouldComponentUpdate(): Returned undefined instead of a " +
+                "boolean value. Make sure to return true or false.",
+              getComponentName(workInProgress) || "Component"
+            )
+          : void 0;
       }
 
       return shouldUpdate;
@@ -6543,7 +6318,7 @@ var ReactFiberClassComponent = function(
     var instance = workInProgress.stateNode;
     var type = workInProgress.type;
     {
-      var name = getComponentName(workInProgress);
+      var name = getComponentName(workInProgress) || "Component";
       var renderPresent = instance.render;
 
       if (!renderPresent) {
@@ -6568,47 +6343,57 @@ var ReactFiberClassComponent = function(
         !instance.getInitialState ||
         instance.getInitialState.isReactClassApproved ||
         instance.state;
-      warning(
-        noGetInitialStateOnES6,
-        "getInitialState was defined on %s, a plain JavaScript class. " +
-          "This is only supported for classes created using React.createClass. " +
-          "Did you mean to define a state property instead?",
-        name
-      );
+      !noGetInitialStateOnES6
+        ? warning(
+            false,
+            "getInitialState was defined on %s, a plain JavaScript class. " +
+              "This is only supported for classes created using React.createClass. " +
+              "Did you mean to define a state property instead?",
+            name
+          )
+        : void 0;
       var noGetDefaultPropsOnES6 =
         !instance.getDefaultProps ||
         instance.getDefaultProps.isReactClassApproved;
-      warning(
-        noGetDefaultPropsOnES6,
-        "getDefaultProps was defined on %s, a plain JavaScript class. " +
-          "This is only supported for classes created using React.createClass. " +
-          "Use a static property to define defaultProps instead.",
-        name
-      );
+      !noGetDefaultPropsOnES6
+        ? warning(
+            false,
+            "getDefaultProps was defined on %s, a plain JavaScript class. " +
+              "This is only supported for classes created using React.createClass. " +
+              "Use a static property to define defaultProps instead.",
+            name
+          )
+        : void 0;
       var noInstancePropTypes = !instance.propTypes;
-      warning(
-        noInstancePropTypes,
-        "propTypes was defined as an instance property on %s. Use a static " +
-          "property to define propTypes instead.",
-        name
-      );
+      !noInstancePropTypes
+        ? warning(
+            false,
+            "propTypes was defined as an instance property on %s. Use a static " +
+              "property to define propTypes instead.",
+            name
+          )
+        : void 0;
       var noInstanceContextTypes = !instance.contextTypes;
-      warning(
-        noInstanceContextTypes,
-        "contextTypes was defined as an instance property on %s. Use a static " +
-          "property to define contextTypes instead.",
-        name
-      );
+      !noInstanceContextTypes
+        ? warning(
+            false,
+            "contextTypes was defined as an instance property on %s. Use a static " +
+              "property to define contextTypes instead.",
+            name
+          )
+        : void 0;
       var noComponentShouldUpdate =
         typeof instance.componentShouldUpdate !== "function";
-      warning(
-        noComponentShouldUpdate,
-        "%s has a method called " +
-          "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
-          "The name is phrased as a question because the function is " +
-          "expected to return a value.",
-        name
-      );
+      !noComponentShouldUpdate
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
+              "The name is phrased as a question because the function is " +
+              "expected to return a value.",
+            name
+          )
+        : void 0;
       if (
         type.prototype &&
         type.prototype.isPureReactComponent &&
@@ -6624,73 +6409,128 @@ var ReactFiberClassComponent = function(
       }
       var noComponentDidUnmount =
         typeof instance.componentDidUnmount !== "function";
-      warning(
-        noComponentDidUnmount,
-        "%s has a method called " +
-          "componentDidUnmount(). But there is no such lifecycle method. " +
-          "Did you mean componentWillUnmount()?",
-        name
-      );
+      !noComponentDidUnmount
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentDidUnmount(). But there is no such lifecycle method. " +
+              "Did you mean componentWillUnmount()?",
+            name
+          )
+        : void 0;
       var noComponentDidReceiveProps =
         typeof instance.componentDidReceiveProps !== "function";
-      warning(
-        noComponentDidReceiveProps,
-        "%s has a method called " +
-          "componentDidReceiveProps(). But there is no such lifecycle method. " +
-          "If you meant to update the state in response to changing props, " +
-          "use componentWillReceiveProps(). If you meant to fetch data or " +
-          "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
-        name
-      );
+      !noComponentDidReceiveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentDidReceiveProps(). But there is no such lifecycle method. " +
+              "If you meant to update the state in response to changing props, " +
+              "use componentWillReceiveProps(). If you meant to fetch data or " +
+              "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
+            name
+          )
+        : void 0;
       var noComponentWillRecieveProps =
         typeof instance.componentWillRecieveProps !== "function";
-      warning(
-        noComponentWillRecieveProps,
-        "%s has a method called " +
-          "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
-        name
-      );
+      !noComponentWillRecieveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
+            name
+          )
+        : void 0;
       var noUnsafeComponentWillRecieveProps =
         typeof instance.UNSAFE_componentWillRecieveProps !== "function";
-      warning(
-        noUnsafeComponentWillRecieveProps,
-        "%s has a method called " +
-          "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
-        name
-      );
+      !noUnsafeComponentWillRecieveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
+            name
+          )
+        : void 0;
       var hasMutatedProps = instance.props !== workInProgress.pendingProps;
-      warning(
-        instance.props === undefined || !hasMutatedProps,
-        "%s(...): When calling super() in `%s`, make sure to pass " +
-          "up the same props that your component's constructor was passed.",
-        name,
-        name
-      );
+      !(instance.props === undefined || !hasMutatedProps)
+        ? warning(
+            false,
+            "%s(...): When calling super() in `%s`, make sure to pass " +
+              "up the same props that your component's constructor was passed.",
+            name,
+            name
+          )
+        : void 0;
       var noInstanceDefaultProps = !instance.defaultProps;
-      warning(
-        noInstanceDefaultProps,
-        "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
-          " Instead, define defaultProps as a static property on %s.",
-        name,
-        name
-      );
-    }
+      !noInstanceDefaultProps
+        ? warning(
+            false,
+            "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
+              " Instead, define defaultProps as a static property on %s.",
+            name,
+            name
+          )
+        : void 0;
 
-    var state = instance.state;
-    if (state && (typeof state !== "object" || isArray(state))) {
-      warning(
-        false,
-        "%s.state: must be set to an object or null",
-        getComponentName(workInProgress)
-      );
-    }
-    if (typeof instance.getChildContext === "function") {
-      warning(
-        typeof type.childContextTypes === "object",
-        "%s.getChildContext(): childContextTypes must be defined in order to " +
-          "use getChildContext().",
-        getComponentName(workInProgress)
-      );
+      if (
+        typeof instance.getSnapshotBeforeUpdate === "function" &&
+        typeof instance.componentDidUpdate !== "function" &&
+        typeof instance.componentDidUpdate !== "function" &&
+        !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
+      ) {
+        didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
+        warning(
+          false,
+          "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
+            "This component defines getSnapshotBeforeUpdate() only.",
+          getComponentName(workInProgress)
+        );
+      }
+
+      var noInstanceGetDerivedStateFromProps =
+        typeof instance.getDerivedStateFromProps !== "function";
+      !noInstanceGetDerivedStateFromProps
+        ? warning(
+            false,
+            "%s: getDerivedStateFromProps() is defined as an instance method " +
+              "and will be ignored. Instead, declare it as a static method.",
+            name
+          )
+        : void 0;
+      var noInstanceGetDerivedStateFromCatch =
+        typeof instance.getDerivedStateFromCatch !== "function";
+      !noInstanceGetDerivedStateFromCatch
+        ? warning(
+            false,
+            "%s: getDerivedStateFromCatch() is defined as an instance method " +
+              "and will be ignored. Instead, declare it as a static method.",
+            name
+          )
+        : void 0;
+      var noStaticGetSnapshotBeforeUpdate =
+        typeof type.getSnapshotBeforeUpdate !== "function";
+      !noStaticGetSnapshotBeforeUpdate
+        ? warning(
+            false,
+            "%s: getSnapshotBeforeUpdate() is defined as a static method " +
+              "and will be ignored. Instead, declare it as an instance method.",
+            name
+          )
+        : void 0;
+      var _state = instance.state;
+      if (_state && (typeof _state !== "object" || isArray(_state))) {
+        warning(false, "%s.state: must be set to an object or null", name);
+      }
+      if (typeof instance.getChildContext === "function") {
+        !(typeof type.childContextTypes === "object")
+          ? warning(
+              false,
+              "%s.getChildContext(): childContextTypes must be defined in order to " +
+                "use getChildContext().",
+              name
+            )
+          : void 0;
+      }
     }
   }
 
@@ -6738,8 +6578,9 @@ var ReactFiberClassComponent = function(
         typeof ctor.getDerivedStateFromProps === "function" &&
         state === null
       ) {
-        var componentName = getComponentName(workInProgress) || "Unknown";
-        if (!didWarnAboutUninitializedState[componentName]) {
+        var componentName = getComponentName(workInProgress) || "Component";
+        if (!didWarnAboutUninitializedState.has(componentName)) {
+          didWarnAboutUninitializedState.add(componentName);
           warning(
             false,
             "%s: Did not properly initialize state during construction. " +
@@ -6747,7 +6588,75 @@ var ReactFiberClassComponent = function(
             componentName,
             instance.state === null ? "null" : "undefined"
           );
-          didWarnAboutUninitializedState[componentName] = true;
+        }
+      }
+
+      // If new component APIs are defined, "unsafe" lifecycles won't be called.
+      // Warn about these lifecycles if they are present.
+      // Don't warn about react-lifecycles-compat polyfilled methods though.
+      if (
+        typeof ctor.getDerivedStateFromProps === "function" ||
+        typeof instance.getSnapshotBeforeUpdate === "function"
+      ) {
+        var foundWillMountName = null;
+        var foundWillReceivePropsName = null;
+        var foundWillUpdateName = null;
+        if (
+          typeof instance.componentWillMount === "function" &&
+          instance.componentWillMount.__suppressDeprecationWarning !== true
+        ) {
+          foundWillMountName = "componentWillMount";
+        } else if (typeof instance.UNSAFE_componentWillMount === "function") {
+          foundWillMountName = "UNSAFE_componentWillMount";
+        }
+        if (
+          typeof instance.componentWillReceiveProps === "function" &&
+          instance.componentWillReceiveProps.__suppressDeprecationWarning !==
+            true
+        ) {
+          foundWillReceivePropsName = "componentWillReceiveProps";
+        } else if (
+          typeof instance.UNSAFE_componentWillReceiveProps === "function"
+        ) {
+          foundWillReceivePropsName = "UNSAFE_componentWillReceiveProps";
+        }
+        if (
+          typeof instance.componentWillUpdate === "function" &&
+          instance.componentWillUpdate.__suppressDeprecationWarning !== true
+        ) {
+          foundWillUpdateName = "componentWillUpdate";
+        } else if (typeof instance.UNSAFE_componentWillUpdate === "function") {
+          foundWillUpdateName = "UNSAFE_componentWillUpdate";
+        }
+        if (
+          foundWillMountName !== null ||
+          foundWillReceivePropsName !== null ||
+          foundWillUpdateName !== null
+        ) {
+          var _componentName = getComponentName(workInProgress) || "Component";
+          var newApiName =
+            typeof ctor.getDerivedStateFromProps === "function"
+              ? "getDerivedStateFromProps()"
+              : "getSnapshotBeforeUpdate()";
+          if (
+            !didWarnAboutLegacyLifecyclesAndDerivedState.has(_componentName)
+          ) {
+            didWarnAboutLegacyLifecyclesAndDerivedState.add(_componentName);
+            warning(
+              false,
+              "Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n" +
+                "%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n" +
+                "The above lifecycles should be removed. Learn more about this warning here:\n" +
+                "https://fb.me/react-async-component-lifecycle-hooks",
+              _componentName,
+              newApiName,
+              foundWillMountName !== null ? "\n  " + foundWillMountName : "",
+              foundWillReceivePropsName !== null
+                ? "\n  " + foundWillReceivePropsName
+                : "",
+              foundWillUpdateName !== null ? "\n  " + foundWillUpdateName : ""
+            );
+          }
         }
       }
     }
@@ -6757,7 +6666,8 @@ var ReactFiberClassComponent = function(
     var partialState = callGetDerivedStateFromProps(
       workInProgress,
       instance,
-      props
+      props,
+      state
     );
 
     if (partialState !== null && partialState !== undefined) {
@@ -6800,7 +6710,7 @@ var ReactFiberClassComponent = function(
           "%s.componentWillMount(): Assigning directly to this.state is " +
             "deprecated (except inside a component's " +
             "constructor). Use setState instead.",
-          getComponentName(workInProgress)
+          getComponentName(workInProgress) || "Component"
         );
       }
       updater.enqueueReplaceState(instance, instance.state, null);
@@ -6826,7 +6736,8 @@ var ReactFiberClassComponent = function(
     if (instance.state !== oldState) {
       {
         var componentName = getComponentName(workInProgress) || "Component";
-        if (!didWarnAboutStateAssignmentForComponent[componentName]) {
+        if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
+          didWarnAboutStateAssignmentForComponent.add(componentName);
           warning(
             false,
             "%s.componentWillReceiveProps(): Assigning directly to " +
@@ -6834,69 +6745,47 @@ var ReactFiberClassComponent = function(
               "constructor). Use setState instead.",
             componentName
           );
-          didWarnAboutStateAssignmentForComponent[componentName] = true;
         }
       }
       updater.enqueueReplaceState(instance, instance.state, null);
     }
   }
 
-  function callGetDerivedStateFromProps(workInProgress, instance, props) {
+  function callGetDerivedStateFromProps(
+    workInProgress,
+    instance,
+    nextProps,
+    prevState
+  ) {
     var type = workInProgress.type;
 
     if (typeof type.getDerivedStateFromProps === "function") {
-      {
-        // Don't warn about react-lifecycles-compat polyfilled components
-        if (
-          (typeof instance.componentWillReceiveProps === "function" &&
-            instance.componentWillReceiveProps.__suppressDeprecationWarning !==
-              true) ||
-          typeof instance.UNSAFE_componentWillReceiveProps === "function"
-        ) {
-          var componentName = getComponentName(workInProgress) || "Unknown";
-          if (!didWarnAboutWillReceivePropsAndDerivedState[componentName]) {
-            warning(
-              false,
-              "%s: Defines both componentWillReceiveProps() and static " +
-                "getDerivedStateFromProps() methods. We recommend using " +
-                "only getDerivedStateFromProps().",
-              componentName
-            );
-            didWarnAboutWillReceivePropsAndDerivedState[componentName] = true;
-          }
-        }
-      }
-
       if (
         debugRenderPhaseSideEffects ||
         (debugRenderPhaseSideEffectsForStrictMode &&
           workInProgress.mode & StrictMode)
       ) {
         // Invoke method an extra time to help detect side-effects.
-        type.getDerivedStateFromProps.call(
-          null,
-          props,
-          workInProgress.memoizedState
-        );
+        type.getDerivedStateFromProps.call(null, nextProps, prevState);
       }
 
       var partialState = type.getDerivedStateFromProps.call(
         null,
-        props,
-        workInProgress.memoizedState
+        nextProps,
+        prevState
       );
 
       {
         if (partialState === undefined) {
-          var _componentName = getComponentName(workInProgress) || "Unknown";
-          if (!didWarnAboutUndefinedDerivedState[_componentName]) {
+          var componentName = getComponentName(workInProgress) || "Component";
+          if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
+            didWarnAboutUndefinedDerivedState.add(componentName);
             warning(
               false,
               "%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. " +
                 "You have returned undefined.",
-              _componentName
+              componentName
             );
-            didWarnAboutUndefinedDerivedState[_componentName] = _componentName;
           }
         }
       }
@@ -6940,11 +6829,12 @@ var ReactFiberClassComponent = function(
     }
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      typeof ctor.getDerivedStateFromProps !== "function" &&
+      typeof instance.getSnapshotBeforeUpdate !== "function" &&
       (typeof instance.UNSAFE_componentWillMount === "function" ||
-        typeof instance.componentWillMount === "function") &&
-      typeof ctor.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillMount === "function")
     ) {
       callComponentWillMount(workInProgress, instance);
       // If we had additional state updates during this life-cycle, let's
@@ -6977,16 +6867,20 @@ var ReactFiberClassComponent = function(
     var newUnmaskedContext = getUnmaskedContext(workInProgress);
     var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
+    var hasNewLifecycles =
+      typeof ctor.getDerivedStateFromProps === "function" ||
+      typeof instance.getSnapshotBeforeUpdate === "function";
+
     // Note: During these life-cycles, instance.props/instance.state are what
     // ever the previously attempted to render - not the "current". However,
     // during componentDidUpdate we pass the "current" props.
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      !hasNewLifecycles &&
       (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function") &&
-      typeof ctor.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillReceiveProps === "function")
     ) {
       if (oldProps !== newProps || oldContext !== newContext) {
         callComponentWillReceiveProps(
@@ -6998,15 +6892,6 @@ var ReactFiberClassComponent = function(
       }
     }
 
-    var derivedStateFromProps = void 0;
-    if (oldProps !== newProps) {
-      derivedStateFromProps = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps
-      );
-    }
-
     // Compute the next state using the memoized state and the update queue.
     var oldState = workInProgress.memoizedState;
     // TODO: Previous state can be null.
@@ -7043,6 +6928,18 @@ var ReactFiberClassComponent = function(
       newState = oldState;
     }
 
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      // The prevState parameter should be the partially updated state.
+      // Otherwise, spreading state in return values could override updates.
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps,
+        newState
+      );
+    }
+
     if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
       // So that multiple render passes do not enqueue multiple updates.
@@ -7051,6 +6948,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromProps
           : Object.assign({}, newState, derivedStateFromProps);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue = workInProgress.updateQueue;
+      if (_updateQueue !== null) {
+        _updateQueue.baseState = Object.assign(
+          {},
+          _updateQueue.baseState,
+          derivedStateFromProps
+        );
+      }
     }
     if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
@@ -7060,6 +6968,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromCatch
           : Object.assign({}, newState, derivedStateFromCatch);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue2 = workInProgress.updateQueue;
+      if (_updateQueue2 !== null) {
+        _updateQueue2.baseState = Object.assign(
+          {},
+          _updateQueue2.baseState,
+          derivedStateFromCatch
+        );
+      }
     }
 
     if (
@@ -7090,22 +7009,22 @@ var ReactFiberClassComponent = function(
 
     if (shouldUpdate) {
       // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      // Unsafe lifecycles should not be invoked for components using the new APIs.
       if (
-        (typeof instance.UNSAFE_componentWillUpdate === "function" ||
-          typeof instance.componentWillUpdate === "function") &&
-        typeof ctor.getDerivedStateFromProps !== "function"
+        !hasNewLifecycles &&
+        (typeof instance.UNSAFE_componentWillMount === "function" ||
+          typeof instance.componentWillMount === "function")
       ) {
-        startPhaseTimer(workInProgress, "componentWillUpdate");
-        if (typeof instance.componentWillUpdate === "function") {
-          instance.componentWillUpdate(newProps, newState, newContext);
+        startPhaseTimer(workInProgress, "componentWillMount");
+        if (typeof instance.componentWillMount === "function") {
+          instance.componentWillMount();
         }
-        if (typeof instance.UNSAFE_componentWillUpdate === "function") {
-          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
+        if (typeof instance.UNSAFE_componentWillMount === "function") {
+          instance.UNSAFE_componentWillMount();
         }
         stopPhaseTimer();
       }
-      if (typeof instance.componentDidUpdate === "function") {
+      if (typeof instance.componentDidMount === "function") {
         workInProgress.effectTag |= Update;
       }
     } else {
@@ -7142,16 +7061,20 @@ var ReactFiberClassComponent = function(
     var newUnmaskedContext = getUnmaskedContext(workInProgress);
     var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
+    var hasNewLifecycles =
+      typeof ctor.getDerivedStateFromProps === "function" ||
+      typeof instance.getSnapshotBeforeUpdate === "function";
+
     // Note: During these life-cycles, instance.props/instance.state are what
     // ever the previously attempted to render - not the "current". However,
     // during componentDidUpdate we pass the "current" props.
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      !hasNewLifecycles &&
       (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function") &&
-      typeof ctor.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillReceiveProps === "function")
     ) {
       if (oldProps !== newProps || oldContext !== newContext) {
         callComponentWillReceiveProps(
@@ -7163,20 +7086,12 @@ var ReactFiberClassComponent = function(
       }
     }
 
-    var derivedStateFromProps = void 0;
-    if (oldProps !== newProps) {
-      derivedStateFromProps = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps
-      );
-    }
-
     // Compute the next state using the memoized state and the update queue.
     var oldState = workInProgress.memoizedState;
     // TODO: Previous state can be null.
     var newState = void 0;
     var derivedStateFromCatch = void 0;
+
     if (workInProgress.updateQueue !== null) {
       newState = processUpdateQueue(
         current,
@@ -7208,6 +7123,18 @@ var ReactFiberClassComponent = function(
       newState = oldState;
     }
 
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      // The prevState parameter should be the partially updated state.
+      // Otherwise, spreading state in return values could override updates.
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps,
+        newState
+      );
+    }
+
     if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
       // So that multiple render passes do not enqueue multiple updates.
@@ -7216,6 +7143,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromProps
           : Object.assign({}, newState, derivedStateFromProps);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue3 = workInProgress.updateQueue;
+      if (_updateQueue3 !== null) {
+        _updateQueue3.baseState = Object.assign(
+          {},
+          _updateQueue3.baseState,
+          derivedStateFromProps
+        );
+      }
     }
     if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
@@ -7225,6 +7163,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromCatch
           : Object.assign({}, newState, derivedStateFromCatch);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue4 = workInProgress.updateQueue;
+      if (_updateQueue4 !== null) {
+        _updateQueue4.baseState = Object.assign(
+          {},
+          _updateQueue4.baseState,
+          derivedStateFromCatch
+        );
+      }
     }
 
     if (
@@ -7246,6 +7195,14 @@ var ReactFiberClassComponent = function(
           workInProgress.effectTag |= Update;
         }
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Snapshot;
+        }
+      }
       return false;
     }
 
@@ -7260,11 +7217,11 @@ var ReactFiberClassComponent = function(
 
     if (shouldUpdate) {
       // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      // Unsafe lifecycles should not be invoked for components using the new APIs.
       if (
+        !hasNewLifecycles &&
         (typeof instance.UNSAFE_componentWillUpdate === "function" ||
-          typeof instance.componentWillUpdate === "function") &&
-        typeof ctor.getDerivedStateFromProps !== "function"
+          typeof instance.componentWillUpdate === "function")
       ) {
         startPhaseTimer(workInProgress, "componentWillUpdate");
         if (typeof instance.componentWillUpdate === "function") {
@@ -7278,6 +7235,9 @@ var ReactFiberClassComponent = function(
       if (typeof instance.componentDidUpdate === "function") {
         workInProgress.effectTag |= Update;
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        workInProgress.effectTag |= Snapshot;
+      }
     } else {
       // If an update was already in progress, we should schedule an Update
       // effect even though we're bailing out, so that cWU/cDU are called.
@@ -7289,6 +7249,14 @@ var ReactFiberClassComponent = function(
           workInProgress.effectTag |= Update;
         }
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Snapshot;
+        }
+      }
 
       // If shouldComponentUpdate returned false, we should still update the
       // memoized props/state to indicate that this work can be reused.
@@ -8128,13 +8096,15 @@ function ChildReconciler(shouldTrackSideEffects) {
       if (typeof newChildrenIterable.entries === "function") {
         var possibleMap = newChildrenIterable;
         if (possibleMap.entries === iteratorFn) {
-          warning(
-            didWarnAboutMaps,
-            "Using Maps as children is unsupported and will likely yield " +
-              "unexpected results. Convert it to a sequence/iterable of keyed " +
-              "ReactElements instead.%s",
-            getCurrentFiberStackAddendum$1()
-          );
+          !didWarnAboutMaps
+            ? warning(
+                false,
+                "Using Maps as children is unsupported and will likely yield " +
+                  "unexpected results. Convert it to a sequence/iterable of keyed " +
+                  "ReactElements instead.%s",
+                getCurrentFiberStackAddendum$1()
+              )
+            : void 0;
           didWarnAboutMaps = true;
         }
       }
@@ -8576,71 +8546,6 @@ function cloneChildFibers(current, workInProgress) {
   newChild.sibling = null;
 }
 
-var changedBitsStack = [];
-var currentValueStack = [];
-var stack = [];
-var index$1 = -1;
-
-var rendererSigil = void 0;
-{
-  // Use this to detect multiple renderers using the same context
-  rendererSigil = {};
-}
-
-function pushProvider(providerFiber) {
-  var context = providerFiber.type.context;
-  index$1 += 1;
-  changedBitsStack[index$1] = context._changedBits;
-  currentValueStack[index$1] = context._currentValue;
-  stack[index$1] = providerFiber;
-  context._currentValue = providerFiber.pendingProps.value;
-  context._changedBits = providerFiber.stateNode;
-
-  {
-    warning(
-      context._currentRenderer === null ||
-        context._currentRenderer === rendererSigil,
-      "Detected multiple renderers concurrently rendering the " +
-        "same context provider. This is currently unsupported."
-    );
-    context._currentRenderer = rendererSigil;
-  }
-}
-
-function popProvider(providerFiber) {
-  {
-    warning(
-      index$1 > -1 && providerFiber === stack[index$1],
-      "Unexpected pop."
-    );
-  }
-  var changedBits = changedBitsStack[index$1];
-  var currentValue = currentValueStack[index$1];
-  changedBitsStack[index$1] = null;
-  currentValueStack[index$1] = null;
-  stack[index$1] = null;
-  index$1 -= 1;
-  var context = providerFiber.type.context;
-  context._currentValue = currentValue;
-  context._changedBits = changedBits;
-}
-
-function resetProviderStack() {
-  for (var i = index$1; i > -1; i--) {
-    var providerFiber = stack[i];
-    var context = providerFiber.type.context;
-    context._currentValue = context._defaultValue;
-    context._changedBits = 0;
-    changedBitsStack[i] = null;
-    currentValueStack[i] = null;
-    stack[i] = null;
-    {
-      context._currentRenderer = null;
-    }
-  }
-  index$1 = -1;
-}
-
 var didWarnAboutBadClass = void 0;
 var didWarnAboutGetDerivedStateOnFunctionalComponent = void 0;
 var didWarnAboutStatelessRefs = void 0;
@@ -8654,6 +8559,8 @@ var didWarnAboutStatelessRefs = void 0;
 var ReactFiberBeginWork = function(
   config,
   hostContext,
+  legacyContext,
+  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
@@ -8662,12 +8569,20 @@ var ReactFiberBeginWork = function(
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree;
   var pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer;
+  var pushProvider = newContext.pushProvider;
+  var getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    hasLegacyContextChanged = legacyContext.hasContextChanged,
+    pushLegacyContextProvider = legacyContext.pushContextProvider,
+    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
+    invalidateContextProvider = legacyContext.invalidateContextProvider;
   var enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
 
   var _ReactFiberClassCompo = ReactFiberClassComponent(
+      legacyContext,
       scheduleWork,
       computeExpirationForFiber,
       memoizeProps,
@@ -8725,9 +8640,17 @@ var ReactFiberBeginWork = function(
     }
   }
 
+  function updateForwardRef(current, workInProgress) {
+    var render = workInProgress.type.render;
+    var nextChildren = render(workInProgress.pendingProps, workInProgress.ref);
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextChildren);
+    return workInProgress.child;
+  }
+
   function updateFragment(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextChildren) {
@@ -8740,7 +8663,7 @@ var ReactFiberBeginWork = function(
 
   function updateMode(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps.children;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (
@@ -8769,7 +8692,7 @@ var ReactFiberBeginWork = function(
     var fn = workInProgress.type;
     var nextProps = workInProgress.pendingProps;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else {
@@ -8802,7 +8725,7 @@ var ReactFiberBeginWork = function(
     // Push context providers early to prevent context stack mismatches.
     // During mounting we don't know the child context yet as the instance doesn't exist.
     // We will invalidate the child context in finishClassComponent() right after rendering.
-    var hasContext = pushContextProvider(workInProgress);
+    var hasContext = pushLegacyContextProvider(workInProgress);
     var shouldUpdate = void 0;
     if (current === null) {
       if (workInProgress.stateNode === null) {
@@ -9027,7 +8950,7 @@ var ReactFiberBeginWork = function(
     var nextProps = workInProgress.pendingProps;
     var prevProps = current !== null ? current.memoizedProps : null;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (memoizedProps === nextProps) {
@@ -9147,7 +9070,8 @@ var ReactFiberBeginWork = function(
         var partialState = callGetDerivedStateFromProps(
           workInProgress,
           value,
-          props
+          props,
+          workInProgress.memoizedState
         );
 
         if (partialState !== null && partialState !== undefined) {
@@ -9162,7 +9086,7 @@ var ReactFiberBeginWork = function(
       // Push context providers early to prevent context stack mismatches.
       // During mounting we don't know the child context yet as the instance doesn't exist.
       // We will invalidate the child context in finishClassComponent() right after rendering.
-      var hasContext = pushContextProvider(workInProgress);
+      var hasContext = pushLegacyContextProvider(workInProgress);
       adoptClassInstance(workInProgress, value);
       mountClassInstance(workInProgress, renderExpirationTime);
       return finishClassComponent(
@@ -9180,11 +9104,13 @@ var ReactFiberBeginWork = function(
         var _Component = workInProgress.type;
 
         if (_Component) {
-          warning(
-            !_Component.childContextTypes,
-            "%s(...): childContextTypes cannot be defined on a functional component.",
-            _Component.displayName || _Component.name || "Component"
-          );
+          !!_Component.childContextTypes
+            ? warning(
+                false,
+                "%s(...): childContextTypes cannot be defined on a functional component.",
+                _Component.displayName || _Component.name || "Component"
+              )
+            : void 0;
         }
         if (workInProgress.ref !== null) {
           var info = "";
@@ -9235,7 +9161,7 @@ var ReactFiberBeginWork = function(
 
   function updateCallComponent(current, workInProgress, renderExpirationTime) {
     var nextProps = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextProps) {
@@ -9278,7 +9204,7 @@ var ReactFiberBeginWork = function(
   ) {
     pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
     var nextChildren = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextChildren) {
@@ -9312,6 +9238,10 @@ var ReactFiberBeginWork = function(
     renderExpirationTime
   ) {
     var fiber = workInProgress.child;
+    if (fiber !== null) {
+      // Set the return pointer of the child to the work-in-progress fiber.
+      fiber["return"] = workInProgress;
+    }
     while (fiber !== null) {
       var nextFiber = void 0;
       // Visit this fiber.
@@ -9399,12 +9329,12 @@ var ReactFiberBeginWork = function(
     renderExpirationTime
   ) {
     var providerType = workInProgress.type;
-    var context = providerType.context;
+    var context = providerType._context;
 
     var newProps = workInProgress.pendingProps;
     var oldProps = workInProgress.memoizedProps;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (oldProps === newProps) {
@@ -9452,12 +9382,14 @@ var ReactFiberBeginWork = function(
               ? context._calculateChangedBits(oldValue, newValue)
               : MAX_SIGNED_31_BIT_INT;
           {
-            warning(
-              (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
-              "calculateChangedBits: Expected the return value to be a " +
-                "31-bit integer. Instead received: %s",
-              changedBits
-            );
+            !((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits)
+              ? warning(
+                  false,
+                  "calculateChangedBits: Expected the return value to be a " +
+                    "31-bit integer. Instead received: %s",
+                  changedBits
+                )
+              : void 0;
           }
           changedBits |= 0;
 
@@ -9500,7 +9432,7 @@ var ReactFiberBeginWork = function(
     var newValue = context._currentValue;
     var changedBits = context._changedBits;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (changedBits === 0 && oldProps === newProps) {
@@ -9525,21 +9457,23 @@ var ReactFiberBeginWork = function(
         changedBits,
         renderExpirationTime
       );
-    } else if (oldProps !== null && oldProps.children === newProps.children) {
-      // No change. Bailout early if children are the same.
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
+    // There is no bailout on `children` equality because we expect people
+    // to often pass a bound method as a child, but it may reference
+    // `this.state` or `this.props` (and thus needs to re-render on `setState`).
 
     var render = newProps.children;
 
     {
-      warning(
-        typeof render === "function",
-        "A context consumer was rendered with multiple children, or a child " +
-          "that isn't a function. A context consumer expects a single child " +
-          "that is a function. If you did pass a function, make sure there " +
-          "is no trailing or leading whitespace around it."
-      );
+      !(typeof render === "function")
+        ? warning(
+            false,
+            "A context consumer was rendered with multiple children, or a child " +
+              "that isn't a function. A context consumer expects a single child " +
+              "that is a function. If you did pass a function, make sure there " +
+              "is no trailing or leading whitespace around it."
+          )
+        : void 0;
     }
 
     var newChildren = render(newValue);
@@ -9597,7 +9531,7 @@ var ReactFiberBeginWork = function(
         pushHostRootContext(workInProgress);
         break;
       case ClassComponent:
-        pushContextProvider(workInProgress);
+        pushLegacyContextProvider(workInProgress);
         break;
       case HostPortal:
         pushHostContainer(
@@ -9678,6 +9612,8 @@ var ReactFiberBeginWork = function(
           workInProgress,
           renderExpirationTime
         );
+      case ForwardRef:
+        return updateForwardRef(current, workInProgress);
       case Fragment:
         return updateFragment(current, workInProgress);
       case Mode:
@@ -9708,7 +9644,13 @@ var ReactFiberBeginWork = function(
   };
 };
 
-var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
+var ReactFiberCompleteWork = function(
+  config,
+  hostContext,
+  legacyContext,
+  newContext,
+  hydrationContext
+) {
   var createInstance = config.createInstance,
     createTextInstance = config.createTextInstance,
     appendInitialChild = config.appendInitialChild,
@@ -9720,6 +9662,9 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer;
+  var popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
+  var popProvider = newContext.popProvider;
   var prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -10035,7 +9980,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
         return null;
       case ClassComponent: {
         // We are leaving this subtree, so pop context if any.
-        popContextProvider(workInProgress);
+        popLegacyContextProvider(workInProgress);
 
         // If this component caught an error, schedule an error log effect.
         var instance = workInProgress.stateNode;
@@ -10054,7 +9999,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
       }
       case HostRoot: {
         popHostContainer(workInProgress);
-        popTopLevelContextObject(workInProgress);
+        popTopLevelLegacyContextObject(workInProgress);
         var fiberRoot = workInProgress.stateNode;
         if (fiberRoot.pendingContext) {
           fiberRoot.context = fiberRoot.pendingContext;
@@ -10230,6 +10175,8 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
       case ReturnComponent:
         // Does nothing.
         return null;
+      case ForwardRef:
+        return null;
       case Fragment:
         return null;
       case Mode:
@@ -10279,11 +10226,16 @@ function createCapturedValue(value, source) {
 
 var ReactFiberUnwindWork = function(
   hostContext,
+  legacyContext,
+  newContext,
   scheduleWork,
   isAlreadyFailedLegacyErrorBoundary
 ) {
   var popHostContainer = hostContext.popHostContainer,
     popHostContext = hostContext.popHostContext;
+  var popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
+  var popProvider = newContext.popProvider;
 
   function throwException(returnFiber, sourceFiber, rawValue) {
     // The source fiber did not complete.
@@ -10339,7 +10291,7 @@ var ReactFiberUnwindWork = function(
   function unwindWork(workInProgress) {
     switch (workInProgress.tag) {
       case ClassComponent: {
-        popContextProvider(workInProgress);
+        popLegacyContextProvider(workInProgress);
         var effectTag = workInProgress.effectTag;
         if (effectTag & ShouldCapture) {
           workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
@@ -10349,7 +10301,7 @@ var ReactFiberUnwindWork = function(
       }
       case HostRoot: {
         popHostContainer(workInProgress);
-        popTopLevelContextObject(workInProgress);
+        popTopLevelLegacyContextObject(workInProgress);
         var _effectTag = workInProgress.effectTag;
         if (_effectTag & ShouldCapture) {
           workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
@@ -10371,9 +10323,37 @@ var ReactFiberUnwindWork = function(
         return null;
     }
   }
+
+  function unwindInterruptedWork(interruptedWork) {
+    switch (interruptedWork.tag) {
+      case ClassComponent: {
+        popLegacyContextProvider(interruptedWork);
+        break;
+      }
+      case HostRoot: {
+        popHostContainer(interruptedWork);
+        popTopLevelLegacyContextObject(interruptedWork);
+        break;
+      }
+      case HostComponent: {
+        popHostContext(interruptedWork);
+        break;
+      }
+      case HostPortal:
+        popHostContainer(interruptedWork);
+        break;
+      case ContextProvider:
+        popProvider(interruptedWork);
+        break;
+      default:
+        break;
+    }
+  }
+
   return {
     throwException: throwException,
-    unwindWork: unwindWork
+    unwindWork: unwindWork,
+    unwindInterruptedWork: unwindInterruptedWork
   };
 };
 
@@ -10482,6 +10462,11 @@ var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
 var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
 
+var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
+{
+  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
+}
+
 function logError(boundary, errorInfo) {
   var source = errorInfo.source;
   var stack = errorInfo.stack;
@@ -10491,21 +10476,19 @@ function logError(boundary, errorInfo) {
 
   var capturedError = {
     componentName: source !== null ? getComponentName(source) : null,
-    error: errorInfo.value,
-    errorBoundary: boundary,
     componentStack: stack !== null ? stack : "",
+    error: errorInfo.value,
+    errorBoundary: null,
     errorBoundaryName: null,
     errorBoundaryFound: false,
     willRetry: false
   };
 
-  if (boundary !== null) {
+  if (boundary !== null && boundary.tag === ClassComponent) {
+    capturedError.errorBoundary = boundary.stateNode;
     capturedError.errorBoundaryName = getComponentName(boundary);
-    capturedError.errorBoundaryFound = capturedError.willRetry =
-      boundary.tag === ClassComponent;
-  } else {
-    capturedError.errorBoundaryName = null;
-    capturedError.errorBoundaryFound = capturedError.willRetry = false;
+    capturedError.errorBoundaryFound = true;
+    capturedError.willRetry = true;
   }
 
   try {
@@ -10569,64 +10552,120 @@ var ReactFiberCommitWork = function(
           }
         }
       } else {
-        ref.value = null;
+        ref.current = null;
       }
     }
   }
 
-  function commitLifeCycles(
-    finishedRoot,
-    current,
-    finishedWork,
-    currentTime,
-    committedExpirationTime
-  ) {
+  function commitBeforeMutationLifeCycles(current, finishedWork) {
     switch (finishedWork.tag) {
       case ClassComponent: {
-        var _instance = finishedWork.stateNode;
-        if (finishedWork.effectTag & Update) {
-          if (current === null) {
-            startPhaseTimer(finishedWork, "componentDidMount");
-            _instance.props = finishedWork.memoizedProps;
-            _instance.state = finishedWork.memoizedState;
-            _instance.componentDidMount();
-            stopPhaseTimer();
-          } else {
+        if (finishedWork.effectTag & Snapshot) {
+          if (current !== null) {
             var prevProps = current.memoizedProps;
             var prevState = current.memoizedState;
-            startPhaseTimer(finishedWork, "componentDidUpdate");
+            startPhaseTimer(finishedWork, "getSnapshotBeforeUpdate");
+            var _instance = finishedWork.stateNode;
             _instance.props = finishedWork.memoizedProps;
             _instance.state = finishedWork.memoizedState;
-            _instance.componentDidUpdate(prevProps, prevState);
+            var snapshot = _instance.getSnapshotBeforeUpdate(
+              prevProps,
+              prevState
+            );
+            {
+              var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
+              if (
+                snapshot === undefined &&
+                !didWarnSet.has(finishedWork.type)
+              ) {
+                didWarnSet.add(finishedWork.type);
+                warning(
+                  false,
+                  "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
+                    "must be returned. You have returned undefined.",
+                  getComponentName(finishedWork)
+                );
+              }
+            }
+            _instance.__reactInternalSnapshotBeforeUpdate = snapshot;
             stopPhaseTimer();
           }
         }
-        var updateQueue = finishedWork.updateQueue;
-        if (updateQueue !== null) {
-          commitCallbacks(updateQueue, _instance);
-        }
         return;
       }
-      case HostRoot: {
-        var _updateQueue = finishedWork.updateQueue;
-        if (_updateQueue !== null) {
-          var _instance2 = null;
-          if (finishedWork.child !== null) {
+      case HostRoot:
+      case HostComponent:
+      case HostText:
+      case HostPortal:
+        // Nothing to do for these component types
+        return;
+      default: {
+        invariant(
+          false,
+          "This unit of work tag should not have side-effects. This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
+      }
+    }
+  }
+
+  function commitLifeCycles(
+    finishedRoot,
+    current,
+    finishedWork,
+    currentTime,
+    committedExpirationTime
+  ) {
+    switch (finishedWork.tag) {
+      case ClassComponent: {
+        var _instance2 = finishedWork.stateNode;
+        if (finishedWork.effectTag & Update) {
+          if (current === null) {
+            startPhaseTimer(finishedWork, "componentDidMount");
+            _instance2.props = finishedWork.memoizedProps;
+            _instance2.state = finishedWork.memoizedState;
+            _instance2.componentDidMount();
+            stopPhaseTimer();
+          } else {
+            var prevProps = current.memoizedProps;
+            var prevState = current.memoizedState;
+            startPhaseTimer(finishedWork, "componentDidUpdate");
+            _instance2.props = finishedWork.memoizedProps;
+            _instance2.state = finishedWork.memoizedState;
+            _instance2.componentDidUpdate(
+              prevProps,
+              prevState,
+              _instance2.__reactInternalSnapshotBeforeUpdate
+            );
+            stopPhaseTimer();
+          }
+        }
+        var updateQueue = finishedWork.updateQueue;
+        if (updateQueue !== null) {
+          commitCallbacks(updateQueue, _instance2);
+        }
+        return;
+      }
+      case HostRoot: {
+        var _updateQueue = finishedWork.updateQueue;
+        if (_updateQueue !== null) {
+          var _instance3 = null;
+          if (finishedWork.child !== null) {
             switch (finishedWork.child.tag) {
               case HostComponent:
-                _instance2 = getPublicInstance(finishedWork.child.stateNode);
+                _instance3 = getPublicInstance(finishedWork.child.stateNode);
                 break;
               case ClassComponent:
-                _instance2 = finishedWork.child.stateNode;
+                _instance3 = finishedWork.child.stateNode;
                 break;
             }
           }
-          commitCallbacks(_updateQueue, _instance2);
+          commitCallbacks(_updateQueue, _instance3);
         }
         return;
       }
       case HostComponent: {
-        var _instance3 = finishedWork.stateNode;
+        var _instance4 = finishedWork.stateNode;
 
         // Renderers may schedule work to be done after host components are mounted
         // (eg DOM renderer may schedule auto-focus for inputs and form controls).
@@ -10635,7 +10674,7 @@ var ReactFiberCommitWork = function(
         if (current === null && finishedWork.effectTag & Update) {
           var type = finishedWork.type;
           var props = finishedWork.memoizedProps;
-          commitMount(_instance3, type, props, finishedWork);
+          commitMount(_instance4, type, props, finishedWork);
         }
 
         return;
@@ -10663,7 +10702,7 @@ var ReactFiberCommitWork = function(
       case ClassComponent:
         {
           var ctor = finishedWork.type;
-          var _instance4 = finishedWork.stateNode;
+          var _instance5 = finishedWork.stateNode;
           var updateQueue = finishedWork.updateQueue;
           invariant(
             updateQueue !== null && updateQueue.capturedValues !== null,
@@ -10680,16 +10719,19 @@ var ReactFiberCommitWork = function(
             // This gets reset before we yield back to the browser.
             // TODO: Warn in strict mode if getDerivedStateFromCatch is
             // not defined.
-            markLegacyErrorBoundaryAsFailed(_instance4);
+            markLegacyErrorBoundaryAsFailed(_instance5);
           }
 
-          _instance4.props = finishedWork.memoizedProps;
-          _instance4.state = finishedWork.memoizedState;
+          _instance5.props = finishedWork.memoizedProps;
+          _instance5.state = finishedWork.memoizedState;
           for (var i = 0; i < capturedErrors.length; i++) {
             var errorInfo = capturedErrors[i];
             var _error = errorInfo.value;
+            var stack = errorInfo.stack;
             logError(finishedWork, errorInfo);
-            _instance4.componentDidCatch(_error);
+            _instance5.componentDidCatch(_error, {
+              componentStack: stack !== null ? stack : ""
+            });
           }
         }
         break;
@@ -10722,19 +10764,31 @@ var ReactFiberCommitWork = function(
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (ref !== null) {
-      var _instance5 = finishedWork.stateNode;
+      var _instance6 = finishedWork.stateNode;
       var instanceToUse = void 0;
       switch (finishedWork.tag) {
         case HostComponent:
-          instanceToUse = getPublicInstance(_instance5);
+          instanceToUse = getPublicInstance(_instance6);
           break;
         default:
-          instanceToUse = _instance5;
+          instanceToUse = _instance6;
       }
       if (typeof ref === "function") {
         ref(instanceToUse);
       } else {
-        ref.value = instanceToUse;
+        {
+          if (!ref.hasOwnProperty("current")) {
+            warning(
+              false,
+              "Unexpected ref object provided for %s. " +
+                "Use either a ref-setter function or React.createRef().%s",
+              getComponentName(finishedWork),
+              getStackAddendumByWorkInProgressFiber(finishedWork)
+            );
+          }
+        }
+
+        ref.current = instanceToUse;
       }
     }
   }
@@ -10745,7 +10799,7 @@ var ReactFiberCommitWork = function(
       if (typeof currentRef === "function") {
         currentRef(null);
       } else {
-        currentRef.value = null;
+        currentRef.current = null;
       }
     }
   }
@@ -10761,9 +10815,9 @@ var ReactFiberCommitWork = function(
     switch (current.tag) {
       case ClassComponent: {
         safelyDetachRef(current);
-        var _instance6 = current.stateNode;
-        if (typeof _instance6.componentWillUnmount === "function") {
-          safelyCallComponentWillUnmount(current, _instance6);
+        var _instance7 = current.stateNode;
+        if (typeof _instance7.componentWillUnmount === "function") {
+          safelyCallComponentWillUnmount(current, _instance7);
         }
         return;
       }
@@ -10900,6 +10954,7 @@ var ReactFiberCommitWork = function(
         },
 
         commitLifeCycles: commitLifeCycles,
+        commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
         commitErrorLogging: commitErrorLogging,
         commitAttachRef: commitAttachRef,
         commitDetachRef: commitDetachRef
@@ -11059,635 +11114,1063 @@ var ReactFiberCommitWork = function(
     }
   }
 
-  function unmountHostComponents(current) {
-    // We only have the top Fiber that was inserted but we need recurse down its
-    var node = current;
+  function unmountHostComponents(current) {
+    // We only have the top Fiber that was inserted but we need recurse down its
+    var node = current;
+
+    // Each iteration, currentParent is populated with node's host parent if not
+    // currentParentIsValid.
+    var currentParentIsValid = false;
+    var currentParent = void 0;
+    var currentParentIsContainer = void 0;
+
+    while (true) {
+      if (!currentParentIsValid) {
+        var parent = node["return"];
+        findParent: while (true) {
+          invariant(
+            parent !== null,
+            "Expected to find a host parent. This error is likely caused by " +
+              "a bug in React. Please file an issue."
+          );
+          switch (parent.tag) {
+            case HostComponent:
+              currentParent = parent.stateNode;
+              currentParentIsContainer = false;
+              break findParent;
+            case HostRoot:
+              currentParent = parent.stateNode.containerInfo;
+              currentParentIsContainer = true;
+              break findParent;
+            case HostPortal:
+              currentParent = parent.stateNode.containerInfo;
+              currentParentIsContainer = true;
+              break findParent;
+          }
+          parent = parent["return"];
+        }
+        currentParentIsValid = true;
+      }
+
+      if (node.tag === HostComponent || node.tag === HostText) {
+        commitNestedUnmounts(node);
+        // After all the children have unmounted, it is now safe to remove the
+        // node from the tree.
+        if (currentParentIsContainer) {
+          removeChildFromContainer(currentParent, node.stateNode);
+        } else {
+          removeChild(currentParent, node.stateNode);
+        }
+        // Don't visit children because we already visited them.
+      } else if (node.tag === HostPortal) {
+        // When we go into a portal, it becomes the parent to remove from.
+        // We will reassign it back when we pop the portal on the way up.
+        currentParent = node.stateNode.containerInfo;
+        // Visit children because portals might contain host components.
+        if (node.child !== null) {
+          node.child["return"] = node;
+          node = node.child;
+          continue;
+        }
+      } else {
+        commitUnmount(node);
+        // Visit children because we may find more host components below.
+        if (node.child !== null) {
+          node.child["return"] = node;
+          node = node.child;
+          continue;
+        }
+      }
+      if (node === current) {
+        return;
+      }
+      while (node.sibling === null) {
+        if (node["return"] === null || node["return"] === current) {
+          return;
+        }
+        node = node["return"];
+        if (node.tag === HostPortal) {
+          // When we go out of the portal, we need to restore the parent.
+          // Since we don't keep a stack of them, we will search for it.
+          currentParentIsValid = false;
+        }
+      }
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
+    }
+  }
+
+  function commitDeletion(current) {
+    // Recursively delete all host nodes from the parent.
+    // Detach refs and call componentWillUnmount() on the whole subtree.
+    unmountHostComponents(current);
+    detachFiber(current);
+  }
+
+  function commitWork(current, finishedWork) {
+    switch (finishedWork.tag) {
+      case ClassComponent: {
+        return;
+      }
+      case HostComponent: {
+        var _instance8 = finishedWork.stateNode;
+        if (_instance8 != null) {
+          // Commit the work prepared earlier.
+          var newProps = finishedWork.memoizedProps;
+          // For hydration we reuse the update path but we treat the oldProps
+          // as the newProps. The updatePayload will contain the real change in
+          // this case.
+          var oldProps = current !== null ? current.memoizedProps : newProps;
+          var type = finishedWork.type;
+          // TODO: Type the updateQueue to be specific to host components.
+          var updatePayload = finishedWork.updateQueue;
+          finishedWork.updateQueue = null;
+          if (updatePayload !== null) {
+            commitUpdate(
+              _instance8,
+              updatePayload,
+              type,
+              oldProps,
+              newProps,
+              finishedWork
+            );
+          }
+        }
+        return;
+      }
+      case HostText: {
+        invariant(
+          finishedWork.stateNode !== null,
+          "This should have a text node initialized. This error is likely " +
+            "caused by a bug in React. Please file an issue."
+        );
+        var textInstance = finishedWork.stateNode;
+        var newText = finishedWork.memoizedProps;
+        // For hydration we reuse the update path but we treat the oldProps
+        // as the newProps. The updatePayload will contain the real change in
+        // this case.
+        var oldText = current !== null ? current.memoizedProps : newText;
+        commitTextUpdate(textInstance, oldText, newText);
+        return;
+      }
+      case HostRoot: {
+        return;
+      }
+      default: {
+        invariant(
+          false,
+          "This unit of work tag should not have side-effects. This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
+      }
+    }
+  }
+
+  function commitResetTextContent(current) {
+    resetTextContent(current.stateNode);
+  }
+
+  if (enableMutatingReconciler) {
+    return {
+      commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
+      commitResetTextContent: commitResetTextContent,
+      commitPlacement: commitPlacement,
+      commitDeletion: commitDeletion,
+      commitWork: commitWork,
+      commitLifeCycles: commitLifeCycles,
+      commitErrorLogging: commitErrorLogging,
+      commitAttachRef: commitAttachRef,
+      commitDetachRef: commitDetachRef
+    };
+  } else {
+    invariant(false, "Mutating reconciler is disabled.");
+  }
+};
+
+var NO_CONTEXT = {};
+
+var ReactFiberHostContext = function(config, stack) {
+  var getChildHostContext = config.getChildHostContext,
+    getRootHostContext = config.getRootHostContext;
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
+
+  var contextStackCursor = createCursor(NO_CONTEXT);
+  var contextFiberStackCursor = createCursor(NO_CONTEXT);
+  var rootInstanceStackCursor = createCursor(NO_CONTEXT);
+
+  function requiredContext(c) {
+    invariant(
+      c !== NO_CONTEXT,
+      "Expected host context to exist. This error is likely caused by a bug " +
+        "in React. Please file an issue."
+    );
+    return c;
+  }
+
+  function getRootHostContainer() {
+    var rootInstance = requiredContext(rootInstanceStackCursor.current);
+    return rootInstance;
+  }
+
+  function pushHostContainer(fiber, nextRootInstance) {
+    // Push current root instance onto the stack;
+    // This allows us to reset root when portals are popped.
+    push(rootInstanceStackCursor, nextRootInstance, fiber);
+    // Track the context and the Fiber that provided it.
+    // This enables us to pop only Fibers that provide unique contexts.
+    push(contextFiberStackCursor, fiber, fiber);
+
+    // Finally, we need to push the host context to the stack.
+    // However, we can't just call getRootHostContext() and push it because
+    // we'd have a different number of entries on the stack depending on
+    // whether getRootHostContext() throws somewhere in renderer code or not.
+    // So we push an empty value first. This lets us safely unwind on errors.
+    push(contextStackCursor, NO_CONTEXT, fiber);
+    var nextRootContext = getRootHostContext(nextRootInstance);
+    // Now that we know this function doesn't throw, replace it.
+    pop(contextStackCursor, fiber);
+    push(contextStackCursor, nextRootContext, fiber);
+  }
+
+  function popHostContainer(fiber) {
+    pop(contextStackCursor, fiber);
+    pop(contextFiberStackCursor, fiber);
+    pop(rootInstanceStackCursor, fiber);
+  }
+
+  function getHostContext() {
+    var context = requiredContext(contextStackCursor.current);
+    return context;
+  }
+
+  function pushHostContext(fiber) {
+    var rootInstance = requiredContext(rootInstanceStackCursor.current);
+    var context = requiredContext(contextStackCursor.current);
+    var nextContext = getChildHostContext(context, fiber.type, rootInstance);
+
+    // Don't push this Fiber's context unless it's unique.
+    if (context === nextContext) {
+      return;
+    }
+
+    // Track the context and the Fiber that provided it.
+    // This enables us to pop only Fibers that provide unique contexts.
+    push(contextFiberStackCursor, fiber, fiber);
+    push(contextStackCursor, nextContext, fiber);
+  }
+
+  function popHostContext(fiber) {
+    // Do not pop unless this Fiber provided the current context.
+    // pushHostContext() only pushes Fibers that provide unique contexts.
+    if (contextFiberStackCursor.current !== fiber) {
+      return;
+    }
+
+    pop(contextStackCursor, fiber);
+    pop(contextFiberStackCursor, fiber);
+  }
+
+  return {
+    getHostContext: getHostContext,
+    getRootHostContainer: getRootHostContainer,
+    popHostContainer: popHostContainer,
+    popHostContext: popHostContext,
+    pushHostContainer: pushHostContainer,
+    pushHostContext: pushHostContext
+  };
+};
+
+var ReactFiberHydrationContext = function(config) {
+  var shouldSetTextContent = config.shouldSetTextContent,
+    hydration = config.hydration;
+
+  // If this doesn't have hydration mode.
+
+  if (!hydration) {
+    return {
+      enterHydrationState: function() {
+        return false;
+      },
+      resetHydrationState: function() {},
+      tryToClaimNextHydratableInstance: function() {},
+      prepareToHydrateHostInstance: function() {
+        invariant(
+          false,
+          "Expected prepareToHydrateHostInstance() to never be called. " +
+            "This error is likely caused by a bug in React. Please file an issue."
+        );
+      },
+      prepareToHydrateHostTextInstance: function() {
+        invariant(
+          false,
+          "Expected prepareToHydrateHostTextInstance() to never be called. " +
+            "This error is likely caused by a bug in React. Please file an issue."
+        );
+      },
+      popHydrationState: function(fiber) {
+        return false;
+      }
+    };
+  }
+
+  var canHydrateInstance = hydration.canHydrateInstance,
+    canHydrateTextInstance = hydration.canHydrateTextInstance,
+    getNextHydratableSibling = hydration.getNextHydratableSibling,
+    getFirstHydratableChild = hydration.getFirstHydratableChild,
+    hydrateInstance = hydration.hydrateInstance,
+    hydrateTextInstance = hydration.hydrateTextInstance,
+    didNotMatchHydratedContainerTextInstance =
+      hydration.didNotMatchHydratedContainerTextInstance,
+    didNotMatchHydratedTextInstance = hydration.didNotMatchHydratedTextInstance,
+    didNotHydrateContainerInstance = hydration.didNotHydrateContainerInstance,
+    didNotHydrateInstance = hydration.didNotHydrateInstance,
+    didNotFindHydratableContainerInstance =
+      hydration.didNotFindHydratableContainerInstance,
+    didNotFindHydratableContainerTextInstance =
+      hydration.didNotFindHydratableContainerTextInstance,
+    didNotFindHydratableInstance = hydration.didNotFindHydratableInstance,
+    didNotFindHydratableTextInstance =
+      hydration.didNotFindHydratableTextInstance;
+
+  // The deepest Fiber on the stack involved in a hydration context.
+  // This may have been an insertion or a hydration.
+
+  var hydrationParentFiber = null;
+  var nextHydratableInstance = null;
+  var isHydrating = false;
+
+  function enterHydrationState(fiber) {
+    var parentInstance = fiber.stateNode.containerInfo;
+    nextHydratableInstance = getFirstHydratableChild(parentInstance);
+    hydrationParentFiber = fiber;
+    isHydrating = true;
+    return true;
+  }
+
+  function deleteHydratableInstance(returnFiber, instance) {
+    {
+      switch (returnFiber.tag) {
+        case HostRoot:
+          didNotHydrateContainerInstance(
+            returnFiber.stateNode.containerInfo,
+            instance
+          );
+          break;
+        case HostComponent:
+          didNotHydrateInstance(
+            returnFiber.type,
+            returnFiber.memoizedProps,
+            returnFiber.stateNode,
+            instance
+          );
+          break;
+      }
+    }
+
+    var childToDelete = createFiberFromHostInstanceForDeletion();
+    childToDelete.stateNode = instance;
+    childToDelete["return"] = returnFiber;
+    childToDelete.effectTag = Deletion;
+
+    // This might seem like it belongs on progressedFirstDeletion. However,
+    // these children are not part of the reconciliation list of children.
+    // Even if we abort and rereconcile the children, that will try to hydrate
+    // again and the nodes are still in the host tree so these will be
+    // recreated.
+    if (returnFiber.lastEffect !== null) {
+      returnFiber.lastEffect.nextEffect = childToDelete;
+      returnFiber.lastEffect = childToDelete;
+    } else {
+      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+    }
+  }
+
+  function insertNonHydratedInstance(returnFiber, fiber) {
+    fiber.effectTag |= Placement;
+    {
+      switch (returnFiber.tag) {
+        case HostRoot: {
+          var parentContainer = returnFiber.stateNode.containerInfo;
+          switch (fiber.tag) {
+            case HostComponent:
+              var type = fiber.type;
+              var props = fiber.pendingProps;
+              didNotFindHydratableContainerInstance(
+                parentContainer,
+                type,
+                props
+              );
+              break;
+            case HostText:
+              var text = fiber.pendingProps;
+              didNotFindHydratableContainerTextInstance(parentContainer, text);
+              break;
+          }
+          break;
+        }
+        case HostComponent: {
+          var parentType = returnFiber.type;
+          var parentProps = returnFiber.memoizedProps;
+          var parentInstance = returnFiber.stateNode;
+          switch (fiber.tag) {
+            case HostComponent:
+              var _type = fiber.type;
+              var _props = fiber.pendingProps;
+              didNotFindHydratableInstance(
+                parentType,
+                parentProps,
+                parentInstance,
+                _type,
+                _props
+              );
+              break;
+            case HostText:
+              var _text = fiber.pendingProps;
+              didNotFindHydratableTextInstance(
+                parentType,
+                parentProps,
+                parentInstance,
+                _text
+              );
+              break;
+          }
+          break;
+        }
+        default:
+          return;
+      }
+    }
+  }
+
+  function tryHydrate(fiber, nextInstance) {
+    switch (fiber.tag) {
+      case HostComponent: {
+        var type = fiber.type;
+        var props = fiber.pendingProps;
+        var instance = canHydrateInstance(nextInstance, type, props);
+        if (instance !== null) {
+          fiber.stateNode = instance;
+          return true;
+        }
+        return false;
+      }
+      case HostText: {
+        var text = fiber.pendingProps;
+        var textInstance = canHydrateTextInstance(nextInstance, text);
+        if (textInstance !== null) {
+          fiber.stateNode = textInstance;
+          return true;
+        }
+        return false;
+      }
+      default:
+        return false;
+    }
+  }
+
+  function tryToClaimNextHydratableInstance(fiber) {
+    if (!isHydrating) {
+      return;
+    }
+    var nextInstance = nextHydratableInstance;
+    if (!nextInstance) {
+      // Nothing to hydrate. Make it an insertion.
+      insertNonHydratedInstance(hydrationParentFiber, fiber);
+      isHydrating = false;
+      hydrationParentFiber = fiber;
+      return;
+    }
+    if (!tryHydrate(fiber, nextInstance)) {
+      // If we can't hydrate this instance let's try the next one.
+      // We use this as a heuristic. It's based on intuition and not data so it
+      // might be flawed or unnecessary.
+      nextInstance = getNextHydratableSibling(nextInstance);
+      if (!nextInstance || !tryHydrate(fiber, nextInstance)) {
+        // Nothing to hydrate. Make it an insertion.
+        insertNonHydratedInstance(hydrationParentFiber, fiber);
+        isHydrating = false;
+        hydrationParentFiber = fiber;
+        return;
+      }
+      // We matched the next one, we'll now assume that the first one was
+      // superfluous and we'll delete it. Since we can't eagerly delete it
+      // we'll have to schedule a deletion. To do that, this node needs a dummy
+      // fiber associated with it.
+      deleteHydratableInstance(hydrationParentFiber, nextHydratableInstance);
+    }
+    hydrationParentFiber = fiber;
+    nextHydratableInstance = getFirstHydratableChild(nextInstance);
+  }
+
+  function prepareToHydrateHostInstance(
+    fiber,
+    rootContainerInstance,
+    hostContext
+  ) {
+    var instance = fiber.stateNode;
+    var updatePayload = hydrateInstance(
+      instance,
+      fiber.type,
+      fiber.memoizedProps,
+      rootContainerInstance,
+      hostContext,
+      fiber
+    );
+    // TODO: Type this specific to this type of component.
+    fiber.updateQueue = updatePayload;
+    // If the update payload indicates that there is a change or if there
+    // is a new ref we mark this as an update.
+    if (updatePayload !== null) {
+      return true;
+    }
+    return false;
+  }
+
+  function prepareToHydrateHostTextInstance(fiber) {
+    var textInstance = fiber.stateNode;
+    var textContent = fiber.memoizedProps;
+    var shouldUpdate = hydrateTextInstance(textInstance, textContent, fiber);
+    {
+      if (shouldUpdate) {
+        // We assume that prepareToHydrateHostTextInstance is called in a context where the
+        // hydration parent is the parent host component of this host text.
+        var returnFiber = hydrationParentFiber;
+        if (returnFiber !== null) {
+          switch (returnFiber.tag) {
+            case HostRoot: {
+              var parentContainer = returnFiber.stateNode.containerInfo;
+              didNotMatchHydratedContainerTextInstance(
+                parentContainer,
+                textInstance,
+                textContent
+              );
+              break;
+            }
+            case HostComponent: {
+              var parentType = returnFiber.type;
+              var parentProps = returnFiber.memoizedProps;
+              var parentInstance = returnFiber.stateNode;
+              didNotMatchHydratedTextInstance(
+                parentType,
+                parentProps,
+                parentInstance,
+                textInstance,
+                textContent
+              );
+              break;
+            }
+          }
+        }
+      }
+    }
+    return shouldUpdate;
+  }
+
+  function popToNextHostParent(fiber) {
+    var parent = fiber["return"];
+    while (
+      parent !== null &&
+      parent.tag !== HostComponent &&
+      parent.tag !== HostRoot
+    ) {
+      parent = parent["return"];
+    }
+    hydrationParentFiber = parent;
+  }
+
+  function popHydrationState(fiber) {
+    if (fiber !== hydrationParentFiber) {
+      // We're deeper than the current hydration context, inside an inserted
+      // tree.
+      return false;
+    }
+    if (!isHydrating) {
+      // If we're not currently hydrating but we're in a hydration context, then
+      // we were an insertion and now need to pop up reenter hydration of our
+      // siblings.
+      popToNextHostParent(fiber);
+      isHydrating = true;
+      return false;
+    }
+
+    var type = fiber.type;
+
+    // If we have any remaining hydratable nodes, we need to delete them now.
+    // We only do this deeper than head and body since they tend to have random
+    // other nodes in them. We also ignore components with pure text content in
+    // side of them.
+    // TODO: Better heuristic.
+    if (
+      fiber.tag !== HostComponent ||
+      (type !== "head" &&
+        type !== "body" &&
+        !shouldSetTextContent(type, fiber.memoizedProps))
+    ) {
+      var nextInstance = nextHydratableInstance;
+      while (nextInstance) {
+        deleteHydratableInstance(fiber, nextInstance);
+        nextInstance = getNextHydratableSibling(nextInstance);
+      }
+    }
+
+    popToNextHostParent(fiber);
+    nextHydratableInstance = hydrationParentFiber
+      ? getNextHydratableSibling(fiber.stateNode)
+      : null;
+    return true;
+  }
+
+  function resetHydrationState() {
+    hydrationParentFiber = null;
+    nextHydratableInstance = null;
+    isHydrating = false;
+  }
 
-    // Each iteration, currentParent is populated with node's host parent if not
-    // currentParentIsValid.
-    var currentParentIsValid = false;
-    var currentParent = void 0;
-    var currentParentIsContainer = void 0;
+  return {
+    enterHydrationState: enterHydrationState,
+    resetHydrationState: resetHydrationState,
+    tryToClaimNextHydratableInstance: tryToClaimNextHydratableInstance,
+    prepareToHydrateHostInstance: prepareToHydrateHostInstance,
+    prepareToHydrateHostTextInstance: prepareToHydrateHostTextInstance,
+    popHydrationState: popHydrationState
+  };
+};
 
-    while (true) {
-      if (!currentParentIsValid) {
-        var parent = node["return"];
-        findParent: while (true) {
-          invariant(
-            parent !== null,
-            "Expected to find a host parent. This error is likely caused by " +
-              "a bug in React. Please file an issue."
-          );
-          switch (parent.tag) {
-            case HostComponent:
-              currentParent = parent.stateNode;
-              currentParentIsContainer = false;
-              break findParent;
-            case HostRoot:
-              currentParent = parent.stateNode.containerInfo;
-              currentParentIsContainer = true;
-              break findParent;
-            case HostPortal:
-              currentParent = parent.stateNode.containerInfo;
-              currentParentIsContainer = true;
-              break findParent;
-          }
-          parent = parent["return"];
-        }
-        currentParentIsValid = true;
-      }
+// This lets us hook into Fiber to debug what it's doing.
+// See https://github.com/facebook/react/pull/8033.
+// This is not part of the public API, not even for React DevTools.
+// You may only inject a debugTool if you work on React Fiber itself.
+var ReactFiberInstrumentation = {
+  debugTool: null
+};
 
-      if (node.tag === HostComponent || node.tag === HostText) {
-        commitNestedUnmounts(node);
-        // After all the children have unmounted, it is now safe to remove the
-        // node from the tree.
-        if (currentParentIsContainer) {
-          removeChildFromContainer(currentParent, node.stateNode);
-        } else {
-          removeChild(currentParent, node.stateNode);
-        }
-        // Don't visit children because we already visited them.
-      } else if (node.tag === HostPortal) {
-        // When we go into a portal, it becomes the parent to remove from.
-        // We will reassign it back when we pop the portal on the way up.
-        currentParent = node.stateNode.containerInfo;
-        // Visit children because portals might contain host components.
-        if (node.child !== null) {
-          node.child["return"] = node;
-          node = node.child;
-          continue;
-        }
-      } else {
-        commitUnmount(node);
-        // Visit children because we may find more host components below.
-        if (node.child !== null) {
-          node.child["return"] = node;
-          node = node.child;
-          continue;
-        }
-      }
-      if (node === current) {
-        return;
-      }
-      while (node.sibling === null) {
-        if (node["return"] === null || node["return"] === current) {
-          return;
-        }
-        node = node["return"];
-        if (node.tag === HostPortal) {
-          // When we go out of the portal, we need to restore the parent.
-          // Since we don't keep a stack of them, we will search for it.
-          currentParentIsValid = false;
-        }
-      }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
+var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
+
+var warnedAboutMissingGetChildContext = void 0;
+
+{
+  warnedAboutMissingGetChildContext = {};
+}
+
+var ReactFiberLegacyContext = function(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
+
+  // A cursor to the current merged context object on the stack.
+
+  var contextStackCursor = createCursor(emptyObject);
+  // A cursor to a boolean indicating whether the context has changed.
+  var didPerformWorkStackCursor = createCursor(false);
+  // Keep track of the previous context object that was on the stack.
+  // We use this to get access to the parent context after we have already
+  // pushed the next context provider, and now need to merge their contexts.
+  var previousContext = emptyObject;
+
+  function getUnmaskedContext(workInProgress) {
+    var hasOwnContext = isContextProvider(workInProgress);
+    if (hasOwnContext) {
+      // If the fiber is a context provider itself, when we read its context
+      // we have already pushed its own child context on the stack. A context
+      // provider should not "see" its own child context. Therefore we read the
+      // previous (parent) context instead for a context provider.
+      return previousContext;
     }
+    return contextStackCursor.current;
   }
 
-  function commitDeletion(current) {
-    // Recursively delete all host nodes from the parent.
-    // Detach refs and call componentWillUnmount() on the whole subtree.
-    unmountHostComponents(current);
-    detachFiber(current);
+  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+    var instance = workInProgress.stateNode;
+    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
   }
 
-  function commitWork(current, finishedWork) {
-    switch (finishedWork.tag) {
-      case ClassComponent: {
-        return;
-      }
-      case HostComponent: {
-        var _instance7 = finishedWork.stateNode;
-        if (_instance7 != null) {
-          // Commit the work prepared earlier.
-          var newProps = finishedWork.memoizedProps;
-          // For hydration we reuse the update path but we treat the oldProps
-          // as the newProps. The updatePayload will contain the real change in
-          // this case.
-          var oldProps = current !== null ? current.memoizedProps : newProps;
-          var type = finishedWork.type;
-          // TODO: Type the updateQueue to be specific to host components.
-          var updatePayload = finishedWork.updateQueue;
-          finishedWork.updateQueue = null;
-          if (updatePayload !== null) {
-            commitUpdate(
-              _instance7,
-              updatePayload,
-              type,
-              oldProps,
-              newProps,
-              finishedWork
-            );
-          }
-        }
-        return;
-      }
-      case HostText: {
-        invariant(
-          finishedWork.stateNode !== null,
-          "This should have a text node initialized. This error is likely " +
-            "caused by a bug in React. Please file an issue."
-        );
-        var textInstance = finishedWork.stateNode;
-        var newText = finishedWork.memoizedProps;
-        // For hydration we reuse the update path but we treat the oldProps
-        // as the newProps. The updatePayload will contain the real change in
-        // this case.
-        var oldText = current !== null ? current.memoizedProps : newText;
-        commitTextUpdate(textInstance, oldText, newText);
-        return;
-      }
-      case HostRoot: {
-        return;
-      }
-      default: {
-        invariant(
-          false,
-          "This unit of work tag should not have side-effects. This error is " +
-            "likely caused by a bug in React. Please file an issue."
-        );
-      }
+  function getMaskedContext(workInProgress, unmaskedContext) {
+    var type = workInProgress.type;
+    var contextTypes = type.contextTypes;
+    if (!contextTypes) {
+      return emptyObject;
+    }
+
+    // Avoid recreating masked context unless unmasked context has changed.
+    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+    // This may trigger infinite loops if componentWillReceiveProps calls setState.
+    var instance = workInProgress.stateNode;
+    if (
+      instance &&
+      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+    ) {
+      return instance.__reactInternalMemoizedMaskedChildContext;
+    }
+
+    var context = {};
+    for (var key in contextTypes) {
+      context[key] = unmaskedContext[key];
+    }
+
+    {
+      var name = getComponentName(workInProgress) || "Unknown";
+      checkPropTypes(
+        contextTypes,
+        context,
+        "context",
+        name,
+        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      );
+    }
+
+    // Cache unmasked context so we can avoid recreating masked context unless necessary.
+    // Context is created before the class component is instantiated so check for instance.
+    if (instance) {
+      cacheContext(workInProgress, unmaskedContext, context);
     }
+
+    return context;
   }
 
-  function commitResetTextContent(current) {
-    resetTextContent(current.stateNode);
+  function hasContextChanged() {
+    return didPerformWorkStackCursor.current;
   }
 
-  if (enableMutatingReconciler) {
-    return {
-      commitResetTextContent: commitResetTextContent,
-      commitPlacement: commitPlacement,
-      commitDeletion: commitDeletion,
-      commitWork: commitWork,
-      commitLifeCycles: commitLifeCycles,
-      commitErrorLogging: commitErrorLogging,
-      commitAttachRef: commitAttachRef,
-      commitDetachRef: commitDetachRef
-    };
-  } else {
-    invariant(false, "Mutating reconciler is disabled.");
+  function isContextConsumer(fiber) {
+    return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
   }
-};
 
-var NO_CONTEXT = {};
+  function isContextProvider(fiber) {
+    return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
+  }
 
-var ReactFiberHostContext = function(config) {
-  var getChildHostContext = config.getChildHostContext,
-    getRootHostContext = config.getRootHostContext;
+  function popContextProvider(fiber) {
+    if (!isContextProvider(fiber)) {
+      return;
+    }
 
-  var contextStackCursor = createCursor(NO_CONTEXT);
-  var contextFiberStackCursor = createCursor(NO_CONTEXT);
-  var rootInstanceStackCursor = createCursor(NO_CONTEXT);
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
 
-  function requiredContext(c) {
+  function popTopLevelContextObject(fiber) {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
+
+  function pushTopLevelContextObject(fiber, context, didChange) {
     invariant(
-      c !== NO_CONTEXT,
-      "Expected host context to exist. This error is likely caused by a bug " +
-        "in React. Please file an issue."
+      contextStackCursor.cursor == null,
+      "Unexpected context found on stack. " +
+        "This error is likely caused by a bug in React. Please file an issue."
     );
-    return c;
-  }
 
-  function getRootHostContainer() {
-    var rootInstance = requiredContext(rootInstanceStackCursor.current);
-    return rootInstance;
+    push(contextStackCursor, context, fiber);
+    push(didPerformWorkStackCursor, didChange, fiber);
   }
 
-  function pushHostContainer(fiber, nextRootInstance) {
-    // Push current root instance onto the stack;
-    // This allows us to reset root when portals are popped.
-    push(rootInstanceStackCursor, nextRootInstance, fiber);
+  function processChildContext(fiber, parentContext) {
+    var instance = fiber.stateNode;
+    var childContextTypes = fiber.type.childContextTypes;
 
-    var nextRootContext = getRootHostContext(nextRootInstance);
+    // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
+    if (typeof instance.getChildContext !== "function") {
+      {
+        var componentName = getComponentName(fiber) || "Unknown";
 
-    // Track the context and the Fiber that provided it.
-    // This enables us to pop only Fibers that provide unique contexts.
-    push(contextFiberStackCursor, fiber, fiber);
-    push(contextStackCursor, nextRootContext, fiber);
-  }
+        if (!warnedAboutMissingGetChildContext[componentName]) {
+          warnedAboutMissingGetChildContext[componentName] = true;
+          warning(
+            false,
+            "%s.childContextTypes is specified but there is no getChildContext() method " +
+              "on the instance. You can either define getChildContext() on %s or remove " +
+              "childContextTypes from it.",
+            componentName,
+            componentName
+          );
+        }
+      }
+      return parentContext;
+    }
 
-  function popHostContainer(fiber) {
-    pop(contextStackCursor, fiber);
-    pop(contextFiberStackCursor, fiber);
-    pop(rootInstanceStackCursor, fiber);
-  }
+    var childContext = void 0;
+    {
+      ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
+    }
+    startPhaseTimer(fiber, "getChildContext");
+    childContext = instance.getChildContext();
+    stopPhaseTimer();
+    {
+      ReactDebugCurrentFiber.setCurrentPhase(null);
+    }
+    for (var contextKey in childContext) {
+      invariant(
+        contextKey in childContextTypes,
+        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+        getComponentName(fiber) || "Unknown",
+        contextKey
+      );
+    }
+    {
+      var name = getComponentName(fiber) || "Unknown";
+      checkPropTypes(
+        childContextTypes,
+        childContext,
+        "child context",
+        name,
+        // In practice, there is one case in which we won't get a stack. It's when
+        // somebody calls unstable_renderSubtreeIntoContainer() and we process
+        // context from the parent component instance. The stack will be missing
+        // because it's outside of the reconciliation, and so the pointer has not
+        // been set. This is rare and doesn't matter. We'll also remove that API.
+        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      );
+    }
 
-  function getHostContext() {
-    var context = requiredContext(contextStackCursor.current);
-    return context;
+    return Object.assign({}, parentContext, childContext);
   }
 
-  function pushHostContext(fiber) {
-    var rootInstance = requiredContext(rootInstanceStackCursor.current);
-    var context = requiredContext(contextStackCursor.current);
-    var nextContext = getChildHostContext(context, fiber.type, rootInstance);
-
-    // Don't push this Fiber's context unless it's unique.
-    if (context === nextContext) {
-      return;
+  function pushContextProvider(workInProgress) {
+    if (!isContextProvider(workInProgress)) {
+      return false;
     }
 
-    // Track the context and the Fiber that provided it.
-    // This enables us to pop only Fibers that provide unique contexts.
-    push(contextFiberStackCursor, fiber, fiber);
-    push(contextStackCursor, nextContext, fiber);
+    var instance = workInProgress.stateNode;
+    // We push the context as early as possible to ensure stack integrity.
+    // If the instance does not exist yet, we will push null at first,
+    // and replace it on the stack later when invalidating the context.
+    var memoizedMergedChildContext =
+      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+      emptyObject;
+
+    // Remember the parent context so we can merge with it later.
+    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+    previousContext = contextStackCursor.current;
+    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+    push(
+      didPerformWorkStackCursor,
+      didPerformWorkStackCursor.current,
+      workInProgress
+    );
+
+    return true;
   }
 
-  function popHostContext(fiber) {
-    // Do not pop unless this Fiber provided the current context.
-    // pushHostContext() only pushes Fibers that provide unique contexts.
-    if (contextFiberStackCursor.current !== fiber) {
-      return;
-    }
+  function invalidateContextProvider(workInProgress, didChange) {
+    var instance = workInProgress.stateNode;
+    invariant(
+      instance,
+      "Expected to have an instance by this point. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
 
-    pop(contextStackCursor, fiber);
-    pop(contextFiberStackCursor, fiber);
+    if (didChange) {
+      // Merge parent and own context.
+      // Skip this if we're not updating due to sCU.
+      // This avoids unnecessarily recomputing memoized values.
+      var mergedContext = processChildContext(workInProgress, previousContext);
+      instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+
+      // Replace the old (or empty) context with the new one.
+      // It is important to unwind the context in the reverse order.
+      pop(didPerformWorkStackCursor, workInProgress);
+      pop(contextStackCursor, workInProgress);
+      // Now push the new context and mark that it has changed.
+      push(contextStackCursor, mergedContext, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    } else {
+      pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    }
   }
 
-  function resetHostContainer() {
-    contextStackCursor.current = NO_CONTEXT;
-    rootInstanceStackCursor.current = NO_CONTEXT;
+  function findCurrentUnmaskedContext(fiber) {
+    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+    // makes sense elsewhere
+    invariant(
+      isFiberMounted(fiber) && fiber.tag === ClassComponent,
+      "Expected subtree parent to be a mounted class component. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+
+    var node = fiber;
+    while (node.tag !== HostRoot) {
+      if (isContextProvider(node)) {
+        return node.stateNode.__reactInternalMemoizedMergedChildContext;
+      }
+      var parent = node["return"];
+      invariant(
+        parent,
+        "Found unexpected detached subtree parent. " +
+          "This error is likely caused by a bug in React. Please file an issue."
+      );
+      node = parent;
+    }
+    return node.stateNode.context;
   }
 
   return {
-    getHostContext: getHostContext,
-    getRootHostContainer: getRootHostContainer,
-    popHostContainer: popHostContainer,
-    popHostContext: popHostContext,
-    pushHostContainer: pushHostContainer,
-    pushHostContext: pushHostContext,
-    resetHostContainer: resetHostContainer
+    getUnmaskedContext: getUnmaskedContext,
+    cacheContext: cacheContext,
+    getMaskedContext: getMaskedContext,
+    hasContextChanged: hasContextChanged,
+    isContextConsumer: isContextConsumer,
+    isContextProvider: isContextProvider,
+    popContextProvider: popContextProvider,
+    popTopLevelContextObject: popTopLevelContextObject,
+    pushTopLevelContextObject: pushTopLevelContextObject,
+    processChildContext: processChildContext,
+    pushContextProvider: pushContextProvider,
+    invalidateContextProvider: invalidateContextProvider,
+    findCurrentUnmaskedContext: findCurrentUnmaskedContext
   };
 };
 
-var ReactFiberHydrationContext = function(config) {
-  var shouldSetTextContent = config.shouldSetTextContent,
-    hydration = config.hydration;
+var ReactFiberNewContext = function(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
 
-  // If this doesn't have hydration mode.
+  var providerCursor = createCursor(null);
+  var valueCursor = createCursor(null);
+  var changedBitsCursor = createCursor(0);
 
-  if (!hydration) {
-    return {
-      enterHydrationState: function() {
-        return false;
-      },
-      resetHydrationState: function() {},
-      tryToClaimNextHydratableInstance: function() {},
-      prepareToHydrateHostInstance: function() {
-        invariant(
-          false,
-          "Expected prepareToHydrateHostInstance() to never be called. " +
-            "This error is likely caused by a bug in React. Please file an issue."
-        );
-      },
-      prepareToHydrateHostTextInstance: function() {
-        invariant(
-          false,
-          "Expected prepareToHydrateHostTextInstance() to never be called. " +
-            "This error is likely caused by a bug in React. Please file an issue."
-        );
-      },
-      popHydrationState: function(fiber) {
-        return false;
-      }
-    };
+  var rendererSigil = void 0;
+  {
+    // Use this to detect multiple renderers using the same context
+    rendererSigil = {};
   }
 
-  var canHydrateInstance = hydration.canHydrateInstance,
-    canHydrateTextInstance = hydration.canHydrateTextInstance,
-    getNextHydratableSibling = hydration.getNextHydratableSibling,
-    getFirstHydratableChild = hydration.getFirstHydratableChild,
-    hydrateInstance = hydration.hydrateInstance,
-    hydrateTextInstance = hydration.hydrateTextInstance,
-    didNotMatchHydratedContainerTextInstance =
-      hydration.didNotMatchHydratedContainerTextInstance,
-    didNotMatchHydratedTextInstance = hydration.didNotMatchHydratedTextInstance,
-    didNotHydrateContainerInstance = hydration.didNotHydrateContainerInstance,
-    didNotHydrateInstance = hydration.didNotHydrateInstance,
-    didNotFindHydratableContainerInstance =
-      hydration.didNotFindHydratableContainerInstance,
-    didNotFindHydratableContainerTextInstance =
-      hydration.didNotFindHydratableContainerTextInstance,
-    didNotFindHydratableInstance = hydration.didNotFindHydratableInstance,
-    didNotFindHydratableTextInstance =
-      hydration.didNotFindHydratableTextInstance;
-
-  // The deepest Fiber on the stack involved in a hydration context.
-  // This may have been an insertion or a hydration.
+  function pushProvider(providerFiber) {
+    var context = providerFiber.type._context;
 
-  var hydrationParentFiber = null;
-  var nextHydratableInstance = null;
-  var isHydrating = false;
+    push(changedBitsCursor, context._changedBits, providerFiber);
+    push(valueCursor, context._currentValue, providerFiber);
+    push(providerCursor, providerFiber, providerFiber);
 
-  function enterHydrationState(fiber) {
-    var parentInstance = fiber.stateNode.containerInfo;
-    nextHydratableInstance = getFirstHydratableChild(parentInstance);
-    hydrationParentFiber = fiber;
-    isHydrating = true;
-    return true;
-  }
+    context._currentValue = providerFiber.pendingProps.value;
+    context._changedBits = providerFiber.stateNode;
 
-  function deleteHydratableInstance(returnFiber, instance) {
     {
-      switch (returnFiber.tag) {
-        case HostRoot:
-          didNotHydrateContainerInstance(
-            returnFiber.stateNode.containerInfo,
-            instance
-          );
-          break;
-        case HostComponent:
-          didNotHydrateInstance(
-            returnFiber.type,
-            returnFiber.memoizedProps,
-            returnFiber.stateNode,
-            instance
-          );
-          break;
-      }
+      !(
+        context._currentRenderer === null ||
+        context._currentRenderer === rendererSigil
+      )
+        ? warning(
+            false,
+            "Detected multiple renderers concurrently rendering the " +
+              "same context provider. This is currently unsupported."
+          )
+        : void 0;
+      context._currentRenderer = rendererSigil;
     }
+  }
 
-    var childToDelete = createFiberFromHostInstanceForDeletion();
-    childToDelete.stateNode = instance;
-    childToDelete["return"] = returnFiber;
-    childToDelete.effectTag = Deletion;
+  function popProvider(providerFiber) {
+    var changedBits = changedBitsCursor.current;
+    var currentValue = valueCursor.current;
 
-    // This might seem like it belongs on progressedFirstDeletion. However,
-    // these children are not part of the reconciliation list of children.
-    // Even if we abort and rereconcile the children, that will try to hydrate
-    // again and the nodes are still in the host tree so these will be
-    // recreated.
-    if (returnFiber.lastEffect !== null) {
-      returnFiber.lastEffect.nextEffect = childToDelete;
-      returnFiber.lastEffect = childToDelete;
-    } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
-    }
+    pop(providerCursor, providerFiber);
+    pop(valueCursor, providerFiber);
+    pop(changedBitsCursor, providerFiber);
+
+    var context = providerFiber.type._context;
+    context._currentValue = currentValue;
+    context._changedBits = changedBits;
   }
 
-  function insertNonHydratedInstance(returnFiber, fiber) {
-    fiber.effectTag |= Placement;
-    {
-      switch (returnFiber.tag) {
-        case HostRoot: {
-          var parentContainer = returnFiber.stateNode.containerInfo;
-          switch (fiber.tag) {
-            case HostComponent:
-              var type = fiber.type;
-              var props = fiber.pendingProps;
-              didNotFindHydratableContainerInstance(
-                parentContainer,
-                type,
-                props
-              );
-              break;
-            case HostText:
-              var text = fiber.pendingProps;
-              didNotFindHydratableContainerTextInstance(parentContainer, text);
-              break;
-          }
-          break;
-        }
-        case HostComponent: {
-          var parentType = returnFiber.type;
-          var parentProps = returnFiber.memoizedProps;
-          var parentInstance = returnFiber.stateNode;
-          switch (fiber.tag) {
-            case HostComponent:
-              var _type = fiber.type;
-              var _props = fiber.pendingProps;
-              didNotFindHydratableInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                _type,
-                _props
-              );
-              break;
-            case HostText:
-              var _text = fiber.pendingProps;
-              didNotFindHydratableTextInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                _text
-              );
-              break;
-          }
-          break;
-        }
-        default:
-          return;
-      }
-    }
+  return {
+    pushProvider: pushProvider,
+    popProvider: popProvider
+  };
+};
+
+var ReactFiberStack = function() {
+  var valueStack = [];
+
+  var fiberStack = void 0;
+
+  {
+    fiberStack = [];
   }
 
-  function tryHydrate(fiber, nextInstance) {
-    switch (fiber.tag) {
-      case HostComponent: {
-        var type = fiber.type;
-        var props = fiber.pendingProps;
-        var instance = canHydrateInstance(nextInstance, type, props);
-        if (instance !== null) {
-          fiber.stateNode = instance;
-          return true;
-        }
-        return false;
-      }
-      case HostText: {
-        var text = fiber.pendingProps;
-        var textInstance = canHydrateTextInstance(nextInstance, text);
-        if (textInstance !== null) {
-          fiber.stateNode = textInstance;
-          return true;
-        }
-        return false;
-      }
-      default:
-        return false;
-    }
+  var index = -1;
+
+  function createCursor(defaultValue) {
+    return {
+      current: defaultValue
+    };
+  }
+
+  function isEmpty() {
+    return index === -1;
   }
 
-  function tryToClaimNextHydratableInstance(fiber) {
-    if (!isHydrating) {
-      return;
-    }
-    var nextInstance = nextHydratableInstance;
-    if (!nextInstance) {
-      // Nothing to hydrate. Make it an insertion.
-      insertNonHydratedInstance(hydrationParentFiber, fiber);
-      isHydrating = false;
-      hydrationParentFiber = fiber;
+  function pop(cursor, fiber) {
+    if (index < 0) {
+      {
+        warning(false, "Unexpected pop.");
+      }
       return;
     }
-    if (!tryHydrate(fiber, nextInstance)) {
-      // If we can't hydrate this instance let's try the next one.
-      // We use this as a heuristic. It's based on intuition and not data so it
-      // might be flawed or unnecessary.
-      nextInstance = getNextHydratableSibling(nextInstance);
-      if (!nextInstance || !tryHydrate(fiber, nextInstance)) {
-        // Nothing to hydrate. Make it an insertion.
-        insertNonHydratedInstance(hydrationParentFiber, fiber);
-        isHydrating = false;
-        hydrationParentFiber = fiber;
-        return;
+
+    {
+      if (fiber !== fiberStack[index]) {
+        warning(false, "Unexpected Fiber popped.");
       }
-      // We matched the next one, we'll now assume that the first one was
-      // superfluous and we'll delete it. Since we can't eagerly delete it
-      // we'll have to schedule a deletion. To do that, this node needs a dummy
-      // fiber associated with it.
-      deleteHydratableInstance(hydrationParentFiber, nextHydratableInstance);
     }
-    hydrationParentFiber = fiber;
-    nextHydratableInstance = getFirstHydratableChild(nextInstance);
-  }
 
-  function prepareToHydrateHostInstance(
-    fiber,
-    rootContainerInstance,
-    hostContext
-  ) {
-    var instance = fiber.stateNode;
-    var updatePayload = hydrateInstance(
-      instance,
-      fiber.type,
-      fiber.memoizedProps,
-      rootContainerInstance,
-      hostContext,
-      fiber
-    );
-    // TODO: Type this specific to this type of component.
-    fiber.updateQueue = updatePayload;
-    // If the update payload indicates that there is a change or if there
-    // is a new ref we mark this as an update.
-    if (updatePayload !== null) {
-      return true;
-    }
-    return false;
-  }
+    cursor.current = valueStack[index];
+
+    valueStack[index] = null;
 
-  function prepareToHydrateHostTextInstance(fiber) {
-    var textInstance = fiber.stateNode;
-    var textContent = fiber.memoizedProps;
-    var shouldUpdate = hydrateTextInstance(textInstance, textContent, fiber);
     {
-      if (shouldUpdate) {
-        // We assume that prepareToHydrateHostTextInstance is called in a context where the
-        // hydration parent is the parent host component of this host text.
-        var returnFiber = hydrationParentFiber;
-        if (returnFiber !== null) {
-          switch (returnFiber.tag) {
-            case HostRoot: {
-              var parentContainer = returnFiber.stateNode.containerInfo;
-              didNotMatchHydratedContainerTextInstance(
-                parentContainer,
-                textInstance,
-                textContent
-              );
-              break;
-            }
-            case HostComponent: {
-              var parentType = returnFiber.type;
-              var parentProps = returnFiber.memoizedProps;
-              var parentInstance = returnFiber.stateNode;
-              didNotMatchHydratedTextInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                textInstance,
-                textContent
-              );
-              break;
-            }
-          }
-        }
-      }
+      fiberStack[index] = null;
     }
-    return shouldUpdate;
-  }
 
-  function popToNextHostParent(fiber) {
-    var parent = fiber["return"];
-    while (
-      parent !== null &&
-      parent.tag !== HostComponent &&
-      parent.tag !== HostRoot
-    ) {
-      parent = parent["return"];
-    }
-    hydrationParentFiber = parent;
+    index--;
   }
 
-  function popHydrationState(fiber) {
-    if (fiber !== hydrationParentFiber) {
-      // We're deeper than the current hydration context, inside an inserted
-      // tree.
-      return false;
-    }
-    if (!isHydrating) {
-      // If we're not currently hydrating but we're in a hydration context, then
-      // we were an insertion and now need to pop up reenter hydration of our
-      // siblings.
-      popToNextHostParent(fiber);
-      isHydrating = true;
-      return false;
+  function push(cursor, value, fiber) {
+    index++;
+
+    valueStack[index] = cursor.current;
+
+    {
+      fiberStack[index] = fiber;
     }
 
-    var type = fiber.type;
+    cursor.current = value;
+  }
 
-    // If we have any remaining hydratable nodes, we need to delete them now.
-    // We only do this deeper than head and body since they tend to have random
-    // other nodes in them. We also ignore components with pure text content in
-    // side of them.
-    // TODO: Better heuristic.
-    if (
-      fiber.tag !== HostComponent ||
-      (type !== "head" &&
-        type !== "body" &&
-        !shouldSetTextContent(type, fiber.memoizedProps))
-    ) {
-      var nextInstance = nextHydratableInstance;
-      while (nextInstance) {
-        deleteHydratableInstance(fiber, nextInstance);
-        nextInstance = getNextHydratableSibling(nextInstance);
+  function checkThatStackIsEmpty() {
+    {
+      if (index !== -1) {
+        warning(
+          false,
+          "Expected an empty stack. Something was not reset properly."
+        );
       }
     }
-
-    popToNextHostParent(fiber);
-    nextHydratableInstance = hydrationParentFiber
-      ? getNextHydratableSibling(fiber.stateNode)
-      : null;
-    return true;
   }
 
-  function resetHydrationState() {
-    hydrationParentFiber = null;
-    nextHydratableInstance = null;
-    isHydrating = false;
+  function resetStackAfterFatalErrorInDev() {
+    {
+      index = -1;
+      valueStack.length = 0;
+      fiberStack.length = 0;
+    }
   }
 
   return {
-    enterHydrationState: enterHydrationState,
-    resetHydrationState: resetHydrationState,
-    tryToClaimNextHydratableInstance: tryToClaimNextHydratableInstance,
-    prepareToHydrateHostInstance: prepareToHydrateHostInstance,
-    prepareToHydrateHostTextInstance: prepareToHydrateHostTextInstance,
-    popHydrationState: popHydrationState
+    createCursor: createCursor,
+    isEmpty: isEmpty,
+    pop: pop,
+    push: push,
+    checkThatStackIsEmpty: checkThatStackIsEmpty,
+    resetStackAfterFatalErrorInDev: resetStackAfterFatalErrorInDev
   };
 };
 
-// This lets us hook into Fiber to debug what it's doing.
-// See https://github.com/facebook/react/pull/8033.
-// This is not part of the public API, not even for React DevTools.
-// You may only inject a debugTool if you work on React Fiber itself.
-var ReactFiberInstrumentation = {
-  debugTool: null
-};
-
-var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
-
 var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError = ReactErrorUtils.hasCaughtError;
 var clearCaughtError = ReactErrorUtils.clearCaughtError;
@@ -11703,17 +12186,19 @@ var warnAboutInvalidUpdates = void 0;
   var didWarnStateUpdateForUnmountedComponent = {};
 
   warnAboutUpdateOnUnmounted = function(fiber) {
+    // We show the whole stack but dedupe on the top component's name because
+    // the problematic code almost always lies inside that component.
     var componentName = getComponentName(fiber) || "ReactClass";
     if (didWarnStateUpdateForUnmountedComponent[componentName]) {
       return;
     }
     warning(
       false,
-      "Can only update a mounted or mounting " +
-        "component. This usually means you called setState, replaceState, " +
-        "or forceUpdate on an unmounted component. This is a no-op.\n\nPlease " +
-        "check the code for the %s component.",
-      componentName
+      "Can't call setState (or forceUpdate) on an unmounted component. This " +
+        "is a no-op, but it indicates a memory leak in your application. To " +
+        "fix, cancel all subscriptions and asynchronous tasks in the " +
+        "componentWillUnmount method.%s",
+      getStackAddendumByWorkInProgressFiber(fiber)
     );
     didWarnStateUpdateForUnmountedComponent[componentName] = true;
   };
@@ -11748,16 +12233,23 @@ var warnAboutInvalidUpdates = void 0;
 }
 
 var ReactFiberScheduler = function(config) {
-  var hostContext = ReactFiberHostContext(config);
+  var stack = ReactFiberStack();
+  var hostContext = ReactFiberHostContext(config, stack);
+  var legacyContext = ReactFiberLegacyContext(stack);
+  var newContext = ReactFiberNewContext(stack);
   var popHostContext = hostContext.popHostContext,
     popHostContainer = hostContext.popHostContainer;
+  var popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popLegacyContextProvider = legacyContext.popContextProvider;
+  var popProvider = newContext.popProvider;
 
   var hydrationContext = ReactFiberHydrationContext(config);
-  var resetHostContainer = hostContext.resetHostContainer;
 
   var _ReactFiberBeginWork = ReactFiberBeginWork(
       config,
       hostContext,
+      legacyContext,
+      newContext,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
@@ -11767,17 +12259,22 @@ var ReactFiberScheduler = function(config) {
   var _ReactFiberCompleteWo = ReactFiberCompleteWork(
       config,
       hostContext,
+      legacyContext,
+      newContext,
       hydrationContext
     ),
     completeWork = _ReactFiberCompleteWo.completeWork;
 
   var _ReactFiberUnwindWork = ReactFiberUnwindWork(
       hostContext,
+      legacyContext,
+      newContext,
       scheduleWork,
       isAlreadyFailedLegacyErrorBoundary
     ),
     throwException = _ReactFiberUnwindWork.throwException,
-    unwindWork = _ReactFiberUnwindWork.unwindWork;
+    unwindWork = _ReactFiberUnwindWork.unwindWork,
+    unwindInterruptedWork = _ReactFiberUnwindWork.unwindInterruptedWork;
 
   var _ReactFiberCommitWork = ReactFiberCommitWork(
       config,
@@ -11787,6 +12284,8 @@ var ReactFiberScheduler = function(config) {
       markLegacyErrorBoundaryAsFailed,
       recalculateCurrentTime
     ),
+    commitBeforeMutationLifeCycles =
+      _ReactFiberCommitWork.commitBeforeMutationLifeCycles,
     commitResetTextContent = _ReactFiberCommitWork.commitResetTextContent,
     commitPlacement = _ReactFiberCommitWork.commitPlacement,
     commitDeletion = _ReactFiberCommitWork.commitDeletion,
@@ -11838,21 +12337,29 @@ var ReactFiberScheduler = function(config) {
 
   var stashedWorkInProgressProperties = void 0;
   var replayUnitOfWork = void 0;
+  var isReplayingFailedUnitOfWork = void 0;
+  var originalReplayError = void 0;
+  var rethrowOriginalError = void 0;
   if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
     stashedWorkInProgressProperties = null;
-    replayUnitOfWork = function(failedUnitOfWork, isAsync) {
-      // Retore the original state of the work-in-progress
-      Object.assign(failedUnitOfWork, stashedWorkInProgressProperties);
+    isReplayingFailedUnitOfWork = false;
+    originalReplayError = null;
+    replayUnitOfWork = function(failedUnitOfWork, error, isAsync) {
+      // Restore the original state of the work-in-progress
+      assignFiberPropertiesInDEV(
+        failedUnitOfWork,
+        stashedWorkInProgressProperties
+      );
       switch (failedUnitOfWork.tag) {
         case HostRoot:
           popHostContainer(failedUnitOfWork);
-          popTopLevelContextObject(failedUnitOfWork);
+          popTopLevelLegacyContextObject(failedUnitOfWork);
           break;
         case HostComponent:
           popHostContext(failedUnitOfWork);
           break;
         case ClassComponent:
-          popContextProvider(failedUnitOfWork);
+          popLegacyContextProvider(failedUnitOfWork);
           break;
         case HostPortal:
           popHostContainer(failedUnitOfWork);
@@ -11862,28 +12369,36 @@ var ReactFiberScheduler = function(config) {
           break;
       }
       // Replay the begin phase.
+      isReplayingFailedUnitOfWork = true;
+      originalReplayError = error;
       invokeGuardedCallback$2(null, workLoop, null, isAsync);
+      isReplayingFailedUnitOfWork = false;
+      originalReplayError = null;
       if (hasCaughtError()) {
         clearCaughtError();
       } else {
-        // This should be unreachable because the render phase is
-        // idempotent
+        // If the begin phase did not fail the second time, set this pointer
+        // back to the original value.
+        nextUnitOfWork = failedUnitOfWork;
       }
     };
+    rethrowOriginalError = function() {
+      throw originalReplayError;
+    };
   }
 
-  function resetContextStack() {
-    // Reset the stack
-    reset();
-    // Reset the cursors
-    resetContext();
-    resetHostContainer();
-
-    // TODO: Unify new context implementation with other stacks
-    resetProviderStack();
+  function resetStack() {
+    if (nextUnitOfWork !== null) {
+      var interruptedWork = nextUnitOfWork["return"];
+      while (interruptedWork !== null) {
+        unwindInterruptedWork(interruptedWork);
+        interruptedWork = interruptedWork["return"];
+      }
+    }
 
     {
       ReactStrictModeWarnings.discardPendingWarnings();
+      stack.checkThatStackIsEmpty();
     }
 
     nextRoot = null;
@@ -11901,6 +12416,7 @@ var ReactFiberScheduler = function(config) {
       recordEffect();
 
       var effectTag = nextEffect.effectTag;
+
       if (effectTag & ContentReset) {
         commitResetTextContent(nextEffect);
       }
@@ -11958,6 +12474,22 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
+  function commitBeforeMutationLifecycles() {
+    while (nextEffect !== null) {
+      var effectTag = nextEffect.effectTag;
+
+      if (effectTag & Snapshot) {
+        recordEffect();
+        var current = nextEffect.alternate;
+        commitBeforeMutationLifeCycles(current, nextEffect);
+      }
+
+      // Don't cleanup effects yet;
+      // This will be done by commitAllLifeCycles()
+      nextEffect = nextEffect.nextEffect;
+    }
+  }
+
   function commitAllLifeCycles(
     finishedRoot,
     currentTime,
@@ -12065,16 +12597,14 @@ var ReactFiberScheduler = function(config) {
 
     prepareForCommit(root.containerInfo);
 
-    // Commit all the side-effects within a tree. We'll do this in two passes.
-    // The first pass performs all the host insertions, updates, deletions and
-    // ref unmounts.
+    // Invoke instances of getSnapshotBeforeUpdate before mutation.
     nextEffect = firstEffect;
-    startCommitHostEffectsTimer();
+    startCommitSnapshotEffectsTimer();
     while (nextEffect !== null) {
       var didError = false;
       var error = void 0;
       {
-        invokeGuardedCallback$2(null, commitAllHostEffects, null);
+        invokeGuardedCallback$2(null, commitBeforeMutationLifecycles, null);
         if (hasCaughtError()) {
           didError = true;
           error = clearCaughtError();
@@ -12093,6 +12623,36 @@ var ReactFiberScheduler = function(config) {
         }
       }
     }
+    stopCommitSnapshotEffectsTimer();
+
+    // Commit all the side-effects within a tree. We'll do this in two passes.
+    // The first pass performs all the host insertions, updates, deletions and
+    // ref unmounts.
+    nextEffect = firstEffect;
+    startCommitHostEffectsTimer();
+    while (nextEffect !== null) {
+      var _didError = false;
+      var _error = void 0;
+      {
+        invokeGuardedCallback$2(null, commitAllHostEffects, null);
+        if (hasCaughtError()) {
+          _didError = true;
+          _error = clearCaughtError();
+        }
+      }
+      if (_didError) {
+        invariant(
+          nextEffect !== null,
+          "Should have next effect. This error is likely caused by a bug " +
+            "in React. Please file an issue."
+        );
+        onCommitPhaseError(nextEffect, _error);
+        // Clean-up
+        if (nextEffect !== null) {
+          nextEffect = nextEffect.nextEffect;
+        }
+      }
+    }
     stopCommitHostEffectsTimer();
 
     resetAfterCommit(root.containerInfo);
@@ -12110,8 +12670,8 @@ var ReactFiberScheduler = function(config) {
     nextEffect = firstEffect;
     startCommitLifeCyclesTimer();
     while (nextEffect !== null) {
-      var _didError = false;
-      var _error = void 0;
+      var _didError2 = false;
+      var _error2 = void 0;
       {
         invokeGuardedCallback$2(
           null,
@@ -12122,17 +12682,17 @@ var ReactFiberScheduler = function(config) {
           committedExpirationTime
         );
         if (hasCaughtError()) {
-          _didError = true;
-          _error = clearCaughtError();
+          _didError2 = true;
+          _error2 = clearCaughtError();
         }
       }
-      if (_didError) {
+      if (_didError2) {
         invariant(
           nextEffect !== null,
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        onCommitPhaseError(nextEffect, _error);
+        onCommitPhaseError(nextEffect, _error2);
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
         }
@@ -12356,12 +12916,21 @@ var ReactFiberScheduler = function(config) {
     }
 
     if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-      stashedWorkInProgressProperties = Object.assign({}, workInProgress);
+      stashedWorkInProgressProperties = assignFiberPropertiesInDEV(
+        stashedWorkInProgressProperties,
+        workInProgress
+      );
     }
     var next = beginWork(current, workInProgress, nextRenderExpirationTime);
-
     {
       ReactDebugCurrentFiber.resetCurrentFiber();
+      if (isReplayingFailedUnitOfWork) {
+        // Currently replaying a failed unit of work. This should be unreachable,
+        // because the render phase is meant to be idempotent, and it should
+        // have thrown again. Since it didn't, rethrow the original error, so
+        // React's internal stack is not misaligned.
+        rethrowOriginalError();
+      }
     }
     if (true && ReactFiberInstrumentation_1.debugTool) {
       ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
@@ -12407,7 +12976,7 @@ var ReactFiberScheduler = function(config) {
       nextUnitOfWork === null
     ) {
       // Reset the stack and start working from the root.
-      resetContextStack();
+      resetStack();
       nextRoot = root;
       nextRenderExpirationTime = expirationTime;
       nextUnitOfWork = createWorkInProgress(
@@ -12435,13 +13004,18 @@ var ReactFiberScheduler = function(config) {
 
         if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
           var failedUnitOfWork = nextUnitOfWork;
-          replayUnitOfWork(failedUnitOfWork, isAsync);
+          replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
         }
 
         var sourceFiber = nextUnitOfWork;
         var returnFiber = sourceFiber["return"];
         if (returnFiber === null) {
-          // This is a fatal error.
+          // This is the root. The root could capture its own errors. However,
+          // we don't know if it errors before or after we pushed the host
+          // context. This information is needed to avoid a stack mismatch.
+          // Because we're not sure, treat this as a fatal error. We could track
+          // which phase it fails in, but doesn't seem worth it. At least
+          // for now.
           didFatal = true;
           onUncaughtError(thrownValue);
           break;
@@ -12453,23 +13027,32 @@ var ReactFiberScheduler = function(config) {
     } while (true);
 
     // We're done performing work. Time to clean up.
-    stopWorkLoopTimer(interruptedBy);
-    interruptedBy = null;
+    var didCompleteRoot = false;
     isWorking = false;
 
     // Yield back to main thread.
     if (didFatal) {
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
       // There was a fatal error.
+      {
+        stack.resetStackAfterFatalErrorInDev();
+      }
       return null;
     } else if (nextUnitOfWork === null) {
       // We reached the root.
       if (isRootReadyForCommit) {
+        didCompleteRoot = true;
+        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+        interruptedBy = null;
         // The root successfully completed. It's ready for commit.
         root.pendingCommitExpirationTime = expirationTime;
         var finishedWork = root.current.alternate;
         return finishedWork;
       } else {
         // The root did not complete.
+        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+        interruptedBy = null;
         invariant(
           false,
           "Expired work should have completed. This error is likely caused " +
@@ -12477,6 +13060,8 @@ var ReactFiberScheduler = function(config) {
         );
       }
     } else {
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
       // There's more work to do, but we ran out of time. Yield back to
       // the renderer.
       return null;
@@ -12660,9 +13245,17 @@ var ReactFiberScheduler = function(config) {
           ) {
             // This is an interruption. (Used for performance tracking.)
             interruptedBy = fiber;
-            resetContextStack();
+            resetStack();
           }
-          if (nextRoot !== root || !isWorking) {
+          if (
+            // If we're in the render phase, we don't need to schedule this root
+            // for an update, because we'll do it before we exit...
+            !isWorking ||
+            isCommitting ||
+            // ...unless this is a different root than the one we're rendering.
+            nextRoot !== root
+          ) {
+            // Add this root to the root schedule.
             requestWork(root, expirationTime);
           }
           if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
@@ -12922,7 +13515,8 @@ var ReactFiberScheduler = function(config) {
 
     if (enableUserTimingAPI && deadline !== null) {
       var didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
-      stopRequestCallbackTimer(didExpire);
+      var timeout = expirationTimeToMs(nextFlushedExpirationTime);
+      stopRequestCallbackTimer(didExpire, timeout);
     }
 
     if (isAsync) {
@@ -12982,7 +13576,11 @@ var ReactFiberScheduler = function(config) {
     // Perform work on root as if the given expiration time is the current time.
     // This has the effect of synchronously flushing all work up to and
     // including the given time.
+    nextFlushedRoot = root;
+    nextFlushedExpirationTime = expirationTime;
     performWorkOnRoot(root, expirationTime, false);
+    // Flush any sync work that was scheduled by lifecycles
+    performSyncWork();
     finishRendering();
   }
 
@@ -13231,7 +13829,8 @@ var ReactFiberScheduler = function(config) {
     syncUpdates: syncUpdates,
     interactiveUpdates: interactiveUpdates,
     flushInteractiveUpdates: flushInteractiveUpdates,
-    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration
+    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration,
+    legacyContext: legacyContext
   };
 };
 
@@ -13244,18 +13843,6 @@ var didWarnAboutNestedUpdates = void 0;
 // 0 is PROD, 1 is DEV.
 // Might add PROFILE later.
 
-function getContextForSubtree(parentComponent) {
-  if (!parentComponent) {
-    return emptyObject;
-  }
-
-  var fiber = get(parentComponent);
-  var parentContext = findCurrentUnmaskedContext(fiber);
-  return isContextProvider(fiber)
-    ? processChildContext(fiber, parentContext)
-    : parentContext;
-}
-
 var ReactFiberReconciler$1 = function(config) {
   var getPublicInstance = config.getPublicInstance;
 
@@ -13274,7 +13861,24 @@ var ReactFiberReconciler$1 = function(config) {
     deferredUpdates = _ReactFiberScheduler.deferredUpdates,
     syncUpdates = _ReactFiberScheduler.syncUpdates,
     interactiveUpdates = _ReactFiberScheduler.interactiveUpdates,
-    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates;
+    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates,
+    legacyContext = _ReactFiberScheduler.legacyContext;
+
+  var findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
+    isContextProvider = legacyContext.isContextProvider,
+    processChildContext = legacyContext.processChildContext;
+
+  function getContextForSubtree(parentComponent) {
+    if (!parentComponent) {
+      return emptyObject;
+    }
+
+    var fiber = get(parentComponent);
+    var parentContext = findCurrentUnmaskedContext(fiber);
+    return isContextProvider(fiber)
+      ? processChildContext(fiber, parentContext)
+      : parentContext;
+  }
 
   function scheduleRootUpdate(
     current,
@@ -13303,12 +13907,14 @@ var ReactFiberReconciler$1 = function(config) {
 
     callback = callback === undefined ? null : callback;
     {
-      warning(
-        callback === null || typeof callback === "function",
-        "render(...): Expected the last optional `callback` argument to be a " +
-          "function. Instead received: %s.",
-        callback
-      );
+      !(callback === null || typeof callback === "function")
+        ? warning(
+            false,
+            "render(...): Expected the last optional `callback` argument to be a " +
+              "function. Instead received: %s.",
+            callback
+          )
+        : void 0;
     }
 
     var update = {
@@ -13630,7 +14236,8 @@ var frameDeadline = 0;
 var frameDeadlineObject = {
   timeRemaining: function() {
     return frameDeadline - now();
-  }
+  },
+  didTimeout: false
 };
 
 function setTimeoutCallback() {
diff --git a/Libraries/Renderer/ReactNativeRenderer-prod.js b/Libraries/Renderer/ReactNativeRenderer-prod.js
index ca27b720b33dfe..055ddd7bb0c161 100644
--- a/Libraries/Renderer/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/ReactNativeRenderer-prod.js
@@ -1174,6 +1174,9 @@ var hasSymbol = "function" === typeof Symbol && Symbol["for"],
   REACT_PROVIDER_TYPE = hasSymbol ? Symbol["for"]("react.provider") : 60109,
   REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 60110,
   REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol["for"]("react.async_mode") : 60111,
+  REACT_FORWARD_REF_TYPE = hasSymbol
+    ? Symbol["for"]("react.forward_ref")
+    : 60112,
   MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
   if (null === maybeIterable || "undefined" === typeof maybeIterable)
@@ -1819,141 +1822,6 @@ function findCurrentHostFiberWithNoPortals(parent) {
   }
   return null;
 }
-var valueStack = [],
-  index = -1;
-function pop(cursor) {
-  0 > index ||
-    ((cursor.current = valueStack[index]), (valueStack[index] = null), index--);
-}
-function push(cursor, value) {
-  index++;
-  valueStack[index] = cursor.current;
-  cursor.current = value;
-}
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  do {
-    a: switch (workInProgress.tag) {
-      case 0:
-      case 1:
-      case 2:
-      case 5:
-        var owner = workInProgress._debugOwner,
-          source = workInProgress._debugSource;
-        var JSCompiler_inline_result = getComponentName(workInProgress);
-        var ownerName = null;
-        owner && (ownerName = getComponentName(owner));
-        owner = source;
-        JSCompiler_inline_result =
-          "\n    in " +
-          (JSCompiler_inline_result || "Unknown") +
-          (owner
-            ? " (at " +
-              owner.fileName.replace(/^.*[\\\/]/, "") +
-              ":" +
-              owner.lineNumber +
-              ")"
-            : ownerName ? " (created by " + ownerName + ")" : "");
-        break a;
-      default:
-        JSCompiler_inline_result = "";
-    }
-    info += JSCompiler_inline_result;
-    workInProgress = workInProgress["return"];
-  } while (workInProgress);
-  return info;
-}
-var _require = require("ReactFeatureFlags"),
-  enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch,
-  debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects,
-  debugRenderPhaseSideEffectsForStrictMode =
-    _require.debugRenderPhaseSideEffectsForStrictMode;
-new Set();
-var contextStackCursor = { current: emptyObject },
-  didPerformWorkStackCursor = { current: !1 },
-  previousContext = emptyObject;
-function getUnmaskedContext(workInProgress) {
-  return isContextProvider(workInProgress)
-    ? previousContext
-    : contextStackCursor.current;
-}
-function getMaskedContext(workInProgress, unmaskedContext) {
-  var contextTypes = workInProgress.type.contextTypes;
-  if (!contextTypes) return emptyObject;
-  var instance = workInProgress.stateNode;
-  if (
-    instance &&
-    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-  )
-    return instance.__reactInternalMemoizedMaskedChildContext;
-  var context = {},
-    key;
-  for (key in contextTypes) context[key] = unmaskedContext[key];
-  instance &&
-    ((workInProgress = workInProgress.stateNode),
-    (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
-    (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
-  return context;
-}
-function isContextProvider(fiber) {
-  return 2 === fiber.tag && null != fiber.type.childContextTypes;
-}
-function popContextProvider(fiber) {
-  isContextProvider(fiber) &&
-    (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
-}
-function pushTopLevelContextObject(fiber, context, didChange) {
-  invariant(
-    null == contextStackCursor.cursor,
-    "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
-  );
-  push(contextStackCursor, context, fiber);
-  push(didPerformWorkStackCursor, didChange, fiber);
-}
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode,
-    childContextTypes = fiber.type.childContextTypes;
-  if ("function" !== typeof instance.getChildContext) return parentContext;
-  instance = instance.getChildContext();
-  for (var contextKey in instance)
-    invariant(
-      contextKey in childContextTypes,
-      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
-      contextKey
-    );
-  return Object.assign({}, parentContext, instance);
-}
-function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) return !1;
-  var instance = workInProgress.stateNode;
-  instance =
-    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
-  previousContext = contextStackCursor.current;
-  push(contextStackCursor, instance, workInProgress);
-  push(
-    didPerformWorkStackCursor,
-    didPerformWorkStackCursor.current,
-    workInProgress
-  );
-  return !0;
-}
-function invalidateContextProvider(workInProgress, didChange) {
-  var instance = workInProgress.stateNode;
-  invariant(
-    instance,
-    "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
-  );
-  if (didChange) {
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    push(contextStackCursor, mergedContext, workInProgress);
-  } else pop(didPerformWorkStackCursor, workInProgress);
-  push(didPerformWorkStackCursor, didChange, workInProgress);
-}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -2037,6 +1905,9 @@ function createFiberFromElement(element, mode, expirationTime) {
             case REACT_CONTEXT_TYPE:
               fiberTag = 12;
               break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = 14;
+              break;
             default:
               if ("number" === typeof type.tag)
                 return (
@@ -2117,6 +1988,45 @@ function onCommitRoot(root) {
 function onCommitUnmount(fiber) {
   "function" === typeof onCommitFiberUnmount && onCommitFiberUnmount(fiber);
 }
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  do {
+    a: switch (workInProgress.tag) {
+      case 0:
+      case 1:
+      case 2:
+      case 5:
+        var owner = workInProgress._debugOwner,
+          source = workInProgress._debugSource;
+        var JSCompiler_inline_result = getComponentName(workInProgress);
+        var ownerName = null;
+        owner && (ownerName = getComponentName(owner));
+        owner = source;
+        JSCompiler_inline_result =
+          "\n    in " +
+          (JSCompiler_inline_result || "Unknown") +
+          (owner
+            ? " (at " +
+              owner.fileName.replace(/^.*[\\\/]/, "") +
+              ":" +
+              owner.lineNumber +
+              ")"
+            : ownerName ? " (created by " + ownerName + ")" : "");
+        break a;
+      default:
+        JSCompiler_inline_result = "";
+    }
+    info += JSCompiler_inline_result;
+    workInProgress = workInProgress["return"];
+  } while (workInProgress);
+  return info;
+}
+var _require = require("ReactFeatureFlags"),
+  enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch,
+  debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects,
+  debugRenderPhaseSideEffectsForStrictMode =
+    _require.debugRenderPhaseSideEffectsForStrictMode;
+new Set();
 function createUpdateQueue(baseState) {
   return {
     baseState: baseState,
@@ -2288,6 +2198,7 @@ function callGetDerivedStateFromCatch(ctor, capturedValues) {
   return resultState;
 }
 function ReactFiberClassComponent(
+  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
@@ -2335,81 +2246,82 @@ function ReactFiberClassComponent(
     instance.state !== workInProgress &&
       updater.enqueueReplaceState(instance, instance.state, null);
   }
-  function callGetDerivedStateFromProps(workInProgress, instance, props) {
+  function callGetDerivedStateFromProps(
+    workInProgress,
+    instance,
+    nextProps,
+    prevState
+  ) {
     instance = workInProgress.type;
     if ("function" === typeof instance.getDerivedStateFromProps)
       return (
         (debugRenderPhaseSideEffects ||
           (debugRenderPhaseSideEffectsForStrictMode &&
             workInProgress.mode & 2)) &&
-          instance.getDerivedStateFromProps.call(
-            null,
-            props,
-            workInProgress.memoizedState
-          ),
-        instance.getDerivedStateFromProps.call(
-          null,
-          props,
-          workInProgress.memoizedState
-        )
+          instance.getDerivedStateFromProps.call(null, nextProps, prevState),
+        instance.getDerivedStateFromProps.call(null, nextProps, prevState)
       );
   }
-  var updater = {
-    isMounted: isMounted,
-    enqueueSetState: function(instance, partialState, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: partialState,
-        callback: callback,
-        isReplace: !1,
-        isForced: !1,
-        capturedValue: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    },
-    enqueueReplaceState: function(instance, state, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: state,
-        callback: callback,
-        isReplace: !0,
-        isForced: !1,
-        capturedValue: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    },
-    enqueueForceUpdate: function(instance, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: null,
-        callback: callback,
-        isReplace: !1,
-        isForced: !0,
-        capturedValue: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    }
-  };
+  var cacheContext = legacyContext.cacheContext,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    isContextConsumer = legacyContext.isContextConsumer,
+    hasContextChanged = legacyContext.hasContextChanged,
+    updater = {
+      isMounted: isMounted,
+      enqueueSetState: function(instance, partialState, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: partialState,
+          callback: callback,
+          isReplace: !1,
+          isForced: !1,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      },
+      enqueueReplaceState: function(instance, state, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: state,
+          callback: callback,
+          isReplace: !0,
+          isForced: !1,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      },
+      enqueueForceUpdate: function(instance, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: null,
+          callback: callback,
+          isReplace: !1,
+          isForced: !0,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      }
+    };
   return {
     adoptClassInstance: adoptClassInstance,
     callGetDerivedStateFromProps: callGetDerivedStateFromProps,
     constructClassInstance: function(workInProgress, props) {
       var ctor = workInProgress.type,
         unmaskedContext = getUnmaskedContext(workInProgress),
-        needsContext =
-          2 === workInProgress.tag && null != workInProgress.type.contextTypes,
+        needsContext = isContextConsumer(workInProgress),
         context = needsContext
           ? getMaskedContext(workInProgress, unmaskedContext)
           : emptyObject;
@@ -2422,7 +2334,7 @@ function ReactFiberClassComponent(
         null !== ctor.state && void 0 !== ctor.state ? ctor.state : null;
       adoptClassInstance(workInProgress, ctor);
       workInProgress.memoizedState = state;
-      props = callGetDerivedStateFromProps(workInProgress, ctor, props);
+      props = callGetDerivedStateFromProps(workInProgress, ctor, props, state);
       null !== props &&
         void 0 !== props &&
         (workInProgress.memoizedState = Object.assign(
@@ -2430,10 +2342,7 @@ function ReactFiberClassComponent(
           workInProgress.memoizedState,
           props
         ));
-      needsContext &&
-        ((workInProgress = workInProgress.stateNode),
-        (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
-        (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
+      needsContext && cacheContext(workInProgress, unmaskedContext, context);
       return ctor;
     },
     mountClassInstance: function(workInProgress, renderExpirationTime) {
@@ -2446,9 +2355,10 @@ function ReactFiberClassComponent(
       instance.state = workInProgress.memoizedState;
       instance.refs = emptyObject;
       instance.context = getMaskedContext(workInProgress, unmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillMount &&
-        "function" !== typeof instance.componentWillMount) ||
-        "function" === typeof ctor.getDerivedStateFromProps ||
+      "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate ||
+        ("function" !== typeof instance.UNSAFE_componentWillMount &&
+          "function" !== typeof instance.componentWillMount) ||
         ((ctor = instance.state),
         "function" === typeof instance.componentWillMount &&
           instance.componentWillMount(),
@@ -2479,9 +2389,12 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-        "function" !== typeof instance.componentWillReceiveProps) ||
+      var hasNewLifecycles =
         "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate;
+      hasNewLifecycles ||
+        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof instance.componentWillReceiveProps) ||
         ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
           callComponentWillReceiveProps(
             workInProgress,
@@ -2489,15 +2402,8 @@ function ReactFiberClassComponent(
             newProps,
             newUnmaskedContext
           ));
-      oldContext = void 0;
-      oldProps !== newProps &&
-        (oldContext = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps
-        ));
-      var oldState = workInProgress.memoizedState,
-        derivedStateFromCatch = void 0;
+      oldContext = workInProgress.memoizedState;
+      var derivedStateFromCatch = void 0;
       if (null !== workInProgress.updateQueue) {
         renderExpirationTime = processUpdateQueue(
           null,
@@ -2516,24 +2422,46 @@ function ReactFiberClassComponent(
             ctor,
             updateQueue.capturedValues
           ));
-      } else renderExpirationTime = oldState;
-      null !== oldContext &&
-        void 0 !== oldContext &&
-        (renderExpirationTime =
+      } else renderExpirationTime = oldContext;
+      ctor = void 0;
+      oldProps !== newProps &&
+        (ctor = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps,
+          renderExpirationTime
+        ));
+      null !== ctor &&
+        void 0 !== ctor &&
+        ((renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? oldContext
-            : Object.assign({}, renderExpirationTime, oldContext));
+            ? ctor
+            : Object.assign({}, renderExpirationTime, ctor)),
+        (updateQueue = workInProgress.updateQueue),
+        null !== updateQueue &&
+          (updateQueue.baseState = Object.assign(
+            {},
+            updateQueue.baseState,
+            ctor
+          )));
       null !== derivedStateFromCatch &&
         void 0 !== derivedStateFromCatch &&
-        (renderExpirationTime =
+        ((renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
             ? derivedStateFromCatch
-            : Object.assign({}, renderExpirationTime, derivedStateFromCatch));
+            : Object.assign({}, renderExpirationTime, derivedStateFromCatch)),
+        (ctor = workInProgress.updateQueue),
+        null !== ctor &&
+          (ctor.baseState = Object.assign(
+            {},
+            ctor.baseState,
+            derivedStateFromCatch
+          )));
       if (
         !(
           oldProps !== newProps ||
-          oldState !== renderExpirationTime ||
-          didPerformWorkStackCursor.current ||
+          oldContext !== renderExpirationTime ||
+          hasContextChanged() ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -2547,26 +2475,18 @@ function ReactFiberClassComponent(
         workInProgress,
         oldProps,
         newProps,
-        oldState,
+        oldContext,
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
-            "function" !== typeof instance.componentWillUpdate) ||
-            "function" === typeof ctor.getDerivedStateFromProps ||
-            ("function" === typeof instance.componentWillUpdate &&
-              instance.componentWillUpdate(
-                newProps,
-                renderExpirationTime,
-                newUnmaskedContext
-              ),
-            "function" === typeof instance.UNSAFE_componentWillUpdate &&
-              instance.UNSAFE_componentWillUpdate(
-                newProps,
-                renderExpirationTime,
-                newUnmaskedContext
-              )),
-          "function" === typeof instance.componentDidUpdate &&
+        ? (hasNewLifecycles ||
+            ("function" !== typeof instance.UNSAFE_componentWillMount &&
+              "function" !== typeof instance.componentWillMount) ||
+            ("function" === typeof instance.componentWillMount &&
+              instance.componentWillMount(),
+            "function" === typeof instance.UNSAFE_componentWillMount &&
+              instance.UNSAFE_componentWillMount()),
+          "function" === typeof instance.componentDidMount &&
             (workInProgress.effectTag |= 4))
         : ("function" === typeof instance.componentDidMount &&
             (workInProgress.effectTag |= 4),
@@ -2591,9 +2511,12 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-        "function" !== typeof instance.componentWillReceiveProps) ||
+      var hasNewLifecycles =
         "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate;
+      hasNewLifecycles ||
+        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof instance.componentWillReceiveProps) ||
         ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
           callComponentWillReceiveProps(
             workInProgress,
@@ -2601,13 +2524,6 @@ function ReactFiberClassComponent(
             newProps,
             newUnmaskedContext
           ));
-      var derivedStateFromProps = void 0;
-      oldProps !== newProps &&
-        (derivedStateFromProps = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps
-        ));
       oldContext = workInProgress.memoizedState;
       var derivedStateFromCatch = void 0;
       if (null !== workInProgress.updateQueue) {
@@ -2629,23 +2545,45 @@ function ReactFiberClassComponent(
             updateQueue.capturedValues
           ));
       } else renderExpirationTime = oldContext;
-      null !== derivedStateFromProps &&
-        void 0 !== derivedStateFromProps &&
-        (renderExpirationTime =
+      ctor = void 0;
+      oldProps !== newProps &&
+        (ctor = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps,
+          renderExpirationTime
+        ));
+      null !== ctor &&
+        void 0 !== ctor &&
+        ((renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? derivedStateFromProps
-            : Object.assign({}, renderExpirationTime, derivedStateFromProps));
+            ? ctor
+            : Object.assign({}, renderExpirationTime, ctor)),
+        (updateQueue = workInProgress.updateQueue),
+        null !== updateQueue &&
+          (updateQueue.baseState = Object.assign(
+            {},
+            updateQueue.baseState,
+            ctor
+          )));
       null !== derivedStateFromCatch &&
         void 0 !== derivedStateFromCatch &&
-        (renderExpirationTime =
+        ((renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
             ? derivedStateFromCatch
-            : Object.assign({}, renderExpirationTime, derivedStateFromCatch));
+            : Object.assign({}, renderExpirationTime, derivedStateFromCatch)),
+        (ctor = workInProgress.updateQueue),
+        null !== ctor &&
+          (ctor.baseState = Object.assign(
+            {},
+            ctor.baseState,
+            derivedStateFromCatch
+          )));
       if (
         !(
           oldProps !== newProps ||
           oldContext !== renderExpirationTime ||
-          didPerformWorkStackCursor.current ||
+          hasContextChanged() ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -2655,9 +2593,13 @@ function ReactFiberClassComponent(
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
+          "function" !== typeof instance.getSnapshotBeforeUpdate ||
+            (oldProps === current.memoizedProps &&
+              oldContext === current.memoizedState) ||
+            (workInProgress.effectTag |= 2048),
           !1
         );
-      (derivedStateFromProps = checkShouldComponentUpdate(
+      (derivedStateFromCatch = checkShouldComponentUpdate(
         workInProgress,
         oldProps,
         newProps,
@@ -2665,9 +2607,9 @@ function ReactFiberClassComponent(
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
-            "function" !== typeof instance.componentWillUpdate) ||
-            "function" === typeof ctor.getDerivedStateFromProps ||
+        ? (hasNewLifecycles ||
+            ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
+              "function" !== typeof instance.componentWillUpdate) ||
             ("function" === typeof instance.componentWillUpdate &&
               instance.componentWillUpdate(
                 newProps,
@@ -2681,17 +2623,23 @@ function ReactFiberClassComponent(
                 newUnmaskedContext
               )),
           "function" === typeof instance.componentDidUpdate &&
-            (workInProgress.effectTag |= 4))
+            (workInProgress.effectTag |= 4),
+          "function" === typeof instance.getSnapshotBeforeUpdate &&
+            (workInProgress.effectTag |= 2048))
         : ("function" !== typeof instance.componentDidUpdate ||
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
+          "function" !== typeof instance.getSnapshotBeforeUpdate ||
+            (oldProps === current.memoizedProps &&
+              oldContext === current.memoizedState) ||
+            (workInProgress.effectTag |= 2048),
           memoizeProps(workInProgress, newProps),
           memoizeState(workInProgress, renderExpirationTime));
       instance.props = newProps;
       instance.state = renderExpirationTime;
       instance.context = newUnmaskedContext;
-      return derivedStateFromProps;
+      return derivedStateFromCatch;
     }
   };
 }
@@ -3368,34 +3316,12 @@ function ChildReconciler(shouldTrackSideEffects) {
   };
 }
 var reconcileChildFibers = ChildReconciler(!0),
-  mountChildFibers = ChildReconciler(!1),
-  changedBitsStack = [],
-  currentValueStack = [],
-  stack = [],
-  index$1 = -1;
-function pushProvider(providerFiber) {
-  var context = providerFiber.type.context;
-  index$1 += 1;
-  changedBitsStack[index$1] = context._changedBits;
-  currentValueStack[index$1] = context._currentValue;
-  stack[index$1] = providerFiber;
-  context._currentValue = providerFiber.pendingProps.value;
-  context._changedBits = providerFiber.stateNode;
-}
-function popProvider(providerFiber) {
-  var changedBits = changedBitsStack[index$1],
-    currentValue = currentValueStack[index$1];
-  changedBitsStack[index$1] = null;
-  currentValueStack[index$1] = null;
-  stack[index$1] = null;
-  --index$1;
-  providerFiber = providerFiber.type.context;
-  providerFiber._currentValue = currentValue;
-  providerFiber._changedBits = changedBits;
-}
+  mountChildFibers = ChildReconciler(!1);
 function ReactFiberBeginWork(
   config,
   hostContext,
+  legacyContext,
+  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
@@ -3501,7 +3427,12 @@ function ReactFiberBeginWork(
     changedBits,
     renderExpirationTime
   ) {
-    for (var fiber = workInProgress.child; null !== fiber; ) {
+    var fiber = workInProgress.child;
+    for (
+      null !== fiber && (fiber["return"] = workInProgress);
+      null !== fiber;
+
+    ) {
       switch (fiber.tag) {
         case 12:
           var nextFiber = fiber.stateNode | 0;
@@ -3557,10 +3488,10 @@ function ReactFiberBeginWork(
     workInProgress,
     renderExpirationTime
   ) {
-    var context = workInProgress.type.context,
+    var context = workInProgress.type._context,
       newProps = workInProgress.pendingProps,
       oldProps = workInProgress.memoizedProps;
-    if (!didPerformWorkStackCursor.current && oldProps === newProps)
+    if (!hasLegacyContextChanged() && oldProps === newProps)
       return (
         (workInProgress.stateNode = 0),
         pushProvider(workInProgress),
@@ -3647,11 +3578,19 @@ function ReactFiberBeginWork(
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree,
     pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer,
+    pushProvider = newContext.pushProvider,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    hasLegacyContextChanged = legacyContext.hasContextChanged,
+    pushLegacyContextProvider = legacyContext.pushContextProvider,
+    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
+    invalidateContextProvider = legacyContext.invalidateContextProvider,
     enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
   config = ReactFiberClassComponent(
+    legacyContext,
     scheduleWork,
     computeExpirationForFiber,
     function(workInProgress, nextProps) {
@@ -3678,7 +3617,7 @@ function ReactFiberBeginWork(
             pushHostRootContext(workInProgress);
             break;
           case 2:
-            pushContextProvider(workInProgress);
+            pushLegacyContextProvider(workInProgress);
             break;
           case 4:
             pushHostContainer(
@@ -3715,7 +3654,8 @@ function ReactFiberBeginWork(
                 ((props = callGetDerivedStateFromProps(
                   workInProgress,
                   fn,
-                  props
+                  props,
+                  workInProgress.memoizedState
                 )),
                 null !== props &&
                   void 0 !== props &&
@@ -3724,7 +3664,7 @@ function ReactFiberBeginWork(
                     workInProgress.memoizedState,
                     props
                   ))),
-              (props = pushContextProvider(workInProgress)),
+              (props = pushLegacyContextProvider(workInProgress)),
               adoptClassInstance(workInProgress, fn),
               mountClassInstance(workInProgress, renderExpirationTime),
               (current = finishClassComponent(
@@ -3744,7 +3684,7 @@ function ReactFiberBeginWork(
           return (
             (props = workInProgress.type),
             (renderExpirationTime = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? ((fn = getUnmaskedContext(workInProgress)),
                 (fn = getMaskedContext(workInProgress, fn)),
@@ -3760,7 +3700,7 @@ function ReactFiberBeginWork(
             current
           );
         case 2:
-          props = pushContextProvider(workInProgress);
+          props = pushLegacyContextProvider(workInProgress);
           null === current
             ? null === workInProgress.stateNode
               ? (constructClassInstance(
@@ -3842,7 +3782,7 @@ function ReactFiberBeginWork(
             updateQueue = workInProgress.memoizedProps;
             fn = workInProgress.pendingProps;
             unmaskedContext = null !== current ? current.memoizedProps : null;
-            if (!didPerformWorkStackCursor.current && updateQueue === fn) {
+            if (!hasLegacyContextChanged() && updateQueue === fn) {
               if (
                 (updateQueue =
                   workInProgress.mode & 1 &&
@@ -3884,7 +3824,7 @@ function ReactFiberBeginWork(
         case 7:
           return (
             (props = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
               workInProgress.memoizedProps !== props ||
               (props = workInProgress.memoizedProps),
             (fn = props.children),
@@ -3914,8 +3854,7 @@ function ReactFiberBeginWork(
               workInProgress.stateNode.containerInfo
             ),
             (props = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
-            workInProgress.memoizedProps !== props
+            hasLegacyContextChanged() || workInProgress.memoizedProps !== props
               ? (null === current
                   ? (workInProgress.child = reconcileChildFibers(
                       workInProgress,
@@ -3932,10 +3871,21 @@ function ReactFiberBeginWork(
                 )),
             current
           );
+        case 14:
+          return (
+            (renderExpirationTime = workInProgress.type.render),
+            (renderExpirationTime = renderExpirationTime(
+              workInProgress.pendingProps,
+              workInProgress.ref
+            )),
+            reconcileChildren(current, workInProgress, renderExpirationTime),
+            (workInProgress.memoizedProps = renderExpirationTime),
+            workInProgress.child
+          );
         case 10:
           return (
             (renderExpirationTime = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? (reconcileChildren(
                   current,
@@ -3953,7 +3903,7 @@ function ReactFiberBeginWork(
         case 11:
           return (
             (renderExpirationTime = workInProgress.pendingProps.children),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             (null !== renderExpirationTime &&
               workInProgress.memoizedProps !== renderExpirationTime)
               ? (reconcileChildren(
@@ -3976,43 +3926,33 @@ function ReactFiberBeginWork(
             renderExpirationTime
           );
         case 12:
-          a: {
-            fn = workInProgress.type;
-            unmaskedContext = workInProgress.pendingProps;
-            updateQueue = workInProgress.memoizedProps;
-            props = fn._currentValue;
-            var changedBits = fn._changedBits;
-            if (
-              didPerformWorkStackCursor.current ||
-              0 !== changedBits ||
-              updateQueue !== unmaskedContext
-            ) {
-              workInProgress.memoizedProps = unmaskedContext;
-              var observedBits = unmaskedContext.unstable_observedBits;
-              if (void 0 === observedBits || null === observedBits)
-                observedBits = 1073741823;
-              workInProgress.stateNode = observedBits;
-              if (0 !== (changedBits & observedBits))
-                propagateContextChange(
-                  workInProgress,
-                  fn,
-                  changedBits,
-                  renderExpirationTime
-                );
-              else if (
-                null !== updateQueue &&
-                updateQueue.children === unmaskedContext.children
-              ) {
-                current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-                break a;
-              }
-              renderExpirationTime = unmaskedContext.children;
-              renderExpirationTime = renderExpirationTime(props);
-              reconcileChildren(current, workInProgress, renderExpirationTime);
-              current = workInProgress.child;
-            } else
-              current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-          }
+          fn = workInProgress.type;
+          unmaskedContext = workInProgress.pendingProps;
+          var oldProps = workInProgress.memoizedProps;
+          props = fn._currentValue;
+          updateQueue = fn._changedBits;
+          if (
+            hasLegacyContextChanged() ||
+            0 !== updateQueue ||
+            oldProps !== unmaskedContext
+          ) {
+            workInProgress.memoizedProps = unmaskedContext;
+            oldProps = unmaskedContext.unstable_observedBits;
+            if (void 0 === oldProps || null === oldProps) oldProps = 1073741823;
+            workInProgress.stateNode = oldProps;
+            0 !== (updateQueue & oldProps) &&
+              propagateContextChange(
+                workInProgress,
+                fn,
+                updateQueue,
+                renderExpirationTime
+              );
+            renderExpirationTime = unmaskedContext.children;
+            renderExpirationTime = renderExpirationTime(props);
+            reconcileChildren(current, workInProgress, renderExpirationTime);
+            current = workInProgress.child;
+          } else
+            current = bailoutOnAlreadyFinishedWork(current, workInProgress);
           return current;
         default:
           invariant(
@@ -4023,7 +3963,13 @@ function ReactFiberBeginWork(
     }
   };
 }
-function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
+function ReactFiberCompleteWork(
+  config,
+  hostContext,
+  legacyContext,
+  newContext,
+  hydrationContext
+) {
   function markUpdate(workInProgress) {
     workInProgress.effectTag |= 4;
   }
@@ -4037,6 +3983,9 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer,
+    popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popProvider = newContext.popProvider,
     prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -4065,7 +4014,7 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           return null;
         case 2:
           return (
-            popContextProvider(workInProgress),
+            popLegacyContextProvider(workInProgress),
             (current = workInProgress.stateNode),
             (newProps = workInProgress.updateQueue),
             null !== newProps &&
@@ -4078,8 +4027,7 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           );
         case 3:
           popHostContainer(workInProgress);
-          pop(didPerformWorkStackCursor, workInProgress);
-          pop(contextStackCursor, workInProgress);
+          popTopLevelLegacyContextObject(workInProgress);
           newProps = workInProgress.stateNode;
           newProps.pendingContext &&
             ((newProps.context = newProps.pendingContext),
@@ -4263,6 +4211,8 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           return (workInProgress.tag = 7), null;
         case 9:
           return null;
+        case 14:
+          return null;
         case 10:
           return null;
         case 11:
@@ -4293,11 +4243,16 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
 }
 function ReactFiberUnwindWork(
   hostContext,
+  legacyContext,
+  newContext,
   scheduleWork,
   isAlreadyFailedLegacyErrorBoundary
 ) {
   var popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext;
+    popHostContext = hostContext.popHostContext,
+    popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popProvider = newContext.popProvider;
   return {
     throwException: function(returnFiber, sourceFiber, rawValue) {
       sourceFiber.effectTag |= 512;
@@ -4341,7 +4296,7 @@ function ReactFiberUnwindWork(
     unwindWork: function(workInProgress) {
       switch (workInProgress.tag) {
         case 2:
-          popContextProvider(workInProgress);
+          popLegacyContextProvider(workInProgress);
           var effectTag = workInProgress.effectTag;
           return effectTag & 1024
             ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4350,8 +4305,7 @@ function ReactFiberUnwindWork(
         case 3:
           return (
             popHostContainer(workInProgress),
-            pop(didPerformWorkStackCursor, workInProgress),
-            pop(contextStackCursor, workInProgress),
+            popTopLevelLegacyContextObject(workInProgress),
             (effectTag = workInProgress.effectTag),
             effectTag & 1024
               ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4367,6 +4321,25 @@ function ReactFiberUnwindWork(
         default:
           return null;
       }
+    },
+    unwindInterruptedWork: function(interruptedWork) {
+      switch (interruptedWork.tag) {
+        case 2:
+          popLegacyContextProvider(interruptedWork);
+          break;
+        case 3:
+          popHostContainer(interruptedWork);
+          popTopLevelLegacyContextObject(interruptedWork);
+          break;
+        case 5:
+          popHostContext(interruptedWork);
+          break;
+        case 4:
+          popHostContainer(interruptedWork);
+          break;
+        case 13:
+          popProvider(interruptedWork);
+      }
     }
   };
 }
@@ -4375,9 +4348,9 @@ function logError(boundary, errorInfo) {
     stack = errorInfo.stack;
   null === stack && (stack = getStackAddendumByWorkInProgressFiber(source));
   null !== source && getComponentName(source);
+  source = null !== stack ? stack : "";
   errorInfo = errorInfo.value;
-  stack = null !== stack ? stack : "";
-  null !== boundary && getComponentName(boundary);
+  null !== boundary && 2 === boundary.tag && getComponentName(boundary);
   try {
     if (errorInfo instanceof Error) {
       var message = errorInfo.message,
@@ -4387,13 +4360,13 @@ function logError(boundary, errorInfo) {
         errorToHandle.message =
           (message ? name + ": " + message : name) +
           "\n\nThis error is located at:" +
-          stack;
+          source;
       } catch (e) {}
     } else
       errorToHandle =
         "string" === typeof errorInfo
-          ? Error(errorInfo + "\n\nThis error is located at:" + stack)
-          : Error("Unspecified error at:" + stack);
+          ? Error(errorInfo + "\n\nThis error is located at:" + source)
+          : Error("Unspecified error at:" + source);
     ExceptionsManager.handleException(errorToHandle, !1);
   } catch (e) {
     (e && e.suppressReactErrorLogging) || console.error(e);
@@ -4415,19 +4388,19 @@ function ReactFiberCommitWork(
         } catch (refError) {
           captureError(current, refError);
         }
-      else ref.value = null;
+      else ref.current = null;
   }
   function commitUnmount(current) {
     "function" === typeof onCommitUnmount && onCommitUnmount(current);
     switch (current.tag) {
       case 2:
         safelyDetachRef(current);
-        var _instance6 = current.stateNode;
-        if ("function" === typeof _instance6.componentWillUnmount)
+        var _instance7 = current.stateNode;
+        if ("function" === typeof _instance7.componentWillUnmount)
           try {
-            (_instance6.props = current.memoizedProps),
-              (_instance6.state = current.memoizedState),
-              _instance6.componentWillUnmount();
+            (_instance7.props = current.memoizedProps),
+              (_instance7.state = current.memoizedState),
+              _instance7.componentWillUnmount();
           } catch (unmountError) {
             captureError(current, unmountError);
           }
@@ -4537,6 +4510,34 @@ function ReactFiberCommitWork(
     removeChild = mutation.removeChild,
     removeChildFromContainer = mutation.removeChildFromContainer;
   return {
+    commitBeforeMutationLifeCycles: function(current, finishedWork) {
+      switch (finishedWork.tag) {
+        case 2:
+          if (finishedWork.effectTag & 2048 && null !== current) {
+            var prevProps = current.memoizedProps,
+              prevState = current.memoizedState;
+            current = finishedWork.stateNode;
+            current.props = finishedWork.memoizedProps;
+            current.state = finishedWork.memoizedState;
+            finishedWork = current.getSnapshotBeforeUpdate(
+              prevProps,
+              prevState
+            );
+            current.__reactInternalSnapshotBeforeUpdate = finishedWork;
+          }
+          break;
+        case 3:
+        case 5:
+        case 6:
+        case 4:
+          break;
+        default:
+          invariant(
+            !1,
+            "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+          );
+      }
+    },
     commitResetTextContent: function(current) {
       resetTextContent(current.stateNode);
     },
@@ -4642,8 +4643,8 @@ function ReactFiberCommitWork(
         case 2:
           break;
         case 5:
-          var _instance7 = finishedWork.stateNode;
-          if (null != _instance7) {
+          var _instance8 = finishedWork.stateNode;
+          if (null != _instance8) {
             var newProps = finishedWork.memoizedProps;
             current = null !== current ? current.memoizedProps : newProps;
             var type = finishedWork.type,
@@ -4651,7 +4652,7 @@ function ReactFiberCommitWork(
             finishedWork.updateQueue = null;
             null !== updatePayload &&
               commitUpdate(
-                _instance7,
+                _instance8,
                 updatePayload,
                 type,
                 current,
@@ -4665,11 +4666,11 @@ function ReactFiberCommitWork(
             null !== finishedWork.stateNode,
             "This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue."
           );
-          _instance7 = finishedWork.memoizedProps;
+          _instance8 = finishedWork.memoizedProps;
           commitTextUpdate(
             finishedWork.stateNode,
-            null !== current ? current.memoizedProps : _instance7,
-            _instance7
+            null !== current ? current.memoizedProps : _instance8,
+            _instance8
           );
           break;
         case 3:
@@ -4695,7 +4696,11 @@ function ReactFiberCommitWork(
               current = current.memoizedState;
               finishedRoot.props = finishedWork.memoizedProps;
               finishedRoot.state = finishedWork.memoizedState;
-              finishedRoot.componentDidUpdate(prevProps, current);
+              finishedRoot.componentDidUpdate(
+                prevProps,
+                current,
+                finishedRoot.__reactInternalSnapshotBeforeUpdate
+              );
             }
           finishedWork = finishedWork.updateQueue;
           null !== finishedWork && commitCallbacks(finishedWork, finishedRoot);
@@ -4757,9 +4762,12 @@ function ReactFiberCommitWork(
           onUncaughtError.state = finishedWork.memoizedState;
           for (ctor = 0; ctor < capturedErrors.length; ctor++) {
             updateQueue = capturedErrors[ctor];
-            var _error = updateQueue.value;
+            var _error = updateQueue.value,
+              stack = updateQueue.stack;
             logError(finishedWork, updateQueue);
-            onUncaughtError.componentDidCatch(_error);
+            onUncaughtError.componentDidCatch(_error, {
+              componentStack: null !== stack ? stack : ""
+            });
           }
           break;
         case 3:
@@ -4785,17 +4793,17 @@ function ReactFiberCommitWork(
     commitAttachRef: function(finishedWork) {
       var ref = finishedWork.ref;
       if (null !== ref) {
-        var _instance5 = finishedWork.stateNode;
+        var _instance6 = finishedWork.stateNode;
         switch (finishedWork.tag) {
           case 5:
-            finishedWork = getPublicInstance(_instance5);
+            finishedWork = getPublicInstance(_instance6);
             break;
           default:
-            finishedWork = _instance5;
+            finishedWork = _instance6;
         }
         "function" === typeof ref
           ? ref(finishedWork)
-          : (ref.value = finishedWork);
+          : (ref.current = finishedWork);
       }
     },
     commitDetachRef: function(current) {
@@ -4803,12 +4811,12 @@ function ReactFiberCommitWork(
       null !== current &&
         ("function" === typeof current
           ? current(null)
-          : (current.value = null));
+          : (current.current = null));
     }
   };
 }
 var NO_CONTEXT = {};
-function ReactFiberHostContext(config) {
+function ReactFiberHostContext(config, stack) {
   function requiredContext(c) {
     invariant(
       c !== NO_CONTEXT,
@@ -4817,10 +4825,13 @@ function ReactFiberHostContext(config) {
     return c;
   }
   var getChildHostContext = config.getChildHostContext,
-    getRootHostContext = config.getRootHostContext,
-    contextStackCursor = { current: NO_CONTEXT },
-    contextFiberStackCursor = { current: NO_CONTEXT },
-    rootInstanceStackCursor = { current: NO_CONTEXT };
+    getRootHostContext = config.getRootHostContext;
+  config = stack.createCursor;
+  var push = stack.push,
+    pop = stack.pop,
+    contextStackCursor = config(NO_CONTEXT),
+    contextFiberStackCursor = config(NO_CONTEXT),
+    rootInstanceStackCursor = config(NO_CONTEXT);
   return {
     getHostContext: function() {
       return requiredContext(contextStackCursor.current);
@@ -4839,8 +4850,10 @@ function ReactFiberHostContext(config) {
     },
     pushHostContainer: function(fiber, nextRootInstance) {
       push(rootInstanceStackCursor, nextRootInstance, fiber);
-      nextRootInstance = getRootHostContext(nextRootInstance);
       push(contextFiberStackCursor, fiber, fiber);
+      push(contextStackCursor, NO_CONTEXT, fiber);
+      nextRootInstance = getRootHostContext(nextRootInstance);
+      pop(contextStackCursor, fiber);
       push(contextStackCursor, nextRootInstance, fiber);
     },
     pushHostContext: function(fiber) {
@@ -4850,10 +4863,6 @@ function ReactFiberHostContext(config) {
       context !== rootInstance &&
         (push(contextFiberStackCursor, fiber, fiber),
         push(contextStackCursor, rootInstance, fiber));
-    },
-    resetHostContainer: function() {
-      contextStackCursor.current = NO_CONTEXT;
-      rootInstanceStackCursor.current = NO_CONTEXT;
     }
   };
 }
@@ -5013,22 +5022,198 @@ function ReactFiberHydrationContext(config) {
     }
   };
 }
-function ReactFiberScheduler(config) {
-  function resetContextStack() {
-    for (; -1 < index; ) (valueStack[index] = null), index--;
+function ReactFiberLegacyContext(stack) {
+  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+    workInProgress = workInProgress.stateNode;
+    workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    workInProgress.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  }
+  function isContextProvider(fiber) {
+    return 2 === fiber.tag && null != fiber.type.childContextTypes;
+  }
+  function processChildContext(fiber, parentContext) {
+    var instance = fiber.stateNode,
+      childContextTypes = fiber.type.childContextTypes;
+    if ("function" !== typeof instance.getChildContext) return parentContext;
+    instance = instance.getChildContext();
+    for (var contextKey in instance)
+      invariant(
+        contextKey in childContextTypes,
+        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+        getComponentName(fiber) || "Unknown",
+        contextKey
+      );
+    return Object.assign({}, parentContext, instance);
+  }
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop,
+    contextStackCursor = createCursor(emptyObject),
+    didPerformWorkStackCursor = createCursor(!1),
     previousContext = emptyObject;
-    contextStackCursor.current = emptyObject;
-    didPerformWorkStackCursor.current = !1;
-    resetHostContainer();
-    for (var i = index$1; -1 < i; i--) {
-      var context = stack[i].type.context;
-      context._currentValue = context._defaultValue;
-      context._changedBits = 0;
-      changedBitsStack[i] = null;
-      currentValueStack[i] = null;
-      stack[i] = null;
+  return {
+    getUnmaskedContext: function(workInProgress) {
+      return isContextProvider(workInProgress)
+        ? previousContext
+        : contextStackCursor.current;
+    },
+    cacheContext: cacheContext,
+    getMaskedContext: function(workInProgress, unmaskedContext) {
+      var contextTypes = workInProgress.type.contextTypes;
+      if (!contextTypes) return emptyObject;
+      var instance = workInProgress.stateNode;
+      if (
+        instance &&
+        instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+      )
+        return instance.__reactInternalMemoizedMaskedChildContext;
+      var context = {},
+        key;
+      for (key in contextTypes) context[key] = unmaskedContext[key];
+      instance && cacheContext(workInProgress, unmaskedContext, context);
+      return context;
+    },
+    hasContextChanged: function() {
+      return didPerformWorkStackCursor.current;
+    },
+    isContextConsumer: function(fiber) {
+      return 2 === fiber.tag && null != fiber.type.contextTypes;
+    },
+    isContextProvider: isContextProvider,
+    popContextProvider: function(fiber) {
+      isContextProvider(fiber) &&
+        (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
+    },
+    popTopLevelContextObject: function(fiber) {
+      pop(didPerformWorkStackCursor, fiber);
+      pop(contextStackCursor, fiber);
+    },
+    pushTopLevelContextObject: function(fiber, context, didChange) {
+      invariant(
+        null == contextStackCursor.cursor,
+        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
+      );
+      push(contextStackCursor, context, fiber);
+      push(didPerformWorkStackCursor, didChange, fiber);
+    },
+    processChildContext: processChildContext,
+    pushContextProvider: function(workInProgress) {
+      if (!isContextProvider(workInProgress)) return !1;
+      var instance = workInProgress.stateNode;
+      instance =
+        (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+        emptyObject;
+      previousContext = contextStackCursor.current;
+      push(contextStackCursor, instance, workInProgress);
+      push(
+        didPerformWorkStackCursor,
+        didPerformWorkStackCursor.current,
+        workInProgress
+      );
+      return !0;
+    },
+    invalidateContextProvider: function(workInProgress, didChange) {
+      var instance = workInProgress.stateNode;
+      invariant(
+        instance,
+        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+      );
+      if (didChange) {
+        var mergedContext = processChildContext(
+          workInProgress,
+          previousContext
+        );
+        instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+        pop(didPerformWorkStackCursor, workInProgress);
+        pop(contextStackCursor, workInProgress);
+        push(contextStackCursor, mergedContext, workInProgress);
+      } else pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    },
+    findCurrentUnmaskedContext: function(fiber) {
+      for (
+        invariant(
+          2 === isFiberMountedImpl(fiber) && 2 === fiber.tag,
+          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+        );
+        3 !== fiber.tag;
+
+      ) {
+        if (isContextProvider(fiber))
+          return fiber.stateNode.__reactInternalMemoizedMergedChildContext;
+        fiber = fiber["return"];
+        invariant(
+          fiber,
+          "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
+      return fiber.stateNode.context;
+    }
+  };
+}
+function ReactFiberNewContext(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop,
+    providerCursor = createCursor(null),
+    valueCursor = createCursor(null),
+    changedBitsCursor = createCursor(0);
+  return {
+    pushProvider: function(providerFiber) {
+      var context = providerFiber.type._context;
+      push(changedBitsCursor, context._changedBits, providerFiber);
+      push(valueCursor, context._currentValue, providerFiber);
+      push(providerCursor, providerFiber, providerFiber);
+      context._currentValue = providerFiber.pendingProps.value;
+      context._changedBits = providerFiber.stateNode;
+    },
+    popProvider: function(providerFiber) {
+      var changedBits = changedBitsCursor.current,
+        currentValue = valueCursor.current;
+      pop(providerCursor, providerFiber);
+      pop(valueCursor, providerFiber);
+      pop(changedBitsCursor, providerFiber);
+      providerFiber = providerFiber.type._context;
+      providerFiber._currentValue = currentValue;
+      providerFiber._changedBits = changedBits;
     }
-    index$1 = -1;
+  };
+}
+function ReactFiberStack() {
+  var valueStack = [],
+    index = -1;
+  return {
+    createCursor: function(defaultValue) {
+      return { current: defaultValue };
+    },
+    isEmpty: function() {
+      return -1 === index;
+    },
+    pop: function(cursor) {
+      0 > index ||
+        ((cursor.current = valueStack[index]),
+        (valueStack[index] = null),
+        index--);
+    },
+    push: function(cursor, value) {
+      index++;
+      valueStack[index] = cursor.current;
+      cursor.current = value;
+    },
+    checkThatStackIsEmpty: function() {},
+    resetStackAfterFatalErrorInDev: function() {}
+  };
+}
+function ReactFiberScheduler(config) {
+  function resetStack() {
+    if (null !== nextUnitOfWork)
+      for (
+        var interruptedWork = nextUnitOfWork["return"];
+        null !== interruptedWork;
+
+      )
+        unwindInterruptedWork(interruptedWork),
+          (interruptedWork = interruptedWork["return"]);
     nextRoot = null;
     nextRenderExpirationTime = 0;
     nextUnitOfWork = null;
@@ -5101,7 +5286,7 @@ function ReactFiberScheduler(config) {
         workInProgress$jscomp$0 = unwindWork(workInProgress$jscomp$0);
         if (null !== workInProgress$jscomp$0)
           return (
-            (workInProgress$jscomp$0.effectTag &= 511), workInProgress$jscomp$0
+            (workInProgress$jscomp$0.effectTag &= 2559), workInProgress$jscomp$0
           );
         null !== returnFiber &&
           ((returnFiber.firstEffect = returnFiber.lastEffect = null),
@@ -5134,7 +5319,7 @@ function ReactFiberScheduler(config) {
       root !== nextRoot ||
       null === nextUnitOfWork
     )
-      resetContextStack(),
+      resetStack(),
         (nextRoot = root),
         (nextRenderExpirationTime = expirationTime),
         (nextUnitOfWork = createWorkInProgress(
@@ -5264,8 +5449,8 @@ function ReactFiberScheduler(config) {
             !isWorking &&
               0 !== nextRenderExpirationTime &&
               expirationTime < nextRenderExpirationTime &&
-              resetContextStack();
-            (nextRoot === root && isWorking) ||
+              resetStack();
+            (isWorking && !isCommitting && nextRoot === root) ||
               requestWork(root, expirationTime);
             nestedUpdateCount > NESTED_UPDATE_LIMIT &&
               invariant(
@@ -5329,7 +5514,7 @@ function ReactFiberScheduler(config) {
           (nextFlushedExpirationTime = 1),
           performWorkOnRoot(root, 1, !1))
         : 1 === expirationTime
-          ? performWork(1, !1, null)
+          ? performSyncWork()
           : scheduleCallbackWithExpiration(expirationTime));
   }
   function findHighestPriorityRoot() {
@@ -5389,6 +5574,9 @@ function ReactFiberScheduler(config) {
   function performAsyncWork(dl) {
     performWork(0, !0, dl);
   }
+  function performSyncWork() {
+    performWork(1, !1, null);
+  }
   function performWork(minExpirationTime, isAsync, dl) {
     deadline = dl;
     findHighestPriorityRoot();
@@ -5511,6 +5699,25 @@ function ReactFiberScheduler(config) {
     for (nextEffect = firstEffect; null !== nextEffect; ) {
       var didError = !1,
         error = void 0;
+      try {
+        for (; null !== nextEffect; )
+          nextEffect.effectTag & 2048 &&
+            commitBeforeMutationLifeCycles(nextEffect.alternate, nextEffect),
+            (nextEffect = nextEffect.nextEffect);
+      } catch (e) {
+        (didError = !0), (error = e);
+      }
+      didError &&
+        (invariant(
+          null !== nextEffect,
+          "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
+        ),
+        onCommitPhaseError(nextEffect, error),
+        null !== nextEffect && (nextEffect = nextEffect.nextEffect));
+    }
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
+      didError = !1;
+      error = void 0;
       try {
         for (; null !== nextEffect; ) {
           var effectTag = nextEffect.effectTag;
@@ -5608,25 +5815,37 @@ function ReactFiberScheduler(config) {
     nextFlushedRoot.remainingExpirationTime = 0;
     hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
   }
-  var hostContext = ReactFiberHostContext(config),
-    hydrationContext = ReactFiberHydrationContext(config),
-    resetHostContainer = hostContext.resetHostContainer,
+  var stack = ReactFiberStack(),
+    hostContext = ReactFiberHostContext(config, stack),
+    legacyContext = ReactFiberLegacyContext(stack);
+  stack = ReactFiberNewContext(stack);
+  var hydrationContext = ReactFiberHydrationContext(config),
     beginWork = ReactFiberBeginWork(
       config,
       hostContext,
+      legacyContext,
+      stack,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
     ).beginWork,
-    completeWork = ReactFiberCompleteWork(config, hostContext, hydrationContext)
-      .completeWork;
+    completeWork = ReactFiberCompleteWork(
+      config,
+      hostContext,
+      legacyContext,
+      stack,
+      hydrationContext
+    ).completeWork;
   hostContext = ReactFiberUnwindWork(
     hostContext,
+    legacyContext,
+    stack,
     scheduleWork,
     isAlreadyFailedLegacyErrorBoundary
   );
   var throwException = hostContext.throwException,
-    unwindWork = hostContext.unwindWork;
+    unwindWork = hostContext.unwindWork,
+    unwindInterruptedWork = hostContext.unwindInterruptedWork;
   hostContext = ReactFiberCommitWork(
     config,
     onCommitPhaseError,
@@ -5639,7 +5858,9 @@ function ReactFiberScheduler(config) {
     },
     recalculateCurrentTime
   );
-  var commitResetTextContent = hostContext.commitResetTextContent,
+  var commitBeforeMutationLifeCycles =
+      hostContext.commitBeforeMutationLifeCycles,
+    commitResetTextContent = hostContext.commitResetTextContent,
     commitPlacement = hostContext.commitPlacement,
     commitDeletion = hostContext.commitDeletion,
     commitWork = hostContext.commitWork,
@@ -5694,7 +5915,10 @@ function ReactFiberScheduler(config) {
         !isRendering,
         "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
       );
+      nextFlushedRoot = root;
+      nextFlushedExpirationTime = expirationTime;
       performWorkOnRoot(root, expirationTime, !1);
+      performSyncWork();
       finishRendering();
     },
     batchedUpdates: function(fn, a) {
@@ -5705,7 +5929,7 @@ function ReactFiberScheduler(config) {
       } finally {
         (isBatchingUpdates = previousIsBatchingUpdates) ||
           isRendering ||
-          performWork(1, !1, null);
+          performSyncWork();
       }
     },
     unbatchedUpdates: function(fn, a) {
@@ -5729,8 +5953,7 @@ function ReactFiberScheduler(config) {
       try {
         return syncUpdates(fn, a);
       } finally {
-        (isBatchingUpdates = previousIsBatchingUpdates),
-          performWork(1, !1, null);
+        (isBatchingUpdates = previousIsBatchingUpdates), performSyncWork();
       }
     },
     flushControlled: function(fn) {
@@ -5771,7 +5994,7 @@ function ReactFiberScheduler(config) {
         (isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates),
           (isBatchingUpdates = previousIsBatchingUpdates) ||
             isRendering ||
-            performWork(1, !1, null);
+            performSyncWork();
       }
     },
     flushInteractiveUpdates: function() {
@@ -5785,7 +6008,8 @@ function ReactFiberScheduler(config) {
       result <= lastUniqueAsyncExpiration &&
         (result = lastUniqueAsyncExpiration + 1);
       return (lastUniqueAsyncExpiration = result);
-    }
+    },
+    legacyContext: legacyContext
   };
 }
 function ReactFiberReconciler$1(config) {
@@ -5800,27 +6024,7 @@ function ReactFiberReconciler$1(config) {
     currentTime = container.current;
     if (parentComponent) {
       parentComponent = parentComponent._reactInternalFiber;
-      var parentContext;
-      b: {
-        invariant(
-          2 === isFiberMountedImpl(parentComponent) &&
-            2 === parentComponent.tag,
-          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-        );
-        for (parentContext = parentComponent; 3 !== parentContext.tag; ) {
-          if (isContextProvider(parentContext)) {
-            parentContext =
-              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
-            break b;
-          }
-          parentContext = parentContext["return"];
-          invariant(
-            parentContext,
-            "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-          );
-        }
-        parentContext = parentContext.stateNode.context;
-      }
+      var parentContext = findCurrentUnmaskedContext(parentComponent);
       parentComponent = isContextProvider(parentComponent)
         ? processChildContext(parentComponent, parentContext)
         : parentContext;
@@ -5849,7 +6053,11 @@ function ReactFiberReconciler$1(config) {
   config = ReactFiberScheduler(config);
   var recalculateCurrentTime = config.recalculateCurrentTime,
     computeExpirationForFiber = config.computeExpirationForFiber,
-    scheduleWork = config.scheduleWork;
+    scheduleWork = config.scheduleWork,
+    legacyContext = config.legacyContext,
+    findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
+    isContextProvider = legacyContext.isContextProvider,
+    processChildContext = legacyContext.processChildContext;
   return {
     createContainer: function(containerInfo, isAsync, hydrate) {
       isAsync = new FiberNode(3, null, null, isAsync ? 3 : 0);
@@ -6018,7 +6226,8 @@ var ReactFiberReconciler$2 = Object.freeze({ default: ReactFiberReconciler$1 }),
   frameDeadlineObject = {
     timeRemaining: function() {
       return frameDeadline - now();
-    }
+    },
+    didTimeout: !1
   };
 function setTimeoutCallback() {
   frameDeadline = now() + 5;
@@ -6352,7 +6561,7 @@ NativeRenderer.injectIntoDevTools({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.3.0-alpha.1",
+  version: "16.3.1",
   rendererPackageName: "react-native-renderer"
 });
 var ReactNativeRenderer$2 = Object.freeze({ default: ReactNativeRenderer }),
diff --git a/Libraries/Renderer/shims/ReactTypes.js b/Libraries/Renderer/shims/ReactTypes.js
index bede9f00e30069..87a769a148c95d 100644
--- a/Libraries/Renderer/shims/ReactTypes.js
+++ b/Libraries/Renderer/shims/ReactTypes.js
@@ -62,7 +62,7 @@ export type ReactProvider<T> = {
 
 export type ReactProviderType<T> = {
   $$typeof: Symbol | number,
-  context: ReactContext<T>,
+  _context: ReactContext<T>,
 };
 
 export type ReactConsumer<T> = {
@@ -72,7 +72,7 @@ export type ReactConsumer<T> = {
   ref: null,
   props: {
     children: (value: T) => ReactNodeList,
-    bits?: number,
+    unstable_observedBits?: number,
   },
 };
 
diff --git a/package.json b/package.json
index 8dda61d84ae124..4f4f558451100f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.55.0",
+  "version": "1000.0.0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -127,22 +127,22 @@
     "lint": "eslint .",
     "prettier": "find . -name node_modules -prune -or -name '*.js' -print | xargs prettier --write",
     "start": "/usr/bin/env bash -c './scripts/packager.sh \"$@\" || true' --",
-    "test-android-setup": "docker pull hramos/android-base:latest",
-    "test-android-build-base": "docker build -t hramos/android-base -f ContainerShip/Dockerfile.android-base .",
-    "test-android-build": "docker build -t react/android -f ContainerShip/Dockerfile.android .",
+    "docker-setup-android": "docker pull hramos/android-base:latest",
+    "docker-build-android-base": "docker build -t hramos/android-base -f ContainerShip/Dockerfile.android-base .",
+    "docker-build-android": "docker build -t react/android -f ContainerShip/Dockerfile.android .",
     "test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it react/android bash ContainerShip/scripts/run-android-docker-instrumentation-tests.sh",
     "test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it react/android bash ContainerShip/scripts/run-android-docker-unit-tests.sh",
     "test-android-run-e2e": "docker run --privileged -it react/android bash ContainerShip/scripts/run-ci-e2e-tests.sh --android --js",
-    "test-android-all": "npm run test-android-build && npm run test-android-run-unit && npm run test-android-run-instrumentation && npm run test-android-run-e2e",
-    "test-android-instrumentation": "npm run test-android-build && npm run test-android-run-instrumentation",
-    "test-android-unit": "npm run test-android-build && npm run test-android-run-unit",
-    "test-android-e2e": "npm run test-android-build && npm run test-android-run-e2e"
+    "test-android-all": "yarn run docker-build-android && yarn run test-android-run-unit && yarn run test-android-run-instrumentation && yarn run test-android-run-e2e",
+    "test-android-instrumentation": "yarn run docker-build-android && yarn run test-android-run-instrumentation",
+    "test-android-unit": "yarn run docker-build-android && yarn run test-android-run-unit",
+    "test-android-e2e": "yarn run docker-build-android && yarn run test-android-run-e2e"
   },
   "bin": {
     "react-native": "local-cli/wrong-react-native.js"
   },
   "peerDependencies": {
-    "react": "^16.3.0-alpha.0"
+    "react": "16.3.1"
   },
   "dependencies": {
     "absolute-path": "^0.0.0",
@@ -175,8 +175,8 @@
     "graceful-fs": "^4.1.3",
     "inquirer": "^3.0.6",
     "lodash": "^4.17.5",
-    "metro": "^0.30.0",
-    "metro-core": "^0.30.0",
+    "metro": "^0.31.0",
+    "metro-core": "^0.31.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
@@ -215,13 +215,13 @@
     "eslint-plugin-jest": "21.8.0",
     "eslint-plugin-prettier": "2.6.0",
     "eslint-plugin-react": "7.6.1",
-    "flow-bin": "^0.67.1",
-    "jest": "22.4.2",
+    "flow-bin": "^0.69.0",
+    "jest": "23.0.0-alpha.4",
     "jest-junit": "3.6.0",
     "prettier": "1.9.1",
-    "react": "^16.3.0-alpha.1",
-    "react-test-renderer": "^16.3.0-alpha.1",
+    "react": "16.3.1",
+    "react-test-renderer": "16.3.1",
     "shelljs": "^0.7.8",
     "sinon": "^2.2.0"
   }
-}
\ No newline at end of file
+}

From b1bddd79523f13ff576738307e15e0aa77e593c8 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Thu, 5 Apr 2018 23:45:58 +0200
Subject: [PATCH 251/267] Revert "React sync for revisions 9d484ed...1c2876d"

This reverts commit 54f23f4b3c487cf516dc92262d0d87efaf2131dc.
---
 Libraries/Renderer/REVISION                   |     2 +-
 Libraries/Renderer/ReactFabric-dev.js         | 13410 ++++++++-------
 Libraries/Renderer/ReactFabric-prod.js        |  1023 +-
 Libraries/Renderer/ReactNativeRenderer-dev.js | 13467 ++++++++--------
 .../Renderer/ReactNativeRenderer-prod.js      |  1087 +-
 Libraries/Renderer/shims/ReactTypes.js        |     4 +-
 package.json                                  |    32 +-
 7 files changed, 13701 insertions(+), 15324 deletions(-)

diff --git a/Libraries/Renderer/REVISION b/Libraries/Renderer/REVISION
index fc81a7c7f28c85..824ff8c33a4c4f 100644
--- a/Libraries/Renderer/REVISION
+++ b/Libraries/Renderer/REVISION
@@ -1 +1 @@
-1c2876d5b558b8591feb335d8d7204bc46f7da8a
\ No newline at end of file
+ad9544f48e58f2599a8ea0de1e9f4dd104db30bb
\ No newline at end of file
diff --git a/Libraries/Renderer/ReactFabric-dev.js b/Libraries/Renderer/ReactFabric-dev.js
index 0b7a78516c11ba..867873cd41d55b 100644
--- a/Libraries/Renderer/ReactFabric-dev.js
+++ b/Libraries/Renderer/ReactFabric-dev.js
@@ -25,8 +25,8 @@ var deepDiffer = require("deepDiffer");
 var flattenStyle = require("flattenStyle");
 var React = require("react");
 var emptyObject = require("fbjs/lib/emptyObject");
-var shallowEqual = require("fbjs/lib/shallowEqual");
 var checkPropTypes = require("prop-types/checkPropTypes");
+var shallowEqual = require("fbjs/lib/shallowEqual");
 var deepFreezeAndThrowOnMutationInDev = require("deepFreezeAndThrowOnMutationInDev");
 var FabricUIManager = require("FabricUIManager");
 
@@ -509,13 +509,11 @@ var injection$1 = {
     getNodeFromInstance = Injected.getNodeFromInstance;
 
     {
-      !(getNodeFromInstance && getInstanceFromNode)
-        ? warning(
-            false,
-            "EventPluginUtils.injection.injectComponentTree(...): Injected " +
-              "module is missing getNodeFromInstance or getInstanceFromNode."
-          )
-        : void 0;
+      warning(
+        getNodeFromInstance && getInstanceFromNode,
+        "EventPluginUtils.injection.injectComponentTree(...): Injected " +
+          "module is missing getNodeFromInstance or getInstanceFromNode."
+      );
     }
   }
 };
@@ -551,9 +549,10 @@ var validateEventDispatches = void 0;
       ? dispatchInstances.length
       : dispatchInstances ? 1 : 0;
 
-    !(instancesIsArr === listenersIsArr && instancesLen === listenersLen)
-      ? warning(false, "EventPluginUtils: Invalid `event`.")
-      : void 0;
+    warning(
+      instancesIsArr === listenersIsArr && instancesLen === listenersLen,
+      "EventPluginUtils: Invalid `event`."
+    );
   };
 }
 
@@ -811,7 +810,6 @@ var Fragment = 10;
 var Mode = 11;
 var ContextConsumer = 12;
 var ContextProvider = 13;
-var ForwardRef = 14;
 
 function getParent(inst) {
   do {
@@ -940,7 +938,7 @@ function listenerAtPhase(inst, event, propagationPhase) {
  */
 function accumulateDirectionalDispatches(inst, phase, event) {
   {
-    !inst ? warning(false, "Dispatching inst must not be null") : void 0;
+    warning(inst, "Dispatching inst must not be null");
   }
   var listener = listenerAtPhase(inst, event, phase);
   if (listener) {
@@ -1259,15 +1257,13 @@ SyntheticEvent.extend = function(Interface) {
               !target.constructor.Interface.hasOwnProperty(prop) &&
               shouldBeReleasedProperties.indexOf(prop) === -1
             ) {
-              !(didWarnForAddedNewProperty || target.isPersistent())
-                ? warning(
-                    false,
-                    "This synthetic event is reused for performance reasons. If you're " +
-                      "seeing this, you're adding a new property in the synthetic event object. " +
-                      "The property is never released. See " +
-                      "https://fb.me/react-event-pooling for more information."
-                  )
-                : void 0;
+              warning(
+                didWarnForAddedNewProperty || target.isPersistent(),
+                "This synthetic event is reused for performance reasons. If you're " +
+                  "seeing this, you're adding a new property in the synthetic event object. " +
+                  "The property is never released. See " +
+                  "https://fb.me/react-event-pooling for more information."
+              );
               didWarnForAddedNewProperty = true;
             }
             target[prop] = value;
@@ -1314,18 +1310,16 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
 
   function warn(action, result) {
     var warningCondition = false;
-    !warningCondition
-      ? warning(
-          false,
-          "This synthetic event is reused for performance reasons. If you're seeing this, " +
-            "you're %s `%s` on a released/nullified synthetic event. %s. " +
-            "If you must keep the original synthetic event around, use event.persist(). " +
-            "See https://fb.me/react-event-pooling for more information.",
-          action,
-          propName,
-          result
-        )
-      : void 0;
+    warning(
+      warningCondition,
+      "This synthetic event is reused for performance reasons. If you're seeing this, " +
+        "you're %s `%s` on a released/nullified synthetic event. %s. " +
+        "If you must keep the original synthetic event around, use event.persist(). " +
+        "See https://fb.me/react-event-pooling for more information.",
+      action,
+      propName,
+      result
+    );
   }
 }
 
@@ -1443,15 +1437,13 @@ function getTouchIdentifier(_ref) {
 
   invariant(identifier != null, "Touch object is missing identifier.");
   {
-    !(identifier <= MAX_TOUCH_BANK)
-      ? warning(
-          false,
-          "Touch identifier %s is greater than maximum supported %s which causes " +
-            "performance issues backfilling array locations for all of the indices.",
-          identifier,
-          MAX_TOUCH_BANK
-        )
-      : void 0;
+    warning(
+      identifier <= MAX_TOUCH_BANK,
+      "Touch identifier %s is greater than maximum supported %s which causes " +
+        "performance issues backfilling array locations for all of the indices.",
+      identifier,
+      MAX_TOUCH_BANK
+    );
   }
   return identifier;
 }
@@ -1550,9 +1542,10 @@ var ResponderTouchHistoryStore = {
         }
         {
           var activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
-          !(activeRecord != null && activeRecord.touchActive)
-            ? warning(false, "Cannot find single active touch.")
-            : void 0;
+          warning(
+            activeRecord != null && activeRecord.touchActive,
+            "Cannot find single active touch."
+          );
         }
       }
     }
@@ -2363,9 +2356,6 @@ var REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 0xeace;
 var REACT_ASYNC_MODE_TYPE = hasSymbol
   ? Symbol["for"]("react.async_mode")
   : 0xeacf;
-var REACT_FORWARD_REF_TYPE = hasSymbol
-  ? Symbol["for"]("react.forward_ref")
-  : 0xead0;
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
 var FAUX_ITERATOR_SYMBOL = "@@iterator";
@@ -2647,7 +2637,7 @@ var TouchHistoryMath = {
 
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.3.1";
+var ReactVersion = "16.3.0-alpha.1";
 
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -3317,17 +3307,15 @@ function findNodeHandle(componentOrHandle) {
   {
     var owner = ReactCurrentOwner.current;
     if (owner !== null && owner.stateNode !== null) {
-      !owner.stateNode._warnedAboutRefsInRender
-        ? warning(
-            false,
-            "%s is accessing findNodeHandle inside its render(). " +
-              "render() should be a pure function of props and state. It should " +
-              "never access something that requires stale data from the previous " +
-              "render, such as refs. Move this logic to componentDidMount and " +
-              "componentDidUpdate instead.",
-            getComponentName(owner) || "A component"
-          )
-        : void 0;
+      warning(
+        owner.stateNode._warnedAboutRefsInRender,
+        "%s is accessing findNodeHandle inside its render(). " +
+          "render() should be a pure function of props and state. It should " +
+          "never access something that requires stale data from the previous " +
+          "render, such as refs. Move this logic to componentDidMount and " +
+          "componentDidUpdate instead.",
+        getComponentName(owner) || "A component"
+      );
 
       owner.stateNode._warnedAboutRefsInRender = true;
     }
@@ -3785,8 +3773,7 @@ var frameDeadline = 0;
 var frameDeadlineObject = {
   timeRemaining: function() {
     return frameDeadline - now();
-  },
-  didTimeout: false
+  }
 };
 
 function setTimeoutCallback() {
@@ -3874,10 +3861,9 @@ var Callback = /*              */ 32;
 var DidCapture = /*            */ 64;
 var Ref = /*                   */ 128;
 var ErrLog = /*                */ 256;
-var Snapshot = /*              */ 2048;
 
 // Union of all host effects
-var HostEffectMask = /*        */ 2559;
+var HostEffectMask = /*        */ 511;
 
 var Incomplete = /*            */ 512;
 var ShouldCapture = /*         */ 1024;
@@ -3925,17 +3911,15 @@ function isMounted(component) {
     if (owner !== null && owner.tag === ClassComponent) {
       var ownerFiber = owner;
       var instance = ownerFiber.stateNode;
-      !instance._warnedAboutRefsInRender
-        ? warning(
-            false,
-            "%s is accessing isMounted inside its render() function. " +
-              "render() should be a pure function of props and state. It should " +
-              "never access something that requires stale data from the previous " +
-              "render, such as refs. Move this logic to componentDidMount and " +
-              "componentDidUpdate instead.",
-            getComponentName(ownerFiber) || "A component"
-          )
-        : void 0;
+      warning(
+        instance._warnedAboutRefsInRender,
+        "%s is accessing isMounted inside its render() function. " +
+          "render() should be a pure function of props and state. It should " +
+          "never access something that requires stale data from the previous " +
+          "render, such as refs. Move this logic to componentDidMount and " +
+          "componentDidUpdate instead.",
+        getComponentName(ownerFiber) || "A component"
+      );
       instance._warnedAboutRefsInRender = true;
     }
   }
@@ -4146,4069 +4130,3430 @@ function findCurrentHostFiberWithNoPortals(parent) {
   return null;
 }
 
-// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
-// Math.pow(2, 30) - 1
-// 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
-
-// TODO: Use an opaque type once ESLint et al support the syntax
-
-var NoWork = 0;
-var Sync = 1;
-var Never = MAX_SIGNED_31_BIT_INT;
-
-var UNIT_SIZE = 10;
-var MAGIC_NUMBER_OFFSET = 2;
-
-// 1 unit of expiration time represents 10ms.
-function msToExpirationTime(ms) {
-  // Always add an offset so that we don't clash with the magic number for NoWork.
-  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
-}
-
-function expirationTimeToMs(expirationTime) {
-  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
-}
-
-function ceiling(num, precision) {
-  return (((num / precision) | 0) + 1) * precision;
-}
-
-function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
-  return ceiling(
-    currentTime + expirationInMs / UNIT_SIZE,
-    bucketSizeMs / UNIT_SIZE
-  );
-}
-
-var NoContext = 0;
-var AsyncMode = 1;
-var StrictMode = 2;
+var valueStack = [];
 
-var hasBadMapPolyfill = void 0;
+var fiberStack = void 0;
 
 {
-  hasBadMapPolyfill = false;
-  try {
-    var nonExtensibleObject = Object.preventExtensions({});
-    var testMap = new Map([[nonExtensibleObject, null]]);
-    var testSet = new Set([nonExtensibleObject]);
-    // This is necessary for Rollup to not consider these unused.
-    // https://github.com/rollup/rollup/issues/1771
-    // TODO: we can remove these if Rollup fixes the bug.
-    testMap.set(0, 0);
-    testSet.add(0);
-  } catch (e) {
-    // TODO: Consider warning about bad polyfills
-    hasBadMapPolyfill = true;
-  }
+  fiberStack = [];
 }
 
-// A Fiber is work on a Component that needs to be done or was done. There can
-// be more than one per component.
-
-var debugCounter = void 0;
+var index = -1;
 
-{
-  debugCounter = 1;
+function createCursor(defaultValue) {
+  return {
+    current: defaultValue
+  };
 }
 
-function FiberNode(tag, pendingProps, key, mode) {
-  // Instance
-  this.tag = tag;
-  this.key = key;
-  this.type = null;
-  this.stateNode = null;
-
-  // Fiber
-  this["return"] = null;
-  this.child = null;
-  this.sibling = null;
-  this.index = 0;
+function pop(cursor, fiber) {
+  if (index < 0) {
+    {
+      warning(false, "Unexpected pop.");
+    }
+    return;
+  }
 
-  this.ref = null;
+  {
+    if (fiber !== fiberStack[index]) {
+      warning(false, "Unexpected Fiber popped.");
+    }
+  }
 
-  this.pendingProps = pendingProps;
-  this.memoizedProps = null;
-  this.updateQueue = null;
-  this.memoizedState = null;
+  cursor.current = valueStack[index];
 
-  this.mode = mode;
+  valueStack[index] = null;
 
-  // Effects
-  this.effectTag = NoEffect;
-  this.nextEffect = null;
+  {
+    fiberStack[index] = null;
+  }
 
-  this.firstEffect = null;
-  this.lastEffect = null;
+  index--;
+}
 
-  this.expirationTime = NoWork;
+function push(cursor, value, fiber) {
+  index++;
 
-  this.alternate = null;
+  valueStack[index] = cursor.current;
 
   {
-    this._debugID = debugCounter++;
-    this._debugSource = null;
-    this._debugOwner = null;
-    this._debugIsCurrentlyTiming = false;
-    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
-      Object.preventExtensions(this);
-    }
+    fiberStack[index] = fiber;
   }
-}
-
-// This is a constructor function, rather than a POJO constructor, still
-// please ensure we do the following:
-// 1) Nobody should add any instance methods on this. Instance methods can be
-//    more difficult to predict when they get optimized and they are almost
-//    never inlined properly in static compilers.
-// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
-//    always know when it is a fiber.
-// 3) We might want to experiment with using numeric keys since they are easier
-//    to optimize in a non-JIT environment.
-// 4) We can easily go from a constructor to a createFiber object literal if that
-//    is faster.
-// 5) It should be easy to port this to a C struct and keep a C implementation
-//    compatible.
-var createFiber = function(tag, pendingProps, key, mode) {
-  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
-  return new FiberNode(tag, pendingProps, key, mode);
-};
 
-function shouldConstruct(Component) {
-  return !!(Component.prototype && Component.prototype.isReactComponent);
+  cursor.current = value;
 }
 
-// This is used to create an alternate fiber to do work on.
-function createWorkInProgress(current, pendingProps, expirationTime) {
-  var workInProgress = current.alternate;
-  if (workInProgress === null) {
-    // We use a double buffering pooling technique because we know that we'll
-    // only ever need at most two versions of a tree. We pool the "other" unused
-    // node that we're free to reuse. This is lazily created to avoid allocating
-    // extra objects for things that are never updated. It also allow us to
-    // reclaim the extra memory if needed.
-    workInProgress = createFiber(
-      current.tag,
-      pendingProps,
-      current.key,
-      current.mode
-    );
-    workInProgress.type = current.type;
-    workInProgress.stateNode = current.stateNode;
+function reset() {
+  while (index > -1) {
+    valueStack[index] = null;
 
     {
-      // DEV-only fields
-      workInProgress._debugID = current._debugID;
-      workInProgress._debugSource = current._debugSource;
-      workInProgress._debugOwner = current._debugOwner;
+      fiberStack[index] = null;
     }
 
-    workInProgress.alternate = current;
-    current.alternate = workInProgress;
-  } else {
-    workInProgress.pendingProps = pendingProps;
-
-    // We already have an alternate.
-    // Reset the effect tag.
-    workInProgress.effectTag = NoEffect;
-
-    // The effect list is no longer valid.
-    workInProgress.nextEffect = null;
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
+    index--;
   }
+}
 
-  workInProgress.expirationTime = expirationTime;
-
-  workInProgress.child = current.child;
-  workInProgress.memoizedProps = current.memoizedProps;
-  workInProgress.memoizedState = current.memoizedState;
-  workInProgress.updateQueue = current.updateQueue;
-
-  // These will be overridden during the parent's reconciliation
-  workInProgress.sibling = current.sibling;
-  workInProgress.index = current.index;
-  workInProgress.ref = current.ref;
+var describeComponentFrame = function(name, source, ownerName) {
+  return (
+    "\n    in " +
+    (name || "Unknown") +
+    (source
+      ? " (at " +
+        source.fileName.replace(/^.*[\\\/]/, "") +
+        ":" +
+        source.lineNumber +
+        ")"
+      : ownerName ? " (created by " + ownerName + ")" : "")
+  );
+};
 
-  return workInProgress;
+function describeFiber(fiber) {
+  switch (fiber.tag) {
+    case IndeterminateComponent:
+    case FunctionalComponent:
+    case ClassComponent:
+    case HostComponent:
+      var owner = fiber._debugOwner;
+      var source = fiber._debugSource;
+      var name = getComponentName(fiber);
+      var ownerName = null;
+      if (owner) {
+        ownerName = getComponentName(owner);
+      }
+      return describeComponentFrame(name, source, ownerName);
+    default:
+      return "";
+  }
 }
 
-function createHostRootFiber(isAsync) {
-  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
-  return createFiber(HostRoot, null, null, mode);
+// This function can only be called with a work-in-progress fiber and
+// only during begin or complete phase. Do not call it under any other
+// circumstances.
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  var node = workInProgress;
+  do {
+    info += describeFiber(node);
+    // Otherwise this return pointer might point to the wrong tree:
+    node = node["return"];
+  } while (node);
+  return info;
 }
 
-function createFiberFromElement(element, mode, expirationTime) {
-  var owner = null;
+function getCurrentFiberOwnerName() {
   {
-    owner = element._owner;
-  }
-
-  var fiber = void 0;
-  var type = element.type;
-  var key = element.key;
-  var pendingProps = element.props;
-
-  var fiberTag = void 0;
-  if (typeof type === "function") {
-    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
-  } else if (typeof type === "string") {
-    fiberTag = HostComponent;
-  } else {
-    switch (type) {
-      case REACT_FRAGMENT_TYPE:
-        return createFiberFromFragment(
-          pendingProps.children,
-          mode,
-          expirationTime,
-          key
-        );
-      case REACT_ASYNC_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= AsyncMode | StrictMode;
-        break;
-      case REACT_STRICT_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= StrictMode;
-        break;
-      case REACT_CALL_TYPE:
-        fiberTag = CallComponent;
-        break;
-      case REACT_RETURN_TYPE:
-        fiberTag = ReturnComponent;
-        break;
-      default: {
-        if (typeof type === "object" && type !== null) {
-          switch (type.$$typeof) {
-            case REACT_PROVIDER_TYPE:
-              fiberTag = ContextProvider;
-              break;
-            case REACT_CONTEXT_TYPE:
-              // This is a consumer
-              fiberTag = ContextConsumer;
-              break;
-            case REACT_FORWARD_REF_TYPE:
-              fiberTag = ForwardRef;
-              break;
-            default:
-              if (typeof type.tag === "number") {
-                // Currently assumed to be a continuation and therefore is a
-                // fiber already.
-                // TODO: The yield system is currently broken for updates in
-                // some cases. The reified yield stores a fiber, but we don't
-                // know which fiber that is; the current or a workInProgress?
-                // When the continuation gets rendered here we don't know if we
-                // can reuse that fiber or if we need to clone it. There is
-                // probably a clever way to restructure this.
-                fiber = type;
-                fiber.pendingProps = pendingProps;
-                fiber.expirationTime = expirationTime;
-                return fiber;
-              } else {
-                throwOnInvalidElementType(type, owner);
-              }
-              break;
-          }
-        } else {
-          throwOnInvalidElementType(type, owner);
-        }
-      }
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
+    }
+    var owner = fiber._debugOwner;
+    if (owner !== null && typeof owner !== "undefined") {
+      return getComponentName(owner);
     }
   }
-
-  fiber = createFiber(fiberTag, pendingProps, key, mode);
-  fiber.type = type;
-  fiber.expirationTime = expirationTime;
-
-  {
-    fiber._debugSource = element._source;
-    fiber._debugOwner = element._owner;
-  }
-
-  return fiber;
+  return null;
 }
 
-function throwOnInvalidElementType(type, owner) {
-  var info = "";
+function getCurrentFiberStackAddendum() {
   {
-    if (
-      type === undefined ||
-      (typeof type === "object" &&
-        type !== null &&
-        Object.keys(type).length === 0)
-    ) {
-      info +=
-        " You likely forgot to export your component from the file " +
-        "it's defined in, or you might have mixed up default and " +
-        "named imports.";
-    }
-    var ownerName = owner ? getComponentName(owner) : null;
-    if (ownerName) {
-      info += "\n\nCheck the render method of `" + ownerName + "`.";
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
     }
+    // Safe because if current fiber exists, we are reconciling,
+    // and it is guaranteed to be the work-in-progress version.
+    return getStackAddendumByWorkInProgressFiber(fiber);
   }
-  invariant(
-    false,
-    "Element type is invalid: expected a string (for built-in " +
-      "components) or a class/function (for composite components) " +
-      "but got: %s.%s",
-    type == null ? type : typeof type,
-    info
-  );
+  return null;
 }
 
-function createFiberFromFragment(elements, mode, expirationTime, key) {
-  var fiber = createFiber(Fragment, elements, key, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
+function resetCurrentFiber() {
+  ReactDebugCurrentFrame.getCurrentStack = null;
+  ReactDebugCurrentFiber.current = null;
+  ReactDebugCurrentFiber.phase = null;
 }
 
-function createFiberFromText(content, mode, expirationTime) {
-  var fiber = createFiber(HostText, content, null, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
+function setCurrentFiber(fiber) {
+  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
+  ReactDebugCurrentFiber.current = fiber;
+  ReactDebugCurrentFiber.phase = null;
 }
 
-function createFiberFromHostInstanceForDeletion() {
-  var fiber = createFiber(HostComponent, null, null, NoContext);
-  fiber.type = "DELETED";
-  return fiber;
+function setCurrentPhase(phase) {
+  ReactDebugCurrentFiber.phase = phase;
 }
 
-function createFiberFromPortal(portal, mode, expirationTime) {
-  var pendingProps = portal.children !== null ? portal.children : [];
-  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
-  fiber.expirationTime = expirationTime;
-  fiber.stateNode = {
-    containerInfo: portal.containerInfo,
-    pendingChildren: null, // Used by persistent updates
-    implementation: portal.implementation
-  };
-  return fiber;
-}
+var ReactDebugCurrentFiber = {
+  current: null,
+  phase: null,
+  resetCurrentFiber: resetCurrentFiber,
+  setCurrentFiber: setCurrentFiber,
+  setCurrentPhase: setCurrentPhase,
+  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
+  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
+};
 
-// Used for stashing WIP properties to replay failed work in DEV.
-function assignFiberPropertiesInDEV(target, source) {
-  if (target === null) {
-    // This Fiber's initial properties will always be overwritten.
-    // We only use a Fiber to ensure the same hidden class so DEV isn't slow.
-    target = createFiber(IndeterminateComponent, null, null, NoContext);
-  }
-
-  // This is intentionally written as a list of all properties.
-  // We tried to use Object.assign() instead but this is called in
-  // the hottest path, and Object.assign() was too slow:
-  // https://github.com/facebook/react/issues/12502
-  // This code is DEV-only so size is not a concern.
-
-  target.tag = source.tag;
-  target.key = source.key;
-  target.type = source.type;
-  target.stateNode = source.stateNode;
-  target["return"] = source["return"];
-  target.child = source.child;
-  target.sibling = source.sibling;
-  target.index = source.index;
-  target.ref = source.ref;
-  target.pendingProps = source.pendingProps;
-  target.memoizedProps = source.memoizedProps;
-  target.updateQueue = source.updateQueue;
-  target.memoizedState = source.memoizedState;
-  target.mode = source.mode;
-  target.effectTag = source.effectTag;
-  target.nextEffect = source.nextEffect;
-  target.firstEffect = source.firstEffect;
-  target.lastEffect = source.lastEffect;
-  target.expirationTime = source.expirationTime;
-  target.alternate = source.alternate;
-  target._debugID = source._debugID;
-  target._debugSource = source._debugSource;
-  target._debugOwner = source._debugOwner;
-  target._debugIsCurrentlyTiming = source._debugIsCurrentlyTiming;
-  return target;
-}
+var debugRenderPhaseSideEffects = false;
+var debugRenderPhaseSideEffectsForStrictMode = false;
 
-// TODO: This should be lifted into the renderer.
+var enableUserTimingAPI = true;
+var enableGetDerivedStateFromCatch = false;
+var warnAboutDeprecatedLifecycles = false;
+var replayFailedUnitOfWorkWithInvokeGuardedCallback = true;
 
-function createFiberRoot(containerInfo, isAsync, hydrate) {
-  // Cyclic construction. This cheats the type system right now because
-  // stateNode is any.
-  var uninitializedFiber = createHostRootFiber(isAsync);
-  var root = {
-    current: uninitializedFiber,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-    pendingCommitExpirationTime: NoWork,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    remainingExpirationTime: NoWork,
-    firstBatch: null,
-    nextScheduledRoot: null
-  };
-  uninitializedFiber.stateNode = root;
-  return root;
-}
+// React Fabric uses persistent reconciler.
+var enableMutatingReconciler = false;
+var enableNoopReconciler = false;
+var enablePersistentReconciler = true;
 
-var onCommitFiberRoot = null;
-var onCommitFiberUnmount = null;
-var hasLoggedError = false;
+// Only used in www builds.
 
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {
-      if (true && !hasLoggedError) {
-        hasLoggedError = true;
-        warning(false, "React DevTools encountered an error: %s", err);
-      }
-    }
-  };
-}
+// Prefix measurements so that it's possible to filter them.
+// Longer prefixes are hard to read in DevTools.
+var reactEmoji = "\u269B";
+var warningEmoji = "\u26D4";
+var supportsUserTiming =
+  typeof performance !== "undefined" &&
+  typeof performance.mark === "function" &&
+  typeof performance.clearMarks === "function" &&
+  typeof performance.measure === "function" &&
+  typeof performance.clearMeasures === "function";
 
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
-  }
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
-  }
-  if (!hook.supportsFiber) {
-    {
-      warning(
-        false,
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://fb.me/react-devtools"
-      );
-    }
-    // DevTools exists, even though it doesn't support Fiber.
-    return true;
-  }
-  try {
-    var rendererID = hook.inject(internals);
-    // We have successfully injected, so now it is safe to set up hooks.
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
-    {
-      warning(false, "React DevTools encountered an error: %s.", err);
-    }
-  }
-  // DevTools exists
-  return true;
-}
+// Keep track of current fiber so that we know the path to unwind on pause.
+// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
+var currentFiber = null;
+// If we're in the middle of user code, which fiber and method is it?
+// Reusing `currentFiber` would be confusing for this because user code fiber
+// can change during commit phase too, but we don't need to unwind it (since
+// lifecycles in the commit phase don't resemble a tree).
+var currentPhase = null;
+var currentPhaseFiber = null;
+// Did lifecycle hook schedule an update? This is often a performance problem,
+// so we will keep track of it, and include it in the report.
+// Track commits caused by cascading updates.
+var isCommitting = false;
+var hasScheduledUpdateInCurrentCommit = false;
+var hasScheduledUpdateInCurrentPhase = false;
+var commitCountInCurrentWorkLoop = 0;
+var effectCountInCurrentCommit = 0;
+var isWaitingForCallback = false;
+// During commits, we only show a measurement once per method name
+// to avoid stretch the commit phase with measurement overhead.
+var labelsInCurrentCommit = new Set();
 
-function onCommitRoot(root) {
-  if (typeof onCommitFiberRoot === "function") {
-    onCommitFiberRoot(root);
+var formatMarkName = function(markName) {
+  return reactEmoji + " " + markName;
+};
+
+var formatLabel = function(label, warning$$1) {
+  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
+  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
+  return "" + prefix + label + suffix;
+};
+
+var beginMark = function(markName) {
+  performance.mark(formatMarkName(markName));
+};
+
+var clearMark = function(markName) {
+  performance.clearMarks(formatMarkName(markName));
+};
+
+var endMark = function(label, markName, warning$$1) {
+  var formattedMarkName = formatMarkName(markName);
+  var formattedLabel = formatLabel(label, warning$$1);
+  try {
+    performance.measure(formattedLabel, formattedMarkName);
+  } catch (err) {}
+  // If previous mark was missing for some reason, this will throw.
+  // This could only happen if React crashed in an unexpected place earlier.
+  // Don't pile on with more errors.
+
+  // Clear marks immediately to avoid growing buffer.
+  performance.clearMarks(formattedMarkName);
+  performance.clearMeasures(formattedLabel);
+};
+
+var getFiberMarkName = function(label, debugID) {
+  return label + " (#" + debugID + ")";
+};
+
+var getFiberLabel = function(componentName, isMounted, phase) {
+  if (phase === null) {
+    // These are composite component total time measurements.
+    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
+  } else {
+    // Composite component methods.
+    return componentName + "." + phase;
   }
-}
+};
 
-function onCommitUnmount(fiber) {
-  if (typeof onCommitFiberUnmount === "function") {
-    onCommitFiberUnmount(fiber);
+var beginFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+
+  if (isCommitting && labelsInCurrentCommit.has(label)) {
+    // During the commit phase, we don't show duplicate labels because
+    // there is a fixed overhead for every measurement, and we don't
+    // want to stretch the commit phase beyond necessary.
+    return false;
   }
-}
+  labelsInCurrentCommit.add(label);
 
-var describeComponentFrame = function(name, source, ownerName) {
-  return (
-    "\n    in " +
-    (name || "Unknown") +
-    (source
-      ? " (at " +
-        source.fileName.replace(/^.*[\\\/]/, "") +
-        ":" +
-        source.lineNumber +
-        ")"
-      : ownerName ? " (created by " + ownerName + ")" : "")
-  );
+  var markName = getFiberMarkName(label, debugID);
+  beginMark(markName);
+  return true;
 };
 
-function describeFiber(fiber) {
+var clearFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  clearMark(markName);
+};
+
+var endFiberMark = function(fiber, phase, warning$$1) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  endMark(label, markName, warning$$1);
+};
+
+var shouldIgnoreFiber = function(fiber) {
+  // Host components should be skipped in the timeline.
+  // We could check typeof fiber.type, but does this work with RN?
   switch (fiber.tag) {
-    case IndeterminateComponent:
-    case FunctionalComponent:
-    case ClassComponent:
+    case HostRoot:
     case HostComponent:
-      var owner = fiber._debugOwner;
-      var source = fiber._debugSource;
-      var name = getComponentName(fiber);
-      var ownerName = null;
-      if (owner) {
-        ownerName = getComponentName(owner);
-      }
-      return describeComponentFrame(name, source, ownerName);
+    case HostText:
+    case HostPortal:
+    case CallComponent:
+    case ReturnComponent:
+    case Fragment:
+    case ContextProvider:
+    case ContextConsumer:
+      return true;
     default:
-      return "";
+      return false;
   }
-}
+};
 
-// This function can only be called with a work-in-progress fiber and
-// only during begin or complete phase. Do not call it under any other
-// circumstances.
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  var node = workInProgress;
-  do {
-    info += describeFiber(node);
-    // Otherwise this return pointer might point to the wrong tree:
-    node = node["return"];
-  } while (node);
-  return info;
-}
+var clearPendingPhaseMeasurement = function() {
+  if (currentPhase !== null && currentPhaseFiber !== null) {
+    clearFiberMark(currentPhaseFiber, currentPhase);
+  }
+  currentPhaseFiber = null;
+  currentPhase = null;
+  hasScheduledUpdateInCurrentPhase = false;
+};
 
-/**
- * Forked from fbjs/warning:
- * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
- *
- * Only change is we use console.warn instead of console.error,
- * and do nothing when 'console' is not supported.
- * This really simplifies the code.
- * ---
- * Similar to invariant but only logs a warning if the condition is not met.
- * This can be used to log issues in development environments in critical
- * paths. Removing the logging code for production environments will keep the
- * same logic and follow the same code paths.
- */
+var pauseTimers = function() {
+  // Stops all currently active measurements so that they can be resumed
+  // if we continue in a later deferred loop from the same unit of work.
+  var fiber = currentFiber;
+  while (fiber) {
+    if (fiber._debugIsCurrentlyTiming) {
+      endFiberMark(fiber, null, null);
+    }
+    fiber = fiber["return"];
+  }
+};
 
-var lowPriorityWarning = function() {};
+var resumeTimersRecursively = function(fiber) {
+  if (fiber["return"] !== null) {
+    resumeTimersRecursively(fiber["return"]);
+  }
+  if (fiber._debugIsCurrentlyTiming) {
+    beginFiberMark(fiber, null);
+  }
+};
 
-{
-  var printWarning = function(format) {
-    for (
-      var _len = arguments.length,
-        args = Array(_len > 1 ? _len - 1 : 0),
-        _key = 1;
-      _key < _len;
-      _key++
+var resumeTimers = function() {
+  // Resumes all measurements that were active during the last deferred loop.
+  if (currentFiber !== null) {
+    resumeTimersRecursively(currentFiber);
+  }
+};
+
+function recordEffect() {
+  if (enableUserTimingAPI) {
+    effectCountInCurrentCommit++;
+  }
+}
+
+function recordScheduleUpdate() {
+  if (enableUserTimingAPI) {
+    if (isCommitting) {
+      hasScheduledUpdateInCurrentCommit = true;
+    }
+    if (
+      currentPhase !== null &&
+      currentPhase !== "componentWillMount" &&
+      currentPhase !== "componentWillReceiveProps"
     ) {
-      args[_key - 1] = arguments[_key];
+      hasScheduledUpdateInCurrentPhase = true;
     }
+  }
+}
 
-    var argIndex = 0;
-    var message =
-      "Warning: " +
-      format.replace(/%s/g, function() {
-        return args[argIndex++];
-      });
-    if (typeof console !== "undefined") {
-      console.warn(message);
+function startRequestCallbackTimer() {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming && !isWaitingForCallback) {
+      isWaitingForCallback = true;
+      beginMark("(Waiting for async callback...)");
     }
-    try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
-      throw new Error(message);
-    } catch (x) {}
-  };
-
-  lowPriorityWarning = function(condition, format) {
-    if (format === undefined) {
-      throw new Error(
-        "`warning(condition, format, ...args)` requires a warning " +
-          "message argument"
+  }
+}
+
+function stopRequestCallbackTimer(didExpire) {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming) {
+      isWaitingForCallback = false;
+      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
+      endMark(
+        "(Waiting for async callback...)",
+        "(Waiting for async callback...)",
+        warning$$1
       );
     }
-    if (!condition) {
-      for (
-        var _len2 = arguments.length,
-          args = Array(_len2 > 2 ? _len2 - 2 : 0),
-          _key2 = 2;
-        _key2 < _len2;
-        _key2++
-      ) {
-        args[_key2 - 2] = arguments[_key2];
-      }
+  }
+}
 
-      printWarning.apply(undefined, [format].concat(args));
+function startWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
     }
-  };
+    // If we pause, this is the fiber to unwind from.
+    currentFiber = fiber;
+    if (!beginFiberMark(fiber, null)) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = true;
+  }
 }
 
-var lowPriorityWarning$1 = lowPriorityWarning;
-
-var ReactStrictModeWarnings = {
-  discardPendingWarnings: function() {},
-  flushPendingDeprecationWarnings: function() {},
-  flushPendingUnsafeLifecycleWarnings: function() {},
-  recordDeprecationWarnings: function(fiber, instance) {},
-  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
-};
-
-{
-  var LIFECYCLE_SUGGESTIONS = {
-    UNSAFE_componentWillMount: "componentDidMount",
-    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
-    UNSAFE_componentWillUpdate: "componentDidUpdate"
-  };
-
-  var pendingComponentWillMountWarnings = [];
-  var pendingComponentWillReceivePropsWarnings = [];
-  var pendingComponentWillUpdateWarnings = [];
-  var pendingUnsafeLifecycleWarnings = new Map();
-
-  // Tracks components we have already warned about.
-  var didWarnAboutDeprecatedLifecycles = new Set();
-  var didWarnAboutUnsafeLifecycles = new Set();
-
-  ReactStrictModeWarnings.discardPendingWarnings = function() {
-    pendingComponentWillMountWarnings = [];
-    pendingComponentWillReceivePropsWarnings = [];
-    pendingComponentWillUpdateWarnings = [];
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+function cancelWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // Remember we shouldn't complete measurement for this fiber.
+    // Otherwise flamechart will be deep even for small updates.
+    fiber._debugIsCurrentlyTiming = false;
+    clearFiberMark(fiber, null);
+  }
+}
 
-  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
-    pendingUnsafeLifecycleWarnings.forEach(function(
-      lifecycleWarningsMap,
-      strictRoot
-    ) {
-      var lifecyclesWarningMesages = [];
+function stopWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = false;
+    endFiberMark(fiber, null, null);
+  }
+}
 
-      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
-        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
-        if (lifecycleWarnings.length > 0) {
-          var componentNames = new Set();
-          lifecycleWarnings.forEach(function(fiber) {
-            componentNames.add(getComponentName(fiber) || "Component");
-            didWarnAboutUnsafeLifecycles.add(fiber.type);
-          });
+function stopFailedWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = false;
+    var warning$$1 = "An error was thrown inside this error boundary";
+    endFiberMark(fiber, null, warning$$1);
+  }
+}
 
-          var formatted = lifecycle.replace("UNSAFE_", "");
-          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
-          var sortedComponentNames = Array.from(componentNames)
-            .sort()
-            .join(", ");
+function startPhaseTimer(fiber, phase) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    clearPendingPhaseMeasurement();
+    if (!beginFiberMark(fiber, phase)) {
+      return;
+    }
+    currentPhaseFiber = fiber;
+    currentPhase = phase;
+  }
+}
 
-          lifecyclesWarningMesages.push(
-            formatted +
-              ": Please update the following components to use " +
-              (suggestion + " instead: " + sortedComponentNames)
-          );
-        }
-      });
+function stopPhaseTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    if (currentPhase !== null && currentPhaseFiber !== null) {
+      var warning$$1 = hasScheduledUpdateInCurrentPhase
+        ? "Scheduled a cascading update"
+        : null;
+      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
+    }
+    currentPhase = null;
+    currentPhaseFiber = null;
+  }
+}
 
-      if (lifecyclesWarningMesages.length > 0) {
-        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
-          strictRoot
-        );
+function startWorkLoopTimer(nextUnitOfWork) {
+  if (enableUserTimingAPI) {
+    currentFiber = nextUnitOfWork;
+    if (!supportsUserTiming) {
+      return;
+    }
+    commitCountInCurrentWorkLoop = 0;
+    // This is top level call.
+    // Any other measurements are performed within.
+    beginMark("(React Tree Reconciliation)");
+    // Resume any measurements that were in progress during the last loop.
+    resumeTimers();
+  }
+}
 
-        warning(
-          false,
-          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
-            "\n\n%s" +
-            "\n\nLearn more about this warning here:" +
-            "\nhttps://fb.me/react-strict-mode-warnings",
-          strictRootComponentStack,
-          lifecyclesWarningMesages.join("\n\n")
-        );
+function stopWorkLoopTimer(interruptedBy) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    var warning$$1 = null;
+    if (interruptedBy !== null) {
+      if (interruptedBy.tag === HostRoot) {
+        warning$$1 = "A top-level update interrupted the previous render";
+      } else {
+        var componentName = getComponentName(interruptedBy) || "Unknown";
+        warning$$1 =
+          "An update to " + componentName + " interrupted the previous render";
       }
-    });
-
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
-
-  var getStrictRoot = function(fiber) {
-    var maybeStrictRoot = null;
+    } else if (commitCountInCurrentWorkLoop > 1) {
+      warning$$1 = "There were cascading updates";
+    }
+    commitCountInCurrentWorkLoop = 0;
+    // Pause any measurements until the next loop.
+    pauseTimers();
+    endMark(
+      "(React Tree Reconciliation)",
+      "(React Tree Reconciliation)",
+      warning$$1
+    );
+  }
+}
 
-    while (fiber !== null) {
-      if (fiber.mode & StrictMode) {
-        maybeStrictRoot = fiber;
-      }
+function startCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    isCommitting = true;
+    hasScheduledUpdateInCurrentCommit = false;
+    labelsInCurrentCommit.clear();
+    beginMark("(Committing Changes)");
+  }
+}
 
-      fiber = fiber["return"];
+function stopCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
 
-    return maybeStrictRoot;
-  };
+    var warning$$1 = null;
+    if (hasScheduledUpdateInCurrentCommit) {
+      warning$$1 = "Lifecycle hook scheduled a cascading update";
+    } else if (commitCountInCurrentWorkLoop > 0) {
+      warning$$1 = "Caused by a cascading update in earlier commit";
+    }
+    hasScheduledUpdateInCurrentCommit = false;
+    commitCountInCurrentWorkLoop++;
+    isCommitting = false;
+    labelsInCurrentCommit.clear();
 
-  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
-    if (pendingComponentWillMountWarnings.length > 0) {
-      var uniqueNames = new Set();
-      pendingComponentWillMountWarnings.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var sortedNames = Array.from(uniqueNames)
-        .sort()
-        .join(", ");
-
-      lowPriorityWarning$1(
-        false,
-        "componentWillMount is deprecated and will be removed in the next major version. " +
-          "Use componentDidMount instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillMount." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        sortedNames
-      );
-
-      pendingComponentWillMountWarnings = [];
-    }
-
-    if (pendingComponentWillReceivePropsWarnings.length > 0) {
-      var _uniqueNames = new Set();
-      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
-        _uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames = Array.from(_uniqueNames)
-        .sort()
-        .join(", ");
-
-      lowPriorityWarning$1(
-        false,
-        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
-          "Use static getDerivedStateFromProps instead." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames
-      );
-
-      pendingComponentWillReceivePropsWarnings = [];
-    }
-
-    if (pendingComponentWillUpdateWarnings.length > 0) {
-      var _uniqueNames2 = new Set();
-      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
-        _uniqueNames2.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames2 = Array.from(_uniqueNames2)
-        .sort()
-        .join(", ");
-
-      lowPriorityWarning$1(
-        false,
-        "componentWillUpdate is deprecated and will be removed in the next major version. " +
-          "Use componentDidUpdate instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillUpdate." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames2
-      );
-
-      pendingComponentWillUpdateWarnings = [];
-    }
-  };
+    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
+  }
+}
 
-  ReactStrictModeWarnings.recordDeprecationWarnings = function(
-    fiber,
-    instance
-  ) {
-    // Dedup strategy: Warn once per component.
-    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+function startCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Host Effects)");
+  }
+}
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillMountWarnings.push(fiber);
-    }
-    if (
-      typeof instance.componentWillReceiveProps === "function" &&
-      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillReceivePropsWarnings.push(fiber);
-    }
-    if (
-      typeof instance.componentWillUpdate === "function" &&
-      instance.componentWillUpdate.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillUpdateWarnings.push(fiber);
+function stopCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-  };
-
-  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
-    fiber,
-    instance
-  ) {
-    var strictRoot = getStrictRoot(fiber);
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Host Effects: " + count + " Total)",
+      "(Committing Host Effects)",
+      null
+    );
+  }
+}
 
-    // Dedup strategy: Warn once per component.
-    // This is difficult to track any other way since component names
-    // are often vague and are likely to collide between 3rd party libraries.
-    // An expand property is probably okay to use here since it's DEV-only,
-    // and will only be set in the event of serious warnings.
-    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+function startCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Calling Lifecycle Methods)");
+  }
+}
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
-    ) {
+function stopCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Calling Lifecycle Methods: " + count + " Total)",
+      "(Calling Lifecycle Methods)",
+      null
+    );
+  }
+}
 
-    var warningsForRoot = void 0;
-    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
-      warningsForRoot = {
-        UNSAFE_componentWillMount: [],
-        UNSAFE_componentWillReceiveProps: [],
-        UNSAFE_componentWillUpdate: []
-      };
+var warnedAboutMissingGetChildContext = void 0;
 
-      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
-    } else {
-      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
-    }
+{
+  warnedAboutMissingGetChildContext = {};
+}
 
-    var unsafeLifecycles = [];
-    if (
-      typeof instance.componentWillMount === "function" ||
-      typeof instance.UNSAFE_componentWillMount === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillMount");
-    }
-    if (
-      typeof instance.componentWillReceiveProps === "function" ||
-      typeof instance.UNSAFE_componentWillReceiveProps === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
-    }
-    if (
-      typeof instance.componentWillUpdate === "function" ||
-      typeof instance.UNSAFE_componentWillUpdate === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
-    }
+// A cursor to the current merged context object on the stack.
+var contextStackCursor = createCursor(emptyObject);
+// A cursor to a boolean indicating whether the context has changed.
+var didPerformWorkStackCursor = createCursor(false);
+// Keep track of the previous context object that was on the stack.
+// We use this to get access to the parent context after we have already
+// pushed the next context provider, and now need to merge their contexts.
+var previousContext = emptyObject;
 
-    if (unsafeLifecycles.length > 0) {
-      unsafeLifecycles.forEach(function(lifecycle) {
-        warningsForRoot[lifecycle].push(fiber);
-      });
-    }
-  };
+function getUnmaskedContext(workInProgress) {
+  var hasOwnContext = isContextProvider(workInProgress);
+  if (hasOwnContext) {
+    // If the fiber is a context provider itself, when we read its context
+    // we have already pushed its own child context on the stack. A context
+    // provider should not "see" its own child context. Therefore we read the
+    // previous (parent) context instead for a context provider.
+    return previousContext;
+  }
+  return contextStackCursor.current;
 }
 
-var debugRenderPhaseSideEffects = false;
-var debugRenderPhaseSideEffectsForStrictMode = false;
-var enableUserTimingAPI = true;
-var enableGetDerivedStateFromCatch = false;
-var warnAboutDeprecatedLifecycles = false;
-var replayFailedUnitOfWorkWithInvokeGuardedCallback = true;
+function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+  var instance = workInProgress.stateNode;
+  instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+  instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+}
 
-// React Fabric uses persistent reconciler.
-var enableMutatingReconciler = false;
-var enableNoopReconciler = false;
-var enablePersistentReconciler = true;
+function getMaskedContext(workInProgress, unmaskedContext) {
+  var type = workInProgress.type;
+  var contextTypes = type.contextTypes;
+  if (!contextTypes) {
+    return emptyObject;
+  }
 
-// Only used in www builds.
+  // Avoid recreating masked context unless unmasked context has changed.
+  // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+  // This may trigger infinite loops if componentWillReceiveProps calls setState.
+  var instance = workInProgress.stateNode;
+  if (
+    instance &&
+    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+  ) {
+    return instance.__reactInternalMemoizedMaskedChildContext;
+  }
 
-function getCurrentFiberOwnerName() {
-  {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    var owner = fiber._debugOwner;
-    if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner);
-    }
+  var context = {};
+  for (var key in contextTypes) {
+    context[key] = unmaskedContext[key];
   }
-  return null;
-}
 
-function getCurrentFiberStackAddendum() {
   {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    // Safe because if current fiber exists, we are reconciling,
-    // and it is guaranteed to be the work-in-progress version.
-    return getStackAddendumByWorkInProgressFiber(fiber);
+    var name = getComponentName(workInProgress) || "Unknown";
+    checkPropTypes(
+      contextTypes,
+      context,
+      "context",
+      name,
+      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+    );
   }
-  return null;
+
+  // Cache unmasked context so we can avoid recreating masked context unless necessary.
+  // Context is created before the class component is instantiated so check for instance.
+  if (instance) {
+    cacheContext(workInProgress, unmaskedContext, context);
+  }
+
+  return context;
 }
 
-function resetCurrentFiber() {
-  ReactDebugCurrentFrame.getCurrentStack = null;
-  ReactDebugCurrentFiber.current = null;
-  ReactDebugCurrentFiber.phase = null;
+function hasContextChanged() {
+  return didPerformWorkStackCursor.current;
 }
 
-function setCurrentFiber(fiber) {
-  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
-  ReactDebugCurrentFiber.current = fiber;
-  ReactDebugCurrentFiber.phase = null;
+function isContextConsumer(fiber) {
+  return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
 }
 
-function setCurrentPhase(phase) {
-  ReactDebugCurrentFiber.phase = phase;
+function isContextProvider(fiber) {
+  return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
 }
 
-var ReactDebugCurrentFiber = {
-  current: null,
-  phase: null,
-  resetCurrentFiber: resetCurrentFiber,
-  setCurrentFiber: setCurrentFiber,
-  setCurrentPhase: setCurrentPhase,
-  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
-};
-
-// Prefix measurements so that it's possible to filter them.
-// Longer prefixes are hard to read in DevTools.
-var reactEmoji = "\u269B";
-var warningEmoji = "\u26D4";
-var supportsUserTiming =
-  typeof performance !== "undefined" &&
-  typeof performance.mark === "function" &&
-  typeof performance.clearMarks === "function" &&
-  typeof performance.measure === "function" &&
-  typeof performance.clearMeasures === "function";
-
-// Keep track of current fiber so that we know the path to unwind on pause.
-// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
-var currentFiber = null;
-// If we're in the middle of user code, which fiber and method is it?
-// Reusing `currentFiber` would be confusing for this because user code fiber
-// can change during commit phase too, but we don't need to unwind it (since
-// lifecycles in the commit phase don't resemble a tree).
-var currentPhase = null;
-var currentPhaseFiber = null;
-// Did lifecycle hook schedule an update? This is often a performance problem,
-// so we will keep track of it, and include it in the report.
-// Track commits caused by cascading updates.
-var isCommitting = false;
-var hasScheduledUpdateInCurrentCommit = false;
-var hasScheduledUpdateInCurrentPhase = false;
-var commitCountInCurrentWorkLoop = 0;
-var effectCountInCurrentCommit = 0;
-var isWaitingForCallback = false;
-// During commits, we only show a measurement once per method name
-// to avoid stretch the commit phase with measurement overhead.
-var labelsInCurrentCommit = new Set();
+function popContextProvider(fiber) {
+  if (!isContextProvider(fiber)) {
+    return;
+  }
 
-var formatMarkName = function(markName) {
-  return reactEmoji + " " + markName;
-};
+  pop(didPerformWorkStackCursor, fiber);
+  pop(contextStackCursor, fiber);
+}
 
-var formatLabel = function(label, warning$$1) {
-  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
-  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
-  return "" + prefix + label + suffix;
-};
+function popTopLevelContextObject(fiber) {
+  pop(didPerformWorkStackCursor, fiber);
+  pop(contextStackCursor, fiber);
+}
 
-var beginMark = function(markName) {
-  performance.mark(formatMarkName(markName));
-};
+function pushTopLevelContextObject(fiber, context, didChange) {
+  invariant(
+    contextStackCursor.cursor == null,
+    "Unexpected context found on stack. " +
+      "This error is likely caused by a bug in React. Please file an issue."
+  );
 
-var clearMark = function(markName) {
-  performance.clearMarks(formatMarkName(markName));
-};
+  push(contextStackCursor, context, fiber);
+  push(didPerformWorkStackCursor, didChange, fiber);
+}
 
-var endMark = function(label, markName, warning$$1) {
-  var formattedMarkName = formatMarkName(markName);
-  var formattedLabel = formatLabel(label, warning$$1);
-  try {
-    performance.measure(formattedLabel, formattedMarkName);
-  } catch (err) {}
-  // If previous mark was missing for some reason, this will throw.
-  // This could only happen if React crashed in an unexpected place earlier.
-  // Don't pile on with more errors.
+function processChildContext(fiber, parentContext) {
+  var instance = fiber.stateNode;
+  var childContextTypes = fiber.type.childContextTypes;
 
-  // Clear marks immediately to avoid growing buffer.
-  performance.clearMarks(formattedMarkName);
-  performance.clearMeasures(formattedLabel);
-};
+  // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+  // It has only been added in Fiber to match the (unintentional) behavior in Stack.
+  if (typeof instance.getChildContext !== "function") {
+    {
+      var componentName = getComponentName(fiber) || "Unknown";
 
-var getFiberMarkName = function(label, debugID) {
-  return label + " (#" + debugID + ")";
-};
+      if (!warnedAboutMissingGetChildContext[componentName]) {
+        warnedAboutMissingGetChildContext[componentName] = true;
+        warning(
+          false,
+          "%s.childContextTypes is specified but there is no getChildContext() method " +
+            "on the instance. You can either define getChildContext() on %s or remove " +
+            "childContextTypes from it.",
+          componentName,
+          componentName
+        );
+      }
+    }
+    return parentContext;
+  }
 
-var getFiberLabel = function(componentName, isMounted, phase) {
-  if (phase === null) {
-    // These are composite component total time measurements.
-    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
-  } else {
-    // Composite component methods.
-    return componentName + "." + phase;
+  var childContext = void 0;
+  {
+    ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
+  }
+  startPhaseTimer(fiber, "getChildContext");
+  childContext = instance.getChildContext();
+  stopPhaseTimer();
+  {
+    ReactDebugCurrentFiber.setCurrentPhase(null);
+  }
+  for (var contextKey in childContext) {
+    invariant(
+      contextKey in childContextTypes,
+      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+      getComponentName(fiber) || "Unknown",
+      contextKey
+    );
+  }
+  {
+    var name = getComponentName(fiber) || "Unknown";
+    checkPropTypes(
+      childContextTypes,
+      childContext,
+      "child context",
+      name,
+      // In practice, there is one case in which we won't get a stack. It's when
+      // somebody calls unstable_renderSubtreeIntoContainer() and we process
+      // context from the parent component instance. The stack will be missing
+      // because it's outside of the reconciliation, and so the pointer has not
+      // been set. This is rare and doesn't matter. We'll also remove that API.
+      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+    );
   }
-};
 
-var beginFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
+  return Object.assign({}, parentContext, childContext);
+}
 
-  if (isCommitting && labelsInCurrentCommit.has(label)) {
-    // During the commit phase, we don't show duplicate labels because
-    // there is a fixed overhead for every measurement, and we don't
-    // want to stretch the commit phase beyond necessary.
+function pushContextProvider(workInProgress) {
+  if (!isContextProvider(workInProgress)) {
     return false;
   }
-  labelsInCurrentCommit.add(label);
 
-  var markName = getFiberMarkName(label, debugID);
-  beginMark(markName);
-  return true;
-};
+  var instance = workInProgress.stateNode;
+  // We push the context as early as possible to ensure stack integrity.
+  // If the instance does not exist yet, we will push null at first,
+  // and replace it on the stack later when invalidating the context.
+  var memoizedMergedChildContext =
+    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+    emptyObject;
+
+  // Remember the parent context so we can merge with it later.
+  // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+  previousContext = contextStackCursor.current;
+  push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+  push(
+    didPerformWorkStackCursor,
+    didPerformWorkStackCursor.current,
+    workInProgress
+  );
 
-var clearFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  clearMark(markName);
-};
+  return true;
+}
 
-var endFiberMark = function(fiber, phase, warning$$1) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  endMark(label, markName, warning$$1);
-};
+function invalidateContextProvider(workInProgress, didChange) {
+  var instance = workInProgress.stateNode;
+  invariant(
+    instance,
+    "Expected to have an instance by this point. " +
+      "This error is likely caused by a bug in React. Please file an issue."
+  );
 
-var shouldIgnoreFiber = function(fiber) {
-  // Host components should be skipped in the timeline.
-  // We could check typeof fiber.type, but does this work with RN?
-  switch (fiber.tag) {
-    case HostRoot:
-    case HostComponent:
-    case HostText:
-    case HostPortal:
-    case CallComponent:
-    case ReturnComponent:
-    case Fragment:
-    case ContextProvider:
-    case ContextConsumer:
-      return true;
-    default:
-      return false;
+  if (didChange) {
+    // Merge parent and own context.
+    // Skip this if we're not updating due to sCU.
+    // This avoids unnecessarily recomputing memoized values.
+    var mergedContext = processChildContext(workInProgress, previousContext);
+    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+
+    // Replace the old (or empty) context with the new one.
+    // It is important to unwind the context in the reverse order.
+    pop(didPerformWorkStackCursor, workInProgress);
+    pop(contextStackCursor, workInProgress);
+    // Now push the new context and mark that it has changed.
+    push(contextStackCursor, mergedContext, workInProgress);
+    push(didPerformWorkStackCursor, didChange, workInProgress);
+  } else {
+    pop(didPerformWorkStackCursor, workInProgress);
+    push(didPerformWorkStackCursor, didChange, workInProgress);
   }
-};
+}
 
-var clearPendingPhaseMeasurement = function() {
-  if (currentPhase !== null && currentPhaseFiber !== null) {
-    clearFiberMark(currentPhaseFiber, currentPhase);
-  }
-  currentPhaseFiber = null;
-  currentPhase = null;
-  hasScheduledUpdateInCurrentPhase = false;
-};
+function resetContext() {
+  previousContext = emptyObject;
+  contextStackCursor.current = emptyObject;
+  didPerformWorkStackCursor.current = false;
+}
 
-var pauseTimers = function() {
-  // Stops all currently active measurements so that they can be resumed
-  // if we continue in a later deferred loop from the same unit of work.
-  var fiber = currentFiber;
-  while (fiber) {
-    if (fiber._debugIsCurrentlyTiming) {
-      endFiberMark(fiber, null, null);
+function findCurrentUnmaskedContext(fiber) {
+  // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+  // makes sense elsewhere
+  invariant(
+    isFiberMounted(fiber) && fiber.tag === ClassComponent,
+    "Expected subtree parent to be a mounted class component. " +
+      "This error is likely caused by a bug in React. Please file an issue."
+  );
+
+  var node = fiber;
+  while (node.tag !== HostRoot) {
+    if (isContextProvider(node)) {
+      return node.stateNode.__reactInternalMemoizedMergedChildContext;
     }
-    fiber = fiber["return"];
+    var parent = node["return"];
+    invariant(
+      parent,
+      "Found unexpected detached subtree parent. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+    node = parent;
   }
-};
+  return node.stateNode.context;
+}
 
-var resumeTimersRecursively = function(fiber) {
-  if (fiber["return"] !== null) {
-    resumeTimersRecursively(fiber["return"]);
-  }
-  if (fiber._debugIsCurrentlyTiming) {
-    beginFiberMark(fiber, null);
-  }
-};
+// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
+// Math.pow(2, 30) - 1
+// 0b111111111111111111111111111111
+var MAX_SIGNED_31_BIT_INT = 1073741823;
 
-var resumeTimers = function() {
-  // Resumes all measurements that were active during the last deferred loop.
-  if (currentFiber !== null) {
-    resumeTimersRecursively(currentFiber);
-  }
-};
+// TODO: Use an opaque type once ESLint et al support the syntax
 
-function recordEffect() {
-  if (enableUserTimingAPI) {
-    effectCountInCurrentCommit++;
-  }
+var NoWork = 0;
+var Sync = 1;
+var Never = MAX_SIGNED_31_BIT_INT;
+
+var UNIT_SIZE = 10;
+var MAGIC_NUMBER_OFFSET = 2;
+
+// 1 unit of expiration time represents 10ms.
+function msToExpirationTime(ms) {
+  // Always add an offset so that we don't clash with the magic number for NoWork.
+  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
 }
 
-function recordScheduleUpdate() {
-  if (enableUserTimingAPI) {
-    if (isCommitting) {
-      hasScheduledUpdateInCurrentCommit = true;
-    }
-    if (
-      currentPhase !== null &&
-      currentPhase !== "componentWillMount" &&
-      currentPhase !== "componentWillReceiveProps"
-    ) {
-      hasScheduledUpdateInCurrentPhase = true;
-    }
-  }
+function expirationTimeToMs(expirationTime) {
+  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
 }
 
-function startRequestCallbackTimer() {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming && !isWaitingForCallback) {
-      isWaitingForCallback = true;
-      beginMark("(Waiting for async callback...)");
-    }
-  }
+function ceiling(num, precision) {
+  return (((num / precision) | 0) + 1) * precision;
 }
 
-function stopRequestCallbackTimer(didExpire, expirationTime) {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming) {
-      isWaitingForCallback = false;
-      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
-      endMark(
-        "(Waiting for async callback... will force flush in " +
-          expirationTime +
-          " ms)",
-        "(Waiting for async callback...)",
-        warning$$1
-      );
-    }
-  }
+function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
+  return ceiling(
+    currentTime + expirationInMs / UNIT_SIZE,
+    bucketSizeMs / UNIT_SIZE
+  );
 }
 
-function startWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, this is the fiber to unwind from.
-    currentFiber = fiber;
-    if (!beginFiberMark(fiber, null)) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = true;
-  }
-}
+var NoContext = 0;
+var AsyncMode = 1;
+var StrictMode = 2;
 
-function cancelWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // Remember we shouldn't complete measurement for this fiber.
-    // Otherwise flamechart will be deep even for small updates.
-    fiber._debugIsCurrentlyTiming = false;
-    clearFiberMark(fiber, null);
-  }
-}
+var hasBadMapPolyfill = void 0;
 
-function stopWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    endFiberMark(fiber, null, null);
+{
+  hasBadMapPolyfill = false;
+  try {
+    var nonExtensibleObject = Object.preventExtensions({});
+    var testMap = new Map([[nonExtensibleObject, null]]);
+    var testSet = new Set([nonExtensibleObject]);
+    // This is necessary for Rollup to not consider these unused.
+    // https://github.com/rollup/rollup/issues/1771
+    // TODO: we can remove these if Rollup fixes the bug.
+    testMap.set(0, 0);
+    testSet.add(0);
+  } catch (e) {
+    // TODO: Consider warning about bad polyfills
+    hasBadMapPolyfill = true;
   }
 }
 
-function stopFailedWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    var warning$$1 = "An error was thrown inside this error boundary";
-    endFiberMark(fiber, null, warning$$1);
-  }
-}
+// A Fiber is work on a Component that needs to be done or was done. There can
+// be more than one per component.
 
-function startPhaseTimer(fiber, phase) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    clearPendingPhaseMeasurement();
-    if (!beginFiberMark(fiber, phase)) {
-      return;
-    }
-    currentPhaseFiber = fiber;
-    currentPhase = phase;
-  }
-}
+var debugCounter = void 0;
 
-function stopPhaseTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    if (currentPhase !== null && currentPhaseFiber !== null) {
-      var warning$$1 = hasScheduledUpdateInCurrentPhase
-        ? "Scheduled a cascading update"
-        : null;
-      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
-    }
-    currentPhase = null;
-    currentPhaseFiber = null;
-  }
+{
+  debugCounter = 1;
 }
 
-function startWorkLoopTimer(nextUnitOfWork) {
-  if (enableUserTimingAPI) {
-    currentFiber = nextUnitOfWork;
-    if (!supportsUserTiming) {
-      return;
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // This is top level call.
-    // Any other measurements are performed within.
-    beginMark("(React Tree Reconciliation)");
-    // Resume any measurements that were in progress during the last loop.
-    resumeTimers();
-  }
-}
+function FiberNode(tag, pendingProps, key, mode) {
+  // Instance
+  this.tag = tag;
+  this.key = key;
+  this.type = null;
+  this.stateNode = null;
 
-function stopWorkLoopTimer(interruptedBy, didCompleteRoot) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var warning$$1 = null;
-    if (interruptedBy !== null) {
-      if (interruptedBy.tag === HostRoot) {
-        warning$$1 = "A top-level update interrupted the previous render";
-      } else {
-        var componentName = getComponentName(interruptedBy) || "Unknown";
-        warning$$1 =
-          "An update to " + componentName + " interrupted the previous render";
-      }
-    } else if (commitCountInCurrentWorkLoop > 1) {
-      warning$$1 = "There were cascading updates";
-    }
-    commitCountInCurrentWorkLoop = 0;
-    var label = didCompleteRoot
-      ? "(React Tree Reconciliation: Completed Root)"
-      : "(React Tree Reconciliation: Yielded)";
-    // Pause any measurements until the next loop.
-    pauseTimers();
-    endMark(label, "(React Tree Reconciliation)", warning$$1);
-  }
-}
+  // Fiber
+  this["return"] = null;
+  this.child = null;
+  this.sibling = null;
+  this.index = 0;
 
-function startCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    isCommitting = true;
-    hasScheduledUpdateInCurrentCommit = false;
-    labelsInCurrentCommit.clear();
-    beginMark("(Committing Changes)");
-  }
-}
+  this.ref = null;
 
-function stopCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
+  this.pendingProps = pendingProps;
+  this.memoizedProps = null;
+  this.updateQueue = null;
+  this.memoizedState = null;
 
-    var warning$$1 = null;
-    if (hasScheduledUpdateInCurrentCommit) {
-      warning$$1 = "Lifecycle hook scheduled a cascading update";
-    } else if (commitCountInCurrentWorkLoop > 0) {
-      warning$$1 = "Caused by a cascading update in earlier commit";
-    }
-    hasScheduledUpdateInCurrentCommit = false;
-    commitCountInCurrentWorkLoop++;
-    isCommitting = false;
-    labelsInCurrentCommit.clear();
+  this.mode = mode;
 
-    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
-  }
-}
+  // Effects
+  this.effectTag = NoEffect;
+  this.nextEffect = null;
 
-function startCommitSnapshotEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Committing Snapshot Effects)");
-  }
-}
+  this.firstEffect = null;
+  this.lastEffect = null;
 
-function stopCommitSnapshotEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Committing Snapshot Effects: " + count + " Total)",
-      "(Committing Snapshot Effects)",
-      null
-    );
-  }
-}
+  this.expirationTime = NoWork;
 
-function startCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
+  this.alternate = null;
+
+  {
+    this._debugID = debugCounter++;
+    this._debugSource = null;
+    this._debugOwner = null;
+    this._debugIsCurrentlyTiming = false;
+    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
+      Object.preventExtensions(this);
     }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Committing Host Effects)");
   }
 }
 
-function stopCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Committing Host Effects: " + count + " Total)",
-      "(Committing Host Effects)",
-      null
-    );
-  }
+// This is a constructor function, rather than a POJO constructor, still
+// please ensure we do the following:
+// 1) Nobody should add any instance methods on this. Instance methods can be
+//    more difficult to predict when they get optimized and they are almost
+//    never inlined properly in static compilers.
+// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
+//    always know when it is a fiber.
+// 3) We might want to experiment with using numeric keys since they are easier
+//    to optimize in a non-JIT environment.
+// 4) We can easily go from a constructor to a createFiber object literal if that
+//    is faster.
+// 5) It should be easy to port this to a C struct and keep a C implementation
+//    compatible.
+var createFiber = function(tag, pendingProps, key, mode) {
+  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
+  return new FiberNode(tag, pendingProps, key, mode);
+};
+
+function shouldConstruct(Component) {
+  return !!(Component.prototype && Component.prototype.isReactComponent);
 }
 
-function startCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Calling Lifecycle Methods)");
-  }
-}
+// This is used to create an alternate fiber to do work on.
+function createWorkInProgress(current, pendingProps, expirationTime) {
+  var workInProgress = current.alternate;
+  if (workInProgress === null) {
+    // We use a double buffering pooling technique because we know that we'll
+    // only ever need at most two versions of a tree. We pool the "other" unused
+    // node that we're free to reuse. This is lazily created to avoid allocating
+    // extra objects for things that are never updated. It also allow us to
+    // reclaim the extra memory if needed.
+    workInProgress = createFiber(
+      current.tag,
+      pendingProps,
+      current.key,
+      current.mode
+    );
+    workInProgress.type = current.type;
+    workInProgress.stateNode = current.stateNode;
 
-function stopCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
+    {
+      // DEV-only fields
+      workInProgress._debugID = current._debugID;
+      workInProgress._debugSource = current._debugSource;
+      workInProgress._debugOwner = current._debugOwner;
     }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Calling Lifecycle Methods: " + count + " Total)",
-      "(Calling Lifecycle Methods)",
-      null
-    );
+
+    workInProgress.alternate = current;
+    current.alternate = workInProgress;
+  } else {
+    workInProgress.pendingProps = pendingProps;
+
+    // We already have an alternate.
+    // Reset the effect tag.
+    workInProgress.effectTag = NoEffect;
+
+    // The effect list is no longer valid.
+    workInProgress.nextEffect = null;
+    workInProgress.firstEffect = null;
+    workInProgress.lastEffect = null;
   }
-}
 
-var didWarnUpdateInsideUpdate = void 0;
+  workInProgress.expirationTime = expirationTime;
 
-{
-  didWarnUpdateInsideUpdate = false;
-}
+  workInProgress.child = current.child;
+  workInProgress.memoizedProps = current.memoizedProps;
+  workInProgress.memoizedState = current.memoizedState;
+  workInProgress.updateQueue = current.updateQueue;
 
-// Callbacks are not validated until invocation
+  // These will be overridden during the parent's reconciliation
+  workInProgress.sibling = current.sibling;
+  workInProgress.index = current.index;
+  workInProgress.ref = current.ref;
 
-// Singly linked-list of updates. When an update is scheduled, it is added to
-// the queue of the current fiber and the work-in-progress fiber. The two queues
-// are separate but they share a persistent structure.
-//
-// During reconciliation, updates are removed from the work-in-progress fiber,
-// but they remain on the current fiber. That ensures that if a work-in-progress
-// is aborted, the aborted updates are recovered by cloning from current.
-//
-// The work-in-progress queue is always a subset of the current queue.
-//
-// When the tree is committed, the work-in-progress becomes the current.
+  return workInProgress;
+}
 
-function createUpdateQueue(baseState) {
-  var queue = {
-    baseState: baseState,
-    expirationTime: NoWork,
-    first: null,
-    last: null,
-    callbackList: null,
-    hasForceUpdate: false,
-    isInitialized: false,
-    capturedValues: null
-  };
+function createHostRootFiber(isAsync) {
+  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
+  return createFiber(HostRoot, null, null, mode);
+}
+
+function createFiberFromElement(element, mode, expirationTime) {
+  var owner = null;
   {
-    queue.isProcessing = false;
+    owner = element._owner;
   }
-  return queue;
-}
 
-function insertUpdateIntoQueue(queue, update) {
-  // Append the update to the end of the list.
-  if (queue.last === null) {
-    // Queue is empty
-    queue.first = queue.last = update;
+  var fiber = void 0;
+  var type = element.type;
+  var key = element.key;
+  var pendingProps = element.props;
+
+  var fiberTag = void 0;
+  if (typeof type === "function") {
+    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
+  } else if (typeof type === "string") {
+    fiberTag = HostComponent;
   } else {
-    queue.last.next = update;
-    queue.last = update;
-  }
-  if (
-    queue.expirationTime === NoWork ||
-    queue.expirationTime > update.expirationTime
-  ) {
-    queue.expirationTime = update.expirationTime;
+    switch (type) {
+      case REACT_FRAGMENT_TYPE:
+        return createFiberFromFragment(
+          pendingProps.children,
+          mode,
+          expirationTime,
+          key
+        );
+      case REACT_ASYNC_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= AsyncMode | StrictMode;
+        break;
+      case REACT_STRICT_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= StrictMode;
+        break;
+      case REACT_CALL_TYPE:
+        fiberTag = CallComponent;
+        break;
+      case REACT_RETURN_TYPE:
+        fiberTag = ReturnComponent;
+        break;
+      default: {
+        if (typeof type === "object" && type !== null) {
+          switch (type.$$typeof) {
+            case REACT_PROVIDER_TYPE:
+              fiberTag = ContextProvider;
+              break;
+            case REACT_CONTEXT_TYPE:
+              // This is a consumer
+              fiberTag = ContextConsumer;
+              break;
+            default:
+              if (typeof type.tag === "number") {
+                // Currently assumed to be a continuation and therefore is a
+                // fiber already.
+                // TODO: The yield system is currently broken for updates in
+                // some cases. The reified yield stores a fiber, but we don't
+                // know which fiber that is; the current or a workInProgress?
+                // When the continuation gets rendered here we don't know if we
+                // can reuse that fiber or if we need to clone it. There is
+                // probably a clever way to restructure this.
+                fiber = type;
+                fiber.pendingProps = pendingProps;
+                fiber.expirationTime = expirationTime;
+                return fiber;
+              } else {
+                throwOnInvalidElementType(type, owner);
+              }
+              break;
+          }
+        } else {
+          throwOnInvalidElementType(type, owner);
+        }
+      }
+    }
   }
-}
 
-var q1 = void 0;
-var q2 = void 0;
-function ensureUpdateQueues(fiber) {
-  q1 = q2 = null;
-  // We'll have at least one and at most two distinct update queues.
-  var alternateFiber = fiber.alternate;
-  var queue1 = fiber.updateQueue;
-  if (queue1 === null) {
-    // TODO: We don't know what the base state will be until we begin work.
-    // It depends on which fiber is the next current. Initialize with an empty
-    // base state, then set to the memoizedState when rendering. Not super
-    // happy with this approach.
-    queue1 = fiber.updateQueue = createUpdateQueue(null);
-  }
+  fiber = createFiber(fiberTag, pendingProps, key, mode);
+  fiber.type = type;
+  fiber.expirationTime = expirationTime;
 
-  var queue2 = void 0;
-  if (alternateFiber !== null) {
-    queue2 = alternateFiber.updateQueue;
-    if (queue2 === null) {
-      queue2 = alternateFiber.updateQueue = createUpdateQueue(null);
-    }
-  } else {
-    queue2 = null;
+  {
+    fiber._debugSource = element._source;
+    fiber._debugOwner = element._owner;
   }
-  queue2 = queue2 !== queue1 ? queue2 : null;
 
-  // Use module variables instead of returning a tuple
-  q1 = queue1;
-  q2 = queue2;
+  return fiber;
 }
 
-function insertUpdateIntoFiber(fiber, update) {
-  ensureUpdateQueues(fiber);
-  var queue1 = q1;
-  var queue2 = q2;
-
-  // Warn if an update is scheduled from inside an updater function.
+function throwOnInvalidElementType(type, owner) {
+  var info = "";
   {
     if (
-      (queue1.isProcessing || (queue2 !== null && queue2.isProcessing)) &&
-      !didWarnUpdateInsideUpdate
+      type === undefined ||
+      (typeof type === "object" &&
+        type !== null &&
+        Object.keys(type).length === 0)
     ) {
-      warning(
-        false,
-        "An update (setState, replaceState, or forceUpdate) was scheduled " +
-          "from inside an update function. Update functions should be pure, " +
-          "with zero side-effects. Consider using componentDidUpdate or a " +
-          "callback."
-      );
-      didWarnUpdateInsideUpdate = true;
+      info +=
+        " You likely forgot to export your component from the file " +
+        "it's defined in, or you might have mixed up default and " +
+        "named imports.";
+    }
+    var ownerName = owner ? getComponentName(owner) : null;
+    if (ownerName) {
+      info += "\n\nCheck the render method of `" + ownerName + "`.";
     }
   }
+  invariant(
+    false,
+    "Element type is invalid: expected a string (for built-in " +
+      "components) or a class/function (for composite components) " +
+      "but got: %s.%s",
+    type == null ? type : typeof type,
+    info
+  );
+}
 
-  // If there's only one queue, add the update to that queue and exit.
-  if (queue2 === null) {
-    insertUpdateIntoQueue(queue1, update);
-    return;
-  }
+function createFiberFromFragment(elements, mode, expirationTime, key) {
+  var fiber = createFiber(Fragment, elements, key, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
+}
 
-  // If either queue is empty, we need to add to both queues.
-  if (queue1.last === null || queue2.last === null) {
-    insertUpdateIntoQueue(queue1, update);
-    insertUpdateIntoQueue(queue2, update);
-    return;
-  }
+function createFiberFromText(content, mode, expirationTime) {
+  var fiber = createFiber(HostText, content, null, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
+}
 
-  // If both lists are not empty, the last update is the same for both lists
-  // because of structural sharing. So, we should only append to one of
-  // the lists.
-  insertUpdateIntoQueue(queue1, update);
-  // But we still need to update the `last` pointer of queue2.
-  queue2.last = update;
+function createFiberFromHostInstanceForDeletion() {
+  var fiber = createFiber(HostComponent, null, null, NoContext);
+  fiber.type = "DELETED";
+  return fiber;
 }
 
-function getUpdateExpirationTime(fiber) {
-  switch (fiber.tag) {
-    case HostRoot:
-    case ClassComponent:
-      var updateQueue = fiber.updateQueue;
-      if (updateQueue === null) {
-        return NoWork;
-      }
-      return updateQueue.expirationTime;
-    default:
-      return NoWork;
-  }
+function createFiberFromPortal(portal, mode, expirationTime) {
+  var pendingProps = portal.children !== null ? portal.children : [];
+  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
+  fiber.expirationTime = expirationTime;
+  fiber.stateNode = {
+    containerInfo: portal.containerInfo,
+    pendingChildren: null, // Used by persistent updates
+    implementation: portal.implementation
+  };
+  return fiber;
 }
 
-function getStateFromUpdate(update, instance, prevState, props) {
-  var partialState = update.partialState;
-  if (typeof partialState === "function") {
-    return partialState.call(instance, prevState, props);
-  } else {
-    return partialState;
-  }
+// TODO: This should be lifted into the renderer.
+
+function createFiberRoot(containerInfo, isAsync, hydrate) {
+  // Cyclic construction. This cheats the type system right now because
+  // stateNode is any.
+  var uninitializedFiber = createHostRootFiber(isAsync);
+  var root = {
+    current: uninitializedFiber,
+    containerInfo: containerInfo,
+    pendingChildren: null,
+    pendingCommitExpirationTime: NoWork,
+    finishedWork: null,
+    context: null,
+    pendingContext: null,
+    hydrate: hydrate,
+    remainingExpirationTime: NoWork,
+    firstBatch: null,
+    nextScheduledRoot: null
+  };
+  uninitializedFiber.stateNode = root;
+  return root;
 }
 
-function processUpdateQueue(
-  current,
-  workInProgress,
-  queue,
-  instance,
-  props,
-  renderExpirationTime
-) {
-  if (current !== null && current.updateQueue === queue) {
-    // We need to create a work-in-progress queue, by cloning the current queue.
-    var currentQueue = queue;
-    queue = workInProgress.updateQueue = {
-      baseState: currentQueue.baseState,
-      expirationTime: currentQueue.expirationTime,
-      first: currentQueue.first,
-      last: currentQueue.last,
-      isInitialized: currentQueue.isInitialized,
-      capturedValues: currentQueue.capturedValues,
-      // These fields are no longer valid because they were already committed.
-      // Reset them.
-      callbackList: null,
-      hasForceUpdate: false
-    };
-  }
+var onCommitFiberRoot = null;
+var onCommitFiberUnmount = null;
+var hasLoggedError = false;
 
-  {
-    // Set this flag so we can warn if setState is called inside the update
-    // function of another setState.
-    queue.isProcessing = true;
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {
+      if (true && !hasLoggedError) {
+        hasLoggedError = true;
+        warning(false, "React DevTools encountered an error: %s", err);
+      }
+    }
+  };
+}
+
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
+    return false;
+  }
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
+  }
+  if (!hook.supportsFiber) {
+    {
+      warning(
+        false,
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://fb.me/react-devtools"
+      );
+    }
+    // DevTools exists, even though it doesn't support Fiber.
+    return true;
+  }
+  try {
+    var rendererID = hook.inject(internals);
+    // We have successfully injected, so now it is safe to set up hooks.
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      warning(false, "React DevTools encountered an error: %s.", err);
+    }
   }
+  // DevTools exists
+  return true;
+}
 
-  // Reset the remaining expiration time. If we skip over any updates, we'll
-  // increase this accordingly.
-  queue.expirationTime = NoWork;
+function onCommitRoot(root) {
+  if (typeof onCommitFiberRoot === "function") {
+    onCommitFiberRoot(root);
+  }
+}
 
-  // TODO: We don't know what the base state will be until we begin work.
-  // It depends on which fiber is the next current. Initialize with an empty
-  // base state, then set to the memoizedState when rendering. Not super
-  // happy with this approach.
-  var state = void 0;
-  if (queue.isInitialized) {
-    state = queue.baseState;
-  } else {
-    state = queue.baseState = workInProgress.memoizedState;
-    queue.isInitialized = true;
+function onCommitUnmount(fiber) {
+  if (typeof onCommitFiberUnmount === "function") {
+    onCommitFiberUnmount(fiber);
   }
-  var dontMutatePrevState = true;
-  var update = queue.first;
-  var didSkip = false;
-  while (update !== null) {
-    var updateExpirationTime = update.expirationTime;
-    if (updateExpirationTime > renderExpirationTime) {
-      // This update does not have sufficient priority. Skip it.
-      var remainingExpirationTime = queue.expirationTime;
-      if (
-        remainingExpirationTime === NoWork ||
-        remainingExpirationTime > updateExpirationTime
-      ) {
-        // Update the remaining expiration time.
-        queue.expirationTime = updateExpirationTime;
-      }
-      if (!didSkip) {
-        didSkip = true;
-        queue.baseState = state;
-      }
-      // Continue to the next update.
-      update = update.next;
-      continue;
-    }
+}
 
-    // This update does have sufficient priority.
+/**
+ * Forked from fbjs/warning:
+ * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
+ *
+ * Only change is we use console.warn instead of console.error,
+ * and do nothing when 'console' is not supported.
+ * This really simplifies the code.
+ * ---
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
 
-    // If no previous updates were skipped, drop this update from the queue by
-    // advancing the head of the list.
-    if (!didSkip) {
-      queue.first = update.next;
-      if (queue.first === null) {
-        queue.last = null;
-      }
-    }
+var lowPriorityWarning = function() {};
 
-    // Invoke setState callback an extra time to help detect side-effects.
-    // Ignore the return value in this case.
-    if (
-      debugRenderPhaseSideEffects ||
-      (debugRenderPhaseSideEffectsForStrictMode &&
-        workInProgress.mode & StrictMode)
+{
+  var printWarning = function(format) {
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 1 ? _len - 1 : 0),
+        _key = 1;
+      _key < _len;
+      _key++
     ) {
-      getStateFromUpdate(update, instance, state, props);
+      args[_key - 1] = arguments[_key];
     }
 
-    // Process the update
-    var _partialState = void 0;
-    if (update.isReplace) {
-      state = getStateFromUpdate(update, instance, state, props);
-      dontMutatePrevState = true;
-    } else {
-      _partialState = getStateFromUpdate(update, instance, state, props);
-      if (_partialState) {
-        if (dontMutatePrevState) {
-          // $FlowFixMe: Idk how to type this properly.
-          state = Object.assign({}, state, _partialState);
-        } else {
-          state = Object.assign(state, _partialState);
-        }
-        dontMutatePrevState = false;
-      }
-    }
-    if (update.isForced) {
-      queue.hasForceUpdate = true;
+    var argIndex = 0;
+    var message =
+      "Warning: " +
+      format.replace(/%s/g, function() {
+        return args[argIndex++];
+      });
+    if (typeof console !== "undefined") {
+      console.warn(message);
     }
-    if (update.callback !== null) {
-      // Append to list of callbacks.
-      var _callbackList = queue.callbackList;
-      if (_callbackList === null) {
-        _callbackList = queue.callbackList = [];
-      }
-      _callbackList.push(update);
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      throw new Error(message);
+    } catch (x) {}
+  };
+
+  lowPriorityWarning = function(condition, format) {
+    if (format === undefined) {
+      throw new Error(
+        "`warning(condition, format, ...args)` requires a warning " +
+          "message argument"
+      );
     }
-    if (update.capturedValue !== null) {
-      var _capturedValues = queue.capturedValues;
-      if (_capturedValues === null) {
-        queue.capturedValues = [update.capturedValue];
-      } else {
-        _capturedValues.push(update.capturedValue);
+    if (!condition) {
+      for (
+        var _len2 = arguments.length,
+          args = Array(_len2 > 2 ? _len2 - 2 : 0),
+          _key2 = 2;
+        _key2 < _len2;
+        _key2++
+      ) {
+        args[_key2 - 2] = arguments[_key2];
       }
+
+      printWarning.apply(undefined, [format].concat(args));
     }
-    update = update.next;
-  }
+  };
+}
 
-  if (queue.callbackList !== null) {
-    workInProgress.effectTag |= Callback;
-  } else if (
-    queue.first === null &&
-    !queue.hasForceUpdate &&
-    queue.capturedValues === null
-  ) {
-    // The queue is empty. We can reset it.
-    workInProgress.updateQueue = null;
-  }
+var lowPriorityWarning$1 = lowPriorityWarning;
 
-  if (!didSkip) {
-    didSkip = true;
-    queue.baseState = state;
-  }
+var ReactStrictModeWarnings = {
+  discardPendingWarnings: function() {},
+  flushPendingDeprecationWarnings: function() {},
+  flushPendingUnsafeLifecycleWarnings: function() {},
+  recordDeprecationWarnings: function(fiber, instance) {},
+  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
+};
 
-  {
-    // No longer processing.
-    queue.isProcessing = false;
-  }
+{
+  var LIFECYCLE_SUGGESTIONS = {
+    UNSAFE_componentWillMount: "componentDidMount",
+    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
+    UNSAFE_componentWillUpdate: "componentDidUpdate"
+  };
 
-  return state;
-}
+  var pendingComponentWillMountWarnings = [];
+  var pendingComponentWillReceivePropsWarnings = [];
+  var pendingComponentWillUpdateWarnings = [];
+  var pendingUnsafeLifecycleWarnings = new Map();
 
-function commitCallbacks(queue, context) {
-  var callbackList = queue.callbackList;
-  if (callbackList === null) {
-    return;
-  }
-  // Set the list to null to make sure they don't get called more than once.
-  queue.callbackList = null;
-  for (var i = 0; i < callbackList.length; i++) {
-    var update = callbackList[i];
-    var _callback = update.callback;
-    // This update might be processed again. Clear the callback so it's only
-    // called once.
-    update.callback = null;
-    invariant(
-      typeof _callback === "function",
-      "Invalid argument passed as callback. Expected a function. Instead " +
-        "received: %s",
-      _callback
-    );
-    _callback.call(context);
-  }
-}
+  // Tracks components we have already warned about.
+  var didWarnAboutDeprecatedLifecycles = new Set();
+  var didWarnAboutUnsafeLifecycles = new Set();
 
-var fakeInternalInstance = {};
-var isArray = Array.isArray;
+  ReactStrictModeWarnings.discardPendingWarnings = function() {
+    pendingComponentWillMountWarnings = [];
+    pendingComponentWillReceivePropsWarnings = [];
+    pendingComponentWillUpdateWarnings = [];
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-var didWarnAboutStateAssignmentForComponent = void 0;
-var didWarnAboutUndefinedDerivedState = void 0;
-var didWarnAboutUninitializedState = void 0;
-var didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = void 0;
-var didWarnAboutLegacyLifecyclesAndDerivedState = void 0;
-var warnOnInvalidCallback = void 0;
+  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
+    pendingUnsafeLifecycleWarnings.forEach(function(
+      lifecycleWarningsMap,
+      strictRoot
+    ) {
+      var lifecyclesWarningMesages = [];
 
-{
-  didWarnAboutStateAssignmentForComponent = new Set();
-  didWarnAboutUndefinedDerivedState = new Set();
-  didWarnAboutUninitializedState = new Set();
-  didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = new Set();
-  didWarnAboutLegacyLifecyclesAndDerivedState = new Set();
+      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
+        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
+        if (lifecycleWarnings.length > 0) {
+          var componentNames = new Set();
+          lifecycleWarnings.forEach(function(fiber) {
+            componentNames.add(getComponentName(fiber) || "Component");
+            didWarnAboutUnsafeLifecycles.add(fiber.type);
+          });
 
-  var didWarnOnInvalidCallback = new Set();
+          var formatted = lifecycle.replace("UNSAFE_", "");
+          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
+          var sortedComponentNames = Array.from(componentNames)
+            .sort()
+            .join(", ");
 
-  warnOnInvalidCallback = function(callback, callerName) {
-    if (callback === null || typeof callback === "function") {
-      return;
-    }
-    var key = callerName + "_" + callback;
-    if (!didWarnOnInvalidCallback.has(key)) {
-      didWarnOnInvalidCallback.add(key);
-      warning(
-        false,
-        "%s(...): Expected the last optional `callback` argument to be a " +
-          "function. Instead received: %s.",
-        callerName,
-        callback
-      );
-    }
+          lifecyclesWarningMesages.push(
+            formatted +
+              ": Please update the following components to use " +
+              (suggestion + " instead: " + sortedComponentNames)
+          );
+        }
+      });
+
+      if (lifecyclesWarningMesages.length > 0) {
+        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
+          strictRoot
+        );
+
+        warning(
+          false,
+          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
+            "\n\n%s" +
+            "\n\nLearn more about this warning here:" +
+            "\nhttps://fb.me/react-strict-mode-warnings",
+          strictRootComponentStack,
+          lifecyclesWarningMesages.join("\n\n")
+        );
+      }
+    });
+
+    pendingUnsafeLifecycleWarnings = new Map();
   };
 
-  // This is so gross but it's at least non-critical and can be removed if
-  // it causes problems. This is meant to give a nicer error message for
-  // ReactDOM15.unstable_renderSubtreeIntoContainer(reactDOM16Component,
-  // ...)) which otherwise throws a "_processChildContext is not a function"
-  // exception.
-  Object.defineProperty(fakeInternalInstance, "_processChildContext", {
-    enumerable: false,
-    value: function() {
-      invariant(
-        false,
-        "_processChildContext is not available in React 16+. This likely " +
-          "means you have multiple copies of React and are attempting to nest " +
-          "a React 15 tree inside a React 16 tree using " +
-          "unstable_renderSubtreeIntoContainer, which isn't supported. Try " +
-          "to make sure you have only one copy of React (and ideally, switch " +
-          "to ReactDOM.createPortal)."
-      );
-    }
-  });
-  Object.freeze(fakeInternalInstance);
-}
-function callGetDerivedStateFromCatch(ctor, capturedValues) {
-  var resultState = {};
-  for (var i = 0; i < capturedValues.length; i++) {
-    var capturedValue = capturedValues[i];
-    var error = capturedValue.value;
-    var partialState = ctor.getDerivedStateFromCatch.call(null, error);
-    if (partialState !== null && partialState !== undefined) {
-      Object.assign(resultState, partialState);
+  var getStrictRoot = function(fiber) {
+    var maybeStrictRoot = null;
+
+    while (fiber !== null) {
+      if (fiber.mode & StrictMode) {
+        maybeStrictRoot = fiber;
+      }
+
+      fiber = fiber["return"];
     }
-  }
-  return resultState;
-}
 
-var ReactFiberClassComponent = function(
-  legacyContext,
-  scheduleWork,
-  computeExpirationForFiber,
-  memoizeProps,
-  memoizeState
-) {
-  var cacheContext = legacyContext.cacheContext,
-    getMaskedContext = legacyContext.getMaskedContext,
-    getUnmaskedContext = legacyContext.getUnmaskedContext,
-    isContextConsumer = legacyContext.isContextConsumer,
-    hasContextChanged = legacyContext.hasContextChanged;
+    return maybeStrictRoot;
+  };
 
-  // Class component state updater
+  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
+    if (pendingComponentWillMountWarnings.length > 0) {
+      var uniqueNames = new Set();
+      pendingComponentWillMountWarnings.forEach(function(fiber) {
+        uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-  var updater = {
-    isMounted: isMounted,
-    enqueueSetState: function(instance, partialState, callback) {
-      var fiber = get(instance);
-      callback = callback === undefined ? null : callback;
-      {
-        warnOnInvalidCallback(callback, "setState");
-      }
-      var expirationTime = computeExpirationForFiber(fiber);
-      var update = {
-        expirationTime: expirationTime,
-        partialState: partialState,
-        callback: callback,
-        isReplace: false,
-        isForced: false,
-        capturedValue: null,
-        next: null
-      };
-      insertUpdateIntoFiber(fiber, update);
-      scheduleWork(fiber, expirationTime);
-    },
-    enqueueReplaceState: function(instance, state, callback) {
-      var fiber = get(instance);
-      callback = callback === undefined ? null : callback;
-      {
-        warnOnInvalidCallback(callback, "replaceState");
-      }
-      var expirationTime = computeExpirationForFiber(fiber);
-      var update = {
-        expirationTime: expirationTime,
-        partialState: state,
-        callback: callback,
-        isReplace: true,
-        isForced: false,
-        capturedValue: null,
-        next: null
-      };
-      insertUpdateIntoFiber(fiber, update);
-      scheduleWork(fiber, expirationTime);
-    },
-    enqueueForceUpdate: function(instance, callback) {
-      var fiber = get(instance);
-      callback = callback === undefined ? null : callback;
-      {
-        warnOnInvalidCallback(callback, "forceUpdate");
-      }
-      var expirationTime = computeExpirationForFiber(fiber);
-      var update = {
-        expirationTime: expirationTime,
-        partialState: null,
-        callback: callback,
-        isReplace: false,
-        isForced: true,
-        capturedValue: null,
-        next: null
-      };
-      insertUpdateIntoFiber(fiber, update);
-      scheduleWork(fiber, expirationTime);
+      var sortedNames = Array.from(uniqueNames)
+        .sort()
+        .join(", ");
+
+      lowPriorityWarning$1(
+        false,
+        "componentWillMount is deprecated and will be removed in the next major version. " +
+          "Use componentDidMount instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillMount." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        sortedNames
+      );
+
+      pendingComponentWillMountWarnings = [];
+    }
+
+    if (pendingComponentWillReceivePropsWarnings.length > 0) {
+      var _uniqueNames = new Set();
+      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
+        _uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
+
+      var _sortedNames = Array.from(_uniqueNames)
+        .sort()
+        .join(", ");
+
+      lowPriorityWarning$1(
+        false,
+        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
+          "Use static getDerivedStateFromProps instead." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames
+      );
+
+      pendingComponentWillReceivePropsWarnings = [];
+    }
+
+    if (pendingComponentWillUpdateWarnings.length > 0) {
+      var _uniqueNames2 = new Set();
+      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
+        _uniqueNames2.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
+
+      var _sortedNames2 = Array.from(_uniqueNames2)
+        .sort()
+        .join(", ");
+
+      lowPriorityWarning$1(
+        false,
+        "componentWillUpdate is deprecated and will be removed in the next major version. " +
+          "Use componentDidUpdate instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillUpdate." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames2
+      );
+
+      pendingComponentWillUpdateWarnings = [];
     }
   };
 
-  function checkShouldComponentUpdate(
-    workInProgress,
-    oldProps,
-    newProps,
-    oldState,
-    newState,
-    newContext
+  ReactStrictModeWarnings.recordDeprecationWarnings = function(
+    fiber,
+    instance
   ) {
+    // Dedup strategy: Warn once per component.
+    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+      return;
+    }
+
+    // Don't warn about react-lifecycles-compat polyfilled components.
     if (
-      oldProps === null ||
-      (workInProgress.updateQueue !== null &&
-        workInProgress.updateQueue.hasForceUpdate)
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning !== true
     ) {
-      // If the workInProgress already has an Update effect, return true
-      return true;
+      pendingComponentWillMountWarnings.push(fiber);
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" &&
+      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillReceivePropsWarnings.push(fiber);
+    }
+    if (typeof instance.componentWillUpdate === "function") {
+      pendingComponentWillUpdateWarnings.push(fiber);
     }
+  };
 
-    var instance = workInProgress.stateNode;
-    var ctor = workInProgress.type;
-    if (typeof instance.shouldComponentUpdate === "function") {
-      startPhaseTimer(workInProgress, "shouldComponentUpdate");
-      var shouldUpdate = instance.shouldComponentUpdate(
-        newProps,
-        newState,
-        newContext
-      );
-      stopPhaseTimer();
+  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
+    fiber,
+    instance
+  ) {
+    var strictRoot = getStrictRoot(fiber);
 
-      {
-        !(shouldUpdate !== undefined)
-          ? warning(
-              false,
-              "%s.shouldComponentUpdate(): Returned undefined instead of a " +
-                "boolean value. Make sure to return true or false.",
-              getComponentName(workInProgress) || "Component"
-            )
-          : void 0;
-      }
+    // Dedup strategy: Warn once per component.
+    // This is difficult to track any other way since component names
+    // are often vague and are likely to collide between 3rd party libraries.
+    // An expand property is probably okay to use here since it's DEV-only,
+    // and will only be set in the event of serious warnings.
+    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+      return;
+    }
 
-      return shouldUpdate;
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    // Note that it is sufficient to check for the presence of a
+    // single lifecycle, componentWillMount, with the polyfill flag.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning === true
+    ) {
+      return;
     }
 
-    if (ctor.prototype && ctor.prototype.isPureReactComponent) {
-      return (
-        !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
-      );
+    var warningsForRoot = void 0;
+    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
+      warningsForRoot = {
+        UNSAFE_componentWillMount: [],
+        UNSAFE_componentWillReceiveProps: [],
+        UNSAFE_componentWillUpdate: []
+      };
+
+      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
+    } else {
+      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
     }
 
-    return true;
-  }
+    var unsafeLifecycles = [];
+    if (
+      typeof instance.componentWillMount === "function" ||
+      typeof instance.UNSAFE_componentWillMount === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillMount");
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" ||
+      typeof instance.UNSAFE_componentWillReceiveProps === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
+    }
+    if (
+      typeof instance.componentWillUpdate === "function" ||
+      typeof instance.UNSAFE_componentWillUpdate === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
+    }
 
-  function checkClassInstance(workInProgress) {
-    var instance = workInProgress.stateNode;
-    var type = workInProgress.type;
-    {
-      var name = getComponentName(workInProgress) || "Component";
-      var renderPresent = instance.render;
+    if (unsafeLifecycles.length > 0) {
+      unsafeLifecycles.forEach(function(lifecycle) {
+        warningsForRoot[lifecycle].push(fiber);
+      });
+    }
+  };
+}
 
-      if (!renderPresent) {
-        if (type.prototype && typeof type.prototype.render === "function") {
-          warning(
-            false,
-            "%s(...): No `render` method found on the returned component " +
-              "instance: did you accidentally return an object from the constructor?",
-            name
-          );
-        } else {
-          warning(
-            false,
-            "%s(...): No `render` method found on the returned component " +
-              "instance: you may have forgotten to define `render`.",
-            name
-          );
-        }
-      }
+var didWarnUpdateInsideUpdate = void 0;
 
-      var noGetInitialStateOnES6 =
-        !instance.getInitialState ||
-        instance.getInitialState.isReactClassApproved ||
-        instance.state;
-      !noGetInitialStateOnES6
-        ? warning(
-            false,
-            "getInitialState was defined on %s, a plain JavaScript class. " +
-              "This is only supported for classes created using React.createClass. " +
-              "Did you mean to define a state property instead?",
-            name
-          )
-        : void 0;
-      var noGetDefaultPropsOnES6 =
-        !instance.getDefaultProps ||
-        instance.getDefaultProps.isReactClassApproved;
-      !noGetDefaultPropsOnES6
-        ? warning(
-            false,
-            "getDefaultProps was defined on %s, a plain JavaScript class. " +
-              "This is only supported for classes created using React.createClass. " +
-              "Use a static property to define defaultProps instead.",
-            name
-          )
-        : void 0;
-      var noInstancePropTypes = !instance.propTypes;
-      !noInstancePropTypes
-        ? warning(
-            false,
-            "propTypes was defined as an instance property on %s. Use a static " +
-              "property to define propTypes instead.",
-            name
-          )
-        : void 0;
-      var noInstanceContextTypes = !instance.contextTypes;
-      !noInstanceContextTypes
-        ? warning(
-            false,
-            "contextTypes was defined as an instance property on %s. Use a static " +
-              "property to define contextTypes instead.",
-            name
-          )
-        : void 0;
-      var noComponentShouldUpdate =
-        typeof instance.componentShouldUpdate !== "function";
-      !noComponentShouldUpdate
-        ? warning(
-            false,
-            "%s has a method called " +
-              "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
-              "The name is phrased as a question because the function is " +
-              "expected to return a value.",
-            name
-          )
-        : void 0;
-      if (
-        type.prototype &&
-        type.prototype.isPureReactComponent &&
-        typeof instance.shouldComponentUpdate !== "undefined"
-      ) {
-        warning(
-          false,
-          "%s has a method called shouldComponentUpdate(). " +
-            "shouldComponentUpdate should not be used when extending React.PureComponent. " +
-            "Please extend React.Component if shouldComponentUpdate is used.",
-          getComponentName(workInProgress) || "A pure component"
-        );
-      }
-      var noComponentDidUnmount =
-        typeof instance.componentDidUnmount !== "function";
-      !noComponentDidUnmount
-        ? warning(
-            false,
-            "%s has a method called " +
-              "componentDidUnmount(). But there is no such lifecycle method. " +
-              "Did you mean componentWillUnmount()?",
-            name
-          )
-        : void 0;
-      var noComponentDidReceiveProps =
-        typeof instance.componentDidReceiveProps !== "function";
-      !noComponentDidReceiveProps
-        ? warning(
-            false,
-            "%s has a method called " +
-              "componentDidReceiveProps(). But there is no such lifecycle method. " +
-              "If you meant to update the state in response to changing props, " +
-              "use componentWillReceiveProps(). If you meant to fetch data or " +
-              "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
-            name
-          )
-        : void 0;
-      var noComponentWillRecieveProps =
-        typeof instance.componentWillRecieveProps !== "function";
-      !noComponentWillRecieveProps
-        ? warning(
-            false,
-            "%s has a method called " +
-              "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
-            name
-          )
-        : void 0;
-      var noUnsafeComponentWillRecieveProps =
-        typeof instance.UNSAFE_componentWillRecieveProps !== "function";
-      !noUnsafeComponentWillRecieveProps
-        ? warning(
-            false,
-            "%s has a method called " +
-              "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
-            name
-          )
-        : void 0;
-      var hasMutatedProps = instance.props !== workInProgress.pendingProps;
-      !(instance.props === undefined || !hasMutatedProps)
-        ? warning(
-            false,
-            "%s(...): When calling super() in `%s`, make sure to pass " +
-              "up the same props that your component's constructor was passed.",
-            name,
-            name
-          )
-        : void 0;
-      var noInstanceDefaultProps = !instance.defaultProps;
-      !noInstanceDefaultProps
-        ? warning(
-            false,
-            "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
-              " Instead, define defaultProps as a static property on %s.",
-            name,
-            name
-          )
-        : void 0;
+{
+  didWarnUpdateInsideUpdate = false;
+}
 
-      if (
-        typeof instance.getSnapshotBeforeUpdate === "function" &&
-        typeof instance.componentDidUpdate !== "function" &&
-        typeof instance.componentDidUpdate !== "function" &&
-        !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
-      ) {
-        didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
-        warning(
-          false,
-          "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
-            "This component defines getSnapshotBeforeUpdate() only.",
-          getComponentName(workInProgress)
-        );
-      }
+// Callbacks are not validated until invocation
 
-      var noInstanceGetDerivedStateFromProps =
-        typeof instance.getDerivedStateFromProps !== "function";
-      !noInstanceGetDerivedStateFromProps
-        ? warning(
-            false,
-            "%s: getDerivedStateFromProps() is defined as an instance method " +
-              "and will be ignored. Instead, declare it as a static method.",
-            name
-          )
-        : void 0;
-      var noInstanceGetDerivedStateFromCatch =
-        typeof instance.getDerivedStateFromCatch !== "function";
-      !noInstanceGetDerivedStateFromCatch
-        ? warning(
-            false,
-            "%s: getDerivedStateFromCatch() is defined as an instance method " +
-              "and will be ignored. Instead, declare it as a static method.",
-            name
-          )
-        : void 0;
-      var noStaticGetSnapshotBeforeUpdate =
-        typeof type.getSnapshotBeforeUpdate !== "function";
-      !noStaticGetSnapshotBeforeUpdate
-        ? warning(
-            false,
-            "%s: getSnapshotBeforeUpdate() is defined as a static method " +
-              "and will be ignored. Instead, declare it as an instance method.",
-            name
-          )
-        : void 0;
-      var _state = instance.state;
-      if (_state && (typeof _state !== "object" || isArray(_state))) {
-        warning(false, "%s.state: must be set to an object or null", name);
-      }
-      if (typeof instance.getChildContext === "function") {
-        !(typeof type.childContextTypes === "object")
-          ? warning(
-              false,
-              "%s.getChildContext(): childContextTypes must be defined in order to " +
-                "use getChildContext().",
-              name
-            )
-          : void 0;
-      }
-    }
+// Singly linked-list of updates. When an update is scheduled, it is added to
+// the queue of the current fiber and the work-in-progress fiber. The two queues
+// are separate but they share a persistent structure.
+//
+// During reconciliation, updates are removed from the work-in-progress fiber,
+// but they remain on the current fiber. That ensures that if a work-in-progress
+// is aborted, the aborted updates are recovered by cloning from current.
+//
+// The work-in-progress queue is always a subset of the current queue.
+//
+// When the tree is committed, the work-in-progress becomes the current.
+
+function createUpdateQueue(baseState) {
+  var queue = {
+    baseState: baseState,
+    expirationTime: NoWork,
+    first: null,
+    last: null,
+    callbackList: null,
+    hasForceUpdate: false,
+    isInitialized: false,
+    capturedValues: null
+  };
+  {
+    queue.isProcessing = false;
   }
+  return queue;
+}
 
-  function resetInputPointers(workInProgress, instance) {
-    instance.props = workInProgress.memoizedProps;
-    instance.state = workInProgress.memoizedState;
+function insertUpdateIntoQueue(queue, update) {
+  // Append the update to the end of the list.
+  if (queue.last === null) {
+    // Queue is empty
+    queue.first = queue.last = update;
+  } else {
+    queue.last.next = update;
+    queue.last = update;
+  }
+  if (
+    queue.expirationTime === NoWork ||
+    queue.expirationTime > update.expirationTime
+  ) {
+    queue.expirationTime = update.expirationTime;
   }
+}
 
-  function adoptClassInstance(workInProgress, instance) {
-    instance.updater = updater;
-    workInProgress.stateNode = instance;
-    // The instance needs access to the fiber so that it can schedule updates
-    set(instance, workInProgress);
-    {
-      instance._reactInternalInstance = fakeInternalInstance;
+var q1 = void 0;
+var q2 = void 0;
+function ensureUpdateQueues(fiber) {
+  q1 = q2 = null;
+  // We'll have at least one and at most two distinct update queues.
+  var alternateFiber = fiber.alternate;
+  var queue1 = fiber.updateQueue;
+  if (queue1 === null) {
+    // TODO: We don't know what the base state will be until we begin work.
+    // It depends on which fiber is the next current. Initialize with an empty
+    // base state, then set to the memoizedState when rendering. Not super
+    // happy with this approach.
+    queue1 = fiber.updateQueue = createUpdateQueue(null);
+  }
+
+  var queue2 = void 0;
+  if (alternateFiber !== null) {
+    queue2 = alternateFiber.updateQueue;
+    if (queue2 === null) {
+      queue2 = alternateFiber.updateQueue = createUpdateQueue(null);
     }
+  } else {
+    queue2 = null;
   }
+  queue2 = queue2 !== queue1 ? queue2 : null;
 
-  function constructClassInstance(workInProgress, props) {
-    var ctor = workInProgress.type;
-    var unmaskedContext = getUnmaskedContext(workInProgress);
-    var needsContext = isContextConsumer(workInProgress);
-    var context = needsContext
-      ? getMaskedContext(workInProgress, unmaskedContext)
-      : emptyObject;
+  // Use module variables instead of returning a tuple
+  q1 = queue1;
+  q2 = queue2;
+}
 
-    // Instantiate twice to help detect side-effects.
+function insertUpdateIntoFiber(fiber, update) {
+  ensureUpdateQueues(fiber);
+  var queue1 = q1;
+  var queue2 = q2;
+
+  // Warn if an update is scheduled from inside an updater function.
+  {
     if (
-      debugRenderPhaseSideEffects ||
-      (debugRenderPhaseSideEffectsForStrictMode &&
-        workInProgress.mode & StrictMode)
+      (queue1.isProcessing || (queue2 !== null && queue2.isProcessing)) &&
+      !didWarnUpdateInsideUpdate
     ) {
-      new ctor(props, context); // eslint-disable-line no-new
+      warning(
+        false,
+        "An update (setState, replaceState, or forceUpdate) was scheduled " +
+          "from inside an update function. Update functions should be pure, " +
+          "with zero side-effects. Consider using componentDidUpdate or a " +
+          "callback."
+      );
+      didWarnUpdateInsideUpdate = true;
     }
+  }
 
-    var instance = new ctor(props, context);
-    var state =
-      instance.state !== null && instance.state !== undefined
-        ? instance.state
-        : null;
-    adoptClassInstance(workInProgress, instance);
-
-    {
-      if (
-        typeof ctor.getDerivedStateFromProps === "function" &&
-        state === null
-      ) {
-        var componentName = getComponentName(workInProgress) || "Component";
-        if (!didWarnAboutUninitializedState.has(componentName)) {
-          didWarnAboutUninitializedState.add(componentName);
-          warning(
-            false,
-            "%s: Did not properly initialize state during construction. " +
-              "Expected state to be an object, but it was %s.",
-            componentName,
-            instance.state === null ? "null" : "undefined"
-          );
-        }
-      }
+  // If there's only one queue, add the update to that queue and exit.
+  if (queue2 === null) {
+    insertUpdateIntoQueue(queue1, update);
+    return;
+  }
 
-      // If new component APIs are defined, "unsafe" lifecycles won't be called.
-      // Warn about these lifecycles if they are present.
-      // Don't warn about react-lifecycles-compat polyfilled methods though.
-      if (
-        typeof ctor.getDerivedStateFromProps === "function" ||
-        typeof instance.getSnapshotBeforeUpdate === "function"
-      ) {
-        var foundWillMountName = null;
-        var foundWillReceivePropsName = null;
-        var foundWillUpdateName = null;
-        if (
-          typeof instance.componentWillMount === "function" &&
-          instance.componentWillMount.__suppressDeprecationWarning !== true
-        ) {
-          foundWillMountName = "componentWillMount";
-        } else if (typeof instance.UNSAFE_componentWillMount === "function") {
-          foundWillMountName = "UNSAFE_componentWillMount";
-        }
-        if (
-          typeof instance.componentWillReceiveProps === "function" &&
-          instance.componentWillReceiveProps.__suppressDeprecationWarning !==
-            true
-        ) {
-          foundWillReceivePropsName = "componentWillReceiveProps";
-        } else if (
-          typeof instance.UNSAFE_componentWillReceiveProps === "function"
-        ) {
-          foundWillReceivePropsName = "UNSAFE_componentWillReceiveProps";
-        }
-        if (
-          typeof instance.componentWillUpdate === "function" &&
-          instance.componentWillUpdate.__suppressDeprecationWarning !== true
-        ) {
-          foundWillUpdateName = "componentWillUpdate";
-        } else if (typeof instance.UNSAFE_componentWillUpdate === "function") {
-          foundWillUpdateName = "UNSAFE_componentWillUpdate";
-        }
-        if (
-          foundWillMountName !== null ||
-          foundWillReceivePropsName !== null ||
-          foundWillUpdateName !== null
-        ) {
-          var _componentName = getComponentName(workInProgress) || "Component";
-          var newApiName =
-            typeof ctor.getDerivedStateFromProps === "function"
-              ? "getDerivedStateFromProps()"
-              : "getSnapshotBeforeUpdate()";
-          if (
-            !didWarnAboutLegacyLifecyclesAndDerivedState.has(_componentName)
-          ) {
-            didWarnAboutLegacyLifecyclesAndDerivedState.add(_componentName);
-            warning(
-              false,
-              "Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n" +
-                "%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n" +
-                "The above lifecycles should be removed. Learn more about this warning here:\n" +
-                "https://fb.me/react-async-component-lifecycle-hooks",
-              _componentName,
-              newApiName,
-              foundWillMountName !== null ? "\n  " + foundWillMountName : "",
-              foundWillReceivePropsName !== null
-                ? "\n  " + foundWillReceivePropsName
-                : "",
-              foundWillUpdateName !== null ? "\n  " + foundWillUpdateName : ""
-            );
-          }
-        }
-      }
-    }
+  // If either queue is empty, we need to add to both queues.
+  if (queue1.last === null || queue2.last === null) {
+    insertUpdateIntoQueue(queue1, update);
+    insertUpdateIntoQueue(queue2, update);
+    return;
+  }
 
-    workInProgress.memoizedState = state;
+  // If both lists are not empty, the last update is the same for both lists
+  // because of structural sharing. So, we should only append to one of
+  // the lists.
+  insertUpdateIntoQueue(queue1, update);
+  // But we still need to update the `last` pointer of queue2.
+  queue2.last = update;
+}
 
-    var partialState = callGetDerivedStateFromProps(
-      workInProgress,
-      instance,
-      props,
-      state
-    );
+function getUpdateExpirationTime(fiber) {
+  switch (fiber.tag) {
+    case HostRoot:
+    case ClassComponent:
+      var updateQueue = fiber.updateQueue;
+      if (updateQueue === null) {
+        return NoWork;
+      }
+      return updateQueue.expirationTime;
+    default:
+      return NoWork;
+  }
+}
 
-    if (partialState !== null && partialState !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      workInProgress.memoizedState = Object.assign(
-        {},
-        workInProgress.memoizedState,
-        partialState
-      );
-    }
+function getStateFromUpdate(update, instance, prevState, props) {
+  var partialState = update.partialState;
+  if (typeof partialState === "function") {
+    return partialState.call(instance, prevState, props);
+  } else {
+    return partialState;
+  }
+}
 
-    // Cache unmasked context so we can avoid recreating masked context unless necessary.
-    // ReactFiberContext usually updates this cache but can't for newly-created instances.
-    if (needsContext) {
-      cacheContext(workInProgress, unmaskedContext, context);
-    }
+function processUpdateQueue(
+  current,
+  workInProgress,
+  queue,
+  instance,
+  props,
+  renderExpirationTime
+) {
+  if (current !== null && current.updateQueue === queue) {
+    // We need to create a work-in-progress queue, by cloning the current queue.
+    var currentQueue = queue;
+    queue = workInProgress.updateQueue = {
+      baseState: currentQueue.baseState,
+      expirationTime: currentQueue.expirationTime,
+      first: currentQueue.first,
+      last: currentQueue.last,
+      isInitialized: currentQueue.isInitialized,
+      capturedValues: currentQueue.capturedValues,
+      // These fields are no longer valid because they were already committed.
+      // Reset them.
+      callbackList: null,
+      hasForceUpdate: false
+    };
+  }
 
-    return instance;
+  {
+    // Set this flag so we can warn if setState is called inside the update
+    // function of another setState.
+    queue.isProcessing = true;
   }
 
-  function callComponentWillMount(workInProgress, instance) {
-    startPhaseTimer(workInProgress, "componentWillMount");
-    var oldState = instance.state;
+  // Reset the remaining expiration time. If we skip over any updates, we'll
+  // increase this accordingly.
+  queue.expirationTime = NoWork;
 
-    if (typeof instance.componentWillMount === "function") {
-      instance.componentWillMount();
-    }
-    if (typeof instance.UNSAFE_componentWillMount === "function") {
-      instance.UNSAFE_componentWillMount();
+  // TODO: We don't know what the base state will be until we begin work.
+  // It depends on which fiber is the next current. Initialize with an empty
+  // base state, then set to the memoizedState when rendering. Not super
+  // happy with this approach.
+  var state = void 0;
+  if (queue.isInitialized) {
+    state = queue.baseState;
+  } else {
+    state = queue.baseState = workInProgress.memoizedState;
+    queue.isInitialized = true;
+  }
+  var dontMutatePrevState = true;
+  var update = queue.first;
+  var didSkip = false;
+  while (update !== null) {
+    var updateExpirationTime = update.expirationTime;
+    if (updateExpirationTime > renderExpirationTime) {
+      // This update does not have sufficient priority. Skip it.
+      var remainingExpirationTime = queue.expirationTime;
+      if (
+        remainingExpirationTime === NoWork ||
+        remainingExpirationTime > updateExpirationTime
+      ) {
+        // Update the remaining expiration time.
+        queue.expirationTime = updateExpirationTime;
+      }
+      if (!didSkip) {
+        didSkip = true;
+        queue.baseState = state;
+      }
+      // Continue to the next update.
+      update = update.next;
+      continue;
     }
 
-    stopPhaseTimer();
+    // This update does have sufficient priority.
 
-    if (oldState !== instance.state) {
-      {
-        warning(
-          false,
-          "%s.componentWillMount(): Assigning directly to this.state is " +
-            "deprecated (except inside a component's " +
-            "constructor). Use setState instead.",
-          getComponentName(workInProgress) || "Component"
-        );
+    // If no previous updates were skipped, drop this update from the queue by
+    // advancing the head of the list.
+    if (!didSkip) {
+      queue.first = update.next;
+      if (queue.first === null) {
+        queue.last = null;
       }
-      updater.enqueueReplaceState(instance, instance.state, null);
     }
-  }
 
-  function callComponentWillReceiveProps(
-    workInProgress,
-    instance,
-    newProps,
-    newContext
-  ) {
-    var oldState = instance.state;
-    startPhaseTimer(workInProgress, "componentWillReceiveProps");
-    if (typeof instance.componentWillReceiveProps === "function") {
-      instance.componentWillReceiveProps(newProps, newContext);
-    }
-    if (typeof instance.UNSAFE_componentWillReceiveProps === "function") {
-      instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    // Invoke setState callback an extra time to help detect side-effects.
+    // Ignore the return value in this case.
+    if (
+      debugRenderPhaseSideEffects ||
+      (debugRenderPhaseSideEffectsForStrictMode &&
+        workInProgress.mode & StrictMode)
+    ) {
+      getStateFromUpdate(update, instance, state, props);
     }
-    stopPhaseTimer();
 
-    if (instance.state !== oldState) {
-      {
-        var componentName = getComponentName(workInProgress) || "Component";
-        if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
-          didWarnAboutStateAssignmentForComponent.add(componentName);
-          warning(
-            false,
-            "%s.componentWillReceiveProps(): Assigning directly to " +
-              "this.state is deprecated (except inside a component's " +
-              "constructor). Use setState instead.",
-            componentName
-          );
+    // Process the update
+    var _partialState = void 0;
+    if (update.isReplace) {
+      state = getStateFromUpdate(update, instance, state, props);
+      dontMutatePrevState = true;
+    } else {
+      _partialState = getStateFromUpdate(update, instance, state, props);
+      if (_partialState) {
+        if (dontMutatePrevState) {
+          // $FlowFixMe: Idk how to type this properly.
+          state = Object.assign({}, state, _partialState);
+        } else {
+          state = Object.assign(state, _partialState);
         }
+        dontMutatePrevState = false;
       }
-      updater.enqueueReplaceState(instance, instance.state, null);
     }
-  }
-
-  function callGetDerivedStateFromProps(
-    workInProgress,
-    instance,
-    nextProps,
-    prevState
-  ) {
-    var type = workInProgress.type;
-
-    if (typeof type.getDerivedStateFromProps === "function") {
-      if (
-        debugRenderPhaseSideEffects ||
-        (debugRenderPhaseSideEffectsForStrictMode &&
-          workInProgress.mode & StrictMode)
-      ) {
-        // Invoke method an extra time to help detect side-effects.
-        type.getDerivedStateFromProps.call(null, nextProps, prevState);
+    if (update.isForced) {
+      queue.hasForceUpdate = true;
+    }
+    if (update.callback !== null) {
+      // Append to list of callbacks.
+      var _callbackList = queue.callbackList;
+      if (_callbackList === null) {
+        _callbackList = queue.callbackList = [];
       }
-
-      var partialState = type.getDerivedStateFromProps.call(
-        null,
-        nextProps,
-        prevState
-      );
-
-      {
-        if (partialState === undefined) {
-          var componentName = getComponentName(workInProgress) || "Component";
-          if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
-            didWarnAboutUndefinedDerivedState.add(componentName);
-            warning(
-              false,
-              "%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. " +
-                "You have returned undefined.",
-              componentName
-            );
-          }
-        }
+      _callbackList.push(update);
+    }
+    if (update.capturedValue !== null) {
+      var _capturedValues = queue.capturedValues;
+      if (_capturedValues === null) {
+        queue.capturedValues = [update.capturedValue];
+      } else {
+        _capturedValues.push(update.capturedValue);
       }
-
-      return partialState;
     }
+    update = update.next;
   }
 
-  // Invokes the mount life-cycles on a previously never rendered instance.
-  function mountClassInstance(workInProgress, renderExpirationTime) {
-    var ctor = workInProgress.type;
-    var current = workInProgress.alternate;
-
-    {
-      checkClassInstance(workInProgress);
-    }
+  if (queue.callbackList !== null) {
+    workInProgress.effectTag |= Callback;
+  } else if (
+    queue.first === null &&
+    !queue.hasForceUpdate &&
+    queue.capturedValues === null
+  ) {
+    // The queue is empty. We can reset it.
+    workInProgress.updateQueue = null;
+  }
 
-    var instance = workInProgress.stateNode;
-    var props = workInProgress.pendingProps;
-    var unmaskedContext = getUnmaskedContext(workInProgress);
+  if (!didSkip) {
+    didSkip = true;
+    queue.baseState = state;
+  }
 
-    instance.props = props;
-    instance.state = workInProgress.memoizedState;
-    instance.refs = emptyObject;
-    instance.context = getMaskedContext(workInProgress, unmaskedContext);
+  {
+    // No longer processing.
+    queue.isProcessing = false;
+  }
 
-    {
-      if (workInProgress.mode & StrictMode) {
-        ReactStrictModeWarnings.recordUnsafeLifecycleWarnings(
-          workInProgress,
-          instance
-        );
-      }
-
-      if (warnAboutDeprecatedLifecycles) {
-        ReactStrictModeWarnings.recordDeprecationWarnings(
-          workInProgress,
-          instance
-        );
-      }
-    }
+  return state;
+}
 
-    // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for components using the new APIs.
-    if (
-      typeof ctor.getDerivedStateFromProps !== "function" &&
-      typeof instance.getSnapshotBeforeUpdate !== "function" &&
-      (typeof instance.UNSAFE_componentWillMount === "function" ||
-        typeof instance.componentWillMount === "function")
-    ) {
-      callComponentWillMount(workInProgress, instance);
-      // If we had additional state updates during this life-cycle, let's
-      // process them now.
-      var updateQueue = workInProgress.updateQueue;
-      if (updateQueue !== null) {
-        instance.state = processUpdateQueue(
-          current,
-          workInProgress,
-          updateQueue,
-          instance,
-          props,
-          renderExpirationTime
-        );
-      }
-    }
-    if (typeof instance.componentDidMount === "function") {
-      workInProgress.effectTag |= Update;
-    }
+function commitCallbacks(queue, context) {
+  var callbackList = queue.callbackList;
+  if (callbackList === null) {
+    return;
+  }
+  // Set the list to null to make sure they don't get called more than once.
+  queue.callbackList = null;
+  for (var i = 0; i < callbackList.length; i++) {
+    var update = callbackList[i];
+    var _callback = update.callback;
+    // This update might be processed again. Clear the callback so it's only
+    // called once.
+    update.callback = null;
+    invariant(
+      typeof _callback === "function",
+      "Invalid argument passed as callback. Expected a function. Instead " +
+        "received: %s",
+      _callback
+    );
+    _callback.call(context);
   }
+}
 
-  function resumeMountClassInstance(workInProgress, renderExpirationTime) {
-    var ctor = workInProgress.type;
-    var instance = workInProgress.stateNode;
-    resetInputPointers(workInProgress, instance);
+var fakeInternalInstance = {};
+var isArray = Array.isArray;
 
-    var oldProps = workInProgress.memoizedProps;
-    var newProps = workInProgress.pendingProps;
-    var oldContext = instance.context;
-    var newUnmaskedContext = getUnmaskedContext(workInProgress);
-    var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+var didWarnAboutStateAssignmentForComponent = void 0;
+var didWarnAboutUndefinedDerivedState = void 0;
+var didWarnAboutUninitializedState = void 0;
+var didWarnAboutWillReceivePropsAndDerivedState = void 0;
+var warnOnInvalidCallback = void 0;
 
-    var hasNewLifecycles =
-      typeof ctor.getDerivedStateFromProps === "function" ||
-      typeof instance.getSnapshotBeforeUpdate === "function";
+{
+  didWarnAboutStateAssignmentForComponent = {};
+  didWarnAboutUndefinedDerivedState = {};
+  didWarnAboutUninitializedState = {};
+  didWarnAboutWillReceivePropsAndDerivedState = {};
 
-    // Note: During these life-cycles, instance.props/instance.state are what
-    // ever the previously attempted to render - not the "current". However,
-    // during componentDidUpdate we pass the "current" props.
+  var didWarnOnInvalidCallback = {};
 
-    // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for components using the new APIs.
-    if (
-      !hasNewLifecycles &&
-      (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function")
-    ) {
-      if (oldProps !== newProps || oldContext !== newContext) {
-        callComponentWillReceiveProps(
-          workInProgress,
-          instance,
-          newProps,
-          newContext
-        );
-      }
+  warnOnInvalidCallback = function(callback, callerName) {
+    if (callback === null || typeof callback === "function") {
+      return;
     }
-
-    // Compute the next state using the memoized state and the update queue.
-    var oldState = workInProgress.memoizedState;
-    // TODO: Previous state can be null.
-    var newState = void 0;
-    var derivedStateFromCatch = void 0;
-    if (workInProgress.updateQueue !== null) {
-      newState = processUpdateQueue(
-        null,
-        workInProgress,
-        workInProgress.updateQueue,
-        instance,
-        newProps,
-        renderExpirationTime
+    var key = callerName + "_" + callback;
+    if (!didWarnOnInvalidCallback[key]) {
+      warning(
+        false,
+        "%s(...): Expected the last optional `callback` argument to be a " +
+          "function. Instead received: %s.",
+        callerName,
+        callback
       );
-
-      var updateQueue = workInProgress.updateQueue;
-      if (
-        updateQueue !== null &&
-        updateQueue.capturedValues !== null &&
-        enableGetDerivedStateFromCatch &&
-        typeof ctor.getDerivedStateFromCatch === "function"
-      ) {
-        var capturedValues = updateQueue.capturedValues;
-        // Don't remove these from the update queue yet. We need them in
-        // finishClassComponent. Do the reset there.
-        // TODO: This is awkward. Refactor class components.
-        // updateQueue.capturedValues = null;
-        derivedStateFromCatch = callGetDerivedStateFromCatch(
-          ctor,
-          capturedValues
-        );
-      }
-    } else {
-      newState = oldState;
+      didWarnOnInvalidCallback[key] = true;
     }
+  };
 
-    var derivedStateFromProps = void 0;
-    if (oldProps !== newProps) {
-      // The prevState parameter should be the partially updated state.
-      // Otherwise, spreading state in return values could override updates.
-      derivedStateFromProps = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps,
-        newState
+  // This is so gross but it's at least non-critical and can be removed if
+  // it causes problems. This is meant to give a nicer error message for
+  // ReactDOM15.unstable_renderSubtreeIntoContainer(reactDOM16Component,
+  // ...)) which otherwise throws a "_processChildContext is not a function"
+  // exception.
+  Object.defineProperty(fakeInternalInstance, "_processChildContext", {
+    enumerable: false,
+    value: function() {
+      invariant(
+        false,
+        "_processChildContext is not available in React 16+. This likely " +
+          "means you have multiple copies of React and are attempting to nest " +
+          "a React 15 tree inside a React 16 tree using " +
+          "unstable_renderSubtreeIntoContainer, which isn't supported. Try " +
+          "to make sure you have only one copy of React (and ideally, switch " +
+          "to ReactDOM.createPortal)."
       );
     }
-
-    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      newState =
-        newState === null || newState === undefined
-          ? derivedStateFromProps
-          : Object.assign({}, newState, derivedStateFromProps);
-
-      // Update the base state of the update queue.
-      // FIXME: This is getting ridiculous. Refactor plz!
-      var _updateQueue = workInProgress.updateQueue;
-      if (_updateQueue !== null) {
-        _updateQueue.baseState = Object.assign(
-          {},
-          _updateQueue.baseState,
-          derivedStateFromProps
-        );
-      }
+  });
+  Object.freeze(fakeInternalInstance);
+}
+function callGetDerivedStateFromCatch(ctor, capturedValues) {
+  var resultState = {};
+  for (var i = 0; i < capturedValues.length; i++) {
+    var capturedValue = capturedValues[i];
+    var error = capturedValue.value;
+    var partialState = ctor.getDerivedStateFromCatch.call(null, error);
+    if (partialState !== null && partialState !== undefined) {
+      Object.assign(resultState, partialState);
     }
-    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      newState =
-        newState === null || newState === undefined
-          ? derivedStateFromCatch
-          : Object.assign({}, newState, derivedStateFromCatch);
+  }
+  return resultState;
+}
 
-      // Update the base state of the update queue.
-      // FIXME: This is getting ridiculous. Refactor plz!
-      var _updateQueue2 = workInProgress.updateQueue;
-      if (_updateQueue2 !== null) {
-        _updateQueue2.baseState = Object.assign(
-          {},
-          _updateQueue2.baseState,
-          derivedStateFromCatch
-        );
+var ReactFiberClassComponent = function(
+  scheduleWork,
+  computeExpirationForFiber,
+  memoizeProps,
+  memoizeState
+) {
+  // Class component state updater
+  var updater = {
+    isMounted: isMounted,
+    enqueueSetState: function(instance, partialState, callback) {
+      var fiber = get(instance);
+      callback = callback === undefined ? null : callback;
+      {
+        warnOnInvalidCallback(callback, "setState");
       }
-    }
-
-    if (
-      oldProps === newProps &&
-      oldState === newState &&
-      !hasContextChanged() &&
-      !(
-        workInProgress.updateQueue !== null &&
-        workInProgress.updateQueue.hasForceUpdate
-      )
-    ) {
-      // If an update was already in progress, we should schedule an Update
-      // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidMount === "function") {
-        workInProgress.effectTag |= Update;
+      var expirationTime = computeExpirationForFiber(fiber);
+      var update = {
+        expirationTime: expirationTime,
+        partialState: partialState,
+        callback: callback,
+        isReplace: false,
+        isForced: false,
+        capturedValue: null,
+        next: null
+      };
+      insertUpdateIntoFiber(fiber, update);
+      scheduleWork(fiber, expirationTime);
+    },
+    enqueueReplaceState: function(instance, state, callback) {
+      var fiber = get(instance);
+      callback = callback === undefined ? null : callback;
+      {
+        warnOnInvalidCallback(callback, "replaceState");
       }
-      return false;
-    }
-
-    var shouldUpdate = checkShouldComponentUpdate(
-      workInProgress,
-      oldProps,
-      newProps,
-      oldState,
-      newState,
-      newContext
-    );
-
-    if (shouldUpdate) {
-      // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for components using the new APIs.
-      if (
-        !hasNewLifecycles &&
-        (typeof instance.UNSAFE_componentWillMount === "function" ||
-          typeof instance.componentWillMount === "function")
-      ) {
-        startPhaseTimer(workInProgress, "componentWillMount");
-        if (typeof instance.componentWillMount === "function") {
-          instance.componentWillMount();
-        }
-        if (typeof instance.UNSAFE_componentWillMount === "function") {
-          instance.UNSAFE_componentWillMount();
-        }
-        stopPhaseTimer();
-      }
-      if (typeof instance.componentDidMount === "function") {
-        workInProgress.effectTag |= Update;
-      }
-    } else {
-      // If an update was already in progress, we should schedule an Update
-      // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidMount === "function") {
-        workInProgress.effectTag |= Update;
+      var expirationTime = computeExpirationForFiber(fiber);
+      var update = {
+        expirationTime: expirationTime,
+        partialState: state,
+        callback: callback,
+        isReplace: true,
+        isForced: false,
+        capturedValue: null,
+        next: null
+      };
+      insertUpdateIntoFiber(fiber, update);
+      scheduleWork(fiber, expirationTime);
+    },
+    enqueueForceUpdate: function(instance, callback) {
+      var fiber = get(instance);
+      callback = callback === undefined ? null : callback;
+      {
+        warnOnInvalidCallback(callback, "forceUpdate");
       }
-
-      // If shouldComponentUpdate returned false, we should still update the
-      // memoized props/state to indicate that this work can be reused.
-      memoizeProps(workInProgress, newProps);
-      memoizeState(workInProgress, newState);
+      var expirationTime = computeExpirationForFiber(fiber);
+      var update = {
+        expirationTime: expirationTime,
+        partialState: null,
+        callback: callback,
+        isReplace: false,
+        isForced: true,
+        capturedValue: null,
+        next: null
+      };
+      insertUpdateIntoFiber(fiber, update);
+      scheduleWork(fiber, expirationTime);
     }
+  };
 
-    // Update the existing instance's state, props, and context pointers even
-    // if shouldComponentUpdate returns false.
-    instance.props = newProps;
-    instance.state = newState;
-    instance.context = newContext;
-
-    return shouldUpdate;
-  }
-
-  // Invokes the update life-cycles and returns false if it shouldn't rerender.
-  function updateClassInstance(current, workInProgress, renderExpirationTime) {
-    var ctor = workInProgress.type;
-    var instance = workInProgress.stateNode;
-    resetInputPointers(workInProgress, instance);
-
-    var oldProps = workInProgress.memoizedProps;
-    var newProps = workInProgress.pendingProps;
-    var oldContext = instance.context;
-    var newUnmaskedContext = getUnmaskedContext(workInProgress);
-    var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
-
-    var hasNewLifecycles =
-      typeof ctor.getDerivedStateFromProps === "function" ||
-      typeof instance.getSnapshotBeforeUpdate === "function";
-
-    // Note: During these life-cycles, instance.props/instance.state are what
-    // ever the previously attempted to render - not the "current". However,
-    // during componentDidUpdate we pass the "current" props.
-
-    // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for components using the new APIs.
+  function checkShouldComponentUpdate(
+    workInProgress,
+    oldProps,
+    newProps,
+    oldState,
+    newState,
+    newContext
+  ) {
     if (
-      !hasNewLifecycles &&
-      (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function")
+      oldProps === null ||
+      (workInProgress.updateQueue !== null &&
+        workInProgress.updateQueue.hasForceUpdate)
     ) {
-      if (oldProps !== newProps || oldContext !== newContext) {
-        callComponentWillReceiveProps(
-          workInProgress,
-          instance,
-          newProps,
-          newContext
-        );
-      }
+      // If the workInProgress already has an Update effect, return true
+      return true;
     }
 
-    // Compute the next state using the memoized state and the update queue.
-    var oldState = workInProgress.memoizedState;
-    // TODO: Previous state can be null.
-    var newState = void 0;
-    var derivedStateFromCatch = void 0;
-
-    if (workInProgress.updateQueue !== null) {
-      newState = processUpdateQueue(
-        current,
-        workInProgress,
-        workInProgress.updateQueue,
-        instance,
+    var instance = workInProgress.stateNode;
+    var ctor = workInProgress.type;
+    if (typeof instance.shouldComponentUpdate === "function") {
+      startPhaseTimer(workInProgress, "shouldComponentUpdate");
+      var shouldUpdate = instance.shouldComponentUpdate(
         newProps,
-        renderExpirationTime
+        newState,
+        newContext
       );
+      stopPhaseTimer();
 
-      var updateQueue = workInProgress.updateQueue;
-      if (
-        updateQueue !== null &&
-        updateQueue.capturedValues !== null &&
-        enableGetDerivedStateFromCatch &&
-        typeof ctor.getDerivedStateFromCatch === "function"
-      ) {
-        var capturedValues = updateQueue.capturedValues;
-        // Don't remove these from the update queue yet. We need them in
-        // finishClassComponent. Do the reset there.
-        // TODO: This is awkward. Refactor class components.
-        // updateQueue.capturedValues = null;
-        derivedStateFromCatch = callGetDerivedStateFromCatch(
-          ctor,
-          capturedValues
+      {
+        warning(
+          shouldUpdate !== undefined,
+          "%s.shouldComponentUpdate(): Returned undefined instead of a " +
+            "boolean value. Make sure to return true or false.",
+          getComponentName(workInProgress) || "Unknown"
         );
       }
-    } else {
-      newState = oldState;
+
+      return shouldUpdate;
     }
 
-    var derivedStateFromProps = void 0;
-    if (oldProps !== newProps) {
-      // The prevState parameter should be the partially updated state.
-      // Otherwise, spreading state in return values could override updates.
-      derivedStateFromProps = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps,
-        newState
+    if (ctor.prototype && ctor.prototype.isPureReactComponent) {
+      return (
+        !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
       );
     }
 
-    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      newState =
-        newState === null || newState === undefined
-          ? derivedStateFromProps
-          : Object.assign({}, newState, derivedStateFromProps);
-
-      // Update the base state of the update queue.
-      // FIXME: This is getting ridiculous. Refactor plz!
-      var _updateQueue3 = workInProgress.updateQueue;
-      if (_updateQueue3 !== null) {
-        _updateQueue3.baseState = Object.assign(
-          {},
-          _updateQueue3.baseState,
-          derivedStateFromProps
-        );
-      }
-    }
-    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      newState =
-        newState === null || newState === undefined
-          ? derivedStateFromCatch
-          : Object.assign({}, newState, derivedStateFromCatch);
+    return true;
+  }
 
-      // Update the base state of the update queue.
-      // FIXME: This is getting ridiculous. Refactor plz!
-      var _updateQueue4 = workInProgress.updateQueue;
-      if (_updateQueue4 !== null) {
-        _updateQueue4.baseState = Object.assign(
-          {},
-          _updateQueue4.baseState,
-          derivedStateFromCatch
-        );
-      }
-    }
+  function checkClassInstance(workInProgress) {
+    var instance = workInProgress.stateNode;
+    var type = workInProgress.type;
+    {
+      var name = getComponentName(workInProgress);
+      var renderPresent = instance.render;
 
-    if (
-      oldProps === newProps &&
-      oldState === newState &&
-      !hasContextChanged() &&
-      !(
-        workInProgress.updateQueue !== null &&
-        workInProgress.updateQueue.hasForceUpdate
-      )
-    ) {
-      // If an update was already in progress, we should schedule an Update
-      // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidUpdate === "function") {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Update;
-        }
-      }
-      if (typeof instance.getSnapshotBeforeUpdate === "function") {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Snapshot;
+      if (!renderPresent) {
+        if (type.prototype && typeof type.prototype.render === "function") {
+          warning(
+            false,
+            "%s(...): No `render` method found on the returned component " +
+              "instance: did you accidentally return an object from the constructor?",
+            name
+          );
+        } else {
+          warning(
+            false,
+            "%s(...): No `render` method found on the returned component " +
+              "instance: you may have forgotten to define `render`.",
+            name
+          );
         }
       }
-      return false;
-    }
-
-    var shouldUpdate = checkShouldComponentUpdate(
-      workInProgress,
-      oldProps,
-      newProps,
-      oldState,
-      newState,
-      newContext
-    );
 
-    if (shouldUpdate) {
-      // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for components using the new APIs.
+      var noGetInitialStateOnES6 =
+        !instance.getInitialState ||
+        instance.getInitialState.isReactClassApproved ||
+        instance.state;
+      warning(
+        noGetInitialStateOnES6,
+        "getInitialState was defined on %s, a plain JavaScript class. " +
+          "This is only supported for classes created using React.createClass. " +
+          "Did you mean to define a state property instead?",
+        name
+      );
+      var noGetDefaultPropsOnES6 =
+        !instance.getDefaultProps ||
+        instance.getDefaultProps.isReactClassApproved;
+      warning(
+        noGetDefaultPropsOnES6,
+        "getDefaultProps was defined on %s, a plain JavaScript class. " +
+          "This is only supported for classes created using React.createClass. " +
+          "Use a static property to define defaultProps instead.",
+        name
+      );
+      var noInstancePropTypes = !instance.propTypes;
+      warning(
+        noInstancePropTypes,
+        "propTypes was defined as an instance property on %s. Use a static " +
+          "property to define propTypes instead.",
+        name
+      );
+      var noInstanceContextTypes = !instance.contextTypes;
+      warning(
+        noInstanceContextTypes,
+        "contextTypes was defined as an instance property on %s. Use a static " +
+          "property to define contextTypes instead.",
+        name
+      );
+      var noComponentShouldUpdate =
+        typeof instance.componentShouldUpdate !== "function";
+      warning(
+        noComponentShouldUpdate,
+        "%s has a method called " +
+          "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
+          "The name is phrased as a question because the function is " +
+          "expected to return a value.",
+        name
+      );
       if (
-        !hasNewLifecycles &&
-        (typeof instance.UNSAFE_componentWillUpdate === "function" ||
-          typeof instance.componentWillUpdate === "function")
+        type.prototype &&
+        type.prototype.isPureReactComponent &&
+        typeof instance.shouldComponentUpdate !== "undefined"
       ) {
-        startPhaseTimer(workInProgress, "componentWillUpdate");
-        if (typeof instance.componentWillUpdate === "function") {
-          instance.componentWillUpdate(newProps, newState, newContext);
-        }
-        if (typeof instance.UNSAFE_componentWillUpdate === "function") {
-          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
-        }
-        stopPhaseTimer();
-      }
-      if (typeof instance.componentDidUpdate === "function") {
-        workInProgress.effectTag |= Update;
-      }
-      if (typeof instance.getSnapshotBeforeUpdate === "function") {
-        workInProgress.effectTag |= Snapshot;
-      }
-    } else {
-      // If an update was already in progress, we should schedule an Update
-      // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidUpdate === "function") {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Update;
-        }
-      }
-      if (typeof instance.getSnapshotBeforeUpdate === "function") {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Snapshot;
-        }
+        warning(
+          false,
+          "%s has a method called shouldComponentUpdate(). " +
+            "shouldComponentUpdate should not be used when extending React.PureComponent. " +
+            "Please extend React.Component if shouldComponentUpdate is used.",
+          getComponentName(workInProgress) || "A pure component"
+        );
       }
+      var noComponentDidUnmount =
+        typeof instance.componentDidUnmount !== "function";
+      warning(
+        noComponentDidUnmount,
+        "%s has a method called " +
+          "componentDidUnmount(). But there is no such lifecycle method. " +
+          "Did you mean componentWillUnmount()?",
+        name
+      );
+      var noComponentDidReceiveProps =
+        typeof instance.componentDidReceiveProps !== "function";
+      warning(
+        noComponentDidReceiveProps,
+        "%s has a method called " +
+          "componentDidReceiveProps(). But there is no such lifecycle method. " +
+          "If you meant to update the state in response to changing props, " +
+          "use componentWillReceiveProps(). If you meant to fetch data or " +
+          "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
+        name
+      );
+      var noComponentWillRecieveProps =
+        typeof instance.componentWillRecieveProps !== "function";
+      warning(
+        noComponentWillRecieveProps,
+        "%s has a method called " +
+          "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
+        name
+      );
+      var noUnsafeComponentWillRecieveProps =
+        typeof instance.UNSAFE_componentWillRecieveProps !== "function";
+      warning(
+        noUnsafeComponentWillRecieveProps,
+        "%s has a method called " +
+          "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
+        name
+      );
+      var hasMutatedProps = instance.props !== workInProgress.pendingProps;
+      warning(
+        instance.props === undefined || !hasMutatedProps,
+        "%s(...): When calling super() in `%s`, make sure to pass " +
+          "up the same props that your component's constructor was passed.",
+        name,
+        name
+      );
+      var noInstanceDefaultProps = !instance.defaultProps;
+      warning(
+        noInstanceDefaultProps,
+        "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
+          " Instead, define defaultProps as a static property on %s.",
+        name,
+        name
+      );
+    }
 
-      // If shouldComponentUpdate returned false, we should still update the
-      // memoized props/state to indicate that this work can be reused.
-      memoizeProps(workInProgress, newProps);
-      memoizeState(workInProgress, newState);
+    var state = instance.state;
+    if (state && (typeof state !== "object" || isArray(state))) {
+      warning(
+        false,
+        "%s.state: must be set to an object or null",
+        getComponentName(workInProgress)
+      );
+    }
+    if (typeof instance.getChildContext === "function") {
+      warning(
+        typeof type.childContextTypes === "object",
+        "%s.getChildContext(): childContextTypes must be defined in order to " +
+          "use getChildContext().",
+        getComponentName(workInProgress)
+      );
     }
+  }
 
-    // Update the existing instance's state, props, and context pointers even
-    // if shouldComponentUpdate returns false.
-    instance.props = newProps;
-    instance.state = newState;
-    instance.context = newContext;
+  function resetInputPointers(workInProgress, instance) {
+    instance.props = workInProgress.memoizedProps;
+    instance.state = workInProgress.memoizedState;
+  }
 
-    return shouldUpdate;
+  function adoptClassInstance(workInProgress, instance) {
+    instance.updater = updater;
+    workInProgress.stateNode = instance;
+    // The instance needs access to the fiber so that it can schedule updates
+    set(instance, workInProgress);
+    {
+      instance._reactInternalInstance = fakeInternalInstance;
+    }
   }
 
-  return {
-    adoptClassInstance: adoptClassInstance,
-    callGetDerivedStateFromProps: callGetDerivedStateFromProps,
-    constructClassInstance: constructClassInstance,
-    mountClassInstance: mountClassInstance,
-    resumeMountClassInstance: resumeMountClassInstance,
-    updateClassInstance: updateClassInstance
-  };
-};
+  function constructClassInstance(workInProgress, props) {
+    var ctor = workInProgress.type;
+    var unmaskedContext = getUnmaskedContext(workInProgress);
+    var needsContext = isContextConsumer(workInProgress);
+    var context = needsContext
+      ? getMaskedContext(workInProgress, unmaskedContext)
+      : emptyObject;
 
-var getCurrentFiberStackAddendum$1 =
-  ReactDebugCurrentFiber.getCurrentFiberStackAddendum;
+    // Instantiate twice to help detect side-effects.
+    if (
+      debugRenderPhaseSideEffects ||
+      (debugRenderPhaseSideEffectsForStrictMode &&
+        workInProgress.mode & StrictMode)
+    ) {
+      new ctor(props, context); // eslint-disable-line no-new
+    }
 
-var didWarnAboutMaps = void 0;
-var didWarnAboutStringRefInStrictMode = void 0;
-var ownerHasKeyUseWarning = void 0;
-var ownerHasFunctionTypeWarning = void 0;
-var warnForMissingKey = function(child) {};
+    var instance = new ctor(props, context);
+    var state =
+      instance.state !== null && instance.state !== undefined
+        ? instance.state
+        : null;
+    adoptClassInstance(workInProgress, instance);
 
-{
-  didWarnAboutMaps = false;
-  didWarnAboutStringRefInStrictMode = {};
+    {
+      if (
+        typeof ctor.getDerivedStateFromProps === "function" &&
+        state === null
+      ) {
+        var componentName = getComponentName(workInProgress) || "Unknown";
+        if (!didWarnAboutUninitializedState[componentName]) {
+          warning(
+            false,
+            "%s: Did not properly initialize state during construction. " +
+              "Expected state to be an object, but it was %s.",
+            componentName,
+            instance.state === null ? "null" : "undefined"
+          );
+          didWarnAboutUninitializedState[componentName] = true;
+        }
+      }
+    }
 
-  /**
-   * Warn if there's no key explicitly set on dynamic arrays of children or
-   * object keys are not valid. This allows us to keep track of children between
-   * updates.
-   */
-  ownerHasKeyUseWarning = {};
-  ownerHasFunctionTypeWarning = {};
+    workInProgress.memoizedState = state;
 
-  warnForMissingKey = function(child) {
-    if (child === null || typeof child !== "object") {
-      return;
-    }
-    if (!child._store || child._store.validated || child.key != null) {
-      return;
-    }
-    invariant(
-      typeof child._store === "object",
-      "React Component in warnForMissingKey should have a _store. " +
-        "This error is likely caused by a bug in React. Please file an issue."
+    var partialState = callGetDerivedStateFromProps(
+      workInProgress,
+      instance,
+      props
     );
-    child._store.validated = true;
 
-    var currentComponentErrorInfo =
-      "Each child in an array or iterator should have a unique " +
-      '"key" prop. See https://fb.me/react-warning-keys for ' +
-      "more information." +
-      (getCurrentFiberStackAddendum$1() || "");
-    if (ownerHasKeyUseWarning[currentComponentErrorInfo]) {
-      return;
+    if (partialState !== null && partialState !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      workInProgress.memoizedState = Object.assign(
+        {},
+        workInProgress.memoizedState,
+        partialState
+      );
     }
-    ownerHasKeyUseWarning[currentComponentErrorInfo] = true;
 
-    warning(
-      false,
-      "Each child in an array or iterator should have a unique " +
-        '"key" prop. See https://fb.me/react-warning-keys for ' +
-        "more information.%s",
-      getCurrentFiberStackAddendum$1()
-    );
-  };
-}
+    // Cache unmasked context so we can avoid recreating masked context unless necessary.
+    // ReactFiberContext usually updates this cache but can't for newly-created instances.
+    if (needsContext) {
+      cacheContext(workInProgress, unmaskedContext, context);
+    }
 
-var isArray$1 = Array.isArray;
+    return instance;
+  }
 
-function coerceRef(returnFiber, current, element) {
-  var mixedRef = element.ref;
-  if (
-    mixedRef !== null &&
-    typeof mixedRef !== "function" &&
-    typeof mixedRef !== "object"
-  ) {
-    {
-      if (returnFiber.mode & StrictMode) {
-        var componentName = getComponentName(returnFiber) || "Component";
-        if (!didWarnAboutStringRefInStrictMode[componentName]) {
-          warning(
-            false,
-            'A string ref, "%s", has been found within a strict mode tree. ' +
-              "String refs are a source of potential bugs and should be avoided. " +
-              "We recommend using createRef() instead." +
-              "\n%s" +
-              "\n\nLearn more about using refs safely here:" +
-              "\nhttps://fb.me/react-strict-mode-string-ref",
-            mixedRef,
-            getStackAddendumByWorkInProgressFiber(returnFiber)
-          );
-          didWarnAboutStringRefInStrictMode[componentName] = true;
-        }
-      }
+  function callComponentWillMount(workInProgress, instance) {
+    startPhaseTimer(workInProgress, "componentWillMount");
+    var oldState = instance.state;
+
+    if (typeof instance.componentWillMount === "function") {
+      instance.componentWillMount();
+    }
+    if (typeof instance.UNSAFE_componentWillMount === "function") {
+      instance.UNSAFE_componentWillMount();
     }
 
-    if (element._owner) {
-      var owner = element._owner;
-      var inst = void 0;
-      if (owner) {
-        var ownerFiber = owner;
-        invariant(
-          ownerFiber.tag === ClassComponent,
-          "Stateless function components cannot have refs."
+    stopPhaseTimer();
+
+    if (oldState !== instance.state) {
+      {
+        warning(
+          false,
+          "%s.componentWillMount(): Assigning directly to this.state is " +
+            "deprecated (except inside a component's " +
+            "constructor). Use setState instead.",
+          getComponentName(workInProgress)
         );
-        inst = ownerFiber.stateNode;
       }
-      invariant(
-        inst,
-        "Missing owner for string ref %s. This error is likely caused by a " +
-          "bug in React. Please file an issue.",
-        mixedRef
-      );
-      var stringRef = "" + mixedRef;
-      // Check if previous string ref matches new string ref
-      if (
-        current !== null &&
-        current.ref !== null &&
-        current.ref._stringRef === stringRef
-      ) {
-        return current.ref;
-      }
-      var ref = function(value) {
-        var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
-        if (value === null) {
-          delete refs[stringRef];
-        } else {
-          refs[stringRef] = value;
-        }
-      };
-      ref._stringRef = stringRef;
-      return ref;
-    } else {
-      invariant(
-        typeof mixedRef === "string",
-        "Expected ref to be a function or a string."
-      );
-      invariant(
-        element._owner,
-        "Element ref was specified as a string (%s) but no owner was set. This could happen for one of" +
-          " the following reasons:\n" +
-          "1. You may be adding a ref to a functional component\n" +
-          "2. You may be adding a ref to a component that was not created inside a component's render method\n" +
-          "3. You have multiple copies of React loaded\n" +
-          "See https://fb.me/react-refs-must-have-owner for more information.",
-        mixedRef
-      );
+      updater.enqueueReplaceState(instance, instance.state, null);
     }
   }
-  return mixedRef;
-}
 
-function throwOnInvalidObjectType(returnFiber, newChild) {
-  if (returnFiber.type !== "textarea") {
-    var addendum = "";
-    {
-      addendum =
-        " If you meant to render a collection of children, use an array " +
-        "instead." +
-        (getCurrentFiberStackAddendum$1() || "");
+  function callComponentWillReceiveProps(
+    workInProgress,
+    instance,
+    newProps,
+    newContext
+  ) {
+    var oldState = instance.state;
+    startPhaseTimer(workInProgress, "componentWillReceiveProps");
+    if (typeof instance.componentWillReceiveProps === "function") {
+      instance.componentWillReceiveProps(newProps, newContext);
+    }
+    if (typeof instance.UNSAFE_componentWillReceiveProps === "function") {
+      instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    }
+    stopPhaseTimer();
+
+    if (instance.state !== oldState) {
+      {
+        var componentName = getComponentName(workInProgress) || "Component";
+        if (!didWarnAboutStateAssignmentForComponent[componentName]) {
+          warning(
+            false,
+            "%s.componentWillReceiveProps(): Assigning directly to " +
+              "this.state is deprecated (except inside a component's " +
+              "constructor). Use setState instead.",
+            componentName
+          );
+          didWarnAboutStateAssignmentForComponent[componentName] = true;
+        }
+      }
+      updater.enqueueReplaceState(instance, instance.state, null);
     }
-    invariant(
-      false,
-      "Objects are not valid as a React child (found: %s).%s",
-      Object.prototype.toString.call(newChild) === "[object Object]"
-        ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-        : newChild,
-      addendum
-    );
   }
-}
 
-function warnOnFunctionType() {
-  var currentComponentErrorInfo =
-    "Functions are not valid as a React child. This may happen if " +
-    "you return a Component instead of <Component /> from render. " +
-    "Or maybe you meant to call this function rather than return it." +
-    (getCurrentFiberStackAddendum$1() || "");
+  function callGetDerivedStateFromProps(workInProgress, instance, props) {
+    var type = workInProgress.type;
 
-  if (ownerHasFunctionTypeWarning[currentComponentErrorInfo]) {
-    return;
-  }
-  ownerHasFunctionTypeWarning[currentComponentErrorInfo] = true;
+    if (typeof type.getDerivedStateFromProps === "function") {
+      {
+        // Don't warn about react-lifecycles-compat polyfilled components
+        if (
+          (typeof instance.componentWillReceiveProps === "function" &&
+            instance.componentWillReceiveProps.__suppressDeprecationWarning !==
+              true) ||
+          typeof instance.UNSAFE_componentWillReceiveProps === "function"
+        ) {
+          var componentName = getComponentName(workInProgress) || "Unknown";
+          if (!didWarnAboutWillReceivePropsAndDerivedState[componentName]) {
+            warning(
+              false,
+              "%s: Defines both componentWillReceiveProps() and static " +
+                "getDerivedStateFromProps() methods. We recommend using " +
+                "only getDerivedStateFromProps().",
+              componentName
+            );
+            didWarnAboutWillReceivePropsAndDerivedState[componentName] = true;
+          }
+        }
+      }
 
-  warning(
-    false,
-    "Functions are not valid as a React child. This may happen if " +
-      "you return a Component instead of <Component /> from render. " +
-      "Or maybe you meant to call this function rather than return it.%s",
-    getCurrentFiberStackAddendum$1() || ""
-  );
-}
+      if (
+        debugRenderPhaseSideEffects ||
+        (debugRenderPhaseSideEffectsForStrictMode &&
+          workInProgress.mode & StrictMode)
+      ) {
+        // Invoke method an extra time to help detect side-effects.
+        type.getDerivedStateFromProps.call(
+          null,
+          props,
+          workInProgress.memoizedState
+        );
+      }
 
-// This wrapper function exists because I expect to clone the code in each path
-// to be able to optimize each path individually by branching early. This needs
-// a compiler or we can do it manually. Helpers that don't need this branching
-// live outside of this function.
-function ChildReconciler(shouldTrackSideEffects) {
-  function deleteChild(returnFiber, childToDelete) {
-    if (!shouldTrackSideEffects) {
-      // Noop.
-      return;
-    }
-    // Deletions are added in reversed order so we add it to the front.
-    // At this point, the return fiber's effect list is empty except for
-    // deletions, so we can just append the deletion to the list. The remaining
-    // effects aren't added until the complete phase. Once we implement
-    // resuming, this may not be true.
-    var last = returnFiber.lastEffect;
-    if (last !== null) {
-      last.nextEffect = childToDelete;
-      returnFiber.lastEffect = childToDelete;
-    } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
-    }
-    childToDelete.nextEffect = null;
-    childToDelete.effectTag = Deletion;
-  }
+      var partialState = type.getDerivedStateFromProps.call(
+        null,
+        props,
+        workInProgress.memoizedState
+      );
 
-  function deleteRemainingChildren(returnFiber, currentFirstChild) {
-    if (!shouldTrackSideEffects) {
-      // Noop.
-      return null;
-    }
+      {
+        if (partialState === undefined) {
+          var _componentName = getComponentName(workInProgress) || "Unknown";
+          if (!didWarnAboutUndefinedDerivedState[_componentName]) {
+            warning(
+              false,
+              "%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. " +
+                "You have returned undefined.",
+              _componentName
+            );
+            didWarnAboutUndefinedDerivedState[_componentName] = _componentName;
+          }
+        }
+      }
 
-    // TODO: For the shouldClone case, this could be micro-optimized a bit by
-    // assuming that after the first child we've already added everything.
-    var childToDelete = currentFirstChild;
-    while (childToDelete !== null) {
-      deleteChild(returnFiber, childToDelete);
-      childToDelete = childToDelete.sibling;
+      return partialState;
     }
-    return null;
   }
 
-  function mapRemainingChildren(returnFiber, currentFirstChild) {
-    // Add the remaining children to a temporary map so that we can find them by
-    // keys quickly. Implicit (null) keys get added to this set with their index
-    var existingChildren = new Map();
+  // Invokes the mount life-cycles on a previously never rendered instance.
+  function mountClassInstance(workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
+    var current = workInProgress.alternate;
 
-    var existingChild = currentFirstChild;
-    while (existingChild !== null) {
-      if (existingChild.key !== null) {
-        existingChildren.set(existingChild.key, existingChild);
-      } else {
-        existingChildren.set(existingChild.index, existingChild);
-      }
-      existingChild = existingChild.sibling;
+    {
+      checkClassInstance(workInProgress);
     }
-    return existingChildren;
-  }
 
-  function useFiber(fiber, pendingProps, expirationTime) {
-    // We currently set sibling to null and index to 0 here because it is easy
-    // to forget to do before returning it. E.g. for the single child case.
-    var clone = createWorkInProgress(fiber, pendingProps, expirationTime);
-    clone.index = 0;
-    clone.sibling = null;
-    return clone;
-  }
+    var instance = workInProgress.stateNode;
+    var props = workInProgress.pendingProps;
+    var unmaskedContext = getUnmaskedContext(workInProgress);
 
-  function placeChild(newFiber, lastPlacedIndex, newIndex) {
-    newFiber.index = newIndex;
-    if (!shouldTrackSideEffects) {
-      // Noop.
-      return lastPlacedIndex;
-    }
-    var current = newFiber.alternate;
-    if (current !== null) {
-      var oldIndex = current.index;
-      if (oldIndex < lastPlacedIndex) {
-        // This is a move.
-        newFiber.effectTag = Placement;
-        return lastPlacedIndex;
-      } else {
-        // This item can stay in place.
-        return oldIndex;
+    instance.props = props;
+    instance.state = workInProgress.memoizedState;
+    instance.refs = emptyObject;
+    instance.context = getMaskedContext(workInProgress, unmaskedContext);
+
+    {
+      if (workInProgress.mode & StrictMode) {
+        ReactStrictModeWarnings.recordUnsafeLifecycleWarnings(
+          workInProgress,
+          instance
+        );
+      }
+
+      if (warnAboutDeprecatedLifecycles) {
+        ReactStrictModeWarnings.recordDeprecationWarnings(
+          workInProgress,
+          instance
+        );
       }
-    } else {
-      // This is an insertion.
-      newFiber.effectTag = Placement;
-      return lastPlacedIndex;
     }
-  }
 
-  function placeSingleChild(newFiber) {
-    // This is simpler for the single child case. We only need to do a
-    // placement for inserting new children.
-    if (shouldTrackSideEffects && newFiber.alternate === null) {
-      newFiber.effectTag = Placement;
+    // In order to support react-lifecycles-compat polyfilled components,
+    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    if (
+      (typeof instance.UNSAFE_componentWillMount === "function" ||
+        typeof instance.componentWillMount === "function") &&
+      typeof ctor.getDerivedStateFromProps !== "function"
+    ) {
+      callComponentWillMount(workInProgress, instance);
+      // If we had additional state updates during this life-cycle, let's
+      // process them now.
+      var updateQueue = workInProgress.updateQueue;
+      if (updateQueue !== null) {
+        instance.state = processUpdateQueue(
+          current,
+          workInProgress,
+          updateQueue,
+          instance,
+          props,
+          renderExpirationTime
+        );
+      }
     }
-    return newFiber;
-  }
-
-  function updateTextNode(returnFiber, current, textContent, expirationTime) {
-    if (current === null || current.tag !== HostText) {
-      // Insert
-      var created = createFiberFromText(
-        textContent,
-        returnFiber.mode,
-        expirationTime
-      );
-      created["return"] = returnFiber;
-      return created;
-    } else {
-      // Update
-      var existing = useFiber(current, textContent, expirationTime);
-      existing["return"] = returnFiber;
-      return existing;
+    if (typeof instance.componentDidMount === "function") {
+      workInProgress.effectTag |= Update;
     }
   }
 
-  function updateElement(returnFiber, current, element, expirationTime) {
-    if (current !== null && current.type === element.type) {
-      // Move based on index
-      var existing = useFiber(current, element.props, expirationTime);
-      existing.ref = coerceRef(returnFiber, current, element);
-      existing["return"] = returnFiber;
-      {
-        existing._debugSource = element._source;
-        existing._debugOwner = element._owner;
-      }
-      return existing;
-    } else {
-      // Insert
-      var created = createFiberFromElement(
-        element,
-        returnFiber.mode,
-        expirationTime
-      );
-      created.ref = coerceRef(returnFiber, current, element);
-      created["return"] = returnFiber;
-      return created;
-    }
-  }
+  function resumeMountClassInstance(workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
+    var instance = workInProgress.stateNode;
+    resetInputPointers(workInProgress, instance);
 
-  function updatePortal(returnFiber, current, portal, expirationTime) {
+    var oldProps = workInProgress.memoizedProps;
+    var newProps = workInProgress.pendingProps;
+    var oldContext = instance.context;
+    var newUnmaskedContext = getUnmaskedContext(workInProgress);
+    var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
+
+    // Note: During these life-cycles, instance.props/instance.state are what
+    // ever the previously attempted to render - not the "current". However,
+    // during componentDidUpdate we pass the "current" props.
+
+    // In order to support react-lifecycles-compat polyfilled components,
+    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
     if (
-      current === null ||
-      current.tag !== HostPortal ||
-      current.stateNode.containerInfo !== portal.containerInfo ||
-      current.stateNode.implementation !== portal.implementation
+      (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
+        typeof instance.componentWillReceiveProps === "function") &&
+      typeof ctor.getDerivedStateFromProps !== "function"
     ) {
-      // Insert
-      var created = createFiberFromPortal(
-        portal,
-        returnFiber.mode,
-        expirationTime
-      );
-      created["return"] = returnFiber;
-      return created;
-    } else {
-      // Update
-      var existing = useFiber(current, portal.children || [], expirationTime);
-      existing["return"] = returnFiber;
-      return existing;
+      if (oldProps !== newProps || oldContext !== newContext) {
+        callComponentWillReceiveProps(
+          workInProgress,
+          instance,
+          newProps,
+          newContext
+        );
+      }
     }
-  }
 
-  function updateFragment(returnFiber, current, fragment, expirationTime, key) {
-    if (current === null || current.tag !== Fragment) {
-      // Insert
-      var created = createFiberFromFragment(
-        fragment,
-        returnFiber.mode,
-        expirationTime,
-        key
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps
       );
-      created["return"] = returnFiber;
-      return created;
-    } else {
-      // Update
-      var existing = useFiber(current, fragment, expirationTime);
-      existing["return"] = returnFiber;
-      return existing;
     }
-  }
 
-  function createChild(returnFiber, newChild, expirationTime) {
-    if (typeof newChild === "string" || typeof newChild === "number") {
-      // Text nodes don't have keys. If the previous node is implicitly keyed
-      // we can continue to replace it without aborting even if it is not a text
-      // node.
-      var created = createFiberFromText(
-        "" + newChild,
-        returnFiber.mode,
-        expirationTime
+    // Compute the next state using the memoized state and the update queue.
+    var oldState = workInProgress.memoizedState;
+    // TODO: Previous state can be null.
+    var newState = void 0;
+    var derivedStateFromCatch = void 0;
+    if (workInProgress.updateQueue !== null) {
+      newState = processUpdateQueue(
+        null,
+        workInProgress,
+        workInProgress.updateQueue,
+        instance,
+        newProps,
+        renderExpirationTime
       );
-      created["return"] = returnFiber;
-      return created;
-    }
-
-    if (typeof newChild === "object" && newChild !== null) {
-      switch (newChild.$$typeof) {
-        case REACT_ELEMENT_TYPE: {
-          var _created = createFiberFromElement(
-            newChild,
-            returnFiber.mode,
-            expirationTime
-          );
-          _created.ref = coerceRef(returnFiber, null, newChild);
-          _created["return"] = returnFiber;
-          return _created;
-        }
-        case REACT_PORTAL_TYPE: {
-          var _created2 = createFiberFromPortal(
-            newChild,
-            returnFiber.mode,
-            expirationTime
-          );
-          _created2["return"] = returnFiber;
-          return _created2;
-        }
-      }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
-        var _created3 = createFiberFromFragment(
-          newChild,
-          returnFiber.mode,
-          expirationTime,
-          null
+      var updateQueue = workInProgress.updateQueue;
+      if (
+        updateQueue !== null &&
+        updateQueue.capturedValues !== null &&
+        enableGetDerivedStateFromCatch &&
+        typeof ctor.getDerivedStateFromCatch === "function"
+      ) {
+        var capturedValues = updateQueue.capturedValues;
+        // Don't remove these from the update queue yet. We need them in
+        // finishClassComponent. Do the reset there.
+        // TODO: This is awkward. Refactor class components.
+        // updateQueue.capturedValues = null;
+        derivedStateFromCatch = callGetDerivedStateFromCatch(
+          ctor,
+          capturedValues
         );
-        _created3["return"] = returnFiber;
-        return _created3;
       }
-
-      throwOnInvalidObjectType(returnFiber, newChild);
+    } else {
+      newState = oldState;
     }
 
-    {
-      if (typeof newChild === "function") {
-        warnOnFunctionType();
-      }
+    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromProps
+          : Object.assign({}, newState, derivedStateFromProps);
+    }
+    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromCatch
+          : Object.assign({}, newState, derivedStateFromCatch);
     }
 
-    return null;
-  }
-
-  function updateSlot(returnFiber, oldFiber, newChild, expirationTime) {
-    // Update the fiber if the keys match, otherwise return null.
-
-    var key = oldFiber !== null ? oldFiber.key : null;
-
-    if (typeof newChild === "string" || typeof newChild === "number") {
-      // Text nodes don't have keys. If the previous node is implicitly keyed
-      // we can continue to replace it without aborting even if it is not a text
-      // node.
-      if (key !== null) {
-        return null;
+    if (
+      oldProps === newProps &&
+      oldState === newState &&
+      !hasContextChanged() &&
+      !(
+        workInProgress.updateQueue !== null &&
+        workInProgress.updateQueue.hasForceUpdate
+      )
+    ) {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
       }
-      return updateTextNode(
-        returnFiber,
-        oldFiber,
-        "" + newChild,
-        expirationTime
-      );
+      return false;
     }
 
-    if (typeof newChild === "object" && newChild !== null) {
-      switch (newChild.$$typeof) {
-        case REACT_ELEMENT_TYPE: {
-          if (newChild.key === key) {
-            if (newChild.type === REACT_FRAGMENT_TYPE) {
-              return updateFragment(
-                returnFiber,
-                oldFiber,
-                newChild.props.children,
-                expirationTime,
-                key
-              );
-            }
-            return updateElement(
-              returnFiber,
-              oldFiber,
-              newChild,
-              expirationTime
-            );
-          } else {
-            return null;
-          }
+    var shouldUpdate = checkShouldComponentUpdate(
+      workInProgress,
+      oldProps,
+      newProps,
+      oldState,
+      newState,
+      newContext
+    );
+
+    if (shouldUpdate) {
+      // In order to support react-lifecycles-compat polyfilled components,
+      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      if (
+        (typeof instance.UNSAFE_componentWillUpdate === "function" ||
+          typeof instance.componentWillUpdate === "function") &&
+        typeof ctor.getDerivedStateFromProps !== "function"
+      ) {
+        startPhaseTimer(workInProgress, "componentWillUpdate");
+        if (typeof instance.componentWillUpdate === "function") {
+          instance.componentWillUpdate(newProps, newState, newContext);
         }
-        case REACT_PORTAL_TYPE: {
-          if (newChild.key === key) {
-            return updatePortal(
-              returnFiber,
-              oldFiber,
-              newChild,
-              expirationTime
-            );
-          } else {
-            return null;
-          }
+        if (typeof instance.UNSAFE_componentWillUpdate === "function") {
+          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
         }
+        stopPhaseTimer();
       }
-
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
-        if (key !== null) {
-          return null;
-        }
-
-        return updateFragment(
-          returnFiber,
-          oldFiber,
-          newChild,
-          expirationTime,
-          null
-        );
+      if (typeof instance.componentDidUpdate === "function") {
+        workInProgress.effectTag |= Update;
+      }
+    } else {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
       }
 
-      throwOnInvalidObjectType(returnFiber, newChild);
+      // If shouldComponentUpdate returned false, we should still update the
+      // memoized props/state to indicate that this work can be reused.
+      memoizeProps(workInProgress, newProps);
+      memoizeState(workInProgress, newState);
     }
 
-    {
-      if (typeof newChild === "function") {
-        warnOnFunctionType();
-      }
-    }
+    // Update the existing instance's state, props, and context pointers even
+    // if shouldComponentUpdate returns false.
+    instance.props = newProps;
+    instance.state = newState;
+    instance.context = newContext;
 
-    return null;
+    return shouldUpdate;
   }
 
-  function updateFromMap(
-    existingChildren,
-    returnFiber,
-    newIdx,
-    newChild,
-    expirationTime
-  ) {
-    if (typeof newChild === "string" || typeof newChild === "number") {
-      // Text nodes don't have keys, so we neither have to check the old nor
-      // new node for the key. If both are text nodes, they match.
-      var matchedFiber = existingChildren.get(newIdx) || null;
-      return updateTextNode(
-        returnFiber,
-        matchedFiber,
-        "" + newChild,
-        expirationTime
-      );
-    }
+  // Invokes the update life-cycles and returns false if it shouldn't rerender.
+  function updateClassInstance(current, workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
+    var instance = workInProgress.stateNode;
+    resetInputPointers(workInProgress, instance);
 
-    if (typeof newChild === "object" && newChild !== null) {
-      switch (newChild.$$typeof) {
-        case REACT_ELEMENT_TYPE: {
-          var _matchedFiber =
-            existingChildren.get(
-              newChild.key === null ? newIdx : newChild.key
-            ) || null;
-          if (newChild.type === REACT_FRAGMENT_TYPE) {
-            return updateFragment(
-              returnFiber,
-              _matchedFiber,
-              newChild.props.children,
-              expirationTime,
-              newChild.key
-            );
-          }
-          return updateElement(
-            returnFiber,
-            _matchedFiber,
-            newChild,
-            expirationTime
-          );
-        }
-        case REACT_PORTAL_TYPE: {
-          var _matchedFiber2 =
-            existingChildren.get(
-              newChild.key === null ? newIdx : newChild.key
-            ) || null;
-          return updatePortal(
-            returnFiber,
-            _matchedFiber2,
-            newChild,
-            expirationTime
-          );
-        }
-      }
+    var oldProps = workInProgress.memoizedProps;
+    var newProps = workInProgress.pendingProps;
+    var oldContext = instance.context;
+    var newUnmaskedContext = getUnmaskedContext(workInProgress);
+    var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
-        var _matchedFiber3 = existingChildren.get(newIdx) || null;
-        return updateFragment(
-          returnFiber,
-          _matchedFiber3,
-          newChild,
-          expirationTime,
-          null
+    // Note: During these life-cycles, instance.props/instance.state are what
+    // ever the previously attempted to render - not the "current". However,
+    // during componentDidUpdate we pass the "current" props.
+
+    // In order to support react-lifecycles-compat polyfilled components,
+    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    if (
+      (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
+        typeof instance.componentWillReceiveProps === "function") &&
+      typeof ctor.getDerivedStateFromProps !== "function"
+    ) {
+      if (oldProps !== newProps || oldContext !== newContext) {
+        callComponentWillReceiveProps(
+          workInProgress,
+          instance,
+          newProps,
+          newContext
         );
       }
+    }
 
-      throwOnInvalidObjectType(returnFiber, newChild);
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps
+      );
     }
 
-    {
-      if (typeof newChild === "function") {
-        warnOnFunctionType();
+    // Compute the next state using the memoized state and the update queue.
+    var oldState = workInProgress.memoizedState;
+    // TODO: Previous state can be null.
+    var newState = void 0;
+    var derivedStateFromCatch = void 0;
+    if (workInProgress.updateQueue !== null) {
+      newState = processUpdateQueue(
+        current,
+        workInProgress,
+        workInProgress.updateQueue,
+        instance,
+        newProps,
+        renderExpirationTime
+      );
+
+      var updateQueue = workInProgress.updateQueue;
+      if (
+        updateQueue !== null &&
+        updateQueue.capturedValues !== null &&
+        enableGetDerivedStateFromCatch &&
+        typeof ctor.getDerivedStateFromCatch === "function"
+      ) {
+        var capturedValues = updateQueue.capturedValues;
+        // Don't remove these from the update queue yet. We need them in
+        // finishClassComponent. Do the reset there.
+        // TODO: This is awkward. Refactor class components.
+        // updateQueue.capturedValues = null;
+        derivedStateFromCatch = callGetDerivedStateFromCatch(
+          ctor,
+          capturedValues
+        );
       }
+    } else {
+      newState = oldState;
     }
 
-    return null;
-  }
+    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromProps
+          : Object.assign({}, newState, derivedStateFromProps);
+    }
+    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromCatch
+          : Object.assign({}, newState, derivedStateFromCatch);
+    }
 
-  /**
-   * Warns if there is a duplicate or missing key
-   */
-  function warnOnInvalidKey(child, knownKeys) {
-    {
-      if (typeof child !== "object" || child === null) {
-        return knownKeys;
-      }
-      switch (child.$$typeof) {
-        case REACT_ELEMENT_TYPE:
-        case REACT_PORTAL_TYPE:
-          warnForMissingKey(child);
-          var key = child.key;
-          if (typeof key !== "string") {
-            break;
-          }
-          if (knownKeys === null) {
-            knownKeys = new Set();
-            knownKeys.add(key);
-            break;
-          }
-          if (!knownKeys.has(key)) {
-            knownKeys.add(key);
-            break;
-          }
-          warning(
-            false,
-            "Encountered two children with the same key, `%s`. " +
-              "Keys should be unique so that components maintain their identity " +
-              "across updates. Non-unique keys may cause children to be " +
-              "duplicated and/or omitted — the behavior is unsupported and " +
-              "could change in a future version.%s",
-            key,
-            getCurrentFiberStackAddendum$1()
-          );
-          break;
-        default:
-          break;
-      }
-    }
-    return knownKeys;
-  }
-
-  function reconcileChildrenArray(
-    returnFiber,
-    currentFirstChild,
-    newChildren,
-    expirationTime
-  ) {
-    // This algorithm can't optimize by searching from boths ends since we
-    // don't have backpointers on fibers. I'm trying to see how far we can get
-    // with that model. If it ends up not being worth the tradeoffs, we can
-    // add it later.
-
-    // Even with a two ended optimization, we'd want to optimize for the case
-    // where there are few changes and brute force the comparison instead of
-    // going for the Map. It'd like to explore hitting that path first in
-    // forward-only mode and only go for the Map once we notice that we need
-    // lots of look ahead. This doesn't handle reversal as well as two ended
-    // search but that's unusual. Besides, for the two ended optimization to
-    // work on Iterables, we'd need to copy the whole set.
-
-    // In this first iteration, we'll just live with hitting the bad case
-    // (adding everything to a Map) in for every insert/move.
-
-    // If you change this code, also update reconcileChildrenIterator() which
-    // uses the same algorithm.
-
-    {
-      // First, validate keys.
-      var knownKeys = null;
-      for (var i = 0; i < newChildren.length; i++) {
-        var child = newChildren[i];
-        knownKeys = warnOnInvalidKey(child, knownKeys);
+    if (
+      oldProps === newProps &&
+      oldState === newState &&
+      !hasContextChanged() &&
+      !(
+        workInProgress.updateQueue !== null &&
+        workInProgress.updateQueue.hasForceUpdate
+      )
+    ) {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Update;
+        }
       }
+      return false;
     }
 
-    var resultingFirstChild = null;
-    var previousNewFiber = null;
+    var shouldUpdate = checkShouldComponentUpdate(
+      workInProgress,
+      oldProps,
+      newProps,
+      oldState,
+      newState,
+      newContext
+    );
 
-    var oldFiber = currentFirstChild;
-    var lastPlacedIndex = 0;
-    var newIdx = 0;
-    var nextOldFiber = null;
-    for (; oldFiber !== null && newIdx < newChildren.length; newIdx++) {
-      if (oldFiber.index > newIdx) {
-        nextOldFiber = oldFiber;
-        oldFiber = null;
-      } else {
-        nextOldFiber = oldFiber.sibling;
-      }
-      var newFiber = updateSlot(
-        returnFiber,
-        oldFiber,
-        newChildren[newIdx],
-        expirationTime
-      );
-      if (newFiber === null) {
-        // TODO: This breaks on empty slots like null children. That's
-        // unfortunate because it triggers the slow path all the time. We need
-        // a better way to communicate whether this was a miss or null,
-        // boolean, undefined, etc.
-        if (oldFiber === null) {
-          oldFiber = nextOldFiber;
+    if (shouldUpdate) {
+      // In order to support react-lifecycles-compat polyfilled components,
+      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      if (
+        (typeof instance.UNSAFE_componentWillUpdate === "function" ||
+          typeof instance.componentWillUpdate === "function") &&
+        typeof ctor.getDerivedStateFromProps !== "function"
+      ) {
+        startPhaseTimer(workInProgress, "componentWillUpdate");
+        if (typeof instance.componentWillUpdate === "function") {
+          instance.componentWillUpdate(newProps, newState, newContext);
         }
-        break;
-      }
-      if (shouldTrackSideEffects) {
-        if (oldFiber && newFiber.alternate === null) {
-          // We matched the slot, but we didn't reuse the existing fiber, so we
-          // need to delete the existing child.
-          deleteChild(returnFiber, oldFiber);
+        if (typeof instance.UNSAFE_componentWillUpdate === "function") {
+          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
         }
+        stopPhaseTimer();
       }
-      lastPlacedIndex = placeChild(newFiber, lastPlacedIndex, newIdx);
-      if (previousNewFiber === null) {
-        // TODO: Move out of the loop. This only happens for the first run.
-        resultingFirstChild = newFiber;
-      } else {
-        // TODO: Defer siblings if we're not at the right index for this slot.
-        // I.e. if we had null values before, then we want to defer this
-        // for each null value. However, we also don't want to call updateSlot
-        // with the previous one.
-        previousNewFiber.sibling = newFiber;
+      if (typeof instance.componentDidUpdate === "function") {
+        workInProgress.effectTag |= Update;
       }
-      previousNewFiber = newFiber;
-      oldFiber = nextOldFiber;
-    }
-
-    if (newIdx === newChildren.length) {
-      // We've reached the end of the new children. We can delete the rest.
-      deleteRemainingChildren(returnFiber, oldFiber);
-      return resultingFirstChild;
-    }
-
-    if (oldFiber === null) {
-      // If we don't have any more existing children we can choose a fast path
-      // since the rest will all be insertions.
-      for (; newIdx < newChildren.length; newIdx++) {
-        var _newFiber = createChild(
-          returnFiber,
-          newChildren[newIdx],
-          expirationTime
-        );
-        if (!_newFiber) {
-          continue;
-        }
-        lastPlacedIndex = placeChild(_newFiber, lastPlacedIndex, newIdx);
-        if (previousNewFiber === null) {
-          // TODO: Move out of the loop. This only happens for the first run.
-          resultingFirstChild = _newFiber;
-        } else {
-          previousNewFiber.sibling = _newFiber;
+    } else {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Update;
         }
-        previousNewFiber = _newFiber;
       }
-      return resultingFirstChild;
-    }
-
-    // Add all children to a key map for quick lookups.
-    var existingChildren = mapRemainingChildren(returnFiber, oldFiber);
 
-    // Keep scanning and use the map to restore deleted items as moves.
-    for (; newIdx < newChildren.length; newIdx++) {
-      var _newFiber2 = updateFromMap(
-        existingChildren,
-        returnFiber,
-        newIdx,
-        newChildren[newIdx],
-        expirationTime
-      );
-      if (_newFiber2) {
-        if (shouldTrackSideEffects) {
-          if (_newFiber2.alternate !== null) {
-            // The new fiber is a work in progress, but if there exists a
-            // current, that means that we reused the fiber. We need to delete
-            // it from the child list so that we don't add it to the deletion
-            // list.
-            existingChildren["delete"](
-              _newFiber2.key === null ? newIdx : _newFiber2.key
-            );
-          }
-        }
-        lastPlacedIndex = placeChild(_newFiber2, lastPlacedIndex, newIdx);
-        if (previousNewFiber === null) {
-          resultingFirstChild = _newFiber2;
-        } else {
-          previousNewFiber.sibling = _newFiber2;
-        }
-        previousNewFiber = _newFiber2;
-      }
+      // If shouldComponentUpdate returned false, we should still update the
+      // memoized props/state to indicate that this work can be reused.
+      memoizeProps(workInProgress, newProps);
+      memoizeState(workInProgress, newState);
     }
 
-    if (shouldTrackSideEffects) {
-      // Any existing children that weren't consumed above were deleted. We need
-      // to add them to the deletion list.
-      existingChildren.forEach(function(child) {
-        return deleteChild(returnFiber, child);
-      });
-    }
+    // Update the existing instance's state, props, and context pointers even
+    // if shouldComponentUpdate returns false.
+    instance.props = newProps;
+    instance.state = newState;
+    instance.context = newContext;
 
-    return resultingFirstChild;
+    return shouldUpdate;
   }
 
-  function reconcileChildrenIterator(
-    returnFiber,
-    currentFirstChild,
-    newChildrenIterable,
-    expirationTime
-  ) {
-    // This is the same implementation as reconcileChildrenArray(),
-    // but using the iterator instead.
-
-    var iteratorFn = getIteratorFn(newChildrenIterable);
-    invariant(
-      typeof iteratorFn === "function",
-      "An object is not an iterable. This error is likely caused by a bug in " +
-        "React. Please file an issue."
-    );
+  return {
+    adoptClassInstance: adoptClassInstance,
+    callGetDerivedStateFromProps: callGetDerivedStateFromProps,
+    constructClassInstance: constructClassInstance,
+    mountClassInstance: mountClassInstance,
+    resumeMountClassInstance: resumeMountClassInstance,
+    updateClassInstance: updateClassInstance
+  };
+};
 
-    {
-      // Warn about using Maps as children
-      if (typeof newChildrenIterable.entries === "function") {
-        var possibleMap = newChildrenIterable;
-        if (possibleMap.entries === iteratorFn) {
-          !didWarnAboutMaps
-            ? warning(
-                false,
-                "Using Maps as children is unsupported and will likely yield " +
-                  "unexpected results. Convert it to a sequence/iterable of keyed " +
-                  "ReactElements instead.%s",
-                getCurrentFiberStackAddendum$1()
-              )
-            : void 0;
-          didWarnAboutMaps = true;
-        }
-      }
-
-      // First, validate keys.
-      // We'll get a different iterator later for the main pass.
-      var _newChildren = iteratorFn.call(newChildrenIterable);
-      if (_newChildren) {
-        var knownKeys = null;
-        var _step = _newChildren.next();
-        for (; !_step.done; _step = _newChildren.next()) {
-          var child = _step.value;
-          knownKeys = warnOnInvalidKey(child, knownKeys);
-        }
-      }
-    }
+var getCurrentFiberStackAddendum$1 =
+  ReactDebugCurrentFiber.getCurrentFiberStackAddendum;
 
-    var newChildren = iteratorFn.call(newChildrenIterable);
-    invariant(newChildren != null, "An iterable object provided no iterator.");
+var didWarnAboutMaps = void 0;
+var didWarnAboutStringRefInStrictMode = void 0;
+var ownerHasKeyUseWarning = void 0;
+var ownerHasFunctionTypeWarning = void 0;
+var warnForMissingKey = function(child) {};
 
-    var resultingFirstChild = null;
-    var previousNewFiber = null;
+{
+  didWarnAboutMaps = false;
+  didWarnAboutStringRefInStrictMode = {};
 
-    var oldFiber = currentFirstChild;
-    var lastPlacedIndex = 0;
-    var newIdx = 0;
-    var nextOldFiber = null;
+  /**
+   * Warn if there's no key explicitly set on dynamic arrays of children or
+   * object keys are not valid. This allows us to keep track of children between
+   * updates.
+   */
+  ownerHasKeyUseWarning = {};
+  ownerHasFunctionTypeWarning = {};
 
-    var step = newChildren.next();
-    for (
-      ;
-      oldFiber !== null && !step.done;
-      newIdx++, step = newChildren.next()
-    ) {
-      if (oldFiber.index > newIdx) {
-        nextOldFiber = oldFiber;
-        oldFiber = null;
-      } else {
-        nextOldFiber = oldFiber.sibling;
-      }
-      var newFiber = updateSlot(
-        returnFiber,
-        oldFiber,
-        step.value,
-        expirationTime
-      );
-      if (newFiber === null) {
-        // TODO: This breaks on empty slots like null children. That's
-        // unfortunate because it triggers the slow path all the time. We need
-        // a better way to communicate whether this was a miss or null,
-        // boolean, undefined, etc.
-        if (!oldFiber) {
-          oldFiber = nextOldFiber;
-        }
-        break;
-      }
-      if (shouldTrackSideEffects) {
-        if (oldFiber && newFiber.alternate === null) {
-          // We matched the slot, but we didn't reuse the existing fiber, so we
-          // need to delete the existing child.
-          deleteChild(returnFiber, oldFiber);
-        }
-      }
-      lastPlacedIndex = placeChild(newFiber, lastPlacedIndex, newIdx);
-      if (previousNewFiber === null) {
-        // TODO: Move out of the loop. This only happens for the first run.
-        resultingFirstChild = newFiber;
-      } else {
-        // TODO: Defer siblings if we're not at the right index for this slot.
-        // I.e. if we had null values before, then we want to defer this
-        // for each null value. However, we also don't want to call updateSlot
-        // with the previous one.
-        previousNewFiber.sibling = newFiber;
-      }
-      previousNewFiber = newFiber;
-      oldFiber = nextOldFiber;
+  warnForMissingKey = function(child) {
+    if (child === null || typeof child !== "object") {
+      return;
+    }
+    if (!child._store || child._store.validated || child.key != null) {
+      return;
     }
+    invariant(
+      typeof child._store === "object",
+      "React Component in warnForMissingKey should have a _store. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+    child._store.validated = true;
 
-    if (step.done) {
-      // We've reached the end of the new children. We can delete the rest.
-      deleteRemainingChildren(returnFiber, oldFiber);
-      return resultingFirstChild;
+    var currentComponentErrorInfo =
+      "Each child in an array or iterator should have a unique " +
+      '"key" prop. See https://fb.me/react-warning-keys for ' +
+      "more information." +
+      (getCurrentFiberStackAddendum$1() || "");
+    if (ownerHasKeyUseWarning[currentComponentErrorInfo]) {
+      return;
     }
+    ownerHasKeyUseWarning[currentComponentErrorInfo] = true;
 
-    if (oldFiber === null) {
-      // If we don't have any more existing children we can choose a fast path
-      // since the rest will all be insertions.
-      for (; !step.done; newIdx++, step = newChildren.next()) {
-        var _newFiber3 = createChild(returnFiber, step.value, expirationTime);
-        if (_newFiber3 === null) {
-          continue;
-        }
-        lastPlacedIndex = placeChild(_newFiber3, lastPlacedIndex, newIdx);
-        if (previousNewFiber === null) {
-          // TODO: Move out of the loop. This only happens for the first run.
-          resultingFirstChild = _newFiber3;
-        } else {
-          previousNewFiber.sibling = _newFiber3;
+    warning(
+      false,
+      "Each child in an array or iterator should have a unique " +
+        '"key" prop. See https://fb.me/react-warning-keys for ' +
+        "more information.%s",
+      getCurrentFiberStackAddendum$1()
+    );
+  };
+}
+
+var isArray$1 = Array.isArray;
+
+function coerceRef(returnFiber, current, element) {
+  var mixedRef = element.ref;
+  if (
+    mixedRef !== null &&
+    typeof mixedRef !== "function" &&
+    typeof mixedRef !== "object"
+  ) {
+    {
+      if (returnFiber.mode & StrictMode) {
+        var componentName = getComponentName(returnFiber) || "Component";
+        if (!didWarnAboutStringRefInStrictMode[componentName]) {
+          warning(
+            false,
+            'A string ref, "%s", has been found within a strict mode tree. ' +
+              "String refs are a source of potential bugs and should be avoided. " +
+              "We recommend using createRef() instead." +
+              "\n%s" +
+              "\n\nLearn more about using refs safely here:" +
+              "\nhttps://fb.me/react-strict-mode-string-ref",
+            mixedRef,
+            getStackAddendumByWorkInProgressFiber(returnFiber)
+          );
+          didWarnAboutStringRefInStrictMode[componentName] = true;
         }
-        previousNewFiber = _newFiber3;
       }
-      return resultingFirstChild;
     }
 
-    // Add all children to a key map for quick lookups.
-    var existingChildren = mapRemainingChildren(returnFiber, oldFiber);
-
-    // Keep scanning and use the map to restore deleted items as moves.
-    for (; !step.done; newIdx++, step = newChildren.next()) {
-      var _newFiber4 = updateFromMap(
-        existingChildren,
-        returnFiber,
-        newIdx,
-        step.value,
-        expirationTime
+    if (element._owner) {
+      var owner = element._owner;
+      var inst = void 0;
+      if (owner) {
+        var ownerFiber = owner;
+        invariant(
+          ownerFiber.tag === ClassComponent,
+          "Stateless function components cannot have refs."
+        );
+        inst = ownerFiber.stateNode;
+      }
+      invariant(
+        inst,
+        "Missing owner for string ref %s. This error is likely caused by a " +
+          "bug in React. Please file an issue.",
+        mixedRef
       );
-      if (_newFiber4 !== null) {
-        if (shouldTrackSideEffects) {
-          if (_newFiber4.alternate !== null) {
-            // The new fiber is a work in progress, but if there exists a
-            // current, that means that we reused the fiber. We need to delete
-            // it from the child list so that we don't add it to the deletion
-            // list.
-            existingChildren["delete"](
-              _newFiber4.key === null ? newIdx : _newFiber4.key
-            );
-          }
-        }
-        lastPlacedIndex = placeChild(_newFiber4, lastPlacedIndex, newIdx);
-        if (previousNewFiber === null) {
-          resultingFirstChild = _newFiber4;
+      var stringRef = "" + mixedRef;
+      // Check if previous string ref matches new string ref
+      if (
+        current !== null &&
+        current.ref !== null &&
+        current.ref._stringRef === stringRef
+      ) {
+        return current.ref;
+      }
+      var ref = function(value) {
+        var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
+        if (value === null) {
+          delete refs[stringRef];
         } else {
-          previousNewFiber.sibling = _newFiber4;
+          refs[stringRef] = value;
         }
-        previousNewFiber = _newFiber4;
-      }
+      };
+      ref._stringRef = stringRef;
+      return ref;
+    } else {
+      invariant(
+        typeof mixedRef === "string",
+        "Expected ref to be a function or a string."
+      );
+      invariant(
+        element._owner,
+        "Element ref was specified as a string (%s) but no owner was set. This could happen for one of" +
+          " the following reasons:\n" +
+          "1. You may be adding a ref to a functional component\n" +
+          "2. You may be adding a ref to a component that was not created inside a component's render method\n" +
+          "3. You have multiple copies of React loaded\n" +
+          "See https://fb.me/react-refs-must-have-owner for more information.",
+        mixedRef
+      );
     }
+  }
+  return mixedRef;
+}
 
-    if (shouldTrackSideEffects) {
-      // Any existing children that weren't consumed above were deleted. We need
-      // to add them to the deletion list.
-      existingChildren.forEach(function(child) {
-        return deleteChild(returnFiber, child);
-      });
+function throwOnInvalidObjectType(returnFiber, newChild) {
+  if (returnFiber.type !== "textarea") {
+    var addendum = "";
+    {
+      addendum =
+        " If you meant to render a collection of children, use an array " +
+        "instead." +
+        (getCurrentFiberStackAddendum$1() || "");
     }
+    invariant(
+      false,
+      "Objects are not valid as a React child (found: %s).%s",
+      Object.prototype.toString.call(newChild) === "[object Object]"
+        ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+        : newChild,
+      addendum
+    );
+  }
+}
 
-    return resultingFirstChild;
+function warnOnFunctionType() {
+  var currentComponentErrorInfo =
+    "Functions are not valid as a React child. This may happen if " +
+    "you return a Component instead of <Component /> from render. " +
+    "Or maybe you meant to call this function rather than return it." +
+    (getCurrentFiberStackAddendum$1() || "");
+
+  if (ownerHasFunctionTypeWarning[currentComponentErrorInfo]) {
+    return;
   }
+  ownerHasFunctionTypeWarning[currentComponentErrorInfo] = true;
 
-  function reconcileSingleTextNode(
-    returnFiber,
-    currentFirstChild,
-    textContent,
-    expirationTime
-  ) {
-    // There's no need to check for keys on text nodes since we don't have a
-    // way to define them.
-    if (currentFirstChild !== null && currentFirstChild.tag === HostText) {
-      // We already have an existing node so let's just update it and delete
-      // the rest.
-      deleteRemainingChildren(returnFiber, currentFirstChild.sibling);
-      var existing = useFiber(currentFirstChild, textContent, expirationTime);
-      existing["return"] = returnFiber;
-      return existing;
+  warning(
+    false,
+    "Functions are not valid as a React child. This may happen if " +
+      "you return a Component instead of <Component /> from render. " +
+      "Or maybe you meant to call this function rather than return it.%s",
+    getCurrentFiberStackAddendum$1() || ""
+  );
+}
+
+// This wrapper function exists because I expect to clone the code in each path
+// to be able to optimize each path individually by branching early. This needs
+// a compiler or we can do it manually. Helpers that don't need this branching
+// live outside of this function.
+function ChildReconciler(shouldTrackSideEffects) {
+  function deleteChild(returnFiber, childToDelete) {
+    if (!shouldTrackSideEffects) {
+      // Noop.
+      return;
     }
-    // The existing first child is not a text node so we need to create one
-    // and delete the existing ones.
-    deleteRemainingChildren(returnFiber, currentFirstChild);
-    var created = createFiberFromText(
-      textContent,
-      returnFiber.mode,
-      expirationTime
-    );
-    created["return"] = returnFiber;
-    return created;
+    // Deletions are added in reversed order so we add it to the front.
+    // At this point, the return fiber's effect list is empty except for
+    // deletions, so we can just append the deletion to the list. The remaining
+    // effects aren't added until the complete phase. Once we implement
+    // resuming, this may not be true.
+    var last = returnFiber.lastEffect;
+    if (last !== null) {
+      last.nextEffect = childToDelete;
+      returnFiber.lastEffect = childToDelete;
+    } else {
+      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+    }
+    childToDelete.nextEffect = null;
+    childToDelete.effectTag = Deletion;
   }
 
-  function reconcileSingleElement(
-    returnFiber,
-    currentFirstChild,
-    element,
-    expirationTime
-  ) {
-    var key = element.key;
-    var child = currentFirstChild;
-    while (child !== null) {
-      // TODO: If key === null and child.key === null, then this only applies to
-      // the first item in the list.
-      if (child.key === key) {
-        if (
-          child.tag === Fragment
-            ? element.type === REACT_FRAGMENT_TYPE
-            : child.type === element.type
-        ) {
-          deleteRemainingChildren(returnFiber, child.sibling);
-          var existing = useFiber(
-            child,
-            element.type === REACT_FRAGMENT_TYPE
-              ? element.props.children
-              : element.props,
-            expirationTime
-          );
-          existing.ref = coerceRef(returnFiber, child, element);
-          existing["return"] = returnFiber;
-          {
-            existing._debugSource = element._source;
-            existing._debugOwner = element._owner;
-          }
-          return existing;
-        } else {
-          deleteRemainingChildren(returnFiber, child);
-          break;
-        }
+  function deleteRemainingChildren(returnFiber, currentFirstChild) {
+    if (!shouldTrackSideEffects) {
+      // Noop.
+      return null;
+    }
+
+    // TODO: For the shouldClone case, this could be micro-optimized a bit by
+    // assuming that after the first child we've already added everything.
+    var childToDelete = currentFirstChild;
+    while (childToDelete !== null) {
+      deleteChild(returnFiber, childToDelete);
+      childToDelete = childToDelete.sibling;
+    }
+    return null;
+  }
+
+  function mapRemainingChildren(returnFiber, currentFirstChild) {
+    // Add the remaining children to a temporary map so that we can find them by
+    // keys quickly. Implicit (null) keys get added to this set with their index
+    var existingChildren = new Map();
+
+    var existingChild = currentFirstChild;
+    while (existingChild !== null) {
+      if (existingChild.key !== null) {
+        existingChildren.set(existingChild.key, existingChild);
       } else {
-        deleteChild(returnFiber, child);
+        existingChildren.set(existingChild.index, existingChild);
       }
-      child = child.sibling;
+      existingChild = existingChild.sibling;
     }
+    return existingChildren;
+  }
 
-    if (element.type === REACT_FRAGMENT_TYPE) {
-      var created = createFiberFromFragment(
-        element.props.children,
+  function useFiber(fiber, pendingProps, expirationTime) {
+    // We currently set sibling to null and index to 0 here because it is easy
+    // to forget to do before returning it. E.g. for the single child case.
+    var clone = createWorkInProgress(fiber, pendingProps, expirationTime);
+    clone.index = 0;
+    clone.sibling = null;
+    return clone;
+  }
+
+  function placeChild(newFiber, lastPlacedIndex, newIndex) {
+    newFiber.index = newIndex;
+    if (!shouldTrackSideEffects) {
+      // Noop.
+      return lastPlacedIndex;
+    }
+    var current = newFiber.alternate;
+    if (current !== null) {
+      var oldIndex = current.index;
+      if (oldIndex < lastPlacedIndex) {
+        // This is a move.
+        newFiber.effectTag = Placement;
+        return lastPlacedIndex;
+      } else {
+        // This item can stay in place.
+        return oldIndex;
+      }
+    } else {
+      // This is an insertion.
+      newFiber.effectTag = Placement;
+      return lastPlacedIndex;
+    }
+  }
+
+  function placeSingleChild(newFiber) {
+    // This is simpler for the single child case. We only need to do a
+    // placement for inserting new children.
+    if (shouldTrackSideEffects && newFiber.alternate === null) {
+      newFiber.effectTag = Placement;
+    }
+    return newFiber;
+  }
+
+  function updateTextNode(returnFiber, current, textContent, expirationTime) {
+    if (current === null || current.tag !== HostText) {
+      // Insert
+      var created = createFiberFromText(
+        textContent,
         returnFiber.mode,
-        expirationTime,
-        element.key
+        expirationTime
       );
       created["return"] = returnFiber;
       return created;
     } else {
-      var _created4 = createFiberFromElement(
+      // Update
+      var existing = useFiber(current, textContent, expirationTime);
+      existing["return"] = returnFiber;
+      return existing;
+    }
+  }
+
+  function updateElement(returnFiber, current, element, expirationTime) {
+    if (current !== null && current.type === element.type) {
+      // Move based on index
+      var existing = useFiber(current, element.props, expirationTime);
+      existing.ref = coerceRef(returnFiber, current, element);
+      existing["return"] = returnFiber;
+      {
+        existing._debugSource = element._source;
+        existing._debugOwner = element._owner;
+      }
+      return existing;
+    } else {
+      // Insert
+      var created = createFiberFromElement(
         element,
         returnFiber.mode,
         expirationTime
       );
-      _created4.ref = coerceRef(returnFiber, currentFirstChild, element);
-      _created4["return"] = returnFiber;
-      return _created4;
+      created.ref = coerceRef(returnFiber, current, element);
+      created["return"] = returnFiber;
+      return created;
     }
   }
 
-  function reconcileSinglePortal(
-    returnFiber,
-    currentFirstChild,
-    portal,
-    expirationTime
-  ) {
-    var key = portal.key;
-    var child = currentFirstChild;
-    while (child !== null) {
-      // TODO: If key === null and child.key === null, then this only applies to
-      // the first item in the list.
-      if (child.key === key) {
-        if (
-          child.tag === HostPortal &&
-          child.stateNode.containerInfo === portal.containerInfo &&
-          child.stateNode.implementation === portal.implementation
-        ) {
-          deleteRemainingChildren(returnFiber, child.sibling);
-          var existing = useFiber(child, portal.children || [], expirationTime);
-          existing["return"] = returnFiber;
-          return existing;
-        } else {
-          deleteRemainingChildren(returnFiber, child);
-          break;
-        }
-      } else {
-        deleteChild(returnFiber, child);
-      }
-      child = child.sibling;
+  function updatePortal(returnFiber, current, portal, expirationTime) {
+    if (
+      current === null ||
+      current.tag !== HostPortal ||
+      current.stateNode.containerInfo !== portal.containerInfo ||
+      current.stateNode.implementation !== portal.implementation
+    ) {
+      // Insert
+      var created = createFiberFromPortal(
+        portal,
+        returnFiber.mode,
+        expirationTime
+      );
+      created["return"] = returnFiber;
+      return created;
+    } else {
+      // Update
+      var existing = useFiber(current, portal.children || [], expirationTime);
+      existing["return"] = returnFiber;
+      return existing;
     }
-
-    var created = createFiberFromPortal(
-      portal,
-      returnFiber.mode,
-      expirationTime
-    );
-    created["return"] = returnFiber;
-    return created;
   }
 
-  // This API will tag the children with the side-effect of the reconciliation
-  // itself. They will be added to the side-effect list as we pass through the
-  // children and the parent.
-  function reconcileChildFibers(
-    returnFiber,
-    currentFirstChild,
-    newChild,
-    expirationTime
-  ) {
-    // This function is not recursive.
-    // If the top level item is an array, we treat it as a set of children,
-    // not as a fragment. Nested arrays on the other hand will be treated as
-    // fragment nodes. Recursion happens at the normal flow.
-
-    // Handle top level unkeyed fragments as if they were arrays.
-    // This leads to an ambiguity between <>{[...]}</> and <>...</>.
-    // We treat the ambiguous cases above the same.
-    if (
-      typeof newChild === "object" &&
-      newChild !== null &&
-      newChild.type === REACT_FRAGMENT_TYPE &&
-      newChild.key === null
-    ) {
-      newChild = newChild.props.children;
+  function updateFragment(returnFiber, current, fragment, expirationTime, key) {
+    if (current === null || current.tag !== Fragment) {
+      // Insert
+      var created = createFiberFromFragment(
+        fragment,
+        returnFiber.mode,
+        expirationTime,
+        key
+      );
+      created["return"] = returnFiber;
+      return created;
+    } else {
+      // Update
+      var existing = useFiber(current, fragment, expirationTime);
+      existing["return"] = returnFiber;
+      return existing;
     }
+  }
 
-    // Handle object types
-    var isObject = typeof newChild === "object" && newChild !== null;
+  function createChild(returnFiber, newChild, expirationTime) {
+    if (typeof newChild === "string" || typeof newChild === "number") {
+      // Text nodes don't have keys. If the previous node is implicitly keyed
+      // we can continue to replace it without aborting even if it is not a text
+      // node.
+      var created = createFiberFromText(
+        "" + newChild,
+        returnFiber.mode,
+        expirationTime
+      );
+      created["return"] = returnFiber;
+      return created;
+    }
 
-    if (isObject) {
+    if (typeof newChild === "object" && newChild !== null) {
       switch (newChild.$$typeof) {
-        case REACT_ELEMENT_TYPE:
-          return placeSingleChild(
-            reconcileSingleElement(
-              returnFiber,
-              currentFirstChild,
-              newChild,
-              expirationTime
-            )
+        case REACT_ELEMENT_TYPE: {
+          var _created = createFiberFromElement(
+            newChild,
+            returnFiber.mode,
+            expirationTime
           );
-        case REACT_PORTAL_TYPE:
-          return placeSingleChild(
-            reconcileSinglePortal(
-              returnFiber,
-              currentFirstChild,
-              newChild,
-              expirationTime
-            )
+          _created.ref = coerceRef(returnFiber, null, newChild);
+          _created["return"] = returnFiber;
+          return _created;
+        }
+        case REACT_PORTAL_TYPE: {
+          var _created2 = createFiberFromPortal(
+            newChild,
+            returnFiber.mode,
+            expirationTime
           );
+          _created2["return"] = returnFiber;
+          return _created2;
+        }
       }
-    }
 
-    if (typeof newChild === "string" || typeof newChild === "number") {
-      return placeSingleChild(
-        reconcileSingleTextNode(
-          returnFiber,
-          currentFirstChild,
-          "" + newChild,
-          expirationTime
-        )
-      );
+      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+        var _created3 = createFiberFromFragment(
+          newChild,
+          returnFiber.mode,
+          expirationTime,
+          null
+        );
+        _created3["return"] = returnFiber;
+        return _created3;
+      }
+
+      throwOnInvalidObjectType(returnFiber, newChild);
     }
 
-    if (isArray$1(newChild)) {
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        expirationTime
-      );
+    {
+      if (typeof newChild === "function") {
+        warnOnFunctionType();
+      }
     }
 
-    if (getIteratorFn(newChild)) {
-      return reconcileChildrenIterator(
+    return null;
+  }
+
+  function updateSlot(returnFiber, oldFiber, newChild, expirationTime) {
+    // Update the fiber if the keys match, otherwise return null.
+
+    var key = oldFiber !== null ? oldFiber.key : null;
+
+    if (typeof newChild === "string" || typeof newChild === "number") {
+      // Text nodes don't have keys. If the previous node is implicitly keyed
+      // we can continue to replace it without aborting even if it is not a text
+      // node.
+      if (key !== null) {
+        return null;
+      }
+      return updateTextNode(
         returnFiber,
-        currentFirstChild,
-        newChild,
+        oldFiber,
+        "" + newChild,
         expirationTime
       );
     }
 
-    if (isObject) {
+    if (typeof newChild === "object" && newChild !== null) {
+      switch (newChild.$$typeof) {
+        case REACT_ELEMENT_TYPE: {
+          if (newChild.key === key) {
+            if (newChild.type === REACT_FRAGMENT_TYPE) {
+              return updateFragment(
+                returnFiber,
+                oldFiber,
+                newChild.props.children,
+                expirationTime,
+                key
+              );
+            }
+            return updateElement(
+              returnFiber,
+              oldFiber,
+              newChild,
+              expirationTime
+            );
+          } else {
+            return null;
+          }
+        }
+        case REACT_PORTAL_TYPE: {
+          if (newChild.key === key) {
+            return updatePortal(
+              returnFiber,
+              oldFiber,
+              newChild,
+              expirationTime
+            );
+          } else {
+            return null;
+          }
+        }
+      }
+
+      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+        if (key !== null) {
+          return null;
+        }
+
+        return updateFragment(
+          returnFiber,
+          oldFiber,
+          newChild,
+          expirationTime,
+          null
+        );
+      }
+
       throwOnInvalidObjectType(returnFiber, newChild);
     }
 
@@ -8217,2751 +7562,2798 @@ function ChildReconciler(shouldTrackSideEffects) {
         warnOnFunctionType();
       }
     }
-    if (typeof newChild === "undefined") {
-      // If the new child is undefined, and the return fiber is a composite
-      // component, throw an error. If Fiber return types are disabled,
-      // we already threw above.
-      switch (returnFiber.tag) {
-        case ClassComponent: {
-          {
-            var instance = returnFiber.stateNode;
-            if (instance.render._isMockFunction) {
-              // We allow auto-mocks to proceed as if they're returning null.
-              break;
-            }
-          }
-        }
-        // Intentionally fall through to the next case, which handles both
-        // functions and classes
-        // eslint-disable-next-lined no-fallthrough
-        case FunctionalComponent: {
-          var Component = returnFiber.type;
-          invariant(
-            false,
-            "%s(...): Nothing was returned from render. This usually means a " +
-              "return statement is missing. Or, to render nothing, " +
-              "return null.",
-            Component.displayName || Component.name || "Component"
-          );
-        }
-      }
-    }
 
-    // Remaining cases are all treated as empty.
-    return deleteRemainingChildren(returnFiber, currentFirstChild);
+    return null;
   }
 
-  return reconcileChildFibers;
-}
+  function updateFromMap(
+    existingChildren,
+    returnFiber,
+    newIdx,
+    newChild,
+    expirationTime
+  ) {
+    if (typeof newChild === "string" || typeof newChild === "number") {
+      // Text nodes don't have keys, so we neither have to check the old nor
+      // new node for the key. If both are text nodes, they match.
+      var matchedFiber = existingChildren.get(newIdx) || null;
+      return updateTextNode(
+        returnFiber,
+        matchedFiber,
+        "" + newChild,
+        expirationTime
+      );
+    }
 
-var reconcileChildFibers = ChildReconciler(true);
-var mountChildFibers = ChildReconciler(false);
+    if (typeof newChild === "object" && newChild !== null) {
+      switch (newChild.$$typeof) {
+        case REACT_ELEMENT_TYPE: {
+          var _matchedFiber =
+            existingChildren.get(
+              newChild.key === null ? newIdx : newChild.key
+            ) || null;
+          if (newChild.type === REACT_FRAGMENT_TYPE) {
+            return updateFragment(
+              returnFiber,
+              _matchedFiber,
+              newChild.props.children,
+              expirationTime,
+              newChild.key
+            );
+          }
+          return updateElement(
+            returnFiber,
+            _matchedFiber,
+            newChild,
+            expirationTime
+          );
+        }
+        case REACT_PORTAL_TYPE: {
+          var _matchedFiber2 =
+            existingChildren.get(
+              newChild.key === null ? newIdx : newChild.key
+            ) || null;
+          return updatePortal(
+            returnFiber,
+            _matchedFiber2,
+            newChild,
+            expirationTime
+          );
+        }
+      }
 
-function cloneChildFibers(current, workInProgress) {
-  invariant(
-    current === null || workInProgress.child === current.child,
-    "Resuming work not yet implemented."
-  );
+      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+        var _matchedFiber3 = existingChildren.get(newIdx) || null;
+        return updateFragment(
+          returnFiber,
+          _matchedFiber3,
+          newChild,
+          expirationTime,
+          null
+        );
+      }
 
-  if (workInProgress.child === null) {
-    return;
-  }
+      throwOnInvalidObjectType(returnFiber, newChild);
+    }
 
-  var currentChild = workInProgress.child;
-  var newChild = createWorkInProgress(
-    currentChild,
-    currentChild.pendingProps,
-    currentChild.expirationTime
-  );
-  workInProgress.child = newChild;
+    {
+      if (typeof newChild === "function") {
+        warnOnFunctionType();
+      }
+    }
 
-  newChild["return"] = workInProgress;
-  while (currentChild.sibling !== null) {
-    currentChild = currentChild.sibling;
-    newChild = newChild.sibling = createWorkInProgress(
-      currentChild,
-      currentChild.pendingProps,
-      currentChild.expirationTime
-    );
-    newChild["return"] = workInProgress;
+    return null;
   }
-  newChild.sibling = null;
-}
 
-var didWarnAboutBadClass = void 0;
-var didWarnAboutGetDerivedStateOnFunctionalComponent = void 0;
-var didWarnAboutStatelessRefs = void 0;
+  /**
+   * Warns if there is a duplicate or missing key
+   */
+  function warnOnInvalidKey(child, knownKeys) {
+    {
+      if (typeof child !== "object" || child === null) {
+        return knownKeys;
+      }
+      switch (child.$$typeof) {
+        case REACT_ELEMENT_TYPE:
+        case REACT_PORTAL_TYPE:
+          warnForMissingKey(child);
+          var key = child.key;
+          if (typeof key !== "string") {
+            break;
+          }
+          if (knownKeys === null) {
+            knownKeys = new Set();
+            knownKeys.add(key);
+            break;
+          }
+          if (!knownKeys.has(key)) {
+            knownKeys.add(key);
+            break;
+          }
+          warning(
+            false,
+            "Encountered two children with the same key, `%s`. " +
+              "Keys should be unique so that components maintain their identity " +
+              "across updates. Non-unique keys may cause children to be " +
+              "duplicated and/or omitted — the behavior is unsupported and " +
+              "could change in a future version.%s",
+            key,
+            getCurrentFiberStackAddendum$1()
+          );
+          break;
+        default:
+          break;
+      }
+    }
+    return knownKeys;
+  }
 
-{
-  didWarnAboutBadClass = {};
-  didWarnAboutGetDerivedStateOnFunctionalComponent = {};
-  didWarnAboutStatelessRefs = {};
-}
+  function reconcileChildrenArray(
+    returnFiber,
+    currentFirstChild,
+    newChildren,
+    expirationTime
+  ) {
+    // This algorithm can't optimize by searching from boths ends since we
+    // don't have backpointers on fibers. I'm trying to see how far we can get
+    // with that model. If it ends up not being worth the tradeoffs, we can
+    // add it later.
 
-var ReactFiberBeginWork = function(
-  config,
-  hostContext,
-  legacyContext,
-  newContext,
-  hydrationContext,
-  scheduleWork,
-  computeExpirationForFiber
-) {
-  var shouldSetTextContent = config.shouldSetTextContent,
-    shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree;
-  var pushHostContext = hostContext.pushHostContext,
-    pushHostContainer = hostContext.pushHostContainer;
-  var pushProvider = newContext.pushProvider;
-  var getMaskedContext = legacyContext.getMaskedContext,
-    getUnmaskedContext = legacyContext.getUnmaskedContext,
-    hasLegacyContextChanged = legacyContext.hasContextChanged,
-    pushLegacyContextProvider = legacyContext.pushContextProvider,
-    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
-    invalidateContextProvider = legacyContext.invalidateContextProvider;
-  var enterHydrationState = hydrationContext.enterHydrationState,
-    resetHydrationState = hydrationContext.resetHydrationState,
-    tryToClaimNextHydratableInstance =
-      hydrationContext.tryToClaimNextHydratableInstance;
+    // Even with a two ended optimization, we'd want to optimize for the case
+    // where there are few changes and brute force the comparison instead of
+    // going for the Map. It'd like to explore hitting that path first in
+    // forward-only mode and only go for the Map once we notice that we need
+    // lots of look ahead. This doesn't handle reversal as well as two ended
+    // search but that's unusual. Besides, for the two ended optimization to
+    // work on Iterables, we'd need to copy the whole set.
 
-  var _ReactFiberClassCompo = ReactFiberClassComponent(
-      legacyContext,
-      scheduleWork,
-      computeExpirationForFiber,
-      memoizeProps,
-      memoizeState
-    ),
-    adoptClassInstance = _ReactFiberClassCompo.adoptClassInstance,
-    callGetDerivedStateFromProps =
-      _ReactFiberClassCompo.callGetDerivedStateFromProps,
-    constructClassInstance = _ReactFiberClassCompo.constructClassInstance,
-    mountClassInstance = _ReactFiberClassCompo.mountClassInstance,
-    resumeMountClassInstance = _ReactFiberClassCompo.resumeMountClassInstance,
-    updateClassInstance = _ReactFiberClassCompo.updateClassInstance;
+    // In this first iteration, we'll just live with hitting the bad case
+    // (adding everything to a Map) in for every insert/move.
 
-  // TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
+    // If you change this code, also update reconcileChildrenIterator() which
+    // uses the same algorithm.
 
-  function reconcileChildren(current, workInProgress, nextChildren) {
-    reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      nextChildren,
-      workInProgress.expirationTime
-    );
-  }
+    {
+      // First, validate keys.
+      var knownKeys = null;
+      for (var i = 0; i < newChildren.length; i++) {
+        var child = newChildren[i];
+        knownKeys = warnOnInvalidKey(child, knownKeys);
+      }
+    }
 
-  function reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    renderExpirationTime
-  ) {
-    if (current === null) {
-      // If this is a fresh new component that hasn't been rendered yet, we
-      // won't update its child set by applying minimal side-effects. Instead,
-      // we will add them all to the child before it gets rendered. That means
-      // we can optimize this reconciliation pass by not tracking side-effects.
-      workInProgress.child = mountChildFibers(
-        workInProgress,
-        null,
-        nextChildren,
-        renderExpirationTime
-      );
-    } else {
-      // If the current child is the same as the work in progress, it means that
-      // we haven't yet started any work on these children. Therefore, we use
-      // the clone algorithm to create a copy of all the current children.
+    var resultingFirstChild = null;
+    var previousNewFiber = null;
 
-      // If we had any progressed work already, that is invalid at this point so
-      // let's throw it out.
-      workInProgress.child = reconcileChildFibers(
-        workInProgress,
-        current.child,
-        nextChildren,
-        renderExpirationTime
+    var oldFiber = currentFirstChild;
+    var lastPlacedIndex = 0;
+    var newIdx = 0;
+    var nextOldFiber = null;
+    for (; oldFiber !== null && newIdx < newChildren.length; newIdx++) {
+      if (oldFiber.index > newIdx) {
+        nextOldFiber = oldFiber;
+        oldFiber = null;
+      } else {
+        nextOldFiber = oldFiber.sibling;
+      }
+      var newFiber = updateSlot(
+        returnFiber,
+        oldFiber,
+        newChildren[newIdx],
+        expirationTime
       );
+      if (newFiber === null) {
+        // TODO: This breaks on empty slots like null children. That's
+        // unfortunate because it triggers the slow path all the time. We need
+        // a better way to communicate whether this was a miss or null,
+        // boolean, undefined, etc.
+        if (oldFiber === null) {
+          oldFiber = nextOldFiber;
+        }
+        break;
+      }
+      if (shouldTrackSideEffects) {
+        if (oldFiber && newFiber.alternate === null) {
+          // We matched the slot, but we didn't reuse the existing fiber, so we
+          // need to delete the existing child.
+          deleteChild(returnFiber, oldFiber);
+        }
+      }
+      lastPlacedIndex = placeChild(newFiber, lastPlacedIndex, newIdx);
+      if (previousNewFiber === null) {
+        // TODO: Move out of the loop. This only happens for the first run.
+        resultingFirstChild = newFiber;
+      } else {
+        // TODO: Defer siblings if we're not at the right index for this slot.
+        // I.e. if we had null values before, then we want to defer this
+        // for each null value. However, we also don't want to call updateSlot
+        // with the previous one.
+        previousNewFiber.sibling = newFiber;
+      }
+      previousNewFiber = newFiber;
+      oldFiber = nextOldFiber;
     }
-  }
 
-  function updateForwardRef(current, workInProgress) {
-    var render = workInProgress.type.render;
-    var nextChildren = render(workInProgress.pendingProps, workInProgress.ref);
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextChildren);
-    return workInProgress.child;
-  }
+    if (newIdx === newChildren.length) {
+      // We've reached the end of the new children. We can delete the rest.
+      deleteRemainingChildren(returnFiber, oldFiber);
+      return resultingFirstChild;
+    }
 
-  function updateFragment(current, workInProgress) {
-    var nextChildren = workInProgress.pendingProps;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (workInProgress.memoizedProps === nextChildren) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    if (oldFiber === null) {
+      // If we don't have any more existing children we can choose a fast path
+      // since the rest will all be insertions.
+      for (; newIdx < newChildren.length; newIdx++) {
+        var _newFiber = createChild(
+          returnFiber,
+          newChildren[newIdx],
+          expirationTime
+        );
+        if (!_newFiber) {
+          continue;
+        }
+        lastPlacedIndex = placeChild(_newFiber, lastPlacedIndex, newIdx);
+        if (previousNewFiber === null) {
+          // TODO: Move out of the loop. This only happens for the first run.
+          resultingFirstChild = _newFiber;
+        } else {
+          previousNewFiber.sibling = _newFiber;
+        }
+        previousNewFiber = _newFiber;
+      }
+      return resultingFirstChild;
     }
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextChildren);
-    return workInProgress.child;
-  }
 
-  function updateMode(current, workInProgress) {
-    var nextChildren = workInProgress.pendingProps.children;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (
-      nextChildren === null ||
-      workInProgress.memoizedProps === nextChildren
-    ) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    // Add all children to a key map for quick lookups.
+    var existingChildren = mapRemainingChildren(returnFiber, oldFiber);
+
+    // Keep scanning and use the map to restore deleted items as moves.
+    for (; newIdx < newChildren.length; newIdx++) {
+      var _newFiber2 = updateFromMap(
+        existingChildren,
+        returnFiber,
+        newIdx,
+        newChildren[newIdx],
+        expirationTime
+      );
+      if (_newFiber2) {
+        if (shouldTrackSideEffects) {
+          if (_newFiber2.alternate !== null) {
+            // The new fiber is a work in progress, but if there exists a
+            // current, that means that we reused the fiber. We need to delete
+            // it from the child list so that we don't add it to the deletion
+            // list.
+            existingChildren["delete"](
+              _newFiber2.key === null ? newIdx : _newFiber2.key
+            );
+          }
+        }
+        lastPlacedIndex = placeChild(_newFiber2, lastPlacedIndex, newIdx);
+        if (previousNewFiber === null) {
+          resultingFirstChild = _newFiber2;
+        } else {
+          previousNewFiber.sibling = _newFiber2;
+        }
+        previousNewFiber = _newFiber2;
+      }
     }
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextChildren);
-    return workInProgress.child;
-  }
 
-  function markRef(current, workInProgress) {
-    var ref = workInProgress.ref;
-    if (
-      (current === null && ref !== null) ||
-      (current !== null && current.ref !== ref)
-    ) {
-      // Schedule a Ref effect
-      workInProgress.effectTag |= Ref;
+    if (shouldTrackSideEffects) {
+      // Any existing children that weren't consumed above were deleted. We need
+      // to add them to the deletion list.
+      existingChildren.forEach(function(child) {
+        return deleteChild(returnFiber, child);
+      });
     }
+
+    return resultingFirstChild;
   }
 
-  function updateFunctionalComponent(current, workInProgress) {
-    var fn = workInProgress.type;
-    var nextProps = workInProgress.pendingProps;
+  function reconcileChildrenIterator(
+    returnFiber,
+    currentFirstChild,
+    newChildrenIterable,
+    expirationTime
+  ) {
+    // This is the same implementation as reconcileChildrenArray(),
+    // but using the iterator instead.
 
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else {
-      if (workInProgress.memoizedProps === nextProps) {
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    var iteratorFn = getIteratorFn(newChildrenIterable);
+    invariant(
+      typeof iteratorFn === "function",
+      "An object is not an iterable. This error is likely caused by a bug in " +
+        "React. Please file an issue."
+    );
+
+    {
+      // Warn about using Maps as children
+      if (typeof newChildrenIterable.entries === "function") {
+        var possibleMap = newChildrenIterable;
+        if (possibleMap.entries === iteratorFn) {
+          warning(
+            didWarnAboutMaps,
+            "Using Maps as children is unsupported and will likely yield " +
+              "unexpected results. Convert it to a sequence/iterable of keyed " +
+              "ReactElements instead.%s",
+            getCurrentFiberStackAddendum$1()
+          );
+          didWarnAboutMaps = true;
+        }
       }
-      // TODO: consider bringing fn.shouldComponentUpdate() back.
-      // It used to be here.
-    }
 
-    var unmaskedContext = getUnmaskedContext(workInProgress);
-    var context = getMaskedContext(workInProgress, unmaskedContext);
+      // First, validate keys.
+      // We'll get a different iterator later for the main pass.
+      var _newChildren = iteratorFn.call(newChildrenIterable);
+      if (_newChildren) {
+        var knownKeys = null;
+        var _step = _newChildren.next();
+        for (; !_step.done; _step = _newChildren.next()) {
+          var child = _step.value;
+          knownKeys = warnOnInvalidKey(child, knownKeys);
+        }
+      }
+    }
 
-    var nextChildren = void 0;
+    var newChildren = iteratorFn.call(newChildrenIterable);
+    invariant(newChildren != null, "An iterable object provided no iterator.");
 
-    {
-      ReactCurrentOwner.current = workInProgress;
-      ReactDebugCurrentFiber.setCurrentPhase("render");
-      nextChildren = fn(nextProps, context);
-      ReactDebugCurrentFiber.setCurrentPhase(null);
-    }
-    // React DevTools reads this flag.
-    workInProgress.effectTag |= PerformedWork;
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextProps);
-    return workInProgress.child;
-  }
+    var resultingFirstChild = null;
+    var previousNewFiber = null;
 
-  function updateClassComponent(current, workInProgress, renderExpirationTime) {
-    // Push context providers early to prevent context stack mismatches.
-    // During mounting we don't know the child context yet as the instance doesn't exist.
-    // We will invalidate the child context in finishClassComponent() right after rendering.
-    var hasContext = pushLegacyContextProvider(workInProgress);
-    var shouldUpdate = void 0;
-    if (current === null) {
-      if (workInProgress.stateNode === null) {
-        // In the initial pass we might need to construct the instance.
-        constructClassInstance(workInProgress, workInProgress.pendingProps);
-        mountClassInstance(workInProgress, renderExpirationTime);
+    var oldFiber = currentFirstChild;
+    var lastPlacedIndex = 0;
+    var newIdx = 0;
+    var nextOldFiber = null;
 
-        shouldUpdate = true;
+    var step = newChildren.next();
+    for (
+      ;
+      oldFiber !== null && !step.done;
+      newIdx++, step = newChildren.next()
+    ) {
+      if (oldFiber.index > newIdx) {
+        nextOldFiber = oldFiber;
+        oldFiber = null;
       } else {
-        // In a resume, we'll already have an instance we can reuse.
-        shouldUpdate = resumeMountClassInstance(
-          workInProgress,
-          renderExpirationTime
-        );
+        nextOldFiber = oldFiber.sibling;
       }
-    } else {
-      shouldUpdate = updateClassInstance(
-        current,
-        workInProgress,
-        renderExpirationTime
-      );
-    }
-
-    // We processed the update queue inside updateClassInstance. It may have
-    // included some errors that were dispatched during the commit phase.
-    // TODO: Refactor class components so this is less awkward.
-    var didCaptureError = false;
-    var updateQueue = workInProgress.updateQueue;
-    if (updateQueue !== null && updateQueue.capturedValues !== null) {
-      shouldUpdate = true;
-      didCaptureError = true;
-    }
-    return finishClassComponent(
-      current,
-      workInProgress,
-      shouldUpdate,
-      hasContext,
-      didCaptureError,
-      renderExpirationTime
-    );
-  }
-
-  function finishClassComponent(
-    current,
-    workInProgress,
-    shouldUpdate,
-    hasContext,
-    didCaptureError,
-    renderExpirationTime
-  ) {
-    // Refs should update even if shouldComponentUpdate returns false
-    markRef(current, workInProgress);
-
-    if (!shouldUpdate && !didCaptureError) {
-      // Context providers should defer to sCU for rendering
-      if (hasContext) {
-        invalidateContextProvider(workInProgress, false);
+      var newFiber = updateSlot(
+        returnFiber,
+        oldFiber,
+        step.value,
+        expirationTime
+      );
+      if (newFiber === null) {
+        // TODO: This breaks on empty slots like null children. That's
+        // unfortunate because it triggers the slow path all the time. We need
+        // a better way to communicate whether this was a miss or null,
+        // boolean, undefined, etc.
+        if (!oldFiber) {
+          oldFiber = nextOldFiber;
+        }
+        break;
       }
-
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      if (shouldTrackSideEffects) {
+        if (oldFiber && newFiber.alternate === null) {
+          // We matched the slot, but we didn't reuse the existing fiber, so we
+          // need to delete the existing child.
+          deleteChild(returnFiber, oldFiber);
+        }
+      }
+      lastPlacedIndex = placeChild(newFiber, lastPlacedIndex, newIdx);
+      if (previousNewFiber === null) {
+        // TODO: Move out of the loop. This only happens for the first run.
+        resultingFirstChild = newFiber;
+      } else {
+        // TODO: Defer siblings if we're not at the right index for this slot.
+        // I.e. if we had null values before, then we want to defer this
+        // for each null value. However, we also don't want to call updateSlot
+        // with the previous one.
+        previousNewFiber.sibling = newFiber;
+      }
+      previousNewFiber = newFiber;
+      oldFiber = nextOldFiber;
     }
 
-    var ctor = workInProgress.type;
-    var instance = workInProgress.stateNode;
+    if (step.done) {
+      // We've reached the end of the new children. We can delete the rest.
+      deleteRemainingChildren(returnFiber, oldFiber);
+      return resultingFirstChild;
+    }
 
-    // Rerender
-    ReactCurrentOwner.current = workInProgress;
-    var nextChildren = void 0;
-    if (
-      didCaptureError &&
-      (!enableGetDerivedStateFromCatch ||
-        typeof ctor.getDerivedStateFromCatch !== "function")
-    ) {
-      // If we captured an error, but getDerivedStateFrom catch is not defined,
-      // unmount all the children. componentDidCatch will schedule an update to
-      // re-render a fallback. This is temporary until we migrate everyone to
-      // the new API.
-      // TODO: Warn in a future release.
-      nextChildren = null;
-    } else {
-      {
-        ReactDebugCurrentFiber.setCurrentPhase("render");
-        nextChildren = instance.render();
-        if (
-          debugRenderPhaseSideEffects ||
-          (debugRenderPhaseSideEffectsForStrictMode &&
-            workInProgress.mode & StrictMode)
-        ) {
-          instance.render();
+    if (oldFiber === null) {
+      // If we don't have any more existing children we can choose a fast path
+      // since the rest will all be insertions.
+      for (; !step.done; newIdx++, step = newChildren.next()) {
+        var _newFiber3 = createChild(returnFiber, step.value, expirationTime);
+        if (_newFiber3 === null) {
+          continue;
         }
-        ReactDebugCurrentFiber.setCurrentPhase(null);
+        lastPlacedIndex = placeChild(_newFiber3, lastPlacedIndex, newIdx);
+        if (previousNewFiber === null) {
+          // TODO: Move out of the loop. This only happens for the first run.
+          resultingFirstChild = _newFiber3;
+        } else {
+          previousNewFiber.sibling = _newFiber3;
+        }
+        previousNewFiber = _newFiber3;
       }
+      return resultingFirstChild;
     }
 
-    // React DevTools reads this flag.
-    workInProgress.effectTag |= PerformedWork;
-    if (didCaptureError) {
-      // If we're recovering from an error, reconcile twice: first to delete
-      // all the existing children.
-      reconcileChildrenAtExpirationTime(
-        current,
-        workInProgress,
-        null,
-        renderExpirationTime
+    // Add all children to a key map for quick lookups.
+    var existingChildren = mapRemainingChildren(returnFiber, oldFiber);
+
+    // Keep scanning and use the map to restore deleted items as moves.
+    for (; !step.done; newIdx++, step = newChildren.next()) {
+      var _newFiber4 = updateFromMap(
+        existingChildren,
+        returnFiber,
+        newIdx,
+        step.value,
+        expirationTime
       );
-      workInProgress.child = null;
-      // Now we can continue reconciling like normal. This has the effect of
-      // remounting all children regardless of whether their their
-      // identity matches.
+      if (_newFiber4 !== null) {
+        if (shouldTrackSideEffects) {
+          if (_newFiber4.alternate !== null) {
+            // The new fiber is a work in progress, but if there exists a
+            // current, that means that we reused the fiber. We need to delete
+            // it from the child list so that we don't add it to the deletion
+            // list.
+            existingChildren["delete"](
+              _newFiber4.key === null ? newIdx : _newFiber4.key
+            );
+          }
+        }
+        lastPlacedIndex = placeChild(_newFiber4, lastPlacedIndex, newIdx);
+        if (previousNewFiber === null) {
+          resultingFirstChild = _newFiber4;
+        } else {
+          previousNewFiber.sibling = _newFiber4;
+        }
+        previousNewFiber = _newFiber4;
+      }
     }
-    reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      nextChildren,
-      renderExpirationTime
-    );
-    // Memoize props and state using the values we just used to render.
-    // TODO: Restructure so we never read values from the instance.
-    memoizeState(workInProgress, instance.state);
-    memoizeProps(workInProgress, instance.props);
 
-    // The context might have changed so we need to recalculate it.
-    if (hasContext) {
-      invalidateContextProvider(workInProgress, true);
+    if (shouldTrackSideEffects) {
+      // Any existing children that weren't consumed above were deleted. We need
+      // to add them to the deletion list.
+      existingChildren.forEach(function(child) {
+        return deleteChild(returnFiber, child);
+      });
     }
 
-    return workInProgress.child;
+    return resultingFirstChild;
   }
 
-  function pushHostRootContext(workInProgress) {
-    var root = workInProgress.stateNode;
-    if (root.pendingContext) {
-      pushTopLevelContextObject(
-        workInProgress,
-        root.pendingContext,
-        root.pendingContext !== root.context
-      );
-    } else if (root.context) {
-      // Should always be set
-      pushTopLevelContextObject(workInProgress, root.context, false);
+  function reconcileSingleTextNode(
+    returnFiber,
+    currentFirstChild,
+    textContent,
+    expirationTime
+  ) {
+    // There's no need to check for keys on text nodes since we don't have a
+    // way to define them.
+    if (currentFirstChild !== null && currentFirstChild.tag === HostText) {
+      // We already have an existing node so let's just update it and delete
+      // the rest.
+      deleteRemainingChildren(returnFiber, currentFirstChild.sibling);
+      var existing = useFiber(currentFirstChild, textContent, expirationTime);
+      existing["return"] = returnFiber;
+      return existing;
     }
-    pushHostContainer(workInProgress, root.containerInfo);
+    // The existing first child is not a text node so we need to create one
+    // and delete the existing ones.
+    deleteRemainingChildren(returnFiber, currentFirstChild);
+    var created = createFiberFromText(
+      textContent,
+      returnFiber.mode,
+      expirationTime
+    );
+    created["return"] = returnFiber;
+    return created;
   }
 
-  function updateHostRoot(current, workInProgress, renderExpirationTime) {
-    pushHostRootContext(workInProgress);
-    var updateQueue = workInProgress.updateQueue;
-    if (updateQueue !== null) {
-      var prevState = workInProgress.memoizedState;
-      var state = processUpdateQueue(
-        current,
-        workInProgress,
-        updateQueue,
-        null,
-        null,
-        renderExpirationTime
-      );
-      memoizeState(workInProgress, state);
-      updateQueue = workInProgress.updateQueue;
-
-      var element = void 0;
-      if (updateQueue !== null && updateQueue.capturedValues !== null) {
-        // There's an uncaught error. Unmount the whole root.
-        element = null;
-      } else if (prevState === state) {
-        // If the state is the same as before, that's a bailout because we had
-        // no work that expires at this time.
-        resetHydrationState();
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
-      } else {
-        element = state.element;
-      }
-      var root = workInProgress.stateNode;
-      if (
-        (current === null || current.child === null) &&
-        root.hydrate &&
-        enterHydrationState(workInProgress)
-      ) {
-        // If we don't have any current children this might be the first pass.
-        // We always try to hydrate. If this isn't a hydration pass there won't
-        // be any children to hydrate which is effectively the same thing as
-        // not hydrating.
+  function reconcileSingleElement(
+    returnFiber,
+    currentFirstChild,
+    element,
+    expirationTime
+  ) {
+    var key = element.key;
+    var child = currentFirstChild;
+    while (child !== null) {
+      // TODO: If key === null and child.key === null, then this only applies to
+      // the first item in the list.
+      if (child.key === key) {
+        if (
+          child.tag === Fragment
+            ? element.type === REACT_FRAGMENT_TYPE
+            : child.type === element.type
+        ) {
+          deleteRemainingChildren(returnFiber, child.sibling);
+          var existing = useFiber(
+            child,
+            element.type === REACT_FRAGMENT_TYPE
+              ? element.props.children
+              : element.props,
+            expirationTime
+          );
+          existing.ref = coerceRef(returnFiber, child, element);
+          existing["return"] = returnFiber;
+          {
+            existing._debugSource = element._source;
+            existing._debugOwner = element._owner;
+          }
+          return existing;
+        } else {
+          deleteRemainingChildren(returnFiber, child);
+          break;
+        }
+      } else {
+        deleteChild(returnFiber, child);
+      }
+      child = child.sibling;
+    }
 
-        // This is a bit of a hack. We track the host root as a placement to
-        // know that we're currently in a mounting state. That way isMounted
-        // works as expected. We must reset this before committing.
-        // TODO: Delete this when we delete isMounted and findDOMNode.
-        workInProgress.effectTag |= Placement;
+    if (element.type === REACT_FRAGMENT_TYPE) {
+      var created = createFiberFromFragment(
+        element.props.children,
+        returnFiber.mode,
+        expirationTime,
+        element.key
+      );
+      created["return"] = returnFiber;
+      return created;
+    } else {
+      var _created4 = createFiberFromElement(
+        element,
+        returnFiber.mode,
+        expirationTime
+      );
+      _created4.ref = coerceRef(returnFiber, currentFirstChild, element);
+      _created4["return"] = returnFiber;
+      return _created4;
+    }
+  }
 
-        // Ensure that children mount into this root without tracking
-        // side-effects. This ensures that we don't store Placement effects on
-        // nodes that will be hydrated.
-        workInProgress.child = mountChildFibers(
-          workInProgress,
-          null,
-          element,
-          renderExpirationTime
-        );
+  function reconcileSinglePortal(
+    returnFiber,
+    currentFirstChild,
+    portal,
+    expirationTime
+  ) {
+    var key = portal.key;
+    var child = currentFirstChild;
+    while (child !== null) {
+      // TODO: If key === null and child.key === null, then this only applies to
+      // the first item in the list.
+      if (child.key === key) {
+        if (
+          child.tag === HostPortal &&
+          child.stateNode.containerInfo === portal.containerInfo &&
+          child.stateNode.implementation === portal.implementation
+        ) {
+          deleteRemainingChildren(returnFiber, child.sibling);
+          var existing = useFiber(child, portal.children || [], expirationTime);
+          existing["return"] = returnFiber;
+          return existing;
+        } else {
+          deleteRemainingChildren(returnFiber, child);
+          break;
+        }
       } else {
-        // Otherwise reset hydration state in case we aborted and resumed another
-        // root.
-        resetHydrationState();
-        reconcileChildren(current, workInProgress, element);
+        deleteChild(returnFiber, child);
       }
-      memoizeState(workInProgress, state);
-      return workInProgress.child;
+      child = child.sibling;
     }
-    resetHydrationState();
-    // If there is no update queue, that's a bailout because the root has no props.
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
+
+    var created = createFiberFromPortal(
+      portal,
+      returnFiber.mode,
+      expirationTime
+    );
+    created["return"] = returnFiber;
+    return created;
   }
 
-  function updateHostComponent(current, workInProgress, renderExpirationTime) {
-    pushHostContext(workInProgress);
+  // This API will tag the children with the side-effect of the reconciliation
+  // itself. They will be added to the side-effect list as we pass through the
+  // children and the parent.
+  function reconcileChildFibers(
+    returnFiber,
+    currentFirstChild,
+    newChild,
+    expirationTime
+  ) {
+    // This function is not recursive.
+    // If the top level item is an array, we treat it as a set of children,
+    // not as a fragment. Nested arrays on the other hand will be treated as
+    // fragment nodes. Recursion happens at the normal flow.
 
-    if (current === null) {
-      tryToClaimNextHydratableInstance(workInProgress);
+    // Handle top level unkeyed fragments as if they were arrays.
+    // This leads to an ambiguity between <>{[...]}</> and <>...</>.
+    // We treat the ambiguous cases above the same.
+    if (
+      typeof newChild === "object" &&
+      newChild !== null &&
+      newChild.type === REACT_FRAGMENT_TYPE &&
+      newChild.key === null
+    ) {
+      newChild = newChild.props.children;
     }
 
-    var type = workInProgress.type;
-    var memoizedProps = workInProgress.memoizedProps;
-    var nextProps = workInProgress.pendingProps;
-    var prevProps = current !== null ? current.memoizedProps : null;
+    // Handle object types
+    var isObject = typeof newChild === "object" && newChild !== null;
 
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (memoizedProps === nextProps) {
-      var isHidden =
-        workInProgress.mode & AsyncMode &&
-        shouldDeprioritizeSubtree(type, nextProps);
-      if (isHidden) {
-        // Before bailing out, make sure we've deprioritized a hidden component.
-        workInProgress.expirationTime = Never;
-      }
-      if (!isHidden || renderExpirationTime !== Never) {
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    if (isObject) {
+      switch (newChild.$$typeof) {
+        case REACT_ELEMENT_TYPE:
+          return placeSingleChild(
+            reconcileSingleElement(
+              returnFiber,
+              currentFirstChild,
+              newChild,
+              expirationTime
+            )
+          );
+        case REACT_PORTAL_TYPE:
+          return placeSingleChild(
+            reconcileSinglePortal(
+              returnFiber,
+              currentFirstChild,
+              newChild,
+              expirationTime
+            )
+          );
       }
-      // If we're rendering a hidden node at hidden priority, don't bailout. The
-      // parent is complete, but the children may not be.
     }
 
-    var nextChildren = nextProps.children;
-    var isDirectTextChild = shouldSetTextContent(type, nextProps);
-
-    if (isDirectTextChild) {
-      // We special case a direct text child of a host node. This is a common
-      // case. We won't handle it as a reified child. We will instead handle
-      // this in the host environment that also have access to this prop. That
-      // avoids allocating another HostText fiber and traversing it.
-      nextChildren = null;
-    } else if (prevProps && shouldSetTextContent(type, prevProps)) {
-      // If we're switching from a direct text child to a normal child, or to
-      // empty, we need to schedule the text content to be reset.
-      workInProgress.effectTag |= ContentReset;
+    if (typeof newChild === "string" || typeof newChild === "number") {
+      return placeSingleChild(
+        reconcileSingleTextNode(
+          returnFiber,
+          currentFirstChild,
+          "" + newChild,
+          expirationTime
+        )
+      );
     }
 
-    markRef(current, workInProgress);
-
-    // Check the host config to see if the children are offscreen/hidden.
-    if (
-      renderExpirationTime !== Never &&
-      workInProgress.mode & AsyncMode &&
-      shouldDeprioritizeSubtree(type, nextProps)
-    ) {
-      // Down-prioritize the children.
-      workInProgress.expirationTime = Never;
-      // Bailout and come back to this fiber later.
-      workInProgress.memoizedProps = nextProps;
-      return null;
+    if (isArray$1(newChild)) {
+      return reconcileChildrenArray(
+        returnFiber,
+        currentFirstChild,
+        newChild,
+        expirationTime
+      );
     }
 
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextProps);
-    return workInProgress.child;
-  }
+    if (getIteratorFn(newChild)) {
+      return reconcileChildrenIterator(
+        returnFiber,
+        currentFirstChild,
+        newChild,
+        expirationTime
+      );
+    }
 
-  function updateHostText(current, workInProgress) {
-    if (current === null) {
-      tryToClaimNextHydratableInstance(workInProgress);
+    if (isObject) {
+      throwOnInvalidObjectType(returnFiber, newChild);
     }
-    var nextProps = workInProgress.pendingProps;
-    memoizeProps(workInProgress, nextProps);
-    // Nothing to do here. This is terminal. We'll do the completion step
-    // immediately after.
-    return null;
-  }
-
-  function mountIndeterminateComponent(
-    current,
-    workInProgress,
-    renderExpirationTime
-  ) {
-    invariant(
-      current === null,
-      "An indeterminate component should never have mounted. This error is " +
-        "likely caused by a bug in React. Please file an issue."
-    );
-    var fn = workInProgress.type;
-    var props = workInProgress.pendingProps;
-    var unmaskedContext = getUnmaskedContext(workInProgress);
-    var context = getMaskedContext(workInProgress, unmaskedContext);
-
-    var value = void 0;
 
     {
-      if (fn.prototype && typeof fn.prototype.render === "function") {
-        var componentName = getComponentName(workInProgress) || "Unknown";
-
-        if (!didWarnAboutBadClass[componentName]) {
-          warning(
+      if (typeof newChild === "function") {
+        warnOnFunctionType();
+      }
+    }
+    if (typeof newChild === "undefined") {
+      // If the new child is undefined, and the return fiber is a composite
+      // component, throw an error. If Fiber return types are disabled,
+      // we already threw above.
+      switch (returnFiber.tag) {
+        case ClassComponent: {
+          {
+            var instance = returnFiber.stateNode;
+            if (instance.render._isMockFunction) {
+              // We allow auto-mocks to proceed as if they're returning null.
+              break;
+            }
+          }
+        }
+        // Intentionally fall through to the next case, which handles both
+        // functions and classes
+        // eslint-disable-next-lined no-fallthrough
+        case FunctionalComponent: {
+          var Component = returnFiber.type;
+          invariant(
             false,
-            "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
-              "This is likely to cause errors. Change %s to extend React.Component instead.",
-            componentName,
-            componentName
+            "%s(...): Nothing was returned from render. This usually means a " +
+              "return statement is missing. Or, to render nothing, " +
+              "return null.",
+            Component.displayName || Component.name || "Component"
           );
-          didWarnAboutBadClass[componentName] = true;
         }
       }
-      ReactCurrentOwner.current = workInProgress;
-      value = fn(props, context);
     }
-    // React DevTools reads this flag.
-    workInProgress.effectTag |= PerformedWork;
-
-    if (
-      typeof value === "object" &&
-      value !== null &&
-      typeof value.render === "function" &&
-      value.$$typeof === undefined
-    ) {
-      var Component = workInProgress.type;
-
-      // Proceed under the assumption that this is a class instance
-      workInProgress.tag = ClassComponent;
 
-      workInProgress.memoizedState =
-        value.state !== null && value.state !== undefined ? value.state : null;
-
-      if (typeof Component.getDerivedStateFromProps === "function") {
-        var partialState = callGetDerivedStateFromProps(
-          workInProgress,
-          value,
-          props,
-          workInProgress.memoizedState
-        );
+    // Remaining cases are all treated as empty.
+    return deleteRemainingChildren(returnFiber, currentFirstChild);
+  }
 
-        if (partialState !== null && partialState !== undefined) {
-          workInProgress.memoizedState = Object.assign(
-            {},
-            workInProgress.memoizedState,
-            partialState
-          );
-        }
-      }
+  return reconcileChildFibers;
+}
 
-      // Push context providers early to prevent context stack mismatches.
-      // During mounting we don't know the child context yet as the instance doesn't exist.
-      // We will invalidate the child context in finishClassComponent() right after rendering.
-      var hasContext = pushLegacyContextProvider(workInProgress);
-      adoptClassInstance(workInProgress, value);
-      mountClassInstance(workInProgress, renderExpirationTime);
-      return finishClassComponent(
-        current,
-        workInProgress,
-        true,
-        hasContext,
-        false,
-        renderExpirationTime
-      );
-    } else {
-      // Proceed under the assumption that this is a functional component
-      workInProgress.tag = FunctionalComponent;
-      {
-        var _Component = workInProgress.type;
+var reconcileChildFibers = ChildReconciler(true);
+var mountChildFibers = ChildReconciler(false);
 
-        if (_Component) {
-          !!_Component.childContextTypes
-            ? warning(
-                false,
-                "%s(...): childContextTypes cannot be defined on a functional component.",
-                _Component.displayName || _Component.name || "Component"
-              )
-            : void 0;
-        }
-        if (workInProgress.ref !== null) {
-          var info = "";
-          var ownerName = ReactDebugCurrentFiber.getCurrentFiberOwnerName();
-          if (ownerName) {
-            info += "\n\nCheck the render method of `" + ownerName + "`.";
-          }
+function cloneChildFibers(current, workInProgress) {
+  invariant(
+    current === null || workInProgress.child === current.child,
+    "Resuming work not yet implemented."
+  );
 
-          var warningKey = ownerName || workInProgress._debugID || "";
-          var debugSource = workInProgress._debugSource;
-          if (debugSource) {
-            warningKey = debugSource.fileName + ":" + debugSource.lineNumber;
-          }
-          if (!didWarnAboutStatelessRefs[warningKey]) {
-            didWarnAboutStatelessRefs[warningKey] = true;
-            warning(
-              false,
-              "Stateless function components cannot be given refs. " +
-                "Attempts to access this ref will fail.%s%s",
-              info,
-              ReactDebugCurrentFiber.getCurrentFiberStackAddendum()
-            );
-          }
-        }
+  if (workInProgress.child === null) {
+    return;
+  }
 
-        if (typeof fn.getDerivedStateFromProps === "function") {
-          var _componentName = getComponentName(workInProgress) || "Unknown";
+  var currentChild = workInProgress.child;
+  var newChild = createWorkInProgress(
+    currentChild,
+    currentChild.pendingProps,
+    currentChild.expirationTime
+  );
+  workInProgress.child = newChild;
 
-          if (
-            !didWarnAboutGetDerivedStateOnFunctionalComponent[_componentName]
-          ) {
-            warning(
-              false,
-              "%s: Stateless functional components do not support getDerivedStateFromProps.",
-              _componentName
-            );
-            didWarnAboutGetDerivedStateOnFunctionalComponent[
-              _componentName
-            ] = true;
-          }
-        }
-      }
-      reconcileChildren(current, workInProgress, value);
-      memoizeProps(workInProgress, props);
-      return workInProgress.child;
-    }
+  newChild["return"] = workInProgress;
+  while (currentChild.sibling !== null) {
+    currentChild = currentChild.sibling;
+    newChild = newChild.sibling = createWorkInProgress(
+      currentChild,
+      currentChild.pendingProps,
+      currentChild.expirationTime
+    );
+    newChild["return"] = workInProgress;
   }
+  newChild.sibling = null;
+}
 
-  function updateCallComponent(current, workInProgress, renderExpirationTime) {
-    var nextProps = workInProgress.pendingProps;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (workInProgress.memoizedProps === nextProps) {
-      nextProps = workInProgress.memoizedProps;
-      // TODO: When bailing out, we might need to return the stateNode instead
-      // of the child. To check it for work.
-      // return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
+var changedBitsStack = [];
+var currentValueStack = [];
+var stack = [];
+var index$1 = -1;
 
-    var nextChildren = nextProps.children;
+var rendererSigil = void 0;
+{
+  // Use this to detect multiple renderers using the same context
+  rendererSigil = {};
+}
 
-    // The following is a fork of reconcileChildrenAtExpirationTime but using
-    // stateNode to store the child.
-    if (current === null) {
-      workInProgress.stateNode = mountChildFibers(
-        workInProgress,
-        workInProgress.stateNode,
-        nextChildren,
-        renderExpirationTime
-      );
-    } else {
-      workInProgress.stateNode = reconcileChildFibers(
-        workInProgress,
-        current.stateNode,
-        nextChildren,
-        renderExpirationTime
-      );
-    }
+function pushProvider(providerFiber) {
+  var context = providerFiber.type.context;
+  index$1 += 1;
+  changedBitsStack[index$1] = context._changedBits;
+  currentValueStack[index$1] = context._currentValue;
+  stack[index$1] = providerFiber;
+  context._currentValue = providerFiber.pendingProps.value;
+  context._changedBits = providerFiber.stateNode;
 
-    memoizeProps(workInProgress, nextProps);
-    // This doesn't take arbitrary time so we could synchronously just begin
-    // eagerly do the work of workInProgress.child as an optimization.
-    return workInProgress.stateNode;
+  {
+    warning(
+      context._currentRenderer === null ||
+        context._currentRenderer === rendererSigil,
+      "Detected multiple renderers concurrently rendering the " +
+        "same context provider. This is currently unsupported."
+    );
+    context._currentRenderer = rendererSigil;
   }
+}
 
-  function updatePortalComponent(
-    current,
-    workInProgress,
-    renderExpirationTime
-  ) {
-    pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
-    var nextChildren = workInProgress.pendingProps;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (workInProgress.memoizedProps === nextChildren) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-
-    if (current === null) {
-      // Portals are special because we don't append the children during mount
-      // but at commit. Therefore we need to track insertions which the normal
-      // flow doesn't do during mount. This doesn't happen at the root because
-      // the root always starts with a "current" with a null child.
-      // TODO: Consider unifying this with how the root works.
-      workInProgress.child = reconcileChildFibers(
-        workInProgress,
-        null,
-        nextChildren,
-        renderExpirationTime
-      );
-      memoizeProps(workInProgress, nextChildren);
-    } else {
-      reconcileChildren(current, workInProgress, nextChildren);
-      memoizeProps(workInProgress, nextChildren);
+function popProvider(providerFiber) {
+  {
+    warning(
+      index$1 > -1 && providerFiber === stack[index$1],
+      "Unexpected pop."
+    );
+  }
+  var changedBits = changedBitsStack[index$1];
+  var currentValue = currentValueStack[index$1];
+  changedBitsStack[index$1] = null;
+  currentValueStack[index$1] = null;
+  stack[index$1] = null;
+  index$1 -= 1;
+  var context = providerFiber.type.context;
+  context._currentValue = currentValue;
+  context._changedBits = changedBits;
+}
+
+function resetProviderStack() {
+  for (var i = index$1; i > -1; i--) {
+    var providerFiber = stack[i];
+    var context = providerFiber.type.context;
+    context._currentValue = context._defaultValue;
+    context._changedBits = 0;
+    changedBitsStack[i] = null;
+    currentValueStack[i] = null;
+    stack[i] = null;
+    {
+      context._currentRenderer = null;
     }
-    return workInProgress.child;
   }
+  index$1 = -1;
+}
 
-  function propagateContextChange(
-    workInProgress,
-    context,
-    changedBits,
-    renderExpirationTime
-  ) {
-    var fiber = workInProgress.child;
-    if (fiber !== null) {
-      // Set the return pointer of the child to the work-in-progress fiber.
-      fiber["return"] = workInProgress;
-    }
-    while (fiber !== null) {
-      var nextFiber = void 0;
-      // Visit this fiber.
-      switch (fiber.tag) {
-        case ContextConsumer:
-          // Check if the context matches.
-          var observedBits = fiber.stateNode | 0;
-          if (fiber.type === context && (observedBits & changedBits) !== 0) {
-            // Update the expiration time of all the ancestors, including
-            // the alternates.
-            var node = fiber;
-            while (node !== null) {
-              var alternate = node.alternate;
-              if (
-                node.expirationTime === NoWork ||
-                node.expirationTime > renderExpirationTime
-              ) {
-                node.expirationTime = renderExpirationTime;
-                if (
-                  alternate !== null &&
-                  (alternate.expirationTime === NoWork ||
-                    alternate.expirationTime > renderExpirationTime)
-                ) {
-                  alternate.expirationTime = renderExpirationTime;
-                }
-              } else if (
-                alternate !== null &&
-                (alternate.expirationTime === NoWork ||
-                  alternate.expirationTime > renderExpirationTime)
-              ) {
-                alternate.expirationTime = renderExpirationTime;
-              } else {
-                // Neither alternate was updated, which means the rest of the
-                // ancestor path already has sufficient priority.
-                break;
-              }
-              node = node["return"];
-            }
-            // Don't scan deeper than a matching consumer. When we render the
-            // consumer, we'll continue scanning from that point. This way the
-            // scanning work is time-sliced.
-            nextFiber = null;
-          } else {
-            // Traverse down.
-            nextFiber = fiber.child;
-          }
-          break;
-        case ContextProvider:
-          // Don't scan deeper if this is a matching provider
-          nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
-          break;
-        default:
-          // Traverse down.
-          nextFiber = fiber.child;
-          break;
-      }
-      if (nextFiber !== null) {
-        // Set the return pointer of the child to the work-in-progress fiber.
-        nextFiber["return"] = fiber;
-      } else {
-        // No child. Traverse to next sibling.
-        nextFiber = fiber;
-        while (nextFiber !== null) {
-          if (nextFiber === workInProgress) {
-            // We're back to the root of this subtree. Exit.
-            nextFiber = null;
-            break;
-          }
-          var sibling = nextFiber.sibling;
-          if (sibling !== null) {
-            nextFiber = sibling;
-            break;
-          }
-          // No more siblings. Traverse up.
-          nextFiber = nextFiber["return"];
-        }
-      }
-      fiber = nextFiber;
-    }
-  }
-
-  function updateContextProvider(
-    current,
-    workInProgress,
-    renderExpirationTime
-  ) {
-    var providerType = workInProgress.type;
-    var context = providerType._context;
-
-    var newProps = workInProgress.pendingProps;
-    var oldProps = workInProgress.memoizedProps;
-
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (oldProps === newProps) {
-      workInProgress.stateNode = 0;
-      pushProvider(workInProgress);
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
+var didWarnAboutBadClass = void 0;
+var didWarnAboutGetDerivedStateOnFunctionalComponent = void 0;
+var didWarnAboutStatelessRefs = void 0;
 
-    var newValue = newProps.value;
-    workInProgress.memoizedProps = newProps;
+{
+  didWarnAboutBadClass = {};
+  didWarnAboutGetDerivedStateOnFunctionalComponent = {};
+  didWarnAboutStatelessRefs = {};
+}
 
-    var changedBits = void 0;
-    if (oldProps === null) {
-      // Initial render
-      changedBits = MAX_SIGNED_31_BIT_INT;
-    } else {
-      if (oldProps.value === newProps.value) {
-        // No change. Bailout early if children are the same.
-        if (oldProps.children === newProps.children) {
-          workInProgress.stateNode = 0;
-          pushProvider(workInProgress);
-          return bailoutOnAlreadyFinishedWork(current, workInProgress);
-        }
-        changedBits = 0;
-      } else {
-        var oldValue = oldProps.value;
-        // Use Object.is to compare the new context value to the old value.
-        // Inlined Object.is polyfill.
-        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
-        if (
-          (oldValue === newValue &&
-            (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
-          (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
-        ) {
-          // No change. Bailout early if children are the same.
-          if (oldProps.children === newProps.children) {
-            workInProgress.stateNode = 0;
-            pushProvider(workInProgress);
-            return bailoutOnAlreadyFinishedWork(current, workInProgress);
-          }
-          changedBits = 0;
-        } else {
-          changedBits =
-            typeof context._calculateChangedBits === "function"
-              ? context._calculateChangedBits(oldValue, newValue)
-              : MAX_SIGNED_31_BIT_INT;
-          {
-            !((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits)
-              ? warning(
-                  false,
-                  "calculateChangedBits: Expected the return value to be a " +
-                    "31-bit integer. Instead received: %s",
-                  changedBits
-                )
-              : void 0;
-          }
-          changedBits |= 0;
+var ReactFiberBeginWork = function(
+  config,
+  hostContext,
+  hydrationContext,
+  scheduleWork,
+  computeExpirationForFiber
+) {
+  var shouldSetTextContent = config.shouldSetTextContent,
+    shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree;
+  var pushHostContext = hostContext.pushHostContext,
+    pushHostContainer = hostContext.pushHostContainer;
+  var enterHydrationState = hydrationContext.enterHydrationState,
+    resetHydrationState = hydrationContext.resetHydrationState,
+    tryToClaimNextHydratableInstance =
+      hydrationContext.tryToClaimNextHydratableInstance;
 
-          if (changedBits === 0) {
-            // No change. Bailout early if children are the same.
-            if (oldProps.children === newProps.children) {
-              workInProgress.stateNode = 0;
-              pushProvider(workInProgress);
-              return bailoutOnAlreadyFinishedWork(current, workInProgress);
-            }
-          } else {
-            propagateContextChange(
-              workInProgress,
-              context,
-              changedBits,
-              renderExpirationTime
-            );
-          }
-        }
-      }
-    }
+  var _ReactFiberClassCompo = ReactFiberClassComponent(
+      scheduleWork,
+      computeExpirationForFiber,
+      memoizeProps,
+      memoizeState
+    ),
+    adoptClassInstance = _ReactFiberClassCompo.adoptClassInstance,
+    callGetDerivedStateFromProps =
+      _ReactFiberClassCompo.callGetDerivedStateFromProps,
+    constructClassInstance = _ReactFiberClassCompo.constructClassInstance,
+    mountClassInstance = _ReactFiberClassCompo.mountClassInstance,
+    resumeMountClassInstance = _ReactFiberClassCompo.resumeMountClassInstance,
+    updateClassInstance = _ReactFiberClassCompo.updateClassInstance;
 
-    workInProgress.stateNode = changedBits;
-    pushProvider(workInProgress);
+  // TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
 
-    var newChildren = newProps.children;
-    reconcileChildren(current, workInProgress, newChildren);
-    return workInProgress.child;
+  function reconcileChildren(current, workInProgress, nextChildren) {
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      workInProgress.expirationTime
+    );
   }
 
-  function updateContextConsumer(
+  function reconcileChildrenAtExpirationTime(
     current,
     workInProgress,
+    nextChildren,
     renderExpirationTime
   ) {
-    var context = workInProgress.type;
-    var newProps = workInProgress.pendingProps;
-    var oldProps = workInProgress.memoizedProps;
+    if (current === null) {
+      // If this is a fresh new component that hasn't been rendered yet, we
+      // won't update its child set by applying minimal side-effects. Instead,
+      // we will add them all to the child before it gets rendered. That means
+      // we can optimize this reconciliation pass by not tracking side-effects.
+      workInProgress.child = mountChildFibers(
+        workInProgress,
+        null,
+        nextChildren,
+        renderExpirationTime
+      );
+    } else {
+      // If the current child is the same as the work in progress, it means that
+      // we haven't yet started any work on these children. Therefore, we use
+      // the clone algorithm to create a copy of all the current children.
 
-    var newValue = context._currentValue;
-    var changedBits = context._changedBits;
+      // If we had any progressed work already, that is invalid at this point so
+      // let's throw it out.
+      workInProgress.child = reconcileChildFibers(
+        workInProgress,
+        current.child,
+        nextChildren,
+        renderExpirationTime
+      );
+    }
+  }
 
-    if (hasLegacyContextChanged()) {
+  function updateFragment(current, workInProgress) {
+    var nextChildren = workInProgress.pendingProps;
+    if (hasContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
-    } else if (changedBits === 0 && oldProps === newProps) {
+    } else if (workInProgress.memoizedProps === nextChildren) {
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
-    workInProgress.memoizedProps = newProps;
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextChildren);
+    return workInProgress.child;
+  }
 
-    var observedBits = newProps.unstable_observedBits;
-    if (observedBits === undefined || observedBits === null) {
-      // Subscribe to all changes by default
-      observedBits = MAX_SIGNED_31_BIT_INT;
-    }
-    // Store the observedBits on the fiber's stateNode for quick access.
-    workInProgress.stateNode = observedBits;
-
-    if ((changedBits & observedBits) !== 0) {
-      // Context change propagation stops at matching consumers, for time-
-      // slicing. Continue the propagation here.
-      propagateContextChange(
-        workInProgress,
-        context,
-        changedBits,
-        renderExpirationTime
-      );
+  function updateMode(current, workInProgress) {
+    var nextChildren = workInProgress.pendingProps.children;
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (
+      nextChildren === null ||
+      workInProgress.memoizedProps === nextChildren
+    ) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
-    // There is no bailout on `children` equality because we expect people
-    // to often pass a bound method as a child, but it may reference
-    // `this.state` or `this.props` (and thus needs to re-render on `setState`).
-
-    var render = newProps.children;
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextChildren);
+    return workInProgress.child;
+  }
 
-    {
-      !(typeof render === "function")
-        ? warning(
-            false,
-            "A context consumer was rendered with multiple children, or a child " +
-              "that isn't a function. A context consumer expects a single child " +
-              "that is a function. If you did pass a function, make sure there " +
-              "is no trailing or leading whitespace around it."
-          )
-        : void 0;
+  function markRef(current, workInProgress) {
+    var ref = workInProgress.ref;
+    if (
+      (current === null && ref !== null) ||
+      (current !== null && current.ref !== ref)
+    ) {
+      // Schedule a Ref effect
+      workInProgress.effectTag |= Ref;
     }
-
-    var newChildren = render(newValue);
-    reconcileChildren(current, workInProgress, newChildren);
-    return workInProgress.child;
   }
 
-  /*
-  function reuseChildrenEffects(returnFiber : Fiber, firstChild : Fiber) {
-    let child = firstChild;
-    do {
-      // Ensure that the first and last effect of the parent corresponds
-      // to the children's first and last effect.
-      if (!returnFiber.firstEffect) {
-        returnFiber.firstEffect = child.firstEffect;
-      }
-      if (child.lastEffect) {
-        if (returnFiber.lastEffect) {
-          returnFiber.lastEffect.nextEffect = child.firstEffect;
-        }
-        returnFiber.lastEffect = child.lastEffect;
+  function updateFunctionalComponent(current, workInProgress) {
+    var fn = workInProgress.type;
+    var nextProps = workInProgress.pendingProps;
+
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else {
+      if (workInProgress.memoizedProps === nextProps) {
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
       }
-    } while (child = child.sibling);
-  }
-  */
+      // TODO: consider bringing fn.shouldComponentUpdate() back.
+      // It used to be here.
+    }
 
-  function bailoutOnAlreadyFinishedWork(current, workInProgress) {
-    cancelWorkTimer(workInProgress);
+    var unmaskedContext = getUnmaskedContext(workInProgress);
+    var context = getMaskedContext(workInProgress, unmaskedContext);
 
-    // TODO: We should ideally be able to bail out early if the children have no
-    // more work to do. However, since we don't have a separation of this
-    // Fiber's priority and its children yet - we don't know without doing lots
-    // of the same work we do anyway. Once we have that separation we can just
-    // bail out here if the children has no more work at this priority level.
-    // if (workInProgress.priorityOfChildren <= priorityLevel) {
-    //   // If there are side-effects in these children that have not yet been
-    //   // committed we need to ensure that they get properly transferred up.
-    //   if (current && current.child !== workInProgress.child) {
-    //     reuseChildrenEffects(workInProgress, child);
-    //   }
-    //   return null;
-    // }
+    var nextChildren = void 0;
 
-    cloneChildFibers(current, workInProgress);
+    {
+      ReactCurrentOwner.current = workInProgress;
+      ReactDebugCurrentFiber.setCurrentPhase("render");
+      nextChildren = fn(nextProps, context);
+      ReactDebugCurrentFiber.setCurrentPhase(null);
+    }
+    // React DevTools reads this flag.
+    workInProgress.effectTag |= PerformedWork;
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextProps);
     return workInProgress.child;
   }
 
-  function bailoutOnLowPriority(current, workInProgress) {
-    cancelWorkTimer(workInProgress);
+  function updateClassComponent(current, workInProgress, renderExpirationTime) {
+    // Push context providers early to prevent context stack mismatches.
+    // During mounting we don't know the child context yet as the instance doesn't exist.
+    // We will invalidate the child context in finishClassComponent() right after rendering.
+    var hasContext = pushContextProvider(workInProgress);
+    var shouldUpdate = void 0;
+    if (current === null) {
+      if (workInProgress.stateNode === null) {
+        // In the initial pass we might need to construct the instance.
+        constructClassInstance(workInProgress, workInProgress.pendingProps);
+        mountClassInstance(workInProgress, renderExpirationTime);
 
-    // TODO: Handle HostComponent tags here as well and call pushHostContext()?
-    // See PR 8590 discussion for context
-    switch (workInProgress.tag) {
-      case HostRoot:
-        pushHostRootContext(workInProgress);
-        break;
-      case ClassComponent:
-        pushLegacyContextProvider(workInProgress);
-        break;
-      case HostPortal:
-        pushHostContainer(
+        shouldUpdate = true;
+      } else {
+        // In a resume, we'll already have an instance we can reuse.
+        shouldUpdate = resumeMountClassInstance(
           workInProgress,
-          workInProgress.stateNode.containerInfo
+          renderExpirationTime
         );
-        break;
-      case ContextProvider:
-        pushProvider(workInProgress);
-        break;
+      }
+    } else {
+      shouldUpdate = updateClassInstance(
+        current,
+        workInProgress,
+        renderExpirationTime
+      );
     }
-    // TODO: What if this is currently in progress?
-    // How can that happen? How is this not being cloned?
-    return null;
-  }
 
-  // TODO: Delete memoizeProps/State and move to reconcile/bailout instead
-  function memoizeProps(workInProgress, nextProps) {
-    workInProgress.memoizedProps = nextProps;
+    // We processed the update queue inside updateClassInstance. It may have
+    // included some errors that were dispatched during the commit phase.
+    // TODO: Refactor class components so this is less awkward.
+    var didCaptureError = false;
+    var updateQueue = workInProgress.updateQueue;
+    if (updateQueue !== null && updateQueue.capturedValues !== null) {
+      shouldUpdate = true;
+      didCaptureError = true;
+    }
+    return finishClassComponent(
+      current,
+      workInProgress,
+      shouldUpdate,
+      hasContext,
+      didCaptureError,
+      renderExpirationTime
+    );
   }
 
-  function memoizeState(workInProgress, nextState) {
-    workInProgress.memoizedState = nextState;
-    // Don't reset the updateQueue, in case there are pending updates. Resetting
-    // is handled by processUpdateQueue.
-  }
+  function finishClassComponent(
+    current,
+    workInProgress,
+    shouldUpdate,
+    hasContext,
+    didCaptureError,
+    renderExpirationTime
+  ) {
+    // Refs should update even if shouldComponentUpdate returns false
+    markRef(current, workInProgress);
 
-  function beginWork(current, workInProgress, renderExpirationTime) {
+    if (!shouldUpdate && !didCaptureError) {
+      // Context providers should defer to sCU for rendering
+      if (hasContext) {
+        invalidateContextProvider(workInProgress, false);
+      }
+
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+
+    var ctor = workInProgress.type;
+    var instance = workInProgress.stateNode;
+
+    // Rerender
+    ReactCurrentOwner.current = workInProgress;
+    var nextChildren = void 0;
     if (
-      workInProgress.expirationTime === NoWork ||
-      workInProgress.expirationTime > renderExpirationTime
+      didCaptureError &&
+      (!enableGetDerivedStateFromCatch ||
+        typeof ctor.getDerivedStateFromCatch !== "function")
     ) {
-      return bailoutOnLowPriority(current, workInProgress);
+      // If we captured an error, but getDerivedStateFrom catch is not defined,
+      // unmount all the children. componentDidCatch will schedule an update to
+      // re-render a fallback. This is temporary until we migrate everyone to
+      // the new API.
+      // TODO: Warn in a future release.
+      nextChildren = null;
+    } else {
+      {
+        ReactDebugCurrentFiber.setCurrentPhase("render");
+        nextChildren = instance.render();
+        if (
+          debugRenderPhaseSideEffects ||
+          (debugRenderPhaseSideEffectsForStrictMode &&
+            workInProgress.mode & StrictMode)
+        ) {
+          instance.render();
+        }
+        ReactDebugCurrentFiber.setCurrentPhase(null);
+      }
     }
 
-    switch (workInProgress.tag) {
-      case IndeterminateComponent:
-        return mountIndeterminateComponent(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case FunctionalComponent:
-        return updateFunctionalComponent(current, workInProgress);
-      case ClassComponent:
-        return updateClassComponent(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case HostRoot:
-        return updateHostRoot(current, workInProgress, renderExpirationTime);
-      case HostComponent:
-        return updateHostComponent(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case HostText:
-        return updateHostText(current, workInProgress);
-      case CallHandlerPhase:
-        // This is a restart. Reset the tag to the initial phase.
-        workInProgress.tag = CallComponent;
-      // Intentionally fall through since this is now the same.
-      case CallComponent:
-        return updateCallComponent(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case ReturnComponent:
-        // A return component is just a placeholder, we can just run through the
-        // next one immediately.
-        return null;
-      case HostPortal:
-        return updatePortalComponent(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case ForwardRef:
-        return updateForwardRef(current, workInProgress);
-      case Fragment:
-        return updateFragment(current, workInProgress);
-      case Mode:
-        return updateMode(current, workInProgress);
-      case ContextProvider:
-        return updateContextProvider(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case ContextConsumer:
-        return updateContextConsumer(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      default:
-        invariant(
-          false,
-          "Unknown unit of work tag. This error is likely caused by a bug in " +
-            "React. Please file an issue."
-        );
+    // React DevTools reads this flag.
+    workInProgress.effectTag |= PerformedWork;
+    if (didCaptureError) {
+      // If we're recovering from an error, reconcile twice: first to delete
+      // all the existing children.
+      reconcileChildrenAtExpirationTime(
+        current,
+        workInProgress,
+        null,
+        renderExpirationTime
+      );
+      workInProgress.child = null;
+      // Now we can continue reconciling like normal. This has the effect of
+      // remounting all children regardless of whether their their
+      // identity matches.
     }
-  }
-
-  return {
-    beginWork: beginWork
-  };
-};
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
+    // Memoize props and state using the values we just used to render.
+    // TODO: Restructure so we never read values from the instance.
+    memoizeState(workInProgress, instance.state);
+    memoizeProps(workInProgress, instance.props);
 
-var ReactFiberCompleteWork = function(
-  config,
-  hostContext,
-  legacyContext,
-  newContext,
-  hydrationContext
-) {
-  var createInstance = config.createInstance,
-    createTextInstance = config.createTextInstance,
-    appendInitialChild = config.appendInitialChild,
-    finalizeInitialChildren = config.finalizeInitialChildren,
-    prepareUpdate = config.prepareUpdate,
-    mutation = config.mutation,
-    persistence = config.persistence;
-  var getRootHostContainer = hostContext.getRootHostContainer,
-    popHostContext = hostContext.popHostContext,
-    getHostContext = hostContext.getHostContext,
-    popHostContainer = hostContext.popHostContainer;
-  var popLegacyContextProvider = legacyContext.popContextProvider,
-    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
-  var popProvider = newContext.popProvider;
-  var prepareToHydrateHostInstance =
-      hydrationContext.prepareToHydrateHostInstance,
-    prepareToHydrateHostTextInstance =
-      hydrationContext.prepareToHydrateHostTextInstance,
-    popHydrationState = hydrationContext.popHydrationState;
+    // The context might have changed so we need to recalculate it.
+    if (hasContext) {
+      invalidateContextProvider(workInProgress, true);
+    }
 
-  function markUpdate(workInProgress) {
-    // Tag the fiber with an update effect. This turns a Placement into
-    // an UpdateAndPlacement.
-    workInProgress.effectTag |= Update;
+    return workInProgress.child;
   }
 
-  function markRef(workInProgress) {
-    workInProgress.effectTag |= Ref;
+  function pushHostRootContext(workInProgress) {
+    var root = workInProgress.stateNode;
+    if (root.pendingContext) {
+      pushTopLevelContextObject(
+        workInProgress,
+        root.pendingContext,
+        root.pendingContext !== root.context
+      );
+    } else if (root.context) {
+      // Should always be set
+      pushTopLevelContextObject(workInProgress, root.context, false);
+    }
+    pushHostContainer(workInProgress, root.containerInfo);
   }
 
-  function appendAllReturns(returns, workInProgress) {
-    var node = workInProgress.stateNode;
-    if (node) {
-      node["return"] = workInProgress;
-    }
-    while (node !== null) {
+  function updateHostRoot(current, workInProgress, renderExpirationTime) {
+    pushHostRootContext(workInProgress);
+    var updateQueue = workInProgress.updateQueue;
+    if (updateQueue !== null) {
+      var prevState = workInProgress.memoizedState;
+      var state = processUpdateQueue(
+        current,
+        workInProgress,
+        updateQueue,
+        null,
+        null,
+        renderExpirationTime
+      );
+      memoizeState(workInProgress, state);
+      updateQueue = workInProgress.updateQueue;
+
+      var element = void 0;
+      if (updateQueue !== null && updateQueue.capturedValues !== null) {
+        // There's an uncaught error. Unmount the whole root.
+        element = null;
+      } else if (prevState === state) {
+        // If the state is the same as before, that's a bailout because we had
+        // no work that expires at this time.
+        resetHydrationState();
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      } else {
+        element = state.element;
+      }
+      var root = workInProgress.stateNode;
       if (
-        node.tag === HostComponent ||
-        node.tag === HostText ||
-        node.tag === HostPortal
+        (current === null || current.child === null) &&
+        root.hydrate &&
+        enterHydrationState(workInProgress)
       ) {
-        invariant(false, "A call cannot have host component children.");
-      } else if (node.tag === ReturnComponent) {
-        returns.push(node.pendingProps.value);
-      } else if (node.child !== null) {
-        node.child["return"] = node;
-        node = node.child;
-        continue;
-      }
-      while (node.sibling === null) {
-        if (node["return"] === null || node["return"] === workInProgress) {
-          return;
-        }
-        node = node["return"];
+        // If we don't have any current children this might be the first pass.
+        // We always try to hydrate. If this isn't a hydration pass there won't
+        // be any children to hydrate which is effectively the same thing as
+        // not hydrating.
+
+        // This is a bit of a hack. We track the host root as a placement to
+        // know that we're currently in a mounting state. That way isMounted
+        // works as expected. We must reset this before committing.
+        // TODO: Delete this when we delete isMounted and findDOMNode.
+        workInProgress.effectTag |= Placement;
+
+        // Ensure that children mount into this root without tracking
+        // side-effects. This ensures that we don't store Placement effects on
+        // nodes that will be hydrated.
+        workInProgress.child = mountChildFibers(
+          workInProgress,
+          null,
+          element,
+          renderExpirationTime
+        );
+      } else {
+        // Otherwise reset hydration state in case we aborted and resumed another
+        // root.
+        resetHydrationState();
+        reconcileChildren(current, workInProgress, element);
       }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
+      memoizeState(workInProgress, state);
+      return workInProgress.child;
     }
+    resetHydrationState();
+    // If there is no update queue, that's a bailout because the root has no props.
+    return bailoutOnAlreadyFinishedWork(current, workInProgress);
   }
 
-  function moveCallToHandlerPhase(
-    current,
-    workInProgress,
-    renderExpirationTime
-  ) {
-    var props = workInProgress.memoizedProps;
-    invariant(
-      props,
-      "Should be resolved by now. This error is likely caused by a bug in " +
-        "React. Please file an issue."
-    );
+  function updateHostComponent(current, workInProgress, renderExpirationTime) {
+    pushHostContext(workInProgress);
 
-    // First step of the call has completed. Now we need to do the second.
-    // TODO: It would be nice to have a multi stage call represented by a
-    // single component, or at least tail call optimize nested ones. Currently
-    // that requires additional fields that we don't want to add to the fiber.
-    // So this requires nested handlers.
-    // Note: This doesn't mutate the alternate node. I don't think it needs to
-    // since this stage is reset for every pass.
-    workInProgress.tag = CallHandlerPhase;
+    if (current === null) {
+      tryToClaimNextHydratableInstance(workInProgress);
+    }
 
-    // Build up the returns.
-    // TODO: Compare this to a generator or opaque helpers like Children.
-    var returns = [];
-    appendAllReturns(returns, workInProgress);
-    var fn = props.handler;
-    var childProps = props.props;
-    var nextChildren = fn(childProps, returns);
+    var type = workInProgress.type;
+    var memoizedProps = workInProgress.memoizedProps;
+    var nextProps = workInProgress.pendingProps;
+    var prevProps = current !== null ? current.memoizedProps : null;
 
-    var currentFirstChild = current !== null ? current.child : null;
-    workInProgress.child = reconcileChildFibers(
-      workInProgress,
-      currentFirstChild,
-      nextChildren,
-      renderExpirationTime
-    );
-    return workInProgress.child;
-  }
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (memoizedProps === nextProps) {
+      var isHidden =
+        workInProgress.mode & AsyncMode &&
+        shouldDeprioritizeSubtree(type, nextProps);
+      if (isHidden) {
+        // Before bailing out, make sure we've deprioritized a hidden component.
+        workInProgress.expirationTime = Never;
+      }
+      if (!isHidden || renderExpirationTime !== Never) {
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      }
+      // If we're rendering a hidden node at hidden priority, don't bailout. The
+      // parent is complete, but the children may not be.
+    }
 
-  function appendAllChildren(parent, workInProgress) {
-    // We only have the top Fiber that was created but we need recurse down its
-    // children to find all the terminal nodes.
-    var node = workInProgress.child;
-    while (node !== null) {
-      if (node.tag === HostComponent || node.tag === HostText) {
-        appendInitialChild(parent, node.stateNode);
-      } else if (node.tag === HostPortal) {
-        // If we have a portal child, then we don't want to traverse
-        // down its children. Instead, we'll get insertions from each child in
-        // the portal directly.
-      } else if (node.child !== null) {
-        node.child["return"] = node;
-        node = node.child;
-        continue;
-      }
-      if (node === workInProgress) {
-        return;
-      }
-      while (node.sibling === null) {
-        if (node["return"] === null || node["return"] === workInProgress) {
-          return;
+    var nextChildren = nextProps.children;
+    var isDirectTextChild = shouldSetTextContent(type, nextProps);
+
+    if (isDirectTextChild) {
+      // We special case a direct text child of a host node. This is a common
+      // case. We won't handle it as a reified child. We will instead handle
+      // this in the host environment that also have access to this prop. That
+      // avoids allocating another HostText fiber and traversing it.
+      nextChildren = null;
+    } else if (prevProps && shouldSetTextContent(type, prevProps)) {
+      // If we're switching from a direct text child to a normal child, or to
+      // empty, we need to schedule the text content to be reset.
+      workInProgress.effectTag |= ContentReset;
+    }
+
+    markRef(current, workInProgress);
+
+    // Check the host config to see if the children are offscreen/hidden.
+    if (
+      renderExpirationTime !== Never &&
+      workInProgress.mode & AsyncMode &&
+      shouldDeprioritizeSubtree(type, nextProps)
+    ) {
+      // Down-prioritize the children.
+      workInProgress.expirationTime = Never;
+      // Bailout and come back to this fiber later.
+      workInProgress.memoizedProps = nextProps;
+      return null;
+    }
+
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextProps);
+    return workInProgress.child;
+  }
+
+  function updateHostText(current, workInProgress) {
+    if (current === null) {
+      tryToClaimNextHydratableInstance(workInProgress);
+    }
+    var nextProps = workInProgress.pendingProps;
+    memoizeProps(workInProgress, nextProps);
+    // Nothing to do here. This is terminal. We'll do the completion step
+    // immediately after.
+    return null;
+  }
+
+  function mountIndeterminateComponent(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    invariant(
+      current === null,
+      "An indeterminate component should never have mounted. This error is " +
+        "likely caused by a bug in React. Please file an issue."
+    );
+    var fn = workInProgress.type;
+    var props = workInProgress.pendingProps;
+    var unmaskedContext = getUnmaskedContext(workInProgress);
+    var context = getMaskedContext(workInProgress, unmaskedContext);
+
+    var value = void 0;
+
+    {
+      if (fn.prototype && typeof fn.prototype.render === "function") {
+        var componentName = getComponentName(workInProgress) || "Unknown";
+
+        if (!didWarnAboutBadClass[componentName]) {
+          warning(
+            false,
+            "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
+              "This is likely to cause errors. Change %s to extend React.Component instead.",
+            componentName,
+            componentName
+          );
+          didWarnAboutBadClass[componentName] = true;
         }
-        node = node["return"];
       }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
+      ReactCurrentOwner.current = workInProgress;
+      value = fn(props, context);
     }
-  }
+    // React DevTools reads this flag.
+    workInProgress.effectTag |= PerformedWork;
 
-  var updateHostContainer = void 0;
-  var updateHostComponent = void 0;
-  var updateHostText = void 0;
-  if (mutation) {
-    if (enableMutatingReconciler) {
-      // Mutation mode
-      updateHostContainer = function(workInProgress) {
-        // Noop
-      };
-      updateHostComponent = function(
+    if (
+      typeof value === "object" &&
+      value !== null &&
+      typeof value.render === "function" &&
+      value.$$typeof === undefined
+    ) {
+      var Component = workInProgress.type;
+
+      // Proceed under the assumption that this is a class instance
+      workInProgress.tag = ClassComponent;
+
+      workInProgress.memoizedState =
+        value.state !== null && value.state !== undefined ? value.state : null;
+
+      if (typeof Component.getDerivedStateFromProps === "function") {
+        var partialState = callGetDerivedStateFromProps(
+          workInProgress,
+          value,
+          props
+        );
+
+        if (partialState !== null && partialState !== undefined) {
+          workInProgress.memoizedState = Object.assign(
+            {},
+            workInProgress.memoizedState,
+            partialState
+          );
+        }
+      }
+
+      // Push context providers early to prevent context stack mismatches.
+      // During mounting we don't know the child context yet as the instance doesn't exist.
+      // We will invalidate the child context in finishClassComponent() right after rendering.
+      var hasContext = pushContextProvider(workInProgress);
+      adoptClassInstance(workInProgress, value);
+      mountClassInstance(workInProgress, renderExpirationTime);
+      return finishClassComponent(
         current,
         workInProgress,
-        updatePayload,
-        type,
-        oldProps,
-        newProps,
-        rootContainerInstance,
-        currentHostContext
-      ) {
-        // TODO: Type this specific to this type of component.
-        workInProgress.updateQueue = updatePayload;
-        // If the update payload indicates that there is a change or if there
-        // is a new ref we mark this as an update. All the work is done in commitWork.
-        if (updatePayload) {
-          markUpdate(workInProgress);
-        }
-      };
-      updateHostText = function(current, workInProgress, oldText, newText) {
-        // If the text differs, mark it as an update. All the work in done in commitWork.
-        if (oldText !== newText) {
-          markUpdate(workInProgress);
-        }
-      };
+        true,
+        hasContext,
+        false,
+        renderExpirationTime
+      );
     } else {
-      invariant(false, "Mutating reconciler is disabled.");
-    }
-  } else if (persistence) {
-    if (enablePersistentReconciler) {
-      // Persistent host tree mode
-      var cloneInstance = persistence.cloneInstance,
-        createContainerChildSet = persistence.createContainerChildSet,
-        appendChildToContainerChildSet =
-          persistence.appendChildToContainerChildSet,
-        finalizeContainerChildren = persistence.finalizeContainerChildren;
+      // Proceed under the assumption that this is a functional component
+      workInProgress.tag = FunctionalComponent;
+      {
+        var _Component = workInProgress.type;
 
-      // An unfortunate fork of appendAllChildren because we have two different parent types.
+        if (_Component) {
+          warning(
+            !_Component.childContextTypes,
+            "%s(...): childContextTypes cannot be defined on a functional component.",
+            _Component.displayName || _Component.name || "Component"
+          );
+        }
+        if (workInProgress.ref !== null) {
+          var info = "";
+          var ownerName = ReactDebugCurrentFiber.getCurrentFiberOwnerName();
+          if (ownerName) {
+            info += "\n\nCheck the render method of `" + ownerName + "`.";
+          }
 
-      var appendAllChildrenToContainer = function(
-        containerChildSet,
-        workInProgress
-      ) {
-        // We only have the top Fiber that was created but we need recurse down its
-        // children to find all the terminal nodes.
-        var node = workInProgress.child;
-        while (node !== null) {
-          if (node.tag === HostComponent || node.tag === HostText) {
-            appendChildToContainerChildSet(containerChildSet, node.stateNode);
-          } else if (node.tag === HostPortal) {
-            // If we have a portal child, then we don't want to traverse
-            // down its children. Instead, we'll get insertions from each child in
-            // the portal directly.
-          } else if (node.child !== null) {
-            node.child["return"] = node;
-            node = node.child;
-            continue;
+          var warningKey = ownerName || workInProgress._debugID || "";
+          var debugSource = workInProgress._debugSource;
+          if (debugSource) {
+            warningKey = debugSource.fileName + ":" + debugSource.lineNumber;
           }
-          if (node === workInProgress) {
-            return;
+          if (!didWarnAboutStatelessRefs[warningKey]) {
+            didWarnAboutStatelessRefs[warningKey] = true;
+            warning(
+              false,
+              "Stateless function components cannot be given refs. " +
+                "Attempts to access this ref will fail.%s%s",
+              info,
+              ReactDebugCurrentFiber.getCurrentFiberStackAddendum()
+            );
           }
-          while (node.sibling === null) {
-            if (node["return"] === null || node["return"] === workInProgress) {
-              return;
-            }
-            node = node["return"];
+        }
+
+        if (typeof fn.getDerivedStateFromProps === "function") {
+          var _componentName = getComponentName(workInProgress) || "Unknown";
+
+          if (
+            !didWarnAboutGetDerivedStateOnFunctionalComponent[_componentName]
+          ) {
+            warning(
+              false,
+              "%s: Stateless functional components do not support getDerivedStateFromProps.",
+              _componentName
+            );
+            didWarnAboutGetDerivedStateOnFunctionalComponent[
+              _componentName
+            ] = true;
           }
-          node.sibling["return"] = node["return"];
-          node = node.sibling;
         }
-      };
-      updateHostContainer = function(workInProgress) {
-        var portalOrRoot = workInProgress.stateNode;
-        var childrenUnchanged = workInProgress.firstEffect === null;
-        if (childrenUnchanged) {
-          // No changes, just reuse the existing instance.
-        } else {
-          var container = portalOrRoot.containerInfo;
-          var newChildSet = createContainerChildSet(container);
-          // If children might have changed, we have to add them all to the set.
-          appendAllChildrenToContainer(newChildSet, workInProgress);
-          portalOrRoot.pendingChildren = newChildSet;
-          // Schedule an update on the container to swap out the container.
-          markUpdate(workInProgress);
-          finalizeContainerChildren(container, newChildSet);
-        }
-      };
-      updateHostComponent = function(
-        current,
+      }
+      reconcileChildren(current, workInProgress, value);
+      memoizeProps(workInProgress, props);
+      return workInProgress.child;
+    }
+  }
+
+  function updateCallComponent(current, workInProgress, renderExpirationTime) {
+    var nextProps = workInProgress.pendingProps;
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (workInProgress.memoizedProps === nextProps) {
+      nextProps = workInProgress.memoizedProps;
+      // TODO: When bailing out, we might need to return the stateNode instead
+      // of the child. To check it for work.
+      // return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+
+    var nextChildren = nextProps.children;
+
+    // The following is a fork of reconcileChildrenAtExpirationTime but using
+    // stateNode to store the child.
+    if (current === null) {
+      workInProgress.stateNode = mountChildFibers(
         workInProgress,
-        updatePayload,
-        type,
-        oldProps,
-        newProps,
-        rootContainerInstance,
-        currentHostContext
-      ) {
-        // If there are no effects associated with this node, then none of our children had any updates.
-        // This guarantees that we can reuse all of them.
-        var childrenUnchanged = workInProgress.firstEffect === null;
-        var currentInstance = current.stateNode;
-        if (childrenUnchanged && updatePayload === null) {
-          // No changes, just reuse the existing instance.
-          // Note that this might release a previous clone.
-          workInProgress.stateNode = currentInstance;
-        } else {
-          var recyclableInstance = workInProgress.stateNode;
-          var newInstance = cloneInstance(
-            currentInstance,
-            updatePayload,
-            type,
-            oldProps,
-            newProps,
-            workInProgress,
-            childrenUnchanged,
-            recyclableInstance
-          );
-          if (
-            finalizeInitialChildren(
-              newInstance,
-              type,
-              newProps,
-              rootContainerInstance,
-              currentHostContext
-            )
-          ) {
-            markUpdate(workInProgress);
-          }
-          workInProgress.stateNode = newInstance;
-          if (childrenUnchanged) {
-            // If there are no other effects in this tree, we need to flag this node as having one.
-            // Even though we're not going to use it for anything.
-            // Otherwise parents won't know that there are new children to propagate upwards.
-            markUpdate(workInProgress);
-          } else {
-            // If children might have changed, we have to add them all to the set.
-            appendAllChildren(newInstance, workInProgress);
-          }
-        }
-      };
-      updateHostText = function(current, workInProgress, oldText, newText) {
-        if (oldText !== newText) {
-          // If the text content differs, we'll create a new text instance for it.
-          var rootContainerInstance = getRootHostContainer();
-          var currentHostContext = getHostContext();
-          workInProgress.stateNode = createTextInstance(
-            newText,
-            rootContainerInstance,
-            currentHostContext,
-            workInProgress
-          );
-          // We'll have to mark it as having an effect, even though we won't use the effect for anything.
-          // This lets the parents know that at least one of their children has changed.
-          markUpdate(workInProgress);
-        }
-      };
+        workInProgress.stateNode,
+        nextChildren,
+        renderExpirationTime
+      );
     } else {
-      invariant(false, "Persistent reconciler is disabled.");
+      workInProgress.stateNode = reconcileChildFibers(
+        workInProgress,
+        current.stateNode,
+        nextChildren,
+        renderExpirationTime
+      );
     }
-  } else {
-    if (enableNoopReconciler) {
-      // No host operations
-      updateHostContainer = function(workInProgress) {
-        // Noop
-      };
-      updateHostComponent = function(
-        current,
+
+    memoizeProps(workInProgress, nextProps);
+    // This doesn't take arbitrary time so we could synchronously just begin
+    // eagerly do the work of workInProgress.child as an optimization.
+    return workInProgress.stateNode;
+  }
+
+  function updatePortalComponent(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+    var nextChildren = workInProgress.pendingProps;
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (workInProgress.memoizedProps === nextChildren) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+
+    if (current === null) {
+      // Portals are special because we don't append the children during mount
+      // but at commit. Therefore we need to track insertions which the normal
+      // flow doesn't do during mount. This doesn't happen at the root because
+      // the root always starts with a "current" with a null child.
+      // TODO: Consider unifying this with how the root works.
+      workInProgress.child = reconcileChildFibers(
         workInProgress,
-        updatePayload,
-        type,
-        oldProps,
-        newProps,
-        rootContainerInstance,
-        currentHostContext
-      ) {
-        // Noop
-      };
-      updateHostText = function(current, workInProgress, oldText, newText) {
-        // Noop
-      };
+        null,
+        nextChildren,
+        renderExpirationTime
+      );
+      memoizeProps(workInProgress, nextChildren);
     } else {
-      invariant(false, "Noop reconciler is disabled.");
+      reconcileChildren(current, workInProgress, nextChildren);
+      memoizeProps(workInProgress, nextChildren);
     }
+    return workInProgress.child;
   }
 
-  function completeWork(current, workInProgress, renderExpirationTime) {
-    var newProps = workInProgress.pendingProps;
-    switch (workInProgress.tag) {
-      case FunctionalComponent:
-        return null;
-      case ClassComponent: {
-        // We are leaving this subtree, so pop context if any.
-        popLegacyContextProvider(workInProgress);
-
-        // If this component caught an error, schedule an error log effect.
-        var instance = workInProgress.stateNode;
-        var updateQueue = workInProgress.updateQueue;
-        if (updateQueue !== null && updateQueue.capturedValues !== null) {
-          workInProgress.effectTag &= ~DidCapture;
-          if (typeof instance.componentDidCatch === "function") {
-            workInProgress.effectTag |= ErrLog;
+  function propagateContextChange(
+    workInProgress,
+    context,
+    changedBits,
+    renderExpirationTime
+  ) {
+    var fiber = workInProgress.child;
+    while (fiber !== null) {
+      var nextFiber = void 0;
+      // Visit this fiber.
+      switch (fiber.tag) {
+        case ContextConsumer:
+          // Check if the context matches.
+          var observedBits = fiber.stateNode | 0;
+          if (fiber.type === context && (observedBits & changedBits) !== 0) {
+            // Update the expiration time of all the ancestors, including
+            // the alternates.
+            var node = fiber;
+            while (node !== null) {
+              var alternate = node.alternate;
+              if (
+                node.expirationTime === NoWork ||
+                node.expirationTime > renderExpirationTime
+              ) {
+                node.expirationTime = renderExpirationTime;
+                if (
+                  alternate !== null &&
+                  (alternate.expirationTime === NoWork ||
+                    alternate.expirationTime > renderExpirationTime)
+                ) {
+                  alternate.expirationTime = renderExpirationTime;
+                }
+              } else if (
+                alternate !== null &&
+                (alternate.expirationTime === NoWork ||
+                  alternate.expirationTime > renderExpirationTime)
+              ) {
+                alternate.expirationTime = renderExpirationTime;
+              } else {
+                // Neither alternate was updated, which means the rest of the
+                // ancestor path already has sufficient priority.
+                break;
+              }
+              node = node["return"];
+            }
+            // Don't scan deeper than a matching consumer. When we render the
+            // consumer, we'll continue scanning from that point. This way the
+            // scanning work is time-sliced.
+            nextFiber = null;
           } else {
-            // Normally we clear this in the commit phase, but since we did not
-            // schedule an effect, we need to reset it here.
-            updateQueue.capturedValues = null;
+            // Traverse down.
+            nextFiber = fiber.child;
           }
-        }
-        return null;
+          break;
+        case ContextProvider:
+          // Don't scan deeper if this is a matching provider
+          nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
+          break;
+        default:
+          // Traverse down.
+          nextFiber = fiber.child;
+          break;
       }
-      case HostRoot: {
-        popHostContainer(workInProgress);
-        popTopLevelLegacyContextObject(workInProgress);
-        var fiberRoot = workInProgress.stateNode;
-        if (fiberRoot.pendingContext) {
-          fiberRoot.context = fiberRoot.pendingContext;
-          fiberRoot.pendingContext = null;
-        }
-        if (current === null || current.child === null) {
-          // If we hydrated, pop so that we can delete any remaining children
-          // that weren't hydrated.
-          popHydrationState(workInProgress);
-          // This resets the hacky state to fix isMounted before committing.
-          // TODO: Delete this when we delete isMounted and findDOMNode.
-          workInProgress.effectTag &= ~Placement;
-        }
-        updateHostContainer(workInProgress);
-
-        var _updateQueue = workInProgress.updateQueue;
-        if (_updateQueue !== null && _updateQueue.capturedValues !== null) {
-          workInProgress.effectTag |= ErrLog;
+      if (nextFiber !== null) {
+        // Set the return pointer of the child to the work-in-progress fiber.
+        nextFiber["return"] = fiber;
+      } else {
+        // No child. Traverse to next sibling.
+        nextFiber = fiber;
+        while (nextFiber !== null) {
+          if (nextFiber === workInProgress) {
+            // We're back to the root of this subtree. Exit.
+            nextFiber = null;
+            break;
+          }
+          var sibling = nextFiber.sibling;
+          if (sibling !== null) {
+            nextFiber = sibling;
+            break;
+          }
+          // No more siblings. Traverse up.
+          nextFiber = nextFiber["return"];
         }
-        return null;
       }
-      case HostComponent: {
-        popHostContext(workInProgress);
-        var rootContainerInstance = getRootHostContainer();
-        var type = workInProgress.type;
-        if (current !== null && workInProgress.stateNode != null) {
-          // If we have an alternate, that means this is an update and we need to
-          // schedule a side-effect to do the updates.
-          var oldProps = current.memoizedProps;
-          // If we get updated because one of our children updated, we don't
-          // have newProps so we'll have to reuse them.
-          // TODO: Split the update API as separate for the props vs. children.
-          // Even better would be if children weren't special cased at all tho.
-          var _instance = workInProgress.stateNode;
-          var currentHostContext = getHostContext();
-          // TODO: Experiencing an error where oldProps is null. Suggests a host
-          // component is hitting the resume path. Figure out why. Possibly
-          // related to `hidden`.
-          var updatePayload = prepareUpdate(
-            _instance,
-            type,
-            oldProps,
-            newProps,
-            rootContainerInstance,
-            currentHostContext
-          );
-
-          updateHostComponent(
-            current,
-            workInProgress,
-            updatePayload,
-            type,
-            oldProps,
-            newProps,
-            rootContainerInstance,
-            currentHostContext
-          );
+      fiber = nextFiber;
+    }
+  }
 
-          if (current.ref !== workInProgress.ref) {
-            markRef(workInProgress);
-          }
-        } else {
-          if (!newProps) {
-            invariant(
-              workInProgress.stateNode !== null,
-              "We must have new props for new mounts. This error is likely " +
-                "caused by a bug in React. Please file an issue."
-            );
-            // This can happen when we abort work.
-            return null;
-          }
+  function updateContextProvider(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    var providerType = workInProgress.type;
+    var context = providerType.context;
 
-          var _currentHostContext = getHostContext();
-          // TODO: Move createInstance to beginWork and keep it on a context
-          // "stack" as the parent. Then append children as we go in beginWork
-          // or completeWork depending on we want to add then top->down or
-          // bottom->up. Top->down is faster in IE11.
-          var wasHydrated = popHydrationState(workInProgress);
-          if (wasHydrated) {
-            // TODO: Move this and createInstance step into the beginPhase
-            // to consolidate.
-            if (
-              prepareToHydrateHostInstance(
-                workInProgress,
-                rootContainerInstance,
-                _currentHostContext
-              )
-            ) {
-              // If changes to the hydrated node needs to be applied at the
-              // commit-phase we mark this as such.
-              markUpdate(workInProgress);
-            }
-          } else {
-            var _instance2 = createInstance(
-              type,
-              newProps,
-              rootContainerInstance,
-              _currentHostContext,
-              workInProgress
-            );
+    var newProps = workInProgress.pendingProps;
+    var oldProps = workInProgress.memoizedProps;
 
-            appendAllChildren(_instance2, workInProgress);
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (oldProps === newProps) {
+      workInProgress.stateNode = 0;
+      pushProvider(workInProgress);
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
 
-            // Certain renderers require commit-time effects for initial mount.
-            // (eg DOM renderer supports auto-focus for certain elements).
-            // Make sure such renderers get scheduled for later work.
-            if (
-              finalizeInitialChildren(
-                _instance2,
-                type,
-                newProps,
-                rootContainerInstance,
-                _currentHostContext
-              )
-            ) {
-              markUpdate(workInProgress);
-            }
-            workInProgress.stateNode = _instance2;
-          }
+    var newValue = newProps.value;
+    workInProgress.memoizedProps = newProps;
 
-          if (workInProgress.ref !== null) {
-            // If there is a ref on a host node we need to schedule a callback
-            markRef(workInProgress);
-          }
+    var changedBits = void 0;
+    if (oldProps === null) {
+      // Initial render
+      changedBits = MAX_SIGNED_31_BIT_INT;
+    } else {
+      if (oldProps.value === newProps.value) {
+        // No change. Bailout early if children are the same.
+        if (oldProps.children === newProps.children) {
+          workInProgress.stateNode = 0;
+          pushProvider(workInProgress);
+          return bailoutOnAlreadyFinishedWork(current, workInProgress);
         }
-        return null;
-      }
-      case HostText: {
-        var newText = newProps;
-        if (current && workInProgress.stateNode != null) {
-          var oldText = current.memoizedProps;
-          // If we have an alternate, that means this is an update and we need
-          // to schedule a side-effect to do the updates.
-          updateHostText(current, workInProgress, oldText, newText);
+        changedBits = 0;
+      } else {
+        var oldValue = oldProps.value;
+        // Use Object.is to compare the new context value to the old value.
+        // Inlined Object.is polyfill.
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
+        if (
+          (oldValue === newValue &&
+            (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
+          (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
+        ) {
+          // No change. Bailout early if children are the same.
+          if (oldProps.children === newProps.children) {
+            workInProgress.stateNode = 0;
+            pushProvider(workInProgress);
+            return bailoutOnAlreadyFinishedWork(current, workInProgress);
+          }
+          changedBits = 0;
         } else {
-          if (typeof newText !== "string") {
-            invariant(
-              workInProgress.stateNode !== null,
-              "We must have new props for new mounts. This error is likely " +
-                "caused by a bug in React. Please file an issue."
-            );
-            // This can happen when we abort work.
-            return null;
+          changedBits =
+            typeof context._calculateChangedBits === "function"
+              ? context._calculateChangedBits(oldValue, newValue)
+              : MAX_SIGNED_31_BIT_INT;
+          {
+            warning(
+              (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
+              "calculateChangedBits: Expected the return value to be a " +
+                "31-bit integer. Instead received: %s",
+              changedBits
+            );
           }
-          var _rootContainerInstance = getRootHostContainer();
-          var _currentHostContext2 = getHostContext();
-          var _wasHydrated = popHydrationState(workInProgress);
-          if (_wasHydrated) {
-            if (prepareToHydrateHostTextInstance(workInProgress)) {
-              markUpdate(workInProgress);
+          changedBits |= 0;
+
+          if (changedBits === 0) {
+            // No change. Bailout early if children are the same.
+            if (oldProps.children === newProps.children) {
+              workInProgress.stateNode = 0;
+              pushProvider(workInProgress);
+              return bailoutOnAlreadyFinishedWork(current, workInProgress);
             }
           } else {
-            workInProgress.stateNode = createTextInstance(
-              newText,
-              _rootContainerInstance,
-              _currentHostContext2,
-              workInProgress
+            propagateContextChange(
+              workInProgress,
+              context,
+              changedBits,
+              renderExpirationTime
             );
           }
         }
-        return null;
       }
-      case CallComponent:
-        return moveCallToHandlerPhase(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case CallHandlerPhase:
-        // Reset the tag to now be a first phase call.
-        workInProgress.tag = CallComponent;
-        return null;
-      case ReturnComponent:
-        // Does nothing.
-        return null;
-      case ForwardRef:
-        return null;
-      case Fragment:
-        return null;
-      case Mode:
-        return null;
-      case HostPortal:
-        popHostContainer(workInProgress);
-        updateHostContainer(workInProgress);
-        return null;
-      case ContextProvider:
-        // Pop provider fiber
-        popProvider(workInProgress);
-        return null;
-      case ContextConsumer:
-        return null;
-      // Error cases
-      case IndeterminateComponent:
-        invariant(
-          false,
-          "An indeterminate component should have become determinate before " +
-            "completing. This error is likely caused by a bug in React. Please " +
-            "file an issue."
-        );
-      // eslint-disable-next-line no-fallthrough
-      default:
-        invariant(
-          false,
-          "Unknown unit of work tag. This error is likely caused by a bug in " +
-            "React. Please file an issue."
-        );
     }
+
+    workInProgress.stateNode = changedBits;
+    pushProvider(workInProgress);
+
+    var newChildren = newProps.children;
+    reconcileChildren(current, workInProgress, newChildren);
+    return workInProgress.child;
   }
 
-  return {
-    completeWork: completeWork
-  };
-};
+  function updateContextConsumer(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    var context = workInProgress.type;
+    var newProps = workInProgress.pendingProps;
+    var oldProps = workInProgress.memoizedProps;
 
-function createCapturedValue(value, source) {
-  // If the value is an error, call this function immediately after it is thrown
-  // so the stack is accurate.
-  return {
-    value: value,
-    source: source,
-    stack: getStackAddendumByWorkInProgressFiber(source)
-  };
-}
+    var newValue = context._currentValue;
+    var changedBits = context._changedBits;
 
-var ReactFiberUnwindWork = function(
-  hostContext,
-  legacyContext,
-  newContext,
-  scheduleWork,
-  isAlreadyFailedLegacyErrorBoundary
-) {
-  var popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext;
-  var popLegacyContextProvider = legacyContext.popContextProvider,
-    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
-  var popProvider = newContext.popProvider;
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (changedBits === 0 && oldProps === newProps) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+    workInProgress.memoizedProps = newProps;
 
-  function throwException(returnFiber, sourceFiber, rawValue) {
-    // The source fiber did not complete.
-    sourceFiber.effectTag |= Incomplete;
-    // Its effect list is no longer valid.
-    sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+    var observedBits = newProps.unstable_observedBits;
+    if (observedBits === undefined || observedBits === null) {
+      // Subscribe to all changes by default
+      observedBits = MAX_SIGNED_31_BIT_INT;
+    }
+    // Store the observedBits on the fiber's stateNode for quick access.
+    workInProgress.stateNode = observedBits;
 
-    var value = createCapturedValue(rawValue, sourceFiber);
+    if ((changedBits & observedBits) !== 0) {
+      // Context change propagation stops at matching consumers, for time-
+      // slicing. Continue the propagation here.
+      propagateContextChange(
+        workInProgress,
+        context,
+        changedBits,
+        renderExpirationTime
+      );
+    } else if (oldProps !== null && oldProps.children === newProps.children) {
+      // No change. Bailout early if children are the same.
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
 
-    var workInProgress = returnFiber;
-    do {
-      switch (workInProgress.tag) {
-        case HostRoot: {
-          // Uncaught error
-          var errorInfo = value;
-          ensureUpdateQueues(workInProgress);
-          var updateQueue = workInProgress.updateQueue;
-          updateQueue.capturedValues = [errorInfo];
-          workInProgress.effectTag |= ShouldCapture;
-          return;
-        }
-        case ClassComponent:
-          // Capture and retry
-          var ctor = workInProgress.type;
-          var _instance = workInProgress.stateNode;
-          if (
-            (workInProgress.effectTag & DidCapture) === NoEffect &&
-            ((typeof ctor.getDerivedStateFromCatch === "function" &&
-              enableGetDerivedStateFromCatch) ||
-              (_instance !== null &&
-                typeof _instance.componentDidCatch === "function" &&
-                !isAlreadyFailedLegacyErrorBoundary(_instance)))
-          ) {
-            ensureUpdateQueues(workInProgress);
-            var _updateQueue = workInProgress.updateQueue;
-            var capturedValues = _updateQueue.capturedValues;
-            if (capturedValues === null) {
-              _updateQueue.capturedValues = [value];
-            } else {
-              capturedValues.push(value);
-            }
-            workInProgress.effectTag |= ShouldCapture;
-            return;
-          }
-          break;
-        default:
-          break;
-      }
-      workInProgress = workInProgress["return"];
-    } while (workInProgress !== null);
+    var render = newProps.children;
+
+    {
+      warning(
+        typeof render === "function",
+        "A context consumer was rendered with multiple children, or a child " +
+          "that isn't a function. A context consumer expects a single child " +
+          "that is a function. If you did pass a function, make sure there " +
+          "is no trailing or leading whitespace around it."
+      );
+    }
+
+    var newChildren = render(newValue);
+    reconcileChildren(current, workInProgress, newChildren);
+    return workInProgress.child;
   }
 
-  function unwindWork(workInProgress) {
-    switch (workInProgress.tag) {
-      case ClassComponent: {
-        popLegacyContextProvider(workInProgress);
-        var effectTag = workInProgress.effectTag;
-        if (effectTag & ShouldCapture) {
-          workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
-          return workInProgress;
-        }
-        return null;
+  /*
+  function reuseChildrenEffects(returnFiber : Fiber, firstChild : Fiber) {
+    let child = firstChild;
+    do {
+      // Ensure that the first and last effect of the parent corresponds
+      // to the children's first and last effect.
+      if (!returnFiber.firstEffect) {
+        returnFiber.firstEffect = child.firstEffect;
       }
-      case HostRoot: {
-        popHostContainer(workInProgress);
-        popTopLevelLegacyContextObject(workInProgress);
-        var _effectTag = workInProgress.effectTag;
-        if (_effectTag & ShouldCapture) {
-          workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
-          return workInProgress;
+      if (child.lastEffect) {
+        if (returnFiber.lastEffect) {
+          returnFiber.lastEffect.nextEffect = child.firstEffect;
         }
-        return null;
-      }
-      case HostComponent: {
-        popHostContext(workInProgress);
-        return null;
+        returnFiber.lastEffect = child.lastEffect;
       }
-      case HostPortal:
-        popHostContainer(workInProgress);
-        return null;
-      case ContextProvider:
-        popProvider(workInProgress);
-        return null;
-      default:
-        return null;
-    }
+    } while (child = child.sibling);
   }
+  */
 
-  function unwindInterruptedWork(interruptedWork) {
-    switch (interruptedWork.tag) {
-      case ClassComponent: {
-        popLegacyContextProvider(interruptedWork);
-        break;
-      }
-      case HostRoot: {
-        popHostContainer(interruptedWork);
-        popTopLevelLegacyContextObject(interruptedWork);
+  function bailoutOnAlreadyFinishedWork(current, workInProgress) {
+    cancelWorkTimer(workInProgress);
+
+    // TODO: We should ideally be able to bail out early if the children have no
+    // more work to do. However, since we don't have a separation of this
+    // Fiber's priority and its children yet - we don't know without doing lots
+    // of the same work we do anyway. Once we have that separation we can just
+    // bail out here if the children has no more work at this priority level.
+    // if (workInProgress.priorityOfChildren <= priorityLevel) {
+    //   // If there are side-effects in these children that have not yet been
+    //   // committed we need to ensure that they get properly transferred up.
+    //   if (current && current.child !== workInProgress.child) {
+    //     reuseChildrenEffects(workInProgress, child);
+    //   }
+    //   return null;
+    // }
+
+    cloneChildFibers(current, workInProgress);
+    return workInProgress.child;
+  }
+
+  function bailoutOnLowPriority(current, workInProgress) {
+    cancelWorkTimer(workInProgress);
+
+    // TODO: Handle HostComponent tags here as well and call pushHostContext()?
+    // See PR 8590 discussion for context
+    switch (workInProgress.tag) {
+      case HostRoot:
+        pushHostRootContext(workInProgress);
         break;
-      }
-      case HostComponent: {
-        popHostContext(interruptedWork);
+      case ClassComponent:
+        pushContextProvider(workInProgress);
         break;
-      }
       case HostPortal:
-        popHostContainer(interruptedWork);
+        pushHostContainer(
+          workInProgress,
+          workInProgress.stateNode.containerInfo
+        );
         break;
       case ContextProvider:
-        popProvider(interruptedWork);
+        pushProvider(workInProgress);
         break;
+    }
+    // TODO: What if this is currently in progress?
+    // How can that happen? How is this not being cloned?
+    return null;
+  }
+
+  // TODO: Delete memoizeProps/State and move to reconcile/bailout instead
+  function memoizeProps(workInProgress, nextProps) {
+    workInProgress.memoizedProps = nextProps;
+  }
+
+  function memoizeState(workInProgress, nextState) {
+    workInProgress.memoizedState = nextState;
+    // Don't reset the updateQueue, in case there are pending updates. Resetting
+    // is handled by processUpdateQueue.
+  }
+
+  function beginWork(current, workInProgress, renderExpirationTime) {
+    if (
+      workInProgress.expirationTime === NoWork ||
+      workInProgress.expirationTime > renderExpirationTime
+    ) {
+      return bailoutOnLowPriority(current, workInProgress);
+    }
+
+    switch (workInProgress.tag) {
+      case IndeterminateComponent:
+        return mountIndeterminateComponent(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case FunctionalComponent:
+        return updateFunctionalComponent(current, workInProgress);
+      case ClassComponent:
+        return updateClassComponent(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case HostRoot:
+        return updateHostRoot(current, workInProgress, renderExpirationTime);
+      case HostComponent:
+        return updateHostComponent(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case HostText:
+        return updateHostText(current, workInProgress);
+      case CallHandlerPhase:
+        // This is a restart. Reset the tag to the initial phase.
+        workInProgress.tag = CallComponent;
+      // Intentionally fall through since this is now the same.
+      case CallComponent:
+        return updateCallComponent(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case ReturnComponent:
+        // A return component is just a placeholder, we can just run through the
+        // next one immediately.
+        return null;
+      case HostPortal:
+        return updatePortalComponent(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case Fragment:
+        return updateFragment(current, workInProgress);
+      case Mode:
+        return updateMode(current, workInProgress);
+      case ContextProvider:
+        return updateContextProvider(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case ContextConsumer:
+        return updateContextConsumer(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
       default:
-        break;
+        invariant(
+          false,
+          "Unknown unit of work tag. This error is likely caused by a bug in " +
+            "React. Please file an issue."
+        );
     }
   }
 
   return {
-    throwException: throwException,
-    unwindWork: unwindWork,
-    unwindInterruptedWork: unwindInterruptedWork
+    beginWork: beginWork
   };
 };
 
-// This module is forked in different environments.
-// By default, return `true` to log errors to the console.
-// Forks can return `false` if this isn't desirable.
-function showErrorDialog(capturedError) {
-  return true;
-}
-
-function logCapturedError(capturedError) {
-  var logError = showErrorDialog(capturedError);
+var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
+  var createInstance = config.createInstance,
+    createTextInstance = config.createTextInstance,
+    appendInitialChild = config.appendInitialChild,
+    finalizeInitialChildren = config.finalizeInitialChildren,
+    prepareUpdate = config.prepareUpdate,
+    mutation = config.mutation,
+    persistence = config.persistence;
+  var getRootHostContainer = hostContext.getRootHostContainer,
+    popHostContext = hostContext.popHostContext,
+    getHostContext = hostContext.getHostContext,
+    popHostContainer = hostContext.popHostContainer;
+  var prepareToHydrateHostInstance =
+      hydrationContext.prepareToHydrateHostInstance,
+    prepareToHydrateHostTextInstance =
+      hydrationContext.prepareToHydrateHostTextInstance,
+    popHydrationState = hydrationContext.popHydrationState;
 
-  // Allow injected showErrorDialog() to prevent default console.error logging.
-  // This enables renderers like ReactNative to better manage redbox behavior.
-  if (logError === false) {
-    return;
+  function markUpdate(workInProgress) {
+    // Tag the fiber with an update effect. This turns a Placement into
+    // an UpdateAndPlacement.
+    workInProgress.effectTag |= Update;
   }
 
-  var error = capturedError.error;
-  var suppressLogging = error && error.suppressReactErrorLogging;
-  if (suppressLogging) {
-    return;
+  function markRef(workInProgress) {
+    workInProgress.effectTag |= Ref;
   }
 
-  {
-    var componentName = capturedError.componentName,
-      componentStack = capturedError.componentStack,
-      errorBoundaryName = capturedError.errorBoundaryName,
-      errorBoundaryFound = capturedError.errorBoundaryFound,
-      willRetry = capturedError.willRetry;
-
-    var componentNameMessage = componentName
-      ? "The above error occurred in the <" + componentName + "> component:"
-      : "The above error occurred in one of your React components:";
-
-    var errorBoundaryMessage = void 0;
-    // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
-    if (errorBoundaryFound && errorBoundaryName) {
-      if (willRetry) {
-        errorBoundaryMessage =
-          "React will try to recreate this component tree from scratch " +
-          ("using the error boundary you provided, " + errorBoundaryName + ".");
-      } else {
-        errorBoundaryMessage =
-          "This error was initially handled by the error boundary " +
-          errorBoundaryName +
-          ".\n" +
-          "Recreating the tree from scratch failed so React will unmount the tree.";
+  function appendAllReturns(returns, workInProgress) {
+    var node = workInProgress.stateNode;
+    if (node) {
+      node["return"] = workInProgress;
+    }
+    while (node !== null) {
+      if (
+        node.tag === HostComponent ||
+        node.tag === HostText ||
+        node.tag === HostPortal
+      ) {
+        invariant(false, "A call cannot have host component children.");
+      } else if (node.tag === ReturnComponent) {
+        returns.push(node.pendingProps.value);
+      } else if (node.child !== null) {
+        node.child["return"] = node;
+        node = node.child;
+        continue;
       }
-    } else {
-      errorBoundaryMessage =
-        "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
-        "Visit https://fb.me/react-error-boundaries to learn more about error boundaries.";
+      while (node.sibling === null) {
+        if (node["return"] === null || node["return"] === workInProgress) {
+          return;
+        }
+        node = node["return"];
+      }
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
     }
-    var combinedMessage =
-      "" +
-      componentNameMessage +
-      componentStack +
-      "\n\n" +
-      ("" + errorBoundaryMessage);
-
-    // In development, we provide our own message with just the component stack.
-    // We don't include the original error message and JS stack because the browser
-    // has already printed it. Even if the application swallows the error, it is still
-    // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
-    console.error(combinedMessage);
   }
-}
 
-var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
-var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
-var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
-
-var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
-{
-  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
-}
-
-function logError(boundary, errorInfo) {
-  var source = errorInfo.source;
-  var stack = errorInfo.stack;
-  if (stack === null) {
-    stack = getStackAddendumByWorkInProgressFiber(source);
-  }
+  function moveCallToHandlerPhase(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    var props = workInProgress.memoizedProps;
+    invariant(
+      props,
+      "Should be resolved by now. This error is likely caused by a bug in " +
+        "React. Please file an issue."
+    );
 
-  var capturedError = {
-    componentName: source !== null ? getComponentName(source) : null,
-    componentStack: stack !== null ? stack : "",
-    error: errorInfo.value,
-    errorBoundary: null,
-    errorBoundaryName: null,
-    errorBoundaryFound: false,
-    willRetry: false
-  };
+    // First step of the call has completed. Now we need to do the second.
+    // TODO: It would be nice to have a multi stage call represented by a
+    // single component, or at least tail call optimize nested ones. Currently
+    // that requires additional fields that we don't want to add to the fiber.
+    // So this requires nested handlers.
+    // Note: This doesn't mutate the alternate node. I don't think it needs to
+    // since this stage is reset for every pass.
+    workInProgress.tag = CallHandlerPhase;
 
-  if (boundary !== null && boundary.tag === ClassComponent) {
-    capturedError.errorBoundary = boundary.stateNode;
-    capturedError.errorBoundaryName = getComponentName(boundary);
-    capturedError.errorBoundaryFound = true;
-    capturedError.willRetry = true;
-  }
+    // Build up the returns.
+    // TODO: Compare this to a generator or opaque helpers like Children.
+    var returns = [];
+    appendAllReturns(returns, workInProgress);
+    var fn = props.handler;
+    var childProps = props.props;
+    var nextChildren = fn(childProps, returns);
 
-  try {
-    logCapturedError(capturedError);
-  } catch (e) {
-    // Prevent cycle if logCapturedError() throws.
-    // A cycle may still occur if logCapturedError renders a component that throws.
-    var suppressLogging = e && e.suppressReactErrorLogging;
-    if (!suppressLogging) {
-      console.error(e);
-    }
+    var currentFirstChild = current !== null ? current.child : null;
+    workInProgress.child = reconcileChildFibers(
+      workInProgress,
+      currentFirstChild,
+      nextChildren,
+      renderExpirationTime
+    );
+    return workInProgress.child;
   }
-}
-
-var ReactFiberCommitWork = function(
-  config,
-  captureError,
-  scheduleWork,
-  computeExpirationForFiber,
-  markLegacyErrorBoundaryAsFailed,
-  recalculateCurrentTime
-) {
-  var getPublicInstance = config.getPublicInstance,
-    mutation = config.mutation,
-    persistence = config.persistence;
-
-  var callComponentWillUnmountWithTimer = function(current, instance) {
-    startPhaseTimer(current, "componentWillUnmount");
-    instance.props = current.memoizedProps;
-    instance.state = current.memoizedState;
-    instance.componentWillUnmount();
-    stopPhaseTimer();
-  };
 
-  // Capture errors so they don't interrupt unmounting.
-  function safelyCallComponentWillUnmount(current, instance) {
-    {
-      invokeGuardedCallback$3(
-        null,
-        callComponentWillUnmountWithTimer,
-        null,
-        current,
-        instance
-      );
-      if (hasCaughtError$1()) {
-        var unmountError = clearCaughtError$1();
-        captureError(current, unmountError);
+  function appendAllChildren(parent, workInProgress) {
+    // We only have the top Fiber that was created but we need recurse down its
+    // children to find all the terminal nodes.
+    var node = workInProgress.child;
+    while (node !== null) {
+      if (node.tag === HostComponent || node.tag === HostText) {
+        appendInitialChild(parent, node.stateNode);
+      } else if (node.tag === HostPortal) {
+        // If we have a portal child, then we don't want to traverse
+        // down its children. Instead, we'll get insertions from each child in
+        // the portal directly.
+      } else if (node.child !== null) {
+        node.child["return"] = node;
+        node = node.child;
+        continue;
+      }
+      if (node === workInProgress) {
+        return;
+      }
+      while (node.sibling === null) {
+        if (node["return"] === null || node["return"] === workInProgress) {
+          return;
+        }
+        node = node["return"];
       }
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
     }
   }
 
-  function safelyDetachRef(current) {
-    var ref = current.ref;
-    if (ref !== null) {
-      if (typeof ref === "function") {
-        {
-          invokeGuardedCallback$3(null, ref, null, null);
-          if (hasCaughtError$1()) {
-            var refError = clearCaughtError$1();
-            captureError(current, refError);
-          }
+  var updateHostContainer = void 0;
+  var updateHostComponent = void 0;
+  var updateHostText = void 0;
+  if (mutation) {
+    if (enableMutatingReconciler) {
+      // Mutation mode
+      updateHostContainer = function(workInProgress) {
+        // Noop
+      };
+      updateHostComponent = function(
+        current,
+        workInProgress,
+        updatePayload,
+        type,
+        oldProps,
+        newProps,
+        rootContainerInstance,
+        currentHostContext
+      ) {
+        // TODO: Type this specific to this type of component.
+        workInProgress.updateQueue = updatePayload;
+        // If the update payload indicates that there is a change or if there
+        // is a new ref we mark this as an update. All the work is done in commitWork.
+        if (updatePayload) {
+          markUpdate(workInProgress);
         }
-      } else {
-        ref.current = null;
-      }
+      };
+      updateHostText = function(current, workInProgress, oldText, newText) {
+        // If the text differs, mark it as an update. All the work in done in commitWork.
+        if (oldText !== newText) {
+          markUpdate(workInProgress);
+        }
+      };
+    } else {
+      invariant(false, "Mutating reconciler is disabled.");
     }
-  }
+  } else if (persistence) {
+    if (enablePersistentReconciler) {
+      // Persistent host tree mode
+      var cloneInstance = persistence.cloneInstance,
+        createContainerChildSet = persistence.createContainerChildSet,
+        appendChildToContainerChildSet =
+          persistence.appendChildToContainerChildSet,
+        finalizeContainerChildren = persistence.finalizeContainerChildren;
 
-  function commitBeforeMutationLifeCycles(current, finishedWork) {
-    switch (finishedWork.tag) {
-      case ClassComponent: {
-        if (finishedWork.effectTag & Snapshot) {
-          if (current !== null) {
-            var prevProps = current.memoizedProps;
-            var prevState = current.memoizedState;
-            startPhaseTimer(finishedWork, "getSnapshotBeforeUpdate");
-            var _instance = finishedWork.stateNode;
-            _instance.props = finishedWork.memoizedProps;
-            _instance.state = finishedWork.memoizedState;
-            var snapshot = _instance.getSnapshotBeforeUpdate(
-              prevProps,
-              prevState
-            );
-            {
-              var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
-              if (
-                snapshot === undefined &&
-                !didWarnSet.has(finishedWork.type)
-              ) {
-                didWarnSet.add(finishedWork.type);
-                warning(
-                  false,
-                  "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
-                    "must be returned. You have returned undefined.",
-                  getComponentName(finishedWork)
-                );
-              }
+      // An unfortunate fork of appendAllChildren because we have two different parent types.
+
+      var appendAllChildrenToContainer = function(
+        containerChildSet,
+        workInProgress
+      ) {
+        // We only have the top Fiber that was created but we need recurse down its
+        // children to find all the terminal nodes.
+        var node = workInProgress.child;
+        while (node !== null) {
+          if (node.tag === HostComponent || node.tag === HostText) {
+            appendChildToContainerChildSet(containerChildSet, node.stateNode);
+          } else if (node.tag === HostPortal) {
+            // If we have a portal child, then we don't want to traverse
+            // down its children. Instead, we'll get insertions from each child in
+            // the portal directly.
+          } else if (node.child !== null) {
+            node.child["return"] = node;
+            node = node.child;
+            continue;
+          }
+          if (node === workInProgress) {
+            return;
+          }
+          while (node.sibling === null) {
+            if (node["return"] === null || node["return"] === workInProgress) {
+              return;
             }
-            _instance.__reactInternalSnapshotBeforeUpdate = snapshot;
-            stopPhaseTimer();
+            node = node["return"];
+          }
+          node.sibling["return"] = node["return"];
+          node = node.sibling;
+        }
+      };
+      updateHostContainer = function(workInProgress) {
+        var portalOrRoot = workInProgress.stateNode;
+        var childrenUnchanged = workInProgress.firstEffect === null;
+        if (childrenUnchanged) {
+          // No changes, just reuse the existing instance.
+        } else {
+          var container = portalOrRoot.containerInfo;
+          var newChildSet = createContainerChildSet(container);
+          // If children might have changed, we have to add them all to the set.
+          appendAllChildrenToContainer(newChildSet, workInProgress);
+          portalOrRoot.pendingChildren = newChildSet;
+          // Schedule an update on the container to swap out the container.
+          markUpdate(workInProgress);
+          finalizeContainerChildren(container, newChildSet);
+        }
+      };
+      updateHostComponent = function(
+        current,
+        workInProgress,
+        updatePayload,
+        type,
+        oldProps,
+        newProps,
+        rootContainerInstance,
+        currentHostContext
+      ) {
+        // If there are no effects associated with this node, then none of our children had any updates.
+        // This guarantees that we can reuse all of them.
+        var childrenUnchanged = workInProgress.firstEffect === null;
+        var currentInstance = current.stateNode;
+        if (childrenUnchanged && updatePayload === null) {
+          // No changes, just reuse the existing instance.
+          // Note that this might release a previous clone.
+          workInProgress.stateNode = currentInstance;
+        } else {
+          var recyclableInstance = workInProgress.stateNode;
+          var newInstance = cloneInstance(
+            currentInstance,
+            updatePayload,
+            type,
+            oldProps,
+            newProps,
+            workInProgress,
+            childrenUnchanged,
+            recyclableInstance
+          );
+          if (
+            finalizeInitialChildren(
+              newInstance,
+              type,
+              newProps,
+              rootContainerInstance,
+              currentHostContext
+            )
+          ) {
+            markUpdate(workInProgress);
+          }
+          workInProgress.stateNode = newInstance;
+          if (childrenUnchanged) {
+            // If there are no other effects in this tree, we need to flag this node as having one.
+            // Even though we're not going to use it for anything.
+            // Otherwise parents won't know that there are new children to propagate upwards.
+            markUpdate(workInProgress);
+          } else {
+            // If children might have changed, we have to add them all to the set.
+            appendAllChildren(newInstance, workInProgress);
           }
         }
-        return;
-      }
-      case HostRoot:
-      case HostComponent:
-      case HostText:
-      case HostPortal:
-        // Nothing to do for these component types
-        return;
-      default: {
-        invariant(
-          false,
-          "This unit of work tag should not have side-effects. This error is " +
-            "likely caused by a bug in React. Please file an issue."
-        );
-      }
+      };
+      updateHostText = function(current, workInProgress, oldText, newText) {
+        if (oldText !== newText) {
+          // If the text content differs, we'll create a new text instance for it.
+          var rootContainerInstance = getRootHostContainer();
+          var currentHostContext = getHostContext();
+          workInProgress.stateNode = createTextInstance(
+            newText,
+            rootContainerInstance,
+            currentHostContext,
+            workInProgress
+          );
+          // We'll have to mark it as having an effect, even though we won't use the effect for anything.
+          // This lets the parents know that at least one of their children has changed.
+          markUpdate(workInProgress);
+        }
+      };
+    } else {
+      invariant(false, "Persistent reconciler is disabled.");
+    }
+  } else {
+    if (enableNoopReconciler) {
+      // No host operations
+      updateHostContainer = function(workInProgress) {
+        // Noop
+      };
+      updateHostComponent = function(
+        current,
+        workInProgress,
+        updatePayload,
+        type,
+        oldProps,
+        newProps,
+        rootContainerInstance,
+        currentHostContext
+      ) {
+        // Noop
+      };
+      updateHostText = function(current, workInProgress, oldText, newText) {
+        // Noop
+      };
+    } else {
+      invariant(false, "Noop reconciler is disabled.");
     }
   }
 
-  function commitLifeCycles(
-    finishedRoot,
-    current,
-    finishedWork,
-    currentTime,
-    committedExpirationTime
-  ) {
-    switch (finishedWork.tag) {
+  function completeWork(current, workInProgress, renderExpirationTime) {
+    var newProps = workInProgress.pendingProps;
+    switch (workInProgress.tag) {
+      case FunctionalComponent:
+        return null;
       case ClassComponent: {
-        var _instance2 = finishedWork.stateNode;
-        if (finishedWork.effectTag & Update) {
-          if (current === null) {
-            startPhaseTimer(finishedWork, "componentDidMount");
-            _instance2.props = finishedWork.memoizedProps;
-            _instance2.state = finishedWork.memoizedState;
-            _instance2.componentDidMount();
-            stopPhaseTimer();
+        // We are leaving this subtree, so pop context if any.
+        popContextProvider(workInProgress);
+
+        // If this component caught an error, schedule an error log effect.
+        var instance = workInProgress.stateNode;
+        var updateQueue = workInProgress.updateQueue;
+        if (updateQueue !== null && updateQueue.capturedValues !== null) {
+          workInProgress.effectTag &= ~DidCapture;
+          if (typeof instance.componentDidCatch === "function") {
+            workInProgress.effectTag |= ErrLog;
           } else {
-            var prevProps = current.memoizedProps;
-            var prevState = current.memoizedState;
-            startPhaseTimer(finishedWork, "componentDidUpdate");
-            _instance2.props = finishedWork.memoizedProps;
-            _instance2.state = finishedWork.memoizedState;
-            _instance2.componentDidUpdate(
-              prevProps,
-              prevState,
-              _instance2.__reactInternalSnapshotBeforeUpdate
-            );
-            stopPhaseTimer();
+            // Normally we clear this in the commit phase, but since we did not
+            // schedule an effect, we need to reset it here.
+            updateQueue.capturedValues = null;
           }
         }
-        var updateQueue = finishedWork.updateQueue;
-        if (updateQueue !== null) {
-          commitCallbacks(updateQueue, _instance2);
-        }
-        return;
+        return null;
       }
       case HostRoot: {
-        var _updateQueue = finishedWork.updateQueue;
-        if (_updateQueue !== null) {
-          var _instance3 = null;
-          if (finishedWork.child !== null) {
-            switch (finishedWork.child.tag) {
-              case HostComponent:
-                _instance3 = getPublicInstance(finishedWork.child.stateNode);
-                break;
-              case ClassComponent:
-                _instance3 = finishedWork.child.stateNode;
-                break;
-            }
-          }
-          commitCallbacks(_updateQueue, _instance3);
+        popHostContainer(workInProgress);
+        popTopLevelContextObject(workInProgress);
+        var fiberRoot = workInProgress.stateNode;
+        if (fiberRoot.pendingContext) {
+          fiberRoot.context = fiberRoot.pendingContext;
+          fiberRoot.pendingContext = null;
         }
-        return;
-      }
-      case HostComponent: {
-        var _instance4 = finishedWork.stateNode;
-
-        // Renderers may schedule work to be done after host components are mounted
-        // (eg DOM renderer may schedule auto-focus for inputs and form controls).
-        // These effects should only be committed when components are first mounted,
-        // aka when there is no current/alternate.
-        if (current === null && finishedWork.effectTag & Update) {
-          var type = finishedWork.type;
-          var props = finishedWork.memoizedProps;
-          commitMount(_instance4, type, props, finishedWork);
+        if (current === null || current.child === null) {
+          // If we hydrated, pop so that we can delete any remaining children
+          // that weren't hydrated.
+          popHydrationState(workInProgress);
+          // This resets the hacky state to fix isMounted before committing.
+          // TODO: Delete this when we delete isMounted and findDOMNode.
+          workInProgress.effectTag &= ~Placement;
         }
+        updateHostContainer(workInProgress);
 
-        return;
-      }
-      case HostText: {
-        // We have no life-cycles associated with text.
-        return;
-      }
-      case HostPortal: {
-        // We have no life-cycles associated with portals.
-        return;
-      }
-      default: {
-        invariant(
-          false,
-          "This unit of work tag should not have side-effects. This error is " +
-            "likely caused by a bug in React. Please file an issue."
-        );
+        var _updateQueue = workInProgress.updateQueue;
+        if (_updateQueue !== null && _updateQueue.capturedValues !== null) {
+          workInProgress.effectTag |= ErrLog;
+        }
+        return null;
       }
-    }
-  }
+      case HostComponent: {
+        popHostContext(workInProgress);
+        var rootContainerInstance = getRootHostContainer();
+        var type = workInProgress.type;
+        if (current !== null && workInProgress.stateNode != null) {
+          // If we have an alternate, that means this is an update and we need to
+          // schedule a side-effect to do the updates.
+          var oldProps = current.memoizedProps;
+          // If we get updated because one of our children updated, we don't
+          // have newProps so we'll have to reuse them.
+          // TODO: Split the update API as separate for the props vs. children.
+          // Even better would be if children weren't special cased at all tho.
+          var _instance = workInProgress.stateNode;
+          var currentHostContext = getHostContext();
+          // TODO: Experiencing an error where oldProps is null. Suggests a host
+          // component is hitting the resume path. Figure out why. Possibly
+          // related to `hidden`.
+          var updatePayload = prepareUpdate(
+            _instance,
+            type,
+            oldProps,
+            newProps,
+            rootContainerInstance,
+            currentHostContext
+          );
 
-  function commitErrorLogging(finishedWork, onUncaughtError) {
-    switch (finishedWork.tag) {
-      case ClassComponent:
-        {
-          var ctor = finishedWork.type;
-          var _instance5 = finishedWork.stateNode;
-          var updateQueue = finishedWork.updateQueue;
-          invariant(
-            updateQueue !== null && updateQueue.capturedValues !== null,
-            "An error logging effect should not have been scheduled if no errors " +
-              "were captured. This error is likely caused by a bug in React. " +
-              "Please file an issue."
+          updateHostComponent(
+            current,
+            workInProgress,
+            updatePayload,
+            type,
+            oldProps,
+            newProps,
+            rootContainerInstance,
+            currentHostContext
           );
-          var capturedErrors = updateQueue.capturedValues;
-          updateQueue.capturedValues = null;
 
-          if (typeof ctor.getDerivedStateFromCatch !== "function") {
-            // To preserve the preexisting retry behavior of error boundaries,
-            // we keep track of which ones already failed during this batch.
-            // This gets reset before we yield back to the browser.
-            // TODO: Warn in strict mode if getDerivedStateFromCatch is
-            // not defined.
-            markLegacyErrorBoundaryAsFailed(_instance5);
+          if (current.ref !== workInProgress.ref) {
+            markRef(workInProgress);
+          }
+        } else {
+          if (!newProps) {
+            invariant(
+              workInProgress.stateNode !== null,
+              "We must have new props for new mounts. This error is likely " +
+                "caused by a bug in React. Please file an issue."
+            );
+            // This can happen when we abort work.
+            return null;
+          }
+
+          var _currentHostContext = getHostContext();
+          // TODO: Move createInstance to beginWork and keep it on a context
+          // "stack" as the parent. Then append children as we go in beginWork
+          // or completeWork depending on we want to add then top->down or
+          // bottom->up. Top->down is faster in IE11.
+          var wasHydrated = popHydrationState(workInProgress);
+          if (wasHydrated) {
+            // TODO: Move this and createInstance step into the beginPhase
+            // to consolidate.
+            if (
+              prepareToHydrateHostInstance(
+                workInProgress,
+                rootContainerInstance,
+                _currentHostContext
+              )
+            ) {
+              // If changes to the hydrated node needs to be applied at the
+              // commit-phase we mark this as such.
+              markUpdate(workInProgress);
+            }
+          } else {
+            var _instance2 = createInstance(
+              type,
+              newProps,
+              rootContainerInstance,
+              _currentHostContext,
+              workInProgress
+            );
+
+            appendAllChildren(_instance2, workInProgress);
+
+            // Certain renderers require commit-time effects for initial mount.
+            // (eg DOM renderer supports auto-focus for certain elements).
+            // Make sure such renderers get scheduled for later work.
+            if (
+              finalizeInitialChildren(
+                _instance2,
+                type,
+                newProps,
+                rootContainerInstance,
+                _currentHostContext
+              )
+            ) {
+              markUpdate(workInProgress);
+            }
+            workInProgress.stateNode = _instance2;
           }
 
-          _instance5.props = finishedWork.memoizedProps;
-          _instance5.state = finishedWork.memoizedState;
-          for (var i = 0; i < capturedErrors.length; i++) {
-            var errorInfo = capturedErrors[i];
-            var _error = errorInfo.value;
-            var stack = errorInfo.stack;
-            logError(finishedWork, errorInfo);
-            _instance5.componentDidCatch(_error, {
-              componentStack: stack !== null ? stack : ""
-            });
+          if (workInProgress.ref !== null) {
+            // If there is a ref on a host node we need to schedule a callback
+            markRef(workInProgress);
           }
         }
-        break;
-      case HostRoot: {
-        var _updateQueue2 = finishedWork.updateQueue;
-        invariant(
-          _updateQueue2 !== null && _updateQueue2.capturedValues !== null,
-          "An error logging effect should not have been scheduled if no errors " +
-            "were captured. This error is likely caused by a bug in React. " +
-            "Please file an issue."
-        );
-        var _capturedErrors = _updateQueue2.capturedValues;
-        _updateQueue2.capturedValues = null;
-        for (var _i = 0; _i < _capturedErrors.length; _i++) {
-          var _errorInfo = _capturedErrors[_i];
-          logError(finishedWork, _errorInfo);
-          onUncaughtError(_errorInfo.value);
+        return null;
+      }
+      case HostText: {
+        var newText = newProps;
+        if (current && workInProgress.stateNode != null) {
+          var oldText = current.memoizedProps;
+          // If we have an alternate, that means this is an update and we need
+          // to schedule a side-effect to do the updates.
+          updateHostText(current, workInProgress, oldText, newText);
+        } else {
+          if (typeof newText !== "string") {
+            invariant(
+              workInProgress.stateNode !== null,
+              "We must have new props for new mounts. This error is likely " +
+                "caused by a bug in React. Please file an issue."
+            );
+            // This can happen when we abort work.
+            return null;
+          }
+          var _rootContainerInstance = getRootHostContainer();
+          var _currentHostContext2 = getHostContext();
+          var _wasHydrated = popHydrationState(workInProgress);
+          if (_wasHydrated) {
+            if (prepareToHydrateHostTextInstance(workInProgress)) {
+              markUpdate(workInProgress);
+            }
+          } else {
+            workInProgress.stateNode = createTextInstance(
+              newText,
+              _rootContainerInstance,
+              _currentHostContext2,
+              workInProgress
+            );
+          }
         }
-        break;
+        return null;
       }
+      case CallComponent:
+        return moveCallToHandlerPhase(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case CallHandlerPhase:
+        // Reset the tag to now be a first phase call.
+        workInProgress.tag = CallComponent;
+        return null;
+      case ReturnComponent:
+        // Does nothing.
+        return null;
+      case Fragment:
+        return null;
+      case Mode:
+        return null;
+      case HostPortal:
+        popHostContainer(workInProgress);
+        updateHostContainer(workInProgress);
+        return null;
+      case ContextProvider:
+        // Pop provider fiber
+        popProvider(workInProgress);
+        return null;
+      case ContextConsumer:
+        return null;
+      // Error cases
+      case IndeterminateComponent:
+        invariant(
+          false,
+          "An indeterminate component should have become determinate before " +
+            "completing. This error is likely caused by a bug in React. Please " +
+            "file an issue."
+        );
+      // eslint-disable-next-line no-fallthrough
       default:
         invariant(
           false,
-          "This unit of work tag cannot capture errors.  This error is " +
-            "likely caused by a bug in React. Please file an issue."
+          "Unknown unit of work tag. This error is likely caused by a bug in " +
+            "React. Please file an issue."
         );
     }
   }
 
-  function commitAttachRef(finishedWork) {
-    var ref = finishedWork.ref;
-    if (ref !== null) {
-      var _instance6 = finishedWork.stateNode;
-      var instanceToUse = void 0;
-      switch (finishedWork.tag) {
-        case HostComponent:
-          instanceToUse = getPublicInstance(_instance6);
-          break;
-        default:
-          instanceToUse = _instance6;
-      }
-      if (typeof ref === "function") {
-        ref(instanceToUse);
-      } else {
-        {
-          if (!ref.hasOwnProperty("current")) {
-            warning(
-              false,
-              "Unexpected ref object provided for %s. " +
-                "Use either a ref-setter function or React.createRef().%s",
-              getComponentName(finishedWork),
-              getStackAddendumByWorkInProgressFiber(finishedWork)
-            );
-          }
-        }
+  return {
+    completeWork: completeWork
+  };
+};
 
-        ref.current = instanceToUse;
-      }
-    }
-  }
+function createCapturedValue(value, source) {
+  // If the value is an error, call this function immediately after it is thrown
+  // so the stack is accurate.
+  return {
+    value: value,
+    source: source,
+    stack: getStackAddendumByWorkInProgressFiber(source)
+  };
+}
 
-  function commitDetachRef(current) {
-    var currentRef = current.ref;
-    if (currentRef !== null) {
-      if (typeof currentRef === "function") {
-        currentRef(null);
-      } else {
-        currentRef.current = null;
-      }
-    }
-  }
+var ReactFiberUnwindWork = function(
+  hostContext,
+  scheduleWork,
+  isAlreadyFailedLegacyErrorBoundary
+) {
+  var popHostContainer = hostContext.popHostContainer,
+    popHostContext = hostContext.popHostContext;
 
-  // User-originating errors (lifecycles and refs) should not interrupt
-  // deletion, so don't let them throw. Host-originating errors should
-  // interrupt deletion, so it's okay
-  function commitUnmount(current) {
-    if (typeof onCommitUnmount === "function") {
-      onCommitUnmount(current);
-    }
+  function throwException(returnFiber, sourceFiber, rawValue) {
+    // The source fiber did not complete.
+    sourceFiber.effectTag |= Incomplete;
+    // Its effect list is no longer valid.
+    sourceFiber.firstEffect = sourceFiber.lastEffect = null;
 
-    switch (current.tag) {
-      case ClassComponent: {
-        safelyDetachRef(current);
-        var _instance7 = current.stateNode;
-        if (typeof _instance7.componentWillUnmount === "function") {
-          safelyCallComponentWillUnmount(current, _instance7);
-        }
-        return;
-      }
-      case HostComponent: {
-        safelyDetachRef(current);
-        return;
-      }
-      case CallComponent: {
-        commitNestedUnmounts(current.stateNode);
-        return;
-      }
-      case HostPortal: {
-        // TODO: this is recursive.
-        // We are also not using this parent because
-        // the portal will get pushed immediately.
-        if (enableMutatingReconciler && mutation) {
-          unmountHostComponents(current);
-        } else if (enablePersistentReconciler && persistence) {
-          emptyPortalContainer(current);
+    var value = createCapturedValue(rawValue, sourceFiber);
+
+    var workInProgress = returnFiber;
+    do {
+      switch (workInProgress.tag) {
+        case HostRoot: {
+          // Uncaught error
+          var errorInfo = value;
+          ensureUpdateQueues(workInProgress);
+          var updateQueue = workInProgress.updateQueue;
+          updateQueue.capturedValues = [errorInfo];
+          workInProgress.effectTag |= ShouldCapture;
+          return;
         }
-        return;
+        case ClassComponent:
+          // Capture and retry
+          var ctor = workInProgress.type;
+          var _instance = workInProgress.stateNode;
+          if (
+            (workInProgress.effectTag & DidCapture) === NoEffect &&
+            ((typeof ctor.getDerivedStateFromCatch === "function" &&
+              enableGetDerivedStateFromCatch) ||
+              (_instance !== null &&
+                typeof _instance.componentDidCatch === "function" &&
+                !isAlreadyFailedLegacyErrorBoundary(_instance)))
+          ) {
+            ensureUpdateQueues(workInProgress);
+            var _updateQueue = workInProgress.updateQueue;
+            var capturedValues = _updateQueue.capturedValues;
+            if (capturedValues === null) {
+              _updateQueue.capturedValues = [value];
+            } else {
+              capturedValues.push(value);
+            }
+            workInProgress.effectTag |= ShouldCapture;
+            return;
+          }
+          break;
+        default:
+          break;
       }
-    }
+      workInProgress = workInProgress["return"];
+    } while (workInProgress !== null);
   }
 
-  function commitNestedUnmounts(root) {
-    // While we're inside a removed host node we don't want to call
-    // removeChild on the inner nodes because they're removed by the top
-    // call anyway. We also want to call componentWillUnmount on all
-    // composites before this host node is removed from the tree. Therefore
-    var node = root;
-    while (true) {
-      commitUnmount(node);
-      // Visit children because they may contain more composite or host nodes.
-      // Skip portals because commitUnmount() currently visits them recursively.
-      if (
-        node.child !== null &&
-        // If we use mutation we drill down into portals using commitUnmount above.
-        // If we don't use mutation we drill down into portals here instead.
-        (!mutation || node.tag !== HostPortal)
-      ) {
-        node.child["return"] = node;
-        node = node.child;
-        continue;
-      }
-      if (node === root) {
-        return;
+  function unwindWork(workInProgress) {
+    switch (workInProgress.tag) {
+      case ClassComponent: {
+        popContextProvider(workInProgress);
+        var effectTag = workInProgress.effectTag;
+        if (effectTag & ShouldCapture) {
+          workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
+        }
+        return null;
       }
-      while (node.sibling === null) {
-        if (node["return"] === null || node["return"] === root) {
-          return;
+      case HostRoot: {
+        popHostContainer(workInProgress);
+        popTopLevelContextObject(workInProgress);
+        var _effectTag = workInProgress.effectTag;
+        if (_effectTag & ShouldCapture) {
+          workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
         }
-        node = node["return"];
+        return null;
       }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
+      case HostComponent: {
+        popHostContext(workInProgress);
+        return null;
+      }
+      case HostPortal:
+        popHostContainer(workInProgress);
+        return null;
+      case ContextProvider:
+        popProvider(workInProgress);
+        return null;
+      default:
+        return null;
     }
   }
+  return {
+    throwException: throwException,
+    unwindWork: unwindWork
+  };
+};
 
-  function detachFiber(current) {
-    // Cut off the return pointers to disconnect it from the tree. Ideally, we
-    // should clear the child pointer of the parent alternate to let this
-    // get GC:ed but we don't know which for sure which parent is the current
-    // one so we'll settle for GC:ing the subtree of this child. This child
-    // itself will be GC:ed when the parent updates the next time.
-    current["return"] = null;
-    current.child = null;
-    if (current.alternate) {
-      current.alternate.child = null;
-      current.alternate["return"] = null;
-    }
-  }
+// This module is forked in different environments.
+// By default, return `true` to log errors to the console.
+// Forks can return `false` if this isn't desirable.
+function showErrorDialog(capturedError) {
+  return true;
+}
 
-  var emptyPortalContainer = void 0;
+function logCapturedError(capturedError) {
+  var logError = showErrorDialog(capturedError);
 
-  if (!mutation) {
-    var commitContainer = void 0;
-    if (persistence) {
-      var replaceContainerChildren = persistence.replaceContainerChildren,
-        createContainerChildSet = persistence.createContainerChildSet;
+  // Allow injected showErrorDialog() to prevent default console.error logging.
+  // This enables renderers like ReactNative to better manage redbox behavior.
+  if (logError === false) {
+    return;
+  }
 
-      emptyPortalContainer = function(current) {
-        var portal = current.stateNode;
-        var containerInfo = portal.containerInfo;
+  var error = capturedError.error;
+  var suppressLogging = error && error.suppressReactErrorLogging;
+  if (suppressLogging) {
+    return;
+  }
 
-        var emptyChildSet = createContainerChildSet(containerInfo);
-        replaceContainerChildren(containerInfo, emptyChildSet);
-      };
-      commitContainer = function(finishedWork) {
-        switch (finishedWork.tag) {
-          case ClassComponent: {
-            return;
-          }
-          case HostComponent: {
-            return;
-          }
-          case HostText: {
-            return;
-          }
-          case HostRoot:
-          case HostPortal: {
-            var portalOrRoot = finishedWork.stateNode;
-            var containerInfo = portalOrRoot.containerInfo,
-              _pendingChildren = portalOrRoot.pendingChildren;
+  {
+    var componentName = capturedError.componentName,
+      componentStack = capturedError.componentStack,
+      errorBoundaryName = capturedError.errorBoundaryName,
+      errorBoundaryFound = capturedError.errorBoundaryFound,
+      willRetry = capturedError.willRetry;
 
-            replaceContainerChildren(containerInfo, _pendingChildren);
-            return;
-          }
-          default: {
-            invariant(
-              false,
-              "This unit of work tag should not have side-effects. This error is " +
-                "likely caused by a bug in React. Please file an issue."
-            );
-          }
-        }
-      };
-    } else {
-      commitContainer = function(finishedWork) {
-        // Noop
-      };
-    }
-    if (enablePersistentReconciler || enableNoopReconciler) {
-      return {
-        commitResetTextContent: function(finishedWork) {},
-        commitPlacement: function(finishedWork) {},
-        commitDeletion: function(current) {
-          // Detach refs and call componentWillUnmount() on the whole subtree.
-          commitNestedUnmounts(current);
-          detachFiber(current);
-        },
-        commitWork: function(current, finishedWork) {
-          commitContainer(finishedWork);
-        },
+    var componentNameMessage = componentName
+      ? "The above error occurred in the <" + componentName + "> component:"
+      : "The above error occurred in one of your React components:";
 
-        commitLifeCycles: commitLifeCycles,
-        commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
-        commitErrorLogging: commitErrorLogging,
-        commitAttachRef: commitAttachRef,
-        commitDetachRef: commitDetachRef
-      };
-    } else if (persistence) {
-      invariant(false, "Persistent reconciler is disabled.");
+    var errorBoundaryMessage = void 0;
+    // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
+    if (errorBoundaryFound && errorBoundaryName) {
+      if (willRetry) {
+        errorBoundaryMessage =
+          "React will try to recreate this component tree from scratch " +
+          ("using the error boundary you provided, " + errorBoundaryName + ".");
+      } else {
+        errorBoundaryMessage =
+          "This error was initially handled by the error boundary " +
+          errorBoundaryName +
+          ".\n" +
+          "Recreating the tree from scratch failed so React will unmount the tree.";
+      }
     } else {
-      invariant(false, "Noop reconciler is disabled.");
+      errorBoundaryMessage =
+        "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
+        "Visit https://fb.me/react-error-boundaries to learn more about error boundaries.";
     }
-  }
-  var commitMount = mutation.commitMount,
-    commitUpdate = mutation.commitUpdate,
-    resetTextContent = mutation.resetTextContent,
-    commitTextUpdate = mutation.commitTextUpdate,
-    appendChild = mutation.appendChild,
-    appendChildToContainer = mutation.appendChildToContainer,
-    insertBefore = mutation.insertBefore,
-    insertInContainerBefore = mutation.insertInContainerBefore,
-    removeChild = mutation.removeChild,
-    removeChildFromContainer = mutation.removeChildFromContainer;
+    var combinedMessage =
+      "" +
+      componentNameMessage +
+      componentStack +
+      "\n\n" +
+      ("" + errorBoundaryMessage);
 
-  function getHostParentFiber(fiber) {
-    var parent = fiber["return"];
-    while (parent !== null) {
-      if (isHostParent(parent)) {
-        return parent;
-      }
-      parent = parent["return"];
-    }
-    invariant(
-      false,
-      "Expected to find a host parent. This error is likely caused by a bug " +
-        "in React. Please file an issue."
-    );
+    // In development, we provide our own message with just the component stack.
+    // We don't include the original error message and JS stack because the browser
+    // has already printed it. Even if the application swallows the error, it is still
+    // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+    console.error(combinedMessage);
   }
+}
 
-  function isHostParent(fiber) {
-    return (
-      fiber.tag === HostComponent ||
-      fiber.tag === HostRoot ||
-      fiber.tag === HostPortal
-    );
+var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
+var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
+var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
+
+function logError(boundary, errorInfo) {
+  var source = errorInfo.source;
+  var stack = errorInfo.stack;
+  if (stack === null) {
+    stack = getStackAddendumByWorkInProgressFiber(source);
   }
 
-  function getHostSibling(fiber) {
-    // We're going to search forward into the tree until we find a sibling host
-    // node. Unfortunately, if multiple insertions are done in a row we have to
-    // search past them. This leads to exponential search for the next sibling.
-    var node = fiber;
-    siblings: while (true) {
-      // If we didn't find anything, let's try the next sibling.
-      while (node.sibling === null) {
-        if (node["return"] === null || isHostParent(node["return"])) {
-          // If we pop out of the root or hit the parent the fiber we are the
-          // last sibling.
-          return null;
-        }
-        node = node["return"];
-      }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
-      while (node.tag !== HostComponent && node.tag !== HostText) {
-        // If it is not host node and, we might have a host node inside it.
-        // Try to search down until we find one.
-        if (node.effectTag & Placement) {
-          // If we don't have a child, try the siblings instead.
-          continue siblings;
-        }
-        // If we don't have a child, try the siblings instead.
-        // We also skip portals because they are not part of this host tree.
-        if (node.child === null || node.tag === HostPortal) {
-          continue siblings;
-        } else {
-          node.child["return"] = node;
-          node = node.child;
-        }
-      }
-      // Check if this host node is stable or about to be placed.
-      if (!(node.effectTag & Placement)) {
-        // Found it!
-        return node.stateNode;
-      }
-    }
+  var capturedError = {
+    componentName: source !== null ? getComponentName(source) : null,
+    error: errorInfo.value,
+    errorBoundary: boundary,
+    componentStack: stack !== null ? stack : "",
+    errorBoundaryName: null,
+    errorBoundaryFound: false,
+    willRetry: false
+  };
+
+  if (boundary !== null) {
+    capturedError.errorBoundaryName = getComponentName(boundary);
+    capturedError.errorBoundaryFound = capturedError.willRetry =
+      boundary.tag === ClassComponent;
+  } else {
+    capturedError.errorBoundaryName = null;
+    capturedError.errorBoundaryFound = capturedError.willRetry = false;
   }
 
-  function commitPlacement(finishedWork) {
-    // Recursively insert all host nodes into the parent.
-    var parentFiber = getHostParentFiber(finishedWork);
-    var parent = void 0;
-    var isContainer = void 0;
-    switch (parentFiber.tag) {
-      case HostComponent:
-        parent = parentFiber.stateNode;
-        isContainer = false;
-        break;
-      case HostRoot:
-        parent = parentFiber.stateNode.containerInfo;
-        isContainer = true;
-        break;
-      case HostPortal:
-        parent = parentFiber.stateNode.containerInfo;
-        isContainer = true;
-        break;
-      default:
-        invariant(
-          false,
-          "Invalid host parent fiber. This error is likely caused by a bug " +
-            "in React. Please file an issue."
-        );
-    }
-    if (parentFiber.effectTag & ContentReset) {
-      // Reset the text content of the parent before doing any insertions
-      resetTextContent(parent);
-      // Clear ContentReset from the effect tag
-      parentFiber.effectTag &= ~ContentReset;
-    }
-
-    var before = getHostSibling(finishedWork);
-    // We only have the top Fiber that was inserted but we need recurse down its
-    // children to find all the terminal nodes.
-    var node = finishedWork;
-    while (true) {
-      if (node.tag === HostComponent || node.tag === HostText) {
-        if (before) {
-          if (isContainer) {
-            insertInContainerBefore(parent, node.stateNode, before);
-          } else {
-            insertBefore(parent, node.stateNode, before);
-          }
-        } else {
-          if (isContainer) {
-            appendChildToContainer(parent, node.stateNode);
-          } else {
-            appendChild(parent, node.stateNode);
-          }
-        }
-      } else if (node.tag === HostPortal) {
-        // If the insertion itself is a portal, then we don't want to traverse
-        // down its children. Instead, we'll get insertions from each child in
-        // the portal directly.
-      } else if (node.child !== null) {
-        node.child["return"] = node;
-        node = node.child;
-        continue;
-      }
-      if (node === finishedWork) {
-        return;
-      }
-      while (node.sibling === null) {
-        if (node["return"] === null || node["return"] === finishedWork) {
-          return;
-        }
-        node = node["return"];
-      }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
+  try {
+    logCapturedError(capturedError);
+  } catch (e) {
+    // Prevent cycle if logCapturedError() throws.
+    // A cycle may still occur if logCapturedError renders a component that throws.
+    var suppressLogging = e && e.suppressReactErrorLogging;
+    if (!suppressLogging) {
+      console.error(e);
     }
   }
+}
 
-  function unmountHostComponents(current) {
-    // We only have the top Fiber that was inserted but we need recurse down its
-    var node = current;
+var ReactFiberCommitWork = function(
+  config,
+  captureError,
+  scheduleWork,
+  computeExpirationForFiber,
+  markLegacyErrorBoundaryAsFailed,
+  recalculateCurrentTime
+) {
+  var getPublicInstance = config.getPublicInstance,
+    mutation = config.mutation,
+    persistence = config.persistence;
 
-    // Each iteration, currentParent is populated with node's host parent if not
-    // currentParentIsValid.
-    var currentParentIsValid = false;
-    var currentParent = void 0;
-    var currentParentIsContainer = void 0;
+  var callComponentWillUnmountWithTimer = function(current, instance) {
+    startPhaseTimer(current, "componentWillUnmount");
+    instance.props = current.memoizedProps;
+    instance.state = current.memoizedState;
+    instance.componentWillUnmount();
+    stopPhaseTimer();
+  };
 
-    while (true) {
-      if (!currentParentIsValid) {
-        var parent = node["return"];
-        findParent: while (true) {
-          invariant(
-            parent !== null,
-            "Expected to find a host parent. This error is likely caused by " +
-              "a bug in React. Please file an issue."
-          );
-          switch (parent.tag) {
-            case HostComponent:
-              currentParent = parent.stateNode;
-              currentParentIsContainer = false;
-              break findParent;
-            case HostRoot:
-              currentParent = parent.stateNode.containerInfo;
-              currentParentIsContainer = true;
-              break findParent;
-            case HostPortal:
-              currentParent = parent.stateNode.containerInfo;
-              currentParentIsContainer = true;
-              break findParent;
-          }
-          parent = parent["return"];
-        }
-        currentParentIsValid = true;
+  // Capture errors so they don't interrupt unmounting.
+  function safelyCallComponentWillUnmount(current, instance) {
+    {
+      invokeGuardedCallback$3(
+        null,
+        callComponentWillUnmountWithTimer,
+        null,
+        current,
+        instance
+      );
+      if (hasCaughtError$1()) {
+        var unmountError = clearCaughtError$1();
+        captureError(current, unmountError);
       }
+    }
+  }
 
-      if (node.tag === HostComponent || node.tag === HostText) {
-        commitNestedUnmounts(node);
-        // After all the children have unmounted, it is now safe to remove the
-        // node from the tree.
-        if (currentParentIsContainer) {
-          removeChildFromContainer(currentParent, node.stateNode);
-        } else {
-          removeChild(currentParent, node.stateNode);
-        }
-        // Don't visit children because we already visited them.
-      } else if (node.tag === HostPortal) {
-        // When we go into a portal, it becomes the parent to remove from.
-        // We will reassign it back when we pop the portal on the way up.
-        currentParent = node.stateNode.containerInfo;
-        // Visit children because portals might contain host components.
-        if (node.child !== null) {
-          node.child["return"] = node;
-          node = node.child;
-          continue;
+  function safelyDetachRef(current) {
+    var ref = current.ref;
+    if (ref !== null) {
+      if (typeof ref === "function") {
+        {
+          invokeGuardedCallback$3(null, ref, null, null);
+          if (hasCaughtError$1()) {
+            var refError = clearCaughtError$1();
+            captureError(current, refError);
+          }
         }
       } else {
-        commitUnmount(node);
-        // Visit children because we may find more host components below.
-        if (node.child !== null) {
-          node.child["return"] = node;
-          node = node.child;
-          continue;
-        }
-      }
-      if (node === current) {
-        return;
-      }
-      while (node.sibling === null) {
-        if (node["return"] === null || node["return"] === current) {
-          return;
-        }
-        node = node["return"];
-        if (node.tag === HostPortal) {
-          // When we go out of the portal, we need to restore the parent.
-          // Since we don't keep a stack of them, we will search for it.
-          currentParentIsValid = false;
-        }
+        ref.value = null;
       }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
     }
   }
 
-  function commitDeletion(current) {
-    // Recursively delete all host nodes from the parent.
-    // Detach refs and call componentWillUnmount() on the whole subtree.
-    unmountHostComponents(current);
-    detachFiber(current);
-  }
-
-  function commitWork(current, finishedWork) {
+  function commitLifeCycles(
+    finishedRoot,
+    current,
+    finishedWork,
+    currentTime,
+    committedExpirationTime
+  ) {
     switch (finishedWork.tag) {
       case ClassComponent: {
+        var _instance = finishedWork.stateNode;
+        if (finishedWork.effectTag & Update) {
+          if (current === null) {
+            startPhaseTimer(finishedWork, "componentDidMount");
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            _instance.componentDidMount();
+            stopPhaseTimer();
+          } else {
+            var prevProps = current.memoizedProps;
+            var prevState = current.memoizedState;
+            startPhaseTimer(finishedWork, "componentDidUpdate");
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            _instance.componentDidUpdate(prevProps, prevState);
+            stopPhaseTimer();
+          }
+        }
+        var updateQueue = finishedWork.updateQueue;
+        if (updateQueue !== null) {
+          commitCallbacks(updateQueue, _instance);
+        }
         return;
       }
-      case HostComponent: {
-        var _instance8 = finishedWork.stateNode;
-        if (_instance8 != null) {
-          // Commit the work prepared earlier.
-          var newProps = finishedWork.memoizedProps;
-          // For hydration we reuse the update path but we treat the oldProps
-          // as the newProps. The updatePayload will contain the real change in
-          // this case.
-          var oldProps = current !== null ? current.memoizedProps : newProps;
-          var type = finishedWork.type;
-          // TODO: Type the updateQueue to be specific to host components.
-          var updatePayload = finishedWork.updateQueue;
-          finishedWork.updateQueue = null;
-          if (updatePayload !== null) {
-            commitUpdate(
-              _instance8,
-              updatePayload,
-              type,
-              oldProps,
-              newProps,
-              finishedWork
-            );
+      case HostRoot: {
+        var _updateQueue = finishedWork.updateQueue;
+        if (_updateQueue !== null) {
+          var _instance2 = null;
+          if (finishedWork.child !== null) {
+            switch (finishedWork.child.tag) {
+              case HostComponent:
+                _instance2 = getPublicInstance(finishedWork.child.stateNode);
+                break;
+              case ClassComponent:
+                _instance2 = finishedWork.child.stateNode;
+                break;
+            }
           }
+          commitCallbacks(_updateQueue, _instance2);
+        }
+        return;
+      }
+      case HostComponent: {
+        var _instance3 = finishedWork.stateNode;
+
+        // Renderers may schedule work to be done after host components are mounted
+        // (eg DOM renderer may schedule auto-focus for inputs and form controls).
+        // These effects should only be committed when components are first mounted,
+        // aka when there is no current/alternate.
+        if (current === null && finishedWork.effectTag & Update) {
+          var type = finishedWork.type;
+          var props = finishedWork.memoizedProps;
+          commitMount(_instance3, type, props, finishedWork);
         }
+
         return;
       }
       case HostText: {
-        invariant(
-          finishedWork.stateNode !== null,
-          "This should have a text node initialized. This error is likely " +
-            "caused by a bug in React. Please file an issue."
-        );
-        var textInstance = finishedWork.stateNode;
-        var newText = finishedWork.memoizedProps;
-        // For hydration we reuse the update path but we treat the oldProps
-        // as the newProps. The updatePayload will contain the real change in
-        // this case.
-        var oldText = current !== null ? current.memoizedProps : newText;
-        commitTextUpdate(textInstance, oldText, newText);
+        // We have no life-cycles associated with text.
         return;
       }
-      case HostRoot: {
+      case HostPortal: {
+        // We have no life-cycles associated with portals.
         return;
       }
       default: {
@@ -10974,911 +10366,1036 @@ var ReactFiberCommitWork = function(
     }
   }
 
-  function commitResetTextContent(current) {
-    resetTextContent(current.stateNode);
-  }
-
-  if (enableMutatingReconciler) {
-    return {
-      commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
-      commitResetTextContent: commitResetTextContent,
-      commitPlacement: commitPlacement,
-      commitDeletion: commitDeletion,
-      commitWork: commitWork,
-      commitLifeCycles: commitLifeCycles,
-      commitErrorLogging: commitErrorLogging,
-      commitAttachRef: commitAttachRef,
-      commitDetachRef: commitDetachRef
-    };
-  } else {
-    invariant(false, "Mutating reconciler is disabled.");
-  }
-};
-
-var NO_CONTEXT = {};
-
-var ReactFiberHostContext = function(config, stack) {
-  var getChildHostContext = config.getChildHostContext,
-    getRootHostContext = config.getRootHostContext;
-  var createCursor = stack.createCursor,
-    push = stack.push,
-    pop = stack.pop;
-
-  var contextStackCursor = createCursor(NO_CONTEXT);
-  var contextFiberStackCursor = createCursor(NO_CONTEXT);
-  var rootInstanceStackCursor = createCursor(NO_CONTEXT);
-
-  function requiredContext(c) {
-    invariant(
-      c !== NO_CONTEXT,
-      "Expected host context to exist. This error is likely caused by a bug " +
-        "in React. Please file an issue."
-    );
-    return c;
-  }
-
-  function getRootHostContainer() {
-    var rootInstance = requiredContext(rootInstanceStackCursor.current);
-    return rootInstance;
-  }
-
-  function pushHostContainer(fiber, nextRootInstance) {
-    // Push current root instance onto the stack;
-    // This allows us to reset root when portals are popped.
-    push(rootInstanceStackCursor, nextRootInstance, fiber);
-    // Track the context and the Fiber that provided it.
-    // This enables us to pop only Fibers that provide unique contexts.
-    push(contextFiberStackCursor, fiber, fiber);
-
-    // Finally, we need to push the host context to the stack.
-    // However, we can't just call getRootHostContext() and push it because
-    // we'd have a different number of entries on the stack depending on
-    // whether getRootHostContext() throws somewhere in renderer code or not.
-    // So we push an empty value first. This lets us safely unwind on errors.
-    push(contextStackCursor, NO_CONTEXT, fiber);
-    var nextRootContext = getRootHostContext(nextRootInstance);
-    // Now that we know this function doesn't throw, replace it.
-    pop(contextStackCursor, fiber);
-    push(contextStackCursor, nextRootContext, fiber);
-  }
-
-  function popHostContainer(fiber) {
-    pop(contextStackCursor, fiber);
-    pop(contextFiberStackCursor, fiber);
-    pop(rootInstanceStackCursor, fiber);
-  }
-
-  function getHostContext() {
-    var context = requiredContext(contextStackCursor.current);
-    return context;
-  }
-
-  function pushHostContext(fiber) {
-    var rootInstance = requiredContext(rootInstanceStackCursor.current);
-    var context = requiredContext(contextStackCursor.current);
-    var nextContext = getChildHostContext(context, fiber.type, rootInstance);
-
-    // Don't push this Fiber's context unless it's unique.
-    if (context === nextContext) {
-      return;
-    }
-
-    // Track the context and the Fiber that provided it.
-    // This enables us to pop only Fibers that provide unique contexts.
-    push(contextFiberStackCursor, fiber, fiber);
-    push(contextStackCursor, nextContext, fiber);
-  }
-
-  function popHostContext(fiber) {
-    // Do not pop unless this Fiber provided the current context.
-    // pushHostContext() only pushes Fibers that provide unique contexts.
-    if (contextFiberStackCursor.current !== fiber) {
-      return;
-    }
-
-    pop(contextStackCursor, fiber);
-    pop(contextFiberStackCursor, fiber);
-  }
-
-  return {
-    getHostContext: getHostContext,
-    getRootHostContainer: getRootHostContainer,
-    popHostContainer: popHostContainer,
-    popHostContext: popHostContext,
-    pushHostContainer: pushHostContainer,
-    pushHostContext: pushHostContext
-  };
-};
-
-var ReactFiberHydrationContext = function(config) {
-  var shouldSetTextContent = config.shouldSetTextContent,
-    hydration = config.hydration;
+  function commitErrorLogging(finishedWork, onUncaughtError) {
+    switch (finishedWork.tag) {
+      case ClassComponent:
+        {
+          var ctor = finishedWork.type;
+          var _instance4 = finishedWork.stateNode;
+          var updateQueue = finishedWork.updateQueue;
+          invariant(
+            updateQueue !== null && updateQueue.capturedValues !== null,
+            "An error logging effect should not have been scheduled if no errors " +
+              "were captured. This error is likely caused by a bug in React. " +
+              "Please file an issue."
+          );
+          var capturedErrors = updateQueue.capturedValues;
+          updateQueue.capturedValues = null;
 
-  // If this doesn't have hydration mode.
+          if (typeof ctor.getDerivedStateFromCatch !== "function") {
+            // To preserve the preexisting retry behavior of error boundaries,
+            // we keep track of which ones already failed during this batch.
+            // This gets reset before we yield back to the browser.
+            // TODO: Warn in strict mode if getDerivedStateFromCatch is
+            // not defined.
+            markLegacyErrorBoundaryAsFailed(_instance4);
+          }
 
-  if (!hydration) {
-    return {
-      enterHydrationState: function() {
-        return false;
-      },
-      resetHydrationState: function() {},
-      tryToClaimNextHydratableInstance: function() {},
-      prepareToHydrateHostInstance: function() {
+          _instance4.props = finishedWork.memoizedProps;
+          _instance4.state = finishedWork.memoizedState;
+          for (var i = 0; i < capturedErrors.length; i++) {
+            var errorInfo = capturedErrors[i];
+            var _error = errorInfo.value;
+            logError(finishedWork, errorInfo);
+            _instance4.componentDidCatch(_error);
+          }
+        }
+        break;
+      case HostRoot: {
+        var _updateQueue2 = finishedWork.updateQueue;
         invariant(
-          false,
-          "Expected prepareToHydrateHostInstance() to never be called. " +
-            "This error is likely caused by a bug in React. Please file an issue."
+          _updateQueue2 !== null && _updateQueue2.capturedValues !== null,
+          "An error logging effect should not have been scheduled if no errors " +
+            "were captured. This error is likely caused by a bug in React. " +
+            "Please file an issue."
         );
-      },
-      prepareToHydrateHostTextInstance: function() {
+        var _capturedErrors = _updateQueue2.capturedValues;
+        _updateQueue2.capturedValues = null;
+        for (var _i = 0; _i < _capturedErrors.length; _i++) {
+          var _errorInfo = _capturedErrors[_i];
+          logError(finishedWork, _errorInfo);
+          onUncaughtError(_errorInfo.value);
+        }
+        break;
+      }
+      default:
         invariant(
           false,
-          "Expected prepareToHydrateHostTextInstance() to never be called. " +
-            "This error is likely caused by a bug in React. Please file an issue."
+          "This unit of work tag cannot capture errors.  This error is " +
+            "likely caused by a bug in React. Please file an issue."
         );
-      },
-      popHydrationState: function(fiber) {
-        return false;
-      }
-    };
-  }
-
-  var canHydrateInstance = hydration.canHydrateInstance,
-    canHydrateTextInstance = hydration.canHydrateTextInstance,
-    getNextHydratableSibling = hydration.getNextHydratableSibling,
-    getFirstHydratableChild = hydration.getFirstHydratableChild,
-    hydrateInstance = hydration.hydrateInstance,
-    hydrateTextInstance = hydration.hydrateTextInstance,
-    didNotMatchHydratedContainerTextInstance =
-      hydration.didNotMatchHydratedContainerTextInstance,
-    didNotMatchHydratedTextInstance = hydration.didNotMatchHydratedTextInstance,
-    didNotHydrateContainerInstance = hydration.didNotHydrateContainerInstance,
-    didNotHydrateInstance = hydration.didNotHydrateInstance,
-    didNotFindHydratableContainerInstance =
-      hydration.didNotFindHydratableContainerInstance,
-    didNotFindHydratableContainerTextInstance =
-      hydration.didNotFindHydratableContainerTextInstance,
-    didNotFindHydratableInstance = hydration.didNotFindHydratableInstance,
-    didNotFindHydratableTextInstance =
-      hydration.didNotFindHydratableTextInstance;
-
-  // The deepest Fiber on the stack involved in a hydration context.
-  // This may have been an insertion or a hydration.
-
-  var hydrationParentFiber = null;
-  var nextHydratableInstance = null;
-  var isHydrating = false;
-
-  function enterHydrationState(fiber) {
-    var parentInstance = fiber.stateNode.containerInfo;
-    nextHydratableInstance = getFirstHydratableChild(parentInstance);
-    hydrationParentFiber = fiber;
-    isHydrating = true;
-    return true;
+    }
   }
 
-  function deleteHydratableInstance(returnFiber, instance) {
-    {
-      switch (returnFiber.tag) {
-        case HostRoot:
-          didNotHydrateContainerInstance(
-            returnFiber.stateNode.containerInfo,
-            instance
-          );
-          break;
+  function commitAttachRef(finishedWork) {
+    var ref = finishedWork.ref;
+    if (ref !== null) {
+      var _instance5 = finishedWork.stateNode;
+      var instanceToUse = void 0;
+      switch (finishedWork.tag) {
         case HostComponent:
-          didNotHydrateInstance(
-            returnFiber.type,
-            returnFiber.memoizedProps,
-            returnFiber.stateNode,
-            instance
-          );
+          instanceToUse = getPublicInstance(_instance5);
           break;
+        default:
+          instanceToUse = _instance5;
+      }
+      if (typeof ref === "function") {
+        ref(instanceToUse);
+      } else {
+        ref.value = instanceToUse;
       }
     }
+  }
 
-    var childToDelete = createFiberFromHostInstanceForDeletion();
-    childToDelete.stateNode = instance;
-    childToDelete["return"] = returnFiber;
-    childToDelete.effectTag = Deletion;
-
-    // This might seem like it belongs on progressedFirstDeletion. However,
-    // these children are not part of the reconciliation list of children.
-    // Even if we abort and rereconcile the children, that will try to hydrate
-    // again and the nodes are still in the host tree so these will be
-    // recreated.
-    if (returnFiber.lastEffect !== null) {
-      returnFiber.lastEffect.nextEffect = childToDelete;
-      returnFiber.lastEffect = childToDelete;
-    } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+  function commitDetachRef(current) {
+    var currentRef = current.ref;
+    if (currentRef !== null) {
+      if (typeof currentRef === "function") {
+        currentRef(null);
+      } else {
+        currentRef.value = null;
+      }
     }
   }
 
-  function insertNonHydratedInstance(returnFiber, fiber) {
-    fiber.effectTag |= Placement;
-    {
-      switch (returnFiber.tag) {
-        case HostRoot: {
-          var parentContainer = returnFiber.stateNode.containerInfo;
-          switch (fiber.tag) {
-            case HostComponent:
-              var type = fiber.type;
-              var props = fiber.pendingProps;
-              didNotFindHydratableContainerInstance(
-                parentContainer,
-                type,
-                props
-              );
-              break;
-            case HostText:
-              var text = fiber.pendingProps;
-              didNotFindHydratableContainerTextInstance(parentContainer, text);
-              break;
-          }
-          break;
+  // User-originating errors (lifecycles and refs) should not interrupt
+  // deletion, so don't let them throw. Host-originating errors should
+  // interrupt deletion, so it's okay
+  function commitUnmount(current) {
+    if (typeof onCommitUnmount === "function") {
+      onCommitUnmount(current);
+    }
+
+    switch (current.tag) {
+      case ClassComponent: {
+        safelyDetachRef(current);
+        var _instance6 = current.stateNode;
+        if (typeof _instance6.componentWillUnmount === "function") {
+          safelyCallComponentWillUnmount(current, _instance6);
         }
-        case HostComponent: {
-          var parentType = returnFiber.type;
-          var parentProps = returnFiber.memoizedProps;
-          var parentInstance = returnFiber.stateNode;
-          switch (fiber.tag) {
-            case HostComponent:
-              var _type = fiber.type;
-              var _props = fiber.pendingProps;
-              didNotFindHydratableInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                _type,
-                _props
-              );
-              break;
-            case HostText:
-              var _text = fiber.pendingProps;
-              didNotFindHydratableTextInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                _text
-              );
-              break;
-          }
-          break;
+        return;
+      }
+      case HostComponent: {
+        safelyDetachRef(current);
+        return;
+      }
+      case CallComponent: {
+        commitNestedUnmounts(current.stateNode);
+        return;
+      }
+      case HostPortal: {
+        // TODO: this is recursive.
+        // We are also not using this parent because
+        // the portal will get pushed immediately.
+        if (enableMutatingReconciler && mutation) {
+          unmountHostComponents(current);
+        } else if (enablePersistentReconciler && persistence) {
+          emptyPortalContainer(current);
         }
-        default:
-          return;
+        return;
       }
     }
   }
 
-  function tryHydrate(fiber, nextInstance) {
-    switch (fiber.tag) {
-      case HostComponent: {
-        var type = fiber.type;
-        var props = fiber.pendingProps;
-        var instance = canHydrateInstance(nextInstance, type, props);
-        if (instance !== null) {
-          fiber.stateNode = instance;
-          return true;
-        }
-        return false;
+  function commitNestedUnmounts(root) {
+    // While we're inside a removed host node we don't want to call
+    // removeChild on the inner nodes because they're removed by the top
+    // call anyway. We also want to call componentWillUnmount on all
+    // composites before this host node is removed from the tree. Therefore
+    var node = root;
+    while (true) {
+      commitUnmount(node);
+      // Visit children because they may contain more composite or host nodes.
+      // Skip portals because commitUnmount() currently visits them recursively.
+      if (
+        node.child !== null &&
+        // If we use mutation we drill down into portals using commitUnmount above.
+        // If we don't use mutation we drill down into portals here instead.
+        (!mutation || node.tag !== HostPortal)
+      ) {
+        node.child["return"] = node;
+        node = node.child;
+        continue;
       }
-      case HostText: {
-        var text = fiber.pendingProps;
-        var textInstance = canHydrateTextInstance(nextInstance, text);
-        if (textInstance !== null) {
-          fiber.stateNode = textInstance;
-          return true;
+      if (node === root) {
+        return;
+      }
+      while (node.sibling === null) {
+        if (node["return"] === null || node["return"] === root) {
+          return;
         }
-        return false;
+        node = node["return"];
       }
-      default:
-        return false;
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
     }
   }
 
-  function tryToClaimNextHydratableInstance(fiber) {
-    if (!isHydrating) {
-      return;
+  function detachFiber(current) {
+    // Cut off the return pointers to disconnect it from the tree. Ideally, we
+    // should clear the child pointer of the parent alternate to let this
+    // get GC:ed but we don't know which for sure which parent is the current
+    // one so we'll settle for GC:ing the subtree of this child. This child
+    // itself will be GC:ed when the parent updates the next time.
+    current["return"] = null;
+    current.child = null;
+    if (current.alternate) {
+      current.alternate.child = null;
+      current.alternate["return"] = null;
     }
-    var nextInstance = nextHydratableInstance;
-    if (!nextInstance) {
-      // Nothing to hydrate. Make it an insertion.
-      insertNonHydratedInstance(hydrationParentFiber, fiber);
-      isHydrating = false;
-      hydrationParentFiber = fiber;
-      return;
+  }
+
+  var emptyPortalContainer = void 0;
+
+  if (!mutation) {
+    var commitContainer = void 0;
+    if (persistence) {
+      var replaceContainerChildren = persistence.replaceContainerChildren,
+        createContainerChildSet = persistence.createContainerChildSet;
+
+      emptyPortalContainer = function(current) {
+        var portal = current.stateNode;
+        var containerInfo = portal.containerInfo;
+
+        var emptyChildSet = createContainerChildSet(containerInfo);
+        replaceContainerChildren(containerInfo, emptyChildSet);
+      };
+      commitContainer = function(finishedWork) {
+        switch (finishedWork.tag) {
+          case ClassComponent: {
+            return;
+          }
+          case HostComponent: {
+            return;
+          }
+          case HostText: {
+            return;
+          }
+          case HostRoot:
+          case HostPortal: {
+            var portalOrRoot = finishedWork.stateNode;
+            var containerInfo = portalOrRoot.containerInfo,
+              _pendingChildren = portalOrRoot.pendingChildren;
+
+            replaceContainerChildren(containerInfo, _pendingChildren);
+            return;
+          }
+          default: {
+            invariant(
+              false,
+              "This unit of work tag should not have side-effects. This error is " +
+                "likely caused by a bug in React. Please file an issue."
+            );
+          }
+        }
+      };
+    } else {
+      commitContainer = function(finishedWork) {
+        // Noop
+      };
+    }
+    if (enablePersistentReconciler || enableNoopReconciler) {
+      return {
+        commitResetTextContent: function(finishedWork) {},
+        commitPlacement: function(finishedWork) {},
+        commitDeletion: function(current) {
+          // Detach refs and call componentWillUnmount() on the whole subtree.
+          commitNestedUnmounts(current);
+          detachFiber(current);
+        },
+        commitWork: function(current, finishedWork) {
+          commitContainer(finishedWork);
+        },
+
+        commitLifeCycles: commitLifeCycles,
+        commitErrorLogging: commitErrorLogging,
+        commitAttachRef: commitAttachRef,
+        commitDetachRef: commitDetachRef
+      };
+    } else if (persistence) {
+      invariant(false, "Persistent reconciler is disabled.");
+    } else {
+      invariant(false, "Noop reconciler is disabled.");
     }
-    if (!tryHydrate(fiber, nextInstance)) {
-      // If we can't hydrate this instance let's try the next one.
-      // We use this as a heuristic. It's based on intuition and not data so it
-      // might be flawed or unnecessary.
-      nextInstance = getNextHydratableSibling(nextInstance);
-      if (!nextInstance || !tryHydrate(fiber, nextInstance)) {
-        // Nothing to hydrate. Make it an insertion.
-        insertNonHydratedInstance(hydrationParentFiber, fiber);
-        isHydrating = false;
-        hydrationParentFiber = fiber;
-        return;
+  }
+  var commitMount = mutation.commitMount,
+    commitUpdate = mutation.commitUpdate,
+    resetTextContent = mutation.resetTextContent,
+    commitTextUpdate = mutation.commitTextUpdate,
+    appendChild = mutation.appendChild,
+    appendChildToContainer = mutation.appendChildToContainer,
+    insertBefore = mutation.insertBefore,
+    insertInContainerBefore = mutation.insertInContainerBefore,
+    removeChild = mutation.removeChild,
+    removeChildFromContainer = mutation.removeChildFromContainer;
+
+  function getHostParentFiber(fiber) {
+    var parent = fiber["return"];
+    while (parent !== null) {
+      if (isHostParent(parent)) {
+        return parent;
       }
-      // We matched the next one, we'll now assume that the first one was
-      // superfluous and we'll delete it. Since we can't eagerly delete it
-      // we'll have to schedule a deletion. To do that, this node needs a dummy
-      // fiber associated with it.
-      deleteHydratableInstance(hydrationParentFiber, nextHydratableInstance);
+      parent = parent["return"];
     }
-    hydrationParentFiber = fiber;
-    nextHydratableInstance = getFirstHydratableChild(nextInstance);
+    invariant(
+      false,
+      "Expected to find a host parent. This error is likely caused by a bug " +
+        "in React. Please file an issue."
+    );
   }
 
-  function prepareToHydrateHostInstance(
-    fiber,
-    rootContainerInstance,
-    hostContext
-  ) {
-    var instance = fiber.stateNode;
-    var updatePayload = hydrateInstance(
-      instance,
-      fiber.type,
-      fiber.memoizedProps,
-      rootContainerInstance,
-      hostContext,
-      fiber
+  function isHostParent(fiber) {
+    return (
+      fiber.tag === HostComponent ||
+      fiber.tag === HostRoot ||
+      fiber.tag === HostPortal
     );
-    // TODO: Type this specific to this type of component.
-    fiber.updateQueue = updatePayload;
-    // If the update payload indicates that there is a change or if there
-    // is a new ref we mark this as an update.
-    if (updatePayload !== null) {
-      return true;
-    }
-    return false;
   }
 
-  function prepareToHydrateHostTextInstance(fiber) {
-    var textInstance = fiber.stateNode;
-    var textContent = fiber.memoizedProps;
-    var shouldUpdate = hydrateTextInstance(textInstance, textContent, fiber);
-    {
-      if (shouldUpdate) {
-        // We assume that prepareToHydrateHostTextInstance is called in a context where the
-        // hydration parent is the parent host component of this host text.
-        var returnFiber = hydrationParentFiber;
-        if (returnFiber !== null) {
-          switch (returnFiber.tag) {
-            case HostRoot: {
-              var parentContainer = returnFiber.stateNode.containerInfo;
-              didNotMatchHydratedContainerTextInstance(
-                parentContainer,
-                textInstance,
-                textContent
-              );
-              break;
-            }
-            case HostComponent: {
-              var parentType = returnFiber.type;
-              var parentProps = returnFiber.memoizedProps;
-              var parentInstance = returnFiber.stateNode;
-              didNotMatchHydratedTextInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                textInstance,
-                textContent
-              );
-              break;
-            }
-          }
+  function getHostSibling(fiber) {
+    // We're going to search forward into the tree until we find a sibling host
+    // node. Unfortunately, if multiple insertions are done in a row we have to
+    // search past them. This leads to exponential search for the next sibling.
+    var node = fiber;
+    siblings: while (true) {
+      // If we didn't find anything, let's try the next sibling.
+      while (node.sibling === null) {
+        if (node["return"] === null || isHostParent(node["return"])) {
+          // If we pop out of the root or hit the parent the fiber we are the
+          // last sibling.
+          return null;
         }
+        node = node["return"];
+      }
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
+      while (node.tag !== HostComponent && node.tag !== HostText) {
+        // If it is not host node and, we might have a host node inside it.
+        // Try to search down until we find one.
+        if (node.effectTag & Placement) {
+          // If we don't have a child, try the siblings instead.
+          continue siblings;
+        }
+        // If we don't have a child, try the siblings instead.
+        // We also skip portals because they are not part of this host tree.
+        if (node.child === null || node.tag === HostPortal) {
+          continue siblings;
+        } else {
+          node.child["return"] = node;
+          node = node.child;
+        }
+      }
+      // Check if this host node is stable or about to be placed.
+      if (!(node.effectTag & Placement)) {
+        // Found it!
+        return node.stateNode;
       }
     }
-    return shouldUpdate;
-  }
-
-  function popToNextHostParent(fiber) {
-    var parent = fiber["return"];
-    while (
-      parent !== null &&
-      parent.tag !== HostComponent &&
-      parent.tag !== HostRoot
-    ) {
-      parent = parent["return"];
-    }
-    hydrationParentFiber = parent;
   }
 
-  function popHydrationState(fiber) {
-    if (fiber !== hydrationParentFiber) {
-      // We're deeper than the current hydration context, inside an inserted
-      // tree.
-      return false;
+  function commitPlacement(finishedWork) {
+    // Recursively insert all host nodes into the parent.
+    var parentFiber = getHostParentFiber(finishedWork);
+    var parent = void 0;
+    var isContainer = void 0;
+    switch (parentFiber.tag) {
+      case HostComponent:
+        parent = parentFiber.stateNode;
+        isContainer = false;
+        break;
+      case HostRoot:
+        parent = parentFiber.stateNode.containerInfo;
+        isContainer = true;
+        break;
+      case HostPortal:
+        parent = parentFiber.stateNode.containerInfo;
+        isContainer = true;
+        break;
+      default:
+        invariant(
+          false,
+          "Invalid host parent fiber. This error is likely caused by a bug " +
+            "in React. Please file an issue."
+        );
     }
-    if (!isHydrating) {
-      // If we're not currently hydrating but we're in a hydration context, then
-      // we were an insertion and now need to pop up reenter hydration of our
-      // siblings.
-      popToNextHostParent(fiber);
-      isHydrating = true;
-      return false;
+    if (parentFiber.effectTag & ContentReset) {
+      // Reset the text content of the parent before doing any insertions
+      resetTextContent(parent);
+      // Clear ContentReset from the effect tag
+      parentFiber.effectTag &= ~ContentReset;
     }
 
-    var type = fiber.type;
-
-    // If we have any remaining hydratable nodes, we need to delete them now.
-    // We only do this deeper than head and body since they tend to have random
-    // other nodes in them. We also ignore components with pure text content in
-    // side of them.
-    // TODO: Better heuristic.
-    if (
-      fiber.tag !== HostComponent ||
-      (type !== "head" &&
-        type !== "body" &&
-        !shouldSetTextContent(type, fiber.memoizedProps))
-    ) {
-      var nextInstance = nextHydratableInstance;
-      while (nextInstance) {
-        deleteHydratableInstance(fiber, nextInstance);
-        nextInstance = getNextHydratableSibling(nextInstance);
+    var before = getHostSibling(finishedWork);
+    // We only have the top Fiber that was inserted but we need recurse down its
+    // children to find all the terminal nodes.
+    var node = finishedWork;
+    while (true) {
+      if (node.tag === HostComponent || node.tag === HostText) {
+        if (before) {
+          if (isContainer) {
+            insertInContainerBefore(parent, node.stateNode, before);
+          } else {
+            insertBefore(parent, node.stateNode, before);
+          }
+        } else {
+          if (isContainer) {
+            appendChildToContainer(parent, node.stateNode);
+          } else {
+            appendChild(parent, node.stateNode);
+          }
+        }
+      } else if (node.tag === HostPortal) {
+        // If the insertion itself is a portal, then we don't want to traverse
+        // down its children. Instead, we'll get insertions from each child in
+        // the portal directly.
+      } else if (node.child !== null) {
+        node.child["return"] = node;
+        node = node.child;
+        continue;
       }
-    }
-
-    popToNextHostParent(fiber);
-    nextHydratableInstance = hydrationParentFiber
-      ? getNextHydratableSibling(fiber.stateNode)
-      : null;
-    return true;
-  }
-
-  function resetHydrationState() {
-    hydrationParentFiber = null;
-    nextHydratableInstance = null;
-    isHydrating = false;
+      if (node === finishedWork) {
+        return;
+      }
+      while (node.sibling === null) {
+        if (node["return"] === null || node["return"] === finishedWork) {
+          return;
+        }
+        node = node["return"];
+      }
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
+    }
   }
 
-  return {
-    enterHydrationState: enterHydrationState,
-    resetHydrationState: resetHydrationState,
-    tryToClaimNextHydratableInstance: tryToClaimNextHydratableInstance,
-    prepareToHydrateHostInstance: prepareToHydrateHostInstance,
-    prepareToHydrateHostTextInstance: prepareToHydrateHostTextInstance,
-    popHydrationState: popHydrationState
-  };
-};
-
-// This lets us hook into Fiber to debug what it's doing.
-// See https://github.com/facebook/react/pull/8033.
-// This is not part of the public API, not even for React DevTools.
-// You may only inject a debugTool if you work on React Fiber itself.
-var ReactFiberInstrumentation = {
-  debugTool: null
-};
-
-var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
-
-var warnedAboutMissingGetChildContext = void 0;
-
-{
-  warnedAboutMissingGetChildContext = {};
-}
-
-var ReactFiberLegacyContext = function(stack) {
-  var createCursor = stack.createCursor,
-    push = stack.push,
-    pop = stack.pop;
+  function unmountHostComponents(current) {
+    // We only have the top Fiber that was inserted but we need recurse down its
+    var node = current;
 
-  // A cursor to the current merged context object on the stack.
+    // Each iteration, currentParent is populated with node's host parent if not
+    // currentParentIsValid.
+    var currentParentIsValid = false;
+    var currentParent = void 0;
+    var currentParentIsContainer = void 0;
 
-  var contextStackCursor = createCursor(emptyObject);
-  // A cursor to a boolean indicating whether the context has changed.
-  var didPerformWorkStackCursor = createCursor(false);
-  // Keep track of the previous context object that was on the stack.
-  // We use this to get access to the parent context after we have already
-  // pushed the next context provider, and now need to merge their contexts.
-  var previousContext = emptyObject;
+    while (true) {
+      if (!currentParentIsValid) {
+        var parent = node["return"];
+        findParent: while (true) {
+          invariant(
+            parent !== null,
+            "Expected to find a host parent. This error is likely caused by " +
+              "a bug in React. Please file an issue."
+          );
+          switch (parent.tag) {
+            case HostComponent:
+              currentParent = parent.stateNode;
+              currentParentIsContainer = false;
+              break findParent;
+            case HostRoot:
+              currentParent = parent.stateNode.containerInfo;
+              currentParentIsContainer = true;
+              break findParent;
+            case HostPortal:
+              currentParent = parent.stateNode.containerInfo;
+              currentParentIsContainer = true;
+              break findParent;
+          }
+          parent = parent["return"];
+        }
+        currentParentIsValid = true;
+      }
 
-  function getUnmaskedContext(workInProgress) {
-    var hasOwnContext = isContextProvider(workInProgress);
-    if (hasOwnContext) {
-      // If the fiber is a context provider itself, when we read its context
-      // we have already pushed its own child context on the stack. A context
-      // provider should not "see" its own child context. Therefore we read the
-      // previous (parent) context instead for a context provider.
-      return previousContext;
+      if (node.tag === HostComponent || node.tag === HostText) {
+        commitNestedUnmounts(node);
+        // After all the children have unmounted, it is now safe to remove the
+        // node from the tree.
+        if (currentParentIsContainer) {
+          removeChildFromContainer(currentParent, node.stateNode);
+        } else {
+          removeChild(currentParent, node.stateNode);
+        }
+        // Don't visit children because we already visited them.
+      } else if (node.tag === HostPortal) {
+        // When we go into a portal, it becomes the parent to remove from.
+        // We will reassign it back when we pop the portal on the way up.
+        currentParent = node.stateNode.containerInfo;
+        // Visit children because portals might contain host components.
+        if (node.child !== null) {
+          node.child["return"] = node;
+          node = node.child;
+          continue;
+        }
+      } else {
+        commitUnmount(node);
+        // Visit children because we may find more host components below.
+        if (node.child !== null) {
+          node.child["return"] = node;
+          node = node.child;
+          continue;
+        }
+      }
+      if (node === current) {
+        return;
+      }
+      while (node.sibling === null) {
+        if (node["return"] === null || node["return"] === current) {
+          return;
+        }
+        node = node["return"];
+        if (node.tag === HostPortal) {
+          // When we go out of the portal, we need to restore the parent.
+          // Since we don't keep a stack of them, we will search for it.
+          currentParentIsValid = false;
+        }
+      }
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
     }
-    return contextStackCursor.current;
   }
 
-  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-    var instance = workInProgress.stateNode;
-    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  function commitDeletion(current) {
+    // Recursively delete all host nodes from the parent.
+    // Detach refs and call componentWillUnmount() on the whole subtree.
+    unmountHostComponents(current);
+    detachFiber(current);
   }
 
-  function getMaskedContext(workInProgress, unmaskedContext) {
-    var type = workInProgress.type;
-    var contextTypes = type.contextTypes;
-    if (!contextTypes) {
-      return emptyObject;
-    }
-
-    // Avoid recreating masked context unless unmasked context has changed.
-    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-    // This may trigger infinite loops if componentWillReceiveProps calls setState.
-    var instance = workInProgress.stateNode;
-    if (
-      instance &&
-      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-    ) {
-      return instance.__reactInternalMemoizedMaskedChildContext;
-    }
-
-    var context = {};
-    for (var key in contextTypes) {
-      context[key] = unmaskedContext[key];
-    }
-
-    {
-      var name = getComponentName(workInProgress) || "Unknown";
-      checkPropTypes(
-        contextTypes,
-        context,
-        "context",
-        name,
-        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-      );
-    }
-
-    // Cache unmasked context so we can avoid recreating masked context unless necessary.
-    // Context is created before the class component is instantiated so check for instance.
-    if (instance) {
-      cacheContext(workInProgress, unmaskedContext, context);
+  function commitWork(current, finishedWork) {
+    switch (finishedWork.tag) {
+      case ClassComponent: {
+        return;
+      }
+      case HostComponent: {
+        var _instance7 = finishedWork.stateNode;
+        if (_instance7 != null) {
+          // Commit the work prepared earlier.
+          var newProps = finishedWork.memoizedProps;
+          // For hydration we reuse the update path but we treat the oldProps
+          // as the newProps. The updatePayload will contain the real change in
+          // this case.
+          var oldProps = current !== null ? current.memoizedProps : newProps;
+          var type = finishedWork.type;
+          // TODO: Type the updateQueue to be specific to host components.
+          var updatePayload = finishedWork.updateQueue;
+          finishedWork.updateQueue = null;
+          if (updatePayload !== null) {
+            commitUpdate(
+              _instance7,
+              updatePayload,
+              type,
+              oldProps,
+              newProps,
+              finishedWork
+            );
+          }
+        }
+        return;
+      }
+      case HostText: {
+        invariant(
+          finishedWork.stateNode !== null,
+          "This should have a text node initialized. This error is likely " +
+            "caused by a bug in React. Please file an issue."
+        );
+        var textInstance = finishedWork.stateNode;
+        var newText = finishedWork.memoizedProps;
+        // For hydration we reuse the update path but we treat the oldProps
+        // as the newProps. The updatePayload will contain the real change in
+        // this case.
+        var oldText = current !== null ? current.memoizedProps : newText;
+        commitTextUpdate(textInstance, oldText, newText);
+        return;
+      }
+      case HostRoot: {
+        return;
+      }
+      default: {
+        invariant(
+          false,
+          "This unit of work tag should not have side-effects. This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
+      }
     }
-
-    return context;
   }
 
-  function hasContextChanged() {
-    return didPerformWorkStackCursor.current;
-  }
-
-  function isContextConsumer(fiber) {
-    return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
+  function commitResetTextContent(current) {
+    resetTextContent(current.stateNode);
   }
 
-  function isContextProvider(fiber) {
-    return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
+  if (enableMutatingReconciler) {
+    return {
+      commitResetTextContent: commitResetTextContent,
+      commitPlacement: commitPlacement,
+      commitDeletion: commitDeletion,
+      commitWork: commitWork,
+      commitLifeCycles: commitLifeCycles,
+      commitErrorLogging: commitErrorLogging,
+      commitAttachRef: commitAttachRef,
+      commitDetachRef: commitDetachRef
+    };
+  } else {
+    invariant(false, "Mutating reconciler is disabled.");
   }
+};
 
-  function popContextProvider(fiber) {
-    if (!isContextProvider(fiber)) {
-      return;
-    }
+var NO_CONTEXT = {};
 
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
-  }
+var ReactFiberHostContext = function(config) {
+  var getChildHostContext = config.getChildHostContext,
+    getRootHostContext = config.getRootHostContext;
 
-  function popTopLevelContextObject(fiber) {
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
-  }
+  var contextStackCursor = createCursor(NO_CONTEXT);
+  var contextFiberStackCursor = createCursor(NO_CONTEXT);
+  var rootInstanceStackCursor = createCursor(NO_CONTEXT);
 
-  function pushTopLevelContextObject(fiber, context, didChange) {
+  function requiredContext(c) {
     invariant(
-      contextStackCursor.cursor == null,
-      "Unexpected context found on stack. " +
-        "This error is likely caused by a bug in React. Please file an issue."
+      c !== NO_CONTEXT,
+      "Expected host context to exist. This error is likely caused by a bug " +
+        "in React. Please file an issue."
     );
-
-    push(contextStackCursor, context, fiber);
-    push(didPerformWorkStackCursor, didChange, fiber);
+    return c;
   }
 
-  function processChildContext(fiber, parentContext) {
-    var instance = fiber.stateNode;
-    var childContextTypes = fiber.type.childContextTypes;
-
-    // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
-    if (typeof instance.getChildContext !== "function") {
-      {
-        var componentName = getComponentName(fiber) || "Unknown";
-
-        if (!warnedAboutMissingGetChildContext[componentName]) {
-          warnedAboutMissingGetChildContext[componentName] = true;
-          warning(
-            false,
-            "%s.childContextTypes is specified but there is no getChildContext() method " +
-              "on the instance. You can either define getChildContext() on %s or remove " +
-              "childContextTypes from it.",
-            componentName,
-            componentName
-          );
-        }
-      }
-      return parentContext;
-    }
-
-    var childContext = void 0;
-    {
-      ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
-    }
-    startPhaseTimer(fiber, "getChildContext");
-    childContext = instance.getChildContext();
-    stopPhaseTimer();
-    {
-      ReactDebugCurrentFiber.setCurrentPhase(null);
-    }
-    for (var contextKey in childContext) {
-      invariant(
-        contextKey in childContextTypes,
-        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-        getComponentName(fiber) || "Unknown",
-        contextKey
-      );
-    }
-    {
-      var name = getComponentName(fiber) || "Unknown";
-      checkPropTypes(
-        childContextTypes,
-        childContext,
-        "child context",
-        name,
-        // In practice, there is one case in which we won't get a stack. It's when
-        // somebody calls unstable_renderSubtreeIntoContainer() and we process
-        // context from the parent component instance. The stack will be missing
-        // because it's outside of the reconciliation, and so the pointer has not
-        // been set. This is rare and doesn't matter. We'll also remove that API.
-        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-      );
-    }
-
-    return Object.assign({}, parentContext, childContext);
+  function getRootHostContainer() {
+    var rootInstance = requiredContext(rootInstanceStackCursor.current);
+    return rootInstance;
   }
 
-  function pushContextProvider(workInProgress) {
-    if (!isContextProvider(workInProgress)) {
-      return false;
-    }
+  function pushHostContainer(fiber, nextRootInstance) {
+    // Push current root instance onto the stack;
+    // This allows us to reset root when portals are popped.
+    push(rootInstanceStackCursor, nextRootInstance, fiber);
 
-    var instance = workInProgress.stateNode;
-    // We push the context as early as possible to ensure stack integrity.
-    // If the instance does not exist yet, we will push null at first,
-    // and replace it on the stack later when invalidating the context.
-    var memoizedMergedChildContext =
-      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-      emptyObject;
-
-    // Remember the parent context so we can merge with it later.
-    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
-    previousContext = contextStackCursor.current;
-    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-    push(
-      didPerformWorkStackCursor,
-      didPerformWorkStackCursor.current,
-      workInProgress
-    );
+    var nextRootContext = getRootHostContext(nextRootInstance);
 
-    return true;
+    // Track the context and the Fiber that provided it.
+    // This enables us to pop only Fibers that provide unique contexts.
+    push(contextFiberStackCursor, fiber, fiber);
+    push(contextStackCursor, nextRootContext, fiber);
   }
 
-  function invalidateContextProvider(workInProgress, didChange) {
-    var instance = workInProgress.stateNode;
-    invariant(
-      instance,
-      "Expected to have an instance by this point. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
+  function popHostContainer(fiber) {
+    pop(contextStackCursor, fiber);
+    pop(contextFiberStackCursor, fiber);
+    pop(rootInstanceStackCursor, fiber);
+  }
 
-    if (didChange) {
-      // Merge parent and own context.
-      // Skip this if we're not updating due to sCU.
-      // This avoids unnecessarily recomputing memoized values.
-      var mergedContext = processChildContext(workInProgress, previousContext);
-      instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-
-      // Replace the old (or empty) context with the new one.
-      // It is important to unwind the context in the reverse order.
-      pop(didPerformWorkStackCursor, workInProgress);
-      pop(contextStackCursor, workInProgress);
-      // Now push the new context and mark that it has changed.
-      push(contextStackCursor, mergedContext, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    } else {
-      pop(didPerformWorkStackCursor, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    }
+  function getHostContext() {
+    var context = requiredContext(contextStackCursor.current);
+    return context;
   }
 
-  function findCurrentUnmaskedContext(fiber) {
-    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-    // makes sense elsewhere
-    invariant(
-      isFiberMounted(fiber) && fiber.tag === ClassComponent,
-      "Expected subtree parent to be a mounted class component. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
+  function pushHostContext(fiber) {
+    var rootInstance = requiredContext(rootInstanceStackCursor.current);
+    var context = requiredContext(contextStackCursor.current);
+    var nextContext = getChildHostContext(context, fiber.type, rootInstance);
 
-    var node = fiber;
-    while (node.tag !== HostRoot) {
-      if (isContextProvider(node)) {
-        return node.stateNode.__reactInternalMemoizedMergedChildContext;
-      }
-      var parent = node["return"];
-      invariant(
-        parent,
-        "Found unexpected detached subtree parent. " +
-          "This error is likely caused by a bug in React. Please file an issue."
-      );
-      node = parent;
+    // Don't push this Fiber's context unless it's unique.
+    if (context === nextContext) {
+      return;
     }
-    return node.stateNode.context;
-  }
 
-  return {
-    getUnmaskedContext: getUnmaskedContext,
-    cacheContext: cacheContext,
-    getMaskedContext: getMaskedContext,
-    hasContextChanged: hasContextChanged,
-    isContextConsumer: isContextConsumer,
-    isContextProvider: isContextProvider,
-    popContextProvider: popContextProvider,
-    popTopLevelContextObject: popTopLevelContextObject,
-    pushTopLevelContextObject: pushTopLevelContextObject,
-    processChildContext: processChildContext,
-    pushContextProvider: pushContextProvider,
-    invalidateContextProvider: invalidateContextProvider,
-    findCurrentUnmaskedContext: findCurrentUnmaskedContext
-  };
-};
+    // Track the context and the Fiber that provided it.
+    // This enables us to pop only Fibers that provide unique contexts.
+    push(contextFiberStackCursor, fiber, fiber);
+    push(contextStackCursor, nextContext, fiber);
+  }
 
-var ReactFiberNewContext = function(stack) {
-  var createCursor = stack.createCursor,
-    push = stack.push,
-    pop = stack.pop;
+  function popHostContext(fiber) {
+    // Do not pop unless this Fiber provided the current context.
+    // pushHostContext() only pushes Fibers that provide unique contexts.
+    if (contextFiberStackCursor.current !== fiber) {
+      return;
+    }
 
-  var providerCursor = createCursor(null);
-  var valueCursor = createCursor(null);
-  var changedBitsCursor = createCursor(0);
+    pop(contextStackCursor, fiber);
+    pop(contextFiberStackCursor, fiber);
+  }
 
-  var rendererSigil = void 0;
-  {
-    // Use this to detect multiple renderers using the same context
-    rendererSigil = {};
+  function resetHostContainer() {
+    contextStackCursor.current = NO_CONTEXT;
+    rootInstanceStackCursor.current = NO_CONTEXT;
   }
 
-  function pushProvider(providerFiber) {
-    var context = providerFiber.type._context;
+  return {
+    getHostContext: getHostContext,
+    getRootHostContainer: getRootHostContainer,
+    popHostContainer: popHostContainer,
+    popHostContext: popHostContext,
+    pushHostContainer: pushHostContainer,
+    pushHostContext: pushHostContext,
+    resetHostContainer: resetHostContainer
+  };
+};
 
-    push(changedBitsCursor, context._changedBits, providerFiber);
-    push(valueCursor, context._currentValue, providerFiber);
-    push(providerCursor, providerFiber, providerFiber);
+var ReactFiberHydrationContext = function(config) {
+  var shouldSetTextContent = config.shouldSetTextContent,
+    hydration = config.hydration;
 
-    context._currentValue = providerFiber.pendingProps.value;
-    context._changedBits = providerFiber.stateNode;
+  // If this doesn't have hydration mode.
 
-    {
-      !(
-        context._currentRenderer === null ||
-        context._currentRenderer === rendererSigil
-      )
-        ? warning(
-            false,
-            "Detected multiple renderers concurrently rendering the " +
-              "same context provider. This is currently unsupported."
-          )
-        : void 0;
-      context._currentRenderer = rendererSigil;
-    }
+  if (!hydration) {
+    return {
+      enterHydrationState: function() {
+        return false;
+      },
+      resetHydrationState: function() {},
+      tryToClaimNextHydratableInstance: function() {},
+      prepareToHydrateHostInstance: function() {
+        invariant(
+          false,
+          "Expected prepareToHydrateHostInstance() to never be called. " +
+            "This error is likely caused by a bug in React. Please file an issue."
+        );
+      },
+      prepareToHydrateHostTextInstance: function() {
+        invariant(
+          false,
+          "Expected prepareToHydrateHostTextInstance() to never be called. " +
+            "This error is likely caused by a bug in React. Please file an issue."
+        );
+      },
+      popHydrationState: function(fiber) {
+        return false;
+      }
+    };
   }
 
-  function popProvider(providerFiber) {
-    var changedBits = changedBitsCursor.current;
-    var currentValue = valueCursor.current;
+  var canHydrateInstance = hydration.canHydrateInstance,
+    canHydrateTextInstance = hydration.canHydrateTextInstance,
+    getNextHydratableSibling = hydration.getNextHydratableSibling,
+    getFirstHydratableChild = hydration.getFirstHydratableChild,
+    hydrateInstance = hydration.hydrateInstance,
+    hydrateTextInstance = hydration.hydrateTextInstance,
+    didNotMatchHydratedContainerTextInstance =
+      hydration.didNotMatchHydratedContainerTextInstance,
+    didNotMatchHydratedTextInstance = hydration.didNotMatchHydratedTextInstance,
+    didNotHydrateContainerInstance = hydration.didNotHydrateContainerInstance,
+    didNotHydrateInstance = hydration.didNotHydrateInstance,
+    didNotFindHydratableContainerInstance =
+      hydration.didNotFindHydratableContainerInstance,
+    didNotFindHydratableContainerTextInstance =
+      hydration.didNotFindHydratableContainerTextInstance,
+    didNotFindHydratableInstance = hydration.didNotFindHydratableInstance,
+    didNotFindHydratableTextInstance =
+      hydration.didNotFindHydratableTextInstance;
 
-    pop(providerCursor, providerFiber);
-    pop(valueCursor, providerFiber);
-    pop(changedBitsCursor, providerFiber);
+  // The deepest Fiber on the stack involved in a hydration context.
+  // This may have been an insertion or a hydration.
 
-    var context = providerFiber.type._context;
-    context._currentValue = currentValue;
-    context._changedBits = changedBits;
-  }
+  var hydrationParentFiber = null;
+  var nextHydratableInstance = null;
+  var isHydrating = false;
 
-  return {
-    pushProvider: pushProvider,
-    popProvider: popProvider
-  };
-};
+  function enterHydrationState(fiber) {
+    var parentInstance = fiber.stateNode.containerInfo;
+    nextHydratableInstance = getFirstHydratableChild(parentInstance);
+    hydrationParentFiber = fiber;
+    isHydrating = true;
+    return true;
+  }
 
-var ReactFiberStack = function() {
-  var valueStack = [];
+  function deleteHydratableInstance(returnFiber, instance) {
+    {
+      switch (returnFiber.tag) {
+        case HostRoot:
+          didNotHydrateContainerInstance(
+            returnFiber.stateNode.containerInfo,
+            instance
+          );
+          break;
+        case HostComponent:
+          didNotHydrateInstance(
+            returnFiber.type,
+            returnFiber.memoizedProps,
+            returnFiber.stateNode,
+            instance
+          );
+          break;
+      }
+    }
 
-  var fiberStack = void 0;
+    var childToDelete = createFiberFromHostInstanceForDeletion();
+    childToDelete.stateNode = instance;
+    childToDelete["return"] = returnFiber;
+    childToDelete.effectTag = Deletion;
 
-  {
-    fiberStack = [];
+    // This might seem like it belongs on progressedFirstDeletion. However,
+    // these children are not part of the reconciliation list of children.
+    // Even if we abort and rereconcile the children, that will try to hydrate
+    // again and the nodes are still in the host tree so these will be
+    // recreated.
+    if (returnFiber.lastEffect !== null) {
+      returnFiber.lastEffect.nextEffect = childToDelete;
+      returnFiber.lastEffect = childToDelete;
+    } else {
+      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+    }
   }
 
-  var index = -1;
-
-  function createCursor(defaultValue) {
-    return {
-      current: defaultValue
-    };
+  function insertNonHydratedInstance(returnFiber, fiber) {
+    fiber.effectTag |= Placement;
+    {
+      switch (returnFiber.tag) {
+        case HostRoot: {
+          var parentContainer = returnFiber.stateNode.containerInfo;
+          switch (fiber.tag) {
+            case HostComponent:
+              var type = fiber.type;
+              var props = fiber.pendingProps;
+              didNotFindHydratableContainerInstance(
+                parentContainer,
+                type,
+                props
+              );
+              break;
+            case HostText:
+              var text = fiber.pendingProps;
+              didNotFindHydratableContainerTextInstance(parentContainer, text);
+              break;
+          }
+          break;
+        }
+        case HostComponent: {
+          var parentType = returnFiber.type;
+          var parentProps = returnFiber.memoizedProps;
+          var parentInstance = returnFiber.stateNode;
+          switch (fiber.tag) {
+            case HostComponent:
+              var _type = fiber.type;
+              var _props = fiber.pendingProps;
+              didNotFindHydratableInstance(
+                parentType,
+                parentProps,
+                parentInstance,
+                _type,
+                _props
+              );
+              break;
+            case HostText:
+              var _text = fiber.pendingProps;
+              didNotFindHydratableTextInstance(
+                parentType,
+                parentProps,
+                parentInstance,
+                _text
+              );
+              break;
+          }
+          break;
+        }
+        default:
+          return;
+      }
+    }
   }
 
-  function isEmpty() {
-    return index === -1;
+  function tryHydrate(fiber, nextInstance) {
+    switch (fiber.tag) {
+      case HostComponent: {
+        var type = fiber.type;
+        var props = fiber.pendingProps;
+        var instance = canHydrateInstance(nextInstance, type, props);
+        if (instance !== null) {
+          fiber.stateNode = instance;
+          return true;
+        }
+        return false;
+      }
+      case HostText: {
+        var text = fiber.pendingProps;
+        var textInstance = canHydrateTextInstance(nextInstance, text);
+        if (textInstance !== null) {
+          fiber.stateNode = textInstance;
+          return true;
+        }
+        return false;
+      }
+      default:
+        return false;
+    }
   }
 
-  function pop(cursor, fiber) {
-    if (index < 0) {
-      {
-        warning(false, "Unexpected pop.");
-      }
+  function tryToClaimNextHydratableInstance(fiber) {
+    if (!isHydrating) {
       return;
     }
-
-    {
-      if (fiber !== fiberStack[index]) {
-        warning(false, "Unexpected Fiber popped.");
+    var nextInstance = nextHydratableInstance;
+    if (!nextInstance) {
+      // Nothing to hydrate. Make it an insertion.
+      insertNonHydratedInstance(hydrationParentFiber, fiber);
+      isHydrating = false;
+      hydrationParentFiber = fiber;
+      return;
+    }
+    if (!tryHydrate(fiber, nextInstance)) {
+      // If we can't hydrate this instance let's try the next one.
+      // We use this as a heuristic. It's based on intuition and not data so it
+      // might be flawed or unnecessary.
+      nextInstance = getNextHydratableSibling(nextInstance);
+      if (!nextInstance || !tryHydrate(fiber, nextInstance)) {
+        // Nothing to hydrate. Make it an insertion.
+        insertNonHydratedInstance(hydrationParentFiber, fiber);
+        isHydrating = false;
+        hydrationParentFiber = fiber;
+        return;
       }
+      // We matched the next one, we'll now assume that the first one was
+      // superfluous and we'll delete it. Since we can't eagerly delete it
+      // we'll have to schedule a deletion. To do that, this node needs a dummy
+      // fiber associated with it.
+      deleteHydratableInstance(hydrationParentFiber, nextHydratableInstance);
     }
+    hydrationParentFiber = fiber;
+    nextHydratableInstance = getFirstHydratableChild(nextInstance);
+  }
 
-    cursor.current = valueStack[index];
-
-    valueStack[index] = null;
+  function prepareToHydrateHostInstance(
+    fiber,
+    rootContainerInstance,
+    hostContext
+  ) {
+    var instance = fiber.stateNode;
+    var updatePayload = hydrateInstance(
+      instance,
+      fiber.type,
+      fiber.memoizedProps,
+      rootContainerInstance,
+      hostContext,
+      fiber
+    );
+    // TODO: Type this specific to this type of component.
+    fiber.updateQueue = updatePayload;
+    // If the update payload indicates that there is a change or if there
+    // is a new ref we mark this as an update.
+    if (updatePayload !== null) {
+      return true;
+    }
+    return false;
+  }
 
+  function prepareToHydrateHostTextInstance(fiber) {
+    var textInstance = fiber.stateNode;
+    var textContent = fiber.memoizedProps;
+    var shouldUpdate = hydrateTextInstance(textInstance, textContent, fiber);
     {
-      fiberStack[index] = null;
+      if (shouldUpdate) {
+        // We assume that prepareToHydrateHostTextInstance is called in a context where the
+        // hydration parent is the parent host component of this host text.
+        var returnFiber = hydrationParentFiber;
+        if (returnFiber !== null) {
+          switch (returnFiber.tag) {
+            case HostRoot: {
+              var parentContainer = returnFiber.stateNode.containerInfo;
+              didNotMatchHydratedContainerTextInstance(
+                parentContainer,
+                textInstance,
+                textContent
+              );
+              break;
+            }
+            case HostComponent: {
+              var parentType = returnFiber.type;
+              var parentProps = returnFiber.memoizedProps;
+              var parentInstance = returnFiber.stateNode;
+              didNotMatchHydratedTextInstance(
+                parentType,
+                parentProps,
+                parentInstance,
+                textInstance,
+                textContent
+              );
+              break;
+            }
+          }
+        }
+      }
     }
-
-    index--;
+    return shouldUpdate;
   }
 
-  function push(cursor, value, fiber) {
-    index++;
-
-    valueStack[index] = cursor.current;
+  function popToNextHostParent(fiber) {
+    var parent = fiber["return"];
+    while (
+      parent !== null &&
+      parent.tag !== HostComponent &&
+      parent.tag !== HostRoot
+    ) {
+      parent = parent["return"];
+    }
+    hydrationParentFiber = parent;
+  }
 
-    {
-      fiberStack[index] = fiber;
+  function popHydrationState(fiber) {
+    if (fiber !== hydrationParentFiber) {
+      // We're deeper than the current hydration context, inside an inserted
+      // tree.
+      return false;
+    }
+    if (!isHydrating) {
+      // If we're not currently hydrating but we're in a hydration context, then
+      // we were an insertion and now need to pop up reenter hydration of our
+      // siblings.
+      popToNextHostParent(fiber);
+      isHydrating = true;
+      return false;
     }
 
-    cursor.current = value;
-  }
+    var type = fiber.type;
 
-  function checkThatStackIsEmpty() {
-    {
-      if (index !== -1) {
-        warning(
-          false,
-          "Expected an empty stack. Something was not reset properly."
-        );
+    // If we have any remaining hydratable nodes, we need to delete them now.
+    // We only do this deeper than head and body since they tend to have random
+    // other nodes in them. We also ignore components with pure text content in
+    // side of them.
+    // TODO: Better heuristic.
+    if (
+      fiber.tag !== HostComponent ||
+      (type !== "head" &&
+        type !== "body" &&
+        !shouldSetTextContent(type, fiber.memoizedProps))
+    ) {
+      var nextInstance = nextHydratableInstance;
+      while (nextInstance) {
+        deleteHydratableInstance(fiber, nextInstance);
+        nextInstance = getNextHydratableSibling(nextInstance);
       }
     }
+
+    popToNextHostParent(fiber);
+    nextHydratableInstance = hydrationParentFiber
+      ? getNextHydratableSibling(fiber.stateNode)
+      : null;
+    return true;
   }
 
-  function resetStackAfterFatalErrorInDev() {
-    {
-      index = -1;
-      valueStack.length = 0;
-      fiberStack.length = 0;
-    }
+  function resetHydrationState() {
+    hydrationParentFiber = null;
+    nextHydratableInstance = null;
+    isHydrating = false;
   }
 
   return {
-    createCursor: createCursor,
-    isEmpty: isEmpty,
-    pop: pop,
-    push: push,
-    checkThatStackIsEmpty: checkThatStackIsEmpty,
-    resetStackAfterFatalErrorInDev: resetStackAfterFatalErrorInDev
+    enterHydrationState: enterHydrationState,
+    resetHydrationState: resetHydrationState,
+    tryToClaimNextHydratableInstance: tryToClaimNextHydratableInstance,
+    prepareToHydrateHostInstance: prepareToHydrateHostInstance,
+    prepareToHydrateHostTextInstance: prepareToHydrateHostTextInstance,
+    popHydrationState: popHydrationState
   };
 };
 
+// This lets us hook into Fiber to debug what it's doing.
+// See https://github.com/facebook/react/pull/8033.
+// This is not part of the public API, not even for React DevTools.
+// You may only inject a debugTool if you work on React Fiber itself.
+var ReactFiberInstrumentation = {
+  debugTool: null
+};
+
+var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
+
 var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError = ReactErrorUtils.hasCaughtError;
 var clearCaughtError = ReactErrorUtils.clearCaughtError;
@@ -11894,19 +11411,17 @@ var warnAboutInvalidUpdates = void 0;
   var didWarnStateUpdateForUnmountedComponent = {};
 
   warnAboutUpdateOnUnmounted = function(fiber) {
-    // We show the whole stack but dedupe on the top component's name because
-    // the problematic code almost always lies inside that component.
     var componentName = getComponentName(fiber) || "ReactClass";
     if (didWarnStateUpdateForUnmountedComponent[componentName]) {
       return;
     }
     warning(
       false,
-      "Can't call setState (or forceUpdate) on an unmounted component. This " +
-        "is a no-op, but it indicates a memory leak in your application. To " +
-        "fix, cancel all subscriptions and asynchronous tasks in the " +
-        "componentWillUnmount method.%s",
-      getStackAddendumByWorkInProgressFiber(fiber)
+      "Can only update a mounted or mounting " +
+        "component. This usually means you called setState, replaceState, " +
+        "or forceUpdate on an unmounted component. This is a no-op.\n\nPlease " +
+        "check the code for the %s component.",
+      componentName
     );
     didWarnStateUpdateForUnmountedComponent[componentName] = true;
   };
@@ -11941,23 +11456,16 @@ var warnAboutInvalidUpdates = void 0;
 }
 
 var ReactFiberScheduler = function(config) {
-  var stack = ReactFiberStack();
-  var hostContext = ReactFiberHostContext(config, stack);
-  var legacyContext = ReactFiberLegacyContext(stack);
-  var newContext = ReactFiberNewContext(stack);
+  var hostContext = ReactFiberHostContext(config);
   var popHostContext = hostContext.popHostContext,
     popHostContainer = hostContext.popHostContainer;
-  var popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
-    popLegacyContextProvider = legacyContext.popContextProvider;
-  var popProvider = newContext.popProvider;
 
   var hydrationContext = ReactFiberHydrationContext(config);
+  var resetHostContainer = hostContext.resetHostContainer;
 
   var _ReactFiberBeginWork = ReactFiberBeginWork(
       config,
       hostContext,
-      legacyContext,
-      newContext,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
@@ -11967,22 +11475,17 @@ var ReactFiberScheduler = function(config) {
   var _ReactFiberCompleteWo = ReactFiberCompleteWork(
       config,
       hostContext,
-      legacyContext,
-      newContext,
       hydrationContext
     ),
     completeWork = _ReactFiberCompleteWo.completeWork;
 
   var _ReactFiberUnwindWork = ReactFiberUnwindWork(
       hostContext,
-      legacyContext,
-      newContext,
       scheduleWork,
       isAlreadyFailedLegacyErrorBoundary
     ),
     throwException = _ReactFiberUnwindWork.throwException,
-    unwindWork = _ReactFiberUnwindWork.unwindWork,
-    unwindInterruptedWork = _ReactFiberUnwindWork.unwindInterruptedWork;
+    unwindWork = _ReactFiberUnwindWork.unwindWork;
 
   var _ReactFiberCommitWork = ReactFiberCommitWork(
       config,
@@ -11992,8 +11495,6 @@ var ReactFiberScheduler = function(config) {
       markLegacyErrorBoundaryAsFailed,
       recalculateCurrentTime
     ),
-    commitBeforeMutationLifeCycles =
-      _ReactFiberCommitWork.commitBeforeMutationLifeCycles,
     commitResetTextContent = _ReactFiberCommitWork.commitResetTextContent,
     commitPlacement = _ReactFiberCommitWork.commitPlacement,
     commitDeletion = _ReactFiberCommitWork.commitDeletion,
@@ -12045,29 +11546,21 @@ var ReactFiberScheduler = function(config) {
 
   var stashedWorkInProgressProperties = void 0;
   var replayUnitOfWork = void 0;
-  var isReplayingFailedUnitOfWork = void 0;
-  var originalReplayError = void 0;
-  var rethrowOriginalError = void 0;
   if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
     stashedWorkInProgressProperties = null;
-    isReplayingFailedUnitOfWork = false;
-    originalReplayError = null;
-    replayUnitOfWork = function(failedUnitOfWork, error, isAsync) {
-      // Restore the original state of the work-in-progress
-      assignFiberPropertiesInDEV(
-        failedUnitOfWork,
-        stashedWorkInProgressProperties
-      );
+    replayUnitOfWork = function(failedUnitOfWork, isAsync) {
+      // Retore the original state of the work-in-progress
+      Object.assign(failedUnitOfWork, stashedWorkInProgressProperties);
       switch (failedUnitOfWork.tag) {
         case HostRoot:
           popHostContainer(failedUnitOfWork);
-          popTopLevelLegacyContextObject(failedUnitOfWork);
+          popTopLevelContextObject(failedUnitOfWork);
           break;
         case HostComponent:
           popHostContext(failedUnitOfWork);
           break;
         case ClassComponent:
-          popLegacyContextProvider(failedUnitOfWork);
+          popContextProvider(failedUnitOfWork);
           break;
         case HostPortal:
           popHostContainer(failedUnitOfWork);
@@ -12077,36 +11570,28 @@ var ReactFiberScheduler = function(config) {
           break;
       }
       // Replay the begin phase.
-      isReplayingFailedUnitOfWork = true;
-      originalReplayError = error;
       invokeGuardedCallback$2(null, workLoop, null, isAsync);
-      isReplayingFailedUnitOfWork = false;
-      originalReplayError = null;
       if (hasCaughtError()) {
         clearCaughtError();
       } else {
-        // If the begin phase did not fail the second time, set this pointer
-        // back to the original value.
-        nextUnitOfWork = failedUnitOfWork;
+        // This should be unreachable because the render phase is
+        // idempotent
       }
     };
-    rethrowOriginalError = function() {
-      throw originalReplayError;
-    };
   }
 
-  function resetStack() {
-    if (nextUnitOfWork !== null) {
-      var interruptedWork = nextUnitOfWork["return"];
-      while (interruptedWork !== null) {
-        unwindInterruptedWork(interruptedWork);
-        interruptedWork = interruptedWork["return"];
-      }
-    }
+  function resetContextStack() {
+    // Reset the stack
+    reset();
+    // Reset the cursors
+    resetContext();
+    resetHostContainer();
+
+    // TODO: Unify new context implementation with other stacks
+    resetProviderStack();
 
     {
       ReactStrictModeWarnings.discardPendingWarnings();
-      stack.checkThatStackIsEmpty();
     }
 
     nextRoot = null;
@@ -12124,7 +11609,6 @@ var ReactFiberScheduler = function(config) {
       recordEffect();
 
       var effectTag = nextEffect.effectTag;
-
       if (effectTag & ContentReset) {
         commitResetTextContent(nextEffect);
       }
@@ -12182,22 +11666,6 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
-  function commitBeforeMutationLifecycles() {
-    while (nextEffect !== null) {
-      var effectTag = nextEffect.effectTag;
-
-      if (effectTag & Snapshot) {
-        recordEffect();
-        var current = nextEffect.alternate;
-        commitBeforeMutationLifeCycles(current, nextEffect);
-      }
-
-      // Don't cleanup effects yet;
-      // This will be done by commitAllLifeCycles()
-      nextEffect = nextEffect.nextEffect;
-    }
-  }
-
   function commitAllLifeCycles(
     finishedRoot,
     currentTime,
@@ -12305,14 +11773,16 @@ var ReactFiberScheduler = function(config) {
 
     prepareForCommit(root.containerInfo);
 
-    // Invoke instances of getSnapshotBeforeUpdate before mutation.
+    // Commit all the side-effects within a tree. We'll do this in two passes.
+    // The first pass performs all the host insertions, updates, deletions and
+    // ref unmounts.
     nextEffect = firstEffect;
-    startCommitSnapshotEffectsTimer();
+    startCommitHostEffectsTimer();
     while (nextEffect !== null) {
       var didError = false;
       var error = void 0;
       {
-        invokeGuardedCallback$2(null, commitBeforeMutationLifecycles, null);
+        invokeGuardedCallback$2(null, commitAllHostEffects, null);
         if (hasCaughtError()) {
           didError = true;
           error = clearCaughtError();
@@ -12331,36 +11801,6 @@ var ReactFiberScheduler = function(config) {
         }
       }
     }
-    stopCommitSnapshotEffectsTimer();
-
-    // Commit all the side-effects within a tree. We'll do this in two passes.
-    // The first pass performs all the host insertions, updates, deletions and
-    // ref unmounts.
-    nextEffect = firstEffect;
-    startCommitHostEffectsTimer();
-    while (nextEffect !== null) {
-      var _didError = false;
-      var _error = void 0;
-      {
-        invokeGuardedCallback$2(null, commitAllHostEffects, null);
-        if (hasCaughtError()) {
-          _didError = true;
-          _error = clearCaughtError();
-        }
-      }
-      if (_didError) {
-        invariant(
-          nextEffect !== null,
-          "Should have next effect. This error is likely caused by a bug " +
-            "in React. Please file an issue."
-        );
-        onCommitPhaseError(nextEffect, _error);
-        // Clean-up
-        if (nextEffect !== null) {
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    }
     stopCommitHostEffectsTimer();
 
     resetAfterCommit(root.containerInfo);
@@ -12378,8 +11818,8 @@ var ReactFiberScheduler = function(config) {
     nextEffect = firstEffect;
     startCommitLifeCyclesTimer();
     while (nextEffect !== null) {
-      var _didError2 = false;
-      var _error2 = void 0;
+      var _didError = false;
+      var _error = void 0;
       {
         invokeGuardedCallback$2(
           null,
@@ -12390,17 +11830,17 @@ var ReactFiberScheduler = function(config) {
           committedExpirationTime
         );
         if (hasCaughtError()) {
-          _didError2 = true;
-          _error2 = clearCaughtError();
+          _didError = true;
+          _error = clearCaughtError();
         }
       }
-      if (_didError2) {
+      if (_didError) {
         invariant(
           nextEffect !== null,
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        onCommitPhaseError(nextEffect, _error2);
+        onCommitPhaseError(nextEffect, _error);
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
         }
@@ -12624,21 +12064,12 @@ var ReactFiberScheduler = function(config) {
     }
 
     if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-      stashedWorkInProgressProperties = assignFiberPropertiesInDEV(
-        stashedWorkInProgressProperties,
-        workInProgress
-      );
+      stashedWorkInProgressProperties = Object.assign({}, workInProgress);
     }
     var next = beginWork(current, workInProgress, nextRenderExpirationTime);
+
     {
       ReactDebugCurrentFiber.resetCurrentFiber();
-      if (isReplayingFailedUnitOfWork) {
-        // Currently replaying a failed unit of work. This should be unreachable,
-        // because the render phase is meant to be idempotent, and it should
-        // have thrown again. Since it didn't, rethrow the original error, so
-        // React's internal stack is not misaligned.
-        rethrowOriginalError();
-      }
     }
     if (true && ReactFiberInstrumentation_1.debugTool) {
       ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
@@ -12684,7 +12115,7 @@ var ReactFiberScheduler = function(config) {
       nextUnitOfWork === null
     ) {
       // Reset the stack and start working from the root.
-      resetStack();
+      resetContextStack();
       nextRoot = root;
       nextRenderExpirationTime = expirationTime;
       nextUnitOfWork = createWorkInProgress(
@@ -12712,18 +12143,13 @@ var ReactFiberScheduler = function(config) {
 
         if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
           var failedUnitOfWork = nextUnitOfWork;
-          replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
+          replayUnitOfWork(failedUnitOfWork, isAsync);
         }
 
         var sourceFiber = nextUnitOfWork;
         var returnFiber = sourceFiber["return"];
         if (returnFiber === null) {
-          // This is the root. The root could capture its own errors. However,
-          // we don't know if it errors before or after we pushed the host
-          // context. This information is needed to avoid a stack mismatch.
-          // Because we're not sure, treat this as a fatal error. We could track
-          // which phase it fails in, but doesn't seem worth it. At least
-          // for now.
+          // This is a fatal error.
           didFatal = true;
           onUncaughtError(thrownValue);
           break;
@@ -12735,32 +12161,23 @@ var ReactFiberScheduler = function(config) {
     } while (true);
 
     // We're done performing work. Time to clean up.
-    var didCompleteRoot = false;
+    stopWorkLoopTimer(interruptedBy);
+    interruptedBy = null;
     isWorking = false;
 
     // Yield back to main thread.
     if (didFatal) {
-      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-      interruptedBy = null;
       // There was a fatal error.
-      {
-        stack.resetStackAfterFatalErrorInDev();
-      }
       return null;
     } else if (nextUnitOfWork === null) {
       // We reached the root.
       if (isRootReadyForCommit) {
-        didCompleteRoot = true;
-        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-        interruptedBy = null;
         // The root successfully completed. It's ready for commit.
         root.pendingCommitExpirationTime = expirationTime;
         var finishedWork = root.current.alternate;
         return finishedWork;
       } else {
         // The root did not complete.
-        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-        interruptedBy = null;
         invariant(
           false,
           "Expired work should have completed. This error is likely caused " +
@@ -12768,8 +12185,6 @@ var ReactFiberScheduler = function(config) {
         );
       }
     } else {
-      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-      interruptedBy = null;
       // There's more work to do, but we ran out of time. Yield back to
       // the renderer.
       return null;
@@ -12953,17 +12368,9 @@ var ReactFiberScheduler = function(config) {
           ) {
             // This is an interruption. (Used for performance tracking.)
             interruptedBy = fiber;
-            resetStack();
+            resetContextStack();
           }
-          if (
-            // If we're in the render phase, we don't need to schedule this root
-            // for an update, because we'll do it before we exit...
-            !isWorking ||
-            isCommitting ||
-            // ...unless this is a different root than the one we're rendering.
-            nextRoot !== root
-          ) {
-            // Add this root to the root schedule.
+          if (nextRoot !== root || !isWorking) {
             requestWork(root, expirationTime);
           }
           if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
@@ -13223,8 +12630,7 @@ var ReactFiberScheduler = function(config) {
 
     if (enableUserTimingAPI && deadline !== null) {
       var didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
-      var timeout = expirationTimeToMs(nextFlushedExpirationTime);
-      stopRequestCallbackTimer(didExpire, timeout);
+      stopRequestCallbackTimer(didExpire);
     }
 
     if (isAsync) {
@@ -13284,11 +12690,7 @@ var ReactFiberScheduler = function(config) {
     // Perform work on root as if the given expiration time is the current time.
     // This has the effect of synchronously flushing all work up to and
     // including the given time.
-    nextFlushedRoot = root;
-    nextFlushedExpirationTime = expirationTime;
     performWorkOnRoot(root, expirationTime, false);
-    // Flush any sync work that was scheduled by lifecycles
-    performSyncWork();
     finishRendering();
   }
 
@@ -13537,8 +12939,7 @@ var ReactFiberScheduler = function(config) {
     syncUpdates: syncUpdates,
     interactiveUpdates: interactiveUpdates,
     flushInteractiveUpdates: flushInteractiveUpdates,
-    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration,
-    legacyContext: legacyContext
+    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration
   };
 };
 
@@ -13551,6 +12952,18 @@ var didWarnAboutNestedUpdates = void 0;
 // 0 is PROD, 1 is DEV.
 // Might add PROFILE later.
 
+function getContextForSubtree(parentComponent) {
+  if (!parentComponent) {
+    return emptyObject;
+  }
+
+  var fiber = get(parentComponent);
+  var parentContext = findCurrentUnmaskedContext(fiber);
+  return isContextProvider(fiber)
+    ? processChildContext(fiber, parentContext)
+    : parentContext;
+}
+
 var ReactFiberReconciler$1 = function(config) {
   var getPublicInstance = config.getPublicInstance;
 
@@ -13569,24 +12982,7 @@ var ReactFiberReconciler$1 = function(config) {
     deferredUpdates = _ReactFiberScheduler.deferredUpdates,
     syncUpdates = _ReactFiberScheduler.syncUpdates,
     interactiveUpdates = _ReactFiberScheduler.interactiveUpdates,
-    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates,
-    legacyContext = _ReactFiberScheduler.legacyContext;
-
-  var findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
-    isContextProvider = legacyContext.isContextProvider,
-    processChildContext = legacyContext.processChildContext;
-
-  function getContextForSubtree(parentComponent) {
-    if (!parentComponent) {
-      return emptyObject;
-    }
-
-    var fiber = get(parentComponent);
-    var parentContext = findCurrentUnmaskedContext(fiber);
-    return isContextProvider(fiber)
-      ? processChildContext(fiber, parentContext)
-      : parentContext;
-  }
+    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates;
 
   function scheduleRootUpdate(
     current,
@@ -13615,14 +13011,12 @@ var ReactFiberReconciler$1 = function(config) {
 
     callback = callback === undefined ? null : callback;
     {
-      !(callback === null || typeof callback === "function")
-        ? warning(
-            false,
-            "render(...): Expected the last optional `callback` argument to be a " +
-              "function. Instead received: %s.",
-            callback
-          )
-        : void 0;
+      warning(
+        callback === null || typeof callback === "function",
+        "render(...): Expected the last optional `callback` argument to be a " +
+          "function. Instead received: %s.",
+        callback
+      );
     }
 
     var update = {
diff --git a/Libraries/Renderer/ReactFabric-prod.js b/Libraries/Renderer/ReactFabric-prod.js
index c12ebd601c84d0..950e09890f8203 100644
--- a/Libraries/Renderer/ReactFabric-prod.js
+++ b/Libraries/Renderer/ReactFabric-prod.js
@@ -945,9 +945,6 @@ var hasSymbol = "function" === typeof Symbol && Symbol["for"],
   REACT_PROVIDER_TYPE = hasSymbol ? Symbol["for"]("react.provider") : 60109,
   REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 60110,
   REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol["for"]("react.async_mode") : 60111,
-  REACT_FORWARD_REF_TYPE = hasSymbol
-    ? Symbol["for"]("react.forward_ref")
-    : 60112,
   MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
   if (null === maybeIterable || "undefined" === typeof maybeIterable)
@@ -1494,8 +1491,7 @@ var ReactNativeComponent = (function(_React$Component) {
   frameDeadlineObject = {
     timeRemaining: function() {
       return frameDeadline - now();
-    },
-    didTimeout: !1
+    }
   };
 function setTimeoutCallback() {
   frameDeadline = now() + 5;
@@ -1634,6 +1630,136 @@ function findCurrentHostFiberWithNoPortals(parent) {
   }
   return null;
 }
+var valueStack = [],
+  index = -1;
+function pop(cursor) {
+  0 > index ||
+    ((cursor.current = valueStack[index]), (valueStack[index] = null), index--);
+}
+function push(cursor, value) {
+  index++;
+  valueStack[index] = cursor.current;
+  cursor.current = value;
+}
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  do {
+    a: switch (workInProgress.tag) {
+      case 0:
+      case 1:
+      case 2:
+      case 5:
+        var owner = workInProgress._debugOwner,
+          source = workInProgress._debugSource;
+        var JSCompiler_inline_result = getComponentName(workInProgress);
+        var ownerName = null;
+        owner && (ownerName = getComponentName(owner));
+        owner = source;
+        JSCompiler_inline_result =
+          "\n    in " +
+          (JSCompiler_inline_result || "Unknown") +
+          (owner
+            ? " (at " +
+              owner.fileName.replace(/^.*[\\\/]/, "") +
+              ":" +
+              owner.lineNumber +
+              ")"
+            : ownerName ? " (created by " + ownerName + ")" : "");
+        break a;
+      default:
+        JSCompiler_inline_result = "";
+    }
+    info += JSCompiler_inline_result;
+    workInProgress = workInProgress["return"];
+  } while (workInProgress);
+  return info;
+}
+new Set();
+var contextStackCursor = { current: emptyObject },
+  didPerformWorkStackCursor = { current: !1 },
+  previousContext = emptyObject;
+function getUnmaskedContext(workInProgress) {
+  return isContextProvider(workInProgress)
+    ? previousContext
+    : contextStackCursor.current;
+}
+function getMaskedContext(workInProgress, unmaskedContext) {
+  var contextTypes = workInProgress.type.contextTypes;
+  if (!contextTypes) return emptyObject;
+  var instance = workInProgress.stateNode;
+  if (
+    instance &&
+    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+  )
+    return instance.__reactInternalMemoizedMaskedChildContext;
+  var context = {},
+    key;
+  for (key in contextTypes) context[key] = unmaskedContext[key];
+  instance &&
+    ((workInProgress = workInProgress.stateNode),
+    (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
+    (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
+  return context;
+}
+function isContextProvider(fiber) {
+  return 2 === fiber.tag && null != fiber.type.childContextTypes;
+}
+function popContextProvider(fiber) {
+  isContextProvider(fiber) &&
+    (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
+}
+function pushTopLevelContextObject(fiber, context, didChange) {
+  invariant(
+    null == contextStackCursor.cursor,
+    "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
+  );
+  push(contextStackCursor, context, fiber);
+  push(didPerformWorkStackCursor, didChange, fiber);
+}
+function processChildContext(fiber, parentContext) {
+  var instance = fiber.stateNode,
+    childContextTypes = fiber.type.childContextTypes;
+  if ("function" !== typeof instance.getChildContext) return parentContext;
+  instance = instance.getChildContext();
+  for (var contextKey in instance)
+    invariant(
+      contextKey in childContextTypes,
+      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+      getComponentName(fiber) || "Unknown",
+      contextKey
+    );
+  return Object.assign({}, parentContext, instance);
+}
+function pushContextProvider(workInProgress) {
+  if (!isContextProvider(workInProgress)) return !1;
+  var instance = workInProgress.stateNode;
+  instance =
+    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+    emptyObject;
+  previousContext = contextStackCursor.current;
+  push(contextStackCursor, instance, workInProgress);
+  push(
+    didPerformWorkStackCursor,
+    didPerformWorkStackCursor.current,
+    workInProgress
+  );
+  return !0;
+}
+function invalidateContextProvider(workInProgress, didChange) {
+  var instance = workInProgress.stateNode;
+  invariant(
+    instance,
+    "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+  );
+  if (didChange) {
+    var mergedContext = processChildContext(workInProgress, previousContext);
+    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+    pop(didPerformWorkStackCursor, workInProgress);
+    pop(contextStackCursor, workInProgress);
+    push(contextStackCursor, mergedContext, workInProgress);
+  } else pop(didPerformWorkStackCursor, workInProgress);
+  push(didPerformWorkStackCursor, didChange, workInProgress);
+}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -1717,9 +1843,6 @@ function createFiberFromElement(element, mode, expirationTime) {
             case REACT_CONTEXT_TYPE:
               fiberTag = 12;
               break;
-            case REACT_FORWARD_REF_TYPE:
-              fiberTag = 14;
-              break;
             default:
               if ("number" === typeof type.tag)
                 return (
@@ -1800,40 +1923,6 @@ function onCommitRoot(root) {
 function onCommitUnmount(fiber) {
   "function" === typeof onCommitFiberUnmount && onCommitFiberUnmount(fiber);
 }
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  do {
-    a: switch (workInProgress.tag) {
-      case 0:
-      case 1:
-      case 2:
-      case 5:
-        var owner = workInProgress._debugOwner,
-          source = workInProgress._debugSource;
-        var JSCompiler_inline_result = getComponentName(workInProgress);
-        var ownerName = null;
-        owner && (ownerName = getComponentName(owner));
-        owner = source;
-        JSCompiler_inline_result =
-          "\n    in " +
-          (JSCompiler_inline_result || "Unknown") +
-          (owner
-            ? " (at " +
-              owner.fileName.replace(/^.*[\\\/]/, "") +
-              ":" +
-              owner.lineNumber +
-              ")"
-            : ownerName ? " (created by " + ownerName + ")" : "");
-        break a;
-      default:
-        JSCompiler_inline_result = "";
-    }
-    info += JSCompiler_inline_result;
-    workInProgress = workInProgress["return"];
-  } while (workInProgress);
-  return info;
-}
-new Set();
 function createUpdateQueue(baseState) {
   return {
     baseState: baseState,
@@ -1989,7 +2078,6 @@ function commitCallbacks(queue, context) {
     }
 }
 function ReactFiberClassComponent(
-  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
@@ -2037,80 +2125,71 @@ function ReactFiberClassComponent(
     instance.state !== workInProgress &&
       updater.enqueueReplaceState(instance, instance.state, null);
   }
-  function callGetDerivedStateFromProps(
-    workInProgress,
-    instance,
-    nextProps,
-    prevState
-  ) {
-    workInProgress = workInProgress.type;
-    if ("function" === typeof workInProgress.getDerivedStateFromProps)
-      return workInProgress.getDerivedStateFromProps.call(
+  function callGetDerivedStateFromProps(workInProgress, instance, props) {
+    instance = workInProgress.type;
+    if ("function" === typeof instance.getDerivedStateFromProps)
+      return instance.getDerivedStateFromProps.call(
         null,
-        nextProps,
-        prevState
+        props,
+        workInProgress.memoizedState
       );
   }
-  var cacheContext = legacyContext.cacheContext,
-    getMaskedContext = legacyContext.getMaskedContext,
-    getUnmaskedContext = legacyContext.getUnmaskedContext,
-    isContextConsumer = legacyContext.isContextConsumer,
-    hasContextChanged = legacyContext.hasContextChanged,
-    updater = {
-      isMounted: isMounted,
-      enqueueSetState: function(instance, partialState, callback) {
-        instance = instance._reactInternalFiber;
-        callback = void 0 === callback ? null : callback;
-        var expirationTime = computeExpirationForFiber(instance);
-        insertUpdateIntoFiber(instance, {
-          expirationTime: expirationTime,
-          partialState: partialState,
-          callback: callback,
-          isReplace: !1,
-          isForced: !1,
-          capturedValue: null,
-          next: null
-        });
-        scheduleWork(instance, expirationTime);
-      },
-      enqueueReplaceState: function(instance, state, callback) {
-        instance = instance._reactInternalFiber;
-        callback = void 0 === callback ? null : callback;
-        var expirationTime = computeExpirationForFiber(instance);
-        insertUpdateIntoFiber(instance, {
-          expirationTime: expirationTime,
-          partialState: state,
-          callback: callback,
-          isReplace: !0,
-          isForced: !1,
-          capturedValue: null,
-          next: null
-        });
-        scheduleWork(instance, expirationTime);
-      },
-      enqueueForceUpdate: function(instance, callback) {
-        instance = instance._reactInternalFiber;
-        callback = void 0 === callback ? null : callback;
-        var expirationTime = computeExpirationForFiber(instance);
-        insertUpdateIntoFiber(instance, {
-          expirationTime: expirationTime,
-          partialState: null,
-          callback: callback,
-          isReplace: !1,
-          isForced: !0,
-          capturedValue: null,
-          next: null
-        });
-        scheduleWork(instance, expirationTime);
-      }
-    };
+  var updater = {
+    isMounted: isMounted,
+    enqueueSetState: function(instance, partialState, callback) {
+      instance = instance._reactInternalFiber;
+      callback = void 0 === callback ? null : callback;
+      var expirationTime = computeExpirationForFiber(instance);
+      insertUpdateIntoFiber(instance, {
+        expirationTime: expirationTime,
+        partialState: partialState,
+        callback: callback,
+        isReplace: !1,
+        isForced: !1,
+        capturedValue: null,
+        next: null
+      });
+      scheduleWork(instance, expirationTime);
+    },
+    enqueueReplaceState: function(instance, state, callback) {
+      instance = instance._reactInternalFiber;
+      callback = void 0 === callback ? null : callback;
+      var expirationTime = computeExpirationForFiber(instance);
+      insertUpdateIntoFiber(instance, {
+        expirationTime: expirationTime,
+        partialState: state,
+        callback: callback,
+        isReplace: !0,
+        isForced: !1,
+        capturedValue: null,
+        next: null
+      });
+      scheduleWork(instance, expirationTime);
+    },
+    enqueueForceUpdate: function(instance, callback) {
+      instance = instance._reactInternalFiber;
+      callback = void 0 === callback ? null : callback;
+      var expirationTime = computeExpirationForFiber(instance);
+      insertUpdateIntoFiber(instance, {
+        expirationTime: expirationTime,
+        partialState: null,
+        callback: callback,
+        isReplace: !1,
+        isForced: !0,
+        capturedValue: null,
+        next: null
+      });
+      scheduleWork(instance, expirationTime);
+    }
+  };
   return {
     adoptClassInstance: adoptClassInstance,
     callGetDerivedStateFromProps: callGetDerivedStateFromProps,
     constructClassInstance: function(workInProgress, props) {
       var ctor = workInProgress.type,
         unmaskedContext = getUnmaskedContext(workInProgress),
-        needsContext = isContextConsumer(workInProgress),
+        needsContext =
+          2 === workInProgress.tag && null != workInProgress.type.contextTypes,
         context = needsContext
           ? getMaskedContext(workInProgress, unmaskedContext)
           : emptyObject;
@@ -2119,7 +2198,7 @@ function ReactFiberClassComponent(
         null !== ctor.state && void 0 !== ctor.state ? ctor.state : null;
       adoptClassInstance(workInProgress, ctor);
       workInProgress.memoizedState = state;
-      props = callGetDerivedStateFromProps(workInProgress, ctor, props, state);
+      props = callGetDerivedStateFromProps(workInProgress, ctor, props);
       null !== props &&
         void 0 !== props &&
         (workInProgress.memoizedState = Object.assign(
@@ -2127,7 +2206,10 @@ function ReactFiberClassComponent(
           workInProgress.memoizedState,
           props
         ));
-      needsContext && cacheContext(workInProgress, unmaskedContext, context);
+      needsContext &&
+        ((workInProgress = workInProgress.stateNode),
+        (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
+        (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
       return ctor;
     },
     mountClassInstance: function(workInProgress, renderExpirationTime) {
@@ -2140,10 +2222,9 @@ function ReactFiberClassComponent(
       instance.state = workInProgress.memoizedState;
       instance.refs = emptyObject;
       instance.context = getMaskedContext(workInProgress, unmaskedContext);
-      "function" === typeof ctor.getDerivedStateFromProps ||
-        "function" === typeof instance.getSnapshotBeforeUpdate ||
-        ("function" !== typeof instance.UNSAFE_componentWillMount &&
-          "function" !== typeof instance.componentWillMount) ||
+      ("function" !== typeof instance.UNSAFE_componentWillMount &&
+        "function" !== typeof instance.componentWillMount) ||
+        "function" === typeof ctor.getDerivedStateFromProps ||
         ((ctor = instance.state),
         "function" === typeof instance.componentWillMount &&
           instance.componentWillMount(),
@@ -2174,11 +2255,9 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      (ctor =
+      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+        "function" !== typeof instance.componentWillReceiveProps) ||
         "function" === typeof ctor.getDerivedStateFromProps ||
-        "function" === typeof instance.getSnapshotBeforeUpdate) ||
-        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-          "function" !== typeof instance.componentWillReceiveProps) ||
         ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
           callComponentWillReceiveProps(
             workInProgress,
@@ -2186,7 +2265,14 @@ function ReactFiberClassComponent(
             newProps,
             newUnmaskedContext
           ));
-      oldContext = workInProgress.memoizedState;
+      oldContext = void 0;
+      oldProps !== newProps &&
+        (oldContext = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps
+        ));
+      var oldState = workInProgress.memoizedState;
       renderExpirationTime =
         null !== workInProgress.updateQueue
           ? processUpdateQueue(
@@ -2197,33 +2283,18 @@ function ReactFiberClassComponent(
               newProps,
               renderExpirationTime
             )
-          : oldContext;
-      var derivedStateFromProps = void 0;
-      oldProps !== newProps &&
-        (derivedStateFromProps = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps,
-          renderExpirationTime
-        ));
-      if (null !== derivedStateFromProps && void 0 !== derivedStateFromProps) {
-        renderExpirationTime =
+          : oldState;
+      null !== oldContext &&
+        void 0 !== oldContext &&
+        (renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? derivedStateFromProps
-            : Object.assign({}, renderExpirationTime, derivedStateFromProps);
-        var _updateQueue = workInProgress.updateQueue;
-        null !== _updateQueue &&
-          (_updateQueue.baseState = Object.assign(
-            {},
-            _updateQueue.baseState,
-            derivedStateFromProps
-          ));
-      }
+            ? oldContext
+            : Object.assign({}, renderExpirationTime, oldContext));
       if (
         !(
           oldProps !== newProps ||
-          oldContext !== renderExpirationTime ||
-          hasContextChanged() ||
+          oldState !== renderExpirationTime ||
+          didPerformWorkStackCursor.current ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -2237,18 +2308,26 @@ function ReactFiberClassComponent(
         workInProgress,
         oldProps,
         newProps,
-        oldContext,
+        oldState,
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (ctor ||
-            ("function" !== typeof instance.UNSAFE_componentWillMount &&
-              "function" !== typeof instance.componentWillMount) ||
-            ("function" === typeof instance.componentWillMount &&
-              instance.componentWillMount(),
-            "function" === typeof instance.UNSAFE_componentWillMount &&
-              instance.UNSAFE_componentWillMount()),
-          "function" === typeof instance.componentDidMount &&
+        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
+            "function" !== typeof instance.componentWillUpdate) ||
+            "function" === typeof ctor.getDerivedStateFromProps ||
+            ("function" === typeof instance.componentWillUpdate &&
+              instance.componentWillUpdate(
+                newProps,
+                renderExpirationTime,
+                newUnmaskedContext
+              ),
+            "function" === typeof instance.UNSAFE_componentWillUpdate &&
+              instance.UNSAFE_componentWillUpdate(
+                newProps,
+                renderExpirationTime,
+                newUnmaskedContext
+              )),
+          "function" === typeof instance.componentDidUpdate &&
             (workInProgress.effectTag |= 4))
         : ("function" === typeof instance.componentDidMount &&
             (workInProgress.effectTag |= 4),
@@ -2273,11 +2352,9 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      (ctor =
+      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+        "function" !== typeof instance.componentWillReceiveProps) ||
         "function" === typeof ctor.getDerivedStateFromProps ||
-        "function" === typeof instance.getSnapshotBeforeUpdate) ||
-        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-          "function" !== typeof instance.componentWillReceiveProps) ||
         ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
           callComponentWillReceiveProps(
             workInProgress,
@@ -2285,6 +2362,13 @@ function ReactFiberClassComponent(
             newProps,
             newUnmaskedContext
           ));
+      var derivedStateFromProps = void 0;
+      oldProps !== newProps &&
+        (derivedStateFromProps = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps
+        ));
       oldContext = workInProgress.memoizedState;
       renderExpirationTime =
         null !== workInProgress.updateQueue
@@ -2297,32 +2381,17 @@ function ReactFiberClassComponent(
               renderExpirationTime
             )
           : oldContext;
-      var derivedStateFromProps = void 0;
-      oldProps !== newProps &&
-        (derivedStateFromProps = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps,
-          renderExpirationTime
-        ));
-      if (null !== derivedStateFromProps && void 0 !== derivedStateFromProps) {
-        renderExpirationTime =
+      null !== derivedStateFromProps &&
+        void 0 !== derivedStateFromProps &&
+        (renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
             ? derivedStateFromProps
-            : Object.assign({}, renderExpirationTime, derivedStateFromProps);
-        var _updateQueue3 = workInProgress.updateQueue;
-        null !== _updateQueue3 &&
-          (_updateQueue3.baseState = Object.assign(
-            {},
-            _updateQueue3.baseState,
-            derivedStateFromProps
-          ));
-      }
+            : Object.assign({}, renderExpirationTime, derivedStateFromProps));
       if (
         !(
           oldProps !== newProps ||
           oldContext !== renderExpirationTime ||
-          hasContextChanged() ||
+          didPerformWorkStackCursor.current ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -2332,10 +2401,6 @@ function ReactFiberClassComponent(
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
-          "function" !== typeof instance.getSnapshotBeforeUpdate ||
-            (oldProps === current.memoizedProps &&
-              oldContext === current.memoizedState) ||
-            (workInProgress.effectTag |= 2048),
           !1
         );
       (derivedStateFromProps = checkShouldComponentUpdate(
@@ -2346,9 +2411,9 @@ function ReactFiberClassComponent(
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (ctor ||
-            ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
-              "function" !== typeof instance.componentWillUpdate) ||
+        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
+            "function" !== typeof instance.componentWillUpdate) ||
+            "function" === typeof ctor.getDerivedStateFromProps ||
             ("function" === typeof instance.componentWillUpdate &&
               instance.componentWillUpdate(
                 newProps,
@@ -2362,17 +2427,11 @@ function ReactFiberClassComponent(
                 newUnmaskedContext
               )),
           "function" === typeof instance.componentDidUpdate &&
-            (workInProgress.effectTag |= 4),
-          "function" === typeof instance.getSnapshotBeforeUpdate &&
-            (workInProgress.effectTag |= 2048))
+            (workInProgress.effectTag |= 4))
         : ("function" !== typeof instance.componentDidUpdate ||
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
-          "function" !== typeof instance.getSnapshotBeforeUpdate ||
-            (oldProps === current.memoizedProps &&
-              oldContext === current.memoizedState) ||
-            (workInProgress.effectTag |= 2048),
           memoizeProps(workInProgress, newProps),
           memoizeState(workInProgress, renderExpirationTime));
       instance.props = newProps;
@@ -3055,12 +3114,34 @@ function ChildReconciler(shouldTrackSideEffects) {
   };
 }
 var reconcileChildFibers = ChildReconciler(!0),
-  mountChildFibers = ChildReconciler(!1);
+  mountChildFibers = ChildReconciler(!1),
+  changedBitsStack = [],
+  currentValueStack = [],
+  stack = [],
+  index$1 = -1;
+function pushProvider(providerFiber) {
+  var context = providerFiber.type.context;
+  index$1 += 1;
+  changedBitsStack[index$1] = context._changedBits;
+  currentValueStack[index$1] = context._currentValue;
+  stack[index$1] = providerFiber;
+  context._currentValue = providerFiber.pendingProps.value;
+  context._changedBits = providerFiber.stateNode;
+}
+function popProvider(providerFiber) {
+  var changedBits = changedBitsStack[index$1],
+    currentValue = currentValueStack[index$1];
+  changedBitsStack[index$1] = null;
+  currentValueStack[index$1] = null;
+  stack[index$1] = null;
+  --index$1;
+  providerFiber = providerFiber.type.context;
+  providerFiber._currentValue = currentValue;
+  providerFiber._changedBits = changedBits;
+}
 function ReactFiberBeginWork(
   config,
   hostContext,
-  legacyContext,
-  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
@@ -3157,12 +3238,7 @@ function ReactFiberBeginWork(
     changedBits,
     renderExpirationTime
   ) {
-    var fiber = workInProgress.child;
-    for (
-      null !== fiber && (fiber["return"] = workInProgress);
-      null !== fiber;
-
-    ) {
+    for (var fiber = workInProgress.child; null !== fiber; ) {
       switch (fiber.tag) {
         case 12:
           var nextFiber = fiber.stateNode | 0;
@@ -3218,10 +3294,10 @@ function ReactFiberBeginWork(
     workInProgress,
     renderExpirationTime
   ) {
-    var context = workInProgress.type._context,
+    var context = workInProgress.type.context,
       newProps = workInProgress.pendingProps,
       oldProps = workInProgress.memoizedProps;
-    if (!hasLegacyContextChanged() && oldProps === newProps)
+    if (!didPerformWorkStackCursor.current && oldProps === newProps)
       return (
         (workInProgress.stateNode = 0),
         pushProvider(workInProgress),
@@ -3308,19 +3384,11 @@ function ReactFiberBeginWork(
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree,
     pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer,
-    pushProvider = newContext.pushProvider,
-    getMaskedContext = legacyContext.getMaskedContext,
-    getUnmaskedContext = legacyContext.getUnmaskedContext,
-    hasLegacyContextChanged = legacyContext.hasContextChanged,
-    pushLegacyContextProvider = legacyContext.pushContextProvider,
-    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
-    invalidateContextProvider = legacyContext.invalidateContextProvider,
     enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
   config = ReactFiberClassComponent(
-    legacyContext,
     scheduleWork,
     computeExpirationForFiber,
     function(workInProgress, nextProps) {
@@ -3347,7 +3415,7 @@ function ReactFiberBeginWork(
             pushHostRootContext(workInProgress);
             break;
           case 2:
-            pushLegacyContextProvider(workInProgress);
+            pushContextProvider(workInProgress);
             break;
           case 4:
             pushHostContainer(
@@ -3384,8 +3452,7 @@ function ReactFiberBeginWork(
                 ((props = callGetDerivedStateFromProps(
                   workInProgress,
                   fn,
-                  props,
-                  workInProgress.memoizedState
+                  props
                 )),
                 null !== props &&
                   void 0 !== props &&
@@ -3394,7 +3461,7 @@ function ReactFiberBeginWork(
                     workInProgress.memoizedState,
                     props
                   ))),
-              (props = pushLegacyContextProvider(workInProgress)),
+              (props = pushContextProvider(workInProgress)),
               adoptClassInstance(workInProgress, fn),
               mountClassInstance(workInProgress, renderExpirationTime),
               (current = finishClassComponent(
@@ -3414,7 +3481,7 @@ function ReactFiberBeginWork(
           return (
             (props = workInProgress.type),
             (renderExpirationTime = workInProgress.pendingProps),
-            hasLegacyContextChanged() ||
+            didPerformWorkStackCursor.current ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? ((fn = getUnmaskedContext(workInProgress)),
                 (fn = getMaskedContext(workInProgress, fn)),
@@ -3430,7 +3497,7 @@ function ReactFiberBeginWork(
             current
           );
         case 2:
-          props = pushLegacyContextProvider(workInProgress);
+          props = pushContextProvider(workInProgress);
           null === current
             ? null === workInProgress.stateNode
               ? (constructClassInstance(
@@ -3512,7 +3579,7 @@ function ReactFiberBeginWork(
             updateQueue = workInProgress.memoizedProps;
             fn = workInProgress.pendingProps;
             unmaskedContext = null !== current ? current.memoizedProps : null;
-            if (!hasLegacyContextChanged() && updateQueue === fn) {
+            if (!didPerformWorkStackCursor.current && updateQueue === fn) {
               if (
                 (updateQueue =
                   workInProgress.mode & 1 &&
@@ -3554,7 +3621,7 @@ function ReactFiberBeginWork(
         case 7:
           return (
             (props = workInProgress.pendingProps),
-            hasLegacyContextChanged() ||
+            didPerformWorkStackCursor.current ||
               workInProgress.memoizedProps !== props ||
               (props = workInProgress.memoizedProps),
             (fn = props.children),
@@ -3584,7 +3651,8 @@ function ReactFiberBeginWork(
               workInProgress.stateNode.containerInfo
             ),
             (props = workInProgress.pendingProps),
-            hasLegacyContextChanged() || workInProgress.memoizedProps !== props
+            didPerformWorkStackCursor.current ||
+            workInProgress.memoizedProps !== props
               ? (null === current
                   ? (workInProgress.child = reconcileChildFibers(
                       workInProgress,
@@ -3601,21 +3669,10 @@ function ReactFiberBeginWork(
                 )),
             current
           );
-        case 14:
-          return (
-            (renderExpirationTime = workInProgress.type.render),
-            (renderExpirationTime = renderExpirationTime(
-              workInProgress.pendingProps,
-              workInProgress.ref
-            )),
-            reconcileChildren(current, workInProgress, renderExpirationTime),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            workInProgress.child
-          );
         case 10:
           return (
             (renderExpirationTime = workInProgress.pendingProps),
-            hasLegacyContextChanged() ||
+            didPerformWorkStackCursor.current ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? (reconcileChildren(
                   current,
@@ -3633,7 +3690,7 @@ function ReactFiberBeginWork(
         case 11:
           return (
             (renderExpirationTime = workInProgress.pendingProps.children),
-            hasLegacyContextChanged() ||
+            didPerformWorkStackCursor.current ||
             (null !== renderExpirationTime &&
               workInProgress.memoizedProps !== renderExpirationTime)
               ? (reconcileChildren(
@@ -3656,33 +3713,43 @@ function ReactFiberBeginWork(
             renderExpirationTime
           );
         case 12:
-          fn = workInProgress.type;
-          unmaskedContext = workInProgress.pendingProps;
-          var oldProps = workInProgress.memoizedProps;
-          props = fn._currentValue;
-          updateQueue = fn._changedBits;
-          if (
-            hasLegacyContextChanged() ||
-            0 !== updateQueue ||
-            oldProps !== unmaskedContext
-          ) {
-            workInProgress.memoizedProps = unmaskedContext;
-            oldProps = unmaskedContext.unstable_observedBits;
-            if (void 0 === oldProps || null === oldProps) oldProps = 1073741823;
-            workInProgress.stateNode = oldProps;
-            0 !== (updateQueue & oldProps) &&
-              propagateContextChange(
-                workInProgress,
-                fn,
-                updateQueue,
-                renderExpirationTime
-              );
-            renderExpirationTime = unmaskedContext.children;
-            renderExpirationTime = renderExpirationTime(props);
-            reconcileChildren(current, workInProgress, renderExpirationTime);
-            current = workInProgress.child;
-          } else
-            current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+          a: {
+            fn = workInProgress.type;
+            unmaskedContext = workInProgress.pendingProps;
+            updateQueue = workInProgress.memoizedProps;
+            props = fn._currentValue;
+            var changedBits = fn._changedBits;
+            if (
+              didPerformWorkStackCursor.current ||
+              0 !== changedBits ||
+              updateQueue !== unmaskedContext
+            ) {
+              workInProgress.memoizedProps = unmaskedContext;
+              var observedBits = unmaskedContext.unstable_observedBits;
+              if (void 0 === observedBits || null === observedBits)
+                observedBits = 1073741823;
+              workInProgress.stateNode = observedBits;
+              if (0 !== (changedBits & observedBits))
+                propagateContextChange(
+                  workInProgress,
+                  fn,
+                  changedBits,
+                  renderExpirationTime
+                );
+              else if (
+                null !== updateQueue &&
+                updateQueue.children === unmaskedContext.children
+              ) {
+                current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+                break a;
+              }
+              renderExpirationTime = unmaskedContext.children;
+              renderExpirationTime = renderExpirationTime(props);
+              reconcileChildren(current, workInProgress, renderExpirationTime);
+              current = workInProgress.child;
+            } else
+              current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+          }
           return current;
         default:
           invariant(
@@ -3693,13 +3760,7 @@ function ReactFiberBeginWork(
     }
   };
 }
-function ReactFiberCompleteWork(
-  config,
-  hostContext,
-  legacyContext,
-  newContext,
-  hydrationContext
-) {
+function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
   function markUpdate(workInProgress) {
     workInProgress.effectTag |= 4;
   }
@@ -3732,9 +3793,6 @@ function ReactFiberCompleteWork(
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer,
-    popLegacyContextProvider = legacyContext.popContextProvider,
-    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
-    popProvider = newContext.popProvider,
     prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -3834,7 +3892,7 @@ function ReactFiberCompleteWork(
           return null;
         case 2:
           return (
-            popLegacyContextProvider(workInProgress),
+            popContextProvider(workInProgress),
             (current = workInProgress.stateNode),
             (newProps = workInProgress.updateQueue),
             null !== newProps &&
@@ -3847,7 +3905,8 @@ function ReactFiberCompleteWork(
           );
         case 3:
           popHostContainer(workInProgress);
-          popTopLevelLegacyContextObject(workInProgress);
+          pop(didPerformWorkStackCursor, workInProgress);
+          pop(contextStackCursor, workInProgress);
           newProps = workInProgress.stateNode;
           newProps.pendingContext &&
             ((newProps.context = newProps.pendingContext),
@@ -3999,8 +4058,6 @@ function ReactFiberCompleteWork(
           return (workInProgress.tag = 7), null;
         case 9:
           return null;
-        case 14:
-          return null;
         case 10:
           return null;
         case 11:
@@ -4031,16 +4088,11 @@ function ReactFiberCompleteWork(
 }
 function ReactFiberUnwindWork(
   hostContext,
-  legacyContext,
-  newContext,
   scheduleWork,
   isAlreadyFailedLegacyErrorBoundary
 ) {
   var popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext,
-    popLegacyContextProvider = legacyContext.popContextProvider,
-    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
-    popProvider = newContext.popProvider;
+    popHostContext = hostContext.popHostContext;
   return {
     throwException: function(returnFiber, sourceFiber, rawValue) {
       sourceFiber.effectTag |= 512;
@@ -4081,7 +4133,7 @@ function ReactFiberUnwindWork(
     unwindWork: function(workInProgress) {
       switch (workInProgress.tag) {
         case 2:
-          popLegacyContextProvider(workInProgress);
+          popContextProvider(workInProgress);
           var effectTag = workInProgress.effectTag;
           return effectTag & 1024
             ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4090,7 +4142,8 @@ function ReactFiberUnwindWork(
         case 3:
           return (
             popHostContainer(workInProgress),
-            popTopLevelLegacyContextObject(workInProgress),
+            pop(didPerformWorkStackCursor, workInProgress),
+            pop(contextStackCursor, workInProgress),
             (effectTag = workInProgress.effectTag),
             effectTag & 1024
               ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4106,25 +4159,6 @@ function ReactFiberUnwindWork(
         default:
           return null;
       }
-    },
-    unwindInterruptedWork: function(interruptedWork) {
-      switch (interruptedWork.tag) {
-        case 2:
-          popLegacyContextProvider(interruptedWork);
-          break;
-        case 3:
-          popHostContainer(interruptedWork);
-          popTopLevelLegacyContextObject(interruptedWork);
-          break;
-        case 5:
-          popHostContext(interruptedWork);
-          break;
-        case 4:
-          popHostContainer(interruptedWork);
-          break;
-        case 13:
-          popProvider(interruptedWork);
-      }
     }
   };
 }
@@ -4133,7 +4167,7 @@ function logError(boundary, errorInfo) {
   null === errorInfo.stack && getStackAddendumByWorkInProgressFiber(source);
   null !== source && getComponentName(source);
   errorInfo = errorInfo.value;
-  null !== boundary && 2 === boundary.tag && getComponentName(boundary);
+  null !== boundary && getComponentName(boundary);
   try {
     (errorInfo && errorInfo.suppressReactErrorLogging) ||
       console.error(errorInfo);
@@ -4157,32 +4191,7 @@ function ReactFiberCommitWork(
         } catch (refError) {
           captureError(current, refError);
         }
-      else ref.current = null;
-  }
-  function commitBeforeMutationLifeCycles(current, finishedWork) {
-    switch (finishedWork.tag) {
-      case 2:
-        if (finishedWork.effectTag & 2048 && null !== current) {
-          var prevProps = current.memoizedProps,
-            prevState = current.memoizedState;
-          current = finishedWork.stateNode;
-          current.props = finishedWork.memoizedProps;
-          current.state = finishedWork.memoizedState;
-          finishedWork = current.getSnapshotBeforeUpdate(prevProps, prevState);
-          current.__reactInternalSnapshotBeforeUpdate = finishedWork;
-        }
-        break;
-      case 3:
-      case 5:
-      case 6:
-      case 4:
-        break;
-      default:
-        invariant(
-          !1,
-          "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-        );
-    }
+      else ref.value = null;
   }
   function commitLifeCycles(finishedRoot, current, finishedWork) {
     switch (finishedWork.tag) {
@@ -4198,11 +4207,7 @@ function ReactFiberCommitWork(
             current = current.memoizedState;
             finishedRoot.props = finishedWork.memoizedProps;
             finishedRoot.state = finishedWork.memoizedState;
-            finishedRoot.componentDidUpdate(
-              prevProps,
-              current,
-              finishedRoot.__reactInternalSnapshotBeforeUpdate
-            );
+            finishedRoot.componentDidUpdate(prevProps, current);
           }
         finishedWork = finishedWork.updateQueue;
         null !== finishedWork && commitCallbacks(finishedWork, finishedRoot);
@@ -4262,12 +4267,9 @@ function ReactFiberCommitWork(
         onUncaughtError.state = finishedWork.memoizedState;
         for (ctor = 0; ctor < capturedErrors.length; ctor++) {
           updateQueue = capturedErrors[ctor];
-          var _error = updateQueue.value,
-            stack = updateQueue.stack;
+          var _error = updateQueue.value;
           logError(finishedWork, updateQueue);
-          onUncaughtError.componentDidCatch(_error, {
-            componentStack: null !== stack ? stack : ""
-          });
+          onUncaughtError.componentDidCatch(_error);
         }
         break;
       case 3:
@@ -4293,25 +4295,23 @@ function ReactFiberCommitWork(
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (null !== ref) {
-      var _instance6 = finishedWork.stateNode;
+      var _instance5 = finishedWork.stateNode;
       switch (finishedWork.tag) {
         case 5:
-          finishedWork = getPublicInstance(_instance6);
+          finishedWork = getPublicInstance(_instance5);
           break;
         default:
-          finishedWork = _instance6;
+          finishedWork = _instance5;
       }
       "function" === typeof ref
         ? ref(finishedWork)
-        : (ref.current = finishedWork);
+        : (ref.value = finishedWork);
     }
   }
   function commitDetachRef(current) {
     current = current.ref;
     null !== current &&
-      ("function" === typeof current
-        ? current(null)
-        : (current.current = null));
+      ("function" === typeof current ? current(null) : (current.value = null));
   }
   function commitNestedUnmounts(root) {
     for (var node = root; ; ) {
@@ -4320,12 +4320,12 @@ function ReactFiberCommitWork(
       switch (current.tag) {
         case 2:
           safelyDetachRef(current);
-          var _instance7 = current.stateNode;
-          if ("function" === typeof _instance7.componentWillUnmount)
+          var _instance6 = current.stateNode;
+          if ("function" === typeof _instance6.componentWillUnmount)
             try {
-              (_instance7.props = current.memoizedProps),
-                (_instance7.state = current.memoizedState),
-                _instance7.componentWillUnmount();
+              (_instance6.props = current.memoizedProps),
+                (_instance6.state = current.memoizedState),
+                _instance6.componentWillUnmount();
             } catch (unmountError) {
               captureError(current, unmountError);
             }
@@ -4403,7 +4403,6 @@ function ReactFiberCommitWork(
         commitContainer(finishedWork);
       },
       commitLifeCycles: commitLifeCycles,
-      commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
       commitErrorLogging: commitErrorLogging,
       commitAttachRef: commitAttachRef,
       commitDetachRef: commitDetachRef
@@ -4413,7 +4412,7 @@ function ReactFiberCommitWork(
   invariant(!1, "Mutating reconciler is disabled.");
 }
 var NO_CONTEXT = {};
-function ReactFiberHostContext(config, stack) {
+function ReactFiberHostContext(config) {
   function requiredContext(c) {
     invariant(
       c !== NO_CONTEXT,
@@ -4422,13 +4421,10 @@ function ReactFiberHostContext(config, stack) {
     return c;
   }
   var getChildHostContext = config.getChildHostContext,
-    getRootHostContext = config.getRootHostContext;
-  config = stack.createCursor;
-  var push = stack.push,
-    pop = stack.pop,
-    contextStackCursor = config(NO_CONTEXT),
-    contextFiberStackCursor = config(NO_CONTEXT),
-    rootInstanceStackCursor = config(NO_CONTEXT);
+    getRootHostContext = config.getRootHostContext,
+    contextStackCursor = { current: NO_CONTEXT },
+    contextFiberStackCursor = { current: NO_CONTEXT },
+    rootInstanceStackCursor = { current: NO_CONTEXT };
   return {
     getHostContext: function() {
       return requiredContext(contextStackCursor.current);
@@ -4447,10 +4443,8 @@ function ReactFiberHostContext(config, stack) {
     },
     pushHostContainer: function(fiber, nextRootInstance) {
       push(rootInstanceStackCursor, nextRootInstance, fiber);
-      push(contextFiberStackCursor, fiber, fiber);
-      push(contextStackCursor, NO_CONTEXT, fiber);
       nextRootInstance = getRootHostContext(nextRootInstance);
-      pop(contextStackCursor, fiber);
+      push(contextFiberStackCursor, fiber, fiber);
       push(contextStackCursor, nextRootInstance, fiber);
     },
     pushHostContext: function(fiber) {
@@ -4460,6 +4454,10 @@ function ReactFiberHostContext(config, stack) {
       context !== rootInstance &&
         (push(contextFiberStackCursor, fiber, fiber),
         push(contextStackCursor, rootInstance, fiber));
+    },
+    resetHostContainer: function() {
+      contextStackCursor.current = NO_CONTEXT;
+      rootInstanceStackCursor.current = NO_CONTEXT;
     }
   };
 }
@@ -4619,198 +4617,22 @@ function ReactFiberHydrationContext(config) {
     }
   };
 }
-function ReactFiberLegacyContext(stack) {
-  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-    workInProgress = workInProgress.stateNode;
-    workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-    workInProgress.__reactInternalMemoizedMaskedChildContext = maskedContext;
-  }
-  function isContextProvider(fiber) {
-    return 2 === fiber.tag && null != fiber.type.childContextTypes;
-  }
-  function processChildContext(fiber, parentContext) {
-    var instance = fiber.stateNode,
-      childContextTypes = fiber.type.childContextTypes;
-    if ("function" !== typeof instance.getChildContext) return parentContext;
-    instance = instance.getChildContext();
-    for (var contextKey in instance)
-      invariant(
-        contextKey in childContextTypes,
-        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-        getComponentName(fiber) || "Unknown",
-        contextKey
-      );
-    return Object.assign({}, parentContext, instance);
-  }
-  var createCursor = stack.createCursor,
-    push = stack.push,
-    pop = stack.pop,
-    contextStackCursor = createCursor(emptyObject),
-    didPerformWorkStackCursor = createCursor(!1),
+function ReactFiberScheduler(config) {
+  function resetContextStack() {
+    for (; -1 < index; ) (valueStack[index] = null), index--;
     previousContext = emptyObject;
-  return {
-    getUnmaskedContext: function(workInProgress) {
-      return isContextProvider(workInProgress)
-        ? previousContext
-        : contextStackCursor.current;
-    },
-    cacheContext: cacheContext,
-    getMaskedContext: function(workInProgress, unmaskedContext) {
-      var contextTypes = workInProgress.type.contextTypes;
-      if (!contextTypes) return emptyObject;
-      var instance = workInProgress.stateNode;
-      if (
-        instance &&
-        instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-      )
-        return instance.__reactInternalMemoizedMaskedChildContext;
-      var context = {},
-        key;
-      for (key in contextTypes) context[key] = unmaskedContext[key];
-      instance && cacheContext(workInProgress, unmaskedContext, context);
-      return context;
-    },
-    hasContextChanged: function() {
-      return didPerformWorkStackCursor.current;
-    },
-    isContextConsumer: function(fiber) {
-      return 2 === fiber.tag && null != fiber.type.contextTypes;
-    },
-    isContextProvider: isContextProvider,
-    popContextProvider: function(fiber) {
-      isContextProvider(fiber) &&
-        (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
-    },
-    popTopLevelContextObject: function(fiber) {
-      pop(didPerformWorkStackCursor, fiber);
-      pop(contextStackCursor, fiber);
-    },
-    pushTopLevelContextObject: function(fiber, context, didChange) {
-      invariant(
-        null == contextStackCursor.cursor,
-        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
-      );
-      push(contextStackCursor, context, fiber);
-      push(didPerformWorkStackCursor, didChange, fiber);
-    },
-    processChildContext: processChildContext,
-    pushContextProvider: function(workInProgress) {
-      if (!isContextProvider(workInProgress)) return !1;
-      var instance = workInProgress.stateNode;
-      instance =
-        (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-        emptyObject;
-      previousContext = contextStackCursor.current;
-      push(contextStackCursor, instance, workInProgress);
-      push(
-        didPerformWorkStackCursor,
-        didPerformWorkStackCursor.current,
-        workInProgress
-      );
-      return !0;
-    },
-    invalidateContextProvider: function(workInProgress, didChange) {
-      var instance = workInProgress.stateNode;
-      invariant(
-        instance,
-        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
-      );
-      if (didChange) {
-        var mergedContext = processChildContext(
-          workInProgress,
-          previousContext
-        );
-        instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-        pop(didPerformWorkStackCursor, workInProgress);
-        pop(contextStackCursor, workInProgress);
-        push(contextStackCursor, mergedContext, workInProgress);
-      } else pop(didPerformWorkStackCursor, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    },
-    findCurrentUnmaskedContext: function(fiber) {
-      for (
-        invariant(
-          2 === isFiberMountedImpl(fiber) && 2 === fiber.tag,
-          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-        );
-        3 !== fiber.tag;
-
-      ) {
-        if (isContextProvider(fiber))
-          return fiber.stateNode.__reactInternalMemoizedMergedChildContext;
-        fiber = fiber["return"];
-        invariant(
-          fiber,
-          "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-        );
-      }
-      return fiber.stateNode.context;
-    }
-  };
-}
-function ReactFiberNewContext(stack) {
-  var createCursor = stack.createCursor,
-    push = stack.push,
-    pop = stack.pop,
-    providerCursor = createCursor(null),
-    valueCursor = createCursor(null),
-    changedBitsCursor = createCursor(0);
-  return {
-    pushProvider: function(providerFiber) {
-      var context = providerFiber.type._context;
-      push(changedBitsCursor, context._changedBits, providerFiber);
-      push(valueCursor, context._currentValue, providerFiber);
-      push(providerCursor, providerFiber, providerFiber);
-      context._currentValue = providerFiber.pendingProps.value;
-      context._changedBits = providerFiber.stateNode;
-    },
-    popProvider: function(providerFiber) {
-      var changedBits = changedBitsCursor.current,
-        currentValue = valueCursor.current;
-      pop(providerCursor, providerFiber);
-      pop(valueCursor, providerFiber);
-      pop(changedBitsCursor, providerFiber);
-      providerFiber = providerFiber.type._context;
-      providerFiber._currentValue = currentValue;
-      providerFiber._changedBits = changedBits;
+    contextStackCursor.current = emptyObject;
+    didPerformWorkStackCursor.current = !1;
+    resetHostContainer();
+    for (var i = index$1; -1 < i; i--) {
+      var context = stack[i].type.context;
+      context._currentValue = context._defaultValue;
+      context._changedBits = 0;
+      changedBitsStack[i] = null;
+      currentValueStack[i] = null;
+      stack[i] = null;
     }
-  };
-}
-function ReactFiberStack() {
-  var valueStack = [],
-    index = -1;
-  return {
-    createCursor: function(defaultValue) {
-      return { current: defaultValue };
-    },
-    isEmpty: function() {
-      return -1 === index;
-    },
-    pop: function(cursor) {
-      0 > index ||
-        ((cursor.current = valueStack[index]),
-        (valueStack[index] = null),
-        index--);
-    },
-    push: function(cursor, value) {
-      index++;
-      valueStack[index] = cursor.current;
-      cursor.current = value;
-    },
-    checkThatStackIsEmpty: function() {},
-    resetStackAfterFatalErrorInDev: function() {}
-  };
-}
-function ReactFiberScheduler(config) {
-  function resetStack() {
-    if (null !== nextUnitOfWork)
-      for (
-        var interruptedWork = nextUnitOfWork["return"];
-        null !== interruptedWork;
-
-      )
-        unwindInterruptedWork(interruptedWork),
-          (interruptedWork = interruptedWork["return"]);
+    index$1 = -1;
     nextRoot = null;
     nextRenderExpirationTime = 0;
     nextUnitOfWork = null;
@@ -4883,7 +4705,7 @@ function ReactFiberScheduler(config) {
         workInProgress$jscomp$0 = unwindWork(workInProgress$jscomp$0);
         if (null !== workInProgress$jscomp$0)
           return (
-            (workInProgress$jscomp$0.effectTag &= 2559), workInProgress$jscomp$0
+            (workInProgress$jscomp$0.effectTag &= 511), workInProgress$jscomp$0
           );
         null !== returnFiber &&
           ((returnFiber.firstEffect = returnFiber.lastEffect = null),
@@ -4916,7 +4738,7 @@ function ReactFiberScheduler(config) {
       root !== nextRoot ||
       null === nextUnitOfWork
     )
-      resetStack(),
+      resetContextStack(),
         (nextRoot = root),
         (nextRenderExpirationTime = expirationTime),
         (nextUnitOfWork = createWorkInProgress(
@@ -5046,8 +4868,8 @@ function ReactFiberScheduler(config) {
             !isWorking &&
               0 !== nextRenderExpirationTime &&
               expirationTime < nextRenderExpirationTime &&
-              resetStack();
-            (isWorking && !isCommitting && nextRoot === root) ||
+              resetContextStack();
+            (nextRoot === root && isWorking) ||
               requestWork(root, expirationTime);
             nestedUpdateCount > NESTED_UPDATE_LIMIT &&
               invariant(
@@ -5111,7 +4933,7 @@ function ReactFiberScheduler(config) {
           (nextFlushedExpirationTime = 1),
           performWorkOnRoot(root, 1, !1))
         : 1 === expirationTime
-          ? performSyncWork()
+          ? performWork(1, !1, null)
           : scheduleCallbackWithExpiration(expirationTime));
   }
   function findHighestPriorityRoot() {
@@ -5171,9 +4993,6 @@ function ReactFiberScheduler(config) {
   function performAsyncWork(dl) {
     performWork(0, !0, dl);
   }
-  function performSyncWork() {
-    performWork(1, !1, null);
-  }
   function performWork(minExpirationTime, isAsync, dl) {
     deadline = dl;
     findHighestPriorityRoot();
@@ -5296,25 +5115,6 @@ function ReactFiberScheduler(config) {
     for (nextEffect = firstEffect; null !== nextEffect; ) {
       var didError = !1,
         error = void 0;
-      try {
-        for (; null !== nextEffect; )
-          nextEffect.effectTag & 2048 &&
-            commitBeforeMutationLifeCycles(nextEffect.alternate, nextEffect),
-            (nextEffect = nextEffect.nextEffect);
-      } catch (e) {
-        (didError = !0), (error = e);
-      }
-      didError &&
-        (invariant(
-          null !== nextEffect,
-          "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
-        ),
-        onCommitPhaseError(nextEffect, error),
-        null !== nextEffect && (nextEffect = nextEffect.nextEffect));
-    }
-    for (nextEffect = firstEffect; null !== nextEffect; ) {
-      didError = !1;
-      error = void 0;
       try {
         for (; null !== nextEffect; ) {
           var effectTag = nextEffect.effectTag;
@@ -5412,37 +5212,25 @@ function ReactFiberScheduler(config) {
     nextFlushedRoot.remainingExpirationTime = 0;
     hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
   }
-  var stack = ReactFiberStack(),
-    hostContext = ReactFiberHostContext(config, stack),
-    legacyContext = ReactFiberLegacyContext(stack);
-  stack = ReactFiberNewContext(stack);
-  var hydrationContext = ReactFiberHydrationContext(config),
+  var hostContext = ReactFiberHostContext(config),
+    hydrationContext = ReactFiberHydrationContext(config),
+    resetHostContainer = hostContext.resetHostContainer,
     beginWork = ReactFiberBeginWork(
       config,
       hostContext,
-      legacyContext,
-      stack,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
     ).beginWork,
-    completeWork = ReactFiberCompleteWork(
-      config,
-      hostContext,
-      legacyContext,
-      stack,
-      hydrationContext
-    ).completeWork;
+    completeWork = ReactFiberCompleteWork(config, hostContext, hydrationContext)
+      .completeWork;
   hostContext = ReactFiberUnwindWork(
     hostContext,
-    legacyContext,
-    stack,
     scheduleWork,
     isAlreadyFailedLegacyErrorBoundary
   );
   var throwException = hostContext.throwException,
-    unwindWork = hostContext.unwindWork,
-    unwindInterruptedWork = hostContext.unwindInterruptedWork;
+    unwindWork = hostContext.unwindWork;
   hostContext = ReactFiberCommitWork(
     config,
     onCommitPhaseError,
@@ -5455,9 +5243,7 @@ function ReactFiberScheduler(config) {
     },
     recalculateCurrentTime
   );
-  var commitBeforeMutationLifeCycles =
-      hostContext.commitBeforeMutationLifeCycles,
-    commitResetTextContent = hostContext.commitResetTextContent,
+  var commitResetTextContent = hostContext.commitResetTextContent,
     commitPlacement = hostContext.commitPlacement,
     commitDeletion = hostContext.commitDeletion,
     commitWork = hostContext.commitWork,
@@ -5512,10 +5298,7 @@ function ReactFiberScheduler(config) {
         !isRendering,
         "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
       );
-      nextFlushedRoot = root;
-      nextFlushedExpirationTime = expirationTime;
       performWorkOnRoot(root, expirationTime, !1);
-      performSyncWork();
       finishRendering();
     },
     batchedUpdates: function(fn, a) {
@@ -5526,7 +5309,7 @@ function ReactFiberScheduler(config) {
       } finally {
         (isBatchingUpdates = previousIsBatchingUpdates) ||
           isRendering ||
-          performSyncWork();
+          performWork(1, !1, null);
       }
     },
     unbatchedUpdates: function(fn, a) {
@@ -5550,7 +5333,8 @@ function ReactFiberScheduler(config) {
       try {
         return syncUpdates(fn, a);
       } finally {
-        (isBatchingUpdates = previousIsBatchingUpdates), performSyncWork();
+        (isBatchingUpdates = previousIsBatchingUpdates),
+          performWork(1, !1, null);
       }
     },
     flushControlled: function(fn) {
@@ -5591,7 +5375,7 @@ function ReactFiberScheduler(config) {
         (isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates),
           (isBatchingUpdates = previousIsBatchingUpdates) ||
             isRendering ||
-            performSyncWork();
+            performWork(1, !1, null);
       }
     },
     flushInteractiveUpdates: function() {
@@ -5605,8 +5389,7 @@ function ReactFiberScheduler(config) {
       result <= lastUniqueAsyncExpiration &&
         (result = lastUniqueAsyncExpiration + 1);
       return (lastUniqueAsyncExpiration = result);
-    },
-    legacyContext: legacyContext
+    }
   };
 }
 function ReactFiberReconciler$1(config) {
@@ -5621,7 +5404,27 @@ function ReactFiberReconciler$1(config) {
     currentTime = container.current;
     if (parentComponent) {
       parentComponent = parentComponent._reactInternalFiber;
-      var parentContext = findCurrentUnmaskedContext(parentComponent);
+      var parentContext;
+      b: {
+        invariant(
+          2 === isFiberMountedImpl(parentComponent) &&
+            2 === parentComponent.tag,
+          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+        );
+        for (parentContext = parentComponent; 3 !== parentContext.tag; ) {
+          if (isContextProvider(parentContext)) {
+            parentContext =
+              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
+            break b;
+          }
+          parentContext = parentContext["return"];
+          invariant(
+            parentContext,
+            "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+          );
+        }
+        parentContext = parentContext.stateNode.context;
+      }
       parentComponent = isContextProvider(parentComponent)
         ? processChildContext(parentComponent, parentContext)
         : parentContext;
@@ -5650,11 +5453,7 @@ function ReactFiberReconciler$1(config) {
   config = ReactFiberScheduler(config);
   var recalculateCurrentTime = config.recalculateCurrentTime,
     computeExpirationForFiber = config.computeExpirationForFiber,
-    scheduleWork = config.scheduleWork,
-    legacyContext = config.legacyContext,
-    findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
-    isContextProvider = legacyContext.isContextProvider,
-    processChildContext = legacyContext.processChildContext;
+    scheduleWork = config.scheduleWork;
   return {
     createContainer: function(containerInfo, isAsync, hydrate) {
       isAsync = new FiberNode(3, null, null, isAsync ? 3 : 0);
@@ -6092,7 +5891,7 @@ ReactFabricRenderer.injectIntoDevTools({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.3.1",
+  version: "16.3.0-alpha.1",
   rendererPackageName: "react-native-renderer"
 });
 var ReactFabric$2 = Object.freeze({ default: ReactFabric }),
diff --git a/Libraries/Renderer/ReactNativeRenderer-dev.js b/Libraries/Renderer/ReactNativeRenderer-dev.js
index 7fd62f11ca6ae4..400472d29a3875 100644
--- a/Libraries/Renderer/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/ReactNativeRenderer-dev.js
@@ -26,9 +26,9 @@ var deepDiffer = require("deepDiffer");
 var flattenStyle = require("flattenStyle");
 var React = require("react");
 var emptyObject = require("fbjs/lib/emptyObject");
+var checkPropTypes = require("prop-types/checkPropTypes");
 var shallowEqual = require("fbjs/lib/shallowEqual");
 var ExceptionsManager = require("ExceptionsManager");
-var checkPropTypes = require("prop-types/checkPropTypes");
 var deepFreezeAndThrowOnMutationInDev = require("deepFreezeAndThrowOnMutationInDev");
 
 var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
@@ -510,13 +510,11 @@ var injection$1 = {
     getNodeFromInstance = Injected.getNodeFromInstance;
 
     {
-      !(getNodeFromInstance && getInstanceFromNode)
-        ? warning(
-            false,
-            "EventPluginUtils.injection.injectComponentTree(...): Injected " +
-              "module is missing getNodeFromInstance or getInstanceFromNode."
-          )
-        : void 0;
+      warning(
+        getNodeFromInstance && getInstanceFromNode,
+        "EventPluginUtils.injection.injectComponentTree(...): Injected " +
+          "module is missing getNodeFromInstance or getInstanceFromNode."
+      );
     }
   }
 };
@@ -552,9 +550,10 @@ var validateEventDispatches = void 0;
       ? dispatchInstances.length
       : dispatchInstances ? 1 : 0;
 
-    !(instancesIsArr === listenersIsArr && instancesLen === listenersLen)
-      ? warning(false, "EventPluginUtils: Invalid `event`.")
-      : void 0;
+    warning(
+      instancesIsArr === listenersIsArr && instancesLen === listenersLen,
+      "EventPluginUtils: Invalid `event`."
+    );
   };
 }
 
@@ -966,7 +965,6 @@ var Fragment = 10;
 var Mode = 11;
 var ContextConsumer = 12;
 var ContextProvider = 13;
-var ForwardRef = 14;
 
 function getParent(inst) {
   do {
@@ -1095,7 +1093,7 @@ function listenerAtPhase(inst, event, propagationPhase) {
  */
 function accumulateDirectionalDispatches(inst, phase, event) {
   {
-    !inst ? warning(false, "Dispatching inst must not be null") : void 0;
+    warning(inst, "Dispatching inst must not be null");
   }
   var listener = listenerAtPhase(inst, event, phase);
   if (listener) {
@@ -1414,15 +1412,13 @@ SyntheticEvent.extend = function(Interface) {
               !target.constructor.Interface.hasOwnProperty(prop) &&
               shouldBeReleasedProperties.indexOf(prop) === -1
             ) {
-              !(didWarnForAddedNewProperty || target.isPersistent())
-                ? warning(
-                    false,
-                    "This synthetic event is reused for performance reasons. If you're " +
-                      "seeing this, you're adding a new property in the synthetic event object. " +
-                      "The property is never released. See " +
-                      "https://fb.me/react-event-pooling for more information."
-                  )
-                : void 0;
+              warning(
+                didWarnForAddedNewProperty || target.isPersistent(),
+                "This synthetic event is reused for performance reasons. If you're " +
+                  "seeing this, you're adding a new property in the synthetic event object. " +
+                  "The property is never released. See " +
+                  "https://fb.me/react-event-pooling for more information."
+              );
               didWarnForAddedNewProperty = true;
             }
             target[prop] = value;
@@ -1469,18 +1465,16 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
 
   function warn(action, result) {
     var warningCondition = false;
-    !warningCondition
-      ? warning(
-          false,
-          "This synthetic event is reused for performance reasons. If you're seeing this, " +
-            "you're %s `%s` on a released/nullified synthetic event. %s. " +
-            "If you must keep the original synthetic event around, use event.persist(). " +
-            "See https://fb.me/react-event-pooling for more information.",
-          action,
-          propName,
-          result
-        )
-      : void 0;
+    warning(
+      warningCondition,
+      "This synthetic event is reused for performance reasons. If you're seeing this, " +
+        "you're %s `%s` on a released/nullified synthetic event. %s. " +
+        "If you must keep the original synthetic event around, use event.persist(). " +
+        "See https://fb.me/react-event-pooling for more information.",
+      action,
+      propName,
+      result
+    );
   }
 }
 
@@ -1598,15 +1592,13 @@ function getTouchIdentifier(_ref) {
 
   invariant(identifier != null, "Touch object is missing identifier.");
   {
-    !(identifier <= MAX_TOUCH_BANK)
-      ? warning(
-          false,
-          "Touch identifier %s is greater than maximum supported %s which causes " +
-            "performance issues backfilling array locations for all of the indices.",
-          identifier,
-          MAX_TOUCH_BANK
-        )
-      : void 0;
+    warning(
+      identifier <= MAX_TOUCH_BANK,
+      "Touch identifier %s is greater than maximum supported %s which causes " +
+        "performance issues backfilling array locations for all of the indices.",
+      identifier,
+      MAX_TOUCH_BANK
+    );
   }
   return identifier;
 }
@@ -1705,9 +1697,10 @@ var ResponderTouchHistoryStore = {
         }
         {
           var activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
-          !(activeRecord != null && activeRecord.touchActive)
-            ? warning(false, "Cannot find single active touch.")
-            : void 0;
+          warning(
+            activeRecord != null && activeRecord.touchActive,
+            "Cannot find single active touch."
+          );
         }
       }
     }
@@ -2809,9 +2802,6 @@ var REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 0xeace;
 var REACT_ASYNC_MODE_TYPE = hasSymbol
   ? Symbol["for"]("react.async_mode")
   : 0xeacf;
-var REACT_FORWARD_REF_TYPE = hasSymbol
-  ? Symbol["for"]("react.forward_ref")
-  : 0xead0;
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
 var FAUX_ITERATOR_SYMBOL = "@@iterator";
@@ -2993,7 +2983,7 @@ var TouchHistoryMath = {
 
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.3.1";
+var ReactVersion = "16.3.0-alpha.1";
 
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -3663,17 +3653,15 @@ function findNodeHandle(componentOrHandle) {
   {
     var owner = ReactCurrentOwner.current;
     if (owner !== null && owner.stateNode !== null) {
-      !owner.stateNode._warnedAboutRefsInRender
-        ? warning(
-            false,
-            "%s is accessing findNodeHandle inside its render(). " +
-              "render() should be a pure function of props and state. It should " +
-              "never access something that requires stale data from the previous " +
-              "render, such as refs. Move this logic to componentDidMount and " +
-              "componentDidUpdate instead.",
-            getComponentName(owner) || "A component"
-          )
-        : void 0;
+      warning(
+        owner.stateNode._warnedAboutRefsInRender,
+        "%s is accessing findNodeHandle inside its render(). " +
+          "render() should be a pure function of props and state. It should " +
+          "never access something that requires stale data from the previous " +
+          "render, such as refs. Move this logic to componentDidMount and " +
+          "componentDidUpdate instead.",
+        getComponentName(owner) || "A component"
+      );
 
       owner.stateNode._warnedAboutRefsInRender = true;
     }
@@ -4128,10 +4116,9 @@ var Callback = /*              */ 32;
 var DidCapture = /*            */ 64;
 var Ref = /*                   */ 128;
 var ErrLog = /*                */ 256;
-var Snapshot = /*              */ 2048;
 
 // Union of all host effects
-var HostEffectMask = /*        */ 2559;
+var HostEffectMask = /*        */ 511;
 
 var Incomplete = /*            */ 512;
 var ShouldCapture = /*         */ 1024;
@@ -4179,17 +4166,15 @@ function isMounted(component) {
     if (owner !== null && owner.tag === ClassComponent) {
       var ownerFiber = owner;
       var instance = ownerFiber.stateNode;
-      !instance._warnedAboutRefsInRender
-        ? warning(
-            false,
-            "%s is accessing isMounted inside its render() function. " +
-              "render() should be a pure function of props and state. It should " +
-              "never access something that requires stale data from the previous " +
-              "render, such as refs. Move this logic to componentDidMount and " +
-              "componentDidUpdate instead.",
-            getComponentName(ownerFiber) || "A component"
-          )
-        : void 0;
+      warning(
+        instance._warnedAboutRefsInRender,
+        "%s is accessing isMounted inside its render() function. " +
+          "render() should be a pure function of props and state. It should " +
+          "never access something that requires stale data from the previous " +
+          "render, such as refs. Move this logic to componentDidMount and " +
+          "componentDidUpdate instead.",
+        getComponentName(ownerFiber) || "A component"
+      );
       instance._warnedAboutRefsInRender = true;
     }
   }
@@ -4400,6474 +4385,5447 @@ function findCurrentHostFiberWithNoPortals(parent) {
   return null;
 }
 
-// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
-// Math.pow(2, 30) - 1
-// 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
-
-// TODO: Use an opaque type once ESLint et al support the syntax
-
-var NoWork = 0;
-var Sync = 1;
-var Never = MAX_SIGNED_31_BIT_INT;
-
-var UNIT_SIZE = 10;
-var MAGIC_NUMBER_OFFSET = 2;
-
-// 1 unit of expiration time represents 10ms.
-function msToExpirationTime(ms) {
-  // Always add an offset so that we don't clash with the magic number for NoWork.
-  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
-}
-
-function expirationTimeToMs(expirationTime) {
-  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
-}
-
-function ceiling(num, precision) {
-  return (((num / precision) | 0) + 1) * precision;
-}
-
-function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
-  return ceiling(
-    currentTime + expirationInMs / UNIT_SIZE,
-    bucketSizeMs / UNIT_SIZE
-  );
-}
-
-var NoContext = 0;
-var AsyncMode = 1;
-var StrictMode = 2;
+var valueStack = [];
 
-var hasBadMapPolyfill = void 0;
+var fiberStack = void 0;
 
 {
-  hasBadMapPolyfill = false;
-  try {
-    var nonExtensibleObject = Object.preventExtensions({});
-    var testMap = new Map([[nonExtensibleObject, null]]);
-    var testSet = new Set([nonExtensibleObject]);
-    // This is necessary for Rollup to not consider these unused.
-    // https://github.com/rollup/rollup/issues/1771
-    // TODO: we can remove these if Rollup fixes the bug.
-    testMap.set(0, 0);
-    testSet.add(0);
-  } catch (e) {
-    // TODO: Consider warning about bad polyfills
-    hasBadMapPolyfill = true;
-  }
+  fiberStack = [];
 }
 
-// A Fiber is work on a Component that needs to be done or was done. There can
-// be more than one per component.
-
-var debugCounter = void 0;
+var index = -1;
 
-{
-  debugCounter = 1;
+function createCursor(defaultValue) {
+  return {
+    current: defaultValue
+  };
 }
 
-function FiberNode(tag, pendingProps, key, mode) {
-  // Instance
-  this.tag = tag;
-  this.key = key;
-  this.type = null;
-  this.stateNode = null;
-
-  // Fiber
-  this["return"] = null;
-  this.child = null;
-  this.sibling = null;
-  this.index = 0;
+function pop(cursor, fiber) {
+  if (index < 0) {
+    {
+      warning(false, "Unexpected pop.");
+    }
+    return;
+  }
 
-  this.ref = null;
+  {
+    if (fiber !== fiberStack[index]) {
+      warning(false, "Unexpected Fiber popped.");
+    }
+  }
 
-  this.pendingProps = pendingProps;
-  this.memoizedProps = null;
-  this.updateQueue = null;
-  this.memoizedState = null;
+  cursor.current = valueStack[index];
 
-  this.mode = mode;
+  valueStack[index] = null;
 
-  // Effects
-  this.effectTag = NoEffect;
-  this.nextEffect = null;
+  {
+    fiberStack[index] = null;
+  }
 
-  this.firstEffect = null;
-  this.lastEffect = null;
+  index--;
+}
 
-  this.expirationTime = NoWork;
+function push(cursor, value, fiber) {
+  index++;
 
-  this.alternate = null;
+  valueStack[index] = cursor.current;
 
   {
-    this._debugID = debugCounter++;
-    this._debugSource = null;
-    this._debugOwner = null;
-    this._debugIsCurrentlyTiming = false;
-    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
-      Object.preventExtensions(this);
-    }
+    fiberStack[index] = fiber;
   }
-}
-
-// This is a constructor function, rather than a POJO constructor, still
-// please ensure we do the following:
-// 1) Nobody should add any instance methods on this. Instance methods can be
-//    more difficult to predict when they get optimized and they are almost
-//    never inlined properly in static compilers.
-// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
-//    always know when it is a fiber.
-// 3) We might want to experiment with using numeric keys since they are easier
-//    to optimize in a non-JIT environment.
-// 4) We can easily go from a constructor to a createFiber object literal if that
-//    is faster.
-// 5) It should be easy to port this to a C struct and keep a C implementation
-//    compatible.
-var createFiber = function(tag, pendingProps, key, mode) {
-  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
-  return new FiberNode(tag, pendingProps, key, mode);
-};
 
-function shouldConstruct(Component) {
-  return !!(Component.prototype && Component.prototype.isReactComponent);
+  cursor.current = value;
 }
 
-// This is used to create an alternate fiber to do work on.
-function createWorkInProgress(current, pendingProps, expirationTime) {
-  var workInProgress = current.alternate;
-  if (workInProgress === null) {
-    // We use a double buffering pooling technique because we know that we'll
-    // only ever need at most two versions of a tree. We pool the "other" unused
-    // node that we're free to reuse. This is lazily created to avoid allocating
-    // extra objects for things that are never updated. It also allow us to
-    // reclaim the extra memory if needed.
-    workInProgress = createFiber(
-      current.tag,
-      pendingProps,
-      current.key,
-      current.mode
-    );
-    workInProgress.type = current.type;
-    workInProgress.stateNode = current.stateNode;
+function reset() {
+  while (index > -1) {
+    valueStack[index] = null;
 
     {
-      // DEV-only fields
-      workInProgress._debugID = current._debugID;
-      workInProgress._debugSource = current._debugSource;
-      workInProgress._debugOwner = current._debugOwner;
+      fiberStack[index] = null;
     }
 
-    workInProgress.alternate = current;
-    current.alternate = workInProgress;
-  } else {
-    workInProgress.pendingProps = pendingProps;
-
-    // We already have an alternate.
-    // Reset the effect tag.
-    workInProgress.effectTag = NoEffect;
-
-    // The effect list is no longer valid.
-    workInProgress.nextEffect = null;
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
+    index--;
   }
+}
 
-  workInProgress.expirationTime = expirationTime;
-
-  workInProgress.child = current.child;
-  workInProgress.memoizedProps = current.memoizedProps;
-  workInProgress.memoizedState = current.memoizedState;
-  workInProgress.updateQueue = current.updateQueue;
-
-  // These will be overridden during the parent's reconciliation
-  workInProgress.sibling = current.sibling;
-  workInProgress.index = current.index;
-  workInProgress.ref = current.ref;
+var describeComponentFrame = function(name, source, ownerName) {
+  return (
+    "\n    in " +
+    (name || "Unknown") +
+    (source
+      ? " (at " +
+        source.fileName.replace(/^.*[\\\/]/, "") +
+        ":" +
+        source.lineNumber +
+        ")"
+      : ownerName ? " (created by " + ownerName + ")" : "")
+  );
+};
 
-  return workInProgress;
+function describeFiber(fiber) {
+  switch (fiber.tag) {
+    case IndeterminateComponent:
+    case FunctionalComponent:
+    case ClassComponent:
+    case HostComponent:
+      var owner = fiber._debugOwner;
+      var source = fiber._debugSource;
+      var name = getComponentName(fiber);
+      var ownerName = null;
+      if (owner) {
+        ownerName = getComponentName(owner);
+      }
+      return describeComponentFrame(name, source, ownerName);
+    default:
+      return "";
+  }
 }
 
-function createHostRootFiber(isAsync) {
-  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
-  return createFiber(HostRoot, null, null, mode);
+// This function can only be called with a work-in-progress fiber and
+// only during begin or complete phase. Do not call it under any other
+// circumstances.
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  var node = workInProgress;
+  do {
+    info += describeFiber(node);
+    // Otherwise this return pointer might point to the wrong tree:
+    node = node["return"];
+  } while (node);
+  return info;
 }
 
-function createFiberFromElement(element, mode, expirationTime) {
-  var owner = null;
+function getCurrentFiberOwnerName() {
   {
-    owner = element._owner;
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
+    }
+    var owner = fiber._debugOwner;
+    if (owner !== null && typeof owner !== "undefined") {
+      return getComponentName(owner);
+    }
   }
-
-  var fiber = void 0;
-  var type = element.type;
-  var key = element.key;
-  var pendingProps = element.props;
-
-  var fiberTag = void 0;
-  if (typeof type === "function") {
-    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
-  } else if (typeof type === "string") {
-    fiberTag = HostComponent;
-  } else {
-    switch (type) {
-      case REACT_FRAGMENT_TYPE:
-        return createFiberFromFragment(
-          pendingProps.children,
-          mode,
-          expirationTime,
-          key
-        );
-      case REACT_ASYNC_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= AsyncMode | StrictMode;
-        break;
-      case REACT_STRICT_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= StrictMode;
-        break;
-      case REACT_CALL_TYPE:
-        fiberTag = CallComponent;
-        break;
-      case REACT_RETURN_TYPE:
-        fiberTag = ReturnComponent;
-        break;
-      default: {
-        if (typeof type === "object" && type !== null) {
-          switch (type.$$typeof) {
-            case REACT_PROVIDER_TYPE:
-              fiberTag = ContextProvider;
-              break;
-            case REACT_CONTEXT_TYPE:
-              // This is a consumer
-              fiberTag = ContextConsumer;
-              break;
-            case REACT_FORWARD_REF_TYPE:
-              fiberTag = ForwardRef;
-              break;
-            default:
-              if (typeof type.tag === "number") {
-                // Currently assumed to be a continuation and therefore is a
-                // fiber already.
-                // TODO: The yield system is currently broken for updates in
-                // some cases. The reified yield stores a fiber, but we don't
-                // know which fiber that is; the current or a workInProgress?
-                // When the continuation gets rendered here we don't know if we
-                // can reuse that fiber or if we need to clone it. There is
-                // probably a clever way to restructure this.
-                fiber = type;
-                fiber.pendingProps = pendingProps;
-                fiber.expirationTime = expirationTime;
-                return fiber;
-              } else {
-                throwOnInvalidElementType(type, owner);
-              }
-              break;
-          }
-        } else {
-          throwOnInvalidElementType(type, owner);
-        }
-      }
-    }
-  }
-
-  fiber = createFiber(fiberTag, pendingProps, key, mode);
-  fiber.type = type;
-  fiber.expirationTime = expirationTime;
-
-  {
-    fiber._debugSource = element._source;
-    fiber._debugOwner = element._owner;
-  }
-
-  return fiber;
+  return null;
 }
 
-function throwOnInvalidElementType(type, owner) {
-  var info = "";
+function getCurrentFiberStackAddendum() {
   {
-    if (
-      type === undefined ||
-      (typeof type === "object" &&
-        type !== null &&
-        Object.keys(type).length === 0)
-    ) {
-      info +=
-        " You likely forgot to export your component from the file " +
-        "it's defined in, or you might have mixed up default and " +
-        "named imports.";
-    }
-    var ownerName = owner ? getComponentName(owner) : null;
-    if (ownerName) {
-      info += "\n\nCheck the render method of `" + ownerName + "`.";
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
     }
+    // Safe because if current fiber exists, we are reconciling,
+    // and it is guaranteed to be the work-in-progress version.
+    return getStackAddendumByWorkInProgressFiber(fiber);
   }
-  invariant(
-    false,
-    "Element type is invalid: expected a string (for built-in " +
-      "components) or a class/function (for composite components) " +
-      "but got: %s.%s",
-    type == null ? type : typeof type,
-    info
-  );
+  return null;
 }
 
-function createFiberFromFragment(elements, mode, expirationTime, key) {
-  var fiber = createFiber(Fragment, elements, key, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
+function resetCurrentFiber() {
+  ReactDebugCurrentFrame.getCurrentStack = null;
+  ReactDebugCurrentFiber.current = null;
+  ReactDebugCurrentFiber.phase = null;
 }
 
-function createFiberFromText(content, mode, expirationTime) {
-  var fiber = createFiber(HostText, content, null, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
+function setCurrentFiber(fiber) {
+  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
+  ReactDebugCurrentFiber.current = fiber;
+  ReactDebugCurrentFiber.phase = null;
 }
 
-function createFiberFromHostInstanceForDeletion() {
-  var fiber = createFiber(HostComponent, null, null, NoContext);
-  fiber.type = "DELETED";
-  return fiber;
+function setCurrentPhase(phase) {
+  ReactDebugCurrentFiber.phase = phase;
 }
 
-function createFiberFromPortal(portal, mode, expirationTime) {
-  var pendingProps = portal.children !== null ? portal.children : [];
-  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
-  fiber.expirationTime = expirationTime;
-  fiber.stateNode = {
-    containerInfo: portal.containerInfo,
-    pendingChildren: null, // Used by persistent updates
-    implementation: portal.implementation
-  };
-  return fiber;
-}
+var ReactDebugCurrentFiber = {
+  current: null,
+  phase: null,
+  resetCurrentFiber: resetCurrentFiber,
+  setCurrentFiber: setCurrentFiber,
+  setCurrentPhase: setCurrentPhase,
+  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
+  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
+};
 
-// Used for stashing WIP properties to replay failed work in DEV.
-function assignFiberPropertiesInDEV(target, source) {
-  if (target === null) {
-    // This Fiber's initial properties will always be overwritten.
-    // We only use a Fiber to ensure the same hidden class so DEV isn't slow.
-    target = createFiber(IndeterminateComponent, null, null, NoContext);
-  }
-
-  // This is intentionally written as a list of all properties.
-  // We tried to use Object.assign() instead but this is called in
-  // the hottest path, and Object.assign() was too slow:
-  // https://github.com/facebook/react/issues/12502
-  // This code is DEV-only so size is not a concern.
-
-  target.tag = source.tag;
-  target.key = source.key;
-  target.type = source.type;
-  target.stateNode = source.stateNode;
-  target["return"] = source["return"];
-  target.child = source.child;
-  target.sibling = source.sibling;
-  target.index = source.index;
-  target.ref = source.ref;
-  target.pendingProps = source.pendingProps;
-  target.memoizedProps = source.memoizedProps;
-  target.updateQueue = source.updateQueue;
-  target.memoizedState = source.memoizedState;
-  target.mode = source.mode;
-  target.effectTag = source.effectTag;
-  target.nextEffect = source.nextEffect;
-  target.firstEffect = source.firstEffect;
-  target.lastEffect = source.lastEffect;
-  target.expirationTime = source.expirationTime;
-  target.alternate = source.alternate;
-  target._debugID = source._debugID;
-  target._debugSource = source._debugSource;
-  target._debugOwner = source._debugOwner;
-  target._debugIsCurrentlyTiming = source._debugIsCurrentlyTiming;
-  return target;
-}
+// Re-export dynamic flags from the fbsource version.
+var _require = require("ReactFeatureFlags");
 
-// TODO: This should be lifted into the renderer.
+var enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch;
+var debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects;
+var debugRenderPhaseSideEffectsForStrictMode =
+  _require.debugRenderPhaseSideEffectsForStrictMode;
+var warnAboutDeprecatedLifecycles = _require.warnAboutDeprecatedLifecycles;
+var replayFailedUnitOfWorkWithInvokeGuardedCallback =
+  _require.replayFailedUnitOfWorkWithInvokeGuardedCallback;
 
-function createFiberRoot(containerInfo, isAsync, hydrate) {
-  // Cyclic construction. This cheats the type system right now because
-  // stateNode is any.
-  var uninitializedFiber = createHostRootFiber(isAsync);
-  var root = {
-    current: uninitializedFiber,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-    pendingCommitExpirationTime: NoWork,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    remainingExpirationTime: NoWork,
-    firstBatch: null,
-    nextScheduledRoot: null
-  };
-  uninitializedFiber.stateNode = root;
-  return root;
-}
+var enableUserTimingAPI = true;
+var enableMutatingReconciler = true;
+var enableNoopReconciler = false;
+var enablePersistentReconciler = false;
 
-var onCommitFiberRoot = null;
-var onCommitFiberUnmount = null;
-var hasLoggedError = false;
+// Only used in www builds.
 
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {
-      if (true && !hasLoggedError) {
-        hasLoggedError = true;
-        warning(false, "React DevTools encountered an error: %s", err);
-      }
-    }
-  };
-}
+// Prefix measurements so that it's possible to filter them.
+// Longer prefixes are hard to read in DevTools.
+var reactEmoji = "\u269B";
+var warningEmoji = "\u26D4";
+var supportsUserTiming =
+  typeof performance !== "undefined" &&
+  typeof performance.mark === "function" &&
+  typeof performance.clearMarks === "function" &&
+  typeof performance.measure === "function" &&
+  typeof performance.clearMeasures === "function";
 
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
-  }
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
-  }
-  if (!hook.supportsFiber) {
-    {
-      warning(
-        false,
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://fb.me/react-devtools"
-      );
-    }
-    // DevTools exists, even though it doesn't support Fiber.
-    return true;
-  }
-  try {
-    var rendererID = hook.inject(internals);
-    // We have successfully injected, so now it is safe to set up hooks.
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
-    {
-      warning(false, "React DevTools encountered an error: %s.", err);
-    }
-  }
-  // DevTools exists
-  return true;
-}
+// Keep track of current fiber so that we know the path to unwind on pause.
+// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
+var currentFiber = null;
+// If we're in the middle of user code, which fiber and method is it?
+// Reusing `currentFiber` would be confusing for this because user code fiber
+// can change during commit phase too, but we don't need to unwind it (since
+// lifecycles in the commit phase don't resemble a tree).
+var currentPhase = null;
+var currentPhaseFiber = null;
+// Did lifecycle hook schedule an update? This is often a performance problem,
+// so we will keep track of it, and include it in the report.
+// Track commits caused by cascading updates.
+var isCommitting = false;
+var hasScheduledUpdateInCurrentCommit = false;
+var hasScheduledUpdateInCurrentPhase = false;
+var commitCountInCurrentWorkLoop = 0;
+var effectCountInCurrentCommit = 0;
+var isWaitingForCallback = false;
+// During commits, we only show a measurement once per method name
+// to avoid stretch the commit phase with measurement overhead.
+var labelsInCurrentCommit = new Set();
 
-function onCommitRoot(root) {
-  if (typeof onCommitFiberRoot === "function") {
-    onCommitFiberRoot(root);
+var formatMarkName = function(markName) {
+  return reactEmoji + " " + markName;
+};
+
+var formatLabel = function(label, warning$$1) {
+  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
+  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
+  return "" + prefix + label + suffix;
+};
+
+var beginMark = function(markName) {
+  performance.mark(formatMarkName(markName));
+};
+
+var clearMark = function(markName) {
+  performance.clearMarks(formatMarkName(markName));
+};
+
+var endMark = function(label, markName, warning$$1) {
+  var formattedMarkName = formatMarkName(markName);
+  var formattedLabel = formatLabel(label, warning$$1);
+  try {
+    performance.measure(formattedLabel, formattedMarkName);
+  } catch (err) {}
+  // If previous mark was missing for some reason, this will throw.
+  // This could only happen if React crashed in an unexpected place earlier.
+  // Don't pile on with more errors.
+
+  // Clear marks immediately to avoid growing buffer.
+  performance.clearMarks(formattedMarkName);
+  performance.clearMeasures(formattedLabel);
+};
+
+var getFiberMarkName = function(label, debugID) {
+  return label + " (#" + debugID + ")";
+};
+
+var getFiberLabel = function(componentName, isMounted, phase) {
+  if (phase === null) {
+    // These are composite component total time measurements.
+    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
+  } else {
+    // Composite component methods.
+    return componentName + "." + phase;
   }
-}
+};
 
-function onCommitUnmount(fiber) {
-  if (typeof onCommitFiberUnmount === "function") {
-    onCommitFiberUnmount(fiber);
+var beginFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+
+  if (isCommitting && labelsInCurrentCommit.has(label)) {
+    // During the commit phase, we don't show duplicate labels because
+    // there is a fixed overhead for every measurement, and we don't
+    // want to stretch the commit phase beyond necessary.
+    return false;
   }
-}
+  labelsInCurrentCommit.add(label);
 
-var describeComponentFrame = function(name, source, ownerName) {
-  return (
-    "\n    in " +
-    (name || "Unknown") +
-    (source
-      ? " (at " +
-        source.fileName.replace(/^.*[\\\/]/, "") +
-        ":" +
-        source.lineNumber +
-        ")"
-      : ownerName ? " (created by " + ownerName + ")" : "")
-  );
+  var markName = getFiberMarkName(label, debugID);
+  beginMark(markName);
+  return true;
 };
 
-function describeFiber(fiber) {
+var clearFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  clearMark(markName);
+};
+
+var endFiberMark = function(fiber, phase, warning$$1) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  endMark(label, markName, warning$$1);
+};
+
+var shouldIgnoreFiber = function(fiber) {
+  // Host components should be skipped in the timeline.
+  // We could check typeof fiber.type, but does this work with RN?
   switch (fiber.tag) {
-    case IndeterminateComponent:
-    case FunctionalComponent:
-    case ClassComponent:
+    case HostRoot:
     case HostComponent:
-      var owner = fiber._debugOwner;
-      var source = fiber._debugSource;
-      var name = getComponentName(fiber);
-      var ownerName = null;
-      if (owner) {
-        ownerName = getComponentName(owner);
-      }
-      return describeComponentFrame(name, source, ownerName);
+    case HostText:
+    case HostPortal:
+    case CallComponent:
+    case ReturnComponent:
+    case Fragment:
+    case ContextProvider:
+    case ContextConsumer:
+      return true;
     default:
-      return "";
+      return false;
   }
-}
+};
 
-// This function can only be called with a work-in-progress fiber and
-// only during begin or complete phase. Do not call it under any other
-// circumstances.
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  var node = workInProgress;
-  do {
-    info += describeFiber(node);
-    // Otherwise this return pointer might point to the wrong tree:
-    node = node["return"];
-  } while (node);
-  return info;
-}
+var clearPendingPhaseMeasurement = function() {
+  if (currentPhase !== null && currentPhaseFiber !== null) {
+    clearFiberMark(currentPhaseFiber, currentPhase);
+  }
+  currentPhaseFiber = null;
+  currentPhase = null;
+  hasScheduledUpdateInCurrentPhase = false;
+};
 
-/**
- * Forked from fbjs/warning:
- * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
- *
- * Only change is we use console.warn instead of console.error,
- * and do nothing when 'console' is not supported.
- * This really simplifies the code.
- * ---
- * Similar to invariant but only logs a warning if the condition is not met.
- * This can be used to log issues in development environments in critical
- * paths. Removing the logging code for production environments will keep the
- * same logic and follow the same code paths.
- */
+var pauseTimers = function() {
+  // Stops all currently active measurements so that they can be resumed
+  // if we continue in a later deferred loop from the same unit of work.
+  var fiber = currentFiber;
+  while (fiber) {
+    if (fiber._debugIsCurrentlyTiming) {
+      endFiberMark(fiber, null, null);
+    }
+    fiber = fiber["return"];
+  }
+};
 
-var lowPriorityWarning = function() {};
+var resumeTimersRecursively = function(fiber) {
+  if (fiber["return"] !== null) {
+    resumeTimersRecursively(fiber["return"]);
+  }
+  if (fiber._debugIsCurrentlyTiming) {
+    beginFiberMark(fiber, null);
+  }
+};
 
-{
-  var printWarning = function(format) {
-    for (
-      var _len = arguments.length,
-        args = Array(_len > 1 ? _len - 1 : 0),
-        _key = 1;
-      _key < _len;
-      _key++
+var resumeTimers = function() {
+  // Resumes all measurements that were active during the last deferred loop.
+  if (currentFiber !== null) {
+    resumeTimersRecursively(currentFiber);
+  }
+};
+
+function recordEffect() {
+  if (enableUserTimingAPI) {
+    effectCountInCurrentCommit++;
+  }
+}
+
+function recordScheduleUpdate() {
+  if (enableUserTimingAPI) {
+    if (isCommitting) {
+      hasScheduledUpdateInCurrentCommit = true;
+    }
+    if (
+      currentPhase !== null &&
+      currentPhase !== "componentWillMount" &&
+      currentPhase !== "componentWillReceiveProps"
     ) {
-      args[_key - 1] = arguments[_key];
+      hasScheduledUpdateInCurrentPhase = true;
     }
+  }
+}
 
-    var argIndex = 0;
-    var message =
-      "Warning: " +
-      format.replace(/%s/g, function() {
-        return args[argIndex++];
-      });
-    if (typeof console !== "undefined") {
-      console.warn(message);
+function startRequestCallbackTimer() {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming && !isWaitingForCallback) {
+      isWaitingForCallback = true;
+      beginMark("(Waiting for async callback...)");
     }
-    try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
-      throw new Error(message);
-    } catch (x) {}
-  };
+  }
+}
 
-  lowPriorityWarning = function(condition, format) {
-    if (format === undefined) {
-      throw new Error(
-        "`warning(condition, format, ...args)` requires a warning " +
-          "message argument"
+function stopRequestCallbackTimer(didExpire) {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming) {
+      isWaitingForCallback = false;
+      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
+      endMark(
+        "(Waiting for async callback...)",
+        "(Waiting for async callback...)",
+        warning$$1
       );
     }
-    if (!condition) {
-      for (
-        var _len2 = arguments.length,
-          args = Array(_len2 > 2 ? _len2 - 2 : 0),
-          _key2 = 2;
-        _key2 < _len2;
-        _key2++
-      ) {
-        args[_key2 - 2] = arguments[_key2];
-      }
+  }
+}
 
-      printWarning.apply(undefined, [format].concat(args));
+function startWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
     }
-  };
+    // If we pause, this is the fiber to unwind from.
+    currentFiber = fiber;
+    if (!beginFiberMark(fiber, null)) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = true;
+  }
 }
 
-var lowPriorityWarning$1 = lowPriorityWarning;
-
-var ReactStrictModeWarnings = {
-  discardPendingWarnings: function() {},
-  flushPendingDeprecationWarnings: function() {},
-  flushPendingUnsafeLifecycleWarnings: function() {},
-  recordDeprecationWarnings: function(fiber, instance) {},
-  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
-};
-
-{
-  var LIFECYCLE_SUGGESTIONS = {
-    UNSAFE_componentWillMount: "componentDidMount",
-    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
-    UNSAFE_componentWillUpdate: "componentDidUpdate"
-  };
-
-  var pendingComponentWillMountWarnings = [];
-  var pendingComponentWillReceivePropsWarnings = [];
-  var pendingComponentWillUpdateWarnings = [];
-  var pendingUnsafeLifecycleWarnings = new Map();
-
-  // Tracks components we have already warned about.
-  var didWarnAboutDeprecatedLifecycles = new Set();
-  var didWarnAboutUnsafeLifecycles = new Set();
-
-  ReactStrictModeWarnings.discardPendingWarnings = function() {
-    pendingComponentWillMountWarnings = [];
-    pendingComponentWillReceivePropsWarnings = [];
-    pendingComponentWillUpdateWarnings = [];
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+function cancelWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // Remember we shouldn't complete measurement for this fiber.
+    // Otherwise flamechart will be deep even for small updates.
+    fiber._debugIsCurrentlyTiming = false;
+    clearFiberMark(fiber, null);
+  }
+}
 
-  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
-    pendingUnsafeLifecycleWarnings.forEach(function(
-      lifecycleWarningsMap,
-      strictRoot
-    ) {
-      var lifecyclesWarningMesages = [];
+function stopWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = false;
+    endFiberMark(fiber, null, null);
+  }
+}
 
-      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
-        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
-        if (lifecycleWarnings.length > 0) {
-          var componentNames = new Set();
-          lifecycleWarnings.forEach(function(fiber) {
-            componentNames.add(getComponentName(fiber) || "Component");
-            didWarnAboutUnsafeLifecycles.add(fiber.type);
-          });
+function stopFailedWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = false;
+    var warning$$1 = "An error was thrown inside this error boundary";
+    endFiberMark(fiber, null, warning$$1);
+  }
+}
 
-          var formatted = lifecycle.replace("UNSAFE_", "");
-          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
-          var sortedComponentNames = Array.from(componentNames)
-            .sort()
-            .join(", ");
+function startPhaseTimer(fiber, phase) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    clearPendingPhaseMeasurement();
+    if (!beginFiberMark(fiber, phase)) {
+      return;
+    }
+    currentPhaseFiber = fiber;
+    currentPhase = phase;
+  }
+}
 
-          lifecyclesWarningMesages.push(
-            formatted +
-              ": Please update the following components to use " +
-              (suggestion + " instead: " + sortedComponentNames)
-          );
-        }
-      });
+function stopPhaseTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    if (currentPhase !== null && currentPhaseFiber !== null) {
+      var warning$$1 = hasScheduledUpdateInCurrentPhase
+        ? "Scheduled a cascading update"
+        : null;
+      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
+    }
+    currentPhase = null;
+    currentPhaseFiber = null;
+  }
+}
 
-      if (lifecyclesWarningMesages.length > 0) {
-        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
-          strictRoot
-        );
+function startWorkLoopTimer(nextUnitOfWork) {
+  if (enableUserTimingAPI) {
+    currentFiber = nextUnitOfWork;
+    if (!supportsUserTiming) {
+      return;
+    }
+    commitCountInCurrentWorkLoop = 0;
+    // This is top level call.
+    // Any other measurements are performed within.
+    beginMark("(React Tree Reconciliation)");
+    // Resume any measurements that were in progress during the last loop.
+    resumeTimers();
+  }
+}
 
-        warning(
-          false,
-          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
-            "\n\n%s" +
-            "\n\nLearn more about this warning here:" +
-            "\nhttps://fb.me/react-strict-mode-warnings",
-          strictRootComponentStack,
-          lifecyclesWarningMesages.join("\n\n")
-        );
+function stopWorkLoopTimer(interruptedBy) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    var warning$$1 = null;
+    if (interruptedBy !== null) {
+      if (interruptedBy.tag === HostRoot) {
+        warning$$1 = "A top-level update interrupted the previous render";
+      } else {
+        var componentName = getComponentName(interruptedBy) || "Unknown";
+        warning$$1 =
+          "An update to " + componentName + " interrupted the previous render";
       }
-    });
-
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
-
-  var getStrictRoot = function(fiber) {
-    var maybeStrictRoot = null;
+    } else if (commitCountInCurrentWorkLoop > 1) {
+      warning$$1 = "There were cascading updates";
+    }
+    commitCountInCurrentWorkLoop = 0;
+    // Pause any measurements until the next loop.
+    pauseTimers();
+    endMark(
+      "(React Tree Reconciliation)",
+      "(React Tree Reconciliation)",
+      warning$$1
+    );
+  }
+}
 
-    while (fiber !== null) {
-      if (fiber.mode & StrictMode) {
-        maybeStrictRoot = fiber;
-      }
+function startCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    isCommitting = true;
+    hasScheduledUpdateInCurrentCommit = false;
+    labelsInCurrentCommit.clear();
+    beginMark("(Committing Changes)");
+  }
+}
 
-      fiber = fiber["return"];
+function stopCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
 
-    return maybeStrictRoot;
-  };
+    var warning$$1 = null;
+    if (hasScheduledUpdateInCurrentCommit) {
+      warning$$1 = "Lifecycle hook scheduled a cascading update";
+    } else if (commitCountInCurrentWorkLoop > 0) {
+      warning$$1 = "Caused by a cascading update in earlier commit";
+    }
+    hasScheduledUpdateInCurrentCommit = false;
+    commitCountInCurrentWorkLoop++;
+    isCommitting = false;
+    labelsInCurrentCommit.clear();
 
-  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
-    if (pendingComponentWillMountWarnings.length > 0) {
-      var uniqueNames = new Set();
-      pendingComponentWillMountWarnings.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var sortedNames = Array.from(uniqueNames)
-        .sort()
-        .join(", ");
-
-      lowPriorityWarning$1(
-        false,
-        "componentWillMount is deprecated and will be removed in the next major version. " +
-          "Use componentDidMount instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillMount." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        sortedNames
-      );
-
-      pendingComponentWillMountWarnings = [];
-    }
-
-    if (pendingComponentWillReceivePropsWarnings.length > 0) {
-      var _uniqueNames = new Set();
-      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
-        _uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames = Array.from(_uniqueNames)
-        .sort()
-        .join(", ");
-
-      lowPriorityWarning$1(
-        false,
-        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
-          "Use static getDerivedStateFromProps instead." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames
-      );
-
-      pendingComponentWillReceivePropsWarnings = [];
-    }
-
-    if (pendingComponentWillUpdateWarnings.length > 0) {
-      var _uniqueNames2 = new Set();
-      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
-        _uniqueNames2.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames2 = Array.from(_uniqueNames2)
-        .sort()
-        .join(", ");
-
-      lowPriorityWarning$1(
-        false,
-        "componentWillUpdate is deprecated and will be removed in the next major version. " +
-          "Use componentDidUpdate instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillUpdate." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames2
-      );
-
-      pendingComponentWillUpdateWarnings = [];
-    }
-  };
+    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
+  }
+}
 
-  ReactStrictModeWarnings.recordDeprecationWarnings = function(
-    fiber,
-    instance
-  ) {
-    // Dedup strategy: Warn once per component.
-    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+function startCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Host Effects)");
+  }
+}
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillMountWarnings.push(fiber);
-    }
-    if (
-      typeof instance.componentWillReceiveProps === "function" &&
-      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillReceivePropsWarnings.push(fiber);
-    }
-    if (
-      typeof instance.componentWillUpdate === "function" &&
-      instance.componentWillUpdate.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillUpdateWarnings.push(fiber);
+function stopCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-  };
-
-  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
-    fiber,
-    instance
-  ) {
-    var strictRoot = getStrictRoot(fiber);
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Host Effects: " + count + " Total)",
+      "(Committing Host Effects)",
+      null
+    );
+  }
+}
 
-    // Dedup strategy: Warn once per component.
-    // This is difficult to track any other way since component names
-    // are often vague and are likely to collide between 3rd party libraries.
-    // An expand property is probably okay to use here since it's DEV-only,
-    // and will only be set in the event of serious warnings.
-    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+function startCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Calling Lifecycle Methods)");
+  }
+}
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
-    ) {
+function stopCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Calling Lifecycle Methods: " + count + " Total)",
+      "(Calling Lifecycle Methods)",
+      null
+    );
+  }
+}
 
-    var warningsForRoot = void 0;
-    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
-      warningsForRoot = {
-        UNSAFE_componentWillMount: [],
-        UNSAFE_componentWillReceiveProps: [],
-        UNSAFE_componentWillUpdate: []
-      };
+var warnedAboutMissingGetChildContext = void 0;
 
-      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
-    } else {
-      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
-    }
+{
+  warnedAboutMissingGetChildContext = {};
+}
 
-    var unsafeLifecycles = [];
-    if (
-      typeof instance.componentWillMount === "function" ||
-      typeof instance.UNSAFE_componentWillMount === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillMount");
-    }
-    if (
-      typeof instance.componentWillReceiveProps === "function" ||
-      typeof instance.UNSAFE_componentWillReceiveProps === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
-    }
-    if (
-      typeof instance.componentWillUpdate === "function" ||
-      typeof instance.UNSAFE_componentWillUpdate === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
-    }
+// A cursor to the current merged context object on the stack.
+var contextStackCursor = createCursor(emptyObject);
+// A cursor to a boolean indicating whether the context has changed.
+var didPerformWorkStackCursor = createCursor(false);
+// Keep track of the previous context object that was on the stack.
+// We use this to get access to the parent context after we have already
+// pushed the next context provider, and now need to merge their contexts.
+var previousContext = emptyObject;
 
-    if (unsafeLifecycles.length > 0) {
-      unsafeLifecycles.forEach(function(lifecycle) {
-        warningsForRoot[lifecycle].push(fiber);
-      });
-    }
-  };
+function getUnmaskedContext(workInProgress) {
+  var hasOwnContext = isContextProvider(workInProgress);
+  if (hasOwnContext) {
+    // If the fiber is a context provider itself, when we read its context
+    // we have already pushed its own child context on the stack. A context
+    // provider should not "see" its own child context. Therefore we read the
+    // previous (parent) context instead for a context provider.
+    return previousContext;
+  }
+  return contextStackCursor.current;
 }
 
-// Re-export dynamic flags from the fbsource version.
-var _require = require("ReactFeatureFlags");
+function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+  var instance = workInProgress.stateNode;
+  instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+  instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+}
 
-var enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch;
-var debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects;
-var debugRenderPhaseSideEffectsForStrictMode =
-  _require.debugRenderPhaseSideEffectsForStrictMode;
-var warnAboutDeprecatedLifecycles = _require.warnAboutDeprecatedLifecycles;
-var replayFailedUnitOfWorkWithInvokeGuardedCallback =
-  _require.replayFailedUnitOfWorkWithInvokeGuardedCallback;
+function getMaskedContext(workInProgress, unmaskedContext) {
+  var type = workInProgress.type;
+  var contextTypes = type.contextTypes;
+  if (!contextTypes) {
+    return emptyObject;
+  }
 
-var enableUserTimingAPI = true;
-var enableMutatingReconciler = true;
-var enableNoopReconciler = false;
-var enablePersistentReconciler = false;
+  // Avoid recreating masked context unless unmasked context has changed.
+  // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+  // This may trigger infinite loops if componentWillReceiveProps calls setState.
+  var instance = workInProgress.stateNode;
+  if (
+    instance &&
+    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+  ) {
+    return instance.__reactInternalMemoizedMaskedChildContext;
+  }
 
-// Only used in www builds.
+  var context = {};
+  for (var key in contextTypes) {
+    context[key] = unmaskedContext[key];
+  }
 
-function getCurrentFiberOwnerName() {
   {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    var owner = fiber._debugOwner;
-    if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner);
-    }
+    var name = getComponentName(workInProgress) || "Unknown";
+    checkPropTypes(
+      contextTypes,
+      context,
+      "context",
+      name,
+      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+    );
   }
-  return null;
-}
 
-function getCurrentFiberStackAddendum() {
-  {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    // Safe because if current fiber exists, we are reconciling,
-    // and it is guaranteed to be the work-in-progress version.
-    return getStackAddendumByWorkInProgressFiber(fiber);
+  // Cache unmasked context so we can avoid recreating masked context unless necessary.
+  // Context is created before the class component is instantiated so check for instance.
+  if (instance) {
+    cacheContext(workInProgress, unmaskedContext, context);
   }
-  return null;
+
+  return context;
 }
 
-function resetCurrentFiber() {
-  ReactDebugCurrentFrame.getCurrentStack = null;
-  ReactDebugCurrentFiber.current = null;
-  ReactDebugCurrentFiber.phase = null;
+function hasContextChanged() {
+  return didPerformWorkStackCursor.current;
 }
 
-function setCurrentFiber(fiber) {
-  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
-  ReactDebugCurrentFiber.current = fiber;
-  ReactDebugCurrentFiber.phase = null;
+function isContextConsumer(fiber) {
+  return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
 }
 
-function setCurrentPhase(phase) {
-  ReactDebugCurrentFiber.phase = phase;
+function isContextProvider(fiber) {
+  return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
 }
 
-var ReactDebugCurrentFiber = {
-  current: null,
-  phase: null,
-  resetCurrentFiber: resetCurrentFiber,
-  setCurrentFiber: setCurrentFiber,
-  setCurrentPhase: setCurrentPhase,
-  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
-};
-
-// Prefix measurements so that it's possible to filter them.
-// Longer prefixes are hard to read in DevTools.
-var reactEmoji = "\u269B";
-var warningEmoji = "\u26D4";
-var supportsUserTiming =
-  typeof performance !== "undefined" &&
-  typeof performance.mark === "function" &&
-  typeof performance.clearMarks === "function" &&
-  typeof performance.measure === "function" &&
-  typeof performance.clearMeasures === "function";
-
-// Keep track of current fiber so that we know the path to unwind on pause.
-// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
-var currentFiber = null;
-// If we're in the middle of user code, which fiber and method is it?
-// Reusing `currentFiber` would be confusing for this because user code fiber
-// can change during commit phase too, but we don't need to unwind it (since
-// lifecycles in the commit phase don't resemble a tree).
-var currentPhase = null;
-var currentPhaseFiber = null;
-// Did lifecycle hook schedule an update? This is often a performance problem,
-// so we will keep track of it, and include it in the report.
-// Track commits caused by cascading updates.
-var isCommitting = false;
-var hasScheduledUpdateInCurrentCommit = false;
-var hasScheduledUpdateInCurrentPhase = false;
-var commitCountInCurrentWorkLoop = 0;
-var effectCountInCurrentCommit = 0;
-var isWaitingForCallback = false;
-// During commits, we only show a measurement once per method name
-// to avoid stretch the commit phase with measurement overhead.
-var labelsInCurrentCommit = new Set();
+function popContextProvider(fiber) {
+  if (!isContextProvider(fiber)) {
+    return;
+  }
 
-var formatMarkName = function(markName) {
-  return reactEmoji + " " + markName;
-};
+  pop(didPerformWorkStackCursor, fiber);
+  pop(contextStackCursor, fiber);
+}
 
-var formatLabel = function(label, warning$$1) {
-  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
-  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
-  return "" + prefix + label + suffix;
-};
+function popTopLevelContextObject(fiber) {
+  pop(didPerformWorkStackCursor, fiber);
+  pop(contextStackCursor, fiber);
+}
 
-var beginMark = function(markName) {
-  performance.mark(formatMarkName(markName));
-};
+function pushTopLevelContextObject(fiber, context, didChange) {
+  invariant(
+    contextStackCursor.cursor == null,
+    "Unexpected context found on stack. " +
+      "This error is likely caused by a bug in React. Please file an issue."
+  );
 
-var clearMark = function(markName) {
-  performance.clearMarks(formatMarkName(markName));
-};
+  push(contextStackCursor, context, fiber);
+  push(didPerformWorkStackCursor, didChange, fiber);
+}
 
-var endMark = function(label, markName, warning$$1) {
-  var formattedMarkName = formatMarkName(markName);
-  var formattedLabel = formatLabel(label, warning$$1);
-  try {
-    performance.measure(formattedLabel, formattedMarkName);
-  } catch (err) {}
-  // If previous mark was missing for some reason, this will throw.
-  // This could only happen if React crashed in an unexpected place earlier.
-  // Don't pile on with more errors.
+function processChildContext(fiber, parentContext) {
+  var instance = fiber.stateNode;
+  var childContextTypes = fiber.type.childContextTypes;
 
-  // Clear marks immediately to avoid growing buffer.
-  performance.clearMarks(formattedMarkName);
-  performance.clearMeasures(formattedLabel);
-};
+  // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+  // It has only been added in Fiber to match the (unintentional) behavior in Stack.
+  if (typeof instance.getChildContext !== "function") {
+    {
+      var componentName = getComponentName(fiber) || "Unknown";
 
-var getFiberMarkName = function(label, debugID) {
-  return label + " (#" + debugID + ")";
-};
+      if (!warnedAboutMissingGetChildContext[componentName]) {
+        warnedAboutMissingGetChildContext[componentName] = true;
+        warning(
+          false,
+          "%s.childContextTypes is specified but there is no getChildContext() method " +
+            "on the instance. You can either define getChildContext() on %s or remove " +
+            "childContextTypes from it.",
+          componentName,
+          componentName
+        );
+      }
+    }
+    return parentContext;
+  }
 
-var getFiberLabel = function(componentName, isMounted, phase) {
-  if (phase === null) {
-    // These are composite component total time measurements.
-    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
-  } else {
-    // Composite component methods.
-    return componentName + "." + phase;
+  var childContext = void 0;
+  {
+    ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
+  }
+  startPhaseTimer(fiber, "getChildContext");
+  childContext = instance.getChildContext();
+  stopPhaseTimer();
+  {
+    ReactDebugCurrentFiber.setCurrentPhase(null);
+  }
+  for (var contextKey in childContext) {
+    invariant(
+      contextKey in childContextTypes,
+      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+      getComponentName(fiber) || "Unknown",
+      contextKey
+    );
+  }
+  {
+    var name = getComponentName(fiber) || "Unknown";
+    checkPropTypes(
+      childContextTypes,
+      childContext,
+      "child context",
+      name,
+      // In practice, there is one case in which we won't get a stack. It's when
+      // somebody calls unstable_renderSubtreeIntoContainer() and we process
+      // context from the parent component instance. The stack will be missing
+      // because it's outside of the reconciliation, and so the pointer has not
+      // been set. This is rare and doesn't matter. We'll also remove that API.
+      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+    );
   }
-};
 
-var beginFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
+  return Object.assign({}, parentContext, childContext);
+}
 
-  if (isCommitting && labelsInCurrentCommit.has(label)) {
-    // During the commit phase, we don't show duplicate labels because
-    // there is a fixed overhead for every measurement, and we don't
-    // want to stretch the commit phase beyond necessary.
+function pushContextProvider(workInProgress) {
+  if (!isContextProvider(workInProgress)) {
     return false;
   }
-  labelsInCurrentCommit.add(label);
 
-  var markName = getFiberMarkName(label, debugID);
-  beginMark(markName);
-  return true;
-};
+  var instance = workInProgress.stateNode;
+  // We push the context as early as possible to ensure stack integrity.
+  // If the instance does not exist yet, we will push null at first,
+  // and replace it on the stack later when invalidating the context.
+  var memoizedMergedChildContext =
+    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+    emptyObject;
+
+  // Remember the parent context so we can merge with it later.
+  // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+  previousContext = contextStackCursor.current;
+  push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+  push(
+    didPerformWorkStackCursor,
+    didPerformWorkStackCursor.current,
+    workInProgress
+  );
 
-var clearFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  clearMark(markName);
-};
+  return true;
+}
 
-var endFiberMark = function(fiber, phase, warning$$1) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  endMark(label, markName, warning$$1);
-};
+function invalidateContextProvider(workInProgress, didChange) {
+  var instance = workInProgress.stateNode;
+  invariant(
+    instance,
+    "Expected to have an instance by this point. " +
+      "This error is likely caused by a bug in React. Please file an issue."
+  );
 
-var shouldIgnoreFiber = function(fiber) {
-  // Host components should be skipped in the timeline.
-  // We could check typeof fiber.type, but does this work with RN?
-  switch (fiber.tag) {
-    case HostRoot:
-    case HostComponent:
-    case HostText:
-    case HostPortal:
-    case CallComponent:
-    case ReturnComponent:
-    case Fragment:
-    case ContextProvider:
-    case ContextConsumer:
-      return true;
-    default:
-      return false;
+  if (didChange) {
+    // Merge parent and own context.
+    // Skip this if we're not updating due to sCU.
+    // This avoids unnecessarily recomputing memoized values.
+    var mergedContext = processChildContext(workInProgress, previousContext);
+    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+
+    // Replace the old (or empty) context with the new one.
+    // It is important to unwind the context in the reverse order.
+    pop(didPerformWorkStackCursor, workInProgress);
+    pop(contextStackCursor, workInProgress);
+    // Now push the new context and mark that it has changed.
+    push(contextStackCursor, mergedContext, workInProgress);
+    push(didPerformWorkStackCursor, didChange, workInProgress);
+  } else {
+    pop(didPerformWorkStackCursor, workInProgress);
+    push(didPerformWorkStackCursor, didChange, workInProgress);
   }
-};
+}
 
-var clearPendingPhaseMeasurement = function() {
-  if (currentPhase !== null && currentPhaseFiber !== null) {
-    clearFiberMark(currentPhaseFiber, currentPhase);
-  }
-  currentPhaseFiber = null;
-  currentPhase = null;
-  hasScheduledUpdateInCurrentPhase = false;
-};
+function resetContext() {
+  previousContext = emptyObject;
+  contextStackCursor.current = emptyObject;
+  didPerformWorkStackCursor.current = false;
+}
 
-var pauseTimers = function() {
-  // Stops all currently active measurements so that they can be resumed
-  // if we continue in a later deferred loop from the same unit of work.
-  var fiber = currentFiber;
-  while (fiber) {
-    if (fiber._debugIsCurrentlyTiming) {
-      endFiberMark(fiber, null, null);
+function findCurrentUnmaskedContext(fiber) {
+  // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+  // makes sense elsewhere
+  invariant(
+    isFiberMounted(fiber) && fiber.tag === ClassComponent,
+    "Expected subtree parent to be a mounted class component. " +
+      "This error is likely caused by a bug in React. Please file an issue."
+  );
+
+  var node = fiber;
+  while (node.tag !== HostRoot) {
+    if (isContextProvider(node)) {
+      return node.stateNode.__reactInternalMemoizedMergedChildContext;
     }
-    fiber = fiber["return"];
+    var parent = node["return"];
+    invariant(
+      parent,
+      "Found unexpected detached subtree parent. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+    node = parent;
   }
-};
+  return node.stateNode.context;
+}
 
-var resumeTimersRecursively = function(fiber) {
-  if (fiber["return"] !== null) {
-    resumeTimersRecursively(fiber["return"]);
-  }
-  if (fiber._debugIsCurrentlyTiming) {
-    beginFiberMark(fiber, null);
-  }
-};
+// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
+// Math.pow(2, 30) - 1
+// 0b111111111111111111111111111111
+var MAX_SIGNED_31_BIT_INT = 1073741823;
 
-var resumeTimers = function() {
-  // Resumes all measurements that were active during the last deferred loop.
-  if (currentFiber !== null) {
-    resumeTimersRecursively(currentFiber);
-  }
-};
+// TODO: Use an opaque type once ESLint et al support the syntax
 
-function recordEffect() {
-  if (enableUserTimingAPI) {
-    effectCountInCurrentCommit++;
-  }
-}
+var NoWork = 0;
+var Sync = 1;
+var Never = MAX_SIGNED_31_BIT_INT;
 
-function recordScheduleUpdate() {
-  if (enableUserTimingAPI) {
-    if (isCommitting) {
-      hasScheduledUpdateInCurrentCommit = true;
-    }
-    if (
-      currentPhase !== null &&
-      currentPhase !== "componentWillMount" &&
-      currentPhase !== "componentWillReceiveProps"
-    ) {
-      hasScheduledUpdateInCurrentPhase = true;
-    }
-  }
+var UNIT_SIZE = 10;
+var MAGIC_NUMBER_OFFSET = 2;
+
+// 1 unit of expiration time represents 10ms.
+function msToExpirationTime(ms) {
+  // Always add an offset so that we don't clash with the magic number for NoWork.
+  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
 }
 
-function startRequestCallbackTimer() {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming && !isWaitingForCallback) {
-      isWaitingForCallback = true;
-      beginMark("(Waiting for async callback...)");
-    }
-  }
+function expirationTimeToMs(expirationTime) {
+  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
 }
 
-function stopRequestCallbackTimer(didExpire, expirationTime) {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming) {
-      isWaitingForCallback = false;
-      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
-      endMark(
-        "(Waiting for async callback... will force flush in " +
-          expirationTime +
-          " ms)",
-        "(Waiting for async callback...)",
-        warning$$1
-      );
-    }
-  }
+function ceiling(num, precision) {
+  return (((num / precision) | 0) + 1) * precision;
 }
 
-function startWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, this is the fiber to unwind from.
-    currentFiber = fiber;
-    if (!beginFiberMark(fiber, null)) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = true;
-  }
+function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
+  return ceiling(
+    currentTime + expirationInMs / UNIT_SIZE,
+    bucketSizeMs / UNIT_SIZE
+  );
 }
 
-function cancelWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // Remember we shouldn't complete measurement for this fiber.
-    // Otherwise flamechart will be deep even for small updates.
-    fiber._debugIsCurrentlyTiming = false;
-    clearFiberMark(fiber, null);
-  }
-}
+var NoContext = 0;
+var AsyncMode = 1;
+var StrictMode = 2;
 
-function stopWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    endFiberMark(fiber, null, null);
-  }
-}
+var hasBadMapPolyfill = void 0;
 
-function stopFailedWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    var warning$$1 = "An error was thrown inside this error boundary";
-    endFiberMark(fiber, null, warning$$1);
+{
+  hasBadMapPolyfill = false;
+  try {
+    var nonExtensibleObject = Object.preventExtensions({});
+    var testMap = new Map([[nonExtensibleObject, null]]);
+    var testSet = new Set([nonExtensibleObject]);
+    // This is necessary for Rollup to not consider these unused.
+    // https://github.com/rollup/rollup/issues/1771
+    // TODO: we can remove these if Rollup fixes the bug.
+    testMap.set(0, 0);
+    testSet.add(0);
+  } catch (e) {
+    // TODO: Consider warning about bad polyfills
+    hasBadMapPolyfill = true;
   }
 }
 
-function startPhaseTimer(fiber, phase) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    clearPendingPhaseMeasurement();
-    if (!beginFiberMark(fiber, phase)) {
-      return;
-    }
-    currentPhaseFiber = fiber;
-    currentPhase = phase;
-  }
-}
+// A Fiber is work on a Component that needs to be done or was done. There can
+// be more than one per component.
 
-function stopPhaseTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    if (currentPhase !== null && currentPhaseFiber !== null) {
-      var warning$$1 = hasScheduledUpdateInCurrentPhase
-        ? "Scheduled a cascading update"
-        : null;
-      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
-    }
-    currentPhase = null;
-    currentPhaseFiber = null;
-  }
-}
+var debugCounter = void 0;
 
-function startWorkLoopTimer(nextUnitOfWork) {
-  if (enableUserTimingAPI) {
-    currentFiber = nextUnitOfWork;
-    if (!supportsUserTiming) {
-      return;
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // This is top level call.
-    // Any other measurements are performed within.
-    beginMark("(React Tree Reconciliation)");
-    // Resume any measurements that were in progress during the last loop.
-    resumeTimers();
-  }
+{
+  debugCounter = 1;
 }
 
-function stopWorkLoopTimer(interruptedBy, didCompleteRoot) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var warning$$1 = null;
-    if (interruptedBy !== null) {
-      if (interruptedBy.tag === HostRoot) {
-        warning$$1 = "A top-level update interrupted the previous render";
-      } else {
-        var componentName = getComponentName(interruptedBy) || "Unknown";
-        warning$$1 =
-          "An update to " + componentName + " interrupted the previous render";
-      }
-    } else if (commitCountInCurrentWorkLoop > 1) {
-      warning$$1 = "There were cascading updates";
-    }
-    commitCountInCurrentWorkLoop = 0;
-    var label = didCompleteRoot
-      ? "(React Tree Reconciliation: Completed Root)"
-      : "(React Tree Reconciliation: Yielded)";
-    // Pause any measurements until the next loop.
-    pauseTimers();
-    endMark(label, "(React Tree Reconciliation)", warning$$1);
-  }
-}
+function FiberNode(tag, pendingProps, key, mode) {
+  // Instance
+  this.tag = tag;
+  this.key = key;
+  this.type = null;
+  this.stateNode = null;
 
-function startCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    isCommitting = true;
-    hasScheduledUpdateInCurrentCommit = false;
-    labelsInCurrentCommit.clear();
-    beginMark("(Committing Changes)");
-  }
-}
+  // Fiber
+  this["return"] = null;
+  this.child = null;
+  this.sibling = null;
+  this.index = 0;
 
-function stopCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
+  this.ref = null;
 
-    var warning$$1 = null;
-    if (hasScheduledUpdateInCurrentCommit) {
-      warning$$1 = "Lifecycle hook scheduled a cascading update";
-    } else if (commitCountInCurrentWorkLoop > 0) {
-      warning$$1 = "Caused by a cascading update in earlier commit";
-    }
-    hasScheduledUpdateInCurrentCommit = false;
-    commitCountInCurrentWorkLoop++;
-    isCommitting = false;
-    labelsInCurrentCommit.clear();
+  this.pendingProps = pendingProps;
+  this.memoizedProps = null;
+  this.updateQueue = null;
+  this.memoizedState = null;
 
-    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
-  }
-}
+  this.mode = mode;
 
-function startCommitSnapshotEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Committing Snapshot Effects)");
-  }
-}
+  // Effects
+  this.effectTag = NoEffect;
+  this.nextEffect = null;
 
-function stopCommitSnapshotEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Committing Snapshot Effects: " + count + " Total)",
-      "(Committing Snapshot Effects)",
-      null
-    );
-  }
-}
+  this.firstEffect = null;
+  this.lastEffect = null;
 
-function startCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Committing Host Effects)");
-  }
-}
+  this.expirationTime = NoWork;
 
-function stopCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Committing Host Effects: " + count + " Total)",
-      "(Committing Host Effects)",
-      null
-    );
-  }
-}
+  this.alternate = null;
 
-function startCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
+  {
+    this._debugID = debugCounter++;
+    this._debugSource = null;
+    this._debugOwner = null;
+    this._debugIsCurrentlyTiming = false;
+    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
+      Object.preventExtensions(this);
     }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Calling Lifecycle Methods)");
   }
 }
 
-function stopCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Calling Lifecycle Methods: " + count + " Total)",
-      "(Calling Lifecycle Methods)",
-      null
-    );
-  }
+// This is a constructor function, rather than a POJO constructor, still
+// please ensure we do the following:
+// 1) Nobody should add any instance methods on this. Instance methods can be
+//    more difficult to predict when they get optimized and they are almost
+//    never inlined properly in static compilers.
+// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
+//    always know when it is a fiber.
+// 3) We might want to experiment with using numeric keys since they are easier
+//    to optimize in a non-JIT environment.
+// 4) We can easily go from a constructor to a createFiber object literal if that
+//    is faster.
+// 5) It should be easy to port this to a C struct and keep a C implementation
+//    compatible.
+var createFiber = function(tag, pendingProps, key, mode) {
+  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
+  return new FiberNode(tag, pendingProps, key, mode);
+};
+
+function shouldConstruct(Component) {
+  return !!(Component.prototype && Component.prototype.isReactComponent);
 }
 
-var didWarnUpdateInsideUpdate = void 0;
+// This is used to create an alternate fiber to do work on.
+function createWorkInProgress(current, pendingProps, expirationTime) {
+  var workInProgress = current.alternate;
+  if (workInProgress === null) {
+    // We use a double buffering pooling technique because we know that we'll
+    // only ever need at most two versions of a tree. We pool the "other" unused
+    // node that we're free to reuse. This is lazily created to avoid allocating
+    // extra objects for things that are never updated. It also allow us to
+    // reclaim the extra memory if needed.
+    workInProgress = createFiber(
+      current.tag,
+      pendingProps,
+      current.key,
+      current.mode
+    );
+    workInProgress.type = current.type;
+    workInProgress.stateNode = current.stateNode;
 
-{
-  didWarnUpdateInsideUpdate = false;
-}
+    {
+      // DEV-only fields
+      workInProgress._debugID = current._debugID;
+      workInProgress._debugSource = current._debugSource;
+      workInProgress._debugOwner = current._debugOwner;
+    }
 
-// Callbacks are not validated until invocation
+    workInProgress.alternate = current;
+    current.alternate = workInProgress;
+  } else {
+    workInProgress.pendingProps = pendingProps;
 
-// Singly linked-list of updates. When an update is scheduled, it is added to
-// the queue of the current fiber and the work-in-progress fiber. The two queues
-// are separate but they share a persistent structure.
-//
-// During reconciliation, updates are removed from the work-in-progress fiber,
-// but they remain on the current fiber. That ensures that if a work-in-progress
-// is aborted, the aborted updates are recovered by cloning from current.
-//
-// The work-in-progress queue is always a subset of the current queue.
-//
-// When the tree is committed, the work-in-progress becomes the current.
+    // We already have an alternate.
+    // Reset the effect tag.
+    workInProgress.effectTag = NoEffect;
 
-function createUpdateQueue(baseState) {
-  var queue = {
-    baseState: baseState,
-    expirationTime: NoWork,
-    first: null,
-    last: null,
-    callbackList: null,
-    hasForceUpdate: false,
-    isInitialized: false,
-    capturedValues: null
-  };
-  {
-    queue.isProcessing = false;
+    // The effect list is no longer valid.
+    workInProgress.nextEffect = null;
+    workInProgress.firstEffect = null;
+    workInProgress.lastEffect = null;
   }
-  return queue;
-}
 
-function insertUpdateIntoQueue(queue, update) {
-  // Append the update to the end of the list.
-  if (queue.last === null) {
-    // Queue is empty
-    queue.first = queue.last = update;
-  } else {
-    queue.last.next = update;
-    queue.last = update;
-  }
-  if (
-    queue.expirationTime === NoWork ||
-    queue.expirationTime > update.expirationTime
-  ) {
-    queue.expirationTime = update.expirationTime;
-  }
-}
+  workInProgress.expirationTime = expirationTime;
 
-var q1 = void 0;
-var q2 = void 0;
-function ensureUpdateQueues(fiber) {
-  q1 = q2 = null;
-  // We'll have at least one and at most two distinct update queues.
-  var alternateFiber = fiber.alternate;
-  var queue1 = fiber.updateQueue;
-  if (queue1 === null) {
-    // TODO: We don't know what the base state will be until we begin work.
-    // It depends on which fiber is the next current. Initialize with an empty
-    // base state, then set to the memoizedState when rendering. Not super
-    // happy with this approach.
-    queue1 = fiber.updateQueue = createUpdateQueue(null);
-  }
+  workInProgress.child = current.child;
+  workInProgress.memoizedProps = current.memoizedProps;
+  workInProgress.memoizedState = current.memoizedState;
+  workInProgress.updateQueue = current.updateQueue;
 
-  var queue2 = void 0;
-  if (alternateFiber !== null) {
-    queue2 = alternateFiber.updateQueue;
-    if (queue2 === null) {
-      queue2 = alternateFiber.updateQueue = createUpdateQueue(null);
-    }
-  } else {
-    queue2 = null;
-  }
-  queue2 = queue2 !== queue1 ? queue2 : null;
+  // These will be overridden during the parent's reconciliation
+  workInProgress.sibling = current.sibling;
+  workInProgress.index = current.index;
+  workInProgress.ref = current.ref;
 
-  // Use module variables instead of returning a tuple
-  q1 = queue1;
-  q2 = queue2;
+  return workInProgress;
 }
 
-function insertUpdateIntoFiber(fiber, update) {
-  ensureUpdateQueues(fiber);
-  var queue1 = q1;
-  var queue2 = q2;
+function createHostRootFiber(isAsync) {
+  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
+  return createFiber(HostRoot, null, null, mode);
+}
 
-  // Warn if an update is scheduled from inside an updater function.
+function createFiberFromElement(element, mode, expirationTime) {
+  var owner = null;
   {
-    if (
-      (queue1.isProcessing || (queue2 !== null && queue2.isProcessing)) &&
-      !didWarnUpdateInsideUpdate
-    ) {
-      warning(
-        false,
-        "An update (setState, replaceState, or forceUpdate) was scheduled " +
-          "from inside an update function. Update functions should be pure, " +
-          "with zero side-effects. Consider using componentDidUpdate or a " +
-          "callback."
-      );
-      didWarnUpdateInsideUpdate = true;
-    }
+    owner = element._owner;
   }
 
-  // If there's only one queue, add the update to that queue and exit.
-  if (queue2 === null) {
-    insertUpdateIntoQueue(queue1, update);
-    return;
+  var fiber = void 0;
+  var type = element.type;
+  var key = element.key;
+  var pendingProps = element.props;
+
+  var fiberTag = void 0;
+  if (typeof type === "function") {
+    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
+  } else if (typeof type === "string") {
+    fiberTag = HostComponent;
+  } else {
+    switch (type) {
+      case REACT_FRAGMENT_TYPE:
+        return createFiberFromFragment(
+          pendingProps.children,
+          mode,
+          expirationTime,
+          key
+        );
+      case REACT_ASYNC_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= AsyncMode | StrictMode;
+        break;
+      case REACT_STRICT_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= StrictMode;
+        break;
+      case REACT_CALL_TYPE:
+        fiberTag = CallComponent;
+        break;
+      case REACT_RETURN_TYPE:
+        fiberTag = ReturnComponent;
+        break;
+      default: {
+        if (typeof type === "object" && type !== null) {
+          switch (type.$$typeof) {
+            case REACT_PROVIDER_TYPE:
+              fiberTag = ContextProvider;
+              break;
+            case REACT_CONTEXT_TYPE:
+              // This is a consumer
+              fiberTag = ContextConsumer;
+              break;
+            default:
+              if (typeof type.tag === "number") {
+                // Currently assumed to be a continuation and therefore is a
+                // fiber already.
+                // TODO: The yield system is currently broken for updates in
+                // some cases. The reified yield stores a fiber, but we don't
+                // know which fiber that is; the current or a workInProgress?
+                // When the continuation gets rendered here we don't know if we
+                // can reuse that fiber or if we need to clone it. There is
+                // probably a clever way to restructure this.
+                fiber = type;
+                fiber.pendingProps = pendingProps;
+                fiber.expirationTime = expirationTime;
+                return fiber;
+              } else {
+                throwOnInvalidElementType(type, owner);
+              }
+              break;
+          }
+        } else {
+          throwOnInvalidElementType(type, owner);
+        }
+      }
+    }
   }
 
-  // If either queue is empty, we need to add to both queues.
-  if (queue1.last === null || queue2.last === null) {
-    insertUpdateIntoQueue(queue1, update);
-    insertUpdateIntoQueue(queue2, update);
-    return;
+  fiber = createFiber(fiberTag, pendingProps, key, mode);
+  fiber.type = type;
+  fiber.expirationTime = expirationTime;
+
+  {
+    fiber._debugSource = element._source;
+    fiber._debugOwner = element._owner;
   }
 
-  // If both lists are not empty, the last update is the same for both lists
-  // because of structural sharing. So, we should only append to one of
-  // the lists.
-  insertUpdateIntoQueue(queue1, update);
-  // But we still need to update the `last` pointer of queue2.
-  queue2.last = update;
+  return fiber;
 }
 
-function getUpdateExpirationTime(fiber) {
-  switch (fiber.tag) {
-    case HostRoot:
-    case ClassComponent:
-      var updateQueue = fiber.updateQueue;
-      if (updateQueue === null) {
-        return NoWork;
-      }
-      return updateQueue.expirationTime;
-    default:
-      return NoWork;
+function throwOnInvalidElementType(type, owner) {
+  var info = "";
+  {
+    if (
+      type === undefined ||
+      (typeof type === "object" &&
+        type !== null &&
+        Object.keys(type).length === 0)
+    ) {
+      info +=
+        " You likely forgot to export your component from the file " +
+        "it's defined in, or you might have mixed up default and " +
+        "named imports.";
+    }
+    var ownerName = owner ? getComponentName(owner) : null;
+    if (ownerName) {
+      info += "\n\nCheck the render method of `" + ownerName + "`.";
+    }
   }
+  invariant(
+    false,
+    "Element type is invalid: expected a string (for built-in " +
+      "components) or a class/function (for composite components) " +
+      "but got: %s.%s",
+    type == null ? type : typeof type,
+    info
+  );
 }
 
-function getStateFromUpdate(update, instance, prevState, props) {
-  var partialState = update.partialState;
-  if (typeof partialState === "function") {
-    return partialState.call(instance, prevState, props);
-  } else {
-    return partialState;
-  }
+function createFiberFromFragment(elements, mode, expirationTime, key) {
+  var fiber = createFiber(Fragment, elements, key, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
 }
 
-function processUpdateQueue(
-  current,
-  workInProgress,
-  queue,
-  instance,
-  props,
-  renderExpirationTime
-) {
-  if (current !== null && current.updateQueue === queue) {
-    // We need to create a work-in-progress queue, by cloning the current queue.
-    var currentQueue = queue;
-    queue = workInProgress.updateQueue = {
-      baseState: currentQueue.baseState,
-      expirationTime: currentQueue.expirationTime,
-      first: currentQueue.first,
-      last: currentQueue.last,
-      isInitialized: currentQueue.isInitialized,
-      capturedValues: currentQueue.capturedValues,
-      // These fields are no longer valid because they were already committed.
-      // Reset them.
-      callbackList: null,
-      hasForceUpdate: false
-    };
-  }
-
-  {
-    // Set this flag so we can warn if setState is called inside the update
-    // function of another setState.
-    queue.isProcessing = true;
-  }
+function createFiberFromText(content, mode, expirationTime) {
+  var fiber = createFiber(HostText, content, null, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
+}
 
-  // Reset the remaining expiration time. If we skip over any updates, we'll
-  // increase this accordingly.
-  queue.expirationTime = NoWork;
+function createFiberFromHostInstanceForDeletion() {
+  var fiber = createFiber(HostComponent, null, null, NoContext);
+  fiber.type = "DELETED";
+  return fiber;
+}
 
-  // TODO: We don't know what the base state will be until we begin work.
-  // It depends on which fiber is the next current. Initialize with an empty
-  // base state, then set to the memoizedState when rendering. Not super
-  // happy with this approach.
-  var state = void 0;
-  if (queue.isInitialized) {
-    state = queue.baseState;
-  } else {
-    state = queue.baseState = workInProgress.memoizedState;
-    queue.isInitialized = true;
-  }
-  var dontMutatePrevState = true;
-  var update = queue.first;
-  var didSkip = false;
-  while (update !== null) {
-    var updateExpirationTime = update.expirationTime;
-    if (updateExpirationTime > renderExpirationTime) {
-      // This update does not have sufficient priority. Skip it.
-      var remainingExpirationTime = queue.expirationTime;
-      if (
-        remainingExpirationTime === NoWork ||
-        remainingExpirationTime > updateExpirationTime
-      ) {
-        // Update the remaining expiration time.
-        queue.expirationTime = updateExpirationTime;
-      }
-      if (!didSkip) {
-        didSkip = true;
-        queue.baseState = state;
-      }
-      // Continue to the next update.
-      update = update.next;
-      continue;
-    }
+function createFiberFromPortal(portal, mode, expirationTime) {
+  var pendingProps = portal.children !== null ? portal.children : [];
+  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
+  fiber.expirationTime = expirationTime;
+  fiber.stateNode = {
+    containerInfo: portal.containerInfo,
+    pendingChildren: null, // Used by persistent updates
+    implementation: portal.implementation
+  };
+  return fiber;
+}
 
-    // This update does have sufficient priority.
+// TODO: This should be lifted into the renderer.
 
-    // If no previous updates were skipped, drop this update from the queue by
-    // advancing the head of the list.
-    if (!didSkip) {
-      queue.first = update.next;
-      if (queue.first === null) {
-        queue.last = null;
-      }
-    }
+function createFiberRoot(containerInfo, isAsync, hydrate) {
+  // Cyclic construction. This cheats the type system right now because
+  // stateNode is any.
+  var uninitializedFiber = createHostRootFiber(isAsync);
+  var root = {
+    current: uninitializedFiber,
+    containerInfo: containerInfo,
+    pendingChildren: null,
+    pendingCommitExpirationTime: NoWork,
+    finishedWork: null,
+    context: null,
+    pendingContext: null,
+    hydrate: hydrate,
+    remainingExpirationTime: NoWork,
+    firstBatch: null,
+    nextScheduledRoot: null
+  };
+  uninitializedFiber.stateNode = root;
+  return root;
+}
 
-    // Invoke setState callback an extra time to help detect side-effects.
-    // Ignore the return value in this case.
-    if (
-      debugRenderPhaseSideEffects ||
-      (debugRenderPhaseSideEffectsForStrictMode &&
-        workInProgress.mode & StrictMode)
-    ) {
-      getStateFromUpdate(update, instance, state, props);
-    }
+var onCommitFiberRoot = null;
+var onCommitFiberUnmount = null;
+var hasLoggedError = false;
 
-    // Process the update
-    var _partialState = void 0;
-    if (update.isReplace) {
-      state = getStateFromUpdate(update, instance, state, props);
-      dontMutatePrevState = true;
-    } else {
-      _partialState = getStateFromUpdate(update, instance, state, props);
-      if (_partialState) {
-        if (dontMutatePrevState) {
-          // $FlowFixMe: Idk how to type this properly.
-          state = Object.assign({}, state, _partialState);
-        } else {
-          state = Object.assign(state, _partialState);
-        }
-        dontMutatePrevState = false;
-      }
-    }
-    if (update.isForced) {
-      queue.hasForceUpdate = true;
-    }
-    if (update.callback !== null) {
-      // Append to list of callbacks.
-      var _callbackList = queue.callbackList;
-      if (_callbackList === null) {
-        _callbackList = queue.callbackList = [];
-      }
-      _callbackList.push(update);
-    }
-    if (update.capturedValue !== null) {
-      var _capturedValues = queue.capturedValues;
-      if (_capturedValues === null) {
-        queue.capturedValues = [update.capturedValue];
-      } else {
-        _capturedValues.push(update.capturedValue);
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {
+      if (true && !hasLoggedError) {
+        hasLoggedError = true;
+        warning(false, "React DevTools encountered an error: %s", err);
       }
     }
-    update = update.next;
-  }
-
-  if (queue.callbackList !== null) {
-    workInProgress.effectTag |= Callback;
-  } else if (
-    queue.first === null &&
-    !queue.hasForceUpdate &&
-    queue.capturedValues === null
-  ) {
-    // The queue is empty. We can reset it.
-    workInProgress.updateQueue = null;
-  }
-
-  if (!didSkip) {
-    didSkip = true;
-    queue.baseState = state;
-  }
-
-  {
-    // No longer processing.
-    queue.isProcessing = false;
-  }
-
-  return state;
+  };
 }
 
-function commitCallbacks(queue, context) {
-  var callbackList = queue.callbackList;
-  if (callbackList === null) {
-    return;
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
+    return false;
   }
-  // Set the list to null to make sure they don't get called more than once.
-  queue.callbackList = null;
-  for (var i = 0; i < callbackList.length; i++) {
-    var update = callbackList[i];
-    var _callback = update.callback;
-    // This update might be processed again. Clear the callback so it's only
-    // called once.
-    update.callback = null;
-    invariant(
-      typeof _callback === "function",
-      "Invalid argument passed as callback. Expected a function. Instead " +
-        "received: %s",
-      _callback
-    );
-    _callback.call(context);
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
   }
-}
-
-var fakeInternalInstance = {};
-var isArray = Array.isArray;
-
-var didWarnAboutStateAssignmentForComponent = void 0;
-var didWarnAboutUndefinedDerivedState = void 0;
-var didWarnAboutUninitializedState = void 0;
-var didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = void 0;
-var didWarnAboutLegacyLifecyclesAndDerivedState = void 0;
-var warnOnInvalidCallback = void 0;
-
-{
-  didWarnAboutStateAssignmentForComponent = new Set();
-  didWarnAboutUndefinedDerivedState = new Set();
-  didWarnAboutUninitializedState = new Set();
-  didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = new Set();
-  didWarnAboutLegacyLifecyclesAndDerivedState = new Set();
-
-  var didWarnOnInvalidCallback = new Set();
-
-  warnOnInvalidCallback = function(callback, callerName) {
-    if (callback === null || typeof callback === "function") {
-      return;
-    }
-    var key = callerName + "_" + callback;
-    if (!didWarnOnInvalidCallback.has(key)) {
-      didWarnOnInvalidCallback.add(key);
+  if (!hook.supportsFiber) {
+    {
       warning(
         false,
-        "%s(...): Expected the last optional `callback` argument to be a " +
-          "function. Instead received: %s.",
-        callerName,
-        callback
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://fb.me/react-devtools"
       );
     }
-  };
-
-  // This is so gross but it's at least non-critical and can be removed if
-  // it causes problems. This is meant to give a nicer error message for
-  // ReactDOM15.unstable_renderSubtreeIntoContainer(reactDOM16Component,
-  // ...)) which otherwise throws a "_processChildContext is not a function"
-  // exception.
-  Object.defineProperty(fakeInternalInstance, "_processChildContext", {
-    enumerable: false,
-    value: function() {
-      invariant(
-        false,
-        "_processChildContext is not available in React 16+. This likely " +
-          "means you have multiple copies of React and are attempting to nest " +
-          "a React 15 tree inside a React 16 tree using " +
-          "unstable_renderSubtreeIntoContainer, which isn't supported. Try " +
-          "to make sure you have only one copy of React (and ideally, switch " +
-          "to ReactDOM.createPortal)."
-      );
+    // DevTools exists, even though it doesn't support Fiber.
+    return true;
+  }
+  try {
+    var rendererID = hook.inject(internals);
+    // We have successfully injected, so now it is safe to set up hooks.
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      warning(false, "React DevTools encountered an error: %s.", err);
     }
-  });
-  Object.freeze(fakeInternalInstance);
+  }
+  // DevTools exists
+  return true;
 }
-function callGetDerivedStateFromCatch(ctor, capturedValues) {
-  var resultState = {};
-  for (var i = 0; i < capturedValues.length; i++) {
-    var capturedValue = capturedValues[i];
-    var error = capturedValue.value;
-    var partialState = ctor.getDerivedStateFromCatch.call(null, error);
-    if (partialState !== null && partialState !== undefined) {
-      Object.assign(resultState, partialState);
-    }
+
+function onCommitRoot(root) {
+  if (typeof onCommitFiberRoot === "function") {
+    onCommitFiberRoot(root);
   }
-  return resultState;
 }
 
-var ReactFiberClassComponent = function(
-  legacyContext,
-  scheduleWork,
-  computeExpirationForFiber,
-  memoizeProps,
-  memoizeState
-) {
-  var cacheContext = legacyContext.cacheContext,
-    getMaskedContext = legacyContext.getMaskedContext,
-    getUnmaskedContext = legacyContext.getUnmaskedContext,
-    isContextConsumer = legacyContext.isContextConsumer,
-    hasContextChanged = legacyContext.hasContextChanged;
+function onCommitUnmount(fiber) {
+  if (typeof onCommitFiberUnmount === "function") {
+    onCommitFiberUnmount(fiber);
+  }
+}
 
-  // Class component state updater
+/**
+ * Forked from fbjs/warning:
+ * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
+ *
+ * Only change is we use console.warn instead of console.error,
+ * and do nothing when 'console' is not supported.
+ * This really simplifies the code.
+ * ---
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
 
-  var updater = {
-    isMounted: isMounted,
-    enqueueSetState: function(instance, partialState, callback) {
-      var fiber = get(instance);
-      callback = callback === undefined ? null : callback;
-      {
-        warnOnInvalidCallback(callback, "setState");
-      }
-      var expirationTime = computeExpirationForFiber(fiber);
-      var update = {
-        expirationTime: expirationTime,
-        partialState: partialState,
-        callback: callback,
-        isReplace: false,
-        isForced: false,
-        capturedValue: null,
-        next: null
-      };
-      insertUpdateIntoFiber(fiber, update);
-      scheduleWork(fiber, expirationTime);
-    },
-    enqueueReplaceState: function(instance, state, callback) {
-      var fiber = get(instance);
-      callback = callback === undefined ? null : callback;
-      {
-        warnOnInvalidCallback(callback, "replaceState");
-      }
-      var expirationTime = computeExpirationForFiber(fiber);
-      var update = {
-        expirationTime: expirationTime,
-        partialState: state,
-        callback: callback,
-        isReplace: true,
-        isForced: false,
-        capturedValue: null,
-        next: null
-      };
-      insertUpdateIntoFiber(fiber, update);
-      scheduleWork(fiber, expirationTime);
-    },
-    enqueueForceUpdate: function(instance, callback) {
-      var fiber = get(instance);
-      callback = callback === undefined ? null : callback;
-      {
-        warnOnInvalidCallback(callback, "forceUpdate");
-      }
-      var expirationTime = computeExpirationForFiber(fiber);
-      var update = {
-        expirationTime: expirationTime,
-        partialState: null,
-        callback: callback,
-        isReplace: false,
-        isForced: true,
-        capturedValue: null,
-        next: null
-      };
-      insertUpdateIntoFiber(fiber, update);
-      scheduleWork(fiber, expirationTime);
-    }
-  };
+var lowPriorityWarning = function() {};
 
-  function checkShouldComponentUpdate(
-    workInProgress,
-    oldProps,
-    newProps,
-    oldState,
-    newState,
-    newContext
-  ) {
-    if (
-      oldProps === null ||
-      (workInProgress.updateQueue !== null &&
-        workInProgress.updateQueue.hasForceUpdate)
+{
+  var printWarning = function(format) {
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 1 ? _len - 1 : 0),
+        _key = 1;
+      _key < _len;
+      _key++
     ) {
-      // If the workInProgress already has an Update effect, return true
-      return true;
+      args[_key - 1] = arguments[_key];
     }
 
-    var instance = workInProgress.stateNode;
-    var ctor = workInProgress.type;
-    if (typeof instance.shouldComponentUpdate === "function") {
-      startPhaseTimer(workInProgress, "shouldComponentUpdate");
-      var shouldUpdate = instance.shouldComponentUpdate(
-        newProps,
-        newState,
-        newContext
-      );
-      stopPhaseTimer();
-
-      {
-        !(shouldUpdate !== undefined)
-          ? warning(
-              false,
-              "%s.shouldComponentUpdate(): Returned undefined instead of a " +
-                "boolean value. Make sure to return true or false.",
-              getComponentName(workInProgress) || "Component"
-            )
-          : void 0;
-      }
-
-      return shouldUpdate;
+    var argIndex = 0;
+    var message =
+      "Warning: " +
+      format.replace(/%s/g, function() {
+        return args[argIndex++];
+      });
+    if (typeof console !== "undefined") {
+      console.warn(message);
     }
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      throw new Error(message);
+    } catch (x) {}
+  };
 
-    if (ctor.prototype && ctor.prototype.isPureReactComponent) {
-      return (
-        !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
+  lowPriorityWarning = function(condition, format) {
+    if (format === undefined) {
+      throw new Error(
+        "`warning(condition, format, ...args)` requires a warning " +
+          "message argument"
       );
     }
+    if (!condition) {
+      for (
+        var _len2 = arguments.length,
+          args = Array(_len2 > 2 ? _len2 - 2 : 0),
+          _key2 = 2;
+        _key2 < _len2;
+        _key2++
+      ) {
+        args[_key2 - 2] = arguments[_key2];
+      }
 
-    return true;
-  }
-
-  function checkClassInstance(workInProgress) {
-    var instance = workInProgress.stateNode;
-    var type = workInProgress.type;
-    {
-      var name = getComponentName(workInProgress) || "Component";
-      var renderPresent = instance.render;
-
-      if (!renderPresent) {
-        if (type.prototype && typeof type.prototype.render === "function") {
-          warning(
-            false,
-            "%s(...): No `render` method found on the returned component " +
-              "instance: did you accidentally return an object from the constructor?",
-            name
-          );
-        } else {
-          warning(
-            false,
-            "%s(...): No `render` method found on the returned component " +
-              "instance: you may have forgotten to define `render`.",
-            name
+      printWarning.apply(undefined, [format].concat(args));
+    }
+  };
+}
+
+var lowPriorityWarning$1 = lowPriorityWarning;
+
+var ReactStrictModeWarnings = {
+  discardPendingWarnings: function() {},
+  flushPendingDeprecationWarnings: function() {},
+  flushPendingUnsafeLifecycleWarnings: function() {},
+  recordDeprecationWarnings: function(fiber, instance) {},
+  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
+};
+
+{
+  var LIFECYCLE_SUGGESTIONS = {
+    UNSAFE_componentWillMount: "componentDidMount",
+    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
+    UNSAFE_componentWillUpdate: "componentDidUpdate"
+  };
+
+  var pendingComponentWillMountWarnings = [];
+  var pendingComponentWillReceivePropsWarnings = [];
+  var pendingComponentWillUpdateWarnings = [];
+  var pendingUnsafeLifecycleWarnings = new Map();
+
+  // Tracks components we have already warned about.
+  var didWarnAboutDeprecatedLifecycles = new Set();
+  var didWarnAboutUnsafeLifecycles = new Set();
+
+  ReactStrictModeWarnings.discardPendingWarnings = function() {
+    pendingComponentWillMountWarnings = [];
+    pendingComponentWillReceivePropsWarnings = [];
+    pendingComponentWillUpdateWarnings = [];
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
+
+  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
+    pendingUnsafeLifecycleWarnings.forEach(function(
+      lifecycleWarningsMap,
+      strictRoot
+    ) {
+      var lifecyclesWarningMesages = [];
+
+      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
+        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
+        if (lifecycleWarnings.length > 0) {
+          var componentNames = new Set();
+          lifecycleWarnings.forEach(function(fiber) {
+            componentNames.add(getComponentName(fiber) || "Component");
+            didWarnAboutUnsafeLifecycles.add(fiber.type);
+          });
+
+          var formatted = lifecycle.replace("UNSAFE_", "");
+          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
+          var sortedComponentNames = Array.from(componentNames)
+            .sort()
+            .join(", ");
+
+          lifecyclesWarningMesages.push(
+            formatted +
+              ": Please update the following components to use " +
+              (suggestion + " instead: " + sortedComponentNames)
           );
         }
-      }
+      });
 
-      var noGetInitialStateOnES6 =
-        !instance.getInitialState ||
-        instance.getInitialState.isReactClassApproved ||
-        instance.state;
-      !noGetInitialStateOnES6
-        ? warning(
-            false,
-            "getInitialState was defined on %s, a plain JavaScript class. " +
-              "This is only supported for classes created using React.createClass. " +
-              "Did you mean to define a state property instead?",
-            name
-          )
-        : void 0;
-      var noGetDefaultPropsOnES6 =
-        !instance.getDefaultProps ||
-        instance.getDefaultProps.isReactClassApproved;
-      !noGetDefaultPropsOnES6
-        ? warning(
-            false,
-            "getDefaultProps was defined on %s, a plain JavaScript class. " +
-              "This is only supported for classes created using React.createClass. " +
-              "Use a static property to define defaultProps instead.",
-            name
-          )
-        : void 0;
-      var noInstancePropTypes = !instance.propTypes;
-      !noInstancePropTypes
-        ? warning(
-            false,
-            "propTypes was defined as an instance property on %s. Use a static " +
-              "property to define propTypes instead.",
-            name
-          )
-        : void 0;
-      var noInstanceContextTypes = !instance.contextTypes;
-      !noInstanceContextTypes
-        ? warning(
-            false,
-            "contextTypes was defined as an instance property on %s. Use a static " +
-              "property to define contextTypes instead.",
-            name
-          )
-        : void 0;
-      var noComponentShouldUpdate =
-        typeof instance.componentShouldUpdate !== "function";
-      !noComponentShouldUpdate
-        ? warning(
-            false,
-            "%s has a method called " +
-              "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
-              "The name is phrased as a question because the function is " +
-              "expected to return a value.",
-            name
-          )
-        : void 0;
-      if (
-        type.prototype &&
-        type.prototype.isPureReactComponent &&
-        typeof instance.shouldComponentUpdate !== "undefined"
-      ) {
-        warning(
-          false,
-          "%s has a method called shouldComponentUpdate(). " +
-            "shouldComponentUpdate should not be used when extending React.PureComponent. " +
-            "Please extend React.Component if shouldComponentUpdate is used.",
-          getComponentName(workInProgress) || "A pure component"
+      if (lifecyclesWarningMesages.length > 0) {
+        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
+          strictRoot
         );
-      }
-      var noComponentDidUnmount =
-        typeof instance.componentDidUnmount !== "function";
-      !noComponentDidUnmount
-        ? warning(
-            false,
-            "%s has a method called " +
-              "componentDidUnmount(). But there is no such lifecycle method. " +
-              "Did you mean componentWillUnmount()?",
-            name
-          )
-        : void 0;
-      var noComponentDidReceiveProps =
-        typeof instance.componentDidReceiveProps !== "function";
-      !noComponentDidReceiveProps
-        ? warning(
-            false,
-            "%s has a method called " +
-              "componentDidReceiveProps(). But there is no such lifecycle method. " +
-              "If you meant to update the state in response to changing props, " +
-              "use componentWillReceiveProps(). If you meant to fetch data or " +
-              "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
-            name
-          )
-        : void 0;
-      var noComponentWillRecieveProps =
-        typeof instance.componentWillRecieveProps !== "function";
-      !noComponentWillRecieveProps
-        ? warning(
-            false,
-            "%s has a method called " +
-              "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
-            name
-          )
-        : void 0;
-      var noUnsafeComponentWillRecieveProps =
-        typeof instance.UNSAFE_componentWillRecieveProps !== "function";
-      !noUnsafeComponentWillRecieveProps
-        ? warning(
-            false,
-            "%s has a method called " +
-              "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
-            name
-          )
-        : void 0;
-      var hasMutatedProps = instance.props !== workInProgress.pendingProps;
-      !(instance.props === undefined || !hasMutatedProps)
-        ? warning(
-            false,
-            "%s(...): When calling super() in `%s`, make sure to pass " +
-              "up the same props that your component's constructor was passed.",
-            name,
-            name
-          )
-        : void 0;
-      var noInstanceDefaultProps = !instance.defaultProps;
-      !noInstanceDefaultProps
-        ? warning(
-            false,
-            "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
-              " Instead, define defaultProps as a static property on %s.",
-            name,
-            name
-          )
-        : void 0;
 
-      if (
-        typeof instance.getSnapshotBeforeUpdate === "function" &&
-        typeof instance.componentDidUpdate !== "function" &&
-        typeof instance.componentDidUpdate !== "function" &&
-        !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
-      ) {
-        didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
         warning(
           false,
-          "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
-            "This component defines getSnapshotBeforeUpdate() only.",
-          getComponentName(workInProgress)
+          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
+            "\n\n%s" +
+            "\n\nLearn more about this warning here:" +
+            "\nhttps://fb.me/react-strict-mode-warnings",
+          strictRootComponentStack,
+          lifecyclesWarningMesages.join("\n\n")
         );
       }
+    });
 
-      var noInstanceGetDerivedStateFromProps =
-        typeof instance.getDerivedStateFromProps !== "function";
-      !noInstanceGetDerivedStateFromProps
-        ? warning(
-            false,
-            "%s: getDerivedStateFromProps() is defined as an instance method " +
-              "and will be ignored. Instead, declare it as a static method.",
-            name
-          )
-        : void 0;
-      var noInstanceGetDerivedStateFromCatch =
-        typeof instance.getDerivedStateFromCatch !== "function";
-      !noInstanceGetDerivedStateFromCatch
-        ? warning(
-            false,
-            "%s: getDerivedStateFromCatch() is defined as an instance method " +
-              "and will be ignored. Instead, declare it as a static method.",
-            name
-          )
-        : void 0;
-      var noStaticGetSnapshotBeforeUpdate =
-        typeof type.getSnapshotBeforeUpdate !== "function";
-      !noStaticGetSnapshotBeforeUpdate
-        ? warning(
-            false,
-            "%s: getSnapshotBeforeUpdate() is defined as a static method " +
-              "and will be ignored. Instead, declare it as an instance method.",
-            name
-          )
-        : void 0;
-      var _state = instance.state;
-      if (_state && (typeof _state !== "object" || isArray(_state))) {
-        warning(false, "%s.state: must be set to an object or null", name);
-      }
-      if (typeof instance.getChildContext === "function") {
-        !(typeof type.childContextTypes === "object")
-          ? warning(
-              false,
-              "%s.getChildContext(): childContextTypes must be defined in order to " +
-                "use getChildContext().",
-              name
-            )
-          : void 0;
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
+
+  var getStrictRoot = function(fiber) {
+    var maybeStrictRoot = null;
+
+    while (fiber !== null) {
+      if (fiber.mode & StrictMode) {
+        maybeStrictRoot = fiber;
       }
+
+      fiber = fiber["return"];
     }
-  }
 
-  function resetInputPointers(workInProgress, instance) {
-    instance.props = workInProgress.memoizedProps;
-    instance.state = workInProgress.memoizedState;
-  }
+    return maybeStrictRoot;
+  };
 
-  function adoptClassInstance(workInProgress, instance) {
-    instance.updater = updater;
-    workInProgress.stateNode = instance;
-    // The instance needs access to the fiber so that it can schedule updates
-    set(instance, workInProgress);
-    {
-      instance._reactInternalInstance = fakeInternalInstance;
-    }
-  }
+  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
+    if (pendingComponentWillMountWarnings.length > 0) {
+      var uniqueNames = new Set();
+      pendingComponentWillMountWarnings.forEach(function(fiber) {
+        uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-  function constructClassInstance(workInProgress, props) {
-    var ctor = workInProgress.type;
-    var unmaskedContext = getUnmaskedContext(workInProgress);
-    var needsContext = isContextConsumer(workInProgress);
-    var context = needsContext
-      ? getMaskedContext(workInProgress, unmaskedContext)
-      : emptyObject;
+      var sortedNames = Array.from(uniqueNames)
+        .sort()
+        .join(", ");
 
-    // Instantiate twice to help detect side-effects.
-    if (
-      debugRenderPhaseSideEffects ||
-      (debugRenderPhaseSideEffectsForStrictMode &&
-        workInProgress.mode & StrictMode)
-    ) {
-      new ctor(props, context); // eslint-disable-line no-new
+      lowPriorityWarning$1(
+        false,
+        "componentWillMount is deprecated and will be removed in the next major version. " +
+          "Use componentDidMount instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillMount." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        sortedNames
+      );
+
+      pendingComponentWillMountWarnings = [];
     }
 
-    var instance = new ctor(props, context);
-    var state =
-      instance.state !== null && instance.state !== undefined
-        ? instance.state
-        : null;
-    adoptClassInstance(workInProgress, instance);
+    if (pendingComponentWillReceivePropsWarnings.length > 0) {
+      var _uniqueNames = new Set();
+      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
+        _uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-    {
-      if (
-        typeof ctor.getDerivedStateFromProps === "function" &&
-        state === null
-      ) {
-        var componentName = getComponentName(workInProgress) || "Component";
-        if (!didWarnAboutUninitializedState.has(componentName)) {
-          didWarnAboutUninitializedState.add(componentName);
-          warning(
-            false,
-            "%s: Did not properly initialize state during construction. " +
-              "Expected state to be an object, but it was %s.",
-            componentName,
-            instance.state === null ? "null" : "undefined"
-          );
-        }
-      }
-
-      // If new component APIs are defined, "unsafe" lifecycles won't be called.
-      // Warn about these lifecycles if they are present.
-      // Don't warn about react-lifecycles-compat polyfilled methods though.
-      if (
-        typeof ctor.getDerivedStateFromProps === "function" ||
-        typeof instance.getSnapshotBeforeUpdate === "function"
-      ) {
-        var foundWillMountName = null;
-        var foundWillReceivePropsName = null;
-        var foundWillUpdateName = null;
-        if (
-          typeof instance.componentWillMount === "function" &&
-          instance.componentWillMount.__suppressDeprecationWarning !== true
-        ) {
-          foundWillMountName = "componentWillMount";
-        } else if (typeof instance.UNSAFE_componentWillMount === "function") {
-          foundWillMountName = "UNSAFE_componentWillMount";
-        }
-        if (
-          typeof instance.componentWillReceiveProps === "function" &&
-          instance.componentWillReceiveProps.__suppressDeprecationWarning !==
-            true
-        ) {
-          foundWillReceivePropsName = "componentWillReceiveProps";
-        } else if (
-          typeof instance.UNSAFE_componentWillReceiveProps === "function"
-        ) {
-          foundWillReceivePropsName = "UNSAFE_componentWillReceiveProps";
-        }
-        if (
-          typeof instance.componentWillUpdate === "function" &&
-          instance.componentWillUpdate.__suppressDeprecationWarning !== true
-        ) {
-          foundWillUpdateName = "componentWillUpdate";
-        } else if (typeof instance.UNSAFE_componentWillUpdate === "function") {
-          foundWillUpdateName = "UNSAFE_componentWillUpdate";
-        }
-        if (
-          foundWillMountName !== null ||
-          foundWillReceivePropsName !== null ||
-          foundWillUpdateName !== null
-        ) {
-          var _componentName = getComponentName(workInProgress) || "Component";
-          var newApiName =
-            typeof ctor.getDerivedStateFromProps === "function"
-              ? "getDerivedStateFromProps()"
-              : "getSnapshotBeforeUpdate()";
-          if (
-            !didWarnAboutLegacyLifecyclesAndDerivedState.has(_componentName)
-          ) {
-            didWarnAboutLegacyLifecyclesAndDerivedState.add(_componentName);
-            warning(
-              false,
-              "Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n" +
-                "%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n" +
-                "The above lifecycles should be removed. Learn more about this warning here:\n" +
-                "https://fb.me/react-async-component-lifecycle-hooks",
-              _componentName,
-              newApiName,
-              foundWillMountName !== null ? "\n  " + foundWillMountName : "",
-              foundWillReceivePropsName !== null
-                ? "\n  " + foundWillReceivePropsName
-                : "",
-              foundWillUpdateName !== null ? "\n  " + foundWillUpdateName : ""
-            );
-          }
-        }
-      }
-    }
-
-    workInProgress.memoizedState = state;
-
-    var partialState = callGetDerivedStateFromProps(
-      workInProgress,
-      instance,
-      props,
-      state
-    );
+      var _sortedNames = Array.from(_uniqueNames)
+        .sort()
+        .join(", ");
 
-    if (partialState !== null && partialState !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      workInProgress.memoizedState = Object.assign(
-        {},
-        workInProgress.memoizedState,
-        partialState
+      lowPriorityWarning$1(
+        false,
+        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
+          "Use static getDerivedStateFromProps instead." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames
       );
-    }
 
-    // Cache unmasked context so we can avoid recreating masked context unless necessary.
-    // ReactFiberContext usually updates this cache but can't for newly-created instances.
-    if (needsContext) {
-      cacheContext(workInProgress, unmaskedContext, context);
+      pendingComponentWillReceivePropsWarnings = [];
     }
 
-    return instance;
-  }
-
-  function callComponentWillMount(workInProgress, instance) {
-    startPhaseTimer(workInProgress, "componentWillMount");
-    var oldState = instance.state;
+    if (pendingComponentWillUpdateWarnings.length > 0) {
+      var _uniqueNames2 = new Set();
+      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
+        _uniqueNames2.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-    if (typeof instance.componentWillMount === "function") {
-      instance.componentWillMount();
-    }
-    if (typeof instance.UNSAFE_componentWillMount === "function") {
-      instance.UNSAFE_componentWillMount();
-    }
+      var _sortedNames2 = Array.from(_uniqueNames2)
+        .sort()
+        .join(", ");
 
-    stopPhaseTimer();
+      lowPriorityWarning$1(
+        false,
+        "componentWillUpdate is deprecated and will be removed in the next major version. " +
+          "Use componentDidUpdate instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillUpdate." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames2
+      );
 
-    if (oldState !== instance.state) {
-      {
-        warning(
-          false,
-          "%s.componentWillMount(): Assigning directly to this.state is " +
-            "deprecated (except inside a component's " +
-            "constructor). Use setState instead.",
-          getComponentName(workInProgress) || "Component"
-        );
-      }
-      updater.enqueueReplaceState(instance, instance.state, null);
+      pendingComponentWillUpdateWarnings = [];
     }
-  }
+  };
 
-  function callComponentWillReceiveProps(
-    workInProgress,
-    instance,
-    newProps,
-    newContext
+  ReactStrictModeWarnings.recordDeprecationWarnings = function(
+    fiber,
+    instance
   ) {
-    var oldState = instance.state;
-    startPhaseTimer(workInProgress, "componentWillReceiveProps");
-    if (typeof instance.componentWillReceiveProps === "function") {
-      instance.componentWillReceiveProps(newProps, newContext);
-    }
-    if (typeof instance.UNSAFE_componentWillReceiveProps === "function") {
-      instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    // Dedup strategy: Warn once per component.
+    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+      return;
     }
-    stopPhaseTimer();
 
-    if (instance.state !== oldState) {
-      {
-        var componentName = getComponentName(workInProgress) || "Component";
-        if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
-          didWarnAboutStateAssignmentForComponent.add(componentName);
-          warning(
-            false,
-            "%s.componentWillReceiveProps(): Assigning directly to " +
-              "this.state is deprecated (except inside a component's " +
-              "constructor). Use setState instead.",
-            componentName
-          );
-        }
-      }
-      updater.enqueueReplaceState(instance, instance.state, null);
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillMountWarnings.push(fiber);
     }
-  }
+    if (
+      typeof instance.componentWillReceiveProps === "function" &&
+      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillReceivePropsWarnings.push(fiber);
+    }
+    if (typeof instance.componentWillUpdate === "function") {
+      pendingComponentWillUpdateWarnings.push(fiber);
+    }
+  };
 
-  function callGetDerivedStateFromProps(
-    workInProgress,
-    instance,
-    nextProps,
-    prevState
+  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
+    fiber,
+    instance
   ) {
-    var type = workInProgress.type;
+    var strictRoot = getStrictRoot(fiber);
 
-    if (typeof type.getDerivedStateFromProps === "function") {
-      if (
-        debugRenderPhaseSideEffects ||
-        (debugRenderPhaseSideEffectsForStrictMode &&
-          workInProgress.mode & StrictMode)
-      ) {
-        // Invoke method an extra time to help detect side-effects.
-        type.getDerivedStateFromProps.call(null, nextProps, prevState);
-      }
+    // Dedup strategy: Warn once per component.
+    // This is difficult to track any other way since component names
+    // are often vague and are likely to collide between 3rd party libraries.
+    // An expand property is probably okay to use here since it's DEV-only,
+    // and will only be set in the event of serious warnings.
+    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+      return;
+    }
 
-      var partialState = type.getDerivedStateFromProps.call(
-        null,
-        nextProps,
-        prevState
-      );
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    // Note that it is sufficient to check for the presence of a
+    // single lifecycle, componentWillMount, with the polyfill flag.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning === true
+    ) {
+      return;
+    }
 
-      {
-        if (partialState === undefined) {
-          var componentName = getComponentName(workInProgress) || "Component";
-          if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
-            didWarnAboutUndefinedDerivedState.add(componentName);
-            warning(
-              false,
-              "%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. " +
-                "You have returned undefined.",
-              componentName
-            );
-          }
-        }
-      }
+    var warningsForRoot = void 0;
+    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
+      warningsForRoot = {
+        UNSAFE_componentWillMount: [],
+        UNSAFE_componentWillReceiveProps: [],
+        UNSAFE_componentWillUpdate: []
+      };
 
-      return partialState;
+      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
+    } else {
+      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
     }
-  }
 
-  // Invokes the mount life-cycles on a previously never rendered instance.
-  function mountClassInstance(workInProgress, renderExpirationTime) {
-    var ctor = workInProgress.type;
-    var current = workInProgress.alternate;
+    var unsafeLifecycles = [];
+    if (
+      typeof instance.componentWillMount === "function" ||
+      typeof instance.UNSAFE_componentWillMount === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillMount");
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" ||
+      typeof instance.UNSAFE_componentWillReceiveProps === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
+    }
+    if (
+      typeof instance.componentWillUpdate === "function" ||
+      typeof instance.UNSAFE_componentWillUpdate === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
+    }
 
-    {
-      checkClassInstance(workInProgress);
+    if (unsafeLifecycles.length > 0) {
+      unsafeLifecycles.forEach(function(lifecycle) {
+        warningsForRoot[lifecycle].push(fiber);
+      });
     }
+  };
+}
 
-    var instance = workInProgress.stateNode;
-    var props = workInProgress.pendingProps;
-    var unmaskedContext = getUnmaskedContext(workInProgress);
+var didWarnUpdateInsideUpdate = void 0;
 
-    instance.props = props;
-    instance.state = workInProgress.memoizedState;
-    instance.refs = emptyObject;
-    instance.context = getMaskedContext(workInProgress, unmaskedContext);
+{
+  didWarnUpdateInsideUpdate = false;
+}
 
-    {
-      if (workInProgress.mode & StrictMode) {
-        ReactStrictModeWarnings.recordUnsafeLifecycleWarnings(
-          workInProgress,
-          instance
-        );
-      }
+// Callbacks are not validated until invocation
 
-      if (warnAboutDeprecatedLifecycles) {
-        ReactStrictModeWarnings.recordDeprecationWarnings(
-          workInProgress,
-          instance
-        );
-      }
-    }
+// Singly linked-list of updates. When an update is scheduled, it is added to
+// the queue of the current fiber and the work-in-progress fiber. The two queues
+// are separate but they share a persistent structure.
+//
+// During reconciliation, updates are removed from the work-in-progress fiber,
+// but they remain on the current fiber. That ensures that if a work-in-progress
+// is aborted, the aborted updates are recovered by cloning from current.
+//
+// The work-in-progress queue is always a subset of the current queue.
+//
+// When the tree is committed, the work-in-progress becomes the current.
 
-    // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for components using the new APIs.
-    if (
-      typeof ctor.getDerivedStateFromProps !== "function" &&
-      typeof instance.getSnapshotBeforeUpdate !== "function" &&
-      (typeof instance.UNSAFE_componentWillMount === "function" ||
-        typeof instance.componentWillMount === "function")
-    ) {
-      callComponentWillMount(workInProgress, instance);
-      // If we had additional state updates during this life-cycle, let's
-      // process them now.
-      var updateQueue = workInProgress.updateQueue;
-      if (updateQueue !== null) {
-        instance.state = processUpdateQueue(
-          current,
-          workInProgress,
-          updateQueue,
-          instance,
-          props,
-          renderExpirationTime
-        );
-      }
-    }
-    if (typeof instance.componentDidMount === "function") {
-      workInProgress.effectTag |= Update;
-    }
+function createUpdateQueue(baseState) {
+  var queue = {
+    baseState: baseState,
+    expirationTime: NoWork,
+    first: null,
+    last: null,
+    callbackList: null,
+    hasForceUpdate: false,
+    isInitialized: false,
+    capturedValues: null
+  };
+  {
+    queue.isProcessing = false;
   }
+  return queue;
+}
 
-  function resumeMountClassInstance(workInProgress, renderExpirationTime) {
-    var ctor = workInProgress.type;
-    var instance = workInProgress.stateNode;
-    resetInputPointers(workInProgress, instance);
-
-    var oldProps = workInProgress.memoizedProps;
-    var newProps = workInProgress.pendingProps;
-    var oldContext = instance.context;
-    var newUnmaskedContext = getUnmaskedContext(workInProgress);
-    var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
-
-    var hasNewLifecycles =
-      typeof ctor.getDerivedStateFromProps === "function" ||
-      typeof instance.getSnapshotBeforeUpdate === "function";
+function insertUpdateIntoQueue(queue, update) {
+  // Append the update to the end of the list.
+  if (queue.last === null) {
+    // Queue is empty
+    queue.first = queue.last = update;
+  } else {
+    queue.last.next = update;
+    queue.last = update;
+  }
+  if (
+    queue.expirationTime === NoWork ||
+    queue.expirationTime > update.expirationTime
+  ) {
+    queue.expirationTime = update.expirationTime;
+  }
+}
 
-    // Note: During these life-cycles, instance.props/instance.state are what
-    // ever the previously attempted to render - not the "current". However,
-    // during componentDidUpdate we pass the "current" props.
+var q1 = void 0;
+var q2 = void 0;
+function ensureUpdateQueues(fiber) {
+  q1 = q2 = null;
+  // We'll have at least one and at most two distinct update queues.
+  var alternateFiber = fiber.alternate;
+  var queue1 = fiber.updateQueue;
+  if (queue1 === null) {
+    // TODO: We don't know what the base state will be until we begin work.
+    // It depends on which fiber is the next current. Initialize with an empty
+    // base state, then set to the memoizedState when rendering. Not super
+    // happy with this approach.
+    queue1 = fiber.updateQueue = createUpdateQueue(null);
+  }
 
-    // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for components using the new APIs.
-    if (
-      !hasNewLifecycles &&
-      (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function")
-    ) {
-      if (oldProps !== newProps || oldContext !== newContext) {
-        callComponentWillReceiveProps(
-          workInProgress,
-          instance,
-          newProps,
-          newContext
-        );
-      }
+  var queue2 = void 0;
+  if (alternateFiber !== null) {
+    queue2 = alternateFiber.updateQueue;
+    if (queue2 === null) {
+      queue2 = alternateFiber.updateQueue = createUpdateQueue(null);
     }
+  } else {
+    queue2 = null;
+  }
+  queue2 = queue2 !== queue1 ? queue2 : null;
 
-    // Compute the next state using the memoized state and the update queue.
-    var oldState = workInProgress.memoizedState;
-    // TODO: Previous state can be null.
-    var newState = void 0;
-    var derivedStateFromCatch = void 0;
-    if (workInProgress.updateQueue !== null) {
-      newState = processUpdateQueue(
-        null,
-        workInProgress,
-        workInProgress.updateQueue,
-        instance,
-        newProps,
-        renderExpirationTime
-      );
+  // Use module variables instead of returning a tuple
+  q1 = queue1;
+  q2 = queue2;
+}
 
-      var updateQueue = workInProgress.updateQueue;
-      if (
-        updateQueue !== null &&
-        updateQueue.capturedValues !== null &&
-        enableGetDerivedStateFromCatch &&
-        typeof ctor.getDerivedStateFromCatch === "function"
-      ) {
-        var capturedValues = updateQueue.capturedValues;
-        // Don't remove these from the update queue yet. We need them in
-        // finishClassComponent. Do the reset there.
-        // TODO: This is awkward. Refactor class components.
-        // updateQueue.capturedValues = null;
-        derivedStateFromCatch = callGetDerivedStateFromCatch(
-          ctor,
-          capturedValues
-        );
-      }
-    } else {
-      newState = oldState;
-    }
+function insertUpdateIntoFiber(fiber, update) {
+  ensureUpdateQueues(fiber);
+  var queue1 = q1;
+  var queue2 = q2;
 
-    var derivedStateFromProps = void 0;
-    if (oldProps !== newProps) {
-      // The prevState parameter should be the partially updated state.
-      // Otherwise, spreading state in return values could override updates.
-      derivedStateFromProps = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps,
-        newState
+  // Warn if an update is scheduled from inside an updater function.
+  {
+    if (
+      (queue1.isProcessing || (queue2 !== null && queue2.isProcessing)) &&
+      !didWarnUpdateInsideUpdate
+    ) {
+      warning(
+        false,
+        "An update (setState, replaceState, or forceUpdate) was scheduled " +
+          "from inside an update function. Update functions should be pure, " +
+          "with zero side-effects. Consider using componentDidUpdate or a " +
+          "callback."
       );
+      didWarnUpdateInsideUpdate = true;
     }
+  }
 
-    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      newState =
-        newState === null || newState === undefined
-          ? derivedStateFromProps
-          : Object.assign({}, newState, derivedStateFromProps);
+  // If there's only one queue, add the update to that queue and exit.
+  if (queue2 === null) {
+    insertUpdateIntoQueue(queue1, update);
+    return;
+  }
 
-      // Update the base state of the update queue.
-      // FIXME: This is getting ridiculous. Refactor plz!
-      var _updateQueue = workInProgress.updateQueue;
-      if (_updateQueue !== null) {
-        _updateQueue.baseState = Object.assign(
-          {},
-          _updateQueue.baseState,
-          derivedStateFromProps
-        );
-      }
-    }
-    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      newState =
-        newState === null || newState === undefined
-          ? derivedStateFromCatch
-          : Object.assign({}, newState, derivedStateFromCatch);
+  // If either queue is empty, we need to add to both queues.
+  if (queue1.last === null || queue2.last === null) {
+    insertUpdateIntoQueue(queue1, update);
+    insertUpdateIntoQueue(queue2, update);
+    return;
+  }
 
-      // Update the base state of the update queue.
-      // FIXME: This is getting ridiculous. Refactor plz!
-      var _updateQueue2 = workInProgress.updateQueue;
-      if (_updateQueue2 !== null) {
-        _updateQueue2.baseState = Object.assign(
-          {},
-          _updateQueue2.baseState,
-          derivedStateFromCatch
-        );
-      }
-    }
+  // If both lists are not empty, the last update is the same for both lists
+  // because of structural sharing. So, we should only append to one of
+  // the lists.
+  insertUpdateIntoQueue(queue1, update);
+  // But we still need to update the `last` pointer of queue2.
+  queue2.last = update;
+}
 
-    if (
-      oldProps === newProps &&
-      oldState === newState &&
-      !hasContextChanged() &&
-      !(
-        workInProgress.updateQueue !== null &&
-        workInProgress.updateQueue.hasForceUpdate
-      )
-    ) {
-      // If an update was already in progress, we should schedule an Update
-      // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidMount === "function") {
-        workInProgress.effectTag |= Update;
+function getUpdateExpirationTime(fiber) {
+  switch (fiber.tag) {
+    case HostRoot:
+    case ClassComponent:
+      var updateQueue = fiber.updateQueue;
+      if (updateQueue === null) {
+        return NoWork;
       }
-      return false;
-    }
+      return updateQueue.expirationTime;
+    default:
+      return NoWork;
+  }
+}
 
-    var shouldUpdate = checkShouldComponentUpdate(
-      workInProgress,
-      oldProps,
-      newProps,
-      oldState,
-      newState,
-      newContext
-    );
+function getStateFromUpdate(update, instance, prevState, props) {
+  var partialState = update.partialState;
+  if (typeof partialState === "function") {
+    return partialState.call(instance, prevState, props);
+  } else {
+    return partialState;
+  }
+}
 
-    if (shouldUpdate) {
-      // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for components using the new APIs.
+function processUpdateQueue(
+  current,
+  workInProgress,
+  queue,
+  instance,
+  props,
+  renderExpirationTime
+) {
+  if (current !== null && current.updateQueue === queue) {
+    // We need to create a work-in-progress queue, by cloning the current queue.
+    var currentQueue = queue;
+    queue = workInProgress.updateQueue = {
+      baseState: currentQueue.baseState,
+      expirationTime: currentQueue.expirationTime,
+      first: currentQueue.first,
+      last: currentQueue.last,
+      isInitialized: currentQueue.isInitialized,
+      capturedValues: currentQueue.capturedValues,
+      // These fields are no longer valid because they were already committed.
+      // Reset them.
+      callbackList: null,
+      hasForceUpdate: false
+    };
+  }
+
+  {
+    // Set this flag so we can warn if setState is called inside the update
+    // function of another setState.
+    queue.isProcessing = true;
+  }
+
+  // Reset the remaining expiration time. If we skip over any updates, we'll
+  // increase this accordingly.
+  queue.expirationTime = NoWork;
+
+  // TODO: We don't know what the base state will be until we begin work.
+  // It depends on which fiber is the next current. Initialize with an empty
+  // base state, then set to the memoizedState when rendering. Not super
+  // happy with this approach.
+  var state = void 0;
+  if (queue.isInitialized) {
+    state = queue.baseState;
+  } else {
+    state = queue.baseState = workInProgress.memoizedState;
+    queue.isInitialized = true;
+  }
+  var dontMutatePrevState = true;
+  var update = queue.first;
+  var didSkip = false;
+  while (update !== null) {
+    var updateExpirationTime = update.expirationTime;
+    if (updateExpirationTime > renderExpirationTime) {
+      // This update does not have sufficient priority. Skip it.
+      var remainingExpirationTime = queue.expirationTime;
       if (
-        !hasNewLifecycles &&
-        (typeof instance.UNSAFE_componentWillMount === "function" ||
-          typeof instance.componentWillMount === "function")
+        remainingExpirationTime === NoWork ||
+        remainingExpirationTime > updateExpirationTime
       ) {
-        startPhaseTimer(workInProgress, "componentWillMount");
-        if (typeof instance.componentWillMount === "function") {
-          instance.componentWillMount();
-        }
-        if (typeof instance.UNSAFE_componentWillMount === "function") {
-          instance.UNSAFE_componentWillMount();
-        }
-        stopPhaseTimer();
-      }
-      if (typeof instance.componentDidMount === "function") {
-        workInProgress.effectTag |= Update;
+        // Update the remaining expiration time.
+        queue.expirationTime = updateExpirationTime;
       }
-    } else {
-      // If an update was already in progress, we should schedule an Update
-      // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidMount === "function") {
-        workInProgress.effectTag |= Update;
+      if (!didSkip) {
+        didSkip = true;
+        queue.baseState = state;
       }
-
-      // If shouldComponentUpdate returned false, we should still update the
-      // memoized props/state to indicate that this work can be reused.
-      memoizeProps(workInProgress, newProps);
-      memoizeState(workInProgress, newState);
+      // Continue to the next update.
+      update = update.next;
+      continue;
     }
 
-    // Update the existing instance's state, props, and context pointers even
-    // if shouldComponentUpdate returns false.
-    instance.props = newProps;
-    instance.state = newState;
-    instance.context = newContext;
-
-    return shouldUpdate;
-  }
-
-  // Invokes the update life-cycles and returns false if it shouldn't rerender.
-  function updateClassInstance(current, workInProgress, renderExpirationTime) {
-    var ctor = workInProgress.type;
-    var instance = workInProgress.stateNode;
-    resetInputPointers(workInProgress, instance);
-
-    var oldProps = workInProgress.memoizedProps;
-    var newProps = workInProgress.pendingProps;
-    var oldContext = instance.context;
-    var newUnmaskedContext = getUnmaskedContext(workInProgress);
-    var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
-
-    var hasNewLifecycles =
-      typeof ctor.getDerivedStateFromProps === "function" ||
-      typeof instance.getSnapshotBeforeUpdate === "function";
+    // This update does have sufficient priority.
 
-    // Note: During these life-cycles, instance.props/instance.state are what
-    // ever the previously attempted to render - not the "current". However,
-    // during componentDidUpdate we pass the "current" props.
+    // If no previous updates were skipped, drop this update from the queue by
+    // advancing the head of the list.
+    if (!didSkip) {
+      queue.first = update.next;
+      if (queue.first === null) {
+        queue.last = null;
+      }
+    }
 
-    // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for components using the new APIs.
+    // Invoke setState callback an extra time to help detect side-effects.
+    // Ignore the return value in this case.
     if (
-      !hasNewLifecycles &&
-      (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function")
+      debugRenderPhaseSideEffects ||
+      (debugRenderPhaseSideEffectsForStrictMode &&
+        workInProgress.mode & StrictMode)
     ) {
-      if (oldProps !== newProps || oldContext !== newContext) {
-        callComponentWillReceiveProps(
-          workInProgress,
-          instance,
-          newProps,
-          newContext
-        );
-      }
+      getStateFromUpdate(update, instance, state, props);
     }
 
-    // Compute the next state using the memoized state and the update queue.
-    var oldState = workInProgress.memoizedState;
-    // TODO: Previous state can be null.
-    var newState = void 0;
-    var derivedStateFromCatch = void 0;
-
-    if (workInProgress.updateQueue !== null) {
-      newState = processUpdateQueue(
-        current,
-        workInProgress,
-        workInProgress.updateQueue,
-        instance,
-        newProps,
-        renderExpirationTime
-      );
-
-      var updateQueue = workInProgress.updateQueue;
-      if (
-        updateQueue !== null &&
-        updateQueue.capturedValues !== null &&
-        enableGetDerivedStateFromCatch &&
-        typeof ctor.getDerivedStateFromCatch === "function"
-      ) {
-        var capturedValues = updateQueue.capturedValues;
-        // Don't remove these from the update queue yet. We need them in
-        // finishClassComponent. Do the reset there.
-        // TODO: This is awkward. Refactor class components.
-        // updateQueue.capturedValues = null;
-        derivedStateFromCatch = callGetDerivedStateFromCatch(
-          ctor,
-          capturedValues
-        );
-      }
+    // Process the update
+    var _partialState = void 0;
+    if (update.isReplace) {
+      state = getStateFromUpdate(update, instance, state, props);
+      dontMutatePrevState = true;
     } else {
-      newState = oldState;
+      _partialState = getStateFromUpdate(update, instance, state, props);
+      if (_partialState) {
+        if (dontMutatePrevState) {
+          // $FlowFixMe: Idk how to type this properly.
+          state = Object.assign({}, state, _partialState);
+        } else {
+          state = Object.assign(state, _partialState);
+        }
+        dontMutatePrevState = false;
+      }
     }
-
-    var derivedStateFromProps = void 0;
-    if (oldProps !== newProps) {
-      // The prevState parameter should be the partially updated state.
-      // Otherwise, spreading state in return values could override updates.
-      derivedStateFromProps = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps,
-        newState
-      );
+    if (update.isForced) {
+      queue.hasForceUpdate = true;
     }
-
-    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      newState =
-        newState === null || newState === undefined
-          ? derivedStateFromProps
-          : Object.assign({}, newState, derivedStateFromProps);
-
-      // Update the base state of the update queue.
-      // FIXME: This is getting ridiculous. Refactor plz!
-      var _updateQueue3 = workInProgress.updateQueue;
-      if (_updateQueue3 !== null) {
-        _updateQueue3.baseState = Object.assign(
-          {},
-          _updateQueue3.baseState,
-          derivedStateFromProps
-        );
+    if (update.callback !== null) {
+      // Append to list of callbacks.
+      var _callbackList = queue.callbackList;
+      if (_callbackList === null) {
+        _callbackList = queue.callbackList = [];
       }
+      _callbackList.push(update);
     }
-    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
-      // Render-phase updates (like this) should not be added to the update queue,
-      // So that multiple render passes do not enqueue multiple updates.
-      // Instead, just synchronously merge the returned state into the instance.
-      newState =
-        newState === null || newState === undefined
-          ? derivedStateFromCatch
-          : Object.assign({}, newState, derivedStateFromCatch);
-
-      // Update the base state of the update queue.
-      // FIXME: This is getting ridiculous. Refactor plz!
-      var _updateQueue4 = workInProgress.updateQueue;
-      if (_updateQueue4 !== null) {
-        _updateQueue4.baseState = Object.assign(
-          {},
-          _updateQueue4.baseState,
-          derivedStateFromCatch
-        );
+    if (update.capturedValue !== null) {
+      var _capturedValues = queue.capturedValues;
+      if (_capturedValues === null) {
+        queue.capturedValues = [update.capturedValue];
+      } else {
+        _capturedValues.push(update.capturedValue);
       }
     }
+    update = update.next;
+  }
 
-    if (
-      oldProps === newProps &&
-      oldState === newState &&
-      !hasContextChanged() &&
-      !(
-        workInProgress.updateQueue !== null &&
-        workInProgress.updateQueue.hasForceUpdate
-      )
-    ) {
-      // If an update was already in progress, we should schedule an Update
-      // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidUpdate === "function") {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Update;
-        }
-      }
-      if (typeof instance.getSnapshotBeforeUpdate === "function") {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Snapshot;
-        }
-      }
-      return false;
-    }
-
-    var shouldUpdate = checkShouldComponentUpdate(
-      workInProgress,
-      oldProps,
-      newProps,
-      oldState,
-      newState,
-      newContext
-    );
+  if (queue.callbackList !== null) {
+    workInProgress.effectTag |= Callback;
+  } else if (
+    queue.first === null &&
+    !queue.hasForceUpdate &&
+    queue.capturedValues === null
+  ) {
+    // The queue is empty. We can reset it.
+    workInProgress.updateQueue = null;
+  }
 
-    if (shouldUpdate) {
-      // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for components using the new APIs.
-      if (
-        !hasNewLifecycles &&
-        (typeof instance.UNSAFE_componentWillUpdate === "function" ||
-          typeof instance.componentWillUpdate === "function")
-      ) {
-        startPhaseTimer(workInProgress, "componentWillUpdate");
-        if (typeof instance.componentWillUpdate === "function") {
-          instance.componentWillUpdate(newProps, newState, newContext);
-        }
-        if (typeof instance.UNSAFE_componentWillUpdate === "function") {
-          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
-        }
-        stopPhaseTimer();
-      }
-      if (typeof instance.componentDidUpdate === "function") {
-        workInProgress.effectTag |= Update;
-      }
-      if (typeof instance.getSnapshotBeforeUpdate === "function") {
-        workInProgress.effectTag |= Snapshot;
-      }
-    } else {
-      // If an update was already in progress, we should schedule an Update
-      // effect even though we're bailing out, so that cWU/cDU are called.
-      if (typeof instance.componentDidUpdate === "function") {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Update;
-        }
-      }
-      if (typeof instance.getSnapshotBeforeUpdate === "function") {
-        if (
-          oldProps !== current.memoizedProps ||
-          oldState !== current.memoizedState
-        ) {
-          workInProgress.effectTag |= Snapshot;
-        }
-      }
+  if (!didSkip) {
+    didSkip = true;
+    queue.baseState = state;
+  }
 
-      // If shouldComponentUpdate returned false, we should still update the
-      // memoized props/state to indicate that this work can be reused.
-      memoizeProps(workInProgress, newProps);
-      memoizeState(workInProgress, newState);
-    }
+  {
+    // No longer processing.
+    queue.isProcessing = false;
+  }
 
-    // Update the existing instance's state, props, and context pointers even
-    // if shouldComponentUpdate returns false.
-    instance.props = newProps;
-    instance.state = newState;
-    instance.context = newContext;
+  return state;
+}
 
-    return shouldUpdate;
+function commitCallbacks(queue, context) {
+  var callbackList = queue.callbackList;
+  if (callbackList === null) {
+    return;
   }
+  // Set the list to null to make sure they don't get called more than once.
+  queue.callbackList = null;
+  for (var i = 0; i < callbackList.length; i++) {
+    var update = callbackList[i];
+    var _callback = update.callback;
+    // This update might be processed again. Clear the callback so it's only
+    // called once.
+    update.callback = null;
+    invariant(
+      typeof _callback === "function",
+      "Invalid argument passed as callback. Expected a function. Instead " +
+        "received: %s",
+      _callback
+    );
+    _callback.call(context);
+  }
+}
 
-  return {
-    adoptClassInstance: adoptClassInstance,
-    callGetDerivedStateFromProps: callGetDerivedStateFromProps,
-    constructClassInstance: constructClassInstance,
-    mountClassInstance: mountClassInstance,
-    resumeMountClassInstance: resumeMountClassInstance,
-    updateClassInstance: updateClassInstance
-  };
-};
-
-var getCurrentFiberStackAddendum$1 =
-  ReactDebugCurrentFiber.getCurrentFiberStackAddendum;
+var fakeInternalInstance = {};
+var isArray = Array.isArray;
 
-var didWarnAboutMaps = void 0;
-var didWarnAboutStringRefInStrictMode = void 0;
-var ownerHasKeyUseWarning = void 0;
-var ownerHasFunctionTypeWarning = void 0;
-var warnForMissingKey = function(child) {};
+var didWarnAboutStateAssignmentForComponent = void 0;
+var didWarnAboutUndefinedDerivedState = void 0;
+var didWarnAboutUninitializedState = void 0;
+var didWarnAboutWillReceivePropsAndDerivedState = void 0;
+var warnOnInvalidCallback = void 0;
 
 {
-  didWarnAboutMaps = false;
-  didWarnAboutStringRefInStrictMode = {};
+  didWarnAboutStateAssignmentForComponent = {};
+  didWarnAboutUndefinedDerivedState = {};
+  didWarnAboutUninitializedState = {};
+  didWarnAboutWillReceivePropsAndDerivedState = {};
 
-  /**
-   * Warn if there's no key explicitly set on dynamic arrays of children or
-   * object keys are not valid. This allows us to keep track of children between
-   * updates.
-   */
-  ownerHasKeyUseWarning = {};
-  ownerHasFunctionTypeWarning = {};
+  var didWarnOnInvalidCallback = {};
 
-  warnForMissingKey = function(child) {
-    if (child === null || typeof child !== "object") {
+  warnOnInvalidCallback = function(callback, callerName) {
+    if (callback === null || typeof callback === "function") {
       return;
     }
-    if (!child._store || child._store.validated || child.key != null) {
-      return;
+    var key = callerName + "_" + callback;
+    if (!didWarnOnInvalidCallback[key]) {
+      warning(
+        false,
+        "%s(...): Expected the last optional `callback` argument to be a " +
+          "function. Instead received: %s.",
+        callerName,
+        callback
+      );
+      didWarnOnInvalidCallback[key] = true;
     }
-    invariant(
-      typeof child._store === "object",
-      "React Component in warnForMissingKey should have a _store. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
-    child._store.validated = true;
+  };
 
-    var currentComponentErrorInfo =
-      "Each child in an array or iterator should have a unique " +
-      '"key" prop. See https://fb.me/react-warning-keys for ' +
-      "more information." +
-      (getCurrentFiberStackAddendum$1() || "");
-    if (ownerHasKeyUseWarning[currentComponentErrorInfo]) {
-      return;
+  // This is so gross but it's at least non-critical and can be removed if
+  // it causes problems. This is meant to give a nicer error message for
+  // ReactDOM15.unstable_renderSubtreeIntoContainer(reactDOM16Component,
+  // ...)) which otherwise throws a "_processChildContext is not a function"
+  // exception.
+  Object.defineProperty(fakeInternalInstance, "_processChildContext", {
+    enumerable: false,
+    value: function() {
+      invariant(
+        false,
+        "_processChildContext is not available in React 16+. This likely " +
+          "means you have multiple copies of React and are attempting to nest " +
+          "a React 15 tree inside a React 16 tree using " +
+          "unstable_renderSubtreeIntoContainer, which isn't supported. Try " +
+          "to make sure you have only one copy of React (and ideally, switch " +
+          "to ReactDOM.createPortal)."
+      );
     }
-    ownerHasKeyUseWarning[currentComponentErrorInfo] = true;
-
-    warning(
-      false,
-      "Each child in an array or iterator should have a unique " +
-        '"key" prop. See https://fb.me/react-warning-keys for ' +
-        "more information.%s",
-      getCurrentFiberStackAddendum$1()
-    );
-  };
+  });
+  Object.freeze(fakeInternalInstance);
 }
-
-var isArray$1 = Array.isArray;
-
-function coerceRef(returnFiber, current, element) {
-  var mixedRef = element.ref;
-  if (
-    mixedRef !== null &&
-    typeof mixedRef !== "function" &&
-    typeof mixedRef !== "object"
-  ) {
-    {
-      if (returnFiber.mode & StrictMode) {
-        var componentName = getComponentName(returnFiber) || "Component";
-        if (!didWarnAboutStringRefInStrictMode[componentName]) {
-          warning(
-            false,
-            'A string ref, "%s", has been found within a strict mode tree. ' +
-              "String refs are a source of potential bugs and should be avoided. " +
-              "We recommend using createRef() instead." +
-              "\n%s" +
-              "\n\nLearn more about using refs safely here:" +
-              "\nhttps://fb.me/react-strict-mode-string-ref",
-            mixedRef,
-            getStackAddendumByWorkInProgressFiber(returnFiber)
-          );
-          didWarnAboutStringRefInStrictMode[componentName] = true;
-        }
-      }
+function callGetDerivedStateFromCatch(ctor, capturedValues) {
+  var resultState = {};
+  for (var i = 0; i < capturedValues.length; i++) {
+    var capturedValue = capturedValues[i];
+    var error = capturedValue.value;
+    var partialState = ctor.getDerivedStateFromCatch.call(null, error);
+    if (partialState !== null && partialState !== undefined) {
+      Object.assign(resultState, partialState);
     }
+  }
+  return resultState;
+}
 
-    if (element._owner) {
-      var owner = element._owner;
-      var inst = void 0;
-      if (owner) {
-        var ownerFiber = owner;
-        invariant(
-          ownerFiber.tag === ClassComponent,
-          "Stateless function components cannot have refs."
-        );
-        inst = ownerFiber.stateNode;
-      }
-      invariant(
-        inst,
-        "Missing owner for string ref %s. This error is likely caused by a " +
-          "bug in React. Please file an issue.",
-        mixedRef
-      );
-      var stringRef = "" + mixedRef;
-      // Check if previous string ref matches new string ref
-      if (
-        current !== null &&
-        current.ref !== null &&
-        current.ref._stringRef === stringRef
-      ) {
-        return current.ref;
+var ReactFiberClassComponent = function(
+  scheduleWork,
+  computeExpirationForFiber,
+  memoizeProps,
+  memoizeState
+) {
+  // Class component state updater
+  var updater = {
+    isMounted: isMounted,
+    enqueueSetState: function(instance, partialState, callback) {
+      var fiber = get(instance);
+      callback = callback === undefined ? null : callback;
+      {
+        warnOnInvalidCallback(callback, "setState");
       }
-      var ref = function(value) {
-        var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
-        if (value === null) {
-          delete refs[stringRef];
-        } else {
-          refs[stringRef] = value;
-        }
+      var expirationTime = computeExpirationForFiber(fiber);
+      var update = {
+        expirationTime: expirationTime,
+        partialState: partialState,
+        callback: callback,
+        isReplace: false,
+        isForced: false,
+        capturedValue: null,
+        next: null
       };
-      ref._stringRef = stringRef;
-      return ref;
-    } else {
-      invariant(
-        typeof mixedRef === "string",
-        "Expected ref to be a function or a string."
-      );
-      invariant(
-        element._owner,
-        "Element ref was specified as a string (%s) but no owner was set. This could happen for one of" +
-          " the following reasons:\n" +
-          "1. You may be adding a ref to a functional component\n" +
-          "2. You may be adding a ref to a component that was not created inside a component's render method\n" +
-          "3. You have multiple copies of React loaded\n" +
-          "See https://fb.me/react-refs-must-have-owner for more information.",
-        mixedRef
-      );
+      insertUpdateIntoFiber(fiber, update);
+      scheduleWork(fiber, expirationTime);
+    },
+    enqueueReplaceState: function(instance, state, callback) {
+      var fiber = get(instance);
+      callback = callback === undefined ? null : callback;
+      {
+        warnOnInvalidCallback(callback, "replaceState");
+      }
+      var expirationTime = computeExpirationForFiber(fiber);
+      var update = {
+        expirationTime: expirationTime,
+        partialState: state,
+        callback: callback,
+        isReplace: true,
+        isForced: false,
+        capturedValue: null,
+        next: null
+      };
+      insertUpdateIntoFiber(fiber, update);
+      scheduleWork(fiber, expirationTime);
+    },
+    enqueueForceUpdate: function(instance, callback) {
+      var fiber = get(instance);
+      callback = callback === undefined ? null : callback;
+      {
+        warnOnInvalidCallback(callback, "forceUpdate");
+      }
+      var expirationTime = computeExpirationForFiber(fiber);
+      var update = {
+        expirationTime: expirationTime,
+        partialState: null,
+        callback: callback,
+        isReplace: false,
+        isForced: true,
+        capturedValue: null,
+        next: null
+      };
+      insertUpdateIntoFiber(fiber, update);
+      scheduleWork(fiber, expirationTime);
     }
-  }
-  return mixedRef;
-}
+  };
 
-function throwOnInvalidObjectType(returnFiber, newChild) {
-  if (returnFiber.type !== "textarea") {
-    var addendum = "";
-    {
-      addendum =
-        " If you meant to render a collection of children, use an array " +
-        "instead." +
-        (getCurrentFiberStackAddendum$1() || "");
+  function checkShouldComponentUpdate(
+    workInProgress,
+    oldProps,
+    newProps,
+    oldState,
+    newState,
+    newContext
+  ) {
+    if (
+      oldProps === null ||
+      (workInProgress.updateQueue !== null &&
+        workInProgress.updateQueue.hasForceUpdate)
+    ) {
+      // If the workInProgress already has an Update effect, return true
+      return true;
     }
-    invariant(
-      false,
-      "Objects are not valid as a React child (found: %s).%s",
-      Object.prototype.toString.call(newChild) === "[object Object]"
-        ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
-        : newChild,
-      addendum
-    );
-  }
-}
-
-function warnOnFunctionType() {
-  var currentComponentErrorInfo =
-    "Functions are not valid as a React child. This may happen if " +
-    "you return a Component instead of <Component /> from render. " +
-    "Or maybe you meant to call this function rather than return it." +
-    (getCurrentFiberStackAddendum$1() || "");
 
-  if (ownerHasFunctionTypeWarning[currentComponentErrorInfo]) {
-    return;
-  }
-  ownerHasFunctionTypeWarning[currentComponentErrorInfo] = true;
+    var instance = workInProgress.stateNode;
+    var ctor = workInProgress.type;
+    if (typeof instance.shouldComponentUpdate === "function") {
+      startPhaseTimer(workInProgress, "shouldComponentUpdate");
+      var shouldUpdate = instance.shouldComponentUpdate(
+        newProps,
+        newState,
+        newContext
+      );
+      stopPhaseTimer();
 
-  warning(
-    false,
-    "Functions are not valid as a React child. This may happen if " +
-      "you return a Component instead of <Component /> from render. " +
-      "Or maybe you meant to call this function rather than return it.%s",
-    getCurrentFiberStackAddendum$1() || ""
-  );
-}
+      {
+        warning(
+          shouldUpdate !== undefined,
+          "%s.shouldComponentUpdate(): Returned undefined instead of a " +
+            "boolean value. Make sure to return true or false.",
+          getComponentName(workInProgress) || "Unknown"
+        );
+      }
 
-// This wrapper function exists because I expect to clone the code in each path
-// to be able to optimize each path individually by branching early. This needs
-// a compiler or we can do it manually. Helpers that don't need this branching
-// live outside of this function.
-function ChildReconciler(shouldTrackSideEffects) {
-  function deleteChild(returnFiber, childToDelete) {
-    if (!shouldTrackSideEffects) {
-      // Noop.
-      return;
-    }
-    // Deletions are added in reversed order so we add it to the front.
-    // At this point, the return fiber's effect list is empty except for
-    // deletions, so we can just append the deletion to the list. The remaining
-    // effects aren't added until the complete phase. Once we implement
-    // resuming, this may not be true.
-    var last = returnFiber.lastEffect;
-    if (last !== null) {
-      last.nextEffect = childToDelete;
-      returnFiber.lastEffect = childToDelete;
-    } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+      return shouldUpdate;
     }
-    childToDelete.nextEffect = null;
-    childToDelete.effectTag = Deletion;
-  }
 
-  function deleteRemainingChildren(returnFiber, currentFirstChild) {
-    if (!shouldTrackSideEffects) {
-      // Noop.
-      return null;
+    if (ctor.prototype && ctor.prototype.isPureReactComponent) {
+      return (
+        !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
+      );
     }
 
-    // TODO: For the shouldClone case, this could be micro-optimized a bit by
-    // assuming that after the first child we've already added everything.
-    var childToDelete = currentFirstChild;
-    while (childToDelete !== null) {
-      deleteChild(returnFiber, childToDelete);
-      childToDelete = childToDelete.sibling;
-    }
-    return null;
+    return true;
   }
 
-  function mapRemainingChildren(returnFiber, currentFirstChild) {
-    // Add the remaining children to a temporary map so that we can find them by
-    // keys quickly. Implicit (null) keys get added to this set with their index
-    var existingChildren = new Map();
+  function checkClassInstance(workInProgress) {
+    var instance = workInProgress.stateNode;
+    var type = workInProgress.type;
+    {
+      var name = getComponentName(workInProgress);
+      var renderPresent = instance.render;
 
-    var existingChild = currentFirstChild;
-    while (existingChild !== null) {
-      if (existingChild.key !== null) {
-        existingChildren.set(existingChild.key, existingChild);
-      } else {
-        existingChildren.set(existingChild.index, existingChild);
+      if (!renderPresent) {
+        if (type.prototype && typeof type.prototype.render === "function") {
+          warning(
+            false,
+            "%s(...): No `render` method found on the returned component " +
+              "instance: did you accidentally return an object from the constructor?",
+            name
+          );
+        } else {
+          warning(
+            false,
+            "%s(...): No `render` method found on the returned component " +
+              "instance: you may have forgotten to define `render`.",
+            name
+          );
+        }
       }
-      existingChild = existingChild.sibling;
-    }
-    return existingChildren;
-  }
-
-  function useFiber(fiber, pendingProps, expirationTime) {
-    // We currently set sibling to null and index to 0 here because it is easy
-    // to forget to do before returning it. E.g. for the single child case.
-    var clone = createWorkInProgress(fiber, pendingProps, expirationTime);
-    clone.index = 0;
-    clone.sibling = null;
-    return clone;
-  }
 
-  function placeChild(newFiber, lastPlacedIndex, newIndex) {
-    newFiber.index = newIndex;
-    if (!shouldTrackSideEffects) {
-      // Noop.
-      return lastPlacedIndex;
-    }
-    var current = newFiber.alternate;
-    if (current !== null) {
-      var oldIndex = current.index;
-      if (oldIndex < lastPlacedIndex) {
-        // This is a move.
-        newFiber.effectTag = Placement;
-        return lastPlacedIndex;
-      } else {
-        // This item can stay in place.
-        return oldIndex;
+      var noGetInitialStateOnES6 =
+        !instance.getInitialState ||
+        instance.getInitialState.isReactClassApproved ||
+        instance.state;
+      warning(
+        noGetInitialStateOnES6,
+        "getInitialState was defined on %s, a plain JavaScript class. " +
+          "This is only supported for classes created using React.createClass. " +
+          "Did you mean to define a state property instead?",
+        name
+      );
+      var noGetDefaultPropsOnES6 =
+        !instance.getDefaultProps ||
+        instance.getDefaultProps.isReactClassApproved;
+      warning(
+        noGetDefaultPropsOnES6,
+        "getDefaultProps was defined on %s, a plain JavaScript class. " +
+          "This is only supported for classes created using React.createClass. " +
+          "Use a static property to define defaultProps instead.",
+        name
+      );
+      var noInstancePropTypes = !instance.propTypes;
+      warning(
+        noInstancePropTypes,
+        "propTypes was defined as an instance property on %s. Use a static " +
+          "property to define propTypes instead.",
+        name
+      );
+      var noInstanceContextTypes = !instance.contextTypes;
+      warning(
+        noInstanceContextTypes,
+        "contextTypes was defined as an instance property on %s. Use a static " +
+          "property to define contextTypes instead.",
+        name
+      );
+      var noComponentShouldUpdate =
+        typeof instance.componentShouldUpdate !== "function";
+      warning(
+        noComponentShouldUpdate,
+        "%s has a method called " +
+          "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
+          "The name is phrased as a question because the function is " +
+          "expected to return a value.",
+        name
+      );
+      if (
+        type.prototype &&
+        type.prototype.isPureReactComponent &&
+        typeof instance.shouldComponentUpdate !== "undefined"
+      ) {
+        warning(
+          false,
+          "%s has a method called shouldComponentUpdate(). " +
+            "shouldComponentUpdate should not be used when extending React.PureComponent. " +
+            "Please extend React.Component if shouldComponentUpdate is used.",
+          getComponentName(workInProgress) || "A pure component"
+        );
       }
-    } else {
-      // This is an insertion.
-      newFiber.effectTag = Placement;
-      return lastPlacedIndex;
-    }
-  }
-
-  function placeSingleChild(newFiber) {
-    // This is simpler for the single child case. We only need to do a
-    // placement for inserting new children.
-    if (shouldTrackSideEffects && newFiber.alternate === null) {
-      newFiber.effectTag = Placement;
-    }
-    return newFiber;
-  }
-
-  function updateTextNode(returnFiber, current, textContent, expirationTime) {
-    if (current === null || current.tag !== HostText) {
-      // Insert
-      var created = createFiberFromText(
-        textContent,
-        returnFiber.mode,
-        expirationTime
+      var noComponentDidUnmount =
+        typeof instance.componentDidUnmount !== "function";
+      warning(
+        noComponentDidUnmount,
+        "%s has a method called " +
+          "componentDidUnmount(). But there is no such lifecycle method. " +
+          "Did you mean componentWillUnmount()?",
+        name
+      );
+      var noComponentDidReceiveProps =
+        typeof instance.componentDidReceiveProps !== "function";
+      warning(
+        noComponentDidReceiveProps,
+        "%s has a method called " +
+          "componentDidReceiveProps(). But there is no such lifecycle method. " +
+          "If you meant to update the state in response to changing props, " +
+          "use componentWillReceiveProps(). If you meant to fetch data or " +
+          "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
+        name
+      );
+      var noComponentWillRecieveProps =
+        typeof instance.componentWillRecieveProps !== "function";
+      warning(
+        noComponentWillRecieveProps,
+        "%s has a method called " +
+          "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
+        name
+      );
+      var noUnsafeComponentWillRecieveProps =
+        typeof instance.UNSAFE_componentWillRecieveProps !== "function";
+      warning(
+        noUnsafeComponentWillRecieveProps,
+        "%s has a method called " +
+          "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
+        name
+      );
+      var hasMutatedProps = instance.props !== workInProgress.pendingProps;
+      warning(
+        instance.props === undefined || !hasMutatedProps,
+        "%s(...): When calling super() in `%s`, make sure to pass " +
+          "up the same props that your component's constructor was passed.",
+        name,
+        name
+      );
+      var noInstanceDefaultProps = !instance.defaultProps;
+      warning(
+        noInstanceDefaultProps,
+        "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
+          " Instead, define defaultProps as a static property on %s.",
+        name,
+        name
       );
-      created["return"] = returnFiber;
-      return created;
-    } else {
-      // Update
-      var existing = useFiber(current, textContent, expirationTime);
-      existing["return"] = returnFiber;
-      return existing;
     }
-  }
 
-  function updateElement(returnFiber, current, element, expirationTime) {
-    if (current !== null && current.type === element.type) {
-      // Move based on index
-      var existing = useFiber(current, element.props, expirationTime);
-      existing.ref = coerceRef(returnFiber, current, element);
-      existing["return"] = returnFiber;
-      {
-        existing._debugSource = element._source;
-        existing._debugOwner = element._owner;
-      }
-      return existing;
-    } else {
-      // Insert
-      var created = createFiberFromElement(
-        element,
-        returnFiber.mode,
-        expirationTime
+    var state = instance.state;
+    if (state && (typeof state !== "object" || isArray(state))) {
+      warning(
+        false,
+        "%s.state: must be set to an object or null",
+        getComponentName(workInProgress)
       );
-      created.ref = coerceRef(returnFiber, current, element);
-      created["return"] = returnFiber;
-      return created;
     }
-  }
-
-  function updatePortal(returnFiber, current, portal, expirationTime) {
-    if (
-      current === null ||
-      current.tag !== HostPortal ||
-      current.stateNode.containerInfo !== portal.containerInfo ||
-      current.stateNode.implementation !== portal.implementation
-    ) {
-      // Insert
-      var created = createFiberFromPortal(
-        portal,
-        returnFiber.mode,
-        expirationTime
+    if (typeof instance.getChildContext === "function") {
+      warning(
+        typeof type.childContextTypes === "object",
+        "%s.getChildContext(): childContextTypes must be defined in order to " +
+          "use getChildContext().",
+        getComponentName(workInProgress)
       );
-      created["return"] = returnFiber;
-      return created;
-    } else {
-      // Update
-      var existing = useFiber(current, portal.children || [], expirationTime);
-      existing["return"] = returnFiber;
-      return existing;
     }
   }
 
-  function updateFragment(returnFiber, current, fragment, expirationTime, key) {
-    if (current === null || current.tag !== Fragment) {
-      // Insert
-      var created = createFiberFromFragment(
-        fragment,
-        returnFiber.mode,
-        expirationTime,
-        key
-      );
-      created["return"] = returnFiber;
-      return created;
-    } else {
-      // Update
-      var existing = useFiber(current, fragment, expirationTime);
-      existing["return"] = returnFiber;
-      return existing;
-    }
+  function resetInputPointers(workInProgress, instance) {
+    instance.props = workInProgress.memoizedProps;
+    instance.state = workInProgress.memoizedState;
   }
 
-  function createChild(returnFiber, newChild, expirationTime) {
-    if (typeof newChild === "string" || typeof newChild === "number") {
-      // Text nodes don't have keys. If the previous node is implicitly keyed
-      // we can continue to replace it without aborting even if it is not a text
-      // node.
-      var created = createFiberFromText(
-        "" + newChild,
-        returnFiber.mode,
-        expirationTime
-      );
-      created["return"] = returnFiber;
-      return created;
+  function adoptClassInstance(workInProgress, instance) {
+    instance.updater = updater;
+    workInProgress.stateNode = instance;
+    // The instance needs access to the fiber so that it can schedule updates
+    set(instance, workInProgress);
+    {
+      instance._reactInternalInstance = fakeInternalInstance;
     }
+  }
 
-    if (typeof newChild === "object" && newChild !== null) {
-      switch (newChild.$$typeof) {
-        case REACT_ELEMENT_TYPE: {
-          var _created = createFiberFromElement(
-            newChild,
-            returnFiber.mode,
-            expirationTime
-          );
-          _created.ref = coerceRef(returnFiber, null, newChild);
-          _created["return"] = returnFiber;
-          return _created;
-        }
-        case REACT_PORTAL_TYPE: {
-          var _created2 = createFiberFromPortal(
-            newChild,
-            returnFiber.mode,
-            expirationTime
-          );
-          _created2["return"] = returnFiber;
-          return _created2;
-        }
-      }
-
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
-        var _created3 = createFiberFromFragment(
-          newChild,
-          returnFiber.mode,
-          expirationTime,
-          null
-        );
-        _created3["return"] = returnFiber;
-        return _created3;
-      }
+  function constructClassInstance(workInProgress, props) {
+    var ctor = workInProgress.type;
+    var unmaskedContext = getUnmaskedContext(workInProgress);
+    var needsContext = isContextConsumer(workInProgress);
+    var context = needsContext
+      ? getMaskedContext(workInProgress, unmaskedContext)
+      : emptyObject;
 
-      throwOnInvalidObjectType(returnFiber, newChild);
+    // Instantiate twice to help detect side-effects.
+    if (
+      debugRenderPhaseSideEffects ||
+      (debugRenderPhaseSideEffectsForStrictMode &&
+        workInProgress.mode & StrictMode)
+    ) {
+      new ctor(props, context); // eslint-disable-line no-new
     }
 
+    var instance = new ctor(props, context);
+    var state =
+      instance.state !== null && instance.state !== undefined
+        ? instance.state
+        : null;
+    adoptClassInstance(workInProgress, instance);
+
     {
-      if (typeof newChild === "function") {
-        warnOnFunctionType();
+      if (
+        typeof ctor.getDerivedStateFromProps === "function" &&
+        state === null
+      ) {
+        var componentName = getComponentName(workInProgress) || "Unknown";
+        if (!didWarnAboutUninitializedState[componentName]) {
+          warning(
+            false,
+            "%s: Did not properly initialize state during construction. " +
+              "Expected state to be an object, but it was %s.",
+            componentName,
+            instance.state === null ? "null" : "undefined"
+          );
+          didWarnAboutUninitializedState[componentName] = true;
+        }
       }
     }
 
-    return null;
-  }
+    workInProgress.memoizedState = state;
 
-  function updateSlot(returnFiber, oldFiber, newChild, expirationTime) {
-    // Update the fiber if the keys match, otherwise return null.
+    var partialState = callGetDerivedStateFromProps(
+      workInProgress,
+      instance,
+      props
+    );
 
-    var key = oldFiber !== null ? oldFiber.key : null;
-
-    if (typeof newChild === "string" || typeof newChild === "number") {
-      // Text nodes don't have keys. If the previous node is implicitly keyed
-      // we can continue to replace it without aborting even if it is not a text
-      // node.
-      if (key !== null) {
-        return null;
-      }
-      return updateTextNode(
-        returnFiber,
-        oldFiber,
-        "" + newChild,
-        expirationTime
+    if (partialState !== null && partialState !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      workInProgress.memoizedState = Object.assign(
+        {},
+        workInProgress.memoizedState,
+        partialState
       );
     }
 
-    if (typeof newChild === "object" && newChild !== null) {
-      switch (newChild.$$typeof) {
-        case REACT_ELEMENT_TYPE: {
-          if (newChild.key === key) {
-            if (newChild.type === REACT_FRAGMENT_TYPE) {
-              return updateFragment(
-                returnFiber,
-                oldFiber,
-                newChild.props.children,
-                expirationTime,
-                key
-              );
-            }
-            return updateElement(
-              returnFiber,
-              oldFiber,
-              newChild,
-              expirationTime
-            );
-          } else {
-            return null;
-          }
-        }
-        case REACT_PORTAL_TYPE: {
-          if (newChild.key === key) {
-            return updatePortal(
-              returnFiber,
-              oldFiber,
-              newChild,
-              expirationTime
-            );
-          } else {
-            return null;
-          }
-        }
-      }
+    // Cache unmasked context so we can avoid recreating masked context unless necessary.
+    // ReactFiberContext usually updates this cache but can't for newly-created instances.
+    if (needsContext) {
+      cacheContext(workInProgress, unmaskedContext, context);
+    }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
-        if (key !== null) {
-          return null;
-        }
+    return instance;
+  }
 
-        return updateFragment(
-          returnFiber,
-          oldFiber,
-          newChild,
-          expirationTime,
-          null
-        );
-      }
+  function callComponentWillMount(workInProgress, instance) {
+    startPhaseTimer(workInProgress, "componentWillMount");
+    var oldState = instance.state;
 
-      throwOnInvalidObjectType(returnFiber, newChild);
+    if (typeof instance.componentWillMount === "function") {
+      instance.componentWillMount();
+    }
+    if (typeof instance.UNSAFE_componentWillMount === "function") {
+      instance.UNSAFE_componentWillMount();
     }
 
-    {
-      if (typeof newChild === "function") {
-        warnOnFunctionType();
+    stopPhaseTimer();
+
+    if (oldState !== instance.state) {
+      {
+        warning(
+          false,
+          "%s.componentWillMount(): Assigning directly to this.state is " +
+            "deprecated (except inside a component's " +
+            "constructor). Use setState instead.",
+          getComponentName(workInProgress)
+        );
       }
+      updater.enqueueReplaceState(instance, instance.state, null);
     }
-
-    return null;
   }
 
-  function updateFromMap(
-    existingChildren,
-    returnFiber,
-    newIdx,
-    newChild,
-    expirationTime
+  function callComponentWillReceiveProps(
+    workInProgress,
+    instance,
+    newProps,
+    newContext
   ) {
-    if (typeof newChild === "string" || typeof newChild === "number") {
-      // Text nodes don't have keys, so we neither have to check the old nor
-      // new node for the key. If both are text nodes, they match.
-      var matchedFiber = existingChildren.get(newIdx) || null;
-      return updateTextNode(
-        returnFiber,
-        matchedFiber,
-        "" + newChild,
-        expirationTime
-      );
+    var oldState = instance.state;
+    startPhaseTimer(workInProgress, "componentWillReceiveProps");
+    if (typeof instance.componentWillReceiveProps === "function") {
+      instance.componentWillReceiveProps(newProps, newContext);
     }
+    if (typeof instance.UNSAFE_componentWillReceiveProps === "function") {
+      instance.UNSAFE_componentWillReceiveProps(newProps, newContext);
+    }
+    stopPhaseTimer();
 
-    if (typeof newChild === "object" && newChild !== null) {
-      switch (newChild.$$typeof) {
-        case REACT_ELEMENT_TYPE: {
-          var _matchedFiber =
-            existingChildren.get(
-              newChild.key === null ? newIdx : newChild.key
-            ) || null;
-          if (newChild.type === REACT_FRAGMENT_TYPE) {
-            return updateFragment(
-              returnFiber,
-              _matchedFiber,
-              newChild.props.children,
-              expirationTime,
-              newChild.key
-            );
-          }
-          return updateElement(
-            returnFiber,
-            _matchedFiber,
-            newChild,
-            expirationTime
+    if (instance.state !== oldState) {
+      {
+        var componentName = getComponentName(workInProgress) || "Component";
+        if (!didWarnAboutStateAssignmentForComponent[componentName]) {
+          warning(
+            false,
+            "%s.componentWillReceiveProps(): Assigning directly to " +
+              "this.state is deprecated (except inside a component's " +
+              "constructor). Use setState instead.",
+            componentName
           );
+          didWarnAboutStateAssignmentForComponent[componentName] = true;
         }
-        case REACT_PORTAL_TYPE: {
-          var _matchedFiber2 =
-            existingChildren.get(
-              newChild.key === null ? newIdx : newChild.key
-            ) || null;
-          return updatePortal(
-            returnFiber,
-            _matchedFiber2,
-            newChild,
-            expirationTime
-          );
+      }
+      updater.enqueueReplaceState(instance, instance.state, null);
+    }
+  }
+
+  function callGetDerivedStateFromProps(workInProgress, instance, props) {
+    var type = workInProgress.type;
+
+    if (typeof type.getDerivedStateFromProps === "function") {
+      {
+        // Don't warn about react-lifecycles-compat polyfilled components
+        if (
+          (typeof instance.componentWillReceiveProps === "function" &&
+            instance.componentWillReceiveProps.__suppressDeprecationWarning !==
+              true) ||
+          typeof instance.UNSAFE_componentWillReceiveProps === "function"
+        ) {
+          var componentName = getComponentName(workInProgress) || "Unknown";
+          if (!didWarnAboutWillReceivePropsAndDerivedState[componentName]) {
+            warning(
+              false,
+              "%s: Defines both componentWillReceiveProps() and static " +
+                "getDerivedStateFromProps() methods. We recommend using " +
+                "only getDerivedStateFromProps().",
+              componentName
+            );
+            didWarnAboutWillReceivePropsAndDerivedState[componentName] = true;
+          }
         }
       }
 
-      if (isArray$1(newChild) || getIteratorFn(newChild)) {
-        var _matchedFiber3 = existingChildren.get(newIdx) || null;
-        return updateFragment(
-          returnFiber,
-          _matchedFiber3,
-          newChild,
-          expirationTime,
-          null
+      if (
+        debugRenderPhaseSideEffects ||
+        (debugRenderPhaseSideEffectsForStrictMode &&
+          workInProgress.mode & StrictMode)
+      ) {
+        // Invoke method an extra time to help detect side-effects.
+        type.getDerivedStateFromProps.call(
+          null,
+          props,
+          workInProgress.memoizedState
         );
       }
 
-      throwOnInvalidObjectType(returnFiber, newChild);
+      var partialState = type.getDerivedStateFromProps.call(
+        null,
+        props,
+        workInProgress.memoizedState
+      );
+
+      {
+        if (partialState === undefined) {
+          var _componentName = getComponentName(workInProgress) || "Unknown";
+          if (!didWarnAboutUndefinedDerivedState[_componentName]) {
+            warning(
+              false,
+              "%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. " +
+                "You have returned undefined.",
+              _componentName
+            );
+            didWarnAboutUndefinedDerivedState[_componentName] = _componentName;
+          }
+        }
+      }
+
+      return partialState;
     }
+  }
+
+  // Invokes the mount life-cycles on a previously never rendered instance.
+  function mountClassInstance(workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
+    var current = workInProgress.alternate;
 
     {
-      if (typeof newChild === "function") {
-        warnOnFunctionType();
-      }
+      checkClassInstance(workInProgress);
     }
 
-    return null;
-  }
+    var instance = workInProgress.stateNode;
+    var props = workInProgress.pendingProps;
+    var unmaskedContext = getUnmaskedContext(workInProgress);
+
+    instance.props = props;
+    instance.state = workInProgress.memoizedState;
+    instance.refs = emptyObject;
+    instance.context = getMaskedContext(workInProgress, unmaskedContext);
 
-  /**
-   * Warns if there is a duplicate or missing key
-   */
-  function warnOnInvalidKey(child, knownKeys) {
     {
-      if (typeof child !== "object" || child === null) {
-        return knownKeys;
-      }
-      switch (child.$$typeof) {
-        case REACT_ELEMENT_TYPE:
-        case REACT_PORTAL_TYPE:
-          warnForMissingKey(child);
-          var key = child.key;
-          if (typeof key !== "string") {
-            break;
-          }
-          if (knownKeys === null) {
-            knownKeys = new Set();
-            knownKeys.add(key);
-            break;
-          }
-          if (!knownKeys.has(key)) {
-            knownKeys.add(key);
-            break;
-          }
-          warning(
-            false,
-            "Encountered two children with the same key, `%s`. " +
-              "Keys should be unique so that components maintain their identity " +
-              "across updates. Non-unique keys may cause children to be " +
-              "duplicated and/or omitted — the behavior is unsupported and " +
-              "could change in a future version.%s",
-            key,
-            getCurrentFiberStackAddendum$1()
-          );
-          break;
-        default:
-          break;
+      if (workInProgress.mode & StrictMode) {
+        ReactStrictModeWarnings.recordUnsafeLifecycleWarnings(
+          workInProgress,
+          instance
+        );
+      }
+
+      if (warnAboutDeprecatedLifecycles) {
+        ReactStrictModeWarnings.recordDeprecationWarnings(
+          workInProgress,
+          instance
+        );
       }
     }
-    return knownKeys;
-  }
 
-  function reconcileChildrenArray(
-    returnFiber,
-    currentFirstChild,
-    newChildren,
-    expirationTime
-  ) {
-    // This algorithm can't optimize by searching from boths ends since we
-    // don't have backpointers on fibers. I'm trying to see how far we can get
-    // with that model. If it ends up not being worth the tradeoffs, we can
-    // add it later.
+    // In order to support react-lifecycles-compat polyfilled components,
+    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    if (
+      (typeof instance.UNSAFE_componentWillMount === "function" ||
+        typeof instance.componentWillMount === "function") &&
+      typeof ctor.getDerivedStateFromProps !== "function"
+    ) {
+      callComponentWillMount(workInProgress, instance);
+      // If we had additional state updates during this life-cycle, let's
+      // process them now.
+      var updateQueue = workInProgress.updateQueue;
+      if (updateQueue !== null) {
+        instance.state = processUpdateQueue(
+          current,
+          workInProgress,
+          updateQueue,
+          instance,
+          props,
+          renderExpirationTime
+        );
+      }
+    }
+    if (typeof instance.componentDidMount === "function") {
+      workInProgress.effectTag |= Update;
+    }
+  }
 
-    // Even with a two ended optimization, we'd want to optimize for the case
-    // where there are few changes and brute force the comparison instead of
-    // going for the Map. It'd like to explore hitting that path first in
-    // forward-only mode and only go for the Map once we notice that we need
-    // lots of look ahead. This doesn't handle reversal as well as two ended
-    // search but that's unusual. Besides, for the two ended optimization to
-    // work on Iterables, we'd need to copy the whole set.
+  function resumeMountClassInstance(workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
+    var instance = workInProgress.stateNode;
+    resetInputPointers(workInProgress, instance);
 
-    // In this first iteration, we'll just live with hitting the bad case
-    // (adding everything to a Map) in for every insert/move.
+    var oldProps = workInProgress.memoizedProps;
+    var newProps = workInProgress.pendingProps;
+    var oldContext = instance.context;
+    var newUnmaskedContext = getUnmaskedContext(workInProgress);
+    var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
-    // If you change this code, also update reconcileChildrenIterator() which
-    // uses the same algorithm.
+    // Note: During these life-cycles, instance.props/instance.state are what
+    // ever the previously attempted to render - not the "current". However,
+    // during componentDidUpdate we pass the "current" props.
 
-    {
-      // First, validate keys.
-      var knownKeys = null;
-      for (var i = 0; i < newChildren.length; i++) {
-        var child = newChildren[i];
-        knownKeys = warnOnInvalidKey(child, knownKeys);
+    // In order to support react-lifecycles-compat polyfilled components,
+    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    if (
+      (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
+        typeof instance.componentWillReceiveProps === "function") &&
+      typeof ctor.getDerivedStateFromProps !== "function"
+    ) {
+      if (oldProps !== newProps || oldContext !== newContext) {
+        callComponentWillReceiveProps(
+          workInProgress,
+          instance,
+          newProps,
+          newContext
+        );
       }
     }
 
-    var resultingFirstChild = null;
-    var previousNewFiber = null;
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps
+      );
+    }
 
-    var oldFiber = currentFirstChild;
-    var lastPlacedIndex = 0;
-    var newIdx = 0;
-    var nextOldFiber = null;
-    for (; oldFiber !== null && newIdx < newChildren.length; newIdx++) {
-      if (oldFiber.index > newIdx) {
-        nextOldFiber = oldFiber;
-        oldFiber = null;
-      } else {
-        nextOldFiber = oldFiber.sibling;
-      }
-      var newFiber = updateSlot(
-        returnFiber,
-        oldFiber,
-        newChildren[newIdx],
-        expirationTime
+    // Compute the next state using the memoized state and the update queue.
+    var oldState = workInProgress.memoizedState;
+    // TODO: Previous state can be null.
+    var newState = void 0;
+    var derivedStateFromCatch = void 0;
+    if (workInProgress.updateQueue !== null) {
+      newState = processUpdateQueue(
+        null,
+        workInProgress,
+        workInProgress.updateQueue,
+        instance,
+        newProps,
+        renderExpirationTime
       );
-      if (newFiber === null) {
-        // TODO: This breaks on empty slots like null children. That's
-        // unfortunate because it triggers the slow path all the time. We need
-        // a better way to communicate whether this was a miss or null,
-        // boolean, undefined, etc.
-        if (oldFiber === null) {
-          oldFiber = nextOldFiber;
-        }
-        break;
-      }
-      if (shouldTrackSideEffects) {
-        if (oldFiber && newFiber.alternate === null) {
-          // We matched the slot, but we didn't reuse the existing fiber, so we
-          // need to delete the existing child.
-          deleteChild(returnFiber, oldFiber);
-        }
-      }
-      lastPlacedIndex = placeChild(newFiber, lastPlacedIndex, newIdx);
-      if (previousNewFiber === null) {
-        // TODO: Move out of the loop. This only happens for the first run.
-        resultingFirstChild = newFiber;
-      } else {
-        // TODO: Defer siblings if we're not at the right index for this slot.
-        // I.e. if we had null values before, then we want to defer this
-        // for each null value. However, we also don't want to call updateSlot
-        // with the previous one.
-        previousNewFiber.sibling = newFiber;
+
+      var updateQueue = workInProgress.updateQueue;
+      if (
+        updateQueue !== null &&
+        updateQueue.capturedValues !== null &&
+        enableGetDerivedStateFromCatch &&
+        typeof ctor.getDerivedStateFromCatch === "function"
+      ) {
+        var capturedValues = updateQueue.capturedValues;
+        // Don't remove these from the update queue yet. We need them in
+        // finishClassComponent. Do the reset there.
+        // TODO: This is awkward. Refactor class components.
+        // updateQueue.capturedValues = null;
+        derivedStateFromCatch = callGetDerivedStateFromCatch(
+          ctor,
+          capturedValues
+        );
       }
-      previousNewFiber = newFiber;
-      oldFiber = nextOldFiber;
+    } else {
+      newState = oldState;
     }
 
-    if (newIdx === newChildren.length) {
-      // We've reached the end of the new children. We can delete the rest.
-      deleteRemainingChildren(returnFiber, oldFiber);
-      return resultingFirstChild;
+    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromProps
+          : Object.assign({}, newState, derivedStateFromProps);
+    }
+    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromCatch
+          : Object.assign({}, newState, derivedStateFromCatch);
     }
 
-    if (oldFiber === null) {
-      // If we don't have any more existing children we can choose a fast path
-      // since the rest will all be insertions.
-      for (; newIdx < newChildren.length; newIdx++) {
-        var _newFiber = createChild(
-          returnFiber,
-          newChildren[newIdx],
-          expirationTime
-        );
-        if (!_newFiber) {
-          continue;
-        }
-        lastPlacedIndex = placeChild(_newFiber, lastPlacedIndex, newIdx);
-        if (previousNewFiber === null) {
-          // TODO: Move out of the loop. This only happens for the first run.
-          resultingFirstChild = _newFiber;
-        } else {
-          previousNewFiber.sibling = _newFiber;
-        }
-        previousNewFiber = _newFiber;
+    if (
+      oldProps === newProps &&
+      oldState === newState &&
+      !hasContextChanged() &&
+      !(
+        workInProgress.updateQueue !== null &&
+        workInProgress.updateQueue.hasForceUpdate
+      )
+    ) {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
       }
-      return resultingFirstChild;
+      return false;
     }
 
-    // Add all children to a key map for quick lookups.
-    var existingChildren = mapRemainingChildren(returnFiber, oldFiber);
+    var shouldUpdate = checkShouldComponentUpdate(
+      workInProgress,
+      oldProps,
+      newProps,
+      oldState,
+      newState,
+      newContext
+    );
 
-    // Keep scanning and use the map to restore deleted items as moves.
-    for (; newIdx < newChildren.length; newIdx++) {
-      var _newFiber2 = updateFromMap(
-        existingChildren,
-        returnFiber,
-        newIdx,
-        newChildren[newIdx],
-        expirationTime
-      );
-      if (_newFiber2) {
-        if (shouldTrackSideEffects) {
-          if (_newFiber2.alternate !== null) {
-            // The new fiber is a work in progress, but if there exists a
-            // current, that means that we reused the fiber. We need to delete
-            // it from the child list so that we don't add it to the deletion
-            // list.
-            existingChildren["delete"](
-              _newFiber2.key === null ? newIdx : _newFiber2.key
-            );
-          }
+    if (shouldUpdate) {
+      // In order to support react-lifecycles-compat polyfilled components,
+      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      if (
+        (typeof instance.UNSAFE_componentWillUpdate === "function" ||
+          typeof instance.componentWillUpdate === "function") &&
+        typeof ctor.getDerivedStateFromProps !== "function"
+      ) {
+        startPhaseTimer(workInProgress, "componentWillUpdate");
+        if (typeof instance.componentWillUpdate === "function") {
+          instance.componentWillUpdate(newProps, newState, newContext);
         }
-        lastPlacedIndex = placeChild(_newFiber2, lastPlacedIndex, newIdx);
-        if (previousNewFiber === null) {
-          resultingFirstChild = _newFiber2;
-        } else {
-          previousNewFiber.sibling = _newFiber2;
+        if (typeof instance.UNSAFE_componentWillUpdate === "function") {
+          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
         }
-        previousNewFiber = _newFiber2;
+        stopPhaseTimer();
+      }
+      if (typeof instance.componentDidUpdate === "function") {
+        workInProgress.effectTag |= Update;
+      }
+    } else {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidMount === "function") {
+        workInProgress.effectTag |= Update;
       }
-    }
 
-    if (shouldTrackSideEffects) {
-      // Any existing children that weren't consumed above were deleted. We need
-      // to add them to the deletion list.
-      existingChildren.forEach(function(child) {
-        return deleteChild(returnFiber, child);
-      });
+      // If shouldComponentUpdate returned false, we should still update the
+      // memoized props/state to indicate that this work can be reused.
+      memoizeProps(workInProgress, newProps);
+      memoizeState(workInProgress, newState);
     }
 
-    return resultingFirstChild;
+    // Update the existing instance's state, props, and context pointers even
+    // if shouldComponentUpdate returns false.
+    instance.props = newProps;
+    instance.state = newState;
+    instance.context = newContext;
+
+    return shouldUpdate;
   }
 
-  function reconcileChildrenIterator(
-    returnFiber,
-    currentFirstChild,
-    newChildrenIterable,
-    expirationTime
-  ) {
-    // This is the same implementation as reconcileChildrenArray(),
-    // but using the iterator instead.
+  // Invokes the update life-cycles and returns false if it shouldn't rerender.
+  function updateClassInstance(current, workInProgress, renderExpirationTime) {
+    var ctor = workInProgress.type;
+    var instance = workInProgress.stateNode;
+    resetInputPointers(workInProgress, instance);
 
-    var iteratorFn = getIteratorFn(newChildrenIterable);
-    invariant(
-      typeof iteratorFn === "function",
-      "An object is not an iterable. This error is likely caused by a bug in " +
-        "React. Please file an issue."
-    );
+    var oldProps = workInProgress.memoizedProps;
+    var newProps = workInProgress.pendingProps;
+    var oldContext = instance.context;
+    var newUnmaskedContext = getUnmaskedContext(workInProgress);
+    var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
-    {
-      // Warn about using Maps as children
-      if (typeof newChildrenIterable.entries === "function") {
-        var possibleMap = newChildrenIterable;
-        if (possibleMap.entries === iteratorFn) {
-          !didWarnAboutMaps
-            ? warning(
-                false,
-                "Using Maps as children is unsupported and will likely yield " +
-                  "unexpected results. Convert it to a sequence/iterable of keyed " +
-                  "ReactElements instead.%s",
-                getCurrentFiberStackAddendum$1()
-              )
-            : void 0;
-          didWarnAboutMaps = true;
-        }
-      }
+    // Note: During these life-cycles, instance.props/instance.state are what
+    // ever the previously attempted to render - not the "current". However,
+    // during componentDidUpdate we pass the "current" props.
 
-      // First, validate keys.
-      // We'll get a different iterator later for the main pass.
-      var _newChildren = iteratorFn.call(newChildrenIterable);
-      if (_newChildren) {
-        var knownKeys = null;
-        var _step = _newChildren.next();
-        for (; !_step.done; _step = _newChildren.next()) {
-          var child = _step.value;
-          knownKeys = warnOnInvalidKey(child, knownKeys);
-        }
+    // In order to support react-lifecycles-compat polyfilled components,
+    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    if (
+      (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
+        typeof instance.componentWillReceiveProps === "function") &&
+      typeof ctor.getDerivedStateFromProps !== "function"
+    ) {
+      if (oldProps !== newProps || oldContext !== newContext) {
+        callComponentWillReceiveProps(
+          workInProgress,
+          instance,
+          newProps,
+          newContext
+        );
       }
     }
 
-    var newChildren = iteratorFn.call(newChildrenIterable);
-    invariant(newChildren != null, "An iterable object provided no iterator.");
-
-    var resultingFirstChild = null;
-    var previousNewFiber = null;
-
-    var oldFiber = currentFirstChild;
-    var lastPlacedIndex = 0;
-    var newIdx = 0;
-    var nextOldFiber = null;
-
-    var step = newChildren.next();
-    for (
-      ;
-      oldFiber !== null && !step.done;
-      newIdx++, step = newChildren.next()
-    ) {
-      if (oldFiber.index > newIdx) {
-        nextOldFiber = oldFiber;
-        oldFiber = null;
-      } else {
-        nextOldFiber = oldFiber.sibling;
-      }
-      var newFiber = updateSlot(
-        returnFiber,
-        oldFiber,
-        step.value,
-        expirationTime
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps
       );
-      if (newFiber === null) {
-        // TODO: This breaks on empty slots like null children. That's
-        // unfortunate because it triggers the slow path all the time. We need
-        // a better way to communicate whether this was a miss or null,
-        // boolean, undefined, etc.
-        if (!oldFiber) {
-          oldFiber = nextOldFiber;
-        }
-        break;
-      }
-      if (shouldTrackSideEffects) {
-        if (oldFiber && newFiber.alternate === null) {
-          // We matched the slot, but we didn't reuse the existing fiber, so we
-          // need to delete the existing child.
-          deleteChild(returnFiber, oldFiber);
-        }
-      }
-      lastPlacedIndex = placeChild(newFiber, lastPlacedIndex, newIdx);
-      if (previousNewFiber === null) {
-        // TODO: Move out of the loop. This only happens for the first run.
-        resultingFirstChild = newFiber;
-      } else {
-        // TODO: Defer siblings if we're not at the right index for this slot.
-        // I.e. if we had null values before, then we want to defer this
-        // for each null value. However, we also don't want to call updateSlot
-        // with the previous one.
-        previousNewFiber.sibling = newFiber;
-      }
-      previousNewFiber = newFiber;
-      oldFiber = nextOldFiber;
     }
 
-    if (step.done) {
-      // We've reached the end of the new children. We can delete the rest.
-      deleteRemainingChildren(returnFiber, oldFiber);
-      return resultingFirstChild;
-    }
+    // Compute the next state using the memoized state and the update queue.
+    var oldState = workInProgress.memoizedState;
+    // TODO: Previous state can be null.
+    var newState = void 0;
+    var derivedStateFromCatch = void 0;
+    if (workInProgress.updateQueue !== null) {
+      newState = processUpdateQueue(
+        current,
+        workInProgress,
+        workInProgress.updateQueue,
+        instance,
+        newProps,
+        renderExpirationTime
+      );
 
-    if (oldFiber === null) {
-      // If we don't have any more existing children we can choose a fast path
-      // since the rest will all be insertions.
-      for (; !step.done; newIdx++, step = newChildren.next()) {
-        var _newFiber3 = createChild(returnFiber, step.value, expirationTime);
-        if (_newFiber3 === null) {
-          continue;
-        }
-        lastPlacedIndex = placeChild(_newFiber3, lastPlacedIndex, newIdx);
-        if (previousNewFiber === null) {
-          // TODO: Move out of the loop. This only happens for the first run.
-          resultingFirstChild = _newFiber3;
-        } else {
-          previousNewFiber.sibling = _newFiber3;
-        }
-        previousNewFiber = _newFiber3;
+      var updateQueue = workInProgress.updateQueue;
+      if (
+        updateQueue !== null &&
+        updateQueue.capturedValues !== null &&
+        enableGetDerivedStateFromCatch &&
+        typeof ctor.getDerivedStateFromCatch === "function"
+      ) {
+        var capturedValues = updateQueue.capturedValues;
+        // Don't remove these from the update queue yet. We need them in
+        // finishClassComponent. Do the reset there.
+        // TODO: This is awkward. Refactor class components.
+        // updateQueue.capturedValues = null;
+        derivedStateFromCatch = callGetDerivedStateFromCatch(
+          ctor,
+          capturedValues
+        );
       }
-      return resultingFirstChild;
+    } else {
+      newState = oldState;
     }
 
-    // Add all children to a key map for quick lookups.
-    var existingChildren = mapRemainingChildren(returnFiber, oldFiber);
-
-    // Keep scanning and use the map to restore deleted items as moves.
-    for (; !step.done; newIdx++, step = newChildren.next()) {
-      var _newFiber4 = updateFromMap(
-        existingChildren,
-        returnFiber,
-        newIdx,
-        step.value,
-        expirationTime
-      );
-      if (_newFiber4 !== null) {
-        if (shouldTrackSideEffects) {
-          if (_newFiber4.alternate !== null) {
-            // The new fiber is a work in progress, but if there exists a
-            // current, that means that we reused the fiber. We need to delete
-            // it from the child list so that we don't add it to the deletion
-            // list.
-            existingChildren["delete"](
-              _newFiber4.key === null ? newIdx : _newFiber4.key
-            );
-          }
-        }
-        lastPlacedIndex = placeChild(_newFiber4, lastPlacedIndex, newIdx);
-        if (previousNewFiber === null) {
-          resultingFirstChild = _newFiber4;
-        } else {
-          previousNewFiber.sibling = _newFiber4;
-        }
-        previousNewFiber = _newFiber4;
-      }
-    }
-
-    if (shouldTrackSideEffects) {
-      // Any existing children that weren't consumed above were deleted. We need
-      // to add them to the deletion list.
-      existingChildren.forEach(function(child) {
-        return deleteChild(returnFiber, child);
-      });
+    if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromProps
+          : Object.assign({}, newState, derivedStateFromProps);
     }
-
-    return resultingFirstChild;
-  }
-
-  function reconcileSingleTextNode(
-    returnFiber,
-    currentFirstChild,
-    textContent,
-    expirationTime
-  ) {
-    // There's no need to check for keys on text nodes since we don't have a
-    // way to define them.
-    if (currentFirstChild !== null && currentFirstChild.tag === HostText) {
-      // We already have an existing node so let's just update it and delete
-      // the rest.
-      deleteRemainingChildren(returnFiber, currentFirstChild.sibling);
-      var existing = useFiber(currentFirstChild, textContent, expirationTime);
-      existing["return"] = returnFiber;
-      return existing;
+    if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
+      // Render-phase updates (like this) should not be added to the update queue,
+      // So that multiple render passes do not enqueue multiple updates.
+      // Instead, just synchronously merge the returned state into the instance.
+      newState =
+        newState === null || newState === undefined
+          ? derivedStateFromCatch
+          : Object.assign({}, newState, derivedStateFromCatch);
     }
-    // The existing first child is not a text node so we need to create one
-    // and delete the existing ones.
-    deleteRemainingChildren(returnFiber, currentFirstChild);
-    var created = createFiberFromText(
-      textContent,
-      returnFiber.mode,
-      expirationTime
-    );
-    created["return"] = returnFiber;
-    return created;
-  }
 
-  function reconcileSingleElement(
-    returnFiber,
-    currentFirstChild,
-    element,
-    expirationTime
-  ) {
-    var key = element.key;
-    var child = currentFirstChild;
-    while (child !== null) {
-      // TODO: If key === null and child.key === null, then this only applies to
-      // the first item in the list.
-      if (child.key === key) {
+    if (
+      oldProps === newProps &&
+      oldState === newState &&
+      !hasContextChanged() &&
+      !(
+        workInProgress.updateQueue !== null &&
+        workInProgress.updateQueue.hasForceUpdate
+      )
+    ) {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidUpdate === "function") {
         if (
-          child.tag === Fragment
-            ? element.type === REACT_FRAGMENT_TYPE
-            : child.type === element.type
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
         ) {
-          deleteRemainingChildren(returnFiber, child.sibling);
-          var existing = useFiber(
-            child,
-            element.type === REACT_FRAGMENT_TYPE
-              ? element.props.children
-              : element.props,
-            expirationTime
-          );
-          existing.ref = coerceRef(returnFiber, child, element);
-          existing["return"] = returnFiber;
-          {
-            existing._debugSource = element._source;
-            existing._debugOwner = element._owner;
-          }
-          return existing;
-        } else {
-          deleteRemainingChildren(returnFiber, child);
-          break;
+          workInProgress.effectTag |= Update;
         }
-      } else {
-        deleteChild(returnFiber, child);
       }
-      child = child.sibling;
+      return false;
     }
 
-    if (element.type === REACT_FRAGMENT_TYPE) {
-      var created = createFiberFromFragment(
-        element.props.children,
-        returnFiber.mode,
-        expirationTime,
-        element.key
-      );
-      created["return"] = returnFiber;
-      return created;
-    } else {
-      var _created4 = createFiberFromElement(
-        element,
-        returnFiber.mode,
-        expirationTime
-      );
-      _created4.ref = coerceRef(returnFiber, currentFirstChild, element);
-      _created4["return"] = returnFiber;
-      return _created4;
-    }
-  }
+    var shouldUpdate = checkShouldComponentUpdate(
+      workInProgress,
+      oldProps,
+      newProps,
+      oldState,
+      newState,
+      newContext
+    );
 
-  function reconcileSinglePortal(
-    returnFiber,
-    currentFirstChild,
-    portal,
-    expirationTime
-  ) {
-    var key = portal.key;
-    var child = currentFirstChild;
-    while (child !== null) {
-      // TODO: If key === null and child.key === null, then this only applies to
-      // the first item in the list.
-      if (child.key === key) {
+    if (shouldUpdate) {
+      // In order to support react-lifecycles-compat polyfilled components,
+      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      if (
+        (typeof instance.UNSAFE_componentWillUpdate === "function" ||
+          typeof instance.componentWillUpdate === "function") &&
+        typeof ctor.getDerivedStateFromProps !== "function"
+      ) {
+        startPhaseTimer(workInProgress, "componentWillUpdate");
+        if (typeof instance.componentWillUpdate === "function") {
+          instance.componentWillUpdate(newProps, newState, newContext);
+        }
+        if (typeof instance.UNSAFE_componentWillUpdate === "function") {
+          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
+        }
+        stopPhaseTimer();
+      }
+      if (typeof instance.componentDidUpdate === "function") {
+        workInProgress.effectTag |= Update;
+      }
+    } else {
+      // If an update was already in progress, we should schedule an Update
+      // effect even though we're bailing out, so that cWU/cDU are called.
+      if (typeof instance.componentDidUpdate === "function") {
         if (
-          child.tag === HostPortal &&
-          child.stateNode.containerInfo === portal.containerInfo &&
-          child.stateNode.implementation === portal.implementation
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
         ) {
-          deleteRemainingChildren(returnFiber, child.sibling);
-          var existing = useFiber(child, portal.children || [], expirationTime);
-          existing["return"] = returnFiber;
-          return existing;
-        } else {
-          deleteRemainingChildren(returnFiber, child);
-          break;
+          workInProgress.effectTag |= Update;
         }
-      } else {
-        deleteChild(returnFiber, child);
       }
-      child = child.sibling;
+
+      // If shouldComponentUpdate returned false, we should still update the
+      // memoized props/state to indicate that this work can be reused.
+      memoizeProps(workInProgress, newProps);
+      memoizeState(workInProgress, newState);
     }
 
-    var created = createFiberFromPortal(
-      portal,
-      returnFiber.mode,
-      expirationTime
-    );
-    created["return"] = returnFiber;
-    return created;
+    // Update the existing instance's state, props, and context pointers even
+    // if shouldComponentUpdate returns false.
+    instance.props = newProps;
+    instance.state = newState;
+    instance.context = newContext;
+
+    return shouldUpdate;
   }
 
-  // This API will tag the children with the side-effect of the reconciliation
-  // itself. They will be added to the side-effect list as we pass through the
-  // children and the parent.
-  function reconcileChildFibers(
-    returnFiber,
-    currentFirstChild,
-    newChild,
-    expirationTime
-  ) {
-    // This function is not recursive.
-    // If the top level item is an array, we treat it as a set of children,
-    // not as a fragment. Nested arrays on the other hand will be treated as
-    // fragment nodes. Recursion happens at the normal flow.
+  return {
+    adoptClassInstance: adoptClassInstance,
+    callGetDerivedStateFromProps: callGetDerivedStateFromProps,
+    constructClassInstance: constructClassInstance,
+    mountClassInstance: mountClassInstance,
+    resumeMountClassInstance: resumeMountClassInstance,
+    updateClassInstance: updateClassInstance
+  };
+};
 
-    // Handle top level unkeyed fragments as if they were arrays.
-    // This leads to an ambiguity between <>{[...]}</> and <>...</>.
-    // We treat the ambiguous cases above the same.
-    if (
-      typeof newChild === "object" &&
-      newChild !== null &&
-      newChild.type === REACT_FRAGMENT_TYPE &&
-      newChild.key === null
-    ) {
-      newChild = newChild.props.children;
-    }
+var getCurrentFiberStackAddendum$1 =
+  ReactDebugCurrentFiber.getCurrentFiberStackAddendum;
 
-    // Handle object types
-    var isObject = typeof newChild === "object" && newChild !== null;
+var didWarnAboutMaps = void 0;
+var didWarnAboutStringRefInStrictMode = void 0;
+var ownerHasKeyUseWarning = void 0;
+var ownerHasFunctionTypeWarning = void 0;
+var warnForMissingKey = function(child) {};
 
-    if (isObject) {
-      switch (newChild.$$typeof) {
-        case REACT_ELEMENT_TYPE:
-          return placeSingleChild(
-            reconcileSingleElement(
-              returnFiber,
-              currentFirstChild,
-              newChild,
-              expirationTime
-            )
-          );
-        case REACT_PORTAL_TYPE:
-          return placeSingleChild(
-            reconcileSinglePortal(
-              returnFiber,
-              currentFirstChild,
-              newChild,
-              expirationTime
-            )
-          );
-      }
-    }
+{
+  didWarnAboutMaps = false;
+  didWarnAboutStringRefInStrictMode = {};
 
-    if (typeof newChild === "string" || typeof newChild === "number") {
-      return placeSingleChild(
-        reconcileSingleTextNode(
-          returnFiber,
-          currentFirstChild,
-          "" + newChild,
-          expirationTime
-        )
-      );
-    }
+  /**
+   * Warn if there's no key explicitly set on dynamic arrays of children or
+   * object keys are not valid. This allows us to keep track of children between
+   * updates.
+   */
+  ownerHasKeyUseWarning = {};
+  ownerHasFunctionTypeWarning = {};
 
-    if (isArray$1(newChild)) {
-      return reconcileChildrenArray(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        expirationTime
-      );
+  warnForMissingKey = function(child) {
+    if (child === null || typeof child !== "object") {
+      return;
     }
-
-    if (getIteratorFn(newChild)) {
-      return reconcileChildrenIterator(
-        returnFiber,
-        currentFirstChild,
-        newChild,
-        expirationTime
-      );
+    if (!child._store || child._store.validated || child.key != null) {
+      return;
     }
+    invariant(
+      typeof child._store === "object",
+      "React Component in warnForMissingKey should have a _store. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+    child._store.validated = true;
 
-    if (isObject) {
-      throwOnInvalidObjectType(returnFiber, newChild);
+    var currentComponentErrorInfo =
+      "Each child in an array or iterator should have a unique " +
+      '"key" prop. See https://fb.me/react-warning-keys for ' +
+      "more information." +
+      (getCurrentFiberStackAddendum$1() || "");
+    if (ownerHasKeyUseWarning[currentComponentErrorInfo]) {
+      return;
     }
+    ownerHasKeyUseWarning[currentComponentErrorInfo] = true;
+
+    warning(
+      false,
+      "Each child in an array or iterator should have a unique " +
+        '"key" prop. See https://fb.me/react-warning-keys for ' +
+        "more information.%s",
+      getCurrentFiberStackAddendum$1()
+    );
+  };
+}
+
+var isArray$1 = Array.isArray;
 
+function coerceRef(returnFiber, current, element) {
+  var mixedRef = element.ref;
+  if (
+    mixedRef !== null &&
+    typeof mixedRef !== "function" &&
+    typeof mixedRef !== "object"
+  ) {
     {
-      if (typeof newChild === "function") {
-        warnOnFunctionType();
-      }
-    }
-    if (typeof newChild === "undefined") {
-      // If the new child is undefined, and the return fiber is a composite
-      // component, throw an error. If Fiber return types are disabled,
-      // we already threw above.
-      switch (returnFiber.tag) {
-        case ClassComponent: {
-          {
-            var instance = returnFiber.stateNode;
-            if (instance.render._isMockFunction) {
-              // We allow auto-mocks to proceed as if they're returning null.
-              break;
-            }
-          }
-        }
-        // Intentionally fall through to the next case, which handles both
-        // functions and classes
-        // eslint-disable-next-lined no-fallthrough
-        case FunctionalComponent: {
-          var Component = returnFiber.type;
-          invariant(
+      if (returnFiber.mode & StrictMode) {
+        var componentName = getComponentName(returnFiber) || "Component";
+        if (!didWarnAboutStringRefInStrictMode[componentName]) {
+          warning(
             false,
-            "%s(...): Nothing was returned from render. This usually means a " +
-              "return statement is missing. Or, to render nothing, " +
-              "return null.",
-            Component.displayName || Component.name || "Component"
+            'A string ref, "%s", has been found within a strict mode tree. ' +
+              "String refs are a source of potential bugs and should be avoided. " +
+              "We recommend using createRef() instead." +
+              "\n%s" +
+              "\n\nLearn more about using refs safely here:" +
+              "\nhttps://fb.me/react-strict-mode-string-ref",
+            mixedRef,
+            getStackAddendumByWorkInProgressFiber(returnFiber)
           );
+          didWarnAboutStringRefInStrictMode[componentName] = true;
         }
       }
     }
 
-    // Remaining cases are all treated as empty.
-    return deleteRemainingChildren(returnFiber, currentFirstChild);
+    if (element._owner) {
+      var owner = element._owner;
+      var inst = void 0;
+      if (owner) {
+        var ownerFiber = owner;
+        invariant(
+          ownerFiber.tag === ClassComponent,
+          "Stateless function components cannot have refs."
+        );
+        inst = ownerFiber.stateNode;
+      }
+      invariant(
+        inst,
+        "Missing owner for string ref %s. This error is likely caused by a " +
+          "bug in React. Please file an issue.",
+        mixedRef
+      );
+      var stringRef = "" + mixedRef;
+      // Check if previous string ref matches new string ref
+      if (
+        current !== null &&
+        current.ref !== null &&
+        current.ref._stringRef === stringRef
+      ) {
+        return current.ref;
+      }
+      var ref = function(value) {
+        var refs = inst.refs === emptyObject ? (inst.refs = {}) : inst.refs;
+        if (value === null) {
+          delete refs[stringRef];
+        } else {
+          refs[stringRef] = value;
+        }
+      };
+      ref._stringRef = stringRef;
+      return ref;
+    } else {
+      invariant(
+        typeof mixedRef === "string",
+        "Expected ref to be a function or a string."
+      );
+      invariant(
+        element._owner,
+        "Element ref was specified as a string (%s) but no owner was set. This could happen for one of" +
+          " the following reasons:\n" +
+          "1. You may be adding a ref to a functional component\n" +
+          "2. You may be adding a ref to a component that was not created inside a component's render method\n" +
+          "3. You have multiple copies of React loaded\n" +
+          "See https://fb.me/react-refs-must-have-owner for more information.",
+        mixedRef
+      );
+    }
   }
-
-  return reconcileChildFibers;
+  return mixedRef;
 }
 
-var reconcileChildFibers = ChildReconciler(true);
-var mountChildFibers = ChildReconciler(false);
+function throwOnInvalidObjectType(returnFiber, newChild) {
+  if (returnFiber.type !== "textarea") {
+    var addendum = "";
+    {
+      addendum =
+        " If you meant to render a collection of children, use an array " +
+        "instead." +
+        (getCurrentFiberStackAddendum$1() || "");
+    }
+    invariant(
+      false,
+      "Objects are not valid as a React child (found: %s).%s",
+      Object.prototype.toString.call(newChild) === "[object Object]"
+        ? "object with keys {" + Object.keys(newChild).join(", ") + "}"
+        : newChild,
+      addendum
+    );
+  }
+}
 
-function cloneChildFibers(current, workInProgress) {
-  invariant(
-    current === null || workInProgress.child === current.child,
-    "Resuming work not yet implemented."
-  );
+function warnOnFunctionType() {
+  var currentComponentErrorInfo =
+    "Functions are not valid as a React child. This may happen if " +
+    "you return a Component instead of <Component /> from render. " +
+    "Or maybe you meant to call this function rather than return it." +
+    (getCurrentFiberStackAddendum$1() || "");
 
-  if (workInProgress.child === null) {
+  if (ownerHasFunctionTypeWarning[currentComponentErrorInfo]) {
     return;
   }
+  ownerHasFunctionTypeWarning[currentComponentErrorInfo] = true;
 
-  var currentChild = workInProgress.child;
-  var newChild = createWorkInProgress(
-    currentChild,
-    currentChild.pendingProps,
-    currentChild.expirationTime
+  warning(
+    false,
+    "Functions are not valid as a React child. This may happen if " +
+      "you return a Component instead of <Component /> from render. " +
+      "Or maybe you meant to call this function rather than return it.%s",
+    getCurrentFiberStackAddendum$1() || ""
   );
-  workInProgress.child = newChild;
+}
 
-  newChild["return"] = workInProgress;
-  while (currentChild.sibling !== null) {
-    currentChild = currentChild.sibling;
-    newChild = newChild.sibling = createWorkInProgress(
-      currentChild,
-      currentChild.pendingProps,
-      currentChild.expirationTime
-    );
-    newChild["return"] = workInProgress;
+// This wrapper function exists because I expect to clone the code in each path
+// to be able to optimize each path individually by branching early. This needs
+// a compiler or we can do it manually. Helpers that don't need this branching
+// live outside of this function.
+function ChildReconciler(shouldTrackSideEffects) {
+  function deleteChild(returnFiber, childToDelete) {
+    if (!shouldTrackSideEffects) {
+      // Noop.
+      return;
+    }
+    // Deletions are added in reversed order so we add it to the front.
+    // At this point, the return fiber's effect list is empty except for
+    // deletions, so we can just append the deletion to the list. The remaining
+    // effects aren't added until the complete phase. Once we implement
+    // resuming, this may not be true.
+    var last = returnFiber.lastEffect;
+    if (last !== null) {
+      last.nextEffect = childToDelete;
+      returnFiber.lastEffect = childToDelete;
+    } else {
+      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+    }
+    childToDelete.nextEffect = null;
+    childToDelete.effectTag = Deletion;
   }
-  newChild.sibling = null;
-}
-
-var didWarnAboutBadClass = void 0;
-var didWarnAboutGetDerivedStateOnFunctionalComponent = void 0;
-var didWarnAboutStatelessRefs = void 0;
 
-{
-  didWarnAboutBadClass = {};
-  didWarnAboutGetDerivedStateOnFunctionalComponent = {};
-  didWarnAboutStatelessRefs = {};
-}
+  function deleteRemainingChildren(returnFiber, currentFirstChild) {
+    if (!shouldTrackSideEffects) {
+      // Noop.
+      return null;
+    }
 
-var ReactFiberBeginWork = function(
-  config,
-  hostContext,
-  legacyContext,
-  newContext,
-  hydrationContext,
-  scheduleWork,
-  computeExpirationForFiber
-) {
-  var shouldSetTextContent = config.shouldSetTextContent,
-    shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree;
-  var pushHostContext = hostContext.pushHostContext,
-    pushHostContainer = hostContext.pushHostContainer;
-  var pushProvider = newContext.pushProvider;
-  var getMaskedContext = legacyContext.getMaskedContext,
-    getUnmaskedContext = legacyContext.getUnmaskedContext,
-    hasLegacyContextChanged = legacyContext.hasContextChanged,
-    pushLegacyContextProvider = legacyContext.pushContextProvider,
-    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
-    invalidateContextProvider = legacyContext.invalidateContextProvider;
-  var enterHydrationState = hydrationContext.enterHydrationState,
-    resetHydrationState = hydrationContext.resetHydrationState,
-    tryToClaimNextHydratableInstance =
-      hydrationContext.tryToClaimNextHydratableInstance;
+    // TODO: For the shouldClone case, this could be micro-optimized a bit by
+    // assuming that after the first child we've already added everything.
+    var childToDelete = currentFirstChild;
+    while (childToDelete !== null) {
+      deleteChild(returnFiber, childToDelete);
+      childToDelete = childToDelete.sibling;
+    }
+    return null;
+  }
 
-  var _ReactFiberClassCompo = ReactFiberClassComponent(
-      legacyContext,
-      scheduleWork,
-      computeExpirationForFiber,
-      memoizeProps,
-      memoizeState
-    ),
-    adoptClassInstance = _ReactFiberClassCompo.adoptClassInstance,
-    callGetDerivedStateFromProps =
-      _ReactFiberClassCompo.callGetDerivedStateFromProps,
-    constructClassInstance = _ReactFiberClassCompo.constructClassInstance,
-    mountClassInstance = _ReactFiberClassCompo.mountClassInstance,
-    resumeMountClassInstance = _ReactFiberClassCompo.resumeMountClassInstance,
-    updateClassInstance = _ReactFiberClassCompo.updateClassInstance;
+  function mapRemainingChildren(returnFiber, currentFirstChild) {
+    // Add the remaining children to a temporary map so that we can find them by
+    // keys quickly. Implicit (null) keys get added to this set with their index
+    var existingChildren = new Map();
 
-  // TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
+    var existingChild = currentFirstChild;
+    while (existingChild !== null) {
+      if (existingChild.key !== null) {
+        existingChildren.set(existingChild.key, existingChild);
+      } else {
+        existingChildren.set(existingChild.index, existingChild);
+      }
+      existingChild = existingChild.sibling;
+    }
+    return existingChildren;
+  }
 
-  function reconcileChildren(current, workInProgress, nextChildren) {
-    reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      nextChildren,
-      workInProgress.expirationTime
-    );
+  function useFiber(fiber, pendingProps, expirationTime) {
+    // We currently set sibling to null and index to 0 here because it is easy
+    // to forget to do before returning it. E.g. for the single child case.
+    var clone = createWorkInProgress(fiber, pendingProps, expirationTime);
+    clone.index = 0;
+    clone.sibling = null;
+    return clone;
   }
 
-  function reconcileChildrenAtExpirationTime(
-    current,
-    workInProgress,
-    nextChildren,
-    renderExpirationTime
-  ) {
-    if (current === null) {
-      // If this is a fresh new component that hasn't been rendered yet, we
-      // won't update its child set by applying minimal side-effects. Instead,
-      // we will add them all to the child before it gets rendered. That means
-      // we can optimize this reconciliation pass by not tracking side-effects.
-      workInProgress.child = mountChildFibers(
-        workInProgress,
-        null,
-        nextChildren,
-        renderExpirationTime
-      );
+  function placeChild(newFiber, lastPlacedIndex, newIndex) {
+    newFiber.index = newIndex;
+    if (!shouldTrackSideEffects) {
+      // Noop.
+      return lastPlacedIndex;
+    }
+    var current = newFiber.alternate;
+    if (current !== null) {
+      var oldIndex = current.index;
+      if (oldIndex < lastPlacedIndex) {
+        // This is a move.
+        newFiber.effectTag = Placement;
+        return lastPlacedIndex;
+      } else {
+        // This item can stay in place.
+        return oldIndex;
+      }
     } else {
-      // If the current child is the same as the work in progress, it means that
-      // we haven't yet started any work on these children. Therefore, we use
-      // the clone algorithm to create a copy of all the current children.
-
-      // If we had any progressed work already, that is invalid at this point so
-      // let's throw it out.
-      workInProgress.child = reconcileChildFibers(
-        workInProgress,
-        current.child,
-        nextChildren,
-        renderExpirationTime
-      );
+      // This is an insertion.
+      newFiber.effectTag = Placement;
+      return lastPlacedIndex;
     }
   }
 
-  function updateForwardRef(current, workInProgress) {
-    var render = workInProgress.type.render;
-    var nextChildren = render(workInProgress.pendingProps, workInProgress.ref);
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextChildren);
-    return workInProgress.child;
+  function placeSingleChild(newFiber) {
+    // This is simpler for the single child case. We only need to do a
+    // placement for inserting new children.
+    if (shouldTrackSideEffects && newFiber.alternate === null) {
+      newFiber.effectTag = Placement;
+    }
+    return newFiber;
   }
 
-  function updateFragment(current, workInProgress) {
-    var nextChildren = workInProgress.pendingProps;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (workInProgress.memoizedProps === nextChildren) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  function updateTextNode(returnFiber, current, textContent, expirationTime) {
+    if (current === null || current.tag !== HostText) {
+      // Insert
+      var created = createFiberFromText(
+        textContent,
+        returnFiber.mode,
+        expirationTime
+      );
+      created["return"] = returnFiber;
+      return created;
+    } else {
+      // Update
+      var existing = useFiber(current, textContent, expirationTime);
+      existing["return"] = returnFiber;
+      return existing;
     }
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextChildren);
-    return workInProgress.child;
   }
 
-  function updateMode(current, workInProgress) {
-    var nextChildren = workInProgress.pendingProps.children;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (
-      nextChildren === null ||
-      workInProgress.memoizedProps === nextChildren
-    ) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+  function updateElement(returnFiber, current, element, expirationTime) {
+    if (current !== null && current.type === element.type) {
+      // Move based on index
+      var existing = useFiber(current, element.props, expirationTime);
+      existing.ref = coerceRef(returnFiber, current, element);
+      existing["return"] = returnFiber;
+      {
+        existing._debugSource = element._source;
+        existing._debugOwner = element._owner;
+      }
+      return existing;
+    } else {
+      // Insert
+      var created = createFiberFromElement(
+        element,
+        returnFiber.mode,
+        expirationTime
+      );
+      created.ref = coerceRef(returnFiber, current, element);
+      created["return"] = returnFiber;
+      return created;
     }
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextChildren);
-    return workInProgress.child;
   }
 
-  function markRef(current, workInProgress) {
-    var ref = workInProgress.ref;
+  function updatePortal(returnFiber, current, portal, expirationTime) {
     if (
-      (current === null && ref !== null) ||
-      (current !== null && current.ref !== ref)
+      current === null ||
+      current.tag !== HostPortal ||
+      current.stateNode.containerInfo !== portal.containerInfo ||
+      current.stateNode.implementation !== portal.implementation
     ) {
-      // Schedule a Ref effect
-      workInProgress.effectTag |= Ref;
+      // Insert
+      var created = createFiberFromPortal(
+        portal,
+        returnFiber.mode,
+        expirationTime
+      );
+      created["return"] = returnFiber;
+      return created;
+    } else {
+      // Update
+      var existing = useFiber(current, portal.children || [], expirationTime);
+      existing["return"] = returnFiber;
+      return existing;
     }
   }
 
-  function updateFunctionalComponent(current, workInProgress) {
-    var fn = workInProgress.type;
-    var nextProps = workInProgress.pendingProps;
-
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
+  function updateFragment(returnFiber, current, fragment, expirationTime, key) {
+    if (current === null || current.tag !== Fragment) {
+      // Insert
+      var created = createFiberFromFragment(
+        fragment,
+        returnFiber.mode,
+        expirationTime,
+        key
+      );
+      created["return"] = returnFiber;
+      return created;
     } else {
-      if (workInProgress.memoizedProps === nextProps) {
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
-      }
-      // TODO: consider bringing fn.shouldComponentUpdate() back.
-      // It used to be here.
+      // Update
+      var existing = useFiber(current, fragment, expirationTime);
+      existing["return"] = returnFiber;
+      return existing;
     }
+  }
 
-    var unmaskedContext = getUnmaskedContext(workInProgress);
-    var context = getMaskedContext(workInProgress, unmaskedContext);
+  function createChild(returnFiber, newChild, expirationTime) {
+    if (typeof newChild === "string" || typeof newChild === "number") {
+      // Text nodes don't have keys. If the previous node is implicitly keyed
+      // we can continue to replace it without aborting even if it is not a text
+      // node.
+      var created = createFiberFromText(
+        "" + newChild,
+        returnFiber.mode,
+        expirationTime
+      );
+      created["return"] = returnFiber;
+      return created;
+    }
 
-    var nextChildren = void 0;
+    if (typeof newChild === "object" && newChild !== null) {
+      switch (newChild.$$typeof) {
+        case REACT_ELEMENT_TYPE: {
+          var _created = createFiberFromElement(
+            newChild,
+            returnFiber.mode,
+            expirationTime
+          );
+          _created.ref = coerceRef(returnFiber, null, newChild);
+          _created["return"] = returnFiber;
+          return _created;
+        }
+        case REACT_PORTAL_TYPE: {
+          var _created2 = createFiberFromPortal(
+            newChild,
+            returnFiber.mode,
+            expirationTime
+          );
+          _created2["return"] = returnFiber;
+          return _created2;
+        }
+      }
+
+      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+        var _created3 = createFiberFromFragment(
+          newChild,
+          returnFiber.mode,
+          expirationTime,
+          null
+        );
+        _created3["return"] = returnFiber;
+        return _created3;
+      }
+
+      throwOnInvalidObjectType(returnFiber, newChild);
+    }
 
     {
-      ReactCurrentOwner.current = workInProgress;
-      ReactDebugCurrentFiber.setCurrentPhase("render");
-      nextChildren = fn(nextProps, context);
-      ReactDebugCurrentFiber.setCurrentPhase(null);
+      if (typeof newChild === "function") {
+        warnOnFunctionType();
+      }
     }
-    // React DevTools reads this flag.
-    workInProgress.effectTag |= PerformedWork;
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextProps);
-    return workInProgress.child;
+
+    return null;
   }
 
-  function updateClassComponent(current, workInProgress, renderExpirationTime) {
-    // Push context providers early to prevent context stack mismatches.
-    // During mounting we don't know the child context yet as the instance doesn't exist.
-    // We will invalidate the child context in finishClassComponent() right after rendering.
-    var hasContext = pushLegacyContextProvider(workInProgress);
-    var shouldUpdate = void 0;
-    if (current === null) {
-      if (workInProgress.stateNode === null) {
-        // In the initial pass we might need to construct the instance.
-        constructClassInstance(workInProgress, workInProgress.pendingProps);
-        mountClassInstance(workInProgress, renderExpirationTime);
+  function updateSlot(returnFiber, oldFiber, newChild, expirationTime) {
+    // Update the fiber if the keys match, otherwise return null.
 
-        shouldUpdate = true;
-      } else {
-        // In a resume, we'll already have an instance we can reuse.
-        shouldUpdate = resumeMountClassInstance(
-          workInProgress,
-          renderExpirationTime
-        );
+    var key = oldFiber !== null ? oldFiber.key : null;
+
+    if (typeof newChild === "string" || typeof newChild === "number") {
+      // Text nodes don't have keys. If the previous node is implicitly keyed
+      // we can continue to replace it without aborting even if it is not a text
+      // node.
+      if (key !== null) {
+        return null;
       }
-    } else {
-      shouldUpdate = updateClassInstance(
-        current,
-        workInProgress,
-        renderExpirationTime
+      return updateTextNode(
+        returnFiber,
+        oldFiber,
+        "" + newChild,
+        expirationTime
       );
     }
 
-    // We processed the update queue inside updateClassInstance. It may have
-    // included some errors that were dispatched during the commit phase.
-    // TODO: Refactor class components so this is less awkward.
-    var didCaptureError = false;
-    var updateQueue = workInProgress.updateQueue;
-    if (updateQueue !== null && updateQueue.capturedValues !== null) {
-      shouldUpdate = true;
-      didCaptureError = true;
-    }
-    return finishClassComponent(
-      current,
-      workInProgress,
-      shouldUpdate,
-      hasContext,
-      didCaptureError,
-      renderExpirationTime
-    );
-  }
+    if (typeof newChild === "object" && newChild !== null) {
+      switch (newChild.$$typeof) {
+        case REACT_ELEMENT_TYPE: {
+          if (newChild.key === key) {
+            if (newChild.type === REACT_FRAGMENT_TYPE) {
+              return updateFragment(
+                returnFiber,
+                oldFiber,
+                newChild.props.children,
+                expirationTime,
+                key
+              );
+            }
+            return updateElement(
+              returnFiber,
+              oldFiber,
+              newChild,
+              expirationTime
+            );
+          } else {
+            return null;
+          }
+        }
+        case REACT_PORTAL_TYPE: {
+          if (newChild.key === key) {
+            return updatePortal(
+              returnFiber,
+              oldFiber,
+              newChild,
+              expirationTime
+            );
+          } else {
+            return null;
+          }
+        }
+      }
 
-  function finishClassComponent(
-    current,
-    workInProgress,
-    shouldUpdate,
-    hasContext,
-    didCaptureError,
-    renderExpirationTime
-  ) {
-    // Refs should update even if shouldComponentUpdate returns false
-    markRef(current, workInProgress);
+      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+        if (key !== null) {
+          return null;
+        }
 
-    if (!shouldUpdate && !didCaptureError) {
-      // Context providers should defer to sCU for rendering
-      if (hasContext) {
-        invalidateContextProvider(workInProgress, false);
+        return updateFragment(
+          returnFiber,
+          oldFiber,
+          newChild,
+          expirationTime,
+          null
+        );
       }
 
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      throwOnInvalidObjectType(returnFiber, newChild);
     }
 
-    var ctor = workInProgress.type;
-    var instance = workInProgress.stateNode;
-
-    // Rerender
-    ReactCurrentOwner.current = workInProgress;
-    var nextChildren = void 0;
-    if (
-      didCaptureError &&
-      (!enableGetDerivedStateFromCatch ||
-        typeof ctor.getDerivedStateFromCatch !== "function")
-    ) {
-      // If we captured an error, but getDerivedStateFrom catch is not defined,
-      // unmount all the children. componentDidCatch will schedule an update to
-      // re-render a fallback. This is temporary until we migrate everyone to
-      // the new API.
-      // TODO: Warn in a future release.
-      nextChildren = null;
-    } else {
-      {
-        ReactDebugCurrentFiber.setCurrentPhase("render");
-        nextChildren = instance.render();
-        if (
-          debugRenderPhaseSideEffects ||
-          (debugRenderPhaseSideEffectsForStrictMode &&
-            workInProgress.mode & StrictMode)
-        ) {
-          instance.render();
-        }
-        ReactDebugCurrentFiber.setCurrentPhase(null);
+    {
+      if (typeof newChild === "function") {
+        warnOnFunctionType();
       }
     }
 
-    // React DevTools reads this flag.
-    workInProgress.effectTag |= PerformedWork;
-    if (didCaptureError) {
-      // If we're recovering from an error, reconcile twice: first to delete
-      // all the existing children.
-      reconcileChildrenAtExpirationTime(
-        current,
-        workInProgress,
-        null,
-        renderExpirationTime
-      );
-      workInProgress.child = null;
-      // Now we can continue reconciling like normal. This has the effect of
-      // remounting all children regardless of whether their their
-      // identity matches.
-    }
-    reconcileChildrenAtExpirationTime(
-      current,
-      workInProgress,
-      nextChildren,
-      renderExpirationTime
-    );
-    // Memoize props and state using the values we just used to render.
-    // TODO: Restructure so we never read values from the instance.
-    memoizeState(workInProgress, instance.state);
-    memoizeProps(workInProgress, instance.props);
-
-    // The context might have changed so we need to recalculate it.
-    if (hasContext) {
-      invalidateContextProvider(workInProgress, true);
-    }
-
-    return workInProgress.child;
+    return null;
   }
 
-  function pushHostRootContext(workInProgress) {
-    var root = workInProgress.stateNode;
-    if (root.pendingContext) {
-      pushTopLevelContextObject(
-        workInProgress,
-        root.pendingContext,
-        root.pendingContext !== root.context
+  function updateFromMap(
+    existingChildren,
+    returnFiber,
+    newIdx,
+    newChild,
+    expirationTime
+  ) {
+    if (typeof newChild === "string" || typeof newChild === "number") {
+      // Text nodes don't have keys, so we neither have to check the old nor
+      // new node for the key. If both are text nodes, they match.
+      var matchedFiber = existingChildren.get(newIdx) || null;
+      return updateTextNode(
+        returnFiber,
+        matchedFiber,
+        "" + newChild,
+        expirationTime
       );
-    } else if (root.context) {
-      // Should always be set
-      pushTopLevelContextObject(workInProgress, root.context, false);
     }
-    pushHostContainer(workInProgress, root.containerInfo);
-  }
-
-  function updateHostRoot(current, workInProgress, renderExpirationTime) {
-    pushHostRootContext(workInProgress);
-    var updateQueue = workInProgress.updateQueue;
-    if (updateQueue !== null) {
-      var prevState = workInProgress.memoizedState;
-      var state = processUpdateQueue(
-        current,
-        workInProgress,
-        updateQueue,
-        null,
-        null,
-        renderExpirationTime
-      );
-      memoizeState(workInProgress, state);
-      updateQueue = workInProgress.updateQueue;
 
-      var element = void 0;
-      if (updateQueue !== null && updateQueue.capturedValues !== null) {
-        // There's an uncaught error. Unmount the whole root.
-        element = null;
-      } else if (prevState === state) {
-        // If the state is the same as before, that's a bailout because we had
-        // no work that expires at this time.
-        resetHydrationState();
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
-      } else {
-        element = state.element;
+    if (typeof newChild === "object" && newChild !== null) {
+      switch (newChild.$$typeof) {
+        case REACT_ELEMENT_TYPE: {
+          var _matchedFiber =
+            existingChildren.get(
+              newChild.key === null ? newIdx : newChild.key
+            ) || null;
+          if (newChild.type === REACT_FRAGMENT_TYPE) {
+            return updateFragment(
+              returnFiber,
+              _matchedFiber,
+              newChild.props.children,
+              expirationTime,
+              newChild.key
+            );
+          }
+          return updateElement(
+            returnFiber,
+            _matchedFiber,
+            newChild,
+            expirationTime
+          );
+        }
+        case REACT_PORTAL_TYPE: {
+          var _matchedFiber2 =
+            existingChildren.get(
+              newChild.key === null ? newIdx : newChild.key
+            ) || null;
+          return updatePortal(
+            returnFiber,
+            _matchedFiber2,
+            newChild,
+            expirationTime
+          );
+        }
       }
-      var root = workInProgress.stateNode;
-      if (
-        (current === null || current.child === null) &&
-        root.hydrate &&
-        enterHydrationState(workInProgress)
-      ) {
-        // If we don't have any current children this might be the first pass.
-        // We always try to hydrate. If this isn't a hydration pass there won't
-        // be any children to hydrate which is effectively the same thing as
-        // not hydrating.
-
-        // This is a bit of a hack. We track the host root as a placement to
-        // know that we're currently in a mounting state. That way isMounted
-        // works as expected. We must reset this before committing.
-        // TODO: Delete this when we delete isMounted and findDOMNode.
-        workInProgress.effectTag |= Placement;
 
-        // Ensure that children mount into this root without tracking
-        // side-effects. This ensures that we don't store Placement effects on
-        // nodes that will be hydrated.
-        workInProgress.child = mountChildFibers(
-          workInProgress,
-          null,
-          element,
-          renderExpirationTime
+      if (isArray$1(newChild) || getIteratorFn(newChild)) {
+        var _matchedFiber3 = existingChildren.get(newIdx) || null;
+        return updateFragment(
+          returnFiber,
+          _matchedFiber3,
+          newChild,
+          expirationTime,
+          null
         );
-      } else {
-        // Otherwise reset hydration state in case we aborted and resumed another
-        // root.
-        resetHydrationState();
-        reconcileChildren(current, workInProgress, element);
       }
-      memoizeState(workInProgress, state);
-      return workInProgress.child;
-    }
-    resetHydrationState();
-    // If there is no update queue, that's a bailout because the root has no props.
-    return bailoutOnAlreadyFinishedWork(current, workInProgress);
-  }
 
-  function updateHostComponent(current, workInProgress, renderExpirationTime) {
-    pushHostContext(workInProgress);
+      throwOnInvalidObjectType(returnFiber, newChild);
+    }
 
-    if (current === null) {
-      tryToClaimNextHydratableInstance(workInProgress);
+    {
+      if (typeof newChild === "function") {
+        warnOnFunctionType();
+      }
     }
 
-    var type = workInProgress.type;
-    var memoizedProps = workInProgress.memoizedProps;
-    var nextProps = workInProgress.pendingProps;
-    var prevProps = current !== null ? current.memoizedProps : null;
+    return null;
+  }
 
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (memoizedProps === nextProps) {
-      var isHidden =
-        workInProgress.mode & AsyncMode &&
-        shouldDeprioritizeSubtree(type, nextProps);
-      if (isHidden) {
-        // Before bailing out, make sure we've deprioritized a hidden component.
-        workInProgress.expirationTime = Never;
+  /**
+   * Warns if there is a duplicate or missing key
+   */
+  function warnOnInvalidKey(child, knownKeys) {
+    {
+      if (typeof child !== "object" || child === null) {
+        return knownKeys;
       }
-      if (!isHidden || renderExpirationTime !== Never) {
-        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      switch (child.$$typeof) {
+        case REACT_ELEMENT_TYPE:
+        case REACT_PORTAL_TYPE:
+          warnForMissingKey(child);
+          var key = child.key;
+          if (typeof key !== "string") {
+            break;
+          }
+          if (knownKeys === null) {
+            knownKeys = new Set();
+            knownKeys.add(key);
+            break;
+          }
+          if (!knownKeys.has(key)) {
+            knownKeys.add(key);
+            break;
+          }
+          warning(
+            false,
+            "Encountered two children with the same key, `%s`. " +
+              "Keys should be unique so that components maintain their identity " +
+              "across updates. Non-unique keys may cause children to be " +
+              "duplicated and/or omitted — the behavior is unsupported and " +
+              "could change in a future version.%s",
+            key,
+            getCurrentFiberStackAddendum$1()
+          );
+          break;
+        default:
+          break;
       }
-      // If we're rendering a hidden node at hidden priority, don't bailout. The
-      // parent is complete, but the children may not be.
     }
+    return knownKeys;
+  }
 
-    var nextChildren = nextProps.children;
-    var isDirectTextChild = shouldSetTextContent(type, nextProps);
+  function reconcileChildrenArray(
+    returnFiber,
+    currentFirstChild,
+    newChildren,
+    expirationTime
+  ) {
+    // This algorithm can't optimize by searching from boths ends since we
+    // don't have backpointers on fibers. I'm trying to see how far we can get
+    // with that model. If it ends up not being worth the tradeoffs, we can
+    // add it later.
 
-    if (isDirectTextChild) {
-      // We special case a direct text child of a host node. This is a common
-      // case. We won't handle it as a reified child. We will instead handle
-      // this in the host environment that also have access to this prop. That
-      // avoids allocating another HostText fiber and traversing it.
-      nextChildren = null;
-    } else if (prevProps && shouldSetTextContent(type, prevProps)) {
-      // If we're switching from a direct text child to a normal child, or to
-      // empty, we need to schedule the text content to be reset.
-      workInProgress.effectTag |= ContentReset;
-    }
+    // Even with a two ended optimization, we'd want to optimize for the case
+    // where there are few changes and brute force the comparison instead of
+    // going for the Map. It'd like to explore hitting that path first in
+    // forward-only mode and only go for the Map once we notice that we need
+    // lots of look ahead. This doesn't handle reversal as well as two ended
+    // search but that's unusual. Besides, for the two ended optimization to
+    // work on Iterables, we'd need to copy the whole set.
 
-    markRef(current, workInProgress);
+    // In this first iteration, we'll just live with hitting the bad case
+    // (adding everything to a Map) in for every insert/move.
 
-    // Check the host config to see if the children are offscreen/hidden.
-    if (
-      renderExpirationTime !== Never &&
-      workInProgress.mode & AsyncMode &&
-      shouldDeprioritizeSubtree(type, nextProps)
-    ) {
-      // Down-prioritize the children.
-      workInProgress.expirationTime = Never;
-      // Bailout and come back to this fiber later.
-      workInProgress.memoizedProps = nextProps;
-      return null;
-    }
-
-    reconcileChildren(current, workInProgress, nextChildren);
-    memoizeProps(workInProgress, nextProps);
-    return workInProgress.child;
-  }
+    // If you change this code, also update reconcileChildrenIterator() which
+    // uses the same algorithm.
 
-  function updateHostText(current, workInProgress) {
-    if (current === null) {
-      tryToClaimNextHydratableInstance(workInProgress);
+    {
+      // First, validate keys.
+      var knownKeys = null;
+      for (var i = 0; i < newChildren.length; i++) {
+        var child = newChildren[i];
+        knownKeys = warnOnInvalidKey(child, knownKeys);
+      }
     }
-    var nextProps = workInProgress.pendingProps;
-    memoizeProps(workInProgress, nextProps);
-    // Nothing to do here. This is terminal. We'll do the completion step
-    // immediately after.
-    return null;
-  }
-
-  function mountIndeterminateComponent(
-    current,
-    workInProgress,
-    renderExpirationTime
-  ) {
-    invariant(
-      current === null,
-      "An indeterminate component should never have mounted. This error is " +
-        "likely caused by a bug in React. Please file an issue."
-    );
-    var fn = workInProgress.type;
-    var props = workInProgress.pendingProps;
-    var unmaskedContext = getUnmaskedContext(workInProgress);
-    var context = getMaskedContext(workInProgress, unmaskedContext);
-
-    var value = void 0;
 
-    {
-      if (fn.prototype && typeof fn.prototype.render === "function") {
-        var componentName = getComponentName(workInProgress) || "Unknown";
+    var resultingFirstChild = null;
+    var previousNewFiber = null;
 
-        if (!didWarnAboutBadClass[componentName]) {
-          warning(
-            false,
-            "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
-              "This is likely to cause errors. Change %s to extend React.Component instead.",
-            componentName,
-            componentName
-          );
-          didWarnAboutBadClass[componentName] = true;
+    var oldFiber = currentFirstChild;
+    var lastPlacedIndex = 0;
+    var newIdx = 0;
+    var nextOldFiber = null;
+    for (; oldFiber !== null && newIdx < newChildren.length; newIdx++) {
+      if (oldFiber.index > newIdx) {
+        nextOldFiber = oldFiber;
+        oldFiber = null;
+      } else {
+        nextOldFiber = oldFiber.sibling;
+      }
+      var newFiber = updateSlot(
+        returnFiber,
+        oldFiber,
+        newChildren[newIdx],
+        expirationTime
+      );
+      if (newFiber === null) {
+        // TODO: This breaks on empty slots like null children. That's
+        // unfortunate because it triggers the slow path all the time. We need
+        // a better way to communicate whether this was a miss or null,
+        // boolean, undefined, etc.
+        if (oldFiber === null) {
+          oldFiber = nextOldFiber;
         }
+        break;
       }
-      ReactCurrentOwner.current = workInProgress;
-      value = fn(props, context);
+      if (shouldTrackSideEffects) {
+        if (oldFiber && newFiber.alternate === null) {
+          // We matched the slot, but we didn't reuse the existing fiber, so we
+          // need to delete the existing child.
+          deleteChild(returnFiber, oldFiber);
+        }
+      }
+      lastPlacedIndex = placeChild(newFiber, lastPlacedIndex, newIdx);
+      if (previousNewFiber === null) {
+        // TODO: Move out of the loop. This only happens for the first run.
+        resultingFirstChild = newFiber;
+      } else {
+        // TODO: Defer siblings if we're not at the right index for this slot.
+        // I.e. if we had null values before, then we want to defer this
+        // for each null value. However, we also don't want to call updateSlot
+        // with the previous one.
+        previousNewFiber.sibling = newFiber;
+      }
+      previousNewFiber = newFiber;
+      oldFiber = nextOldFiber;
     }
-    // React DevTools reads this flag.
-    workInProgress.effectTag |= PerformedWork;
-
-    if (
-      typeof value === "object" &&
-      value !== null &&
-      typeof value.render === "function" &&
-      value.$$typeof === undefined
-    ) {
-      var Component = workInProgress.type;
-
-      // Proceed under the assumption that this is a class instance
-      workInProgress.tag = ClassComponent;
 
-      workInProgress.memoizedState =
-        value.state !== null && value.state !== undefined ? value.state : null;
+    if (newIdx === newChildren.length) {
+      // We've reached the end of the new children. We can delete the rest.
+      deleteRemainingChildren(returnFiber, oldFiber);
+      return resultingFirstChild;
+    }
 
-      if (typeof Component.getDerivedStateFromProps === "function") {
-        var partialState = callGetDerivedStateFromProps(
-          workInProgress,
-          value,
-          props,
-          workInProgress.memoizedState
+    if (oldFiber === null) {
+      // If we don't have any more existing children we can choose a fast path
+      // since the rest will all be insertions.
+      for (; newIdx < newChildren.length; newIdx++) {
+        var _newFiber = createChild(
+          returnFiber,
+          newChildren[newIdx],
+          expirationTime
         );
-
-        if (partialState !== null && partialState !== undefined) {
-          workInProgress.memoizedState = Object.assign(
-            {},
-            workInProgress.memoizedState,
-            partialState
-          );
+        if (!_newFiber) {
+          continue;
+        }
+        lastPlacedIndex = placeChild(_newFiber, lastPlacedIndex, newIdx);
+        if (previousNewFiber === null) {
+          // TODO: Move out of the loop. This only happens for the first run.
+          resultingFirstChild = _newFiber;
+        } else {
+          previousNewFiber.sibling = _newFiber;
         }
+        previousNewFiber = _newFiber;
       }
+      return resultingFirstChild;
+    }
 
-      // Push context providers early to prevent context stack mismatches.
-      // During mounting we don't know the child context yet as the instance doesn't exist.
-      // We will invalidate the child context in finishClassComponent() right after rendering.
-      var hasContext = pushLegacyContextProvider(workInProgress);
-      adoptClassInstance(workInProgress, value);
-      mountClassInstance(workInProgress, renderExpirationTime);
-      return finishClassComponent(
-        current,
-        workInProgress,
-        true,
-        hasContext,
-        false,
-        renderExpirationTime
-      );
-    } else {
-      // Proceed under the assumption that this is a functional component
-      workInProgress.tag = FunctionalComponent;
-      {
-        var _Component = workInProgress.type;
-
-        if (_Component) {
-          !!_Component.childContextTypes
-            ? warning(
-                false,
-                "%s(...): childContextTypes cannot be defined on a functional component.",
-                _Component.displayName || _Component.name || "Component"
-              )
-            : void 0;
-        }
-        if (workInProgress.ref !== null) {
-          var info = "";
-          var ownerName = ReactDebugCurrentFiber.getCurrentFiberOwnerName();
-          if (ownerName) {
-            info += "\n\nCheck the render method of `" + ownerName + "`.";
-          }
+    // Add all children to a key map for quick lookups.
+    var existingChildren = mapRemainingChildren(returnFiber, oldFiber);
 
-          var warningKey = ownerName || workInProgress._debugID || "";
-          var debugSource = workInProgress._debugSource;
-          if (debugSource) {
-            warningKey = debugSource.fileName + ":" + debugSource.lineNumber;
-          }
-          if (!didWarnAboutStatelessRefs[warningKey]) {
-            didWarnAboutStatelessRefs[warningKey] = true;
-            warning(
-              false,
-              "Stateless function components cannot be given refs. " +
-                "Attempts to access this ref will fail.%s%s",
-              info,
-              ReactDebugCurrentFiber.getCurrentFiberStackAddendum()
+    // Keep scanning and use the map to restore deleted items as moves.
+    for (; newIdx < newChildren.length; newIdx++) {
+      var _newFiber2 = updateFromMap(
+        existingChildren,
+        returnFiber,
+        newIdx,
+        newChildren[newIdx],
+        expirationTime
+      );
+      if (_newFiber2) {
+        if (shouldTrackSideEffects) {
+          if (_newFiber2.alternate !== null) {
+            // The new fiber is a work in progress, but if there exists a
+            // current, that means that we reused the fiber. We need to delete
+            // it from the child list so that we don't add it to the deletion
+            // list.
+            existingChildren["delete"](
+              _newFiber2.key === null ? newIdx : _newFiber2.key
             );
           }
         }
-
-        if (typeof fn.getDerivedStateFromProps === "function") {
-          var _componentName = getComponentName(workInProgress) || "Unknown";
-
-          if (
-            !didWarnAboutGetDerivedStateOnFunctionalComponent[_componentName]
-          ) {
-            warning(
-              false,
-              "%s: Stateless functional components do not support getDerivedStateFromProps.",
-              _componentName
-            );
-            didWarnAboutGetDerivedStateOnFunctionalComponent[
-              _componentName
-            ] = true;
-          }
+        lastPlacedIndex = placeChild(_newFiber2, lastPlacedIndex, newIdx);
+        if (previousNewFiber === null) {
+          resultingFirstChild = _newFiber2;
+        } else {
+          previousNewFiber.sibling = _newFiber2;
         }
+        previousNewFiber = _newFiber2;
       }
-      reconcileChildren(current, workInProgress, value);
-      memoizeProps(workInProgress, props);
-      return workInProgress.child;
     }
-  }
 
-  function updateCallComponent(current, workInProgress, renderExpirationTime) {
-    var nextProps = workInProgress.pendingProps;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (workInProgress.memoizedProps === nextProps) {
-      nextProps = workInProgress.memoizedProps;
-      // TODO: When bailing out, we might need to return the stateNode instead
-      // of the child. To check it for work.
-      // return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
-
-    var nextChildren = nextProps.children;
-
-    // The following is a fork of reconcileChildrenAtExpirationTime but using
-    // stateNode to store the child.
-    if (current === null) {
-      workInProgress.stateNode = mountChildFibers(
-        workInProgress,
-        workInProgress.stateNode,
-        nextChildren,
-        renderExpirationTime
-      );
-    } else {
-      workInProgress.stateNode = reconcileChildFibers(
-        workInProgress,
-        current.stateNode,
-        nextChildren,
-        renderExpirationTime
-      );
+    if (shouldTrackSideEffects) {
+      // Any existing children that weren't consumed above were deleted. We need
+      // to add them to the deletion list.
+      existingChildren.forEach(function(child) {
+        return deleteChild(returnFiber, child);
+      });
     }
 
-    memoizeProps(workInProgress, nextProps);
-    // This doesn't take arbitrary time so we could synchronously just begin
-    // eagerly do the work of workInProgress.child as an optimization.
-    return workInProgress.stateNode;
+    return resultingFirstChild;
   }
 
-  function updatePortalComponent(
-    current,
-    workInProgress,
-    renderExpirationTime
+  function reconcileChildrenIterator(
+    returnFiber,
+    currentFirstChild,
+    newChildrenIterable,
+    expirationTime
   ) {
-    pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
-    var nextChildren = workInProgress.pendingProps;
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (workInProgress.memoizedProps === nextChildren) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
+    // This is the same implementation as reconcileChildrenArray(),
+    // but using the iterator instead.
 
-    if (current === null) {
-      // Portals are special because we don't append the children during mount
-      // but at commit. Therefore we need to track insertions which the normal
-      // flow doesn't do during mount. This doesn't happen at the root because
-      // the root always starts with a "current" with a null child.
-      // TODO: Consider unifying this with how the root works.
-      workInProgress.child = reconcileChildFibers(
-        workInProgress,
-        null,
-        nextChildren,
-        renderExpirationTime
-      );
-      memoizeProps(workInProgress, nextChildren);
-    } else {
-      reconcileChildren(current, workInProgress, nextChildren);
-      memoizeProps(workInProgress, nextChildren);
-    }
-    return workInProgress.child;
-  }
+    var iteratorFn = getIteratorFn(newChildrenIterable);
+    invariant(
+      typeof iteratorFn === "function",
+      "An object is not an iterable. This error is likely caused by a bug in " +
+        "React. Please file an issue."
+    );
 
-  function propagateContextChange(
-    workInProgress,
-    context,
-    changedBits,
-    renderExpirationTime
-  ) {
-    var fiber = workInProgress.child;
-    if (fiber !== null) {
-      // Set the return pointer of the child to the work-in-progress fiber.
-      fiber["return"] = workInProgress;
-    }
-    while (fiber !== null) {
-      var nextFiber = void 0;
-      // Visit this fiber.
-      switch (fiber.tag) {
-        case ContextConsumer:
-          // Check if the context matches.
-          var observedBits = fiber.stateNode | 0;
-          if (fiber.type === context && (observedBits & changedBits) !== 0) {
-            // Update the expiration time of all the ancestors, including
-            // the alternates.
-            var node = fiber;
-            while (node !== null) {
-              var alternate = node.alternate;
-              if (
-                node.expirationTime === NoWork ||
-                node.expirationTime > renderExpirationTime
-              ) {
-                node.expirationTime = renderExpirationTime;
-                if (
-                  alternate !== null &&
-                  (alternate.expirationTime === NoWork ||
-                    alternate.expirationTime > renderExpirationTime)
-                ) {
-                  alternate.expirationTime = renderExpirationTime;
-                }
-              } else if (
-                alternate !== null &&
-                (alternate.expirationTime === NoWork ||
-                  alternate.expirationTime > renderExpirationTime)
-              ) {
-                alternate.expirationTime = renderExpirationTime;
-              } else {
-                // Neither alternate was updated, which means the rest of the
-                // ancestor path already has sufficient priority.
-                break;
-              }
-              node = node["return"];
-            }
-            // Don't scan deeper than a matching consumer. When we render the
-            // consumer, we'll continue scanning from that point. This way the
-            // scanning work is time-sliced.
-            nextFiber = null;
-          } else {
-            // Traverse down.
-            nextFiber = fiber.child;
-          }
-          break;
-        case ContextProvider:
-          // Don't scan deeper if this is a matching provider
-          nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
-          break;
-        default:
-          // Traverse down.
-          nextFiber = fiber.child;
-          break;
+    {
+      // Warn about using Maps as children
+      if (typeof newChildrenIterable.entries === "function") {
+        var possibleMap = newChildrenIterable;
+        if (possibleMap.entries === iteratorFn) {
+          warning(
+            didWarnAboutMaps,
+            "Using Maps as children is unsupported and will likely yield " +
+              "unexpected results. Convert it to a sequence/iterable of keyed " +
+              "ReactElements instead.%s",
+            getCurrentFiberStackAddendum$1()
+          );
+          didWarnAboutMaps = true;
+        }
       }
-      if (nextFiber !== null) {
-        // Set the return pointer of the child to the work-in-progress fiber.
-        nextFiber["return"] = fiber;
-      } else {
-        // No child. Traverse to next sibling.
-        nextFiber = fiber;
-        while (nextFiber !== null) {
-          if (nextFiber === workInProgress) {
-            // We're back to the root of this subtree. Exit.
-            nextFiber = null;
-            break;
-          }
-          var sibling = nextFiber.sibling;
-          if (sibling !== null) {
-            nextFiber = sibling;
-            break;
-          }
-          // No more siblings. Traverse up.
-          nextFiber = nextFiber["return"];
+
+      // First, validate keys.
+      // We'll get a different iterator later for the main pass.
+      var _newChildren = iteratorFn.call(newChildrenIterable);
+      if (_newChildren) {
+        var knownKeys = null;
+        var _step = _newChildren.next();
+        for (; !_step.done; _step = _newChildren.next()) {
+          var child = _step.value;
+          knownKeys = warnOnInvalidKey(child, knownKeys);
         }
       }
-      fiber = nextFiber;
     }
-  }
 
-  function updateContextProvider(
-    current,
-    workInProgress,
-    renderExpirationTime
-  ) {
-    var providerType = workInProgress.type;
-    var context = providerType._context;
-
-    var newProps = workInProgress.pendingProps;
-    var oldProps = workInProgress.memoizedProps;
+    var newChildren = iteratorFn.call(newChildrenIterable);
+    invariant(newChildren != null, "An iterable object provided no iterator.");
 
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (oldProps === newProps) {
-      workInProgress.stateNode = 0;
-      pushProvider(workInProgress);
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
-    }
+    var resultingFirstChild = null;
+    var previousNewFiber = null;
 
-    var newValue = newProps.value;
-    workInProgress.memoizedProps = newProps;
+    var oldFiber = currentFirstChild;
+    var lastPlacedIndex = 0;
+    var newIdx = 0;
+    var nextOldFiber = null;
 
-    var changedBits = void 0;
-    if (oldProps === null) {
-      // Initial render
-      changedBits = MAX_SIGNED_31_BIT_INT;
-    } else {
-      if (oldProps.value === newProps.value) {
-        // No change. Bailout early if children are the same.
-        if (oldProps.children === newProps.children) {
-          workInProgress.stateNode = 0;
-          pushProvider(workInProgress);
-          return bailoutOnAlreadyFinishedWork(current, workInProgress);
-        }
-        changedBits = 0;
+    var step = newChildren.next();
+    for (
+      ;
+      oldFiber !== null && !step.done;
+      newIdx++, step = newChildren.next()
+    ) {
+      if (oldFiber.index > newIdx) {
+        nextOldFiber = oldFiber;
+        oldFiber = null;
       } else {
-        var oldValue = oldProps.value;
-        // Use Object.is to compare the new context value to the old value.
-        // Inlined Object.is polyfill.
-        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
-        if (
-          (oldValue === newValue &&
-            (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
-          (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
-        ) {
-          // No change. Bailout early if children are the same.
-          if (oldProps.children === newProps.children) {
-            workInProgress.stateNode = 0;
-            pushProvider(workInProgress);
-            return bailoutOnAlreadyFinishedWork(current, workInProgress);
-          }
-          changedBits = 0;
-        } else {
-          changedBits =
-            typeof context._calculateChangedBits === "function"
-              ? context._calculateChangedBits(oldValue, newValue)
-              : MAX_SIGNED_31_BIT_INT;
-          {
-            !((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits)
-              ? warning(
-                  false,
-                  "calculateChangedBits: Expected the return value to be a " +
-                    "31-bit integer. Instead received: %s",
-                  changedBits
-                )
-              : void 0;
-          }
-          changedBits |= 0;
+        nextOldFiber = oldFiber.sibling;
+      }
+      var newFiber = updateSlot(
+        returnFiber,
+        oldFiber,
+        step.value,
+        expirationTime
+      );
+      if (newFiber === null) {
+        // TODO: This breaks on empty slots like null children. That's
+        // unfortunate because it triggers the slow path all the time. We need
+        // a better way to communicate whether this was a miss or null,
+        // boolean, undefined, etc.
+        if (!oldFiber) {
+          oldFiber = nextOldFiber;
+        }
+        break;
+      }
+      if (shouldTrackSideEffects) {
+        if (oldFiber && newFiber.alternate === null) {
+          // We matched the slot, but we didn't reuse the existing fiber, so we
+          // need to delete the existing child.
+          deleteChild(returnFiber, oldFiber);
+        }
+      }
+      lastPlacedIndex = placeChild(newFiber, lastPlacedIndex, newIdx);
+      if (previousNewFiber === null) {
+        // TODO: Move out of the loop. This only happens for the first run.
+        resultingFirstChild = newFiber;
+      } else {
+        // TODO: Defer siblings if we're not at the right index for this slot.
+        // I.e. if we had null values before, then we want to defer this
+        // for each null value. However, we also don't want to call updateSlot
+        // with the previous one.
+        previousNewFiber.sibling = newFiber;
+      }
+      previousNewFiber = newFiber;
+      oldFiber = nextOldFiber;
+    }
 
-          if (changedBits === 0) {
-            // No change. Bailout early if children are the same.
-            if (oldProps.children === newProps.children) {
-              workInProgress.stateNode = 0;
-              pushProvider(workInProgress);
-              return bailoutOnAlreadyFinishedWork(current, workInProgress);
-            }
-          } else {
-            propagateContextChange(
-              workInProgress,
-              context,
-              changedBits,
-              renderExpirationTime
+    if (step.done) {
+      // We've reached the end of the new children. We can delete the rest.
+      deleteRemainingChildren(returnFiber, oldFiber);
+      return resultingFirstChild;
+    }
+
+    if (oldFiber === null) {
+      // If we don't have any more existing children we can choose a fast path
+      // since the rest will all be insertions.
+      for (; !step.done; newIdx++, step = newChildren.next()) {
+        var _newFiber3 = createChild(returnFiber, step.value, expirationTime);
+        if (_newFiber3 === null) {
+          continue;
+        }
+        lastPlacedIndex = placeChild(_newFiber3, lastPlacedIndex, newIdx);
+        if (previousNewFiber === null) {
+          // TODO: Move out of the loop. This only happens for the first run.
+          resultingFirstChild = _newFiber3;
+        } else {
+          previousNewFiber.sibling = _newFiber3;
+        }
+        previousNewFiber = _newFiber3;
+      }
+      return resultingFirstChild;
+    }
+
+    // Add all children to a key map for quick lookups.
+    var existingChildren = mapRemainingChildren(returnFiber, oldFiber);
+
+    // Keep scanning and use the map to restore deleted items as moves.
+    for (; !step.done; newIdx++, step = newChildren.next()) {
+      var _newFiber4 = updateFromMap(
+        existingChildren,
+        returnFiber,
+        newIdx,
+        step.value,
+        expirationTime
+      );
+      if (_newFiber4 !== null) {
+        if (shouldTrackSideEffects) {
+          if (_newFiber4.alternate !== null) {
+            // The new fiber is a work in progress, but if there exists a
+            // current, that means that we reused the fiber. We need to delete
+            // it from the child list so that we don't add it to the deletion
+            // list.
+            existingChildren["delete"](
+              _newFiber4.key === null ? newIdx : _newFiber4.key
             );
           }
         }
+        lastPlacedIndex = placeChild(_newFiber4, lastPlacedIndex, newIdx);
+        if (previousNewFiber === null) {
+          resultingFirstChild = _newFiber4;
+        } else {
+          previousNewFiber.sibling = _newFiber4;
+        }
+        previousNewFiber = _newFiber4;
       }
     }
 
-    workInProgress.stateNode = changedBits;
-    pushProvider(workInProgress);
+    if (shouldTrackSideEffects) {
+      // Any existing children that weren't consumed above were deleted. We need
+      // to add them to the deletion list.
+      existingChildren.forEach(function(child) {
+        return deleteChild(returnFiber, child);
+      });
+    }
 
-    var newChildren = newProps.children;
-    reconcileChildren(current, workInProgress, newChildren);
-    return workInProgress.child;
+    return resultingFirstChild;
   }
 
-  function updateContextConsumer(
-    current,
-    workInProgress,
-    renderExpirationTime
+  function reconcileSingleTextNode(
+    returnFiber,
+    currentFirstChild,
+    textContent,
+    expirationTime
   ) {
-    var context = workInProgress.type;
-    var newProps = workInProgress.pendingProps;
-    var oldProps = workInProgress.memoizedProps;
-
-    var newValue = context._currentValue;
-    var changedBits = context._changedBits;
-
-    if (hasLegacyContextChanged()) {
-      // Normally we can bail out on props equality but if context has changed
-      // we don't do the bailout and we have to reuse existing props instead.
-    } else if (changedBits === 0 && oldProps === newProps) {
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    // There's no need to check for keys on text nodes since we don't have a
+    // way to define them.
+    if (currentFirstChild !== null && currentFirstChild.tag === HostText) {
+      // We already have an existing node so let's just update it and delete
+      // the rest.
+      deleteRemainingChildren(returnFiber, currentFirstChild.sibling);
+      var existing = useFiber(currentFirstChild, textContent, expirationTime);
+      existing["return"] = returnFiber;
+      return existing;
     }
-    workInProgress.memoizedProps = newProps;
+    // The existing first child is not a text node so we need to create one
+    // and delete the existing ones.
+    deleteRemainingChildren(returnFiber, currentFirstChild);
+    var created = createFiberFromText(
+      textContent,
+      returnFiber.mode,
+      expirationTime
+    );
+    created["return"] = returnFiber;
+    return created;
+  }
 
-    var observedBits = newProps.unstable_observedBits;
-    if (observedBits === undefined || observedBits === null) {
-      // Subscribe to all changes by default
-      observedBits = MAX_SIGNED_31_BIT_INT;
+  function reconcileSingleElement(
+    returnFiber,
+    currentFirstChild,
+    element,
+    expirationTime
+  ) {
+    var key = element.key;
+    var child = currentFirstChild;
+    while (child !== null) {
+      // TODO: If key === null and child.key === null, then this only applies to
+      // the first item in the list.
+      if (child.key === key) {
+        if (
+          child.tag === Fragment
+            ? element.type === REACT_FRAGMENT_TYPE
+            : child.type === element.type
+        ) {
+          deleteRemainingChildren(returnFiber, child.sibling);
+          var existing = useFiber(
+            child,
+            element.type === REACT_FRAGMENT_TYPE
+              ? element.props.children
+              : element.props,
+            expirationTime
+          );
+          existing.ref = coerceRef(returnFiber, child, element);
+          existing["return"] = returnFiber;
+          {
+            existing._debugSource = element._source;
+            existing._debugOwner = element._owner;
+          }
+          return existing;
+        } else {
+          deleteRemainingChildren(returnFiber, child);
+          break;
+        }
+      } else {
+        deleteChild(returnFiber, child);
+      }
+      child = child.sibling;
     }
-    // Store the observedBits on the fiber's stateNode for quick access.
-    workInProgress.stateNode = observedBits;
 
-    if ((changedBits & observedBits) !== 0) {
-      // Context change propagation stops at matching consumers, for time-
-      // slicing. Continue the propagation here.
-      propagateContextChange(
-        workInProgress,
-        context,
-        changedBits,
-        renderExpirationTime
+    if (element.type === REACT_FRAGMENT_TYPE) {
+      var created = createFiberFromFragment(
+        element.props.children,
+        returnFiber.mode,
+        expirationTime,
+        element.key
       );
+      created["return"] = returnFiber;
+      return created;
+    } else {
+      var _created4 = createFiberFromElement(
+        element,
+        returnFiber.mode,
+        expirationTime
+      );
+      _created4.ref = coerceRef(returnFiber, currentFirstChild, element);
+      _created4["return"] = returnFiber;
+      return _created4;
     }
-    // There is no bailout on `children` equality because we expect people
-    // to often pass a bound method as a child, but it may reference
-    // `this.state` or `this.props` (and thus needs to re-render on `setState`).
-
-    var render = newProps.children;
-
-    {
-      !(typeof render === "function")
-        ? warning(
-            false,
-            "A context consumer was rendered with multiple children, or a child " +
-              "that isn't a function. A context consumer expects a single child " +
-              "that is a function. If you did pass a function, make sure there " +
-              "is no trailing or leading whitespace around it."
-          )
-        : void 0;
-    }
-
-    var newChildren = render(newValue);
-    reconcileChildren(current, workInProgress, newChildren);
-    return workInProgress.child;
   }
 
-  /*
-  function reuseChildrenEffects(returnFiber : Fiber, firstChild : Fiber) {
-    let child = firstChild;
-    do {
-      // Ensure that the first and last effect of the parent corresponds
-      // to the children's first and last effect.
-      if (!returnFiber.firstEffect) {
-        returnFiber.firstEffect = child.firstEffect;
-      }
-      if (child.lastEffect) {
-        if (returnFiber.lastEffect) {
-          returnFiber.lastEffect.nextEffect = child.firstEffect;
-        }
-        returnFiber.lastEffect = child.lastEffect;
-      }
-    } while (child = child.sibling);
+  function reconcileSinglePortal(
+    returnFiber,
+    currentFirstChild,
+    portal,
+    expirationTime
+  ) {
+    var key = portal.key;
+    var child = currentFirstChild;
+    while (child !== null) {
+      // TODO: If key === null and child.key === null, then this only applies to
+      // the first item in the list.
+      if (child.key === key) {
+        if (
+          child.tag === HostPortal &&
+          child.stateNode.containerInfo === portal.containerInfo &&
+          child.stateNode.implementation === portal.implementation
+        ) {
+          deleteRemainingChildren(returnFiber, child.sibling);
+          var existing = useFiber(child, portal.children || [], expirationTime);
+          existing["return"] = returnFiber;
+          return existing;
+        } else {
+          deleteRemainingChildren(returnFiber, child);
+          break;
+        }
+      } else {
+        deleteChild(returnFiber, child);
+      }
+      child = child.sibling;
+    }
+
+    var created = createFiberFromPortal(
+      portal,
+      returnFiber.mode,
+      expirationTime
+    );
+    created["return"] = returnFiber;
+    return created;
   }
-  */
 
-  function bailoutOnAlreadyFinishedWork(current, workInProgress) {
-    cancelWorkTimer(workInProgress);
+  // This API will tag the children with the side-effect of the reconciliation
+  // itself. They will be added to the side-effect list as we pass through the
+  // children and the parent.
+  function reconcileChildFibers(
+    returnFiber,
+    currentFirstChild,
+    newChild,
+    expirationTime
+  ) {
+    // This function is not recursive.
+    // If the top level item is an array, we treat it as a set of children,
+    // not as a fragment. Nested arrays on the other hand will be treated as
+    // fragment nodes. Recursion happens at the normal flow.
 
-    // TODO: We should ideally be able to bail out early if the children have no
-    // more work to do. However, since we don't have a separation of this
-    // Fiber's priority and its children yet - we don't know without doing lots
-    // of the same work we do anyway. Once we have that separation we can just
-    // bail out here if the children has no more work at this priority level.
-    // if (workInProgress.priorityOfChildren <= priorityLevel) {
-    //   // If there are side-effects in these children that have not yet been
-    //   // committed we need to ensure that they get properly transferred up.
-    //   if (current && current.child !== workInProgress.child) {
-    //     reuseChildrenEffects(workInProgress, child);
-    //   }
-    //   return null;
-    // }
+    // Handle top level unkeyed fragments as if they were arrays.
+    // This leads to an ambiguity between <>{[...]}</> and <>...</>.
+    // We treat the ambiguous cases above the same.
+    if (
+      typeof newChild === "object" &&
+      newChild !== null &&
+      newChild.type === REACT_FRAGMENT_TYPE &&
+      newChild.key === null
+    ) {
+      newChild = newChild.props.children;
+    }
 
-    cloneChildFibers(current, workInProgress);
-    return workInProgress.child;
-  }
+    // Handle object types
+    var isObject = typeof newChild === "object" && newChild !== null;
 
-  function bailoutOnLowPriority(current, workInProgress) {
-    cancelWorkTimer(workInProgress);
+    if (isObject) {
+      switch (newChild.$$typeof) {
+        case REACT_ELEMENT_TYPE:
+          return placeSingleChild(
+            reconcileSingleElement(
+              returnFiber,
+              currentFirstChild,
+              newChild,
+              expirationTime
+            )
+          );
+        case REACT_PORTAL_TYPE:
+          return placeSingleChild(
+            reconcileSinglePortal(
+              returnFiber,
+              currentFirstChild,
+              newChild,
+              expirationTime
+            )
+          );
+      }
+    }
 
-    // TODO: Handle HostComponent tags here as well and call pushHostContext()?
-    // See PR 8590 discussion for context
-    switch (workInProgress.tag) {
-      case HostRoot:
-        pushHostRootContext(workInProgress);
-        break;
-      case ClassComponent:
-        pushLegacyContextProvider(workInProgress);
-        break;
-      case HostPortal:
-        pushHostContainer(
-          workInProgress,
-          workInProgress.stateNode.containerInfo
-        );
-        break;
-      case ContextProvider:
-        pushProvider(workInProgress);
-        break;
+    if (typeof newChild === "string" || typeof newChild === "number") {
+      return placeSingleChild(
+        reconcileSingleTextNode(
+          returnFiber,
+          currentFirstChild,
+          "" + newChild,
+          expirationTime
+        )
+      );
     }
-    // TODO: What if this is currently in progress?
-    // How can that happen? How is this not being cloned?
-    return null;
+
+    if (isArray$1(newChild)) {
+      return reconcileChildrenArray(
+        returnFiber,
+        currentFirstChild,
+        newChild,
+        expirationTime
+      );
+    }
+
+    if (getIteratorFn(newChild)) {
+      return reconcileChildrenIterator(
+        returnFiber,
+        currentFirstChild,
+        newChild,
+        expirationTime
+      );
+    }
+
+    if (isObject) {
+      throwOnInvalidObjectType(returnFiber, newChild);
+    }
+
+    {
+      if (typeof newChild === "function") {
+        warnOnFunctionType();
+      }
+    }
+    if (typeof newChild === "undefined") {
+      // If the new child is undefined, and the return fiber is a composite
+      // component, throw an error. If Fiber return types are disabled,
+      // we already threw above.
+      switch (returnFiber.tag) {
+        case ClassComponent: {
+          {
+            var instance = returnFiber.stateNode;
+            if (instance.render._isMockFunction) {
+              // We allow auto-mocks to proceed as if they're returning null.
+              break;
+            }
+          }
+        }
+        // Intentionally fall through to the next case, which handles both
+        // functions and classes
+        // eslint-disable-next-lined no-fallthrough
+        case FunctionalComponent: {
+          var Component = returnFiber.type;
+          invariant(
+            false,
+            "%s(...): Nothing was returned from render. This usually means a " +
+              "return statement is missing. Or, to render nothing, " +
+              "return null.",
+            Component.displayName || Component.name || "Component"
+          );
+        }
+      }
+    }
+
+    // Remaining cases are all treated as empty.
+    return deleteRemainingChildren(returnFiber, currentFirstChild);
   }
 
-  // TODO: Delete memoizeProps/State and move to reconcile/bailout instead
-  function memoizeProps(workInProgress, nextProps) {
-    workInProgress.memoizedProps = nextProps;
+  return reconcileChildFibers;
+}
+
+var reconcileChildFibers = ChildReconciler(true);
+var mountChildFibers = ChildReconciler(false);
+
+function cloneChildFibers(current, workInProgress) {
+  invariant(
+    current === null || workInProgress.child === current.child,
+    "Resuming work not yet implemented."
+  );
+
+  if (workInProgress.child === null) {
+    return;
   }
 
-  function memoizeState(workInProgress, nextState) {
-    workInProgress.memoizedState = nextState;
-    // Don't reset the updateQueue, in case there are pending updates. Resetting
-    // is handled by processUpdateQueue.
+  var currentChild = workInProgress.child;
+  var newChild = createWorkInProgress(
+    currentChild,
+    currentChild.pendingProps,
+    currentChild.expirationTime
+  );
+  workInProgress.child = newChild;
+
+  newChild["return"] = workInProgress;
+  while (currentChild.sibling !== null) {
+    currentChild = currentChild.sibling;
+    newChild = newChild.sibling = createWorkInProgress(
+      currentChild,
+      currentChild.pendingProps,
+      currentChild.expirationTime
+    );
+    newChild["return"] = workInProgress;
   }
+  newChild.sibling = null;
+}
 
-  function beginWork(current, workInProgress, renderExpirationTime) {
-    if (
-      workInProgress.expirationTime === NoWork ||
-      workInProgress.expirationTime > renderExpirationTime
-    ) {
-      return bailoutOnLowPriority(current, workInProgress);
-    }
+var changedBitsStack = [];
+var currentValueStack = [];
+var stack = [];
+var index$1 = -1;
 
-    switch (workInProgress.tag) {
-      case IndeterminateComponent:
-        return mountIndeterminateComponent(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case FunctionalComponent:
-        return updateFunctionalComponent(current, workInProgress);
-      case ClassComponent:
-        return updateClassComponent(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case HostRoot:
-        return updateHostRoot(current, workInProgress, renderExpirationTime);
-      case HostComponent:
-        return updateHostComponent(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case HostText:
-        return updateHostText(current, workInProgress);
-      case CallHandlerPhase:
-        // This is a restart. Reset the tag to the initial phase.
-        workInProgress.tag = CallComponent;
-      // Intentionally fall through since this is now the same.
-      case CallComponent:
-        return updateCallComponent(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case ReturnComponent:
-        // A return component is just a placeholder, we can just run through the
-        // next one immediately.
-        return null;
-      case HostPortal:
-        return updatePortalComponent(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case ForwardRef:
-        return updateForwardRef(current, workInProgress);
-      case Fragment:
-        return updateFragment(current, workInProgress);
-      case Mode:
-        return updateMode(current, workInProgress);
-      case ContextProvider:
-        return updateContextProvider(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case ContextConsumer:
-        return updateContextConsumer(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      default:
-        invariant(
-          false,
-          "Unknown unit of work tag. This error is likely caused by a bug in " +
-            "React. Please file an issue."
-        );
+var rendererSigil = void 0;
+{
+  // Use this to detect multiple renderers using the same context
+  rendererSigil = {};
+}
+
+function pushProvider(providerFiber) {
+  var context = providerFiber.type.context;
+  index$1 += 1;
+  changedBitsStack[index$1] = context._changedBits;
+  currentValueStack[index$1] = context._currentValue;
+  stack[index$1] = providerFiber;
+  context._currentValue = providerFiber.pendingProps.value;
+  context._changedBits = providerFiber.stateNode;
+
+  {
+    warning(
+      context._currentRenderer === null ||
+        context._currentRenderer === rendererSigil,
+      "Detected multiple renderers concurrently rendering the " +
+        "same context provider. This is currently unsupported."
+    );
+    context._currentRenderer = rendererSigil;
+  }
+}
+
+function popProvider(providerFiber) {
+  {
+    warning(
+      index$1 > -1 && providerFiber === stack[index$1],
+      "Unexpected pop."
+    );
+  }
+  var changedBits = changedBitsStack[index$1];
+  var currentValue = currentValueStack[index$1];
+  changedBitsStack[index$1] = null;
+  currentValueStack[index$1] = null;
+  stack[index$1] = null;
+  index$1 -= 1;
+  var context = providerFiber.type.context;
+  context._currentValue = currentValue;
+  context._changedBits = changedBits;
+}
+
+function resetProviderStack() {
+  for (var i = index$1; i > -1; i--) {
+    var providerFiber = stack[i];
+    var context = providerFiber.type.context;
+    context._currentValue = context._defaultValue;
+    context._changedBits = 0;
+    changedBitsStack[i] = null;
+    currentValueStack[i] = null;
+    stack[i] = null;
+    {
+      context._currentRenderer = null;
     }
   }
+  index$1 = -1;
+}
 
-  return {
-    beginWork: beginWork
-  };
-};
+var didWarnAboutBadClass = void 0;
+var didWarnAboutGetDerivedStateOnFunctionalComponent = void 0;
+var didWarnAboutStatelessRefs = void 0;
+
+{
+  didWarnAboutBadClass = {};
+  didWarnAboutGetDerivedStateOnFunctionalComponent = {};
+  didWarnAboutStatelessRefs = {};
+}
 
-var ReactFiberCompleteWork = function(
+var ReactFiberBeginWork = function(
   config,
   hostContext,
-  legacyContext,
-  newContext,
-  hydrationContext
+  hydrationContext,
+  scheduleWork,
+  computeExpirationForFiber
 ) {
-  var createInstance = config.createInstance,
-    createTextInstance = config.createTextInstance,
-    appendInitialChild = config.appendInitialChild,
-    finalizeInitialChildren = config.finalizeInitialChildren,
-    prepareUpdate = config.prepareUpdate,
-    mutation = config.mutation,
-    persistence = config.persistence;
-  var getRootHostContainer = hostContext.getRootHostContainer,
-    popHostContext = hostContext.popHostContext,
-    getHostContext = hostContext.getHostContext,
-    popHostContainer = hostContext.popHostContainer;
-  var popLegacyContextProvider = legacyContext.popContextProvider,
-    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
-  var popProvider = newContext.popProvider;
-  var prepareToHydrateHostInstance =
-      hydrationContext.prepareToHydrateHostInstance,
-    prepareToHydrateHostTextInstance =
-      hydrationContext.prepareToHydrateHostTextInstance,
-    popHydrationState = hydrationContext.popHydrationState;
+  var shouldSetTextContent = config.shouldSetTextContent,
+    shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree;
+  var pushHostContext = hostContext.pushHostContext,
+    pushHostContainer = hostContext.pushHostContainer;
+  var enterHydrationState = hydrationContext.enterHydrationState,
+    resetHydrationState = hydrationContext.resetHydrationState,
+    tryToClaimNextHydratableInstance =
+      hydrationContext.tryToClaimNextHydratableInstance;
 
-  function markUpdate(workInProgress) {
-    // Tag the fiber with an update effect. This turns a Placement into
-    // an UpdateAndPlacement.
-    workInProgress.effectTag |= Update;
-  }
+  var _ReactFiberClassCompo = ReactFiberClassComponent(
+      scheduleWork,
+      computeExpirationForFiber,
+      memoizeProps,
+      memoizeState
+    ),
+    adoptClassInstance = _ReactFiberClassCompo.adoptClassInstance,
+    callGetDerivedStateFromProps =
+      _ReactFiberClassCompo.callGetDerivedStateFromProps,
+    constructClassInstance = _ReactFiberClassCompo.constructClassInstance,
+    mountClassInstance = _ReactFiberClassCompo.mountClassInstance,
+    resumeMountClassInstance = _ReactFiberClassCompo.resumeMountClassInstance,
+    updateClassInstance = _ReactFiberClassCompo.updateClassInstance;
 
-  function markRef(workInProgress) {
-    workInProgress.effectTag |= Ref;
-  }
+  // TODO: Remove this and use reconcileChildrenAtExpirationTime directly.
 
-  function appendAllReturns(returns, workInProgress) {
-    var node = workInProgress.stateNode;
-    if (node) {
-      node["return"] = workInProgress;
-    }
-    while (node !== null) {
-      if (
-        node.tag === HostComponent ||
-        node.tag === HostText ||
-        node.tag === HostPortal
-      ) {
-        invariant(false, "A call cannot have host component children.");
-      } else if (node.tag === ReturnComponent) {
-        returns.push(node.pendingProps.value);
-      } else if (node.child !== null) {
-        node.child["return"] = node;
-        node = node.child;
-        continue;
-      }
-      while (node.sibling === null) {
-        if (node["return"] === null || node["return"] === workInProgress) {
-          return;
-        }
-        node = node["return"];
-      }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
-    }
+  function reconcileChildren(current, workInProgress, nextChildren) {
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      workInProgress.expirationTime
+    );
   }
 
-  function moveCallToHandlerPhase(
+  function reconcileChildrenAtExpirationTime(
     current,
     workInProgress,
+    nextChildren,
     renderExpirationTime
   ) {
-    var props = workInProgress.memoizedProps;
-    invariant(
-      props,
-      "Should be resolved by now. This error is likely caused by a bug in " +
-        "React. Please file an issue."
-    );
+    if (current === null) {
+      // If this is a fresh new component that hasn't been rendered yet, we
+      // won't update its child set by applying minimal side-effects. Instead,
+      // we will add them all to the child before it gets rendered. That means
+      // we can optimize this reconciliation pass by not tracking side-effects.
+      workInProgress.child = mountChildFibers(
+        workInProgress,
+        null,
+        nextChildren,
+        renderExpirationTime
+      );
+    } else {
+      // If the current child is the same as the work in progress, it means that
+      // we haven't yet started any work on these children. Therefore, we use
+      // the clone algorithm to create a copy of all the current children.
 
-    // First step of the call has completed. Now we need to do the second.
-    // TODO: It would be nice to have a multi stage call represented by a
-    // single component, or at least tail call optimize nested ones. Currently
-    // that requires additional fields that we don't want to add to the fiber.
-    // So this requires nested handlers.
-    // Note: This doesn't mutate the alternate node. I don't think it needs to
-    // since this stage is reset for every pass.
-    workInProgress.tag = CallHandlerPhase;
+      // If we had any progressed work already, that is invalid at this point so
+      // let's throw it out.
+      workInProgress.child = reconcileChildFibers(
+        workInProgress,
+        current.child,
+        nextChildren,
+        renderExpirationTime
+      );
+    }
+  }
 
-    // Build up the returns.
-    // TODO: Compare this to a generator or opaque helpers like Children.
-    var returns = [];
-    appendAllReturns(returns, workInProgress);
-    var fn = props.handler;
-    var childProps = props.props;
-    var nextChildren = fn(childProps, returns);
+  function updateFragment(current, workInProgress) {
+    var nextChildren = workInProgress.pendingProps;
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (workInProgress.memoizedProps === nextChildren) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextChildren);
+    return workInProgress.child;
+  }
 
-    var currentFirstChild = current !== null ? current.child : null;
-    workInProgress.child = reconcileChildFibers(
-      workInProgress,
-      currentFirstChild,
-      nextChildren,
-      renderExpirationTime
-    );
+  function updateMode(current, workInProgress) {
+    var nextChildren = workInProgress.pendingProps.children;
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (
+      nextChildren === null ||
+      workInProgress.memoizedProps === nextChildren
+    ) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextChildren);
     return workInProgress.child;
   }
 
-  function appendAllChildren(parent, workInProgress) {
-    // We only have the top Fiber that was created but we need recurse down its
-    // children to find all the terminal nodes.
-    var node = workInProgress.child;
-    while (node !== null) {
-      if (node.tag === HostComponent || node.tag === HostText) {
-        appendInitialChild(parent, node.stateNode);
-      } else if (node.tag === HostPortal) {
-        // If we have a portal child, then we don't want to traverse
-        // down its children. Instead, we'll get insertions from each child in
-        // the portal directly.
-      } else if (node.child !== null) {
-        node.child["return"] = node;
-        node = node.child;
-        continue;
-      }
-      if (node === workInProgress) {
-        return;
-      }
-      while (node.sibling === null) {
-        if (node["return"] === null || node["return"] === workInProgress) {
-          return;
-        }
-        node = node["return"];
+  function markRef(current, workInProgress) {
+    var ref = workInProgress.ref;
+    if (
+      (current === null && ref !== null) ||
+      (current !== null && current.ref !== ref)
+    ) {
+      // Schedule a Ref effect
+      workInProgress.effectTag |= Ref;
+    }
+  }
+
+  function updateFunctionalComponent(current, workInProgress) {
+    var fn = workInProgress.type;
+    var nextProps = workInProgress.pendingProps;
+
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else {
+      if (workInProgress.memoizedProps === nextProps) {
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
       }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
+      // TODO: consider bringing fn.shouldComponentUpdate() back.
+      // It used to be here.
+    }
+
+    var unmaskedContext = getUnmaskedContext(workInProgress);
+    var context = getMaskedContext(workInProgress, unmaskedContext);
+
+    var nextChildren = void 0;
+
+    {
+      ReactCurrentOwner.current = workInProgress;
+      ReactDebugCurrentFiber.setCurrentPhase("render");
+      nextChildren = fn(nextProps, context);
+      ReactDebugCurrentFiber.setCurrentPhase(null);
     }
+    // React DevTools reads this flag.
+    workInProgress.effectTag |= PerformedWork;
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextProps);
+    return workInProgress.child;
   }
 
-  var updateHostContainer = void 0;
-  var updateHostComponent = void 0;
-  var updateHostText = void 0;
-  if (mutation) {
-    if (enableMutatingReconciler) {
-      // Mutation mode
-      updateHostContainer = function(workInProgress) {
-        // Noop
-      };
-      updateHostComponent = function(
+  function updateClassComponent(current, workInProgress, renderExpirationTime) {
+    // Push context providers early to prevent context stack mismatches.
+    // During mounting we don't know the child context yet as the instance doesn't exist.
+    // We will invalidate the child context in finishClassComponent() right after rendering.
+    var hasContext = pushContextProvider(workInProgress);
+    var shouldUpdate = void 0;
+    if (current === null) {
+      if (workInProgress.stateNode === null) {
+        // In the initial pass we might need to construct the instance.
+        constructClassInstance(workInProgress, workInProgress.pendingProps);
+        mountClassInstance(workInProgress, renderExpirationTime);
+
+        shouldUpdate = true;
+      } else {
+        // In a resume, we'll already have an instance we can reuse.
+        shouldUpdate = resumeMountClassInstance(
+          workInProgress,
+          renderExpirationTime
+        );
+      }
+    } else {
+      shouldUpdate = updateClassInstance(
         current,
         workInProgress,
-        updatePayload,
-        type,
-        oldProps,
-        newProps,
-        rootContainerInstance,
-        currentHostContext
-      ) {
-        // TODO: Type this specific to this type of component.
-        workInProgress.updateQueue = updatePayload;
-        // If the update payload indicates that there is a change or if there
-        // is a new ref we mark this as an update. All the work is done in commitWork.
-        if (updatePayload) {
-          markUpdate(workInProgress);
-        }
-      };
-      updateHostText = function(current, workInProgress, oldText, newText) {
-        // If the text differs, mark it as an update. All the work in done in commitWork.
-        if (oldText !== newText) {
-          markUpdate(workInProgress);
-        }
-      };
-    } else {
-      invariant(false, "Mutating reconciler is disabled.");
+        renderExpirationTime
+      );
     }
-  } else if (persistence) {
-    if (enablePersistentReconciler) {
-      // Persistent host tree mode
-      var cloneInstance = persistence.cloneInstance,
-        createContainerChildSet = persistence.createContainerChildSet,
-        appendChildToContainerChildSet =
-          persistence.appendChildToContainerChildSet,
-        finalizeContainerChildren = persistence.finalizeContainerChildren;
 
-      // An unfortunate fork of appendAllChildren because we have two different parent types.
+    // We processed the update queue inside updateClassInstance. It may have
+    // included some errors that were dispatched during the commit phase.
+    // TODO: Refactor class components so this is less awkward.
+    var didCaptureError = false;
+    var updateQueue = workInProgress.updateQueue;
+    if (updateQueue !== null && updateQueue.capturedValues !== null) {
+      shouldUpdate = true;
+      didCaptureError = true;
+    }
+    return finishClassComponent(
+      current,
+      workInProgress,
+      shouldUpdate,
+      hasContext,
+      didCaptureError,
+      renderExpirationTime
+    );
+  }
 
-      var appendAllChildrenToContainer = function(
-        containerChildSet,
-        workInProgress
-      ) {
-        // We only have the top Fiber that was created but we need recurse down its
-        // children to find all the terminal nodes.
-        var node = workInProgress.child;
-        while (node !== null) {
-          if (node.tag === HostComponent || node.tag === HostText) {
-            appendChildToContainerChildSet(containerChildSet, node.stateNode);
-          } else if (node.tag === HostPortal) {
-            // If we have a portal child, then we don't want to traverse
-            // down its children. Instead, we'll get insertions from each child in
-            // the portal directly.
-          } else if (node.child !== null) {
-            node.child["return"] = node;
-            node = node.child;
-            continue;
-          }
-          if (node === workInProgress) {
-            return;
-          }
-          while (node.sibling === null) {
-            if (node["return"] === null || node["return"] === workInProgress) {
-              return;
-            }
-            node = node["return"];
-          }
-          node.sibling["return"] = node["return"];
-          node = node.sibling;
-        }
-      };
-      updateHostContainer = function(workInProgress) {
-        var portalOrRoot = workInProgress.stateNode;
-        var childrenUnchanged = workInProgress.firstEffect === null;
-        if (childrenUnchanged) {
-          // No changes, just reuse the existing instance.
-        } else {
-          var container = portalOrRoot.containerInfo;
-          var newChildSet = createContainerChildSet(container);
-          // If children might have changed, we have to add them all to the set.
-          appendAllChildrenToContainer(newChildSet, workInProgress);
-          portalOrRoot.pendingChildren = newChildSet;
-          // Schedule an update on the container to swap out the container.
-          markUpdate(workInProgress);
-          finalizeContainerChildren(container, newChildSet);
+  function finishClassComponent(
+    current,
+    workInProgress,
+    shouldUpdate,
+    hasContext,
+    didCaptureError,
+    renderExpirationTime
+  ) {
+    // Refs should update even if shouldComponentUpdate returns false
+    markRef(current, workInProgress);
+
+    if (!shouldUpdate && !didCaptureError) {
+      // Context providers should defer to sCU for rendering
+      if (hasContext) {
+        invalidateContextProvider(workInProgress, false);
+      }
+
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+
+    var ctor = workInProgress.type;
+    var instance = workInProgress.stateNode;
+
+    // Rerender
+    ReactCurrentOwner.current = workInProgress;
+    var nextChildren = void 0;
+    if (
+      didCaptureError &&
+      (!enableGetDerivedStateFromCatch ||
+        typeof ctor.getDerivedStateFromCatch !== "function")
+    ) {
+      // If we captured an error, but getDerivedStateFrom catch is not defined,
+      // unmount all the children. componentDidCatch will schedule an update to
+      // re-render a fallback. This is temporary until we migrate everyone to
+      // the new API.
+      // TODO: Warn in a future release.
+      nextChildren = null;
+    } else {
+      {
+        ReactDebugCurrentFiber.setCurrentPhase("render");
+        nextChildren = instance.render();
+        if (
+          debugRenderPhaseSideEffects ||
+          (debugRenderPhaseSideEffectsForStrictMode &&
+            workInProgress.mode & StrictMode)
+        ) {
+          instance.render();
         }
-      };
-      updateHostComponent = function(
+        ReactDebugCurrentFiber.setCurrentPhase(null);
+      }
+    }
+
+    // React DevTools reads this flag.
+    workInProgress.effectTag |= PerformedWork;
+    if (didCaptureError) {
+      // If we're recovering from an error, reconcile twice: first to delete
+      // all the existing children.
+      reconcileChildrenAtExpirationTime(
         current,
         workInProgress,
-        updatePayload,
-        type,
-        oldProps,
-        newProps,
-        rootContainerInstance,
-        currentHostContext
-      ) {
-        // If there are no effects associated with this node, then none of our children had any updates.
-        // This guarantees that we can reuse all of them.
-        var childrenUnchanged = workInProgress.firstEffect === null;
-        var currentInstance = current.stateNode;
-        if (childrenUnchanged && updatePayload === null) {
-          // No changes, just reuse the existing instance.
-          // Note that this might release a previous clone.
-          workInProgress.stateNode = currentInstance;
-        } else {
-          var recyclableInstance = workInProgress.stateNode;
-          var newInstance = cloneInstance(
-            currentInstance,
-            updatePayload,
-            type,
-            oldProps,
-            newProps,
-            workInProgress,
-            childrenUnchanged,
-            recyclableInstance
-          );
-          if (
-            finalizeInitialChildren(
-              newInstance,
-              type,
-              newProps,
-              rootContainerInstance,
-              currentHostContext
-            )
-          ) {
-            markUpdate(workInProgress);
-          }
-          workInProgress.stateNode = newInstance;
-          if (childrenUnchanged) {
-            // If there are no other effects in this tree, we need to flag this node as having one.
-            // Even though we're not going to use it for anything.
-            // Otherwise parents won't know that there are new children to propagate upwards.
-            markUpdate(workInProgress);
-          } else {
-            // If children might have changed, we have to add them all to the set.
-            appendAllChildren(newInstance, workInProgress);
-          }
-        }
-      };
-      updateHostText = function(current, workInProgress, oldText, newText) {
-        if (oldText !== newText) {
-          // If the text content differs, we'll create a new text instance for it.
-          var rootContainerInstance = getRootHostContainer();
-          var currentHostContext = getHostContext();
-          workInProgress.stateNode = createTextInstance(
-            newText,
-            rootContainerInstance,
-            currentHostContext,
-            workInProgress
-          );
-          // We'll have to mark it as having an effect, even though we won't use the effect for anything.
-          // This lets the parents know that at least one of their children has changed.
-          markUpdate(workInProgress);
-        }
-      };
-    } else {
-      invariant(false, "Persistent reconciler is disabled.");
+        null,
+        renderExpirationTime
+      );
+      workInProgress.child = null;
+      // Now we can continue reconciling like normal. This has the effect of
+      // remounting all children regardless of whether their their
+      // identity matches.
     }
-  } else {
-    if (enableNoopReconciler) {
-      // No host operations
-      updateHostContainer = function(workInProgress) {
-        // Noop
-      };
-      updateHostComponent = function(
+    reconcileChildrenAtExpirationTime(
+      current,
+      workInProgress,
+      nextChildren,
+      renderExpirationTime
+    );
+    // Memoize props and state using the values we just used to render.
+    // TODO: Restructure so we never read values from the instance.
+    memoizeState(workInProgress, instance.state);
+    memoizeProps(workInProgress, instance.props);
+
+    // The context might have changed so we need to recalculate it.
+    if (hasContext) {
+      invalidateContextProvider(workInProgress, true);
+    }
+
+    return workInProgress.child;
+  }
+
+  function pushHostRootContext(workInProgress) {
+    var root = workInProgress.stateNode;
+    if (root.pendingContext) {
+      pushTopLevelContextObject(
+        workInProgress,
+        root.pendingContext,
+        root.pendingContext !== root.context
+      );
+    } else if (root.context) {
+      // Should always be set
+      pushTopLevelContextObject(workInProgress, root.context, false);
+    }
+    pushHostContainer(workInProgress, root.containerInfo);
+  }
+
+  function updateHostRoot(current, workInProgress, renderExpirationTime) {
+    pushHostRootContext(workInProgress);
+    var updateQueue = workInProgress.updateQueue;
+    if (updateQueue !== null) {
+      var prevState = workInProgress.memoizedState;
+      var state = processUpdateQueue(
         current,
         workInProgress,
-        updatePayload,
-        type,
-        oldProps,
-        newProps,
-        rootContainerInstance,
-        currentHostContext
+        updateQueue,
+        null,
+        null,
+        renderExpirationTime
+      );
+      memoizeState(workInProgress, state);
+      updateQueue = workInProgress.updateQueue;
+
+      var element = void 0;
+      if (updateQueue !== null && updateQueue.capturedValues !== null) {
+        // There's an uncaught error. Unmount the whole root.
+        element = null;
+      } else if (prevState === state) {
+        // If the state is the same as before, that's a bailout because we had
+        // no work that expires at this time.
+        resetHydrationState();
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      } else {
+        element = state.element;
+      }
+      var root = workInProgress.stateNode;
+      if (
+        (current === null || current.child === null) &&
+        root.hydrate &&
+        enterHydrationState(workInProgress)
       ) {
-        // Noop
-      };
-      updateHostText = function(current, workInProgress, oldText, newText) {
-        // Noop
-      };
-    } else {
-      invariant(false, "Noop reconciler is disabled.");
+        // If we don't have any current children this might be the first pass.
+        // We always try to hydrate. If this isn't a hydration pass there won't
+        // be any children to hydrate which is effectively the same thing as
+        // not hydrating.
+
+        // This is a bit of a hack. We track the host root as a placement to
+        // know that we're currently in a mounting state. That way isMounted
+        // works as expected. We must reset this before committing.
+        // TODO: Delete this when we delete isMounted and findDOMNode.
+        workInProgress.effectTag |= Placement;
+
+        // Ensure that children mount into this root without tracking
+        // side-effects. This ensures that we don't store Placement effects on
+        // nodes that will be hydrated.
+        workInProgress.child = mountChildFibers(
+          workInProgress,
+          null,
+          element,
+          renderExpirationTime
+        );
+      } else {
+        // Otherwise reset hydration state in case we aborted and resumed another
+        // root.
+        resetHydrationState();
+        reconcileChildren(current, workInProgress, element);
+      }
+      memoizeState(workInProgress, state);
+      return workInProgress.child;
     }
+    resetHydrationState();
+    // If there is no update queue, that's a bailout because the root has no props.
+    return bailoutOnAlreadyFinishedWork(current, workInProgress);
   }
 
-  function completeWork(current, workInProgress, renderExpirationTime) {
-    var newProps = workInProgress.pendingProps;
-    switch (workInProgress.tag) {
-      case FunctionalComponent:
-        return null;
-      case ClassComponent: {
-        // We are leaving this subtree, so pop context if any.
-        popLegacyContextProvider(workInProgress);
+  function updateHostComponent(current, workInProgress, renderExpirationTime) {
+    pushHostContext(workInProgress);
+
+    if (current === null) {
+      tryToClaimNextHydratableInstance(workInProgress);
+    }
+
+    var type = workInProgress.type;
+    var memoizedProps = workInProgress.memoizedProps;
+    var nextProps = workInProgress.pendingProps;
+    var prevProps = current !== null ? current.memoizedProps : null;
+
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (memoizedProps === nextProps) {
+      var isHidden =
+        workInProgress.mode & AsyncMode &&
+        shouldDeprioritizeSubtree(type, nextProps);
+      if (isHidden) {
+        // Before bailing out, make sure we've deprioritized a hidden component.
+        workInProgress.expirationTime = Never;
+      }
+      if (!isHidden || renderExpirationTime !== Never) {
+        return bailoutOnAlreadyFinishedWork(current, workInProgress);
+      }
+      // If we're rendering a hidden node at hidden priority, don't bailout. The
+      // parent is complete, but the children may not be.
+    }
+
+    var nextChildren = nextProps.children;
+    var isDirectTextChild = shouldSetTextContent(type, nextProps);
+
+    if (isDirectTextChild) {
+      // We special case a direct text child of a host node. This is a common
+      // case. We won't handle it as a reified child. We will instead handle
+      // this in the host environment that also have access to this prop. That
+      // avoids allocating another HostText fiber and traversing it.
+      nextChildren = null;
+    } else if (prevProps && shouldSetTextContent(type, prevProps)) {
+      // If we're switching from a direct text child to a normal child, or to
+      // empty, we need to schedule the text content to be reset.
+      workInProgress.effectTag |= ContentReset;
+    }
+
+    markRef(current, workInProgress);
+
+    // Check the host config to see if the children are offscreen/hidden.
+    if (
+      renderExpirationTime !== Never &&
+      workInProgress.mode & AsyncMode &&
+      shouldDeprioritizeSubtree(type, nextProps)
+    ) {
+      // Down-prioritize the children.
+      workInProgress.expirationTime = Never;
+      // Bailout and come back to this fiber later.
+      workInProgress.memoizedProps = nextProps;
+      return null;
+    }
+
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextProps);
+    return workInProgress.child;
+  }
+
+  function updateHostText(current, workInProgress) {
+    if (current === null) {
+      tryToClaimNextHydratableInstance(workInProgress);
+    }
+    var nextProps = workInProgress.pendingProps;
+    memoizeProps(workInProgress, nextProps);
+    // Nothing to do here. This is terminal. We'll do the completion step
+    // immediately after.
+    return null;
+  }
+
+  function mountIndeterminateComponent(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    invariant(
+      current === null,
+      "An indeterminate component should never have mounted. This error is " +
+        "likely caused by a bug in React. Please file an issue."
+    );
+    var fn = workInProgress.type;
+    var props = workInProgress.pendingProps;
+    var unmaskedContext = getUnmaskedContext(workInProgress);
+    var context = getMaskedContext(workInProgress, unmaskedContext);
+
+    var value = void 0;
 
-        // If this component caught an error, schedule an error log effect.
-        var instance = workInProgress.stateNode;
-        var updateQueue = workInProgress.updateQueue;
-        if (updateQueue !== null && updateQueue.capturedValues !== null) {
-          workInProgress.effectTag &= ~DidCapture;
-          if (typeof instance.componentDidCatch === "function") {
-            workInProgress.effectTag |= ErrLog;
-          } else {
-            // Normally we clear this in the commit phase, but since we did not
-            // schedule an effect, we need to reset it here.
-            updateQueue.capturedValues = null;
-          }
-        }
-        return null;
-      }
-      case HostRoot: {
-        popHostContainer(workInProgress);
-        popTopLevelLegacyContextObject(workInProgress);
-        var fiberRoot = workInProgress.stateNode;
-        if (fiberRoot.pendingContext) {
-          fiberRoot.context = fiberRoot.pendingContext;
-          fiberRoot.pendingContext = null;
-        }
-        if (current === null || current.child === null) {
-          // If we hydrated, pop so that we can delete any remaining children
-          // that weren't hydrated.
-          popHydrationState(workInProgress);
-          // This resets the hacky state to fix isMounted before committing.
-          // TODO: Delete this when we delete isMounted and findDOMNode.
-          workInProgress.effectTag &= ~Placement;
-        }
-        updateHostContainer(workInProgress);
+    {
+      if (fn.prototype && typeof fn.prototype.render === "function") {
+        var componentName = getComponentName(workInProgress) || "Unknown";
 
-        var _updateQueue = workInProgress.updateQueue;
-        if (_updateQueue !== null && _updateQueue.capturedValues !== null) {
-          workInProgress.effectTag |= ErrLog;
+        if (!didWarnAboutBadClass[componentName]) {
+          warning(
+            false,
+            "The <%s /> component appears to have a render method, but doesn't extend React.Component. " +
+              "This is likely to cause errors. Change %s to extend React.Component instead.",
+            componentName,
+            componentName
+          );
+          didWarnAboutBadClass[componentName] = true;
         }
-        return null;
       }
-      case HostComponent: {
-        popHostContext(workInProgress);
-        var rootContainerInstance = getRootHostContainer();
-        var type = workInProgress.type;
-        if (current !== null && workInProgress.stateNode != null) {
-          // If we have an alternate, that means this is an update and we need to
-          // schedule a side-effect to do the updates.
-          var oldProps = current.memoizedProps;
-          // If we get updated because one of our children updated, we don't
-          // have newProps so we'll have to reuse them.
-          // TODO: Split the update API as separate for the props vs. children.
-          // Even better would be if children weren't special cased at all tho.
-          var _instance = workInProgress.stateNode;
-          var currentHostContext = getHostContext();
-          // TODO: Experiencing an error where oldProps is null. Suggests a host
-          // component is hitting the resume path. Figure out why. Possibly
-          // related to `hidden`.
-          var updatePayload = prepareUpdate(
-            _instance,
-            type,
-            oldProps,
-            newProps,
-            rootContainerInstance,
-            currentHostContext
-          );
+      ReactCurrentOwner.current = workInProgress;
+      value = fn(props, context);
+    }
+    // React DevTools reads this flag.
+    workInProgress.effectTag |= PerformedWork;
 
-          updateHostComponent(
-            current,
-            workInProgress,
-            updatePayload,
-            type,
-            oldProps,
-            newProps,
-            rootContainerInstance,
-            currentHostContext
-          );
+    if (
+      typeof value === "object" &&
+      value !== null &&
+      typeof value.render === "function" &&
+      value.$$typeof === undefined
+    ) {
+      var Component = workInProgress.type;
 
-          if (current.ref !== workInProgress.ref) {
-            markRef(workInProgress);
-          }
-        } else {
-          if (!newProps) {
-            invariant(
-              workInProgress.stateNode !== null,
-              "We must have new props for new mounts. This error is likely " +
-                "caused by a bug in React. Please file an issue."
-            );
-            // This can happen when we abort work.
-            return null;
-          }
+      // Proceed under the assumption that this is a class instance
+      workInProgress.tag = ClassComponent;
 
-          var _currentHostContext = getHostContext();
-          // TODO: Move createInstance to beginWork and keep it on a context
-          // "stack" as the parent. Then append children as we go in beginWork
-          // or completeWork depending on we want to add then top->down or
-          // bottom->up. Top->down is faster in IE11.
-          var wasHydrated = popHydrationState(workInProgress);
-          if (wasHydrated) {
-            // TODO: Move this and createInstance step into the beginPhase
-            // to consolidate.
-            if (
-              prepareToHydrateHostInstance(
-                workInProgress,
-                rootContainerInstance,
-                _currentHostContext
-              )
-            ) {
-              // If changes to the hydrated node needs to be applied at the
-              // commit-phase we mark this as such.
-              markUpdate(workInProgress);
-            }
-          } else {
-            var _instance2 = createInstance(
-              type,
-              newProps,
-              rootContainerInstance,
-              _currentHostContext,
-              workInProgress
-            );
+      workInProgress.memoizedState =
+        value.state !== null && value.state !== undefined ? value.state : null;
 
-            appendAllChildren(_instance2, workInProgress);
+      if (typeof Component.getDerivedStateFromProps === "function") {
+        var partialState = callGetDerivedStateFromProps(
+          workInProgress,
+          value,
+          props
+        );
 
-            // Certain renderers require commit-time effects for initial mount.
-            // (eg DOM renderer supports auto-focus for certain elements).
-            // Make sure such renderers get scheduled for later work.
-            if (
-              finalizeInitialChildren(
-                _instance2,
-                type,
-                newProps,
-                rootContainerInstance,
-                _currentHostContext
-              )
-            ) {
-              markUpdate(workInProgress);
-            }
-            workInProgress.stateNode = _instance2;
+        if (partialState !== null && partialState !== undefined) {
+          workInProgress.memoizedState = Object.assign(
+            {},
+            workInProgress.memoizedState,
+            partialState
+          );
+        }
+      }
+
+      // Push context providers early to prevent context stack mismatches.
+      // During mounting we don't know the child context yet as the instance doesn't exist.
+      // We will invalidate the child context in finishClassComponent() right after rendering.
+      var hasContext = pushContextProvider(workInProgress);
+      adoptClassInstance(workInProgress, value);
+      mountClassInstance(workInProgress, renderExpirationTime);
+      return finishClassComponent(
+        current,
+        workInProgress,
+        true,
+        hasContext,
+        false,
+        renderExpirationTime
+      );
+    } else {
+      // Proceed under the assumption that this is a functional component
+      workInProgress.tag = FunctionalComponent;
+      {
+        var _Component = workInProgress.type;
+
+        if (_Component) {
+          warning(
+            !_Component.childContextTypes,
+            "%s(...): childContextTypes cannot be defined on a functional component.",
+            _Component.displayName || _Component.name || "Component"
+          );
+        }
+        if (workInProgress.ref !== null) {
+          var info = "";
+          var ownerName = ReactDebugCurrentFiber.getCurrentFiberOwnerName();
+          if (ownerName) {
+            info += "\n\nCheck the render method of `" + ownerName + "`.";
           }
 
-          if (workInProgress.ref !== null) {
-            // If there is a ref on a host node we need to schedule a callback
-            markRef(workInProgress);
+          var warningKey = ownerName || workInProgress._debugID || "";
+          var debugSource = workInProgress._debugSource;
+          if (debugSource) {
+            warningKey = debugSource.fileName + ":" + debugSource.lineNumber;
           }
-        }
-        return null;
-      }
-      case HostText: {
-        var newText = newProps;
-        if (current && workInProgress.stateNode != null) {
-          var oldText = current.memoizedProps;
-          // If we have an alternate, that means this is an update and we need
-          // to schedule a side-effect to do the updates.
-          updateHostText(current, workInProgress, oldText, newText);
-        } else {
-          if (typeof newText !== "string") {
-            invariant(
-              workInProgress.stateNode !== null,
-              "We must have new props for new mounts. This error is likely " +
-                "caused by a bug in React. Please file an issue."
+          if (!didWarnAboutStatelessRefs[warningKey]) {
+            didWarnAboutStatelessRefs[warningKey] = true;
+            warning(
+              false,
+              "Stateless function components cannot be given refs. " +
+                "Attempts to access this ref will fail.%s%s",
+              info,
+              ReactDebugCurrentFiber.getCurrentFiberStackAddendum()
             );
-            // This can happen when we abort work.
-            return null;
-          }
-          var _rootContainerInstance = getRootHostContainer();
-          var _currentHostContext2 = getHostContext();
-          var _wasHydrated = popHydrationState(workInProgress);
-          if (_wasHydrated) {
-            if (prepareToHydrateHostTextInstance(workInProgress)) {
-              markUpdate(workInProgress);
-            }
-          } else {
-            workInProgress.stateNode = createTextInstance(
-              newText,
-              _rootContainerInstance,
-              _currentHostContext2,
-              workInProgress
+          }
+        }
+
+        if (typeof fn.getDerivedStateFromProps === "function") {
+          var _componentName = getComponentName(workInProgress) || "Unknown";
+
+          if (
+            !didWarnAboutGetDerivedStateOnFunctionalComponent[_componentName]
+          ) {
+            warning(
+              false,
+              "%s: Stateless functional components do not support getDerivedStateFromProps.",
+              _componentName
             );
+            didWarnAboutGetDerivedStateOnFunctionalComponent[
+              _componentName
+            ] = true;
           }
         }
-        return null;
       }
-      case CallComponent:
-        return moveCallToHandlerPhase(
-          current,
-          workInProgress,
-          renderExpirationTime
-        );
-      case CallHandlerPhase:
-        // Reset the tag to now be a first phase call.
-        workInProgress.tag = CallComponent;
-        return null;
-      case ReturnComponent:
-        // Does nothing.
-        return null;
-      case ForwardRef:
-        return null;
-      case Fragment:
-        return null;
-      case Mode:
-        return null;
-      case HostPortal:
-        popHostContainer(workInProgress);
-        updateHostContainer(workInProgress);
-        return null;
-      case ContextProvider:
-        // Pop provider fiber
-        popProvider(workInProgress);
-        return null;
-      case ContextConsumer:
-        return null;
-      // Error cases
-      case IndeterminateComponent:
-        invariant(
-          false,
-          "An indeterminate component should have become determinate before " +
-            "completing. This error is likely caused by a bug in React. Please " +
-            "file an issue."
-        );
-      // eslint-disable-next-line no-fallthrough
-      default:
-        invariant(
-          false,
-          "Unknown unit of work tag. This error is likely caused by a bug in " +
-            "React. Please file an issue."
-        );
+      reconcileChildren(current, workInProgress, value);
+      memoizeProps(workInProgress, props);
+      return workInProgress.child;
     }
   }
 
-  return {
-    completeWork: completeWork
-  };
-};
+  function updateCallComponent(current, workInProgress, renderExpirationTime) {
+    var nextProps = workInProgress.pendingProps;
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (workInProgress.memoizedProps === nextProps) {
+      nextProps = workInProgress.memoizedProps;
+      // TODO: When bailing out, we might need to return the stateNode instead
+      // of the child. To check it for work.
+      // return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
 
-function createCapturedValue(value, source) {
-  // If the value is an error, call this function immediately after it is thrown
-  // so the stack is accurate.
-  return {
-    value: value,
-    source: source,
-    stack: getStackAddendumByWorkInProgressFiber(source)
-  };
-}
+    var nextChildren = nextProps.children;
 
-var ReactFiberUnwindWork = function(
-  hostContext,
-  legacyContext,
-  newContext,
-  scheduleWork,
-  isAlreadyFailedLegacyErrorBoundary
-) {
-  var popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext;
-  var popLegacyContextProvider = legacyContext.popContextProvider,
-    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
-  var popProvider = newContext.popProvider;
+    // The following is a fork of reconcileChildrenAtExpirationTime but using
+    // stateNode to store the child.
+    if (current === null) {
+      workInProgress.stateNode = mountChildFibers(
+        workInProgress,
+        workInProgress.stateNode,
+        nextChildren,
+        renderExpirationTime
+      );
+    } else {
+      workInProgress.stateNode = reconcileChildFibers(
+        workInProgress,
+        current.stateNode,
+        nextChildren,
+        renderExpirationTime
+      );
+    }
 
-  function throwException(returnFiber, sourceFiber, rawValue) {
-    // The source fiber did not complete.
-    sourceFiber.effectTag |= Incomplete;
-    // Its effect list is no longer valid.
-    sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+    memoizeProps(workInProgress, nextProps);
+    // This doesn't take arbitrary time so we could synchronously just begin
+    // eagerly do the work of workInProgress.child as an optimization.
+    return workInProgress.stateNode;
+  }
 
-    var value = createCapturedValue(rawValue, sourceFiber);
+  function updatePortalComponent(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
+    var nextChildren = workInProgress.pendingProps;
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (workInProgress.memoizedProps === nextChildren) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
 
-    var workInProgress = returnFiber;
-    do {
-      switch (workInProgress.tag) {
-        case HostRoot: {
-          // Uncaught error
-          var errorInfo = value;
-          ensureUpdateQueues(workInProgress);
-          var updateQueue = workInProgress.updateQueue;
-          updateQueue.capturedValues = [errorInfo];
-          workInProgress.effectTag |= ShouldCapture;
-          return;
-        }
-        case ClassComponent:
-          // Capture and retry
-          var ctor = workInProgress.type;
-          var _instance = workInProgress.stateNode;
-          if (
-            (workInProgress.effectTag & DidCapture) === NoEffect &&
-            ((typeof ctor.getDerivedStateFromCatch === "function" &&
-              enableGetDerivedStateFromCatch) ||
-              (_instance !== null &&
-                typeof _instance.componentDidCatch === "function" &&
-                !isAlreadyFailedLegacyErrorBoundary(_instance)))
-          ) {
-            ensureUpdateQueues(workInProgress);
-            var _updateQueue = workInProgress.updateQueue;
-            var capturedValues = _updateQueue.capturedValues;
-            if (capturedValues === null) {
-              _updateQueue.capturedValues = [value];
-            } else {
-              capturedValues.push(value);
+    if (current === null) {
+      // Portals are special because we don't append the children during mount
+      // but at commit. Therefore we need to track insertions which the normal
+      // flow doesn't do during mount. This doesn't happen at the root because
+      // the root always starts with a "current" with a null child.
+      // TODO: Consider unifying this with how the root works.
+      workInProgress.child = reconcileChildFibers(
+        workInProgress,
+        null,
+        nextChildren,
+        renderExpirationTime
+      );
+      memoizeProps(workInProgress, nextChildren);
+    } else {
+      reconcileChildren(current, workInProgress, nextChildren);
+      memoizeProps(workInProgress, nextChildren);
+    }
+    return workInProgress.child;
+  }
+
+  function propagateContextChange(
+    workInProgress,
+    context,
+    changedBits,
+    renderExpirationTime
+  ) {
+    var fiber = workInProgress.child;
+    while (fiber !== null) {
+      var nextFiber = void 0;
+      // Visit this fiber.
+      switch (fiber.tag) {
+        case ContextConsumer:
+          // Check if the context matches.
+          var observedBits = fiber.stateNode | 0;
+          if (fiber.type === context && (observedBits & changedBits) !== 0) {
+            // Update the expiration time of all the ancestors, including
+            // the alternates.
+            var node = fiber;
+            while (node !== null) {
+              var alternate = node.alternate;
+              if (
+                node.expirationTime === NoWork ||
+                node.expirationTime > renderExpirationTime
+              ) {
+                node.expirationTime = renderExpirationTime;
+                if (
+                  alternate !== null &&
+                  (alternate.expirationTime === NoWork ||
+                    alternate.expirationTime > renderExpirationTime)
+                ) {
+                  alternate.expirationTime = renderExpirationTime;
+                }
+              } else if (
+                alternate !== null &&
+                (alternate.expirationTime === NoWork ||
+                  alternate.expirationTime > renderExpirationTime)
+              ) {
+                alternate.expirationTime = renderExpirationTime;
+              } else {
+                // Neither alternate was updated, which means the rest of the
+                // ancestor path already has sufficient priority.
+                break;
+              }
+              node = node["return"];
             }
-            workInProgress.effectTag |= ShouldCapture;
-            return;
+            // Don't scan deeper than a matching consumer. When we render the
+            // consumer, we'll continue scanning from that point. This way the
+            // scanning work is time-sliced.
+            nextFiber = null;
+          } else {
+            // Traverse down.
+            nextFiber = fiber.child;
           }
           break;
-        default:
-          break;
-      }
-      workInProgress = workInProgress["return"];
-    } while (workInProgress !== null);
-  }
-
-  function unwindWork(workInProgress) {
-    switch (workInProgress.tag) {
-      case ClassComponent: {
-        popLegacyContextProvider(workInProgress);
-        var effectTag = workInProgress.effectTag;
-        if (effectTag & ShouldCapture) {
-          workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
-          return workInProgress;
-        }
-        return null;
+        case ContextProvider:
+          // Don't scan deeper if this is a matching provider
+          nextFiber = fiber.type === workInProgress.type ? null : fiber.child;
+          break;
+        default:
+          // Traverse down.
+          nextFiber = fiber.child;
+          break;
       }
-      case HostRoot: {
-        popHostContainer(workInProgress);
-        popTopLevelLegacyContextObject(workInProgress);
-        var _effectTag = workInProgress.effectTag;
-        if (_effectTag & ShouldCapture) {
-          workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
-          return workInProgress;
+      if (nextFiber !== null) {
+        // Set the return pointer of the child to the work-in-progress fiber.
+        nextFiber["return"] = fiber;
+      } else {
+        // No child. Traverse to next sibling.
+        nextFiber = fiber;
+        while (nextFiber !== null) {
+          if (nextFiber === workInProgress) {
+            // We're back to the root of this subtree. Exit.
+            nextFiber = null;
+            break;
+          }
+          var sibling = nextFiber.sibling;
+          if (sibling !== null) {
+            nextFiber = sibling;
+            break;
+          }
+          // No more siblings. Traverse up.
+          nextFiber = nextFiber["return"];
         }
-        return null;
       }
-      case HostComponent: {
-        popHostContext(workInProgress);
-        return null;
-      }
-      case HostPortal:
-        popHostContainer(workInProgress);
-        return null;
-      case ContextProvider:
-        popProvider(workInProgress);
-        return null;
-      default:
-        return null;
-    }
-  }
-
-  function unwindInterruptedWork(interruptedWork) {
-    switch (interruptedWork.tag) {
-      case ClassComponent: {
-        popLegacyContextProvider(interruptedWork);
-        break;
-      }
-      case HostRoot: {
-        popHostContainer(interruptedWork);
-        popTopLevelLegacyContextObject(interruptedWork);
-        break;
-      }
-      case HostComponent: {
-        popHostContext(interruptedWork);
-        break;
-      }
-      case HostPortal:
-        popHostContainer(interruptedWork);
-        break;
-      case ContextProvider:
-        popProvider(interruptedWork);
-        break;
-      default:
-        break;
+      fiber = nextFiber;
     }
   }
 
-  return {
-    throwException: throwException,
-    unwindWork: unwindWork,
-    unwindInterruptedWork: unwindInterruptedWork
-  };
-};
-
-// Module provided by RN:
-/**
- * Intercept lifecycle errors and ensure they are shown with the correct stack
- * trace within the native redbox component.
- */
-function showErrorDialog(capturedError) {
-  var componentStack = capturedError.componentStack,
-    error = capturedError.error;
-
-  var errorToHandle = void 0;
-
-  // Typically Errors are thrown but eg strings or null can be thrown as well.
-  if (error instanceof Error) {
-    var message = error.message,
-      name = error.name;
-
-    var summary = message ? name + ": " + message : name;
-
-    errorToHandle = error;
-
-    try {
-      errorToHandle.message =
-        summary + "\n\nThis error is located at:" + componentStack;
-    } catch (e) {}
-  } else if (typeof error === "string") {
-    errorToHandle = new Error(
-      error + "\n\nThis error is located at:" + componentStack
-    );
-  } else {
-    errorToHandle = new Error("Unspecified error at:" + componentStack);
-  }
-
-  ExceptionsManager.handleException(errorToHandle, false);
-
-  // Return false here to prevent ReactFiberErrorLogger default behavior of
-  // logging error details to console.error. Calls to console.error are
-  // automatically routed to the native redbox controller, which we've already
-  // done above by calling ExceptionsManager.
-  return false;
-}
-
-function logCapturedError(capturedError) {
-  var logError = showErrorDialog(capturedError);
-
-  // Allow injected showErrorDialog() to prevent default console.error logging.
-  // This enables renderers like ReactNative to better manage redbox behavior.
-  if (logError === false) {
-    return;
-  }
+  function updateContextProvider(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    var providerType = workInProgress.type;
+    var context = providerType.context;
 
-  var error = capturedError.error;
-  var suppressLogging = error && error.suppressReactErrorLogging;
-  if (suppressLogging) {
-    return;
-  }
+    var newProps = workInProgress.pendingProps;
+    var oldProps = workInProgress.memoizedProps;
 
-  {
-    var componentName = capturedError.componentName,
-      componentStack = capturedError.componentStack,
-      errorBoundaryName = capturedError.errorBoundaryName,
-      errorBoundaryFound = capturedError.errorBoundaryFound,
-      willRetry = capturedError.willRetry;
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (oldProps === newProps) {
+      workInProgress.stateNode = 0;
+      pushProvider(workInProgress);
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
 
-    var componentNameMessage = componentName
-      ? "The above error occurred in the <" + componentName + "> component:"
-      : "The above error occurred in one of your React components:";
+    var newValue = newProps.value;
+    workInProgress.memoizedProps = newProps;
 
-    var errorBoundaryMessage = void 0;
-    // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
-    if (errorBoundaryFound && errorBoundaryName) {
-      if (willRetry) {
-        errorBoundaryMessage =
-          "React will try to recreate this component tree from scratch " +
-          ("using the error boundary you provided, " + errorBoundaryName + ".");
+    var changedBits = void 0;
+    if (oldProps === null) {
+      // Initial render
+      changedBits = MAX_SIGNED_31_BIT_INT;
+    } else {
+      if (oldProps.value === newProps.value) {
+        // No change. Bailout early if children are the same.
+        if (oldProps.children === newProps.children) {
+          workInProgress.stateNode = 0;
+          pushProvider(workInProgress);
+          return bailoutOnAlreadyFinishedWork(current, workInProgress);
+        }
+        changedBits = 0;
       } else {
-        errorBoundaryMessage =
-          "This error was initially handled by the error boundary " +
-          errorBoundaryName +
-          ".\n" +
-          "Recreating the tree from scratch failed so React will unmount the tree.";
+        var oldValue = oldProps.value;
+        // Use Object.is to compare the new context value to the old value.
+        // Inlined Object.is polyfill.
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
+        if (
+          (oldValue === newValue &&
+            (oldValue !== 0 || 1 / oldValue === 1 / newValue)) ||
+          (oldValue !== oldValue && newValue !== newValue) // eslint-disable-line no-self-compare
+        ) {
+          // No change. Bailout early if children are the same.
+          if (oldProps.children === newProps.children) {
+            workInProgress.stateNode = 0;
+            pushProvider(workInProgress);
+            return bailoutOnAlreadyFinishedWork(current, workInProgress);
+          }
+          changedBits = 0;
+        } else {
+          changedBits =
+            typeof context._calculateChangedBits === "function"
+              ? context._calculateChangedBits(oldValue, newValue)
+              : MAX_SIGNED_31_BIT_INT;
+          {
+            warning(
+              (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
+              "calculateChangedBits: Expected the return value to be a " +
+                "31-bit integer. Instead received: %s",
+              changedBits
+            );
+          }
+          changedBits |= 0;
+
+          if (changedBits === 0) {
+            // No change. Bailout early if children are the same.
+            if (oldProps.children === newProps.children) {
+              workInProgress.stateNode = 0;
+              pushProvider(workInProgress);
+              return bailoutOnAlreadyFinishedWork(current, workInProgress);
+            }
+          } else {
+            propagateContextChange(
+              workInProgress,
+              context,
+              changedBits,
+              renderExpirationTime
+            );
+          }
+        }
       }
-    } else {
-      errorBoundaryMessage =
-        "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
-        "Visit https://fb.me/react-error-boundaries to learn more about error boundaries.";
     }
-    var combinedMessage =
-      "" +
-      componentNameMessage +
-      componentStack +
-      "\n\n" +
-      ("" + errorBoundaryMessage);
-
-    // In development, we provide our own message with just the component stack.
-    // We don't include the original error message and JS stack because the browser
-    // has already printed it. Even if the application swallows the error, it is still
-    // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
-    console.error(combinedMessage);
-  }
-}
-
-var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
-var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
-var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
-
-var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
-{
-  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
-}
-
-function logError(boundary, errorInfo) {
-  var source = errorInfo.source;
-  var stack = errorInfo.stack;
-  if (stack === null) {
-    stack = getStackAddendumByWorkInProgressFiber(source);
-  }
 
-  var capturedError = {
-    componentName: source !== null ? getComponentName(source) : null,
-    componentStack: stack !== null ? stack : "",
-    error: errorInfo.value,
-    errorBoundary: null,
-    errorBoundaryName: null,
-    errorBoundaryFound: false,
-    willRetry: false
-  };
+    workInProgress.stateNode = changedBits;
+    pushProvider(workInProgress);
 
-  if (boundary !== null && boundary.tag === ClassComponent) {
-    capturedError.errorBoundary = boundary.stateNode;
-    capturedError.errorBoundaryName = getComponentName(boundary);
-    capturedError.errorBoundaryFound = true;
-    capturedError.willRetry = true;
+    var newChildren = newProps.children;
+    reconcileChildren(current, workInProgress, newChildren);
+    return workInProgress.child;
   }
 
-  try {
-    logCapturedError(capturedError);
-  } catch (e) {
-    // Prevent cycle if logCapturedError() throws.
-    // A cycle may still occur if logCapturedError renders a component that throws.
-    var suppressLogging = e && e.suppressReactErrorLogging;
-    if (!suppressLogging) {
-      console.error(e);
+  function updateContextConsumer(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    var context = workInProgress.type;
+    var newProps = workInProgress.pendingProps;
+    var oldProps = workInProgress.memoizedProps;
+
+    var newValue = context._currentValue;
+    var changedBits = context._changedBits;
+
+    if (hasContextChanged()) {
+      // Normally we can bail out on props equality but if context has changed
+      // we don't do the bailout and we have to reuse existing props instead.
+    } else if (changedBits === 0 && oldProps === newProps) {
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
-  }
-}
+    workInProgress.memoizedProps = newProps;
 
-var ReactFiberCommitWork = function(
-  config,
-  captureError,
-  scheduleWork,
-  computeExpirationForFiber,
-  markLegacyErrorBoundaryAsFailed,
-  recalculateCurrentTime
-) {
-  var getPublicInstance = config.getPublicInstance,
-    mutation = config.mutation,
-    persistence = config.persistence;
+    var observedBits = newProps.unstable_observedBits;
+    if (observedBits === undefined || observedBits === null) {
+      // Subscribe to all changes by default
+      observedBits = MAX_SIGNED_31_BIT_INT;
+    }
+    // Store the observedBits on the fiber's stateNode for quick access.
+    workInProgress.stateNode = observedBits;
 
-  var callComponentWillUnmountWithTimer = function(current, instance) {
-    startPhaseTimer(current, "componentWillUnmount");
-    instance.props = current.memoizedProps;
-    instance.state = current.memoizedState;
-    instance.componentWillUnmount();
-    stopPhaseTimer();
-  };
+    if ((changedBits & observedBits) !== 0) {
+      // Context change propagation stops at matching consumers, for time-
+      // slicing. Continue the propagation here.
+      propagateContextChange(
+        workInProgress,
+        context,
+        changedBits,
+        renderExpirationTime
+      );
+    } else if (oldProps !== null && oldProps.children === newProps.children) {
+      // No change. Bailout early if children are the same.
+      return bailoutOnAlreadyFinishedWork(current, workInProgress);
+    }
+
+    var render = newProps.children;
 
-  // Capture errors so they don't interrupt unmounting.
-  function safelyCallComponentWillUnmount(current, instance) {
     {
-      invokeGuardedCallback$3(
-        null,
-        callComponentWillUnmountWithTimer,
-        null,
-        current,
-        instance
+      warning(
+        typeof render === "function",
+        "A context consumer was rendered with multiple children, or a child " +
+          "that isn't a function. A context consumer expects a single child " +
+          "that is a function. If you did pass a function, make sure there " +
+          "is no trailing or leading whitespace around it."
       );
-      if (hasCaughtError$1()) {
-        var unmountError = clearCaughtError$1();
-        captureError(current, unmountError);
-      }
     }
+
+    var newChildren = render(newValue);
+    reconcileChildren(current, workInProgress, newChildren);
+    return workInProgress.child;
   }
 
-  function safelyDetachRef(current) {
-    var ref = current.ref;
-    if (ref !== null) {
-      if (typeof ref === "function") {
-        {
-          invokeGuardedCallback$3(null, ref, null, null);
-          if (hasCaughtError$1()) {
-            var refError = clearCaughtError$1();
-            captureError(current, refError);
-          }
+  /*
+  function reuseChildrenEffects(returnFiber : Fiber, firstChild : Fiber) {
+    let child = firstChild;
+    do {
+      // Ensure that the first and last effect of the parent corresponds
+      // to the children's first and last effect.
+      if (!returnFiber.firstEffect) {
+        returnFiber.firstEffect = child.firstEffect;
+      }
+      if (child.lastEffect) {
+        if (returnFiber.lastEffect) {
+          returnFiber.lastEffect.nextEffect = child.firstEffect;
         }
-      } else {
-        ref.current = null;
+        returnFiber.lastEffect = child.lastEffect;
       }
-    }
+    } while (child = child.sibling);
   }
+  */
 
-  function commitBeforeMutationLifeCycles(current, finishedWork) {
-    switch (finishedWork.tag) {
-      case ClassComponent: {
-        if (finishedWork.effectTag & Snapshot) {
-          if (current !== null) {
-            var prevProps = current.memoizedProps;
-            var prevState = current.memoizedState;
-            startPhaseTimer(finishedWork, "getSnapshotBeforeUpdate");
-            var _instance = finishedWork.stateNode;
-            _instance.props = finishedWork.memoizedProps;
-            _instance.state = finishedWork.memoizedState;
-            var snapshot = _instance.getSnapshotBeforeUpdate(
-              prevProps,
-              prevState
-            );
-            {
-              var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
-              if (
-                snapshot === undefined &&
-                !didWarnSet.has(finishedWork.type)
-              ) {
-                didWarnSet.add(finishedWork.type);
-                warning(
-                  false,
-                  "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
-                    "must be returned. You have returned undefined.",
-                  getComponentName(finishedWork)
-                );
-              }
-            }
-            _instance.__reactInternalSnapshotBeforeUpdate = snapshot;
-            stopPhaseTimer();
-          }
-        }
-        return;
-      }
+  function bailoutOnAlreadyFinishedWork(current, workInProgress) {
+    cancelWorkTimer(workInProgress);
+
+    // TODO: We should ideally be able to bail out early if the children have no
+    // more work to do. However, since we don't have a separation of this
+    // Fiber's priority and its children yet - we don't know without doing lots
+    // of the same work we do anyway. Once we have that separation we can just
+    // bail out here if the children has no more work at this priority level.
+    // if (workInProgress.priorityOfChildren <= priorityLevel) {
+    //   // If there are side-effects in these children that have not yet been
+    //   // committed we need to ensure that they get properly transferred up.
+    //   if (current && current.child !== workInProgress.child) {
+    //     reuseChildrenEffects(workInProgress, child);
+    //   }
+    //   return null;
+    // }
+
+    cloneChildFibers(current, workInProgress);
+    return workInProgress.child;
+  }
+
+  function bailoutOnLowPriority(current, workInProgress) {
+    cancelWorkTimer(workInProgress);
+
+    // TODO: Handle HostComponent tags here as well and call pushHostContext()?
+    // See PR 8590 discussion for context
+    switch (workInProgress.tag) {
       case HostRoot:
-      case HostComponent:
-      case HostText:
+        pushHostRootContext(workInProgress);
+        break;
+      case ClassComponent:
+        pushContextProvider(workInProgress);
+        break;
       case HostPortal:
-        // Nothing to do for these component types
-        return;
-      default: {
-        invariant(
-          false,
-          "This unit of work tag should not have side-effects. This error is " +
-            "likely caused by a bug in React. Please file an issue."
+        pushHostContainer(
+          workInProgress,
+          workInProgress.stateNode.containerInfo
         );
-      }
+        break;
+      case ContextProvider:
+        pushProvider(workInProgress);
+        break;
     }
+    // TODO: What if this is currently in progress?
+    // How can that happen? How is this not being cloned?
+    return null;
   }
 
-  function commitLifeCycles(
-    finishedRoot,
-    current,
-    finishedWork,
-    currentTime,
-    committedExpirationTime
-  ) {
-    switch (finishedWork.tag) {
-      case ClassComponent: {
-        var _instance2 = finishedWork.stateNode;
-        if (finishedWork.effectTag & Update) {
-          if (current === null) {
-            startPhaseTimer(finishedWork, "componentDidMount");
-            _instance2.props = finishedWork.memoizedProps;
-            _instance2.state = finishedWork.memoizedState;
-            _instance2.componentDidMount();
-            stopPhaseTimer();
-          } else {
-            var prevProps = current.memoizedProps;
-            var prevState = current.memoizedState;
-            startPhaseTimer(finishedWork, "componentDidUpdate");
-            _instance2.props = finishedWork.memoizedProps;
-            _instance2.state = finishedWork.memoizedState;
-            _instance2.componentDidUpdate(
-              prevProps,
-              prevState,
-              _instance2.__reactInternalSnapshotBeforeUpdate
-            );
-            stopPhaseTimer();
-          }
-        }
-        var updateQueue = finishedWork.updateQueue;
-        if (updateQueue !== null) {
-          commitCallbacks(updateQueue, _instance2);
-        }
-        return;
-      }
-      case HostRoot: {
-        var _updateQueue = finishedWork.updateQueue;
-        if (_updateQueue !== null) {
-          var _instance3 = null;
-          if (finishedWork.child !== null) {
-            switch (finishedWork.child.tag) {
-              case HostComponent:
-                _instance3 = getPublicInstance(finishedWork.child.stateNode);
-                break;
-              case ClassComponent:
-                _instance3 = finishedWork.child.stateNode;
-                break;
-            }
-          }
-          commitCallbacks(_updateQueue, _instance3);
-        }
-        return;
-      }
-      case HostComponent: {
-        var _instance4 = finishedWork.stateNode;
+  // TODO: Delete memoizeProps/State and move to reconcile/bailout instead
+  function memoizeProps(workInProgress, nextProps) {
+    workInProgress.memoizedProps = nextProps;
+  }
 
-        // Renderers may schedule work to be done after host components are mounted
-        // (eg DOM renderer may schedule auto-focus for inputs and form controls).
-        // These effects should only be committed when components are first mounted,
-        // aka when there is no current/alternate.
-        if (current === null && finishedWork.effectTag & Update) {
-          var type = finishedWork.type;
-          var props = finishedWork.memoizedProps;
-          commitMount(_instance4, type, props, finishedWork);
-        }
+  function memoizeState(workInProgress, nextState) {
+    workInProgress.memoizedState = nextState;
+    // Don't reset the updateQueue, in case there are pending updates. Resetting
+    // is handled by processUpdateQueue.
+  }
 
-        return;
-      }
-      case HostText: {
-        // We have no life-cycles associated with text.
-        return;
-      }
-      case HostPortal: {
-        // We have no life-cycles associated with portals.
-        return;
-      }
-      default: {
-        invariant(
-          false,
-          "This unit of work tag should not have side-effects. This error is " +
-            "likely caused by a bug in React. Please file an issue."
-        );
-      }
+  function beginWork(current, workInProgress, renderExpirationTime) {
+    if (
+      workInProgress.expirationTime === NoWork ||
+      workInProgress.expirationTime > renderExpirationTime
+    ) {
+      return bailoutOnLowPriority(current, workInProgress);
     }
-  }
 
-  function commitErrorLogging(finishedWork, onUncaughtError) {
-    switch (finishedWork.tag) {
+    switch (workInProgress.tag) {
+      case IndeterminateComponent:
+        return mountIndeterminateComponent(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case FunctionalComponent:
+        return updateFunctionalComponent(current, workInProgress);
       case ClassComponent:
-        {
-          var ctor = finishedWork.type;
-          var _instance5 = finishedWork.stateNode;
-          var updateQueue = finishedWork.updateQueue;
-          invariant(
-            updateQueue !== null && updateQueue.capturedValues !== null,
-            "An error logging effect should not have been scheduled if no errors " +
-              "were captured. This error is likely caused by a bug in React. " +
-              "Please file an issue."
-          );
-          var capturedErrors = updateQueue.capturedValues;
-          updateQueue.capturedValues = null;
-
-          if (typeof ctor.getDerivedStateFromCatch !== "function") {
-            // To preserve the preexisting retry behavior of error boundaries,
-            // we keep track of which ones already failed during this batch.
-            // This gets reset before we yield back to the browser.
-            // TODO: Warn in strict mode if getDerivedStateFromCatch is
-            // not defined.
-            markLegacyErrorBoundaryAsFailed(_instance5);
-          }
-
-          _instance5.props = finishedWork.memoizedProps;
-          _instance5.state = finishedWork.memoizedState;
-          for (var i = 0; i < capturedErrors.length; i++) {
-            var errorInfo = capturedErrors[i];
-            var _error = errorInfo.value;
-            var stack = errorInfo.stack;
-            logError(finishedWork, errorInfo);
-            _instance5.componentDidCatch(_error, {
-              componentStack: stack !== null ? stack : ""
-            });
-          }
-        }
-        break;
-      case HostRoot: {
-        var _updateQueue2 = finishedWork.updateQueue;
-        invariant(
-          _updateQueue2 !== null && _updateQueue2.capturedValues !== null,
-          "An error logging effect should not have been scheduled if no errors " +
-            "were captured. This error is likely caused by a bug in React. " +
-            "Please file an issue."
+        return updateClassComponent(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case HostRoot:
+        return updateHostRoot(current, workInProgress, renderExpirationTime);
+      case HostComponent:
+        return updateHostComponent(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case HostText:
+        return updateHostText(current, workInProgress);
+      case CallHandlerPhase:
+        // This is a restart. Reset the tag to the initial phase.
+        workInProgress.tag = CallComponent;
+      // Intentionally fall through since this is now the same.
+      case CallComponent:
+        return updateCallComponent(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case ReturnComponent:
+        // A return component is just a placeholder, we can just run through the
+        // next one immediately.
+        return null;
+      case HostPortal:
+        return updatePortalComponent(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case Fragment:
+        return updateFragment(current, workInProgress);
+      case Mode:
+        return updateMode(current, workInProgress);
+      case ContextProvider:
+        return updateContextProvider(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case ContextConsumer:
+        return updateContextConsumer(
+          current,
+          workInProgress,
+          renderExpirationTime
         );
-        var _capturedErrors = _updateQueue2.capturedValues;
-        _updateQueue2.capturedValues = null;
-        for (var _i = 0; _i < _capturedErrors.length; _i++) {
-          var _errorInfo = _capturedErrors[_i];
-          logError(finishedWork, _errorInfo);
-          onUncaughtError(_errorInfo.value);
-        }
-        break;
-      }
       default:
         invariant(
           false,
-          "This unit of work tag cannot capture errors.  This error is " +
-            "likely caused by a bug in React. Please file an issue."
+          "Unknown unit of work tag. This error is likely caused by a bug in " +
+            "React. Please file an issue."
         );
     }
   }
 
-  function commitAttachRef(finishedWork) {
-    var ref = finishedWork.ref;
-    if (ref !== null) {
-      var _instance6 = finishedWork.stateNode;
-      var instanceToUse = void 0;
-      switch (finishedWork.tag) {
-        case HostComponent:
-          instanceToUse = getPublicInstance(_instance6);
-          break;
-        default:
-          instanceToUse = _instance6;
-      }
-      if (typeof ref === "function") {
-        ref(instanceToUse);
-      } else {
-        {
-          if (!ref.hasOwnProperty("current")) {
-            warning(
-              false,
-              "Unexpected ref object provided for %s. " +
-                "Use either a ref-setter function or React.createRef().%s",
-              getComponentName(finishedWork),
-              getStackAddendumByWorkInProgressFiber(finishedWork)
-            );
-          }
-        }
+  return {
+    beginWork: beginWork
+  };
+};
 
-        ref.current = instanceToUse;
-      }
-    }
+var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
+  var createInstance = config.createInstance,
+    createTextInstance = config.createTextInstance,
+    appendInitialChild = config.appendInitialChild,
+    finalizeInitialChildren = config.finalizeInitialChildren,
+    prepareUpdate = config.prepareUpdate,
+    mutation = config.mutation,
+    persistence = config.persistence;
+  var getRootHostContainer = hostContext.getRootHostContainer,
+    popHostContext = hostContext.popHostContext,
+    getHostContext = hostContext.getHostContext,
+    popHostContainer = hostContext.popHostContainer;
+  var prepareToHydrateHostInstance =
+      hydrationContext.prepareToHydrateHostInstance,
+    prepareToHydrateHostTextInstance =
+      hydrationContext.prepareToHydrateHostTextInstance,
+    popHydrationState = hydrationContext.popHydrationState;
+
+  function markUpdate(workInProgress) {
+    // Tag the fiber with an update effect. This turns a Placement into
+    // an UpdateAndPlacement.
+    workInProgress.effectTag |= Update;
   }
 
-  function commitDetachRef(current) {
-    var currentRef = current.ref;
-    if (currentRef !== null) {
-      if (typeof currentRef === "function") {
-        currentRef(null);
-      } else {
-        currentRef.current = null;
-      }
-    }
+  function markRef(workInProgress) {
+    workInProgress.effectTag |= Ref;
   }
 
-  // User-originating errors (lifecycles and refs) should not interrupt
-  // deletion, so don't let them throw. Host-originating errors should
-  // interrupt deletion, so it's okay
-  function commitUnmount(current) {
-    if (typeof onCommitUnmount === "function") {
-      onCommitUnmount(current);
+  function appendAllReturns(returns, workInProgress) {
+    var node = workInProgress.stateNode;
+    if (node) {
+      node["return"] = workInProgress;
     }
-
-    switch (current.tag) {
-      case ClassComponent: {
-        safelyDetachRef(current);
-        var _instance7 = current.stateNode;
-        if (typeof _instance7.componentWillUnmount === "function") {
-          safelyCallComponentWillUnmount(current, _instance7);
-        }
-        return;
-      }
-      case HostComponent: {
-        safelyDetachRef(current);
-        return;
-      }
-      case CallComponent: {
-        commitNestedUnmounts(current.stateNode);
-        return;
+    while (node !== null) {
+      if (
+        node.tag === HostComponent ||
+        node.tag === HostText ||
+        node.tag === HostPortal
+      ) {
+        invariant(false, "A call cannot have host component children.");
+      } else if (node.tag === ReturnComponent) {
+        returns.push(node.pendingProps.value);
+      } else if (node.child !== null) {
+        node.child["return"] = node;
+        node = node.child;
+        continue;
       }
-      case HostPortal: {
-        // TODO: this is recursive.
-        // We are also not using this parent because
-        // the portal will get pushed immediately.
-        if (enableMutatingReconciler && mutation) {
-          unmountHostComponents(current);
-        } else if (enablePersistentReconciler && persistence) {
-          emptyPortalContainer(current);
+      while (node.sibling === null) {
+        if (node["return"] === null || node["return"] === workInProgress) {
+          return;
         }
-        return;
+        node = node["return"];
       }
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
     }
   }
 
-  function commitNestedUnmounts(root) {
-    // While we're inside a removed host node we don't want to call
-    // removeChild on the inner nodes because they're removed by the top
-    // call anyway. We also want to call componentWillUnmount on all
-    // composites before this host node is removed from the tree. Therefore
-    var node = root;
-    while (true) {
-      commitUnmount(node);
-      // Visit children because they may contain more composite or host nodes.
-      // Skip portals because commitUnmount() currently visits them recursively.
-      if (
-        node.child !== null &&
-        // If we use mutation we drill down into portals using commitUnmount above.
-        // If we don't use mutation we drill down into portals here instead.
-        (!mutation || node.tag !== HostPortal)
-      ) {
+  function moveCallToHandlerPhase(
+    current,
+    workInProgress,
+    renderExpirationTime
+  ) {
+    var props = workInProgress.memoizedProps;
+    invariant(
+      props,
+      "Should be resolved by now. This error is likely caused by a bug in " +
+        "React. Please file an issue."
+    );
+
+    // First step of the call has completed. Now we need to do the second.
+    // TODO: It would be nice to have a multi stage call represented by a
+    // single component, or at least tail call optimize nested ones. Currently
+    // that requires additional fields that we don't want to add to the fiber.
+    // So this requires nested handlers.
+    // Note: This doesn't mutate the alternate node. I don't think it needs to
+    // since this stage is reset for every pass.
+    workInProgress.tag = CallHandlerPhase;
+
+    // Build up the returns.
+    // TODO: Compare this to a generator or opaque helpers like Children.
+    var returns = [];
+    appendAllReturns(returns, workInProgress);
+    var fn = props.handler;
+    var childProps = props.props;
+    var nextChildren = fn(childProps, returns);
+
+    var currentFirstChild = current !== null ? current.child : null;
+    workInProgress.child = reconcileChildFibers(
+      workInProgress,
+      currentFirstChild,
+      nextChildren,
+      renderExpirationTime
+    );
+    return workInProgress.child;
+  }
+
+  function appendAllChildren(parent, workInProgress) {
+    // We only have the top Fiber that was created but we need recurse down its
+    // children to find all the terminal nodes.
+    var node = workInProgress.child;
+    while (node !== null) {
+      if (node.tag === HostComponent || node.tag === HostText) {
+        appendInitialChild(parent, node.stateNode);
+      } else if (node.tag === HostPortal) {
+        // If we have a portal child, then we don't want to traverse
+        // down its children. Instead, we'll get insertions from each child in
+        // the portal directly.
+      } else if (node.child !== null) {
         node.child["return"] = node;
         node = node.child;
         continue;
       }
-      if (node === root) {
+      if (node === workInProgress) {
         return;
       }
       while (node.sibling === null) {
-        if (node["return"] === null || node["return"] === root) {
+        if (node["return"] === null || node["return"] === workInProgress) {
           return;
         }
         node = node["return"];
@@ -10877,1300 +9835,1859 @@ var ReactFiberCommitWork = function(
     }
   }
 
-  function detachFiber(current) {
-    // Cut off the return pointers to disconnect it from the tree. Ideally, we
-    // should clear the child pointer of the parent alternate to let this
-    // get GC:ed but we don't know which for sure which parent is the current
-    // one so we'll settle for GC:ing the subtree of this child. This child
-    // itself will be GC:ed when the parent updates the next time.
-    current["return"] = null;
-    current.child = null;
-    if (current.alternate) {
-      current.alternate.child = null;
-      current.alternate["return"] = null;
+  var updateHostContainer = void 0;
+  var updateHostComponent = void 0;
+  var updateHostText = void 0;
+  if (mutation) {
+    if (enableMutatingReconciler) {
+      // Mutation mode
+      updateHostContainer = function(workInProgress) {
+        // Noop
+      };
+      updateHostComponent = function(
+        current,
+        workInProgress,
+        updatePayload,
+        type,
+        oldProps,
+        newProps,
+        rootContainerInstance,
+        currentHostContext
+      ) {
+        // TODO: Type this specific to this type of component.
+        workInProgress.updateQueue = updatePayload;
+        // If the update payload indicates that there is a change or if there
+        // is a new ref we mark this as an update. All the work is done in commitWork.
+        if (updatePayload) {
+          markUpdate(workInProgress);
+        }
+      };
+      updateHostText = function(current, workInProgress, oldText, newText) {
+        // If the text differs, mark it as an update. All the work in done in commitWork.
+        if (oldText !== newText) {
+          markUpdate(workInProgress);
+        }
+      };
+    } else {
+      invariant(false, "Mutating reconciler is disabled.");
     }
-  }
-
-  var emptyPortalContainer = void 0;
-
-  if (!mutation) {
-    var commitContainer = void 0;
-    if (persistence) {
-      var replaceContainerChildren = persistence.replaceContainerChildren,
-        createContainerChildSet = persistence.createContainerChildSet;
+  } else if (persistence) {
+    if (enablePersistentReconciler) {
+      // Persistent host tree mode
+      var cloneInstance = persistence.cloneInstance,
+        createContainerChildSet = persistence.createContainerChildSet,
+        appendChildToContainerChildSet =
+          persistence.appendChildToContainerChildSet,
+        finalizeContainerChildren = persistence.finalizeContainerChildren;
 
-      emptyPortalContainer = function(current) {
-        var portal = current.stateNode;
-        var containerInfo = portal.containerInfo;
+      // An unfortunate fork of appendAllChildren because we have two different parent types.
 
-        var emptyChildSet = createContainerChildSet(containerInfo);
-        replaceContainerChildren(containerInfo, emptyChildSet);
-      };
-      commitContainer = function(finishedWork) {
-        switch (finishedWork.tag) {
-          case ClassComponent: {
-            return;
+      var appendAllChildrenToContainer = function(
+        containerChildSet,
+        workInProgress
+      ) {
+        // We only have the top Fiber that was created but we need recurse down its
+        // children to find all the terminal nodes.
+        var node = workInProgress.child;
+        while (node !== null) {
+          if (node.tag === HostComponent || node.tag === HostText) {
+            appendChildToContainerChildSet(containerChildSet, node.stateNode);
+          } else if (node.tag === HostPortal) {
+            // If we have a portal child, then we don't want to traverse
+            // down its children. Instead, we'll get insertions from each child in
+            // the portal directly.
+          } else if (node.child !== null) {
+            node.child["return"] = node;
+            node = node.child;
+            continue;
           }
-          case HostComponent: {
+          if (node === workInProgress) {
             return;
           }
-          case HostText: {
-            return;
+          while (node.sibling === null) {
+            if (node["return"] === null || node["return"] === workInProgress) {
+              return;
+            }
+            node = node["return"];
           }
-          case HostRoot:
-          case HostPortal: {
-            var portalOrRoot = finishedWork.stateNode;
-            var containerInfo = portalOrRoot.containerInfo,
-              _pendingChildren = portalOrRoot.pendingChildren;
-
-            replaceContainerChildren(containerInfo, _pendingChildren);
-            return;
+          node.sibling["return"] = node["return"];
+          node = node.sibling;
+        }
+      };
+      updateHostContainer = function(workInProgress) {
+        var portalOrRoot = workInProgress.stateNode;
+        var childrenUnchanged = workInProgress.firstEffect === null;
+        if (childrenUnchanged) {
+          // No changes, just reuse the existing instance.
+        } else {
+          var container = portalOrRoot.containerInfo;
+          var newChildSet = createContainerChildSet(container);
+          // If children might have changed, we have to add them all to the set.
+          appendAllChildrenToContainer(newChildSet, workInProgress);
+          portalOrRoot.pendingChildren = newChildSet;
+          // Schedule an update on the container to swap out the container.
+          markUpdate(workInProgress);
+          finalizeContainerChildren(container, newChildSet);
+        }
+      };
+      updateHostComponent = function(
+        current,
+        workInProgress,
+        updatePayload,
+        type,
+        oldProps,
+        newProps,
+        rootContainerInstance,
+        currentHostContext
+      ) {
+        // If there are no effects associated with this node, then none of our children had any updates.
+        // This guarantees that we can reuse all of them.
+        var childrenUnchanged = workInProgress.firstEffect === null;
+        var currentInstance = current.stateNode;
+        if (childrenUnchanged && updatePayload === null) {
+          // No changes, just reuse the existing instance.
+          // Note that this might release a previous clone.
+          workInProgress.stateNode = currentInstance;
+        } else {
+          var recyclableInstance = workInProgress.stateNode;
+          var newInstance = cloneInstance(
+            currentInstance,
+            updatePayload,
+            type,
+            oldProps,
+            newProps,
+            workInProgress,
+            childrenUnchanged,
+            recyclableInstance
+          );
+          if (
+            finalizeInitialChildren(
+              newInstance,
+              type,
+              newProps,
+              rootContainerInstance,
+              currentHostContext
+            )
+          ) {
+            markUpdate(workInProgress);
           }
-          default: {
-            invariant(
-              false,
-              "This unit of work tag should not have side-effects. This error is " +
-                "likely caused by a bug in React. Please file an issue."
-            );
+          workInProgress.stateNode = newInstance;
+          if (childrenUnchanged) {
+            // If there are no other effects in this tree, we need to flag this node as having one.
+            // Even though we're not going to use it for anything.
+            // Otherwise parents won't know that there are new children to propagate upwards.
+            markUpdate(workInProgress);
+          } else {
+            // If children might have changed, we have to add them all to the set.
+            appendAllChildren(newInstance, workInProgress);
           }
         }
       };
+      updateHostText = function(current, workInProgress, oldText, newText) {
+        if (oldText !== newText) {
+          // If the text content differs, we'll create a new text instance for it.
+          var rootContainerInstance = getRootHostContainer();
+          var currentHostContext = getHostContext();
+          workInProgress.stateNode = createTextInstance(
+            newText,
+            rootContainerInstance,
+            currentHostContext,
+            workInProgress
+          );
+          // We'll have to mark it as having an effect, even though we won't use the effect for anything.
+          // This lets the parents know that at least one of their children has changed.
+          markUpdate(workInProgress);
+        }
+      };
     } else {
-      commitContainer = function(finishedWork) {
+      invariant(false, "Persistent reconciler is disabled.");
+    }
+  } else {
+    if (enableNoopReconciler) {
+      // No host operations
+      updateHostContainer = function(workInProgress) {
+        // Noop
+      };
+      updateHostComponent = function(
+        current,
+        workInProgress,
+        updatePayload,
+        type,
+        oldProps,
+        newProps,
+        rootContainerInstance,
+        currentHostContext
+      ) {
         // Noop
       };
-    }
-    if (enablePersistentReconciler || enableNoopReconciler) {
-      return {
-        commitResetTextContent: function(finishedWork) {},
-        commitPlacement: function(finishedWork) {},
-        commitDeletion: function(current) {
-          // Detach refs and call componentWillUnmount() on the whole subtree.
-          commitNestedUnmounts(current);
-          detachFiber(current);
-        },
-        commitWork: function(current, finishedWork) {
-          commitContainer(finishedWork);
-        },
-
-        commitLifeCycles: commitLifeCycles,
-        commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
-        commitErrorLogging: commitErrorLogging,
-        commitAttachRef: commitAttachRef,
-        commitDetachRef: commitDetachRef
+      updateHostText = function(current, workInProgress, oldText, newText) {
+        // Noop
       };
-    } else if (persistence) {
-      invariant(false, "Persistent reconciler is disabled.");
     } else {
       invariant(false, "Noop reconciler is disabled.");
     }
   }
-  var commitMount = mutation.commitMount,
-    commitUpdate = mutation.commitUpdate,
-    resetTextContent = mutation.resetTextContent,
-    commitTextUpdate = mutation.commitTextUpdate,
-    appendChild = mutation.appendChild,
-    appendChildToContainer = mutation.appendChildToContainer,
-    insertBefore = mutation.insertBefore,
-    insertInContainerBefore = mutation.insertInContainerBefore,
-    removeChild = mutation.removeChild,
-    removeChildFromContainer = mutation.removeChildFromContainer;
-
-  function getHostParentFiber(fiber) {
-    var parent = fiber["return"];
-    while (parent !== null) {
-      if (isHostParent(parent)) {
-        return parent;
-      }
-      parent = parent["return"];
-    }
-    invariant(
-      false,
-      "Expected to find a host parent. This error is likely caused by a bug " +
-        "in React. Please file an issue."
-    );
-  }
 
-  function isHostParent(fiber) {
-    return (
-      fiber.tag === HostComponent ||
-      fiber.tag === HostRoot ||
-      fiber.tag === HostPortal
-    );
-  }
+  function completeWork(current, workInProgress, renderExpirationTime) {
+    var newProps = workInProgress.pendingProps;
+    switch (workInProgress.tag) {
+      case FunctionalComponent:
+        return null;
+      case ClassComponent: {
+        // We are leaving this subtree, so pop context if any.
+        popContextProvider(workInProgress);
 
-  function getHostSibling(fiber) {
-    // We're going to search forward into the tree until we find a sibling host
-    // node. Unfortunately, if multiple insertions are done in a row we have to
-    // search past them. This leads to exponential search for the next sibling.
-    var node = fiber;
-    siblings: while (true) {
-      // If we didn't find anything, let's try the next sibling.
-      while (node.sibling === null) {
-        if (node["return"] === null || isHostParent(node["return"])) {
-          // If we pop out of the root or hit the parent the fiber we are the
-          // last sibling.
-          return null;
+        // If this component caught an error, schedule an error log effect.
+        var instance = workInProgress.stateNode;
+        var updateQueue = workInProgress.updateQueue;
+        if (updateQueue !== null && updateQueue.capturedValues !== null) {
+          workInProgress.effectTag &= ~DidCapture;
+          if (typeof instance.componentDidCatch === "function") {
+            workInProgress.effectTag |= ErrLog;
+          } else {
+            // Normally we clear this in the commit phase, but since we did not
+            // schedule an effect, we need to reset it here.
+            updateQueue.capturedValues = null;
+          }
         }
-        node = node["return"];
+        return null;
       }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
-      while (node.tag !== HostComponent && node.tag !== HostText) {
-        // If it is not host node and, we might have a host node inside it.
-        // Try to search down until we find one.
-        if (node.effectTag & Placement) {
-          // If we don't have a child, try the siblings instead.
-          continue siblings;
+      case HostRoot: {
+        popHostContainer(workInProgress);
+        popTopLevelContextObject(workInProgress);
+        var fiberRoot = workInProgress.stateNode;
+        if (fiberRoot.pendingContext) {
+          fiberRoot.context = fiberRoot.pendingContext;
+          fiberRoot.pendingContext = null;
         }
-        // If we don't have a child, try the siblings instead.
-        // We also skip portals because they are not part of this host tree.
-        if (node.child === null || node.tag === HostPortal) {
-          continue siblings;
-        } else {
-          node.child["return"] = node;
-          node = node.child;
+        if (current === null || current.child === null) {
+          // If we hydrated, pop so that we can delete any remaining children
+          // that weren't hydrated.
+          popHydrationState(workInProgress);
+          // This resets the hacky state to fix isMounted before committing.
+          // TODO: Delete this when we delete isMounted and findDOMNode.
+          workInProgress.effectTag &= ~Placement;
         }
+        updateHostContainer(workInProgress);
+
+        var _updateQueue = workInProgress.updateQueue;
+        if (_updateQueue !== null && _updateQueue.capturedValues !== null) {
+          workInProgress.effectTag |= ErrLog;
+        }
+        return null;
       }
-      // Check if this host node is stable or about to be placed.
-      if (!(node.effectTag & Placement)) {
-        // Found it!
-        return node.stateNode;
-      }
-    }
-  }
+      case HostComponent: {
+        popHostContext(workInProgress);
+        var rootContainerInstance = getRootHostContainer();
+        var type = workInProgress.type;
+        if (current !== null && workInProgress.stateNode != null) {
+          // If we have an alternate, that means this is an update and we need to
+          // schedule a side-effect to do the updates.
+          var oldProps = current.memoizedProps;
+          // If we get updated because one of our children updated, we don't
+          // have newProps so we'll have to reuse them.
+          // TODO: Split the update API as separate for the props vs. children.
+          // Even better would be if children weren't special cased at all tho.
+          var _instance = workInProgress.stateNode;
+          var currentHostContext = getHostContext();
+          // TODO: Experiencing an error where oldProps is null. Suggests a host
+          // component is hitting the resume path. Figure out why. Possibly
+          // related to `hidden`.
+          var updatePayload = prepareUpdate(
+            _instance,
+            type,
+            oldProps,
+            newProps,
+            rootContainerInstance,
+            currentHostContext
+          );
 
-  function commitPlacement(finishedWork) {
-    // Recursively insert all host nodes into the parent.
-    var parentFiber = getHostParentFiber(finishedWork);
-    var parent = void 0;
-    var isContainer = void 0;
-    switch (parentFiber.tag) {
-      case HostComponent:
-        parent = parentFiber.stateNode;
-        isContainer = false;
-        break;
-      case HostRoot:
-        parent = parentFiber.stateNode.containerInfo;
-        isContainer = true;
-        break;
-      case HostPortal:
-        parent = parentFiber.stateNode.containerInfo;
-        isContainer = true;
-        break;
-      default:
-        invariant(
-          false,
-          "Invalid host parent fiber. This error is likely caused by a bug " +
-            "in React. Please file an issue."
-        );
-    }
-    if (parentFiber.effectTag & ContentReset) {
-      // Reset the text content of the parent before doing any insertions
-      resetTextContent(parent);
-      // Clear ContentReset from the effect tag
-      parentFiber.effectTag &= ~ContentReset;
-    }
+          updateHostComponent(
+            current,
+            workInProgress,
+            updatePayload,
+            type,
+            oldProps,
+            newProps,
+            rootContainerInstance,
+            currentHostContext
+          );
 
-    var before = getHostSibling(finishedWork);
-    // We only have the top Fiber that was inserted but we need recurse down its
-    // children to find all the terminal nodes.
-    var node = finishedWork;
-    while (true) {
-      if (node.tag === HostComponent || node.tag === HostText) {
-        if (before) {
-          if (isContainer) {
-            insertInContainerBefore(parent, node.stateNode, before);
+          if (current.ref !== workInProgress.ref) {
+            markRef(workInProgress);
+          }
+        } else {
+          if (!newProps) {
+            invariant(
+              workInProgress.stateNode !== null,
+              "We must have new props for new mounts. This error is likely " +
+                "caused by a bug in React. Please file an issue."
+            );
+            // This can happen when we abort work.
+            return null;
+          }
+
+          var _currentHostContext = getHostContext();
+          // TODO: Move createInstance to beginWork and keep it on a context
+          // "stack" as the parent. Then append children as we go in beginWork
+          // or completeWork depending on we want to add then top->down or
+          // bottom->up. Top->down is faster in IE11.
+          var wasHydrated = popHydrationState(workInProgress);
+          if (wasHydrated) {
+            // TODO: Move this and createInstance step into the beginPhase
+            // to consolidate.
+            if (
+              prepareToHydrateHostInstance(
+                workInProgress,
+                rootContainerInstance,
+                _currentHostContext
+              )
+            ) {
+              // If changes to the hydrated node needs to be applied at the
+              // commit-phase we mark this as such.
+              markUpdate(workInProgress);
+            }
           } else {
-            insertBefore(parent, node.stateNode, before);
+            var _instance2 = createInstance(
+              type,
+              newProps,
+              rootContainerInstance,
+              _currentHostContext,
+              workInProgress
+            );
+
+            appendAllChildren(_instance2, workInProgress);
+
+            // Certain renderers require commit-time effects for initial mount.
+            // (eg DOM renderer supports auto-focus for certain elements).
+            // Make sure such renderers get scheduled for later work.
+            if (
+              finalizeInitialChildren(
+                _instance2,
+                type,
+                newProps,
+                rootContainerInstance,
+                _currentHostContext
+              )
+            ) {
+              markUpdate(workInProgress);
+            }
+            workInProgress.stateNode = _instance2;
           }
-        } else {
-          if (isContainer) {
-            appendChildToContainer(parent, node.stateNode);
-          } else {
-            appendChild(parent, node.stateNode);
+
+          if (workInProgress.ref !== null) {
+            // If there is a ref on a host node we need to schedule a callback
+            markRef(workInProgress);
           }
         }
-      } else if (node.tag === HostPortal) {
-        // If the insertion itself is a portal, then we don't want to traverse
-        // down its children. Instead, we'll get insertions from each child in
-        // the portal directly.
-      } else if (node.child !== null) {
-        node.child["return"] = node;
-        node = node.child;
-        continue;
-      }
-      if (node === finishedWork) {
-        return;
+        return null;
       }
-      while (node.sibling === null) {
-        if (node["return"] === null || node["return"] === finishedWork) {
-          return;
+      case HostText: {
+        var newText = newProps;
+        if (current && workInProgress.stateNode != null) {
+          var oldText = current.memoizedProps;
+          // If we have an alternate, that means this is an update and we need
+          // to schedule a side-effect to do the updates.
+          updateHostText(current, workInProgress, oldText, newText);
+        } else {
+          if (typeof newText !== "string") {
+            invariant(
+              workInProgress.stateNode !== null,
+              "We must have new props for new mounts. This error is likely " +
+                "caused by a bug in React. Please file an issue."
+            );
+            // This can happen when we abort work.
+            return null;
+          }
+          var _rootContainerInstance = getRootHostContainer();
+          var _currentHostContext2 = getHostContext();
+          var _wasHydrated = popHydrationState(workInProgress);
+          if (_wasHydrated) {
+            if (prepareToHydrateHostTextInstance(workInProgress)) {
+              markUpdate(workInProgress);
+            }
+          } else {
+            workInProgress.stateNode = createTextInstance(
+              newText,
+              _rootContainerInstance,
+              _currentHostContext2,
+              workInProgress
+            );
+          }
         }
-        node = node["return"];
+        return null;
       }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
+      case CallComponent:
+        return moveCallToHandlerPhase(
+          current,
+          workInProgress,
+          renderExpirationTime
+        );
+      case CallHandlerPhase:
+        // Reset the tag to now be a first phase call.
+        workInProgress.tag = CallComponent;
+        return null;
+      case ReturnComponent:
+        // Does nothing.
+        return null;
+      case Fragment:
+        return null;
+      case Mode:
+        return null;
+      case HostPortal:
+        popHostContainer(workInProgress);
+        updateHostContainer(workInProgress);
+        return null;
+      case ContextProvider:
+        // Pop provider fiber
+        popProvider(workInProgress);
+        return null;
+      case ContextConsumer:
+        return null;
+      // Error cases
+      case IndeterminateComponent:
+        invariant(
+          false,
+          "An indeterminate component should have become determinate before " +
+            "completing. This error is likely caused by a bug in React. Please " +
+            "file an issue."
+        );
+      // eslint-disable-next-line no-fallthrough
+      default:
+        invariant(
+          false,
+          "Unknown unit of work tag. This error is likely caused by a bug in " +
+            "React. Please file an issue."
+        );
     }
   }
 
-  function unmountHostComponents(current) {
-    // We only have the top Fiber that was inserted but we need recurse down its
-    var node = current;
+  return {
+    completeWork: completeWork
+  };
+};
 
-    // Each iteration, currentParent is populated with node's host parent if not
-    // currentParentIsValid.
-    var currentParentIsValid = false;
-    var currentParent = void 0;
-    var currentParentIsContainer = void 0;
+function createCapturedValue(value, source) {
+  // If the value is an error, call this function immediately after it is thrown
+  // so the stack is accurate.
+  return {
+    value: value,
+    source: source,
+    stack: getStackAddendumByWorkInProgressFiber(source)
+  };
+}
 
-    while (true) {
-      if (!currentParentIsValid) {
-        var parent = node["return"];
-        findParent: while (true) {
-          invariant(
-            parent !== null,
-            "Expected to find a host parent. This error is likely caused by " +
-              "a bug in React. Please file an issue."
-          );
-          switch (parent.tag) {
-            case HostComponent:
-              currentParent = parent.stateNode;
-              currentParentIsContainer = false;
-              break findParent;
-            case HostRoot:
-              currentParent = parent.stateNode.containerInfo;
-              currentParentIsContainer = true;
-              break findParent;
-            case HostPortal:
-              currentParent = parent.stateNode.containerInfo;
-              currentParentIsContainer = true;
-              break findParent;
-          }
-          parent = parent["return"];
-        }
-        currentParentIsValid = true;
-      }
+var ReactFiberUnwindWork = function(
+  hostContext,
+  scheduleWork,
+  isAlreadyFailedLegacyErrorBoundary
+) {
+  var popHostContainer = hostContext.popHostContainer,
+    popHostContext = hostContext.popHostContext;
 
-      if (node.tag === HostComponent || node.tag === HostText) {
-        commitNestedUnmounts(node);
-        // After all the children have unmounted, it is now safe to remove the
-        // node from the tree.
-        if (currentParentIsContainer) {
-          removeChildFromContainer(currentParent, node.stateNode);
-        } else {
-          removeChild(currentParent, node.stateNode);
-        }
-        // Don't visit children because we already visited them.
-      } else if (node.tag === HostPortal) {
-        // When we go into a portal, it becomes the parent to remove from.
-        // We will reassign it back when we pop the portal on the way up.
-        currentParent = node.stateNode.containerInfo;
-        // Visit children because portals might contain host components.
-        if (node.child !== null) {
-          node.child["return"] = node;
-          node = node.child;
-          continue;
-        }
-      } else {
-        commitUnmount(node);
-        // Visit children because we may find more host components below.
-        if (node.child !== null) {
-          node.child["return"] = node;
-          node = node.child;
-          continue;
-        }
-      }
-      if (node === current) {
-        return;
-      }
-      while (node.sibling === null) {
-        if (node["return"] === null || node["return"] === current) {
+  function throwException(returnFiber, sourceFiber, rawValue) {
+    // The source fiber did not complete.
+    sourceFiber.effectTag |= Incomplete;
+    // Its effect list is no longer valid.
+    sourceFiber.firstEffect = sourceFiber.lastEffect = null;
+
+    var value = createCapturedValue(rawValue, sourceFiber);
+
+    var workInProgress = returnFiber;
+    do {
+      switch (workInProgress.tag) {
+        case HostRoot: {
+          // Uncaught error
+          var errorInfo = value;
+          ensureUpdateQueues(workInProgress);
+          var updateQueue = workInProgress.updateQueue;
+          updateQueue.capturedValues = [errorInfo];
+          workInProgress.effectTag |= ShouldCapture;
           return;
         }
-        node = node["return"];
-        if (node.tag === HostPortal) {
-          // When we go out of the portal, we need to restore the parent.
-          // Since we don't keep a stack of them, we will search for it.
-          currentParentIsValid = false;
-        }
-      }
-      node.sibling["return"] = node["return"];
-      node = node.sibling;
-    }
-  }
-
-  function commitDeletion(current) {
-    // Recursively delete all host nodes from the parent.
-    // Detach refs and call componentWillUnmount() on the whole subtree.
-    unmountHostComponents(current);
-    detachFiber(current);
+        case ClassComponent:
+          // Capture and retry
+          var ctor = workInProgress.type;
+          var _instance = workInProgress.stateNode;
+          if (
+            (workInProgress.effectTag & DidCapture) === NoEffect &&
+            ((typeof ctor.getDerivedStateFromCatch === "function" &&
+              enableGetDerivedStateFromCatch) ||
+              (_instance !== null &&
+                typeof _instance.componentDidCatch === "function" &&
+                !isAlreadyFailedLegacyErrorBoundary(_instance)))
+          ) {
+            ensureUpdateQueues(workInProgress);
+            var _updateQueue = workInProgress.updateQueue;
+            var capturedValues = _updateQueue.capturedValues;
+            if (capturedValues === null) {
+              _updateQueue.capturedValues = [value];
+            } else {
+              capturedValues.push(value);
+            }
+            workInProgress.effectTag |= ShouldCapture;
+            return;
+          }
+          break;
+        default:
+          break;
+      }
+      workInProgress = workInProgress["return"];
+    } while (workInProgress !== null);
   }
 
-  function commitWork(current, finishedWork) {
-    switch (finishedWork.tag) {
+  function unwindWork(workInProgress) {
+    switch (workInProgress.tag) {
       case ClassComponent: {
-        return;
-      }
-      case HostComponent: {
-        var _instance8 = finishedWork.stateNode;
-        if (_instance8 != null) {
-          // Commit the work prepared earlier.
-          var newProps = finishedWork.memoizedProps;
-          // For hydration we reuse the update path but we treat the oldProps
-          // as the newProps. The updatePayload will contain the real change in
-          // this case.
-          var oldProps = current !== null ? current.memoizedProps : newProps;
-          var type = finishedWork.type;
-          // TODO: Type the updateQueue to be specific to host components.
-          var updatePayload = finishedWork.updateQueue;
-          finishedWork.updateQueue = null;
-          if (updatePayload !== null) {
-            commitUpdate(
-              _instance8,
-              updatePayload,
-              type,
-              oldProps,
-              newProps,
-              finishedWork
-            );
-          }
+        popContextProvider(workInProgress);
+        var effectTag = workInProgress.effectTag;
+        if (effectTag & ShouldCapture) {
+          workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
         }
-        return;
-      }
-      case HostText: {
-        invariant(
-          finishedWork.stateNode !== null,
-          "This should have a text node initialized. This error is likely " +
-            "caused by a bug in React. Please file an issue."
-        );
-        var textInstance = finishedWork.stateNode;
-        var newText = finishedWork.memoizedProps;
-        // For hydration we reuse the update path but we treat the oldProps
-        // as the newProps. The updatePayload will contain the real change in
-        // this case.
-        var oldText = current !== null ? current.memoizedProps : newText;
-        commitTextUpdate(textInstance, oldText, newText);
-        return;
+        return null;
       }
       case HostRoot: {
-        return;
+        popHostContainer(workInProgress);
+        popTopLevelContextObject(workInProgress);
+        var _effectTag = workInProgress.effectTag;
+        if (_effectTag & ShouldCapture) {
+          workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
+          return workInProgress;
+        }
+        return null;
       }
-      default: {
-        invariant(
-          false,
-          "This unit of work tag should not have side-effects. This error is " +
-            "likely caused by a bug in React. Please file an issue."
-        );
+      case HostComponent: {
+        popHostContext(workInProgress);
+        return null;
       }
+      case HostPortal:
+        popHostContainer(workInProgress);
+        return null;
+      case ContextProvider:
+        popProvider(workInProgress);
+        return null;
+      default:
+        return null;
     }
   }
-
-  function commitResetTextContent(current) {
-    resetTextContent(current.stateNode);
-  }
-
-  if (enableMutatingReconciler) {
-    return {
-      commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
-      commitResetTextContent: commitResetTextContent,
-      commitPlacement: commitPlacement,
-      commitDeletion: commitDeletion,
-      commitWork: commitWork,
-      commitLifeCycles: commitLifeCycles,
-      commitErrorLogging: commitErrorLogging,
-      commitAttachRef: commitAttachRef,
-      commitDetachRef: commitDetachRef
-    };
-  } else {
-    invariant(false, "Mutating reconciler is disabled.");
-  }
+  return {
+    throwException: throwException,
+    unwindWork: unwindWork
+  };
 };
 
-var NO_CONTEXT = {};
-
-var ReactFiberHostContext = function(config, stack) {
-  var getChildHostContext = config.getChildHostContext,
-    getRootHostContext = config.getRootHostContext;
-  var createCursor = stack.createCursor,
-    push = stack.push,
-    pop = stack.pop;
-
-  var contextStackCursor = createCursor(NO_CONTEXT);
-  var contextFiberStackCursor = createCursor(NO_CONTEXT);
-  var rootInstanceStackCursor = createCursor(NO_CONTEXT);
+// Module provided by RN:
+/**
+ * Intercept lifecycle errors and ensure they are shown with the correct stack
+ * trace within the native redbox component.
+ */
+function showErrorDialog(capturedError) {
+  var componentStack = capturedError.componentStack,
+    error = capturedError.error;
 
-  function requiredContext(c) {
-    invariant(
-      c !== NO_CONTEXT,
-      "Expected host context to exist. This error is likely caused by a bug " +
-        "in React. Please file an issue."
-    );
-    return c;
-  }
+  var errorToHandle = void 0;
 
-  function getRootHostContainer() {
-    var rootInstance = requiredContext(rootInstanceStackCursor.current);
-    return rootInstance;
-  }
+  // Typically Errors are thrown but eg strings or null can be thrown as well.
+  if (error instanceof Error) {
+    var message = error.message,
+      name = error.name;
 
-  function pushHostContainer(fiber, nextRootInstance) {
-    // Push current root instance onto the stack;
-    // This allows us to reset root when portals are popped.
-    push(rootInstanceStackCursor, nextRootInstance, fiber);
-    // Track the context and the Fiber that provided it.
-    // This enables us to pop only Fibers that provide unique contexts.
-    push(contextFiberStackCursor, fiber, fiber);
+    var summary = message ? name + ": " + message : name;
 
-    // Finally, we need to push the host context to the stack.
-    // However, we can't just call getRootHostContext() and push it because
-    // we'd have a different number of entries on the stack depending on
-    // whether getRootHostContext() throws somewhere in renderer code or not.
-    // So we push an empty value first. This lets us safely unwind on errors.
-    push(contextStackCursor, NO_CONTEXT, fiber);
-    var nextRootContext = getRootHostContext(nextRootInstance);
-    // Now that we know this function doesn't throw, replace it.
-    pop(contextStackCursor, fiber);
-    push(contextStackCursor, nextRootContext, fiber);
-  }
+    errorToHandle = error;
 
-  function popHostContainer(fiber) {
-    pop(contextStackCursor, fiber);
-    pop(contextFiberStackCursor, fiber);
-    pop(rootInstanceStackCursor, fiber);
+    try {
+      errorToHandle.message =
+        summary + "\n\nThis error is located at:" + componentStack;
+    } catch (e) {}
+  } else if (typeof error === "string") {
+    errorToHandle = new Error(
+      error + "\n\nThis error is located at:" + componentStack
+    );
+  } else {
+    errorToHandle = new Error("Unspecified error at:" + componentStack);
   }
 
-  function getHostContext() {
-    var context = requiredContext(contextStackCursor.current);
-    return context;
-  }
+  ExceptionsManager.handleException(errorToHandle, false);
 
-  function pushHostContext(fiber) {
-    var rootInstance = requiredContext(rootInstanceStackCursor.current);
-    var context = requiredContext(contextStackCursor.current);
-    var nextContext = getChildHostContext(context, fiber.type, rootInstance);
+  // Return false here to prevent ReactFiberErrorLogger default behavior of
+  // logging error details to console.error. Calls to console.error are
+  // automatically routed to the native redbox controller, which we've already
+  // done above by calling ExceptionsManager.
+  return false;
+}
 
-    // Don't push this Fiber's context unless it's unique.
-    if (context === nextContext) {
-      return;
-    }
+function logCapturedError(capturedError) {
+  var logError = showErrorDialog(capturedError);
 
-    // Track the context and the Fiber that provided it.
-    // This enables us to pop only Fibers that provide unique contexts.
-    push(contextFiberStackCursor, fiber, fiber);
-    push(contextStackCursor, nextContext, fiber);
+  // Allow injected showErrorDialog() to prevent default console.error logging.
+  // This enables renderers like ReactNative to better manage redbox behavior.
+  if (logError === false) {
+    return;
   }
 
-  function popHostContext(fiber) {
-    // Do not pop unless this Fiber provided the current context.
-    // pushHostContext() only pushes Fibers that provide unique contexts.
-    if (contextFiberStackCursor.current !== fiber) {
-      return;
-    }
-
-    pop(contextStackCursor, fiber);
-    pop(contextFiberStackCursor, fiber);
+  var error = capturedError.error;
+  var suppressLogging = error && error.suppressReactErrorLogging;
+  if (suppressLogging) {
+    return;
   }
 
-  return {
-    getHostContext: getHostContext,
-    getRootHostContainer: getRootHostContainer,
-    popHostContainer: popHostContainer,
-    popHostContext: popHostContext,
-    pushHostContainer: pushHostContainer,
-    pushHostContext: pushHostContext
-  };
-};
-
-var ReactFiberHydrationContext = function(config) {
-  var shouldSetTextContent = config.shouldSetTextContent,
-    hydration = config.hydration;
+  {
+    var componentName = capturedError.componentName,
+      componentStack = capturedError.componentStack,
+      errorBoundaryName = capturedError.errorBoundaryName,
+      errorBoundaryFound = capturedError.errorBoundaryFound,
+      willRetry = capturedError.willRetry;
 
-  // If this doesn't have hydration mode.
+    var componentNameMessage = componentName
+      ? "The above error occurred in the <" + componentName + "> component:"
+      : "The above error occurred in one of your React components:";
 
-  if (!hydration) {
-    return {
-      enterHydrationState: function() {
-        return false;
-      },
-      resetHydrationState: function() {},
-      tryToClaimNextHydratableInstance: function() {},
-      prepareToHydrateHostInstance: function() {
-        invariant(
-          false,
-          "Expected prepareToHydrateHostInstance() to never be called. " +
-            "This error is likely caused by a bug in React. Please file an issue."
-        );
-      },
-      prepareToHydrateHostTextInstance: function() {
-        invariant(
-          false,
-          "Expected prepareToHydrateHostTextInstance() to never be called. " +
-            "This error is likely caused by a bug in React. Please file an issue."
-        );
-      },
-      popHydrationState: function(fiber) {
-        return false;
+    var errorBoundaryMessage = void 0;
+    // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
+    if (errorBoundaryFound && errorBoundaryName) {
+      if (willRetry) {
+        errorBoundaryMessage =
+          "React will try to recreate this component tree from scratch " +
+          ("using the error boundary you provided, " + errorBoundaryName + ".");
+      } else {
+        errorBoundaryMessage =
+          "This error was initially handled by the error boundary " +
+          errorBoundaryName +
+          ".\n" +
+          "Recreating the tree from scratch failed so React will unmount the tree.";
       }
-    };
+    } else {
+      errorBoundaryMessage =
+        "Consider adding an error boundary to your tree to customize error handling behavior.\n" +
+        "Visit https://fb.me/react-error-boundaries to learn more about error boundaries.";
+    }
+    var combinedMessage =
+      "" +
+      componentNameMessage +
+      componentStack +
+      "\n\n" +
+      ("" + errorBoundaryMessage);
+
+    // In development, we provide our own message with just the component stack.
+    // We don't include the original error message and JS stack because the browser
+    // has already printed it. Even if the application swallows the error, it is still
+    // displayed by the browser thanks to the DEV-only fake event trick in ReactErrorUtils.
+    console.error(combinedMessage);
   }
+}
 
-  var canHydrateInstance = hydration.canHydrateInstance,
-    canHydrateTextInstance = hydration.canHydrateTextInstance,
-    getNextHydratableSibling = hydration.getNextHydratableSibling,
-    getFirstHydratableChild = hydration.getFirstHydratableChild,
-    hydrateInstance = hydration.hydrateInstance,
-    hydrateTextInstance = hydration.hydrateTextInstance,
-    didNotMatchHydratedContainerTextInstance =
-      hydration.didNotMatchHydratedContainerTextInstance,
-    didNotMatchHydratedTextInstance = hydration.didNotMatchHydratedTextInstance,
-    didNotHydrateContainerInstance = hydration.didNotHydrateContainerInstance,
-    didNotHydrateInstance = hydration.didNotHydrateInstance,
-    didNotFindHydratableContainerInstance =
-      hydration.didNotFindHydratableContainerInstance,
-    didNotFindHydratableContainerTextInstance =
-      hydration.didNotFindHydratableContainerTextInstance,
-    didNotFindHydratableInstance = hydration.didNotFindHydratableInstance,
-    didNotFindHydratableTextInstance =
-      hydration.didNotFindHydratableTextInstance;
+var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
+var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
+var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
 
-  // The deepest Fiber on the stack involved in a hydration context.
-  // This may have been an insertion or a hydration.
+function logError(boundary, errorInfo) {
+  var source = errorInfo.source;
+  var stack = errorInfo.stack;
+  if (stack === null) {
+    stack = getStackAddendumByWorkInProgressFiber(source);
+  }
 
-  var hydrationParentFiber = null;
-  var nextHydratableInstance = null;
-  var isHydrating = false;
+  var capturedError = {
+    componentName: source !== null ? getComponentName(source) : null,
+    error: errorInfo.value,
+    errorBoundary: boundary,
+    componentStack: stack !== null ? stack : "",
+    errorBoundaryName: null,
+    errorBoundaryFound: false,
+    willRetry: false
+  };
 
-  function enterHydrationState(fiber) {
-    var parentInstance = fiber.stateNode.containerInfo;
-    nextHydratableInstance = getFirstHydratableChild(parentInstance);
-    hydrationParentFiber = fiber;
-    isHydrating = true;
-    return true;
+  if (boundary !== null) {
+    capturedError.errorBoundaryName = getComponentName(boundary);
+    capturedError.errorBoundaryFound = capturedError.willRetry =
+      boundary.tag === ClassComponent;
+  } else {
+    capturedError.errorBoundaryName = null;
+    capturedError.errorBoundaryFound = capturedError.willRetry = false;
   }
 
-  function deleteHydratableInstance(returnFiber, instance) {
-    {
-      switch (returnFiber.tag) {
-        case HostRoot:
-          didNotHydrateContainerInstance(
-            returnFiber.stateNode.containerInfo,
-            instance
-          );
-          break;
-        case HostComponent:
-          didNotHydrateInstance(
-            returnFiber.type,
-            returnFiber.memoizedProps,
-            returnFiber.stateNode,
-            instance
-          );
-          break;
-      }
+  try {
+    logCapturedError(capturedError);
+  } catch (e) {
+    // Prevent cycle if logCapturedError() throws.
+    // A cycle may still occur if logCapturedError renders a component that throws.
+    var suppressLogging = e && e.suppressReactErrorLogging;
+    if (!suppressLogging) {
+      console.error(e);
     }
+  }
+}
 
-    var childToDelete = createFiberFromHostInstanceForDeletion();
-    childToDelete.stateNode = instance;
-    childToDelete["return"] = returnFiber;
-    childToDelete.effectTag = Deletion;
+var ReactFiberCommitWork = function(
+  config,
+  captureError,
+  scheduleWork,
+  computeExpirationForFiber,
+  markLegacyErrorBoundaryAsFailed,
+  recalculateCurrentTime
+) {
+  var getPublicInstance = config.getPublicInstance,
+    mutation = config.mutation,
+    persistence = config.persistence;
 
-    // This might seem like it belongs on progressedFirstDeletion. However,
-    // these children are not part of the reconciliation list of children.
-    // Even if we abort and rereconcile the children, that will try to hydrate
-    // again and the nodes are still in the host tree so these will be
-    // recreated.
-    if (returnFiber.lastEffect !== null) {
-      returnFiber.lastEffect.nextEffect = childToDelete;
-      returnFiber.lastEffect = childToDelete;
-    } else {
-      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+  var callComponentWillUnmountWithTimer = function(current, instance) {
+    startPhaseTimer(current, "componentWillUnmount");
+    instance.props = current.memoizedProps;
+    instance.state = current.memoizedState;
+    instance.componentWillUnmount();
+    stopPhaseTimer();
+  };
+
+  // Capture errors so they don't interrupt unmounting.
+  function safelyCallComponentWillUnmount(current, instance) {
+    {
+      invokeGuardedCallback$3(
+        null,
+        callComponentWillUnmountWithTimer,
+        null,
+        current,
+        instance
+      );
+      if (hasCaughtError$1()) {
+        var unmountError = clearCaughtError$1();
+        captureError(current, unmountError);
+      }
     }
   }
 
-  function insertNonHydratedInstance(returnFiber, fiber) {
-    fiber.effectTag |= Placement;
-    {
-      switch (returnFiber.tag) {
-        case HostRoot: {
-          var parentContainer = returnFiber.stateNode.containerInfo;
-          switch (fiber.tag) {
-            case HostComponent:
-              var type = fiber.type;
-              var props = fiber.pendingProps;
-              didNotFindHydratableContainerInstance(
-                parentContainer,
-                type,
-                props
-              );
-              break;
-            case HostText:
-              var text = fiber.pendingProps;
-              didNotFindHydratableContainerTextInstance(parentContainer, text);
-              break;
-          }
-          break;
-        }
-        case HostComponent: {
-          var parentType = returnFiber.type;
-          var parentProps = returnFiber.memoizedProps;
-          var parentInstance = returnFiber.stateNode;
-          switch (fiber.tag) {
-            case HostComponent:
-              var _type = fiber.type;
-              var _props = fiber.pendingProps;
-              didNotFindHydratableInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                _type,
-                _props
-              );
-              break;
-            case HostText:
-              var _text = fiber.pendingProps;
-              didNotFindHydratableTextInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                _text
-              );
-              break;
+  function safelyDetachRef(current) {
+    var ref = current.ref;
+    if (ref !== null) {
+      if (typeof ref === "function") {
+        {
+          invokeGuardedCallback$3(null, ref, null, null);
+          if (hasCaughtError$1()) {
+            var refError = clearCaughtError$1();
+            captureError(current, refError);
           }
-          break;
         }
-        default:
-          return;
+      } else {
+        ref.value = null;
       }
     }
   }
 
-  function tryHydrate(fiber, nextInstance) {
-    switch (fiber.tag) {
-      case HostComponent: {
-        var type = fiber.type;
-        var props = fiber.pendingProps;
-        var instance = canHydrateInstance(nextInstance, type, props);
-        if (instance !== null) {
-          fiber.stateNode = instance;
-          return true;
+  function commitLifeCycles(
+    finishedRoot,
+    current,
+    finishedWork,
+    currentTime,
+    committedExpirationTime
+  ) {
+    switch (finishedWork.tag) {
+      case ClassComponent: {
+        var _instance = finishedWork.stateNode;
+        if (finishedWork.effectTag & Update) {
+          if (current === null) {
+            startPhaseTimer(finishedWork, "componentDidMount");
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            _instance.componentDidMount();
+            stopPhaseTimer();
+          } else {
+            var prevProps = current.memoizedProps;
+            var prevState = current.memoizedState;
+            startPhaseTimer(finishedWork, "componentDidUpdate");
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            _instance.componentDidUpdate(prevProps, prevState);
+            stopPhaseTimer();
+          }
+        }
+        var updateQueue = finishedWork.updateQueue;
+        if (updateQueue !== null) {
+          commitCallbacks(updateQueue, _instance);
+        }
+        return;
+      }
+      case HostRoot: {
+        var _updateQueue = finishedWork.updateQueue;
+        if (_updateQueue !== null) {
+          var _instance2 = null;
+          if (finishedWork.child !== null) {
+            switch (finishedWork.child.tag) {
+              case HostComponent:
+                _instance2 = getPublicInstance(finishedWork.child.stateNode);
+                break;
+              case ClassComponent:
+                _instance2 = finishedWork.child.stateNode;
+                break;
+            }
+          }
+          commitCallbacks(_updateQueue, _instance2);
         }
-        return false;
+        return;
       }
-      case HostText: {
-        var text = fiber.pendingProps;
-        var textInstance = canHydrateTextInstance(nextInstance, text);
-        if (textInstance !== null) {
-          fiber.stateNode = textInstance;
-          return true;
+      case HostComponent: {
+        var _instance3 = finishedWork.stateNode;
+
+        // Renderers may schedule work to be done after host components are mounted
+        // (eg DOM renderer may schedule auto-focus for inputs and form controls).
+        // These effects should only be committed when components are first mounted,
+        // aka when there is no current/alternate.
+        if (current === null && finishedWork.effectTag & Update) {
+          var type = finishedWork.type;
+          var props = finishedWork.memoizedProps;
+          commitMount(_instance3, type, props, finishedWork);
         }
-        return false;
-      }
-      default:
-        return false;
-    }
-  }
 
-  function tryToClaimNextHydratableInstance(fiber) {
-    if (!isHydrating) {
-      return;
-    }
-    var nextInstance = nextHydratableInstance;
-    if (!nextInstance) {
-      // Nothing to hydrate. Make it an insertion.
-      insertNonHydratedInstance(hydrationParentFiber, fiber);
-      isHydrating = false;
-      hydrationParentFiber = fiber;
-      return;
-    }
-    if (!tryHydrate(fiber, nextInstance)) {
-      // If we can't hydrate this instance let's try the next one.
-      // We use this as a heuristic. It's based on intuition and not data so it
-      // might be flawed or unnecessary.
-      nextInstance = getNextHydratableSibling(nextInstance);
-      if (!nextInstance || !tryHydrate(fiber, nextInstance)) {
-        // Nothing to hydrate. Make it an insertion.
-        insertNonHydratedInstance(hydrationParentFiber, fiber);
-        isHydrating = false;
-        hydrationParentFiber = fiber;
         return;
       }
-      // We matched the next one, we'll now assume that the first one was
-      // superfluous and we'll delete it. Since we can't eagerly delete it
-      // we'll have to schedule a deletion. To do that, this node needs a dummy
-      // fiber associated with it.
-      deleteHydratableInstance(hydrationParentFiber, nextHydratableInstance);
+      case HostText: {
+        // We have no life-cycles associated with text.
+        return;
+      }
+      case HostPortal: {
+        // We have no life-cycles associated with portals.
+        return;
+      }
+      default: {
+        invariant(
+          false,
+          "This unit of work tag should not have side-effects. This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
+      }
     }
-    hydrationParentFiber = fiber;
-    nextHydratableInstance = getFirstHydratableChild(nextInstance);
   }
 
-  function prepareToHydrateHostInstance(
-    fiber,
-    rootContainerInstance,
-    hostContext
-  ) {
-    var instance = fiber.stateNode;
-    var updatePayload = hydrateInstance(
-      instance,
-      fiber.type,
-      fiber.memoizedProps,
-      rootContainerInstance,
-      hostContext,
-      fiber
-    );
-    // TODO: Type this specific to this type of component.
-    fiber.updateQueue = updatePayload;
-    // If the update payload indicates that there is a change or if there
-    // is a new ref we mark this as an update.
-    if (updatePayload !== null) {
-      return true;
-    }
-    return false;
-  }
+  function commitErrorLogging(finishedWork, onUncaughtError) {
+    switch (finishedWork.tag) {
+      case ClassComponent:
+        {
+          var ctor = finishedWork.type;
+          var _instance4 = finishedWork.stateNode;
+          var updateQueue = finishedWork.updateQueue;
+          invariant(
+            updateQueue !== null && updateQueue.capturedValues !== null,
+            "An error logging effect should not have been scheduled if no errors " +
+              "were captured. This error is likely caused by a bug in React. " +
+              "Please file an issue."
+          );
+          var capturedErrors = updateQueue.capturedValues;
+          updateQueue.capturedValues = null;
 
-  function prepareToHydrateHostTextInstance(fiber) {
-    var textInstance = fiber.stateNode;
-    var textContent = fiber.memoizedProps;
-    var shouldUpdate = hydrateTextInstance(textInstance, textContent, fiber);
-    {
-      if (shouldUpdate) {
-        // We assume that prepareToHydrateHostTextInstance is called in a context where the
-        // hydration parent is the parent host component of this host text.
-        var returnFiber = hydrationParentFiber;
-        if (returnFiber !== null) {
-          switch (returnFiber.tag) {
-            case HostRoot: {
-              var parentContainer = returnFiber.stateNode.containerInfo;
-              didNotMatchHydratedContainerTextInstance(
-                parentContainer,
-                textInstance,
-                textContent
-              );
-              break;
-            }
-            case HostComponent: {
-              var parentType = returnFiber.type;
-              var parentProps = returnFiber.memoizedProps;
-              var parentInstance = returnFiber.stateNode;
-              didNotMatchHydratedTextInstance(
-                parentType,
-                parentProps,
-                parentInstance,
-                textInstance,
-                textContent
-              );
-              break;
-            }
+          if (typeof ctor.getDerivedStateFromCatch !== "function") {
+            // To preserve the preexisting retry behavior of error boundaries,
+            // we keep track of which ones already failed during this batch.
+            // This gets reset before we yield back to the browser.
+            // TODO: Warn in strict mode if getDerivedStateFromCatch is
+            // not defined.
+            markLegacyErrorBoundaryAsFailed(_instance4);
           }
+
+          _instance4.props = finishedWork.memoizedProps;
+          _instance4.state = finishedWork.memoizedState;
+          for (var i = 0; i < capturedErrors.length; i++) {
+            var errorInfo = capturedErrors[i];
+            var _error = errorInfo.value;
+            logError(finishedWork, errorInfo);
+            _instance4.componentDidCatch(_error);
+          }
+        }
+        break;
+      case HostRoot: {
+        var _updateQueue2 = finishedWork.updateQueue;
+        invariant(
+          _updateQueue2 !== null && _updateQueue2.capturedValues !== null,
+          "An error logging effect should not have been scheduled if no errors " +
+            "were captured. This error is likely caused by a bug in React. " +
+            "Please file an issue."
+        );
+        var _capturedErrors = _updateQueue2.capturedValues;
+        _updateQueue2.capturedValues = null;
+        for (var _i = 0; _i < _capturedErrors.length; _i++) {
+          var _errorInfo = _capturedErrors[_i];
+          logError(finishedWork, _errorInfo);
+          onUncaughtError(_errorInfo.value);
         }
+        break;
       }
+      default:
+        invariant(
+          false,
+          "This unit of work tag cannot capture errors.  This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
     }
-    return shouldUpdate;
   }
 
-  function popToNextHostParent(fiber) {
-    var parent = fiber["return"];
-    while (
-      parent !== null &&
-      parent.tag !== HostComponent &&
-      parent.tag !== HostRoot
-    ) {
-      parent = parent["return"];
+  function commitAttachRef(finishedWork) {
+    var ref = finishedWork.ref;
+    if (ref !== null) {
+      var _instance5 = finishedWork.stateNode;
+      var instanceToUse = void 0;
+      switch (finishedWork.tag) {
+        case HostComponent:
+          instanceToUse = getPublicInstance(_instance5);
+          break;
+        default:
+          instanceToUse = _instance5;
+      }
+      if (typeof ref === "function") {
+        ref(instanceToUse);
+      } else {
+        ref.value = instanceToUse;
+      }
     }
-    hydrationParentFiber = parent;
   }
 
-  function popHydrationState(fiber) {
-    if (fiber !== hydrationParentFiber) {
-      // We're deeper than the current hydration context, inside an inserted
-      // tree.
-      return false;
-    }
-    if (!isHydrating) {
-      // If we're not currently hydrating but we're in a hydration context, then
-      // we were an insertion and now need to pop up reenter hydration of our
-      // siblings.
-      popToNextHostParent(fiber);
-      isHydrating = true;
-      return false;
+  function commitDetachRef(current) {
+    var currentRef = current.ref;
+    if (currentRef !== null) {
+      if (typeof currentRef === "function") {
+        currentRef(null);
+      } else {
+        currentRef.value = null;
+      }
     }
+  }
 
-    var type = fiber.type;
+  // User-originating errors (lifecycles and refs) should not interrupt
+  // deletion, so don't let them throw. Host-originating errors should
+  // interrupt deletion, so it's okay
+  function commitUnmount(current) {
+    if (typeof onCommitUnmount === "function") {
+      onCommitUnmount(current);
+    }
 
-    // If we have any remaining hydratable nodes, we need to delete them now.
-    // We only do this deeper than head and body since they tend to have random
-    // other nodes in them. We also ignore components with pure text content in
-    // side of them.
-    // TODO: Better heuristic.
-    if (
-      fiber.tag !== HostComponent ||
-      (type !== "head" &&
-        type !== "body" &&
-        !shouldSetTextContent(type, fiber.memoizedProps))
-    ) {
-      var nextInstance = nextHydratableInstance;
-      while (nextInstance) {
-        deleteHydratableInstance(fiber, nextInstance);
-        nextInstance = getNextHydratableSibling(nextInstance);
+    switch (current.tag) {
+      case ClassComponent: {
+        safelyDetachRef(current);
+        var _instance6 = current.stateNode;
+        if (typeof _instance6.componentWillUnmount === "function") {
+          safelyCallComponentWillUnmount(current, _instance6);
+        }
+        return;
+      }
+      case HostComponent: {
+        safelyDetachRef(current);
+        return;
+      }
+      case CallComponent: {
+        commitNestedUnmounts(current.stateNode);
+        return;
+      }
+      case HostPortal: {
+        // TODO: this is recursive.
+        // We are also not using this parent because
+        // the portal will get pushed immediately.
+        if (enableMutatingReconciler && mutation) {
+          unmountHostComponents(current);
+        } else if (enablePersistentReconciler && persistence) {
+          emptyPortalContainer(current);
+        }
+        return;
       }
     }
-
-    popToNextHostParent(fiber);
-    nextHydratableInstance = hydrationParentFiber
-      ? getNextHydratableSibling(fiber.stateNode)
-      : null;
-    return true;
   }
 
-  function resetHydrationState() {
-    hydrationParentFiber = null;
-    nextHydratableInstance = null;
-    isHydrating = false;
+  function commitNestedUnmounts(root) {
+    // While we're inside a removed host node we don't want to call
+    // removeChild on the inner nodes because they're removed by the top
+    // call anyway. We also want to call componentWillUnmount on all
+    // composites before this host node is removed from the tree. Therefore
+    var node = root;
+    while (true) {
+      commitUnmount(node);
+      // Visit children because they may contain more composite or host nodes.
+      // Skip portals because commitUnmount() currently visits them recursively.
+      if (
+        node.child !== null &&
+        // If we use mutation we drill down into portals using commitUnmount above.
+        // If we don't use mutation we drill down into portals here instead.
+        (!mutation || node.tag !== HostPortal)
+      ) {
+        node.child["return"] = node;
+        node = node.child;
+        continue;
+      }
+      if (node === root) {
+        return;
+      }
+      while (node.sibling === null) {
+        if (node["return"] === null || node["return"] === root) {
+          return;
+        }
+        node = node["return"];
+      }
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
+    }
   }
 
-  return {
-    enterHydrationState: enterHydrationState,
-    resetHydrationState: resetHydrationState,
-    tryToClaimNextHydratableInstance: tryToClaimNextHydratableInstance,
-    prepareToHydrateHostInstance: prepareToHydrateHostInstance,
-    prepareToHydrateHostTextInstance: prepareToHydrateHostTextInstance,
-    popHydrationState: popHydrationState
-  };
-};
-
-// This lets us hook into Fiber to debug what it's doing.
-// See https://github.com/facebook/react/pull/8033.
-// This is not part of the public API, not even for React DevTools.
-// You may only inject a debugTool if you work on React Fiber itself.
-var ReactFiberInstrumentation = {
-  debugTool: null
-};
-
-var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
-
-var warnedAboutMissingGetChildContext = void 0;
+  function detachFiber(current) {
+    // Cut off the return pointers to disconnect it from the tree. Ideally, we
+    // should clear the child pointer of the parent alternate to let this
+    // get GC:ed but we don't know which for sure which parent is the current
+    // one so we'll settle for GC:ing the subtree of this child. This child
+    // itself will be GC:ed when the parent updates the next time.
+    current["return"] = null;
+    current.child = null;
+    if (current.alternate) {
+      current.alternate.child = null;
+      current.alternate["return"] = null;
+    }
+  }
 
-{
-  warnedAboutMissingGetChildContext = {};
-}
+  var emptyPortalContainer = void 0;
 
-var ReactFiberLegacyContext = function(stack) {
-  var createCursor = stack.createCursor,
-    push = stack.push,
-    pop = stack.pop;
+  if (!mutation) {
+    var commitContainer = void 0;
+    if (persistence) {
+      var replaceContainerChildren = persistence.replaceContainerChildren,
+        createContainerChildSet = persistence.createContainerChildSet;
 
-  // A cursor to the current merged context object on the stack.
+      emptyPortalContainer = function(current) {
+        var portal = current.stateNode;
+        var containerInfo = portal.containerInfo;
 
-  var contextStackCursor = createCursor(emptyObject);
-  // A cursor to a boolean indicating whether the context has changed.
-  var didPerformWorkStackCursor = createCursor(false);
-  // Keep track of the previous context object that was on the stack.
-  // We use this to get access to the parent context after we have already
-  // pushed the next context provider, and now need to merge their contexts.
-  var previousContext = emptyObject;
+        var emptyChildSet = createContainerChildSet(containerInfo);
+        replaceContainerChildren(containerInfo, emptyChildSet);
+      };
+      commitContainer = function(finishedWork) {
+        switch (finishedWork.tag) {
+          case ClassComponent: {
+            return;
+          }
+          case HostComponent: {
+            return;
+          }
+          case HostText: {
+            return;
+          }
+          case HostRoot:
+          case HostPortal: {
+            var portalOrRoot = finishedWork.stateNode;
+            var containerInfo = portalOrRoot.containerInfo,
+              _pendingChildren = portalOrRoot.pendingChildren;
 
-  function getUnmaskedContext(workInProgress) {
-    var hasOwnContext = isContextProvider(workInProgress);
-    if (hasOwnContext) {
-      // If the fiber is a context provider itself, when we read its context
-      // we have already pushed its own child context on the stack. A context
-      // provider should not "see" its own child context. Therefore we read the
-      // previous (parent) context instead for a context provider.
-      return previousContext;
+            replaceContainerChildren(containerInfo, _pendingChildren);
+            return;
+          }
+          default: {
+            invariant(
+              false,
+              "This unit of work tag should not have side-effects. This error is " +
+                "likely caused by a bug in React. Please file an issue."
+            );
+          }
+        }
+      };
+    } else {
+      commitContainer = function(finishedWork) {
+        // Noop
+      };
     }
-    return contextStackCursor.current;
-  }
+    if (enablePersistentReconciler || enableNoopReconciler) {
+      return {
+        commitResetTextContent: function(finishedWork) {},
+        commitPlacement: function(finishedWork) {},
+        commitDeletion: function(current) {
+          // Detach refs and call componentWillUnmount() on the whole subtree.
+          commitNestedUnmounts(current);
+          detachFiber(current);
+        },
+        commitWork: function(current, finishedWork) {
+          commitContainer(finishedWork);
+        },
 
-  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-    var instance = workInProgress.stateNode;
-    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+        commitLifeCycles: commitLifeCycles,
+        commitErrorLogging: commitErrorLogging,
+        commitAttachRef: commitAttachRef,
+        commitDetachRef: commitDetachRef
+      };
+    } else if (persistence) {
+      invariant(false, "Persistent reconciler is disabled.");
+    } else {
+      invariant(false, "Noop reconciler is disabled.");
+    }
   }
+  var commitMount = mutation.commitMount,
+    commitUpdate = mutation.commitUpdate,
+    resetTextContent = mutation.resetTextContent,
+    commitTextUpdate = mutation.commitTextUpdate,
+    appendChild = mutation.appendChild,
+    appendChildToContainer = mutation.appendChildToContainer,
+    insertBefore = mutation.insertBefore,
+    insertInContainerBefore = mutation.insertInContainerBefore,
+    removeChild = mutation.removeChild,
+    removeChildFromContainer = mutation.removeChildFromContainer;
 
-  function getMaskedContext(workInProgress, unmaskedContext) {
-    var type = workInProgress.type;
-    var contextTypes = type.contextTypes;
-    if (!contextTypes) {
-      return emptyObject;
+  function getHostParentFiber(fiber) {
+    var parent = fiber["return"];
+    while (parent !== null) {
+      if (isHostParent(parent)) {
+        return parent;
+      }
+      parent = parent["return"];
     }
+    invariant(
+      false,
+      "Expected to find a host parent. This error is likely caused by a bug " +
+        "in React. Please file an issue."
+    );
+  }
 
-    // Avoid recreating masked context unless unmasked context has changed.
-    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-    // This may trigger infinite loops if componentWillReceiveProps calls setState.
-    var instance = workInProgress.stateNode;
-    if (
-      instance &&
-      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-    ) {
-      return instance.__reactInternalMemoizedMaskedChildContext;
-    }
+  function isHostParent(fiber) {
+    return (
+      fiber.tag === HostComponent ||
+      fiber.tag === HostRoot ||
+      fiber.tag === HostPortal
+    );
+  }
 
-    var context = {};
-    for (var key in contextTypes) {
-      context[key] = unmaskedContext[key];
+  function getHostSibling(fiber) {
+    // We're going to search forward into the tree until we find a sibling host
+    // node. Unfortunately, if multiple insertions are done in a row we have to
+    // search past them. This leads to exponential search for the next sibling.
+    var node = fiber;
+    siblings: while (true) {
+      // If we didn't find anything, let's try the next sibling.
+      while (node.sibling === null) {
+        if (node["return"] === null || isHostParent(node["return"])) {
+          // If we pop out of the root or hit the parent the fiber we are the
+          // last sibling.
+          return null;
+        }
+        node = node["return"];
+      }
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
+      while (node.tag !== HostComponent && node.tag !== HostText) {
+        // If it is not host node and, we might have a host node inside it.
+        // Try to search down until we find one.
+        if (node.effectTag & Placement) {
+          // If we don't have a child, try the siblings instead.
+          continue siblings;
+        }
+        // If we don't have a child, try the siblings instead.
+        // We also skip portals because they are not part of this host tree.
+        if (node.child === null || node.tag === HostPortal) {
+          continue siblings;
+        } else {
+          node.child["return"] = node;
+          node = node.child;
+        }
+      }
+      // Check if this host node is stable or about to be placed.
+      if (!(node.effectTag & Placement)) {
+        // Found it!
+        return node.stateNode;
+      }
     }
+  }
 
-    {
-      var name = getComponentName(workInProgress) || "Unknown";
-      checkPropTypes(
-        contextTypes,
-        context,
-        "context",
-        name,
-        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-      );
+  function commitPlacement(finishedWork) {
+    // Recursively insert all host nodes into the parent.
+    var parentFiber = getHostParentFiber(finishedWork);
+    var parent = void 0;
+    var isContainer = void 0;
+    switch (parentFiber.tag) {
+      case HostComponent:
+        parent = parentFiber.stateNode;
+        isContainer = false;
+        break;
+      case HostRoot:
+        parent = parentFiber.stateNode.containerInfo;
+        isContainer = true;
+        break;
+      case HostPortal:
+        parent = parentFiber.stateNode.containerInfo;
+        isContainer = true;
+        break;
+      default:
+        invariant(
+          false,
+          "Invalid host parent fiber. This error is likely caused by a bug " +
+            "in React. Please file an issue."
+        );
     }
-
-    // Cache unmasked context so we can avoid recreating masked context unless necessary.
-    // Context is created before the class component is instantiated so check for instance.
-    if (instance) {
-      cacheContext(workInProgress, unmaskedContext, context);
+    if (parentFiber.effectTag & ContentReset) {
+      // Reset the text content of the parent before doing any insertions
+      resetTextContent(parent);
+      // Clear ContentReset from the effect tag
+      parentFiber.effectTag &= ~ContentReset;
     }
 
-    return context;
-  }
-
-  function hasContextChanged() {
-    return didPerformWorkStackCursor.current;
-  }
-
-  function isContextConsumer(fiber) {
-    return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
-  }
-
-  function isContextProvider(fiber) {
-    return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
-  }
-
-  function popContextProvider(fiber) {
-    if (!isContextProvider(fiber)) {
-      return;
+    var before = getHostSibling(finishedWork);
+    // We only have the top Fiber that was inserted but we need recurse down its
+    // children to find all the terminal nodes.
+    var node = finishedWork;
+    while (true) {
+      if (node.tag === HostComponent || node.tag === HostText) {
+        if (before) {
+          if (isContainer) {
+            insertInContainerBefore(parent, node.stateNode, before);
+          } else {
+            insertBefore(parent, node.stateNode, before);
+          }
+        } else {
+          if (isContainer) {
+            appendChildToContainer(parent, node.stateNode);
+          } else {
+            appendChild(parent, node.stateNode);
+          }
+        }
+      } else if (node.tag === HostPortal) {
+        // If the insertion itself is a portal, then we don't want to traverse
+        // down its children. Instead, we'll get insertions from each child in
+        // the portal directly.
+      } else if (node.child !== null) {
+        node.child["return"] = node;
+        node = node.child;
+        continue;
+      }
+      if (node === finishedWork) {
+        return;
+      }
+      while (node.sibling === null) {
+        if (node["return"] === null || node["return"] === finishedWork) {
+          return;
+        }
+        node = node["return"];
+      }
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
     }
-
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
-  }
-
-  function popTopLevelContextObject(fiber) {
-    pop(didPerformWorkStackCursor, fiber);
-    pop(contextStackCursor, fiber);
   }
 
-  function pushTopLevelContextObject(fiber, context, didChange) {
-    invariant(
-      contextStackCursor.cursor == null,
-      "Unexpected context found on stack. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
-
-    push(contextStackCursor, context, fiber);
-    push(didPerformWorkStackCursor, didChange, fiber);
-  }
-
-  function processChildContext(fiber, parentContext) {
-    var instance = fiber.stateNode;
-    var childContextTypes = fiber.type.childContextTypes;
+  function unmountHostComponents(current) {
+    // We only have the top Fiber that was inserted but we need recurse down its
+    var node = current;
 
-    // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
-    if (typeof instance.getChildContext !== "function") {
-      {
-        var componentName = getComponentName(fiber) || "Unknown";
+    // Each iteration, currentParent is populated with node's host parent if not
+    // currentParentIsValid.
+    var currentParentIsValid = false;
+    var currentParent = void 0;
+    var currentParentIsContainer = void 0;
 
-        if (!warnedAboutMissingGetChildContext[componentName]) {
-          warnedAboutMissingGetChildContext[componentName] = true;
-          warning(
-            false,
-            "%s.childContextTypes is specified but there is no getChildContext() method " +
-              "on the instance. You can either define getChildContext() on %s or remove " +
-              "childContextTypes from it.",
-            componentName,
-            componentName
+    while (true) {
+      if (!currentParentIsValid) {
+        var parent = node["return"];
+        findParent: while (true) {
+          invariant(
+            parent !== null,
+            "Expected to find a host parent. This error is likely caused by " +
+              "a bug in React. Please file an issue."
           );
+          switch (parent.tag) {
+            case HostComponent:
+              currentParent = parent.stateNode;
+              currentParentIsContainer = false;
+              break findParent;
+            case HostRoot:
+              currentParent = parent.stateNode.containerInfo;
+              currentParentIsContainer = true;
+              break findParent;
+            case HostPortal:
+              currentParent = parent.stateNode.containerInfo;
+              currentParentIsContainer = true;
+              break findParent;
+          }
+          parent = parent["return"];
         }
+        currentParentIsValid = true;
       }
-      return parentContext;
-    }
 
-    var childContext = void 0;
-    {
-      ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
-    }
-    startPhaseTimer(fiber, "getChildContext");
-    childContext = instance.getChildContext();
-    stopPhaseTimer();
-    {
-      ReactDebugCurrentFiber.setCurrentPhase(null);
-    }
-    for (var contextKey in childContext) {
-      invariant(
-        contextKey in childContextTypes,
-        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-        getComponentName(fiber) || "Unknown",
-        contextKey
-      );
-    }
-    {
-      var name = getComponentName(fiber) || "Unknown";
-      checkPropTypes(
-        childContextTypes,
-        childContext,
-        "child context",
-        name,
-        // In practice, there is one case in which we won't get a stack. It's when
-        // somebody calls unstable_renderSubtreeIntoContainer() and we process
-        // context from the parent component instance. The stack will be missing
-        // because it's outside of the reconciliation, and so the pointer has not
-        // been set. This is rare and doesn't matter. We'll also remove that API.
-        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-      );
+      if (node.tag === HostComponent || node.tag === HostText) {
+        commitNestedUnmounts(node);
+        // After all the children have unmounted, it is now safe to remove the
+        // node from the tree.
+        if (currentParentIsContainer) {
+          removeChildFromContainer(currentParent, node.stateNode);
+        } else {
+          removeChild(currentParent, node.stateNode);
+        }
+        // Don't visit children because we already visited them.
+      } else if (node.tag === HostPortal) {
+        // When we go into a portal, it becomes the parent to remove from.
+        // We will reassign it back when we pop the portal on the way up.
+        currentParent = node.stateNode.containerInfo;
+        // Visit children because portals might contain host components.
+        if (node.child !== null) {
+          node.child["return"] = node;
+          node = node.child;
+          continue;
+        }
+      } else {
+        commitUnmount(node);
+        // Visit children because we may find more host components below.
+        if (node.child !== null) {
+          node.child["return"] = node;
+          node = node.child;
+          continue;
+        }
+      }
+      if (node === current) {
+        return;
+      }
+      while (node.sibling === null) {
+        if (node["return"] === null || node["return"] === current) {
+          return;
+        }
+        node = node["return"];
+        if (node.tag === HostPortal) {
+          // When we go out of the portal, we need to restore the parent.
+          // Since we don't keep a stack of them, we will search for it.
+          currentParentIsValid = false;
+        }
+      }
+      node.sibling["return"] = node["return"];
+      node = node.sibling;
     }
+  }
 
-    return Object.assign({}, parentContext, childContext);
+  function commitDeletion(current) {
+    // Recursively delete all host nodes from the parent.
+    // Detach refs and call componentWillUnmount() on the whole subtree.
+    unmountHostComponents(current);
+    detachFiber(current);
   }
 
-  function pushContextProvider(workInProgress) {
-    if (!isContextProvider(workInProgress)) {
-      return false;
+  function commitWork(current, finishedWork) {
+    switch (finishedWork.tag) {
+      case ClassComponent: {
+        return;
+      }
+      case HostComponent: {
+        var _instance7 = finishedWork.stateNode;
+        if (_instance7 != null) {
+          // Commit the work prepared earlier.
+          var newProps = finishedWork.memoizedProps;
+          // For hydration we reuse the update path but we treat the oldProps
+          // as the newProps. The updatePayload will contain the real change in
+          // this case.
+          var oldProps = current !== null ? current.memoizedProps : newProps;
+          var type = finishedWork.type;
+          // TODO: Type the updateQueue to be specific to host components.
+          var updatePayload = finishedWork.updateQueue;
+          finishedWork.updateQueue = null;
+          if (updatePayload !== null) {
+            commitUpdate(
+              _instance7,
+              updatePayload,
+              type,
+              oldProps,
+              newProps,
+              finishedWork
+            );
+          }
+        }
+        return;
+      }
+      case HostText: {
+        invariant(
+          finishedWork.stateNode !== null,
+          "This should have a text node initialized. This error is likely " +
+            "caused by a bug in React. Please file an issue."
+        );
+        var textInstance = finishedWork.stateNode;
+        var newText = finishedWork.memoizedProps;
+        // For hydration we reuse the update path but we treat the oldProps
+        // as the newProps. The updatePayload will contain the real change in
+        // this case.
+        var oldText = current !== null ? current.memoizedProps : newText;
+        commitTextUpdate(textInstance, oldText, newText);
+        return;
+      }
+      case HostRoot: {
+        return;
+      }
+      default: {
+        invariant(
+          false,
+          "This unit of work tag should not have side-effects. This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
+      }
     }
+  }
 
-    var instance = workInProgress.stateNode;
-    // We push the context as early as possible to ensure stack integrity.
-    // If the instance does not exist yet, we will push null at first,
-    // and replace it on the stack later when invalidating the context.
-    var memoizedMergedChildContext =
-      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-      emptyObject;
-
-    // Remember the parent context so we can merge with it later.
-    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
-    previousContext = contextStackCursor.current;
-    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-    push(
-      didPerformWorkStackCursor,
-      didPerformWorkStackCursor.current,
-      workInProgress
-    );
+  function commitResetTextContent(current) {
+    resetTextContent(current.stateNode);
+  }
 
-    return true;
+  if (enableMutatingReconciler) {
+    return {
+      commitResetTextContent: commitResetTextContent,
+      commitPlacement: commitPlacement,
+      commitDeletion: commitDeletion,
+      commitWork: commitWork,
+      commitLifeCycles: commitLifeCycles,
+      commitErrorLogging: commitErrorLogging,
+      commitAttachRef: commitAttachRef,
+      commitDetachRef: commitDetachRef
+    };
+  } else {
+    invariant(false, "Mutating reconciler is disabled.");
   }
+};
 
-  function invalidateContextProvider(workInProgress, didChange) {
-    var instance = workInProgress.stateNode;
-    invariant(
-      instance,
-      "Expected to have an instance by this point. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
+var NO_CONTEXT = {};
+
+var ReactFiberHostContext = function(config) {
+  var getChildHostContext = config.getChildHostContext,
+    getRootHostContext = config.getRootHostContext;
 
-    if (didChange) {
-      // Merge parent and own context.
-      // Skip this if we're not updating due to sCU.
-      // This avoids unnecessarily recomputing memoized values.
-      var mergedContext = processChildContext(workInProgress, previousContext);
-      instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-
-      // Replace the old (or empty) context with the new one.
-      // It is important to unwind the context in the reverse order.
-      pop(didPerformWorkStackCursor, workInProgress);
-      pop(contextStackCursor, workInProgress);
-      // Now push the new context and mark that it has changed.
-      push(contextStackCursor, mergedContext, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    } else {
-      pop(didPerformWorkStackCursor, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    }
-  }
+  var contextStackCursor = createCursor(NO_CONTEXT);
+  var contextFiberStackCursor = createCursor(NO_CONTEXT);
+  var rootInstanceStackCursor = createCursor(NO_CONTEXT);
 
-  function findCurrentUnmaskedContext(fiber) {
-    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-    // makes sense elsewhere
+  function requiredContext(c) {
     invariant(
-      isFiberMounted(fiber) && fiber.tag === ClassComponent,
-      "Expected subtree parent to be a mounted class component. " +
-        "This error is likely caused by a bug in React. Please file an issue."
+      c !== NO_CONTEXT,
+      "Expected host context to exist. This error is likely caused by a bug " +
+        "in React. Please file an issue."
     );
-
-    var node = fiber;
-    while (node.tag !== HostRoot) {
-      if (isContextProvider(node)) {
-        return node.stateNode.__reactInternalMemoizedMergedChildContext;
-      }
-      var parent = node["return"];
-      invariant(
-        parent,
-        "Found unexpected detached subtree parent. " +
-          "This error is likely caused by a bug in React. Please file an issue."
-      );
-      node = parent;
-    }
-    return node.stateNode.context;
+    return c;
   }
 
-  return {
-    getUnmaskedContext: getUnmaskedContext,
-    cacheContext: cacheContext,
-    getMaskedContext: getMaskedContext,
-    hasContextChanged: hasContextChanged,
-    isContextConsumer: isContextConsumer,
-    isContextProvider: isContextProvider,
-    popContextProvider: popContextProvider,
-    popTopLevelContextObject: popTopLevelContextObject,
-    pushTopLevelContextObject: pushTopLevelContextObject,
-    processChildContext: processChildContext,
-    pushContextProvider: pushContextProvider,
-    invalidateContextProvider: invalidateContextProvider,
-    findCurrentUnmaskedContext: findCurrentUnmaskedContext
-  };
-};
+  function getRootHostContainer() {
+    var rootInstance = requiredContext(rootInstanceStackCursor.current);
+    return rootInstance;
+  }
 
-var ReactFiberNewContext = function(stack) {
-  var createCursor = stack.createCursor,
-    push = stack.push,
-    pop = stack.pop;
+  function pushHostContainer(fiber, nextRootInstance) {
+    // Push current root instance onto the stack;
+    // This allows us to reset root when portals are popped.
+    push(rootInstanceStackCursor, nextRootInstance, fiber);
 
-  var providerCursor = createCursor(null);
-  var valueCursor = createCursor(null);
-  var changedBitsCursor = createCursor(0);
+    var nextRootContext = getRootHostContext(nextRootInstance);
 
-  var rendererSigil = void 0;
-  {
-    // Use this to detect multiple renderers using the same context
-    rendererSigil = {};
+    // Track the context and the Fiber that provided it.
+    // This enables us to pop only Fibers that provide unique contexts.
+    push(contextFiberStackCursor, fiber, fiber);
+    push(contextStackCursor, nextRootContext, fiber);
   }
 
-  function pushProvider(providerFiber) {
-    var context = providerFiber.type._context;
+  function popHostContainer(fiber) {
+    pop(contextStackCursor, fiber);
+    pop(contextFiberStackCursor, fiber);
+    pop(rootInstanceStackCursor, fiber);
+  }
 
-    push(changedBitsCursor, context._changedBits, providerFiber);
-    push(valueCursor, context._currentValue, providerFiber);
-    push(providerCursor, providerFiber, providerFiber);
+  function getHostContext() {
+    var context = requiredContext(contextStackCursor.current);
+    return context;
+  }
 
-    context._currentValue = providerFiber.pendingProps.value;
-    context._changedBits = providerFiber.stateNode;
+  function pushHostContext(fiber) {
+    var rootInstance = requiredContext(rootInstanceStackCursor.current);
+    var context = requiredContext(contextStackCursor.current);
+    var nextContext = getChildHostContext(context, fiber.type, rootInstance);
 
-    {
-      !(
-        context._currentRenderer === null ||
-        context._currentRenderer === rendererSigil
-      )
-        ? warning(
-            false,
-            "Detected multiple renderers concurrently rendering the " +
-              "same context provider. This is currently unsupported."
-          )
-        : void 0;
-      context._currentRenderer = rendererSigil;
+    // Don't push this Fiber's context unless it's unique.
+    if (context === nextContext) {
+      return;
     }
+
+    // Track the context and the Fiber that provided it.
+    // This enables us to pop only Fibers that provide unique contexts.
+    push(contextFiberStackCursor, fiber, fiber);
+    push(contextStackCursor, nextContext, fiber);
   }
 
-  function popProvider(providerFiber) {
-    var changedBits = changedBitsCursor.current;
-    var currentValue = valueCursor.current;
+  function popHostContext(fiber) {
+    // Do not pop unless this Fiber provided the current context.
+    // pushHostContext() only pushes Fibers that provide unique contexts.
+    if (contextFiberStackCursor.current !== fiber) {
+      return;
+    }
 
-    pop(providerCursor, providerFiber);
-    pop(valueCursor, providerFiber);
-    pop(changedBitsCursor, providerFiber);
+    pop(contextStackCursor, fiber);
+    pop(contextFiberStackCursor, fiber);
+  }
 
-    var context = providerFiber.type._context;
-    context._currentValue = currentValue;
-    context._changedBits = changedBits;
+  function resetHostContainer() {
+    contextStackCursor.current = NO_CONTEXT;
+    rootInstanceStackCursor.current = NO_CONTEXT;
   }
 
   return {
-    pushProvider: pushProvider,
-    popProvider: popProvider
+    getHostContext: getHostContext,
+    getRootHostContainer: getRootHostContainer,
+    popHostContainer: popHostContainer,
+    popHostContext: popHostContext,
+    pushHostContainer: pushHostContainer,
+    pushHostContext: pushHostContext,
+    resetHostContainer: resetHostContainer
   };
 };
 
-var ReactFiberStack = function() {
-  var valueStack = [];
+var ReactFiberHydrationContext = function(config) {
+  var shouldSetTextContent = config.shouldSetTextContent,
+    hydration = config.hydration;
 
-  var fiberStack = void 0;
+  // If this doesn't have hydration mode.
 
-  {
-    fiberStack = [];
+  if (!hydration) {
+    return {
+      enterHydrationState: function() {
+        return false;
+      },
+      resetHydrationState: function() {},
+      tryToClaimNextHydratableInstance: function() {},
+      prepareToHydrateHostInstance: function() {
+        invariant(
+          false,
+          "Expected prepareToHydrateHostInstance() to never be called. " +
+            "This error is likely caused by a bug in React. Please file an issue."
+        );
+      },
+      prepareToHydrateHostTextInstance: function() {
+        invariant(
+          false,
+          "Expected prepareToHydrateHostTextInstance() to never be called. " +
+            "This error is likely caused by a bug in React. Please file an issue."
+        );
+      },
+      popHydrationState: function(fiber) {
+        return false;
+      }
+    };
   }
 
-  var index = -1;
+  var canHydrateInstance = hydration.canHydrateInstance,
+    canHydrateTextInstance = hydration.canHydrateTextInstance,
+    getNextHydratableSibling = hydration.getNextHydratableSibling,
+    getFirstHydratableChild = hydration.getFirstHydratableChild,
+    hydrateInstance = hydration.hydrateInstance,
+    hydrateTextInstance = hydration.hydrateTextInstance,
+    didNotMatchHydratedContainerTextInstance =
+      hydration.didNotMatchHydratedContainerTextInstance,
+    didNotMatchHydratedTextInstance = hydration.didNotMatchHydratedTextInstance,
+    didNotHydrateContainerInstance = hydration.didNotHydrateContainerInstance,
+    didNotHydrateInstance = hydration.didNotHydrateInstance,
+    didNotFindHydratableContainerInstance =
+      hydration.didNotFindHydratableContainerInstance,
+    didNotFindHydratableContainerTextInstance =
+      hydration.didNotFindHydratableContainerTextInstance,
+    didNotFindHydratableInstance = hydration.didNotFindHydratableInstance,
+    didNotFindHydratableTextInstance =
+      hydration.didNotFindHydratableTextInstance;
+
+  // The deepest Fiber on the stack involved in a hydration context.
+  // This may have been an insertion or a hydration.
 
-  function createCursor(defaultValue) {
-    return {
-      current: defaultValue
-    };
+  var hydrationParentFiber = null;
+  var nextHydratableInstance = null;
+  var isHydrating = false;
+
+  function enterHydrationState(fiber) {
+    var parentInstance = fiber.stateNode.containerInfo;
+    nextHydratableInstance = getFirstHydratableChild(parentInstance);
+    hydrationParentFiber = fiber;
+    isHydrating = true;
+    return true;
+  }
+
+  function deleteHydratableInstance(returnFiber, instance) {
+    {
+      switch (returnFiber.tag) {
+        case HostRoot:
+          didNotHydrateContainerInstance(
+            returnFiber.stateNode.containerInfo,
+            instance
+          );
+          break;
+        case HostComponent:
+          didNotHydrateInstance(
+            returnFiber.type,
+            returnFiber.memoizedProps,
+            returnFiber.stateNode,
+            instance
+          );
+          break;
+      }
+    }
+
+    var childToDelete = createFiberFromHostInstanceForDeletion();
+    childToDelete.stateNode = instance;
+    childToDelete["return"] = returnFiber;
+    childToDelete.effectTag = Deletion;
+
+    // This might seem like it belongs on progressedFirstDeletion. However,
+    // these children are not part of the reconciliation list of children.
+    // Even if we abort and rereconcile the children, that will try to hydrate
+    // again and the nodes are still in the host tree so these will be
+    // recreated.
+    if (returnFiber.lastEffect !== null) {
+      returnFiber.lastEffect.nextEffect = childToDelete;
+      returnFiber.lastEffect = childToDelete;
+    } else {
+      returnFiber.firstEffect = returnFiber.lastEffect = childToDelete;
+    }
+  }
+
+  function insertNonHydratedInstance(returnFiber, fiber) {
+    fiber.effectTag |= Placement;
+    {
+      switch (returnFiber.tag) {
+        case HostRoot: {
+          var parentContainer = returnFiber.stateNode.containerInfo;
+          switch (fiber.tag) {
+            case HostComponent:
+              var type = fiber.type;
+              var props = fiber.pendingProps;
+              didNotFindHydratableContainerInstance(
+                parentContainer,
+                type,
+                props
+              );
+              break;
+            case HostText:
+              var text = fiber.pendingProps;
+              didNotFindHydratableContainerTextInstance(parentContainer, text);
+              break;
+          }
+          break;
+        }
+        case HostComponent: {
+          var parentType = returnFiber.type;
+          var parentProps = returnFiber.memoizedProps;
+          var parentInstance = returnFiber.stateNode;
+          switch (fiber.tag) {
+            case HostComponent:
+              var _type = fiber.type;
+              var _props = fiber.pendingProps;
+              didNotFindHydratableInstance(
+                parentType,
+                parentProps,
+                parentInstance,
+                _type,
+                _props
+              );
+              break;
+            case HostText:
+              var _text = fiber.pendingProps;
+              didNotFindHydratableTextInstance(
+                parentType,
+                parentProps,
+                parentInstance,
+                _text
+              );
+              break;
+          }
+          break;
+        }
+        default:
+          return;
+      }
+    }
   }
 
-  function isEmpty() {
-    return index === -1;
+  function tryHydrate(fiber, nextInstance) {
+    switch (fiber.tag) {
+      case HostComponent: {
+        var type = fiber.type;
+        var props = fiber.pendingProps;
+        var instance = canHydrateInstance(nextInstance, type, props);
+        if (instance !== null) {
+          fiber.stateNode = instance;
+          return true;
+        }
+        return false;
+      }
+      case HostText: {
+        var text = fiber.pendingProps;
+        var textInstance = canHydrateTextInstance(nextInstance, text);
+        if (textInstance !== null) {
+          fiber.stateNode = textInstance;
+          return true;
+        }
+        return false;
+      }
+      default:
+        return false;
+    }
   }
 
-  function pop(cursor, fiber) {
-    if (index < 0) {
-      {
-        warning(false, "Unexpected pop.");
-      }
+  function tryToClaimNextHydratableInstance(fiber) {
+    if (!isHydrating) {
       return;
     }
-
-    {
-      if (fiber !== fiberStack[index]) {
-        warning(false, "Unexpected Fiber popped.");
+    var nextInstance = nextHydratableInstance;
+    if (!nextInstance) {
+      // Nothing to hydrate. Make it an insertion.
+      insertNonHydratedInstance(hydrationParentFiber, fiber);
+      isHydrating = false;
+      hydrationParentFiber = fiber;
+      return;
+    }
+    if (!tryHydrate(fiber, nextInstance)) {
+      // If we can't hydrate this instance let's try the next one.
+      // We use this as a heuristic. It's based on intuition and not data so it
+      // might be flawed or unnecessary.
+      nextInstance = getNextHydratableSibling(nextInstance);
+      if (!nextInstance || !tryHydrate(fiber, nextInstance)) {
+        // Nothing to hydrate. Make it an insertion.
+        insertNonHydratedInstance(hydrationParentFiber, fiber);
+        isHydrating = false;
+        hydrationParentFiber = fiber;
+        return;
       }
+      // We matched the next one, we'll now assume that the first one was
+      // superfluous and we'll delete it. Since we can't eagerly delete it
+      // we'll have to schedule a deletion. To do that, this node needs a dummy
+      // fiber associated with it.
+      deleteHydratableInstance(hydrationParentFiber, nextHydratableInstance);
     }
+    hydrationParentFiber = fiber;
+    nextHydratableInstance = getFirstHydratableChild(nextInstance);
+  }
 
-    cursor.current = valueStack[index];
-
-    valueStack[index] = null;
+  function prepareToHydrateHostInstance(
+    fiber,
+    rootContainerInstance,
+    hostContext
+  ) {
+    var instance = fiber.stateNode;
+    var updatePayload = hydrateInstance(
+      instance,
+      fiber.type,
+      fiber.memoizedProps,
+      rootContainerInstance,
+      hostContext,
+      fiber
+    );
+    // TODO: Type this specific to this type of component.
+    fiber.updateQueue = updatePayload;
+    // If the update payload indicates that there is a change or if there
+    // is a new ref we mark this as an update.
+    if (updatePayload !== null) {
+      return true;
+    }
+    return false;
+  }
 
+  function prepareToHydrateHostTextInstance(fiber) {
+    var textInstance = fiber.stateNode;
+    var textContent = fiber.memoizedProps;
+    var shouldUpdate = hydrateTextInstance(textInstance, textContent, fiber);
     {
-      fiberStack[index] = null;
+      if (shouldUpdate) {
+        // We assume that prepareToHydrateHostTextInstance is called in a context where the
+        // hydration parent is the parent host component of this host text.
+        var returnFiber = hydrationParentFiber;
+        if (returnFiber !== null) {
+          switch (returnFiber.tag) {
+            case HostRoot: {
+              var parentContainer = returnFiber.stateNode.containerInfo;
+              didNotMatchHydratedContainerTextInstance(
+                parentContainer,
+                textInstance,
+                textContent
+              );
+              break;
+            }
+            case HostComponent: {
+              var parentType = returnFiber.type;
+              var parentProps = returnFiber.memoizedProps;
+              var parentInstance = returnFiber.stateNode;
+              didNotMatchHydratedTextInstance(
+                parentType,
+                parentProps,
+                parentInstance,
+                textInstance,
+                textContent
+              );
+              break;
+            }
+          }
+        }
+      }
     }
-
-    index--;
+    return shouldUpdate;
   }
 
-  function push(cursor, value, fiber) {
-    index++;
-
-    valueStack[index] = cursor.current;
+  function popToNextHostParent(fiber) {
+    var parent = fiber["return"];
+    while (
+      parent !== null &&
+      parent.tag !== HostComponent &&
+      parent.tag !== HostRoot
+    ) {
+      parent = parent["return"];
+    }
+    hydrationParentFiber = parent;
+  }
 
-    {
-      fiberStack[index] = fiber;
+  function popHydrationState(fiber) {
+    if (fiber !== hydrationParentFiber) {
+      // We're deeper than the current hydration context, inside an inserted
+      // tree.
+      return false;
+    }
+    if (!isHydrating) {
+      // If we're not currently hydrating but we're in a hydration context, then
+      // we were an insertion and now need to pop up reenter hydration of our
+      // siblings.
+      popToNextHostParent(fiber);
+      isHydrating = true;
+      return false;
     }
 
-    cursor.current = value;
-  }
+    var type = fiber.type;
 
-  function checkThatStackIsEmpty() {
-    {
-      if (index !== -1) {
-        warning(
-          false,
-          "Expected an empty stack. Something was not reset properly."
-        );
+    // If we have any remaining hydratable nodes, we need to delete them now.
+    // We only do this deeper than head and body since they tend to have random
+    // other nodes in them. We also ignore components with pure text content in
+    // side of them.
+    // TODO: Better heuristic.
+    if (
+      fiber.tag !== HostComponent ||
+      (type !== "head" &&
+        type !== "body" &&
+        !shouldSetTextContent(type, fiber.memoizedProps))
+    ) {
+      var nextInstance = nextHydratableInstance;
+      while (nextInstance) {
+        deleteHydratableInstance(fiber, nextInstance);
+        nextInstance = getNextHydratableSibling(nextInstance);
       }
     }
+
+    popToNextHostParent(fiber);
+    nextHydratableInstance = hydrationParentFiber
+      ? getNextHydratableSibling(fiber.stateNode)
+      : null;
+    return true;
   }
 
-  function resetStackAfterFatalErrorInDev() {
-    {
-      index = -1;
-      valueStack.length = 0;
-      fiberStack.length = 0;
-    }
+  function resetHydrationState() {
+    hydrationParentFiber = null;
+    nextHydratableInstance = null;
+    isHydrating = false;
   }
 
   return {
-    createCursor: createCursor,
-    isEmpty: isEmpty,
-    pop: pop,
-    push: push,
-    checkThatStackIsEmpty: checkThatStackIsEmpty,
-    resetStackAfterFatalErrorInDev: resetStackAfterFatalErrorInDev
+    enterHydrationState: enterHydrationState,
+    resetHydrationState: resetHydrationState,
+    tryToClaimNextHydratableInstance: tryToClaimNextHydratableInstance,
+    prepareToHydrateHostInstance: prepareToHydrateHostInstance,
+    prepareToHydrateHostTextInstance: prepareToHydrateHostTextInstance,
+    popHydrationState: popHydrationState
   };
 };
 
+// This lets us hook into Fiber to debug what it's doing.
+// See https://github.com/facebook/react/pull/8033.
+// This is not part of the public API, not even for React DevTools.
+// You may only inject a debugTool if you work on React Fiber itself.
+var ReactFiberInstrumentation = {
+  debugTool: null
+};
+
+var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
+
 var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError = ReactErrorUtils.hasCaughtError;
 var clearCaughtError = ReactErrorUtils.clearCaughtError;
@@ -12186,19 +11703,17 @@ var warnAboutInvalidUpdates = void 0;
   var didWarnStateUpdateForUnmountedComponent = {};
 
   warnAboutUpdateOnUnmounted = function(fiber) {
-    // We show the whole stack but dedupe on the top component's name because
-    // the problematic code almost always lies inside that component.
     var componentName = getComponentName(fiber) || "ReactClass";
     if (didWarnStateUpdateForUnmountedComponent[componentName]) {
       return;
     }
     warning(
       false,
-      "Can't call setState (or forceUpdate) on an unmounted component. This " +
-        "is a no-op, but it indicates a memory leak in your application. To " +
-        "fix, cancel all subscriptions and asynchronous tasks in the " +
-        "componentWillUnmount method.%s",
-      getStackAddendumByWorkInProgressFiber(fiber)
+      "Can only update a mounted or mounting " +
+        "component. This usually means you called setState, replaceState, " +
+        "or forceUpdate on an unmounted component. This is a no-op.\n\nPlease " +
+        "check the code for the %s component.",
+      componentName
     );
     didWarnStateUpdateForUnmountedComponent[componentName] = true;
   };
@@ -12233,23 +11748,16 @@ var warnAboutInvalidUpdates = void 0;
 }
 
 var ReactFiberScheduler = function(config) {
-  var stack = ReactFiberStack();
-  var hostContext = ReactFiberHostContext(config, stack);
-  var legacyContext = ReactFiberLegacyContext(stack);
-  var newContext = ReactFiberNewContext(stack);
+  var hostContext = ReactFiberHostContext(config);
   var popHostContext = hostContext.popHostContext,
     popHostContainer = hostContext.popHostContainer;
-  var popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
-    popLegacyContextProvider = legacyContext.popContextProvider;
-  var popProvider = newContext.popProvider;
 
   var hydrationContext = ReactFiberHydrationContext(config);
+  var resetHostContainer = hostContext.resetHostContainer;
 
   var _ReactFiberBeginWork = ReactFiberBeginWork(
       config,
       hostContext,
-      legacyContext,
-      newContext,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
@@ -12259,22 +11767,17 @@ var ReactFiberScheduler = function(config) {
   var _ReactFiberCompleteWo = ReactFiberCompleteWork(
       config,
       hostContext,
-      legacyContext,
-      newContext,
       hydrationContext
     ),
     completeWork = _ReactFiberCompleteWo.completeWork;
 
   var _ReactFiberUnwindWork = ReactFiberUnwindWork(
       hostContext,
-      legacyContext,
-      newContext,
       scheduleWork,
       isAlreadyFailedLegacyErrorBoundary
     ),
     throwException = _ReactFiberUnwindWork.throwException,
-    unwindWork = _ReactFiberUnwindWork.unwindWork,
-    unwindInterruptedWork = _ReactFiberUnwindWork.unwindInterruptedWork;
+    unwindWork = _ReactFiberUnwindWork.unwindWork;
 
   var _ReactFiberCommitWork = ReactFiberCommitWork(
       config,
@@ -12284,8 +11787,6 @@ var ReactFiberScheduler = function(config) {
       markLegacyErrorBoundaryAsFailed,
       recalculateCurrentTime
     ),
-    commitBeforeMutationLifeCycles =
-      _ReactFiberCommitWork.commitBeforeMutationLifeCycles,
     commitResetTextContent = _ReactFiberCommitWork.commitResetTextContent,
     commitPlacement = _ReactFiberCommitWork.commitPlacement,
     commitDeletion = _ReactFiberCommitWork.commitDeletion,
@@ -12337,29 +11838,21 @@ var ReactFiberScheduler = function(config) {
 
   var stashedWorkInProgressProperties = void 0;
   var replayUnitOfWork = void 0;
-  var isReplayingFailedUnitOfWork = void 0;
-  var originalReplayError = void 0;
-  var rethrowOriginalError = void 0;
   if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
     stashedWorkInProgressProperties = null;
-    isReplayingFailedUnitOfWork = false;
-    originalReplayError = null;
-    replayUnitOfWork = function(failedUnitOfWork, error, isAsync) {
-      // Restore the original state of the work-in-progress
-      assignFiberPropertiesInDEV(
-        failedUnitOfWork,
-        stashedWorkInProgressProperties
-      );
+    replayUnitOfWork = function(failedUnitOfWork, isAsync) {
+      // Retore the original state of the work-in-progress
+      Object.assign(failedUnitOfWork, stashedWorkInProgressProperties);
       switch (failedUnitOfWork.tag) {
         case HostRoot:
           popHostContainer(failedUnitOfWork);
-          popTopLevelLegacyContextObject(failedUnitOfWork);
+          popTopLevelContextObject(failedUnitOfWork);
           break;
         case HostComponent:
           popHostContext(failedUnitOfWork);
           break;
         case ClassComponent:
-          popLegacyContextProvider(failedUnitOfWork);
+          popContextProvider(failedUnitOfWork);
           break;
         case HostPortal:
           popHostContainer(failedUnitOfWork);
@@ -12369,36 +11862,28 @@ var ReactFiberScheduler = function(config) {
           break;
       }
       // Replay the begin phase.
-      isReplayingFailedUnitOfWork = true;
-      originalReplayError = error;
       invokeGuardedCallback$2(null, workLoop, null, isAsync);
-      isReplayingFailedUnitOfWork = false;
-      originalReplayError = null;
       if (hasCaughtError()) {
         clearCaughtError();
       } else {
-        // If the begin phase did not fail the second time, set this pointer
-        // back to the original value.
-        nextUnitOfWork = failedUnitOfWork;
+        // This should be unreachable because the render phase is
+        // idempotent
       }
     };
-    rethrowOriginalError = function() {
-      throw originalReplayError;
-    };
   }
 
-  function resetStack() {
-    if (nextUnitOfWork !== null) {
-      var interruptedWork = nextUnitOfWork["return"];
-      while (interruptedWork !== null) {
-        unwindInterruptedWork(interruptedWork);
-        interruptedWork = interruptedWork["return"];
-      }
-    }
+  function resetContextStack() {
+    // Reset the stack
+    reset();
+    // Reset the cursors
+    resetContext();
+    resetHostContainer();
+
+    // TODO: Unify new context implementation with other stacks
+    resetProviderStack();
 
     {
       ReactStrictModeWarnings.discardPendingWarnings();
-      stack.checkThatStackIsEmpty();
     }
 
     nextRoot = null;
@@ -12416,7 +11901,6 @@ var ReactFiberScheduler = function(config) {
       recordEffect();
 
       var effectTag = nextEffect.effectTag;
-
       if (effectTag & ContentReset) {
         commitResetTextContent(nextEffect);
       }
@@ -12474,22 +11958,6 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
-  function commitBeforeMutationLifecycles() {
-    while (nextEffect !== null) {
-      var effectTag = nextEffect.effectTag;
-
-      if (effectTag & Snapshot) {
-        recordEffect();
-        var current = nextEffect.alternate;
-        commitBeforeMutationLifeCycles(current, nextEffect);
-      }
-
-      // Don't cleanup effects yet;
-      // This will be done by commitAllLifeCycles()
-      nextEffect = nextEffect.nextEffect;
-    }
-  }
-
   function commitAllLifeCycles(
     finishedRoot,
     currentTime,
@@ -12597,14 +12065,16 @@ var ReactFiberScheduler = function(config) {
 
     prepareForCommit(root.containerInfo);
 
-    // Invoke instances of getSnapshotBeforeUpdate before mutation.
+    // Commit all the side-effects within a tree. We'll do this in two passes.
+    // The first pass performs all the host insertions, updates, deletions and
+    // ref unmounts.
     nextEffect = firstEffect;
-    startCommitSnapshotEffectsTimer();
+    startCommitHostEffectsTimer();
     while (nextEffect !== null) {
       var didError = false;
       var error = void 0;
       {
-        invokeGuardedCallback$2(null, commitBeforeMutationLifecycles, null);
+        invokeGuardedCallback$2(null, commitAllHostEffects, null);
         if (hasCaughtError()) {
           didError = true;
           error = clearCaughtError();
@@ -12623,36 +12093,6 @@ var ReactFiberScheduler = function(config) {
         }
       }
     }
-    stopCommitSnapshotEffectsTimer();
-
-    // Commit all the side-effects within a tree. We'll do this in two passes.
-    // The first pass performs all the host insertions, updates, deletions and
-    // ref unmounts.
-    nextEffect = firstEffect;
-    startCommitHostEffectsTimer();
-    while (nextEffect !== null) {
-      var _didError = false;
-      var _error = void 0;
-      {
-        invokeGuardedCallback$2(null, commitAllHostEffects, null);
-        if (hasCaughtError()) {
-          _didError = true;
-          _error = clearCaughtError();
-        }
-      }
-      if (_didError) {
-        invariant(
-          nextEffect !== null,
-          "Should have next effect. This error is likely caused by a bug " +
-            "in React. Please file an issue."
-        );
-        onCommitPhaseError(nextEffect, _error);
-        // Clean-up
-        if (nextEffect !== null) {
-          nextEffect = nextEffect.nextEffect;
-        }
-      }
-    }
     stopCommitHostEffectsTimer();
 
     resetAfterCommit(root.containerInfo);
@@ -12670,8 +12110,8 @@ var ReactFiberScheduler = function(config) {
     nextEffect = firstEffect;
     startCommitLifeCyclesTimer();
     while (nextEffect !== null) {
-      var _didError2 = false;
-      var _error2 = void 0;
+      var _didError = false;
+      var _error = void 0;
       {
         invokeGuardedCallback$2(
           null,
@@ -12682,17 +12122,17 @@ var ReactFiberScheduler = function(config) {
           committedExpirationTime
         );
         if (hasCaughtError()) {
-          _didError2 = true;
-          _error2 = clearCaughtError();
+          _didError = true;
+          _error = clearCaughtError();
         }
       }
-      if (_didError2) {
+      if (_didError) {
         invariant(
           nextEffect !== null,
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        onCommitPhaseError(nextEffect, _error2);
+        onCommitPhaseError(nextEffect, _error);
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
         }
@@ -12916,21 +12356,12 @@ var ReactFiberScheduler = function(config) {
     }
 
     if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-      stashedWorkInProgressProperties = assignFiberPropertiesInDEV(
-        stashedWorkInProgressProperties,
-        workInProgress
-      );
+      stashedWorkInProgressProperties = Object.assign({}, workInProgress);
     }
     var next = beginWork(current, workInProgress, nextRenderExpirationTime);
+
     {
       ReactDebugCurrentFiber.resetCurrentFiber();
-      if (isReplayingFailedUnitOfWork) {
-        // Currently replaying a failed unit of work. This should be unreachable,
-        // because the render phase is meant to be idempotent, and it should
-        // have thrown again. Since it didn't, rethrow the original error, so
-        // React's internal stack is not misaligned.
-        rethrowOriginalError();
-      }
     }
     if (true && ReactFiberInstrumentation_1.debugTool) {
       ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
@@ -12976,7 +12407,7 @@ var ReactFiberScheduler = function(config) {
       nextUnitOfWork === null
     ) {
       // Reset the stack and start working from the root.
-      resetStack();
+      resetContextStack();
       nextRoot = root;
       nextRenderExpirationTime = expirationTime;
       nextUnitOfWork = createWorkInProgress(
@@ -13004,18 +12435,13 @@ var ReactFiberScheduler = function(config) {
 
         if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
           var failedUnitOfWork = nextUnitOfWork;
-          replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
+          replayUnitOfWork(failedUnitOfWork, isAsync);
         }
 
         var sourceFiber = nextUnitOfWork;
         var returnFiber = sourceFiber["return"];
         if (returnFiber === null) {
-          // This is the root. The root could capture its own errors. However,
-          // we don't know if it errors before or after we pushed the host
-          // context. This information is needed to avoid a stack mismatch.
-          // Because we're not sure, treat this as a fatal error. We could track
-          // which phase it fails in, but doesn't seem worth it. At least
-          // for now.
+          // This is a fatal error.
           didFatal = true;
           onUncaughtError(thrownValue);
           break;
@@ -13027,32 +12453,23 @@ var ReactFiberScheduler = function(config) {
     } while (true);
 
     // We're done performing work. Time to clean up.
-    var didCompleteRoot = false;
+    stopWorkLoopTimer(interruptedBy);
+    interruptedBy = null;
     isWorking = false;
 
     // Yield back to main thread.
     if (didFatal) {
-      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-      interruptedBy = null;
       // There was a fatal error.
-      {
-        stack.resetStackAfterFatalErrorInDev();
-      }
       return null;
     } else if (nextUnitOfWork === null) {
       // We reached the root.
       if (isRootReadyForCommit) {
-        didCompleteRoot = true;
-        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-        interruptedBy = null;
         // The root successfully completed. It's ready for commit.
         root.pendingCommitExpirationTime = expirationTime;
         var finishedWork = root.current.alternate;
         return finishedWork;
       } else {
         // The root did not complete.
-        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-        interruptedBy = null;
         invariant(
           false,
           "Expired work should have completed. This error is likely caused " +
@@ -13060,8 +12477,6 @@ var ReactFiberScheduler = function(config) {
         );
       }
     } else {
-      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
-      interruptedBy = null;
       // There's more work to do, but we ran out of time. Yield back to
       // the renderer.
       return null;
@@ -13245,17 +12660,9 @@ var ReactFiberScheduler = function(config) {
           ) {
             // This is an interruption. (Used for performance tracking.)
             interruptedBy = fiber;
-            resetStack();
+            resetContextStack();
           }
-          if (
-            // If we're in the render phase, we don't need to schedule this root
-            // for an update, because we'll do it before we exit...
-            !isWorking ||
-            isCommitting ||
-            // ...unless this is a different root than the one we're rendering.
-            nextRoot !== root
-          ) {
-            // Add this root to the root schedule.
+          if (nextRoot !== root || !isWorking) {
             requestWork(root, expirationTime);
           }
           if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
@@ -13515,8 +12922,7 @@ var ReactFiberScheduler = function(config) {
 
     if (enableUserTimingAPI && deadline !== null) {
       var didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
-      var timeout = expirationTimeToMs(nextFlushedExpirationTime);
-      stopRequestCallbackTimer(didExpire, timeout);
+      stopRequestCallbackTimer(didExpire);
     }
 
     if (isAsync) {
@@ -13576,11 +12982,7 @@ var ReactFiberScheduler = function(config) {
     // Perform work on root as if the given expiration time is the current time.
     // This has the effect of synchronously flushing all work up to and
     // including the given time.
-    nextFlushedRoot = root;
-    nextFlushedExpirationTime = expirationTime;
     performWorkOnRoot(root, expirationTime, false);
-    // Flush any sync work that was scheduled by lifecycles
-    performSyncWork();
     finishRendering();
   }
 
@@ -13829,8 +13231,7 @@ var ReactFiberScheduler = function(config) {
     syncUpdates: syncUpdates,
     interactiveUpdates: interactiveUpdates,
     flushInteractiveUpdates: flushInteractiveUpdates,
-    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration,
-    legacyContext: legacyContext
+    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration
   };
 };
 
@@ -13843,6 +13244,18 @@ var didWarnAboutNestedUpdates = void 0;
 // 0 is PROD, 1 is DEV.
 // Might add PROFILE later.
 
+function getContextForSubtree(parentComponent) {
+  if (!parentComponent) {
+    return emptyObject;
+  }
+
+  var fiber = get(parentComponent);
+  var parentContext = findCurrentUnmaskedContext(fiber);
+  return isContextProvider(fiber)
+    ? processChildContext(fiber, parentContext)
+    : parentContext;
+}
+
 var ReactFiberReconciler$1 = function(config) {
   var getPublicInstance = config.getPublicInstance;
 
@@ -13861,24 +13274,7 @@ var ReactFiberReconciler$1 = function(config) {
     deferredUpdates = _ReactFiberScheduler.deferredUpdates,
     syncUpdates = _ReactFiberScheduler.syncUpdates,
     interactiveUpdates = _ReactFiberScheduler.interactiveUpdates,
-    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates,
-    legacyContext = _ReactFiberScheduler.legacyContext;
-
-  var findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
-    isContextProvider = legacyContext.isContextProvider,
-    processChildContext = legacyContext.processChildContext;
-
-  function getContextForSubtree(parentComponent) {
-    if (!parentComponent) {
-      return emptyObject;
-    }
-
-    var fiber = get(parentComponent);
-    var parentContext = findCurrentUnmaskedContext(fiber);
-    return isContextProvider(fiber)
-      ? processChildContext(fiber, parentContext)
-      : parentContext;
-  }
+    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates;
 
   function scheduleRootUpdate(
     current,
@@ -13907,14 +13303,12 @@ var ReactFiberReconciler$1 = function(config) {
 
     callback = callback === undefined ? null : callback;
     {
-      !(callback === null || typeof callback === "function")
-        ? warning(
-            false,
-            "render(...): Expected the last optional `callback` argument to be a " +
-              "function. Instead received: %s.",
-            callback
-          )
-        : void 0;
+      warning(
+        callback === null || typeof callback === "function",
+        "render(...): Expected the last optional `callback` argument to be a " +
+          "function. Instead received: %s.",
+        callback
+      );
     }
 
     var update = {
@@ -14236,8 +13630,7 @@ var frameDeadline = 0;
 var frameDeadlineObject = {
   timeRemaining: function() {
     return frameDeadline - now();
-  },
-  didTimeout: false
+  }
 };
 
 function setTimeoutCallback() {
diff --git a/Libraries/Renderer/ReactNativeRenderer-prod.js b/Libraries/Renderer/ReactNativeRenderer-prod.js
index 055ddd7bb0c161..ca27b720b33dfe 100644
--- a/Libraries/Renderer/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/ReactNativeRenderer-prod.js
@@ -1174,9 +1174,6 @@ var hasSymbol = "function" === typeof Symbol && Symbol["for"],
   REACT_PROVIDER_TYPE = hasSymbol ? Symbol["for"]("react.provider") : 60109,
   REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 60110,
   REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol["for"]("react.async_mode") : 60111,
-  REACT_FORWARD_REF_TYPE = hasSymbol
-    ? Symbol["for"]("react.forward_ref")
-    : 60112,
   MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
   if (null === maybeIterable || "undefined" === typeof maybeIterable)
@@ -1822,6 +1819,141 @@ function findCurrentHostFiberWithNoPortals(parent) {
   }
   return null;
 }
+var valueStack = [],
+  index = -1;
+function pop(cursor) {
+  0 > index ||
+    ((cursor.current = valueStack[index]), (valueStack[index] = null), index--);
+}
+function push(cursor, value) {
+  index++;
+  valueStack[index] = cursor.current;
+  cursor.current = value;
+}
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  do {
+    a: switch (workInProgress.tag) {
+      case 0:
+      case 1:
+      case 2:
+      case 5:
+        var owner = workInProgress._debugOwner,
+          source = workInProgress._debugSource;
+        var JSCompiler_inline_result = getComponentName(workInProgress);
+        var ownerName = null;
+        owner && (ownerName = getComponentName(owner));
+        owner = source;
+        JSCompiler_inline_result =
+          "\n    in " +
+          (JSCompiler_inline_result || "Unknown") +
+          (owner
+            ? " (at " +
+              owner.fileName.replace(/^.*[\\\/]/, "") +
+              ":" +
+              owner.lineNumber +
+              ")"
+            : ownerName ? " (created by " + ownerName + ")" : "");
+        break a;
+      default:
+        JSCompiler_inline_result = "";
+    }
+    info += JSCompiler_inline_result;
+    workInProgress = workInProgress["return"];
+  } while (workInProgress);
+  return info;
+}
+var _require = require("ReactFeatureFlags"),
+  enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch,
+  debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects,
+  debugRenderPhaseSideEffectsForStrictMode =
+    _require.debugRenderPhaseSideEffectsForStrictMode;
+new Set();
+var contextStackCursor = { current: emptyObject },
+  didPerformWorkStackCursor = { current: !1 },
+  previousContext = emptyObject;
+function getUnmaskedContext(workInProgress) {
+  return isContextProvider(workInProgress)
+    ? previousContext
+    : contextStackCursor.current;
+}
+function getMaskedContext(workInProgress, unmaskedContext) {
+  var contextTypes = workInProgress.type.contextTypes;
+  if (!contextTypes) return emptyObject;
+  var instance = workInProgress.stateNode;
+  if (
+    instance &&
+    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+  )
+    return instance.__reactInternalMemoizedMaskedChildContext;
+  var context = {},
+    key;
+  for (key in contextTypes) context[key] = unmaskedContext[key];
+  instance &&
+    ((workInProgress = workInProgress.stateNode),
+    (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
+    (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
+  return context;
+}
+function isContextProvider(fiber) {
+  return 2 === fiber.tag && null != fiber.type.childContextTypes;
+}
+function popContextProvider(fiber) {
+  isContextProvider(fiber) &&
+    (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
+}
+function pushTopLevelContextObject(fiber, context, didChange) {
+  invariant(
+    null == contextStackCursor.cursor,
+    "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
+  );
+  push(contextStackCursor, context, fiber);
+  push(didPerformWorkStackCursor, didChange, fiber);
+}
+function processChildContext(fiber, parentContext) {
+  var instance = fiber.stateNode,
+    childContextTypes = fiber.type.childContextTypes;
+  if ("function" !== typeof instance.getChildContext) return parentContext;
+  instance = instance.getChildContext();
+  for (var contextKey in instance)
+    invariant(
+      contextKey in childContextTypes,
+      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+      getComponentName(fiber) || "Unknown",
+      contextKey
+    );
+  return Object.assign({}, parentContext, instance);
+}
+function pushContextProvider(workInProgress) {
+  if (!isContextProvider(workInProgress)) return !1;
+  var instance = workInProgress.stateNode;
+  instance =
+    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+    emptyObject;
+  previousContext = contextStackCursor.current;
+  push(contextStackCursor, instance, workInProgress);
+  push(
+    didPerformWorkStackCursor,
+    didPerformWorkStackCursor.current,
+    workInProgress
+  );
+  return !0;
+}
+function invalidateContextProvider(workInProgress, didChange) {
+  var instance = workInProgress.stateNode;
+  invariant(
+    instance,
+    "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+  );
+  if (didChange) {
+    var mergedContext = processChildContext(workInProgress, previousContext);
+    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+    pop(didPerformWorkStackCursor, workInProgress);
+    pop(contextStackCursor, workInProgress);
+    push(contextStackCursor, mergedContext, workInProgress);
+  } else pop(didPerformWorkStackCursor, workInProgress);
+  push(didPerformWorkStackCursor, didChange, workInProgress);
+}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -1905,9 +2037,6 @@ function createFiberFromElement(element, mode, expirationTime) {
             case REACT_CONTEXT_TYPE:
               fiberTag = 12;
               break;
-            case REACT_FORWARD_REF_TYPE:
-              fiberTag = 14;
-              break;
             default:
               if ("number" === typeof type.tag)
                 return (
@@ -1988,45 +2117,6 @@ function onCommitRoot(root) {
 function onCommitUnmount(fiber) {
   "function" === typeof onCommitFiberUnmount && onCommitFiberUnmount(fiber);
 }
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  do {
-    a: switch (workInProgress.tag) {
-      case 0:
-      case 1:
-      case 2:
-      case 5:
-        var owner = workInProgress._debugOwner,
-          source = workInProgress._debugSource;
-        var JSCompiler_inline_result = getComponentName(workInProgress);
-        var ownerName = null;
-        owner && (ownerName = getComponentName(owner));
-        owner = source;
-        JSCompiler_inline_result =
-          "\n    in " +
-          (JSCompiler_inline_result || "Unknown") +
-          (owner
-            ? " (at " +
-              owner.fileName.replace(/^.*[\\\/]/, "") +
-              ":" +
-              owner.lineNumber +
-              ")"
-            : ownerName ? " (created by " + ownerName + ")" : "");
-        break a;
-      default:
-        JSCompiler_inline_result = "";
-    }
-    info += JSCompiler_inline_result;
-    workInProgress = workInProgress["return"];
-  } while (workInProgress);
-  return info;
-}
-var _require = require("ReactFeatureFlags"),
-  enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch,
-  debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects,
-  debugRenderPhaseSideEffectsForStrictMode =
-    _require.debugRenderPhaseSideEffectsForStrictMode;
-new Set();
 function createUpdateQueue(baseState) {
   return {
     baseState: baseState,
@@ -2198,7 +2288,6 @@ function callGetDerivedStateFromCatch(ctor, capturedValues) {
   return resultState;
 }
 function ReactFiberClassComponent(
-  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
@@ -2246,82 +2335,81 @@ function ReactFiberClassComponent(
     instance.state !== workInProgress &&
       updater.enqueueReplaceState(instance, instance.state, null);
   }
-  function callGetDerivedStateFromProps(
-    workInProgress,
-    instance,
-    nextProps,
-    prevState
-  ) {
+  function callGetDerivedStateFromProps(workInProgress, instance, props) {
     instance = workInProgress.type;
     if ("function" === typeof instance.getDerivedStateFromProps)
       return (
         (debugRenderPhaseSideEffects ||
           (debugRenderPhaseSideEffectsForStrictMode &&
             workInProgress.mode & 2)) &&
-          instance.getDerivedStateFromProps.call(null, nextProps, prevState),
-        instance.getDerivedStateFromProps.call(null, nextProps, prevState)
+          instance.getDerivedStateFromProps.call(
+            null,
+            props,
+            workInProgress.memoizedState
+          ),
+        instance.getDerivedStateFromProps.call(
+          null,
+          props,
+          workInProgress.memoizedState
+        )
       );
   }
-  var cacheContext = legacyContext.cacheContext,
-    getMaskedContext = legacyContext.getMaskedContext,
-    getUnmaskedContext = legacyContext.getUnmaskedContext,
-    isContextConsumer = legacyContext.isContextConsumer,
-    hasContextChanged = legacyContext.hasContextChanged,
-    updater = {
-      isMounted: isMounted,
-      enqueueSetState: function(instance, partialState, callback) {
-        instance = instance._reactInternalFiber;
-        callback = void 0 === callback ? null : callback;
-        var expirationTime = computeExpirationForFiber(instance);
-        insertUpdateIntoFiber(instance, {
-          expirationTime: expirationTime,
-          partialState: partialState,
-          callback: callback,
-          isReplace: !1,
-          isForced: !1,
-          capturedValue: null,
-          next: null
-        });
-        scheduleWork(instance, expirationTime);
-      },
-      enqueueReplaceState: function(instance, state, callback) {
-        instance = instance._reactInternalFiber;
-        callback = void 0 === callback ? null : callback;
-        var expirationTime = computeExpirationForFiber(instance);
-        insertUpdateIntoFiber(instance, {
-          expirationTime: expirationTime,
-          partialState: state,
-          callback: callback,
-          isReplace: !0,
-          isForced: !1,
-          capturedValue: null,
-          next: null
-        });
-        scheduleWork(instance, expirationTime);
-      },
-      enqueueForceUpdate: function(instance, callback) {
-        instance = instance._reactInternalFiber;
-        callback = void 0 === callback ? null : callback;
-        var expirationTime = computeExpirationForFiber(instance);
-        insertUpdateIntoFiber(instance, {
-          expirationTime: expirationTime,
-          partialState: null,
-          callback: callback,
-          isReplace: !1,
-          isForced: !0,
-          capturedValue: null,
-          next: null
-        });
-        scheduleWork(instance, expirationTime);
-      }
-    };
+  var updater = {
+    isMounted: isMounted,
+    enqueueSetState: function(instance, partialState, callback) {
+      instance = instance._reactInternalFiber;
+      callback = void 0 === callback ? null : callback;
+      var expirationTime = computeExpirationForFiber(instance);
+      insertUpdateIntoFiber(instance, {
+        expirationTime: expirationTime,
+        partialState: partialState,
+        callback: callback,
+        isReplace: !1,
+        isForced: !1,
+        capturedValue: null,
+        next: null
+      });
+      scheduleWork(instance, expirationTime);
+    },
+    enqueueReplaceState: function(instance, state, callback) {
+      instance = instance._reactInternalFiber;
+      callback = void 0 === callback ? null : callback;
+      var expirationTime = computeExpirationForFiber(instance);
+      insertUpdateIntoFiber(instance, {
+        expirationTime: expirationTime,
+        partialState: state,
+        callback: callback,
+        isReplace: !0,
+        isForced: !1,
+        capturedValue: null,
+        next: null
+      });
+      scheduleWork(instance, expirationTime);
+    },
+    enqueueForceUpdate: function(instance, callback) {
+      instance = instance._reactInternalFiber;
+      callback = void 0 === callback ? null : callback;
+      var expirationTime = computeExpirationForFiber(instance);
+      insertUpdateIntoFiber(instance, {
+        expirationTime: expirationTime,
+        partialState: null,
+        callback: callback,
+        isReplace: !1,
+        isForced: !0,
+        capturedValue: null,
+        next: null
+      });
+      scheduleWork(instance, expirationTime);
+    }
+  };
   return {
     adoptClassInstance: adoptClassInstance,
     callGetDerivedStateFromProps: callGetDerivedStateFromProps,
     constructClassInstance: function(workInProgress, props) {
       var ctor = workInProgress.type,
         unmaskedContext = getUnmaskedContext(workInProgress),
-        needsContext = isContextConsumer(workInProgress),
+        needsContext =
+          2 === workInProgress.tag && null != workInProgress.type.contextTypes,
         context = needsContext
           ? getMaskedContext(workInProgress, unmaskedContext)
           : emptyObject;
@@ -2334,7 +2422,7 @@ function ReactFiberClassComponent(
         null !== ctor.state && void 0 !== ctor.state ? ctor.state : null;
       adoptClassInstance(workInProgress, ctor);
       workInProgress.memoizedState = state;
-      props = callGetDerivedStateFromProps(workInProgress, ctor, props, state);
+      props = callGetDerivedStateFromProps(workInProgress, ctor, props);
       null !== props &&
         void 0 !== props &&
         (workInProgress.memoizedState = Object.assign(
@@ -2342,7 +2430,10 @@ function ReactFiberClassComponent(
           workInProgress.memoizedState,
           props
         ));
-      needsContext && cacheContext(workInProgress, unmaskedContext, context);
+      needsContext &&
+        ((workInProgress = workInProgress.stateNode),
+        (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
+        (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
       return ctor;
     },
     mountClassInstance: function(workInProgress, renderExpirationTime) {
@@ -2355,10 +2446,9 @@ function ReactFiberClassComponent(
       instance.state = workInProgress.memoizedState;
       instance.refs = emptyObject;
       instance.context = getMaskedContext(workInProgress, unmaskedContext);
-      "function" === typeof ctor.getDerivedStateFromProps ||
-        "function" === typeof instance.getSnapshotBeforeUpdate ||
-        ("function" !== typeof instance.UNSAFE_componentWillMount &&
-          "function" !== typeof instance.componentWillMount) ||
+      ("function" !== typeof instance.UNSAFE_componentWillMount &&
+        "function" !== typeof instance.componentWillMount) ||
+        "function" === typeof ctor.getDerivedStateFromProps ||
         ((ctor = instance.state),
         "function" === typeof instance.componentWillMount &&
           instance.componentWillMount(),
@@ -2389,12 +2479,9 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      var hasNewLifecycles =
+      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+        "function" !== typeof instance.componentWillReceiveProps) ||
         "function" === typeof ctor.getDerivedStateFromProps ||
-        "function" === typeof instance.getSnapshotBeforeUpdate;
-      hasNewLifecycles ||
-        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-          "function" !== typeof instance.componentWillReceiveProps) ||
         ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
           callComponentWillReceiveProps(
             workInProgress,
@@ -2402,8 +2489,15 @@ function ReactFiberClassComponent(
             newProps,
             newUnmaskedContext
           ));
-      oldContext = workInProgress.memoizedState;
-      var derivedStateFromCatch = void 0;
+      oldContext = void 0;
+      oldProps !== newProps &&
+        (oldContext = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps
+        ));
+      var oldState = workInProgress.memoizedState,
+        derivedStateFromCatch = void 0;
       if (null !== workInProgress.updateQueue) {
         renderExpirationTime = processUpdateQueue(
           null,
@@ -2422,46 +2516,24 @@ function ReactFiberClassComponent(
             ctor,
             updateQueue.capturedValues
           ));
-      } else renderExpirationTime = oldContext;
-      ctor = void 0;
-      oldProps !== newProps &&
-        (ctor = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps,
-          renderExpirationTime
-        ));
-      null !== ctor &&
-        void 0 !== ctor &&
-        ((renderExpirationTime =
+      } else renderExpirationTime = oldState;
+      null !== oldContext &&
+        void 0 !== oldContext &&
+        (renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? ctor
-            : Object.assign({}, renderExpirationTime, ctor)),
-        (updateQueue = workInProgress.updateQueue),
-        null !== updateQueue &&
-          (updateQueue.baseState = Object.assign(
-            {},
-            updateQueue.baseState,
-            ctor
-          )));
+            ? oldContext
+            : Object.assign({}, renderExpirationTime, oldContext));
       null !== derivedStateFromCatch &&
         void 0 !== derivedStateFromCatch &&
-        ((renderExpirationTime =
+        (renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
             ? derivedStateFromCatch
-            : Object.assign({}, renderExpirationTime, derivedStateFromCatch)),
-        (ctor = workInProgress.updateQueue),
-        null !== ctor &&
-          (ctor.baseState = Object.assign(
-            {},
-            ctor.baseState,
-            derivedStateFromCatch
-          )));
+            : Object.assign({}, renderExpirationTime, derivedStateFromCatch));
       if (
         !(
           oldProps !== newProps ||
-          oldContext !== renderExpirationTime ||
-          hasContextChanged() ||
+          oldState !== renderExpirationTime ||
+          didPerformWorkStackCursor.current ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -2475,18 +2547,26 @@ function ReactFiberClassComponent(
         workInProgress,
         oldProps,
         newProps,
-        oldContext,
+        oldState,
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (hasNewLifecycles ||
-            ("function" !== typeof instance.UNSAFE_componentWillMount &&
-              "function" !== typeof instance.componentWillMount) ||
-            ("function" === typeof instance.componentWillMount &&
-              instance.componentWillMount(),
-            "function" === typeof instance.UNSAFE_componentWillMount &&
-              instance.UNSAFE_componentWillMount()),
-          "function" === typeof instance.componentDidMount &&
+        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
+            "function" !== typeof instance.componentWillUpdate) ||
+            "function" === typeof ctor.getDerivedStateFromProps ||
+            ("function" === typeof instance.componentWillUpdate &&
+              instance.componentWillUpdate(
+                newProps,
+                renderExpirationTime,
+                newUnmaskedContext
+              ),
+            "function" === typeof instance.UNSAFE_componentWillUpdate &&
+              instance.UNSAFE_componentWillUpdate(
+                newProps,
+                renderExpirationTime,
+                newUnmaskedContext
+              )),
+          "function" === typeof instance.componentDidUpdate &&
             (workInProgress.effectTag |= 4))
         : ("function" === typeof instance.componentDidMount &&
             (workInProgress.effectTag |= 4),
@@ -2511,12 +2591,9 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      var hasNewLifecycles =
+      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+        "function" !== typeof instance.componentWillReceiveProps) ||
         "function" === typeof ctor.getDerivedStateFromProps ||
-        "function" === typeof instance.getSnapshotBeforeUpdate;
-      hasNewLifecycles ||
-        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-          "function" !== typeof instance.componentWillReceiveProps) ||
         ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
           callComponentWillReceiveProps(
             workInProgress,
@@ -2524,6 +2601,13 @@ function ReactFiberClassComponent(
             newProps,
             newUnmaskedContext
           ));
+      var derivedStateFromProps = void 0;
+      oldProps !== newProps &&
+        (derivedStateFromProps = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps
+        ));
       oldContext = workInProgress.memoizedState;
       var derivedStateFromCatch = void 0;
       if (null !== workInProgress.updateQueue) {
@@ -2545,45 +2629,23 @@ function ReactFiberClassComponent(
             updateQueue.capturedValues
           ));
       } else renderExpirationTime = oldContext;
-      ctor = void 0;
-      oldProps !== newProps &&
-        (ctor = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps,
-          renderExpirationTime
-        ));
-      null !== ctor &&
-        void 0 !== ctor &&
-        ((renderExpirationTime =
+      null !== derivedStateFromProps &&
+        void 0 !== derivedStateFromProps &&
+        (renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? ctor
-            : Object.assign({}, renderExpirationTime, ctor)),
-        (updateQueue = workInProgress.updateQueue),
-        null !== updateQueue &&
-          (updateQueue.baseState = Object.assign(
-            {},
-            updateQueue.baseState,
-            ctor
-          )));
+            ? derivedStateFromProps
+            : Object.assign({}, renderExpirationTime, derivedStateFromProps));
       null !== derivedStateFromCatch &&
         void 0 !== derivedStateFromCatch &&
-        ((renderExpirationTime =
+        (renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
             ? derivedStateFromCatch
-            : Object.assign({}, renderExpirationTime, derivedStateFromCatch)),
-        (ctor = workInProgress.updateQueue),
-        null !== ctor &&
-          (ctor.baseState = Object.assign(
-            {},
-            ctor.baseState,
-            derivedStateFromCatch
-          )));
+            : Object.assign({}, renderExpirationTime, derivedStateFromCatch));
       if (
         !(
           oldProps !== newProps ||
           oldContext !== renderExpirationTime ||
-          hasContextChanged() ||
+          didPerformWorkStackCursor.current ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -2593,13 +2655,9 @@ function ReactFiberClassComponent(
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
-          "function" !== typeof instance.getSnapshotBeforeUpdate ||
-            (oldProps === current.memoizedProps &&
-              oldContext === current.memoizedState) ||
-            (workInProgress.effectTag |= 2048),
           !1
         );
-      (derivedStateFromCatch = checkShouldComponentUpdate(
+      (derivedStateFromProps = checkShouldComponentUpdate(
         workInProgress,
         oldProps,
         newProps,
@@ -2607,9 +2665,9 @@ function ReactFiberClassComponent(
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (hasNewLifecycles ||
-            ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
-              "function" !== typeof instance.componentWillUpdate) ||
+        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
+            "function" !== typeof instance.componentWillUpdate) ||
+            "function" === typeof ctor.getDerivedStateFromProps ||
             ("function" === typeof instance.componentWillUpdate &&
               instance.componentWillUpdate(
                 newProps,
@@ -2623,23 +2681,17 @@ function ReactFiberClassComponent(
                 newUnmaskedContext
               )),
           "function" === typeof instance.componentDidUpdate &&
-            (workInProgress.effectTag |= 4),
-          "function" === typeof instance.getSnapshotBeforeUpdate &&
-            (workInProgress.effectTag |= 2048))
+            (workInProgress.effectTag |= 4))
         : ("function" !== typeof instance.componentDidUpdate ||
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
-          "function" !== typeof instance.getSnapshotBeforeUpdate ||
-            (oldProps === current.memoizedProps &&
-              oldContext === current.memoizedState) ||
-            (workInProgress.effectTag |= 2048),
           memoizeProps(workInProgress, newProps),
           memoizeState(workInProgress, renderExpirationTime));
       instance.props = newProps;
       instance.state = renderExpirationTime;
       instance.context = newUnmaskedContext;
-      return derivedStateFromCatch;
+      return derivedStateFromProps;
     }
   };
 }
@@ -3316,12 +3368,34 @@ function ChildReconciler(shouldTrackSideEffects) {
   };
 }
 var reconcileChildFibers = ChildReconciler(!0),
-  mountChildFibers = ChildReconciler(!1);
+  mountChildFibers = ChildReconciler(!1),
+  changedBitsStack = [],
+  currentValueStack = [],
+  stack = [],
+  index$1 = -1;
+function pushProvider(providerFiber) {
+  var context = providerFiber.type.context;
+  index$1 += 1;
+  changedBitsStack[index$1] = context._changedBits;
+  currentValueStack[index$1] = context._currentValue;
+  stack[index$1] = providerFiber;
+  context._currentValue = providerFiber.pendingProps.value;
+  context._changedBits = providerFiber.stateNode;
+}
+function popProvider(providerFiber) {
+  var changedBits = changedBitsStack[index$1],
+    currentValue = currentValueStack[index$1];
+  changedBitsStack[index$1] = null;
+  currentValueStack[index$1] = null;
+  stack[index$1] = null;
+  --index$1;
+  providerFiber = providerFiber.type.context;
+  providerFiber._currentValue = currentValue;
+  providerFiber._changedBits = changedBits;
+}
 function ReactFiberBeginWork(
   config,
   hostContext,
-  legacyContext,
-  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
@@ -3427,12 +3501,7 @@ function ReactFiberBeginWork(
     changedBits,
     renderExpirationTime
   ) {
-    var fiber = workInProgress.child;
-    for (
-      null !== fiber && (fiber["return"] = workInProgress);
-      null !== fiber;
-
-    ) {
+    for (var fiber = workInProgress.child; null !== fiber; ) {
       switch (fiber.tag) {
         case 12:
           var nextFiber = fiber.stateNode | 0;
@@ -3488,10 +3557,10 @@ function ReactFiberBeginWork(
     workInProgress,
     renderExpirationTime
   ) {
-    var context = workInProgress.type._context,
+    var context = workInProgress.type.context,
       newProps = workInProgress.pendingProps,
       oldProps = workInProgress.memoizedProps;
-    if (!hasLegacyContextChanged() && oldProps === newProps)
+    if (!didPerformWorkStackCursor.current && oldProps === newProps)
       return (
         (workInProgress.stateNode = 0),
         pushProvider(workInProgress),
@@ -3578,19 +3647,11 @@ function ReactFiberBeginWork(
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree,
     pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer,
-    pushProvider = newContext.pushProvider,
-    getMaskedContext = legacyContext.getMaskedContext,
-    getUnmaskedContext = legacyContext.getUnmaskedContext,
-    hasLegacyContextChanged = legacyContext.hasContextChanged,
-    pushLegacyContextProvider = legacyContext.pushContextProvider,
-    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
-    invalidateContextProvider = legacyContext.invalidateContextProvider,
     enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
   config = ReactFiberClassComponent(
-    legacyContext,
     scheduleWork,
     computeExpirationForFiber,
     function(workInProgress, nextProps) {
@@ -3617,7 +3678,7 @@ function ReactFiberBeginWork(
             pushHostRootContext(workInProgress);
             break;
           case 2:
-            pushLegacyContextProvider(workInProgress);
+            pushContextProvider(workInProgress);
             break;
           case 4:
             pushHostContainer(
@@ -3654,8 +3715,7 @@ function ReactFiberBeginWork(
                 ((props = callGetDerivedStateFromProps(
                   workInProgress,
                   fn,
-                  props,
-                  workInProgress.memoizedState
+                  props
                 )),
                 null !== props &&
                   void 0 !== props &&
@@ -3664,7 +3724,7 @@ function ReactFiberBeginWork(
                     workInProgress.memoizedState,
                     props
                   ))),
-              (props = pushLegacyContextProvider(workInProgress)),
+              (props = pushContextProvider(workInProgress)),
               adoptClassInstance(workInProgress, fn),
               mountClassInstance(workInProgress, renderExpirationTime),
               (current = finishClassComponent(
@@ -3684,7 +3744,7 @@ function ReactFiberBeginWork(
           return (
             (props = workInProgress.type),
             (renderExpirationTime = workInProgress.pendingProps),
-            hasLegacyContextChanged() ||
+            didPerformWorkStackCursor.current ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? ((fn = getUnmaskedContext(workInProgress)),
                 (fn = getMaskedContext(workInProgress, fn)),
@@ -3700,7 +3760,7 @@ function ReactFiberBeginWork(
             current
           );
         case 2:
-          props = pushLegacyContextProvider(workInProgress);
+          props = pushContextProvider(workInProgress);
           null === current
             ? null === workInProgress.stateNode
               ? (constructClassInstance(
@@ -3782,7 +3842,7 @@ function ReactFiberBeginWork(
             updateQueue = workInProgress.memoizedProps;
             fn = workInProgress.pendingProps;
             unmaskedContext = null !== current ? current.memoizedProps : null;
-            if (!hasLegacyContextChanged() && updateQueue === fn) {
+            if (!didPerformWorkStackCursor.current && updateQueue === fn) {
               if (
                 (updateQueue =
                   workInProgress.mode & 1 &&
@@ -3824,7 +3884,7 @@ function ReactFiberBeginWork(
         case 7:
           return (
             (props = workInProgress.pendingProps),
-            hasLegacyContextChanged() ||
+            didPerformWorkStackCursor.current ||
               workInProgress.memoizedProps !== props ||
               (props = workInProgress.memoizedProps),
             (fn = props.children),
@@ -3854,7 +3914,8 @@ function ReactFiberBeginWork(
               workInProgress.stateNode.containerInfo
             ),
             (props = workInProgress.pendingProps),
-            hasLegacyContextChanged() || workInProgress.memoizedProps !== props
+            didPerformWorkStackCursor.current ||
+            workInProgress.memoizedProps !== props
               ? (null === current
                   ? (workInProgress.child = reconcileChildFibers(
                       workInProgress,
@@ -3871,21 +3932,10 @@ function ReactFiberBeginWork(
                 )),
             current
           );
-        case 14:
-          return (
-            (renderExpirationTime = workInProgress.type.render),
-            (renderExpirationTime = renderExpirationTime(
-              workInProgress.pendingProps,
-              workInProgress.ref
-            )),
-            reconcileChildren(current, workInProgress, renderExpirationTime),
-            (workInProgress.memoizedProps = renderExpirationTime),
-            workInProgress.child
-          );
         case 10:
           return (
             (renderExpirationTime = workInProgress.pendingProps),
-            hasLegacyContextChanged() ||
+            didPerformWorkStackCursor.current ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? (reconcileChildren(
                   current,
@@ -3903,7 +3953,7 @@ function ReactFiberBeginWork(
         case 11:
           return (
             (renderExpirationTime = workInProgress.pendingProps.children),
-            hasLegacyContextChanged() ||
+            didPerformWorkStackCursor.current ||
             (null !== renderExpirationTime &&
               workInProgress.memoizedProps !== renderExpirationTime)
               ? (reconcileChildren(
@@ -3926,33 +3976,43 @@ function ReactFiberBeginWork(
             renderExpirationTime
           );
         case 12:
-          fn = workInProgress.type;
-          unmaskedContext = workInProgress.pendingProps;
-          var oldProps = workInProgress.memoizedProps;
-          props = fn._currentValue;
-          updateQueue = fn._changedBits;
-          if (
-            hasLegacyContextChanged() ||
-            0 !== updateQueue ||
-            oldProps !== unmaskedContext
-          ) {
-            workInProgress.memoizedProps = unmaskedContext;
-            oldProps = unmaskedContext.unstable_observedBits;
-            if (void 0 === oldProps || null === oldProps) oldProps = 1073741823;
-            workInProgress.stateNode = oldProps;
-            0 !== (updateQueue & oldProps) &&
-              propagateContextChange(
-                workInProgress,
-                fn,
-                updateQueue,
-                renderExpirationTime
-              );
-            renderExpirationTime = unmaskedContext.children;
-            renderExpirationTime = renderExpirationTime(props);
-            reconcileChildren(current, workInProgress, renderExpirationTime);
-            current = workInProgress.child;
-          } else
-            current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+          a: {
+            fn = workInProgress.type;
+            unmaskedContext = workInProgress.pendingProps;
+            updateQueue = workInProgress.memoizedProps;
+            props = fn._currentValue;
+            var changedBits = fn._changedBits;
+            if (
+              didPerformWorkStackCursor.current ||
+              0 !== changedBits ||
+              updateQueue !== unmaskedContext
+            ) {
+              workInProgress.memoizedProps = unmaskedContext;
+              var observedBits = unmaskedContext.unstable_observedBits;
+              if (void 0 === observedBits || null === observedBits)
+                observedBits = 1073741823;
+              workInProgress.stateNode = observedBits;
+              if (0 !== (changedBits & observedBits))
+                propagateContextChange(
+                  workInProgress,
+                  fn,
+                  changedBits,
+                  renderExpirationTime
+                );
+              else if (
+                null !== updateQueue &&
+                updateQueue.children === unmaskedContext.children
+              ) {
+                current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+                break a;
+              }
+              renderExpirationTime = unmaskedContext.children;
+              renderExpirationTime = renderExpirationTime(props);
+              reconcileChildren(current, workInProgress, renderExpirationTime);
+              current = workInProgress.child;
+            } else
+              current = bailoutOnAlreadyFinishedWork(current, workInProgress);
+          }
           return current;
         default:
           invariant(
@@ -3963,13 +4023,7 @@ function ReactFiberBeginWork(
     }
   };
 }
-function ReactFiberCompleteWork(
-  config,
-  hostContext,
-  legacyContext,
-  newContext,
-  hydrationContext
-) {
+function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
   function markUpdate(workInProgress) {
     workInProgress.effectTag |= 4;
   }
@@ -3983,9 +4037,6 @@ function ReactFiberCompleteWork(
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer,
-    popLegacyContextProvider = legacyContext.popContextProvider,
-    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
-    popProvider = newContext.popProvider,
     prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -4014,7 +4065,7 @@ function ReactFiberCompleteWork(
           return null;
         case 2:
           return (
-            popLegacyContextProvider(workInProgress),
+            popContextProvider(workInProgress),
             (current = workInProgress.stateNode),
             (newProps = workInProgress.updateQueue),
             null !== newProps &&
@@ -4027,7 +4078,8 @@ function ReactFiberCompleteWork(
           );
         case 3:
           popHostContainer(workInProgress);
-          popTopLevelLegacyContextObject(workInProgress);
+          pop(didPerformWorkStackCursor, workInProgress);
+          pop(contextStackCursor, workInProgress);
           newProps = workInProgress.stateNode;
           newProps.pendingContext &&
             ((newProps.context = newProps.pendingContext),
@@ -4211,8 +4263,6 @@ function ReactFiberCompleteWork(
           return (workInProgress.tag = 7), null;
         case 9:
           return null;
-        case 14:
-          return null;
         case 10:
           return null;
         case 11:
@@ -4243,16 +4293,11 @@ function ReactFiberCompleteWork(
 }
 function ReactFiberUnwindWork(
   hostContext,
-  legacyContext,
-  newContext,
   scheduleWork,
   isAlreadyFailedLegacyErrorBoundary
 ) {
   var popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext,
-    popLegacyContextProvider = legacyContext.popContextProvider,
-    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
-    popProvider = newContext.popProvider;
+    popHostContext = hostContext.popHostContext;
   return {
     throwException: function(returnFiber, sourceFiber, rawValue) {
       sourceFiber.effectTag |= 512;
@@ -4296,7 +4341,7 @@ function ReactFiberUnwindWork(
     unwindWork: function(workInProgress) {
       switch (workInProgress.tag) {
         case 2:
-          popLegacyContextProvider(workInProgress);
+          popContextProvider(workInProgress);
           var effectTag = workInProgress.effectTag;
           return effectTag & 1024
             ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4305,7 +4350,8 @@ function ReactFiberUnwindWork(
         case 3:
           return (
             popHostContainer(workInProgress),
-            popTopLevelLegacyContextObject(workInProgress),
+            pop(didPerformWorkStackCursor, workInProgress),
+            pop(contextStackCursor, workInProgress),
             (effectTag = workInProgress.effectTag),
             effectTag & 1024
               ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4321,25 +4367,6 @@ function ReactFiberUnwindWork(
         default:
           return null;
       }
-    },
-    unwindInterruptedWork: function(interruptedWork) {
-      switch (interruptedWork.tag) {
-        case 2:
-          popLegacyContextProvider(interruptedWork);
-          break;
-        case 3:
-          popHostContainer(interruptedWork);
-          popTopLevelLegacyContextObject(interruptedWork);
-          break;
-        case 5:
-          popHostContext(interruptedWork);
-          break;
-        case 4:
-          popHostContainer(interruptedWork);
-          break;
-        case 13:
-          popProvider(interruptedWork);
-      }
     }
   };
 }
@@ -4348,9 +4375,9 @@ function logError(boundary, errorInfo) {
     stack = errorInfo.stack;
   null === stack && (stack = getStackAddendumByWorkInProgressFiber(source));
   null !== source && getComponentName(source);
-  source = null !== stack ? stack : "";
   errorInfo = errorInfo.value;
-  null !== boundary && 2 === boundary.tag && getComponentName(boundary);
+  stack = null !== stack ? stack : "";
+  null !== boundary && getComponentName(boundary);
   try {
     if (errorInfo instanceof Error) {
       var message = errorInfo.message,
@@ -4360,13 +4387,13 @@ function logError(boundary, errorInfo) {
         errorToHandle.message =
           (message ? name + ": " + message : name) +
           "\n\nThis error is located at:" +
-          source;
+          stack;
       } catch (e) {}
     } else
       errorToHandle =
         "string" === typeof errorInfo
-          ? Error(errorInfo + "\n\nThis error is located at:" + source)
-          : Error("Unspecified error at:" + source);
+          ? Error(errorInfo + "\n\nThis error is located at:" + stack)
+          : Error("Unspecified error at:" + stack);
     ExceptionsManager.handleException(errorToHandle, !1);
   } catch (e) {
     (e && e.suppressReactErrorLogging) || console.error(e);
@@ -4388,19 +4415,19 @@ function ReactFiberCommitWork(
         } catch (refError) {
           captureError(current, refError);
         }
-      else ref.current = null;
+      else ref.value = null;
   }
   function commitUnmount(current) {
     "function" === typeof onCommitUnmount && onCommitUnmount(current);
     switch (current.tag) {
       case 2:
         safelyDetachRef(current);
-        var _instance7 = current.stateNode;
-        if ("function" === typeof _instance7.componentWillUnmount)
+        var _instance6 = current.stateNode;
+        if ("function" === typeof _instance6.componentWillUnmount)
           try {
-            (_instance7.props = current.memoizedProps),
-              (_instance7.state = current.memoizedState),
-              _instance7.componentWillUnmount();
+            (_instance6.props = current.memoizedProps),
+              (_instance6.state = current.memoizedState),
+              _instance6.componentWillUnmount();
           } catch (unmountError) {
             captureError(current, unmountError);
           }
@@ -4510,34 +4537,6 @@ function ReactFiberCommitWork(
     removeChild = mutation.removeChild,
     removeChildFromContainer = mutation.removeChildFromContainer;
   return {
-    commitBeforeMutationLifeCycles: function(current, finishedWork) {
-      switch (finishedWork.tag) {
-        case 2:
-          if (finishedWork.effectTag & 2048 && null !== current) {
-            var prevProps = current.memoizedProps,
-              prevState = current.memoizedState;
-            current = finishedWork.stateNode;
-            current.props = finishedWork.memoizedProps;
-            current.state = finishedWork.memoizedState;
-            finishedWork = current.getSnapshotBeforeUpdate(
-              prevProps,
-              prevState
-            );
-            current.__reactInternalSnapshotBeforeUpdate = finishedWork;
-          }
-          break;
-        case 3:
-        case 5:
-        case 6:
-        case 4:
-          break;
-        default:
-          invariant(
-            !1,
-            "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
-          );
-      }
-    },
     commitResetTextContent: function(current) {
       resetTextContent(current.stateNode);
     },
@@ -4643,8 +4642,8 @@ function ReactFiberCommitWork(
         case 2:
           break;
         case 5:
-          var _instance8 = finishedWork.stateNode;
-          if (null != _instance8) {
+          var _instance7 = finishedWork.stateNode;
+          if (null != _instance7) {
             var newProps = finishedWork.memoizedProps;
             current = null !== current ? current.memoizedProps : newProps;
             var type = finishedWork.type,
@@ -4652,7 +4651,7 @@ function ReactFiberCommitWork(
             finishedWork.updateQueue = null;
             null !== updatePayload &&
               commitUpdate(
-                _instance8,
+                _instance7,
                 updatePayload,
                 type,
                 current,
@@ -4666,11 +4665,11 @@ function ReactFiberCommitWork(
             null !== finishedWork.stateNode,
             "This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue."
           );
-          _instance8 = finishedWork.memoizedProps;
+          _instance7 = finishedWork.memoizedProps;
           commitTextUpdate(
             finishedWork.stateNode,
-            null !== current ? current.memoizedProps : _instance8,
-            _instance8
+            null !== current ? current.memoizedProps : _instance7,
+            _instance7
           );
           break;
         case 3:
@@ -4696,11 +4695,7 @@ function ReactFiberCommitWork(
               current = current.memoizedState;
               finishedRoot.props = finishedWork.memoizedProps;
               finishedRoot.state = finishedWork.memoizedState;
-              finishedRoot.componentDidUpdate(
-                prevProps,
-                current,
-                finishedRoot.__reactInternalSnapshotBeforeUpdate
-              );
+              finishedRoot.componentDidUpdate(prevProps, current);
             }
           finishedWork = finishedWork.updateQueue;
           null !== finishedWork && commitCallbacks(finishedWork, finishedRoot);
@@ -4762,12 +4757,9 @@ function ReactFiberCommitWork(
           onUncaughtError.state = finishedWork.memoizedState;
           for (ctor = 0; ctor < capturedErrors.length; ctor++) {
             updateQueue = capturedErrors[ctor];
-            var _error = updateQueue.value,
-              stack = updateQueue.stack;
+            var _error = updateQueue.value;
             logError(finishedWork, updateQueue);
-            onUncaughtError.componentDidCatch(_error, {
-              componentStack: null !== stack ? stack : ""
-            });
+            onUncaughtError.componentDidCatch(_error);
           }
           break;
         case 3:
@@ -4793,17 +4785,17 @@ function ReactFiberCommitWork(
     commitAttachRef: function(finishedWork) {
       var ref = finishedWork.ref;
       if (null !== ref) {
-        var _instance6 = finishedWork.stateNode;
+        var _instance5 = finishedWork.stateNode;
         switch (finishedWork.tag) {
           case 5:
-            finishedWork = getPublicInstance(_instance6);
+            finishedWork = getPublicInstance(_instance5);
             break;
           default:
-            finishedWork = _instance6;
+            finishedWork = _instance5;
         }
         "function" === typeof ref
           ? ref(finishedWork)
-          : (ref.current = finishedWork);
+          : (ref.value = finishedWork);
       }
     },
     commitDetachRef: function(current) {
@@ -4811,12 +4803,12 @@ function ReactFiberCommitWork(
       null !== current &&
         ("function" === typeof current
           ? current(null)
-          : (current.current = null));
+          : (current.value = null));
     }
   };
 }
 var NO_CONTEXT = {};
-function ReactFiberHostContext(config, stack) {
+function ReactFiberHostContext(config) {
   function requiredContext(c) {
     invariant(
       c !== NO_CONTEXT,
@@ -4825,13 +4817,10 @@ function ReactFiberHostContext(config, stack) {
     return c;
   }
   var getChildHostContext = config.getChildHostContext,
-    getRootHostContext = config.getRootHostContext;
-  config = stack.createCursor;
-  var push = stack.push,
-    pop = stack.pop,
-    contextStackCursor = config(NO_CONTEXT),
-    contextFiberStackCursor = config(NO_CONTEXT),
-    rootInstanceStackCursor = config(NO_CONTEXT);
+    getRootHostContext = config.getRootHostContext,
+    contextStackCursor = { current: NO_CONTEXT },
+    contextFiberStackCursor = { current: NO_CONTEXT },
+    rootInstanceStackCursor = { current: NO_CONTEXT };
   return {
     getHostContext: function() {
       return requiredContext(contextStackCursor.current);
@@ -4850,10 +4839,8 @@ function ReactFiberHostContext(config, stack) {
     },
     pushHostContainer: function(fiber, nextRootInstance) {
       push(rootInstanceStackCursor, nextRootInstance, fiber);
-      push(contextFiberStackCursor, fiber, fiber);
-      push(contextStackCursor, NO_CONTEXT, fiber);
       nextRootInstance = getRootHostContext(nextRootInstance);
-      pop(contextStackCursor, fiber);
+      push(contextFiberStackCursor, fiber, fiber);
       push(contextStackCursor, nextRootInstance, fiber);
     },
     pushHostContext: function(fiber) {
@@ -4863,6 +4850,10 @@ function ReactFiberHostContext(config, stack) {
       context !== rootInstance &&
         (push(contextFiberStackCursor, fiber, fiber),
         push(contextStackCursor, rootInstance, fiber));
+    },
+    resetHostContainer: function() {
+      contextStackCursor.current = NO_CONTEXT;
+      rootInstanceStackCursor.current = NO_CONTEXT;
     }
   };
 }
@@ -5022,198 +5013,22 @@ function ReactFiberHydrationContext(config) {
     }
   };
 }
-function ReactFiberLegacyContext(stack) {
-  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-    workInProgress = workInProgress.stateNode;
-    workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-    workInProgress.__reactInternalMemoizedMaskedChildContext = maskedContext;
-  }
-  function isContextProvider(fiber) {
-    return 2 === fiber.tag && null != fiber.type.childContextTypes;
-  }
-  function processChildContext(fiber, parentContext) {
-    var instance = fiber.stateNode,
-      childContextTypes = fiber.type.childContextTypes;
-    if ("function" !== typeof instance.getChildContext) return parentContext;
-    instance = instance.getChildContext();
-    for (var contextKey in instance)
-      invariant(
-        contextKey in childContextTypes,
-        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-        getComponentName(fiber) || "Unknown",
-        contextKey
-      );
-    return Object.assign({}, parentContext, instance);
-  }
-  var createCursor = stack.createCursor,
-    push = stack.push,
-    pop = stack.pop,
-    contextStackCursor = createCursor(emptyObject),
-    didPerformWorkStackCursor = createCursor(!1),
+function ReactFiberScheduler(config) {
+  function resetContextStack() {
+    for (; -1 < index; ) (valueStack[index] = null), index--;
     previousContext = emptyObject;
-  return {
-    getUnmaskedContext: function(workInProgress) {
-      return isContextProvider(workInProgress)
-        ? previousContext
-        : contextStackCursor.current;
-    },
-    cacheContext: cacheContext,
-    getMaskedContext: function(workInProgress, unmaskedContext) {
-      var contextTypes = workInProgress.type.contextTypes;
-      if (!contextTypes) return emptyObject;
-      var instance = workInProgress.stateNode;
-      if (
-        instance &&
-        instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-      )
-        return instance.__reactInternalMemoizedMaskedChildContext;
-      var context = {},
-        key;
-      for (key in contextTypes) context[key] = unmaskedContext[key];
-      instance && cacheContext(workInProgress, unmaskedContext, context);
-      return context;
-    },
-    hasContextChanged: function() {
-      return didPerformWorkStackCursor.current;
-    },
-    isContextConsumer: function(fiber) {
-      return 2 === fiber.tag && null != fiber.type.contextTypes;
-    },
-    isContextProvider: isContextProvider,
-    popContextProvider: function(fiber) {
-      isContextProvider(fiber) &&
-        (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
-    },
-    popTopLevelContextObject: function(fiber) {
-      pop(didPerformWorkStackCursor, fiber);
-      pop(contextStackCursor, fiber);
-    },
-    pushTopLevelContextObject: function(fiber, context, didChange) {
-      invariant(
-        null == contextStackCursor.cursor,
-        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
-      );
-      push(contextStackCursor, context, fiber);
-      push(didPerformWorkStackCursor, didChange, fiber);
-    },
-    processChildContext: processChildContext,
-    pushContextProvider: function(workInProgress) {
-      if (!isContextProvider(workInProgress)) return !1;
-      var instance = workInProgress.stateNode;
-      instance =
-        (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-        emptyObject;
-      previousContext = contextStackCursor.current;
-      push(contextStackCursor, instance, workInProgress);
-      push(
-        didPerformWorkStackCursor,
-        didPerformWorkStackCursor.current,
-        workInProgress
-      );
-      return !0;
-    },
-    invalidateContextProvider: function(workInProgress, didChange) {
-      var instance = workInProgress.stateNode;
-      invariant(
-        instance,
-        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
-      );
-      if (didChange) {
-        var mergedContext = processChildContext(
-          workInProgress,
-          previousContext
-        );
-        instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-        pop(didPerformWorkStackCursor, workInProgress);
-        pop(contextStackCursor, workInProgress);
-        push(contextStackCursor, mergedContext, workInProgress);
-      } else pop(didPerformWorkStackCursor, workInProgress);
-      push(didPerformWorkStackCursor, didChange, workInProgress);
-    },
-    findCurrentUnmaskedContext: function(fiber) {
-      for (
-        invariant(
-          2 === isFiberMountedImpl(fiber) && 2 === fiber.tag,
-          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-        );
-        3 !== fiber.tag;
-
-      ) {
-        if (isContextProvider(fiber))
-          return fiber.stateNode.__reactInternalMemoizedMergedChildContext;
-        fiber = fiber["return"];
-        invariant(
-          fiber,
-          "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-        );
-      }
-      return fiber.stateNode.context;
-    }
-  };
-}
-function ReactFiberNewContext(stack) {
-  var createCursor = stack.createCursor,
-    push = stack.push,
-    pop = stack.pop,
-    providerCursor = createCursor(null),
-    valueCursor = createCursor(null),
-    changedBitsCursor = createCursor(0);
-  return {
-    pushProvider: function(providerFiber) {
-      var context = providerFiber.type._context;
-      push(changedBitsCursor, context._changedBits, providerFiber);
-      push(valueCursor, context._currentValue, providerFiber);
-      push(providerCursor, providerFiber, providerFiber);
-      context._currentValue = providerFiber.pendingProps.value;
-      context._changedBits = providerFiber.stateNode;
-    },
-    popProvider: function(providerFiber) {
-      var changedBits = changedBitsCursor.current,
-        currentValue = valueCursor.current;
-      pop(providerCursor, providerFiber);
-      pop(valueCursor, providerFiber);
-      pop(changedBitsCursor, providerFiber);
-      providerFiber = providerFiber.type._context;
-      providerFiber._currentValue = currentValue;
-      providerFiber._changedBits = changedBits;
+    contextStackCursor.current = emptyObject;
+    didPerformWorkStackCursor.current = !1;
+    resetHostContainer();
+    for (var i = index$1; -1 < i; i--) {
+      var context = stack[i].type.context;
+      context._currentValue = context._defaultValue;
+      context._changedBits = 0;
+      changedBitsStack[i] = null;
+      currentValueStack[i] = null;
+      stack[i] = null;
     }
-  };
-}
-function ReactFiberStack() {
-  var valueStack = [],
-    index = -1;
-  return {
-    createCursor: function(defaultValue) {
-      return { current: defaultValue };
-    },
-    isEmpty: function() {
-      return -1 === index;
-    },
-    pop: function(cursor) {
-      0 > index ||
-        ((cursor.current = valueStack[index]),
-        (valueStack[index] = null),
-        index--);
-    },
-    push: function(cursor, value) {
-      index++;
-      valueStack[index] = cursor.current;
-      cursor.current = value;
-    },
-    checkThatStackIsEmpty: function() {},
-    resetStackAfterFatalErrorInDev: function() {}
-  };
-}
-function ReactFiberScheduler(config) {
-  function resetStack() {
-    if (null !== nextUnitOfWork)
-      for (
-        var interruptedWork = nextUnitOfWork["return"];
-        null !== interruptedWork;
-
-      )
-        unwindInterruptedWork(interruptedWork),
-          (interruptedWork = interruptedWork["return"]);
+    index$1 = -1;
     nextRoot = null;
     nextRenderExpirationTime = 0;
     nextUnitOfWork = null;
@@ -5286,7 +5101,7 @@ function ReactFiberScheduler(config) {
         workInProgress$jscomp$0 = unwindWork(workInProgress$jscomp$0);
         if (null !== workInProgress$jscomp$0)
           return (
-            (workInProgress$jscomp$0.effectTag &= 2559), workInProgress$jscomp$0
+            (workInProgress$jscomp$0.effectTag &= 511), workInProgress$jscomp$0
           );
         null !== returnFiber &&
           ((returnFiber.firstEffect = returnFiber.lastEffect = null),
@@ -5319,7 +5134,7 @@ function ReactFiberScheduler(config) {
       root !== nextRoot ||
       null === nextUnitOfWork
     )
-      resetStack(),
+      resetContextStack(),
         (nextRoot = root),
         (nextRenderExpirationTime = expirationTime),
         (nextUnitOfWork = createWorkInProgress(
@@ -5449,8 +5264,8 @@ function ReactFiberScheduler(config) {
             !isWorking &&
               0 !== nextRenderExpirationTime &&
               expirationTime < nextRenderExpirationTime &&
-              resetStack();
-            (isWorking && !isCommitting && nextRoot === root) ||
+              resetContextStack();
+            (nextRoot === root && isWorking) ||
               requestWork(root, expirationTime);
             nestedUpdateCount > NESTED_UPDATE_LIMIT &&
               invariant(
@@ -5514,7 +5329,7 @@ function ReactFiberScheduler(config) {
           (nextFlushedExpirationTime = 1),
           performWorkOnRoot(root, 1, !1))
         : 1 === expirationTime
-          ? performSyncWork()
+          ? performWork(1, !1, null)
           : scheduleCallbackWithExpiration(expirationTime));
   }
   function findHighestPriorityRoot() {
@@ -5574,9 +5389,6 @@ function ReactFiberScheduler(config) {
   function performAsyncWork(dl) {
     performWork(0, !0, dl);
   }
-  function performSyncWork() {
-    performWork(1, !1, null);
-  }
   function performWork(minExpirationTime, isAsync, dl) {
     deadline = dl;
     findHighestPriorityRoot();
@@ -5699,25 +5511,6 @@ function ReactFiberScheduler(config) {
     for (nextEffect = firstEffect; null !== nextEffect; ) {
       var didError = !1,
         error = void 0;
-      try {
-        for (; null !== nextEffect; )
-          nextEffect.effectTag & 2048 &&
-            commitBeforeMutationLifeCycles(nextEffect.alternate, nextEffect),
-            (nextEffect = nextEffect.nextEffect);
-      } catch (e) {
-        (didError = !0), (error = e);
-      }
-      didError &&
-        (invariant(
-          null !== nextEffect,
-          "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
-        ),
-        onCommitPhaseError(nextEffect, error),
-        null !== nextEffect && (nextEffect = nextEffect.nextEffect));
-    }
-    for (nextEffect = firstEffect; null !== nextEffect; ) {
-      didError = !1;
-      error = void 0;
       try {
         for (; null !== nextEffect; ) {
           var effectTag = nextEffect.effectTag;
@@ -5815,37 +5608,25 @@ function ReactFiberScheduler(config) {
     nextFlushedRoot.remainingExpirationTime = 0;
     hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
   }
-  var stack = ReactFiberStack(),
-    hostContext = ReactFiberHostContext(config, stack),
-    legacyContext = ReactFiberLegacyContext(stack);
-  stack = ReactFiberNewContext(stack);
-  var hydrationContext = ReactFiberHydrationContext(config),
+  var hostContext = ReactFiberHostContext(config),
+    hydrationContext = ReactFiberHydrationContext(config),
+    resetHostContainer = hostContext.resetHostContainer,
     beginWork = ReactFiberBeginWork(
       config,
       hostContext,
-      legacyContext,
-      stack,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
     ).beginWork,
-    completeWork = ReactFiberCompleteWork(
-      config,
-      hostContext,
-      legacyContext,
-      stack,
-      hydrationContext
-    ).completeWork;
+    completeWork = ReactFiberCompleteWork(config, hostContext, hydrationContext)
+      .completeWork;
   hostContext = ReactFiberUnwindWork(
     hostContext,
-    legacyContext,
-    stack,
     scheduleWork,
     isAlreadyFailedLegacyErrorBoundary
   );
   var throwException = hostContext.throwException,
-    unwindWork = hostContext.unwindWork,
-    unwindInterruptedWork = hostContext.unwindInterruptedWork;
+    unwindWork = hostContext.unwindWork;
   hostContext = ReactFiberCommitWork(
     config,
     onCommitPhaseError,
@@ -5858,9 +5639,7 @@ function ReactFiberScheduler(config) {
     },
     recalculateCurrentTime
   );
-  var commitBeforeMutationLifeCycles =
-      hostContext.commitBeforeMutationLifeCycles,
-    commitResetTextContent = hostContext.commitResetTextContent,
+  var commitResetTextContent = hostContext.commitResetTextContent,
     commitPlacement = hostContext.commitPlacement,
     commitDeletion = hostContext.commitDeletion,
     commitWork = hostContext.commitWork,
@@ -5915,10 +5694,7 @@ function ReactFiberScheduler(config) {
         !isRendering,
         "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
       );
-      nextFlushedRoot = root;
-      nextFlushedExpirationTime = expirationTime;
       performWorkOnRoot(root, expirationTime, !1);
-      performSyncWork();
       finishRendering();
     },
     batchedUpdates: function(fn, a) {
@@ -5929,7 +5705,7 @@ function ReactFiberScheduler(config) {
       } finally {
         (isBatchingUpdates = previousIsBatchingUpdates) ||
           isRendering ||
-          performSyncWork();
+          performWork(1, !1, null);
       }
     },
     unbatchedUpdates: function(fn, a) {
@@ -5953,7 +5729,8 @@ function ReactFiberScheduler(config) {
       try {
         return syncUpdates(fn, a);
       } finally {
-        (isBatchingUpdates = previousIsBatchingUpdates), performSyncWork();
+        (isBatchingUpdates = previousIsBatchingUpdates),
+          performWork(1, !1, null);
       }
     },
     flushControlled: function(fn) {
@@ -5994,7 +5771,7 @@ function ReactFiberScheduler(config) {
         (isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates),
           (isBatchingUpdates = previousIsBatchingUpdates) ||
             isRendering ||
-            performSyncWork();
+            performWork(1, !1, null);
       }
     },
     flushInteractiveUpdates: function() {
@@ -6008,8 +5785,7 @@ function ReactFiberScheduler(config) {
       result <= lastUniqueAsyncExpiration &&
         (result = lastUniqueAsyncExpiration + 1);
       return (lastUniqueAsyncExpiration = result);
-    },
-    legacyContext: legacyContext
+    }
   };
 }
 function ReactFiberReconciler$1(config) {
@@ -6024,7 +5800,27 @@ function ReactFiberReconciler$1(config) {
     currentTime = container.current;
     if (parentComponent) {
       parentComponent = parentComponent._reactInternalFiber;
-      var parentContext = findCurrentUnmaskedContext(parentComponent);
+      var parentContext;
+      b: {
+        invariant(
+          2 === isFiberMountedImpl(parentComponent) &&
+            2 === parentComponent.tag,
+          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+        );
+        for (parentContext = parentComponent; 3 !== parentContext.tag; ) {
+          if (isContextProvider(parentContext)) {
+            parentContext =
+              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
+            break b;
+          }
+          parentContext = parentContext["return"];
+          invariant(
+            parentContext,
+            "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+          );
+        }
+        parentContext = parentContext.stateNode.context;
+      }
       parentComponent = isContextProvider(parentComponent)
         ? processChildContext(parentComponent, parentContext)
         : parentContext;
@@ -6053,11 +5849,7 @@ function ReactFiberReconciler$1(config) {
   config = ReactFiberScheduler(config);
   var recalculateCurrentTime = config.recalculateCurrentTime,
     computeExpirationForFiber = config.computeExpirationForFiber,
-    scheduleWork = config.scheduleWork,
-    legacyContext = config.legacyContext,
-    findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
-    isContextProvider = legacyContext.isContextProvider,
-    processChildContext = legacyContext.processChildContext;
+    scheduleWork = config.scheduleWork;
   return {
     createContainer: function(containerInfo, isAsync, hydrate) {
       isAsync = new FiberNode(3, null, null, isAsync ? 3 : 0);
@@ -6226,8 +6018,7 @@ var ReactFiberReconciler$2 = Object.freeze({ default: ReactFiberReconciler$1 }),
   frameDeadlineObject = {
     timeRemaining: function() {
       return frameDeadline - now();
-    },
-    didTimeout: !1
+    }
   };
 function setTimeoutCallback() {
   frameDeadline = now() + 5;
@@ -6561,7 +6352,7 @@ NativeRenderer.injectIntoDevTools({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.3.1",
+  version: "16.3.0-alpha.1",
   rendererPackageName: "react-native-renderer"
 });
 var ReactNativeRenderer$2 = Object.freeze({ default: ReactNativeRenderer }),
diff --git a/Libraries/Renderer/shims/ReactTypes.js b/Libraries/Renderer/shims/ReactTypes.js
index 87a769a148c95d..bede9f00e30069 100644
--- a/Libraries/Renderer/shims/ReactTypes.js
+++ b/Libraries/Renderer/shims/ReactTypes.js
@@ -62,7 +62,7 @@ export type ReactProvider<T> = {
 
 export type ReactProviderType<T> = {
   $$typeof: Symbol | number,
-  _context: ReactContext<T>,
+  context: ReactContext<T>,
 };
 
 export type ReactConsumer<T> = {
@@ -72,7 +72,7 @@ export type ReactConsumer<T> = {
   ref: null,
   props: {
     children: (value: T) => ReactNodeList,
-    unstable_observedBits?: number,
+    bits?: number,
   },
 };
 
diff --git a/package.json b/package.json
index 4f4f558451100f..8dda61d84ae124 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "1000.0.0",
+  "version": "0.55.0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -127,22 +127,22 @@
     "lint": "eslint .",
     "prettier": "find . -name node_modules -prune -or -name '*.js' -print | xargs prettier --write",
     "start": "/usr/bin/env bash -c './scripts/packager.sh \"$@\" || true' --",
-    "docker-setup-android": "docker pull hramos/android-base:latest",
-    "docker-build-android-base": "docker build -t hramos/android-base -f ContainerShip/Dockerfile.android-base .",
-    "docker-build-android": "docker build -t react/android -f ContainerShip/Dockerfile.android .",
+    "test-android-setup": "docker pull hramos/android-base:latest",
+    "test-android-build-base": "docker build -t hramos/android-base -f ContainerShip/Dockerfile.android-base .",
+    "test-android-build": "docker build -t react/android -f ContainerShip/Dockerfile.android .",
     "test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it react/android bash ContainerShip/scripts/run-android-docker-instrumentation-tests.sh",
     "test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it react/android bash ContainerShip/scripts/run-android-docker-unit-tests.sh",
     "test-android-run-e2e": "docker run --privileged -it react/android bash ContainerShip/scripts/run-ci-e2e-tests.sh --android --js",
-    "test-android-all": "yarn run docker-build-android && yarn run test-android-run-unit && yarn run test-android-run-instrumentation && yarn run test-android-run-e2e",
-    "test-android-instrumentation": "yarn run docker-build-android && yarn run test-android-run-instrumentation",
-    "test-android-unit": "yarn run docker-build-android && yarn run test-android-run-unit",
-    "test-android-e2e": "yarn run docker-build-android && yarn run test-android-run-e2e"
+    "test-android-all": "npm run test-android-build && npm run test-android-run-unit && npm run test-android-run-instrumentation && npm run test-android-run-e2e",
+    "test-android-instrumentation": "npm run test-android-build && npm run test-android-run-instrumentation",
+    "test-android-unit": "npm run test-android-build && npm run test-android-run-unit",
+    "test-android-e2e": "npm run test-android-build && npm run test-android-run-e2e"
   },
   "bin": {
     "react-native": "local-cli/wrong-react-native.js"
   },
   "peerDependencies": {
-    "react": "16.3.1"
+    "react": "^16.3.0-alpha.0"
   },
   "dependencies": {
     "absolute-path": "^0.0.0",
@@ -175,8 +175,8 @@
     "graceful-fs": "^4.1.3",
     "inquirer": "^3.0.6",
     "lodash": "^4.17.5",
-    "metro": "^0.31.0",
-    "metro-core": "^0.31.0",
+    "metro": "^0.30.0",
+    "metro-core": "^0.30.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
@@ -215,13 +215,13 @@
     "eslint-plugin-jest": "21.8.0",
     "eslint-plugin-prettier": "2.6.0",
     "eslint-plugin-react": "7.6.1",
-    "flow-bin": "^0.69.0",
-    "jest": "23.0.0-alpha.4",
+    "flow-bin": "^0.67.1",
+    "jest": "22.4.2",
     "jest-junit": "3.6.0",
     "prettier": "1.9.1",
-    "react": "16.3.1",
-    "react-test-renderer": "16.3.1",
+    "react": "^16.3.0-alpha.1",
+    "react-test-renderer": "^16.3.0-alpha.1",
     "shelljs": "^0.7.8",
     "sinon": "^2.2.0"
   }
-}
+}
\ No newline at end of file

From 73ffa6003ac28354c9d1ae7ca336b49c9bab2df7 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Wed, 14 Mar 2018 23:23:11 -0700
Subject: [PATCH 252/267] React sync for revisions ad9544f...ced176e

Reviewed By: sebmarkbage

Differential Revision: D7281277

fbshipit-source-id: 75a638114cf2a65a5c973dbdf218f6d3ba042cc4
---
 Libraries/Renderer/REVISION                   |  2 +-
 Libraries/Renderer/ReactFabric-dev.js         | 55 +++++++++++++++----
 Libraries/Renderer/ReactFabric-prod.js        | 51 ++++++++++-------
 Libraries/Renderer/ReactNativeRenderer-dev.js | 55 +++++++++++++++----
 .../Renderer/ReactNativeRenderer-prod.js      | 49 ++++++++++-------
 Libraries/Renderer/shims/ReactTypes.js        |  2 +-
 package.json                                  |  6 +-
 7 files changed, 153 insertions(+), 67 deletions(-)

diff --git a/Libraries/Renderer/REVISION b/Libraries/Renderer/REVISION
index 824ff8c33a4c4f..3210553184230d 100644
--- a/Libraries/Renderer/REVISION
+++ b/Libraries/Renderer/REVISION
@@ -1 +1 @@
-ad9544f48e58f2599a8ea0de1e9f4dd104db30bb
\ No newline at end of file
+ced176edb7605a25e916895fd060f3943c647fee
\ No newline at end of file
diff --git a/Libraries/Renderer/ReactFabric-dev.js b/Libraries/Renderer/ReactFabric-dev.js
index 867873cd41d55b..e485c562182322 100644
--- a/Libraries/Renderer/ReactFabric-dev.js
+++ b/Libraries/Renderer/ReactFabric-dev.js
@@ -810,6 +810,7 @@ var Fragment = 10;
 var Mode = 11;
 var ContextConsumer = 12;
 var ContextProvider = 13;
+var ForwardRef = 14;
 
 function getParent(inst) {
   do {
@@ -2356,6 +2357,9 @@ var REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 0xeace;
 var REACT_ASYNC_MODE_TYPE = hasSymbol
   ? Symbol["for"]("react.async_mode")
   : 0xeacf;
+var REACT_FORWARD_REF_TYPE = hasSymbol
+  ? Symbol["for"]("react.forward_ref")
+  : 0xead0;
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
 var FAUX_ITERATOR_SYMBOL = "@@iterator";
@@ -2637,7 +2641,7 @@ var TouchHistoryMath = {
 
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.3.0-alpha.1";
+var ReactVersion = "16.3.0-alpha.2";
 
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -5242,6 +5246,9 @@ function createFiberFromElement(element, mode, expirationTime) {
               // This is a consumer
               fiberTag = ContextConsumer;
               break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = ForwardRef;
+              break;
             default:
               if (typeof type.tag === "number") {
                 // Currently assumed to be a continuation and therefore is a
@@ -6834,20 +6841,20 @@ var ReactFiberClassComponent = function(
       // In order to support react-lifecycles-compat polyfilled components,
       // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
       if (
-        (typeof instance.UNSAFE_componentWillUpdate === "function" ||
-          typeof instance.componentWillUpdate === "function") &&
+        (typeof instance.UNSAFE_componentWillMount === "function" ||
+          typeof instance.componentWillMount === "function") &&
         typeof ctor.getDerivedStateFromProps !== "function"
       ) {
-        startPhaseTimer(workInProgress, "componentWillUpdate");
-        if (typeof instance.componentWillUpdate === "function") {
-          instance.componentWillUpdate(newProps, newState, newContext);
+        startPhaseTimer(workInProgress, "componentWillMount");
+        if (typeof instance.componentWillMount === "function") {
+          instance.componentWillMount();
         }
-        if (typeof instance.UNSAFE_componentWillUpdate === "function") {
-          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
+        if (typeof instance.UNSAFE_componentWillMount === "function") {
+          instance.UNSAFE_componentWillMount();
         }
         stopPhaseTimer();
       }
-      if (typeof instance.componentDidUpdate === "function") {
+      if (typeof instance.componentDidMount === "function") {
         workInProgress.effectTag |= Update;
       }
     } else {
@@ -8467,6 +8474,14 @@ var ReactFiberBeginWork = function(
     }
   }
 
+  function updateForwardRef(current, workInProgress) {
+    var render = workInProgress.type.render;
+    var nextChildren = render(workInProgress.pendingProps, workInProgress.ref);
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextChildren);
+    return workInProgress.child;
+  }
+
   function updateFragment(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps;
     if (hasContextChanged()) {
@@ -9420,6 +9435,8 @@ var ReactFiberBeginWork = function(
           workInProgress,
           renderExpirationTime
         );
+      case ForwardRef:
+        return updateForwardRef(current, workInProgress);
       case Fragment:
         return updateFragment(current, workInProgress);
       case Mode:
@@ -9972,6 +9989,8 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
       case ReturnComponent:
         // Does nothing.
         return null;
+      case ForwardRef:
+        return null;
       case Fragment:
         return null;
       case Mode:
@@ -10277,7 +10296,7 @@ var ReactFiberCommitWork = function(
           }
         }
       } else {
-        ref.value = null;
+        ref.current = null;
       }
     }
   }
@@ -10442,7 +10461,19 @@ var ReactFiberCommitWork = function(
       if (typeof ref === "function") {
         ref(instanceToUse);
       } else {
-        ref.value = instanceToUse;
+        {
+          if (!ref.hasOwnProperty("current")) {
+            warning(
+              false,
+              "Unexpected ref object provided for %s. " +
+                "Use either a ref-setter function or Reacte.createRef().%s",
+              getComponentName(finishedWork),
+              getStackAddendumByWorkInProgressFiber(finishedWork)
+            );
+          }
+        }
+
+        ref.current = instanceToUse;
       }
     }
   }
@@ -10453,7 +10484,7 @@ var ReactFiberCommitWork = function(
       if (typeof currentRef === "function") {
         currentRef(null);
       } else {
-        currentRef.value = null;
+        currentRef.current = null;
       }
     }
   }
diff --git a/Libraries/Renderer/ReactFabric-prod.js b/Libraries/Renderer/ReactFabric-prod.js
index 950e09890f8203..637481f04146cb 100644
--- a/Libraries/Renderer/ReactFabric-prod.js
+++ b/Libraries/Renderer/ReactFabric-prod.js
@@ -945,6 +945,9 @@ var hasSymbol = "function" === typeof Symbol && Symbol["for"],
   REACT_PROVIDER_TYPE = hasSymbol ? Symbol["for"]("react.provider") : 60109,
   REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 60110,
   REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol["for"]("react.async_mode") : 60111,
+  REACT_FORWARD_REF_TYPE = hasSymbol
+    ? Symbol["for"]("react.forward_ref")
+    : 60112,
   MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
   if (null === maybeIterable || "undefined" === typeof maybeIterable)
@@ -1843,6 +1846,9 @@ function createFiberFromElement(element, mode, expirationTime) {
             case REACT_CONTEXT_TYPE:
               fiberTag = 12;
               break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = 14;
+              break;
             default:
               if ("number" === typeof type.tag)
                 return (
@@ -2312,22 +2318,14 @@ function ReactFiberClassComponent(
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
-            "function" !== typeof instance.componentWillUpdate) ||
+        ? (("function" !== typeof instance.UNSAFE_componentWillMount &&
+            "function" !== typeof instance.componentWillMount) ||
             "function" === typeof ctor.getDerivedStateFromProps ||
-            ("function" === typeof instance.componentWillUpdate &&
-              instance.componentWillUpdate(
-                newProps,
-                renderExpirationTime,
-                newUnmaskedContext
-              ),
-            "function" === typeof instance.UNSAFE_componentWillUpdate &&
-              instance.UNSAFE_componentWillUpdate(
-                newProps,
-                renderExpirationTime,
-                newUnmaskedContext
-              )),
-          "function" === typeof instance.componentDidUpdate &&
+            ("function" === typeof instance.componentWillMount &&
+              instance.componentWillMount(),
+            "function" === typeof instance.UNSAFE_componentWillMount &&
+              instance.UNSAFE_componentWillMount()),
+          "function" === typeof instance.componentDidMount &&
             (workInProgress.effectTag |= 4))
         : ("function" === typeof instance.componentDidMount &&
             (workInProgress.effectTag |= 4),
@@ -3669,6 +3667,17 @@ function ReactFiberBeginWork(
                 )),
             current
           );
+        case 14:
+          return (
+            (renderExpirationTime = workInProgress.type.render),
+            (renderExpirationTime = renderExpirationTime(
+              workInProgress.pendingProps,
+              workInProgress.ref
+            )),
+            reconcileChildren(current, workInProgress, renderExpirationTime),
+            (workInProgress.memoizedProps = renderExpirationTime),
+            workInProgress.child
+          );
         case 10:
           return (
             (renderExpirationTime = workInProgress.pendingProps),
@@ -4058,6 +4067,8 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           return (workInProgress.tag = 7), null;
         case 9:
           return null;
+        case 14:
+          return null;
         case 10:
           return null;
         case 11:
@@ -4191,7 +4202,7 @@ function ReactFiberCommitWork(
         } catch (refError) {
           captureError(current, refError);
         }
-      else ref.value = null;
+      else ref.current = null;
   }
   function commitLifeCycles(finishedRoot, current, finishedWork) {
     switch (finishedWork.tag) {
@@ -4305,13 +4316,15 @@ function ReactFiberCommitWork(
       }
       "function" === typeof ref
         ? ref(finishedWork)
-        : (ref.value = finishedWork);
+        : (ref.current = finishedWork);
     }
   }
   function commitDetachRef(current) {
     current = current.ref;
     null !== current &&
-      ("function" === typeof current ? current(null) : (current.value = null));
+      ("function" === typeof current
+        ? current(null)
+        : (current.current = null));
   }
   function commitNestedUnmounts(root) {
     for (var node = root; ; ) {
@@ -5891,7 +5904,7 @@ ReactFabricRenderer.injectIntoDevTools({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.3.0-alpha.1",
+  version: "16.3.0-alpha.2",
   rendererPackageName: "react-native-renderer"
 });
 var ReactFabric$2 = Object.freeze({ default: ReactFabric }),
diff --git a/Libraries/Renderer/ReactNativeRenderer-dev.js b/Libraries/Renderer/ReactNativeRenderer-dev.js
index 400472d29a3875..d54c9f31c6cda3 100644
--- a/Libraries/Renderer/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/ReactNativeRenderer-dev.js
@@ -965,6 +965,7 @@ var Fragment = 10;
 var Mode = 11;
 var ContextConsumer = 12;
 var ContextProvider = 13;
+var ForwardRef = 14;
 
 function getParent(inst) {
   do {
@@ -2802,6 +2803,9 @@ var REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 0xeace;
 var REACT_ASYNC_MODE_TYPE = hasSymbol
   ? Symbol["for"]("react.async_mode")
   : 0xeacf;
+var REACT_FORWARD_REF_TYPE = hasSymbol
+  ? Symbol["for"]("react.forward_ref")
+  : 0xead0;
 
 var MAYBE_ITERATOR_SYMBOL = typeof Symbol === "function" && Symbol.iterator;
 var FAUX_ITERATOR_SYMBOL = "@@iterator";
@@ -2983,7 +2987,7 @@ var TouchHistoryMath = {
 
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.3.0-alpha.1";
+var ReactVersion = "16.3.0-alpha.2";
 
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -5500,6 +5504,9 @@ function createFiberFromElement(element, mode, expirationTime) {
               // This is a consumer
               fiberTag = ContextConsumer;
               break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = ForwardRef;
+              break;
             default:
               if (typeof type.tag === "number") {
                 // Currently assumed to be a continuation and therefore is a
@@ -7092,20 +7099,20 @@ var ReactFiberClassComponent = function(
       // In order to support react-lifecycles-compat polyfilled components,
       // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
       if (
-        (typeof instance.UNSAFE_componentWillUpdate === "function" ||
-          typeof instance.componentWillUpdate === "function") &&
+        (typeof instance.UNSAFE_componentWillMount === "function" ||
+          typeof instance.componentWillMount === "function") &&
         typeof ctor.getDerivedStateFromProps !== "function"
       ) {
-        startPhaseTimer(workInProgress, "componentWillUpdate");
-        if (typeof instance.componentWillUpdate === "function") {
-          instance.componentWillUpdate(newProps, newState, newContext);
+        startPhaseTimer(workInProgress, "componentWillMount");
+        if (typeof instance.componentWillMount === "function") {
+          instance.componentWillMount();
         }
-        if (typeof instance.UNSAFE_componentWillUpdate === "function") {
-          instance.UNSAFE_componentWillUpdate(newProps, newState, newContext);
+        if (typeof instance.UNSAFE_componentWillMount === "function") {
+          instance.UNSAFE_componentWillMount();
         }
         stopPhaseTimer();
       }
-      if (typeof instance.componentDidUpdate === "function") {
+      if (typeof instance.componentDidMount === "function") {
         workInProgress.effectTag |= Update;
       }
     } else {
@@ -8725,6 +8732,14 @@ var ReactFiberBeginWork = function(
     }
   }
 
+  function updateForwardRef(current, workInProgress) {
+    var render = workInProgress.type.render;
+    var nextChildren = render(workInProgress.pendingProps, workInProgress.ref);
+    reconcileChildren(current, workInProgress, nextChildren);
+    memoizeProps(workInProgress, nextChildren);
+    return workInProgress.child;
+  }
+
   function updateFragment(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps;
     if (hasContextChanged()) {
@@ -9678,6 +9693,8 @@ var ReactFiberBeginWork = function(
           workInProgress,
           renderExpirationTime
         );
+      case ForwardRef:
+        return updateForwardRef(current, workInProgress);
       case Fragment:
         return updateFragment(current, workInProgress);
       case Mode:
@@ -10230,6 +10247,8 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
       case ReturnComponent:
         // Does nothing.
         return null;
+      case ForwardRef:
+        return null;
       case Fragment:
         return null;
       case Mode:
@@ -10569,7 +10588,7 @@ var ReactFiberCommitWork = function(
           }
         }
       } else {
-        ref.value = null;
+        ref.current = null;
       }
     }
   }
@@ -10734,7 +10753,19 @@ var ReactFiberCommitWork = function(
       if (typeof ref === "function") {
         ref(instanceToUse);
       } else {
-        ref.value = instanceToUse;
+        {
+          if (!ref.hasOwnProperty("current")) {
+            warning(
+              false,
+              "Unexpected ref object provided for %s. " +
+                "Use either a ref-setter function or Reacte.createRef().%s",
+              getComponentName(finishedWork),
+              getStackAddendumByWorkInProgressFiber(finishedWork)
+            );
+          }
+        }
+
+        ref.current = instanceToUse;
       }
     }
   }
@@ -10745,7 +10776,7 @@ var ReactFiberCommitWork = function(
       if (typeof currentRef === "function") {
         currentRef(null);
       } else {
-        currentRef.value = null;
+        currentRef.current = null;
       }
     }
   }
diff --git a/Libraries/Renderer/ReactNativeRenderer-prod.js b/Libraries/Renderer/ReactNativeRenderer-prod.js
index ca27b720b33dfe..258608b7f31a6b 100644
--- a/Libraries/Renderer/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/ReactNativeRenderer-prod.js
@@ -1174,6 +1174,9 @@ var hasSymbol = "function" === typeof Symbol && Symbol["for"],
   REACT_PROVIDER_TYPE = hasSymbol ? Symbol["for"]("react.provider") : 60109,
   REACT_CONTEXT_TYPE = hasSymbol ? Symbol["for"]("react.context") : 60110,
   REACT_ASYNC_MODE_TYPE = hasSymbol ? Symbol["for"]("react.async_mode") : 60111,
+  REACT_FORWARD_REF_TYPE = hasSymbol
+    ? Symbol["for"]("react.forward_ref")
+    : 60112,
   MAYBE_ITERATOR_SYMBOL = "function" === typeof Symbol && Symbol.iterator;
 function getIteratorFn(maybeIterable) {
   if (null === maybeIterable || "undefined" === typeof maybeIterable)
@@ -2037,6 +2040,9 @@ function createFiberFromElement(element, mode, expirationTime) {
             case REACT_CONTEXT_TYPE:
               fiberTag = 12;
               break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = 14;
+              break;
             default:
               if ("number" === typeof type.tag)
                 return (
@@ -2551,22 +2557,14 @@ function ReactFiberClassComponent(
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
-            "function" !== typeof instance.componentWillUpdate) ||
+        ? (("function" !== typeof instance.UNSAFE_componentWillMount &&
+            "function" !== typeof instance.componentWillMount) ||
             "function" === typeof ctor.getDerivedStateFromProps ||
-            ("function" === typeof instance.componentWillUpdate &&
-              instance.componentWillUpdate(
-                newProps,
-                renderExpirationTime,
-                newUnmaskedContext
-              ),
-            "function" === typeof instance.UNSAFE_componentWillUpdate &&
-              instance.UNSAFE_componentWillUpdate(
-                newProps,
-                renderExpirationTime,
-                newUnmaskedContext
-              )),
-          "function" === typeof instance.componentDidUpdate &&
+            ("function" === typeof instance.componentWillMount &&
+              instance.componentWillMount(),
+            "function" === typeof instance.UNSAFE_componentWillMount &&
+              instance.UNSAFE_componentWillMount()),
+          "function" === typeof instance.componentDidMount &&
             (workInProgress.effectTag |= 4))
         : ("function" === typeof instance.componentDidMount &&
             (workInProgress.effectTag |= 4),
@@ -3932,6 +3930,17 @@ function ReactFiberBeginWork(
                 )),
             current
           );
+        case 14:
+          return (
+            (renderExpirationTime = workInProgress.type.render),
+            (renderExpirationTime = renderExpirationTime(
+              workInProgress.pendingProps,
+              workInProgress.ref
+            )),
+            reconcileChildren(current, workInProgress, renderExpirationTime),
+            (workInProgress.memoizedProps = renderExpirationTime),
+            workInProgress.child
+          );
         case 10:
           return (
             (renderExpirationTime = workInProgress.pendingProps),
@@ -4263,6 +4272,8 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           return (workInProgress.tag = 7), null;
         case 9:
           return null;
+        case 14:
+          return null;
         case 10:
           return null;
         case 11:
@@ -4415,7 +4426,7 @@ function ReactFiberCommitWork(
         } catch (refError) {
           captureError(current, refError);
         }
-      else ref.value = null;
+      else ref.current = null;
   }
   function commitUnmount(current) {
     "function" === typeof onCommitUnmount && onCommitUnmount(current);
@@ -4795,7 +4806,7 @@ function ReactFiberCommitWork(
         }
         "function" === typeof ref
           ? ref(finishedWork)
-          : (ref.value = finishedWork);
+          : (ref.current = finishedWork);
       }
     },
     commitDetachRef: function(current) {
@@ -4803,7 +4814,7 @@ function ReactFiberCommitWork(
       null !== current &&
         ("function" === typeof current
           ? current(null)
-          : (current.value = null));
+          : (current.current = null));
     }
   };
 }
@@ -6352,7 +6363,7 @@ NativeRenderer.injectIntoDevTools({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.3.0-alpha.1",
+  version: "16.3.0-alpha.2",
   rendererPackageName: "react-native-renderer"
 });
 var ReactNativeRenderer$2 = Object.freeze({ default: ReactNativeRenderer }),
diff --git a/Libraries/Renderer/shims/ReactTypes.js b/Libraries/Renderer/shims/ReactTypes.js
index bede9f00e30069..f6a56ccc96ed4e 100644
--- a/Libraries/Renderer/shims/ReactTypes.js
+++ b/Libraries/Renderer/shims/ReactTypes.js
@@ -101,5 +101,5 @@ export type ReactPortal = {
 };
 
 export type RefObject = {|
-  value: any,
+  current: any,
 |};
diff --git a/package.json b/package.json
index 8dda61d84ae124..a0991064305048 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "react-native": "local-cli/wrong-react-native.js"
   },
   "peerDependencies": {
-    "react": "^16.3.0-alpha.0"
+    "react": "^16.3.0-alpha.2"
   },
   "dependencies": {
     "absolute-path": "^0.0.0",
@@ -219,8 +219,8 @@
     "jest": "22.4.2",
     "jest-junit": "3.6.0",
     "prettier": "1.9.1",
-    "react": "^16.3.0-alpha.1",
-    "react-test-renderer": "^16.3.0-alpha.1",
+    "react": "^16.3.0-alpha.2",
+    "react-test-renderer": "^16.3.0-alpha.2",
     "shelljs": "^0.7.8",
     "sinon": "^2.2.0"
   }

From 69c77d6492e1465f30cc1463132e18dadc614dcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Tue, 20 Mar 2018 17:03:06 -0700
Subject: [PATCH 253/267] React sync for revisions ced176e...9d484ed

Reviewed By: bvaughn

Differential Revision: D7338640

fbshipit-source-id: e2d75d2f1795fb3c37f193d15216951c707711d9
---
 Libraries/Renderer/REVISION                   |    2 +-
 Libraries/Renderer/ReactFabric-dev.js         | 3259 ++++++++--------
 Libraries/Renderer/ReactFabric-prod.js        |  671 ++--
 Libraries/Renderer/ReactNativeRenderer-dev.js | 3265 +++++++++--------
 .../Renderer/ReactNativeRenderer-prod.js      |  681 ++--
 Libraries/Renderer/shims/ReactFabric.js       |    5 +
 6 files changed, 4154 insertions(+), 3729 deletions(-)

diff --git a/Libraries/Renderer/REVISION b/Libraries/Renderer/REVISION
index 3210553184230d..7e989de9720393 100644
--- a/Libraries/Renderer/REVISION
+++ b/Libraries/Renderer/REVISION
@@ -1 +1 @@
-ced176edb7605a25e916895fd060f3943c647fee
\ No newline at end of file
+9d484edc4b64160cb335a23a2cb21667fb2cdf4c
\ No newline at end of file
diff --git a/Libraries/Renderer/ReactFabric-dev.js b/Libraries/Renderer/ReactFabric-dev.js
index e485c562182322..22c77f2e072d9c 100644
--- a/Libraries/Renderer/ReactFabric-dev.js
+++ b/Libraries/Renderer/ReactFabric-dev.js
@@ -25,8 +25,8 @@ var deepDiffer = require("deepDiffer");
 var flattenStyle = require("flattenStyle");
 var React = require("react");
 var emptyObject = require("fbjs/lib/emptyObject");
-var checkPropTypes = require("prop-types/checkPropTypes");
 var shallowEqual = require("fbjs/lib/shallowEqual");
+var checkPropTypes = require("prop-types/checkPropTypes");
 var deepFreezeAndThrowOnMutationInDev = require("deepFreezeAndThrowOnMutationInDev");
 var FabricUIManager = require("FabricUIManager");
 
@@ -4134,1645 +4134,1320 @@ function findCurrentHostFiberWithNoPortals(parent) {
   return null;
 }
 
-var valueStack = [];
+// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
+// Math.pow(2, 30) - 1
+// 0b111111111111111111111111111111
+var MAX_SIGNED_31_BIT_INT = 1073741823;
 
-var fiberStack = void 0;
+// TODO: Use an opaque type once ESLint et al support the syntax
 
-{
-  fiberStack = [];
-}
+var NoWork = 0;
+var Sync = 1;
+var Never = MAX_SIGNED_31_BIT_INT;
 
-var index = -1;
+var UNIT_SIZE = 10;
+var MAGIC_NUMBER_OFFSET = 2;
 
-function createCursor(defaultValue) {
-  return {
-    current: defaultValue
-  };
+// 1 unit of expiration time represents 10ms.
+function msToExpirationTime(ms) {
+  // Always add an offset so that we don't clash with the magic number for NoWork.
+  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
 }
 
-function pop(cursor, fiber) {
-  if (index < 0) {
-    {
-      warning(false, "Unexpected pop.");
-    }
-    return;
-  }
+function expirationTimeToMs(expirationTime) {
+  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
+}
 
-  {
-    if (fiber !== fiberStack[index]) {
-      warning(false, "Unexpected Fiber popped.");
-    }
-  }
+function ceiling(num, precision) {
+  return (((num / precision) | 0) + 1) * precision;
+}
+
+function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
+  return ceiling(
+    currentTime + expirationInMs / UNIT_SIZE,
+    bucketSizeMs / UNIT_SIZE
+  );
+}
 
-  cursor.current = valueStack[index];
+var NoContext = 0;
+var AsyncMode = 1;
+var StrictMode = 2;
 
-  valueStack[index] = null;
+var hasBadMapPolyfill = void 0;
 
-  {
-    fiberStack[index] = null;
+{
+  hasBadMapPolyfill = false;
+  try {
+    var nonExtensibleObject = Object.preventExtensions({});
+    var testMap = new Map([[nonExtensibleObject, null]]);
+    var testSet = new Set([nonExtensibleObject]);
+    // This is necessary for Rollup to not consider these unused.
+    // https://github.com/rollup/rollup/issues/1771
+    // TODO: we can remove these if Rollup fixes the bug.
+    testMap.set(0, 0);
+    testSet.add(0);
+  } catch (e) {
+    // TODO: Consider warning about bad polyfills
+    hasBadMapPolyfill = true;
   }
+}
+
+// A Fiber is work on a Component that needs to be done or was done. There can
+// be more than one per component.
+
+var debugCounter = void 0;
 
-  index--;
+{
+  debugCounter = 1;
 }
 
-function push(cursor, value, fiber) {
-  index++;
+function FiberNode(tag, pendingProps, key, mode) {
+  // Instance
+  this.tag = tag;
+  this.key = key;
+  this.type = null;
+  this.stateNode = null;
 
-  valueStack[index] = cursor.current;
+  // Fiber
+  this["return"] = null;
+  this.child = null;
+  this.sibling = null;
+  this.index = 0;
 
-  {
-    fiberStack[index] = fiber;
-  }
+  this.ref = null;
 
-  cursor.current = value;
-}
+  this.pendingProps = pendingProps;
+  this.memoizedProps = null;
+  this.updateQueue = null;
+  this.memoizedState = null;
 
-function reset() {
-  while (index > -1) {
-    valueStack[index] = null;
+  this.mode = mode;
 
-    {
-      fiberStack[index] = null;
-    }
+  // Effects
+  this.effectTag = NoEffect;
+  this.nextEffect = null;
 
-    index--;
+  this.firstEffect = null;
+  this.lastEffect = null;
+
+  this.expirationTime = NoWork;
+
+  this.alternate = null;
+
+  {
+    this._debugID = debugCounter++;
+    this._debugSource = null;
+    this._debugOwner = null;
+    this._debugIsCurrentlyTiming = false;
+    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
+      Object.preventExtensions(this);
+    }
   }
 }
 
-var describeComponentFrame = function(name, source, ownerName) {
-  return (
-    "\n    in " +
-    (name || "Unknown") +
-    (source
-      ? " (at " +
-        source.fileName.replace(/^.*[\\\/]/, "") +
-        ":" +
-        source.lineNumber +
-        ")"
-      : ownerName ? " (created by " + ownerName + ")" : "")
-  );
+// This is a constructor function, rather than a POJO constructor, still
+// please ensure we do the following:
+// 1) Nobody should add any instance methods on this. Instance methods can be
+//    more difficult to predict when they get optimized and they are almost
+//    never inlined properly in static compilers.
+// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
+//    always know when it is a fiber.
+// 3) We might want to experiment with using numeric keys since they are easier
+//    to optimize in a non-JIT environment.
+// 4) We can easily go from a constructor to a createFiber object literal if that
+//    is faster.
+// 5) It should be easy to port this to a C struct and keep a C implementation
+//    compatible.
+var createFiber = function(tag, pendingProps, key, mode) {
+  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
+  return new FiberNode(tag, pendingProps, key, mode);
 };
 
-function describeFiber(fiber) {
-  switch (fiber.tag) {
-    case IndeterminateComponent:
-    case FunctionalComponent:
-    case ClassComponent:
-    case HostComponent:
-      var owner = fiber._debugOwner;
-      var source = fiber._debugSource;
-      var name = getComponentName(fiber);
-      var ownerName = null;
-      if (owner) {
-        ownerName = getComponentName(owner);
-      }
-      return describeComponentFrame(name, source, ownerName);
-    default:
-      return "";
-  }
+function shouldConstruct(Component) {
+  return !!(Component.prototype && Component.prototype.isReactComponent);
 }
 
-// This function can only be called with a work-in-progress fiber and
-// only during begin or complete phase. Do not call it under any other
-// circumstances.
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  var node = workInProgress;
-  do {
-    info += describeFiber(node);
-    // Otherwise this return pointer might point to the wrong tree:
-    node = node["return"];
-  } while (node);
-  return info;
-}
+// This is used to create an alternate fiber to do work on.
+function createWorkInProgress(current, pendingProps, expirationTime) {
+  var workInProgress = current.alternate;
+  if (workInProgress === null) {
+    // We use a double buffering pooling technique because we know that we'll
+    // only ever need at most two versions of a tree. We pool the "other" unused
+    // node that we're free to reuse. This is lazily created to avoid allocating
+    // extra objects for things that are never updated. It also allow us to
+    // reclaim the extra memory if needed.
+    workInProgress = createFiber(
+      current.tag,
+      pendingProps,
+      current.key,
+      current.mode
+    );
+    workInProgress.type = current.type;
+    workInProgress.stateNode = current.stateNode;
 
-function getCurrentFiberOwnerName() {
-  {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    var owner = fiber._debugOwner;
-    if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner);
+    {
+      // DEV-only fields
+      workInProgress._debugID = current._debugID;
+      workInProgress._debugSource = current._debugSource;
+      workInProgress._debugOwner = current._debugOwner;
     }
-  }
-  return null;
-}
 
-function getCurrentFiberStackAddendum() {
-  {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    // Safe because if current fiber exists, we are reconciling,
-    // and it is guaranteed to be the work-in-progress version.
-    return getStackAddendumByWorkInProgressFiber(fiber);
+    workInProgress.alternate = current;
+    current.alternate = workInProgress;
+  } else {
+    workInProgress.pendingProps = pendingProps;
+
+    // We already have an alternate.
+    // Reset the effect tag.
+    workInProgress.effectTag = NoEffect;
+
+    // The effect list is no longer valid.
+    workInProgress.nextEffect = null;
+    workInProgress.firstEffect = null;
+    workInProgress.lastEffect = null;
   }
-  return null;
-}
 
-function resetCurrentFiber() {
-  ReactDebugCurrentFrame.getCurrentStack = null;
-  ReactDebugCurrentFiber.current = null;
-  ReactDebugCurrentFiber.phase = null;
-}
+  workInProgress.expirationTime = expirationTime;
 
-function setCurrentFiber(fiber) {
-  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
-  ReactDebugCurrentFiber.current = fiber;
-  ReactDebugCurrentFiber.phase = null;
+  workInProgress.child = current.child;
+  workInProgress.memoizedProps = current.memoizedProps;
+  workInProgress.memoizedState = current.memoizedState;
+  workInProgress.updateQueue = current.updateQueue;
+
+  // These will be overridden during the parent's reconciliation
+  workInProgress.sibling = current.sibling;
+  workInProgress.index = current.index;
+  workInProgress.ref = current.ref;
+
+  return workInProgress;
 }
 
-function setCurrentPhase(phase) {
-  ReactDebugCurrentFiber.phase = phase;
+function createHostRootFiber(isAsync) {
+  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
+  return createFiber(HostRoot, null, null, mode);
 }
 
-var ReactDebugCurrentFiber = {
-  current: null,
-  phase: null,
-  resetCurrentFiber: resetCurrentFiber,
-  setCurrentFiber: setCurrentFiber,
-  setCurrentPhase: setCurrentPhase,
-  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
-};
-
-var debugRenderPhaseSideEffects = false;
-var debugRenderPhaseSideEffectsForStrictMode = false;
-
-var enableUserTimingAPI = true;
-var enableGetDerivedStateFromCatch = false;
-var warnAboutDeprecatedLifecycles = false;
-var replayFailedUnitOfWorkWithInvokeGuardedCallback = true;
-
-// React Fabric uses persistent reconciler.
-var enableMutatingReconciler = false;
-var enableNoopReconciler = false;
-var enablePersistentReconciler = true;
-
-// Only used in www builds.
-
-// Prefix measurements so that it's possible to filter them.
-// Longer prefixes are hard to read in DevTools.
-var reactEmoji = "\u269B";
-var warningEmoji = "\u26D4";
-var supportsUserTiming =
-  typeof performance !== "undefined" &&
-  typeof performance.mark === "function" &&
-  typeof performance.clearMarks === "function" &&
-  typeof performance.measure === "function" &&
-  typeof performance.clearMeasures === "function";
-
-// Keep track of current fiber so that we know the path to unwind on pause.
-// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
-var currentFiber = null;
-// If we're in the middle of user code, which fiber and method is it?
-// Reusing `currentFiber` would be confusing for this because user code fiber
-// can change during commit phase too, but we don't need to unwind it (since
-// lifecycles in the commit phase don't resemble a tree).
-var currentPhase = null;
-var currentPhaseFiber = null;
-// Did lifecycle hook schedule an update? This is often a performance problem,
-// so we will keep track of it, and include it in the report.
-// Track commits caused by cascading updates.
-var isCommitting = false;
-var hasScheduledUpdateInCurrentCommit = false;
-var hasScheduledUpdateInCurrentPhase = false;
-var commitCountInCurrentWorkLoop = 0;
-var effectCountInCurrentCommit = 0;
-var isWaitingForCallback = false;
-// During commits, we only show a measurement once per method name
-// to avoid stretch the commit phase with measurement overhead.
-var labelsInCurrentCommit = new Set();
-
-var formatMarkName = function(markName) {
-  return reactEmoji + " " + markName;
-};
-
-var formatLabel = function(label, warning$$1) {
-  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
-  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
-  return "" + prefix + label + suffix;
-};
-
-var beginMark = function(markName) {
-  performance.mark(formatMarkName(markName));
-};
-
-var clearMark = function(markName) {
-  performance.clearMarks(formatMarkName(markName));
-};
-
-var endMark = function(label, markName, warning$$1) {
-  var formattedMarkName = formatMarkName(markName);
-  var formattedLabel = formatLabel(label, warning$$1);
-  try {
-    performance.measure(formattedLabel, formattedMarkName);
-  } catch (err) {}
-  // If previous mark was missing for some reason, this will throw.
-  // This could only happen if React crashed in an unexpected place earlier.
-  // Don't pile on with more errors.
-
-  // Clear marks immediately to avoid growing buffer.
-  performance.clearMarks(formattedMarkName);
-  performance.clearMeasures(formattedLabel);
-};
-
-var getFiberMarkName = function(label, debugID) {
-  return label + " (#" + debugID + ")";
-};
-
-var getFiberLabel = function(componentName, isMounted, phase) {
-  if (phase === null) {
-    // These are composite component total time measurements.
-    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
-  } else {
-    // Composite component methods.
-    return componentName + "." + phase;
-  }
-};
-
-var beginFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-
-  if (isCommitting && labelsInCurrentCommit.has(label)) {
-    // During the commit phase, we don't show duplicate labels because
-    // there is a fixed overhead for every measurement, and we don't
-    // want to stretch the commit phase beyond necessary.
-    return false;
-  }
-  labelsInCurrentCommit.add(label);
-
-  var markName = getFiberMarkName(label, debugID);
-  beginMark(markName);
-  return true;
-};
-
-var clearFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  clearMark(markName);
-};
-
-var endFiberMark = function(fiber, phase, warning$$1) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  endMark(label, markName, warning$$1);
-};
-
-var shouldIgnoreFiber = function(fiber) {
-  // Host components should be skipped in the timeline.
-  // We could check typeof fiber.type, but does this work with RN?
-  switch (fiber.tag) {
-    case HostRoot:
-    case HostComponent:
-    case HostText:
-    case HostPortal:
-    case CallComponent:
-    case ReturnComponent:
-    case Fragment:
-    case ContextProvider:
-    case ContextConsumer:
-      return true;
-    default:
-      return false;
-  }
-};
-
-var clearPendingPhaseMeasurement = function() {
-  if (currentPhase !== null && currentPhaseFiber !== null) {
-    clearFiberMark(currentPhaseFiber, currentPhase);
-  }
-  currentPhaseFiber = null;
-  currentPhase = null;
-  hasScheduledUpdateInCurrentPhase = false;
-};
-
-var pauseTimers = function() {
-  // Stops all currently active measurements so that they can be resumed
-  // if we continue in a later deferred loop from the same unit of work.
-  var fiber = currentFiber;
-  while (fiber) {
-    if (fiber._debugIsCurrentlyTiming) {
-      endFiberMark(fiber, null, null);
-    }
-    fiber = fiber["return"];
-  }
-};
-
-var resumeTimersRecursively = function(fiber) {
-  if (fiber["return"] !== null) {
-    resumeTimersRecursively(fiber["return"]);
-  }
-  if (fiber._debugIsCurrentlyTiming) {
-    beginFiberMark(fiber, null);
-  }
-};
-
-var resumeTimers = function() {
-  // Resumes all measurements that were active during the last deferred loop.
-  if (currentFiber !== null) {
-    resumeTimersRecursively(currentFiber);
-  }
-};
-
-function recordEffect() {
-  if (enableUserTimingAPI) {
-    effectCountInCurrentCommit++;
-  }
-}
-
-function recordScheduleUpdate() {
-  if (enableUserTimingAPI) {
-    if (isCommitting) {
-      hasScheduledUpdateInCurrentCommit = true;
-    }
-    if (
-      currentPhase !== null &&
-      currentPhase !== "componentWillMount" &&
-      currentPhase !== "componentWillReceiveProps"
-    ) {
-      hasScheduledUpdateInCurrentPhase = true;
-    }
-  }
-}
-
-function startRequestCallbackTimer() {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming && !isWaitingForCallback) {
-      isWaitingForCallback = true;
-      beginMark("(Waiting for async callback...)");
-    }
-  }
-}
-
-function stopRequestCallbackTimer(didExpire) {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming) {
-      isWaitingForCallback = false;
-      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
-      endMark(
-        "(Waiting for async callback...)",
-        "(Waiting for async callback...)",
-        warning$$1
-      );
-    }
-  }
-}
-
-function startWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, this is the fiber to unwind from.
-    currentFiber = fiber;
-    if (!beginFiberMark(fiber, null)) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = true;
-  }
-}
-
-function cancelWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // Remember we shouldn't complete measurement for this fiber.
-    // Otherwise flamechart will be deep even for small updates.
-    fiber._debugIsCurrentlyTiming = false;
-    clearFiberMark(fiber, null);
-  }
-}
-
-function stopWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    endFiberMark(fiber, null, null);
-  }
-}
-
-function stopFailedWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    var warning$$1 = "An error was thrown inside this error boundary";
-    endFiberMark(fiber, null, warning$$1);
-  }
-}
-
-function startPhaseTimer(fiber, phase) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    clearPendingPhaseMeasurement();
-    if (!beginFiberMark(fiber, phase)) {
-      return;
-    }
-    currentPhaseFiber = fiber;
-    currentPhase = phase;
-  }
-}
-
-function stopPhaseTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    if (currentPhase !== null && currentPhaseFiber !== null) {
-      var warning$$1 = hasScheduledUpdateInCurrentPhase
-        ? "Scheduled a cascading update"
-        : null;
-      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
-    }
-    currentPhase = null;
-    currentPhaseFiber = null;
-  }
-}
-
-function startWorkLoopTimer(nextUnitOfWork) {
-  if (enableUserTimingAPI) {
-    currentFiber = nextUnitOfWork;
-    if (!supportsUserTiming) {
-      return;
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // This is top level call.
-    // Any other measurements are performed within.
-    beginMark("(React Tree Reconciliation)");
-    // Resume any measurements that were in progress during the last loop.
-    resumeTimers();
-  }
-}
-
-function stopWorkLoopTimer(interruptedBy) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var warning$$1 = null;
-    if (interruptedBy !== null) {
-      if (interruptedBy.tag === HostRoot) {
-        warning$$1 = "A top-level update interrupted the previous render";
-      } else {
-        var componentName = getComponentName(interruptedBy) || "Unknown";
-        warning$$1 =
-          "An update to " + componentName + " interrupted the previous render";
-      }
-    } else if (commitCountInCurrentWorkLoop > 1) {
-      warning$$1 = "There were cascading updates";
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // Pause any measurements until the next loop.
-    pauseTimers();
-    endMark(
-      "(React Tree Reconciliation)",
-      "(React Tree Reconciliation)",
-      warning$$1
-    );
-  }
-}
-
-function startCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    isCommitting = true;
-    hasScheduledUpdateInCurrentCommit = false;
-    labelsInCurrentCommit.clear();
-    beginMark("(Committing Changes)");
-  }
-}
-
-function stopCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-
-    var warning$$1 = null;
-    if (hasScheduledUpdateInCurrentCommit) {
-      warning$$1 = "Lifecycle hook scheduled a cascading update";
-    } else if (commitCountInCurrentWorkLoop > 0) {
-      warning$$1 = "Caused by a cascading update in earlier commit";
-    }
-    hasScheduledUpdateInCurrentCommit = false;
-    commitCountInCurrentWorkLoop++;
-    isCommitting = false;
-    labelsInCurrentCommit.clear();
-
-    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
-  }
-}
-
-function startCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Committing Host Effects)");
-  }
-}
-
-function stopCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Committing Host Effects: " + count + " Total)",
-      "(Committing Host Effects)",
-      null
-    );
+function createFiberFromElement(element, mode, expirationTime) {
+  var owner = null;
+  {
+    owner = element._owner;
   }
-}
 
-function startCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Calling Lifecycle Methods)");
-  }
-}
+  var fiber = void 0;
+  var type = element.type;
+  var key = element.key;
+  var pendingProps = element.props;
 
-function stopCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
+  var fiberTag = void 0;
+  if (typeof type === "function") {
+    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
+  } else if (typeof type === "string") {
+    fiberTag = HostComponent;
+  } else {
+    switch (type) {
+      case REACT_FRAGMENT_TYPE:
+        return createFiberFromFragment(
+          pendingProps.children,
+          mode,
+          expirationTime,
+          key
+        );
+      case REACT_ASYNC_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= AsyncMode | StrictMode;
+        break;
+      case REACT_STRICT_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= StrictMode;
+        break;
+      case REACT_CALL_TYPE:
+        fiberTag = CallComponent;
+        break;
+      case REACT_RETURN_TYPE:
+        fiberTag = ReturnComponent;
+        break;
+      default: {
+        if (typeof type === "object" && type !== null) {
+          switch (type.$$typeof) {
+            case REACT_PROVIDER_TYPE:
+              fiberTag = ContextProvider;
+              break;
+            case REACT_CONTEXT_TYPE:
+              // This is a consumer
+              fiberTag = ContextConsumer;
+              break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = ForwardRef;
+              break;
+            default:
+              if (typeof type.tag === "number") {
+                // Currently assumed to be a continuation and therefore is a
+                // fiber already.
+                // TODO: The yield system is currently broken for updates in
+                // some cases. The reified yield stores a fiber, but we don't
+                // know which fiber that is; the current or a workInProgress?
+                // When the continuation gets rendered here we don't know if we
+                // can reuse that fiber or if we need to clone it. There is
+                // probably a clever way to restructure this.
+                fiber = type;
+                fiber.pendingProps = pendingProps;
+                fiber.expirationTime = expirationTime;
+                return fiber;
+              } else {
+                throwOnInvalidElementType(type, owner);
+              }
+              break;
+          }
+        } else {
+          throwOnInvalidElementType(type, owner);
+        }
+      }
     }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Calling Lifecycle Methods: " + count + " Total)",
-      "(Calling Lifecycle Methods)",
-      null
-    );
   }
-}
-
-var warnedAboutMissingGetChildContext = void 0;
-
-{
-  warnedAboutMissingGetChildContext = {};
-}
 
-// A cursor to the current merged context object on the stack.
-var contextStackCursor = createCursor(emptyObject);
-// A cursor to a boolean indicating whether the context has changed.
-var didPerformWorkStackCursor = createCursor(false);
-// Keep track of the previous context object that was on the stack.
-// We use this to get access to the parent context after we have already
-// pushed the next context provider, and now need to merge their contexts.
-var previousContext = emptyObject;
+  fiber = createFiber(fiberTag, pendingProps, key, mode);
+  fiber.type = type;
+  fiber.expirationTime = expirationTime;
 
-function getUnmaskedContext(workInProgress) {
-  var hasOwnContext = isContextProvider(workInProgress);
-  if (hasOwnContext) {
-    // If the fiber is a context provider itself, when we read its context
-    // we have already pushed its own child context on the stack. A context
-    // provider should not "see" its own child context. Therefore we read the
-    // previous (parent) context instead for a context provider.
-    return previousContext;
+  {
+    fiber._debugSource = element._source;
+    fiber._debugOwner = element._owner;
   }
-  return contextStackCursor.current;
-}
 
-function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-  var instance = workInProgress.stateNode;
-  instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-  instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  return fiber;
 }
 
-function getMaskedContext(workInProgress, unmaskedContext) {
-  var type = workInProgress.type;
-  var contextTypes = type.contextTypes;
-  if (!contextTypes) {
-    return emptyObject;
-  }
-
-  // Avoid recreating masked context unless unmasked context has changed.
-  // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-  // This may trigger infinite loops if componentWillReceiveProps calls setState.
-  var instance = workInProgress.stateNode;
-  if (
-    instance &&
-    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-  ) {
-    return instance.__reactInternalMemoizedMaskedChildContext;
-  }
-
-  var context = {};
-  for (var key in contextTypes) {
-    context[key] = unmaskedContext[key];
-  }
-
+function throwOnInvalidElementType(type, owner) {
+  var info = "";
   {
-    var name = getComponentName(workInProgress) || "Unknown";
-    checkPropTypes(
-      contextTypes,
-      context,
-      "context",
-      name,
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-    );
-  }
-
-  // Cache unmasked context so we can avoid recreating masked context unless necessary.
-  // Context is created before the class component is instantiated so check for instance.
-  if (instance) {
-    cacheContext(workInProgress, unmaskedContext, context);
+    if (
+      type === undefined ||
+      (typeof type === "object" &&
+        type !== null &&
+        Object.keys(type).length === 0)
+    ) {
+      info +=
+        " You likely forgot to export your component from the file " +
+        "it's defined in, or you might have mixed up default and " +
+        "named imports.";
+    }
+    var ownerName = owner ? getComponentName(owner) : null;
+    if (ownerName) {
+      info += "\n\nCheck the render method of `" + ownerName + "`.";
+    }
   }
-
-  return context;
-}
-
-function hasContextChanged() {
-  return didPerformWorkStackCursor.current;
+  invariant(
+    false,
+    "Element type is invalid: expected a string (for built-in " +
+      "components) or a class/function (for composite components) " +
+      "but got: %s.%s",
+    type == null ? type : typeof type,
+    info
+  );
 }
 
-function isContextConsumer(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
+function createFiberFromFragment(elements, mode, expirationTime, key) {
+  var fiber = createFiber(Fragment, elements, key, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
 }
 
-function isContextProvider(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
+function createFiberFromText(content, mode, expirationTime) {
+  var fiber = createFiber(HostText, content, null, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
 }
 
-function popContextProvider(fiber) {
-  if (!isContextProvider(fiber)) {
-    return;
-  }
-
-  pop(didPerformWorkStackCursor, fiber);
-  pop(contextStackCursor, fiber);
+function createFiberFromHostInstanceForDeletion() {
+  var fiber = createFiber(HostComponent, null, null, NoContext);
+  fiber.type = "DELETED";
+  return fiber;
 }
 
-function popTopLevelContextObject(fiber) {
-  pop(didPerformWorkStackCursor, fiber);
-  pop(contextStackCursor, fiber);
+function createFiberFromPortal(portal, mode, expirationTime) {
+  var pendingProps = portal.children !== null ? portal.children : [];
+  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
+  fiber.expirationTime = expirationTime;
+  fiber.stateNode = {
+    containerInfo: portal.containerInfo,
+    pendingChildren: null, // Used by persistent updates
+    implementation: portal.implementation
+  };
+  return fiber;
 }
 
-function pushTopLevelContextObject(fiber, context, didChange) {
-  invariant(
-    contextStackCursor.cursor == null,
-    "Unexpected context found on stack. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
+// TODO: This should be lifted into the renderer.
 
-  push(contextStackCursor, context, fiber);
-  push(didPerformWorkStackCursor, didChange, fiber);
+function createFiberRoot(containerInfo, isAsync, hydrate) {
+  // Cyclic construction. This cheats the type system right now because
+  // stateNode is any.
+  var uninitializedFiber = createHostRootFiber(isAsync);
+  var root = {
+    current: uninitializedFiber,
+    containerInfo: containerInfo,
+    pendingChildren: null,
+    pendingCommitExpirationTime: NoWork,
+    finishedWork: null,
+    context: null,
+    pendingContext: null,
+    hydrate: hydrate,
+    remainingExpirationTime: NoWork,
+    firstBatch: null,
+    nextScheduledRoot: null
+  };
+  uninitializedFiber.stateNode = root;
+  return root;
 }
 
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode;
-  var childContextTypes = fiber.type.childContextTypes;
-
-  // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-  // It has only been added in Fiber to match the (unintentional) behavior in Stack.
-  if (typeof instance.getChildContext !== "function") {
-    {
-      var componentName = getComponentName(fiber) || "Unknown";
+var onCommitFiberRoot = null;
+var onCommitFiberUnmount = null;
+var hasLoggedError = false;
 
-      if (!warnedAboutMissingGetChildContext[componentName]) {
-        warnedAboutMissingGetChildContext[componentName] = true;
-        warning(
-          false,
-          "%s.childContextTypes is specified but there is no getChildContext() method " +
-            "on the instance. You can either define getChildContext() on %s or remove " +
-            "childContextTypes from it.",
-          componentName,
-          componentName
-        );
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {
+      if (true && !hasLoggedError) {
+        hasLoggedError = true;
+        warning(false, "React DevTools encountered an error: %s", err);
       }
     }
-    return parentContext;
-  }
+  };
+}
 
-  var childContext = void 0;
-  {
-    ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
-  }
-  startPhaseTimer(fiber, "getChildContext");
-  childContext = instance.getChildContext();
-  stopPhaseTimer();
-  {
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
+    return false;
   }
-  for (var contextKey in childContext) {
-    invariant(
-      contextKey in childContextTypes,
-      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
-      contextKey
-    );
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
   }
-  {
-    var name = getComponentName(fiber) || "Unknown";
-    checkPropTypes(
-      childContextTypes,
-      childContext,
-      "child context",
-      name,
-      // In practice, there is one case in which we won't get a stack. It's when
-      // somebody calls unstable_renderSubtreeIntoContainer() and we process
-      // context from the parent component instance. The stack will be missing
-      // because it's outside of the reconciliation, and so the pointer has not
-      // been set. This is rare and doesn't matter. We'll also remove that API.
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-    );
+  if (!hook.supportsFiber) {
+    {
+      warning(
+        false,
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://fb.me/react-devtools"
+      );
+    }
+    // DevTools exists, even though it doesn't support Fiber.
+    return true;
   }
-
-  return Object.assign({}, parentContext, childContext);
-}
-
-function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) {
-    return false;
+  try {
+    var rendererID = hook.inject(internals);
+    // We have successfully injected, so now it is safe to set up hooks.
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      warning(false, "React DevTools encountered an error: %s.", err);
+    }
   }
-
-  var instance = workInProgress.stateNode;
-  // We push the context as early as possible to ensure stack integrity.
-  // If the instance does not exist yet, we will push null at first,
-  // and replace it on the stack later when invalidating the context.
-  var memoizedMergedChildContext =
-    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
-
-  // Remember the parent context so we can merge with it later.
-  // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
-  previousContext = contextStackCursor.current;
-  push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-  push(
-    didPerformWorkStackCursor,
-    didPerformWorkStackCursor.current,
-    workInProgress
-  );
-
+  // DevTools exists
   return true;
 }
 
-function invalidateContextProvider(workInProgress, didChange) {
-  var instance = workInProgress.stateNode;
-  invariant(
-    instance,
-    "Expected to have an instance by this point. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
-
-  if (didChange) {
-    // Merge parent and own context.
-    // Skip this if we're not updating due to sCU.
-    // This avoids unnecessarily recomputing memoized values.
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-
-    // Replace the old (or empty) context with the new one.
-    // It is important to unwind the context in the reverse order.
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    // Now push the new context and mark that it has changed.
-    push(contextStackCursor, mergedContext, workInProgress);
-    push(didPerformWorkStackCursor, didChange, workInProgress);
-  } else {
-    pop(didPerformWorkStackCursor, workInProgress);
-    push(didPerformWorkStackCursor, didChange, workInProgress);
+function onCommitRoot(root) {
+  if (typeof onCommitFiberRoot === "function") {
+    onCommitFiberRoot(root);
   }
 }
 
-function resetContext() {
-  previousContext = emptyObject;
-  contextStackCursor.current = emptyObject;
-  didPerformWorkStackCursor.current = false;
-}
-
-function findCurrentUnmaskedContext(fiber) {
-  // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-  // makes sense elsewhere
-  invariant(
-    isFiberMounted(fiber) && fiber.tag === ClassComponent,
-    "Expected subtree parent to be a mounted class component. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
-
-  var node = fiber;
-  while (node.tag !== HostRoot) {
-    if (isContextProvider(node)) {
-      return node.stateNode.__reactInternalMemoizedMergedChildContext;
-    }
-    var parent = node["return"];
-    invariant(
-      parent,
-      "Found unexpected detached subtree parent. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
-    node = parent;
+function onCommitUnmount(fiber) {
+  if (typeof onCommitFiberUnmount === "function") {
+    onCommitFiberUnmount(fiber);
   }
-  return node.stateNode.context;
-}
-
-// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
-// Math.pow(2, 30) - 1
-// 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
-
-// TODO: Use an opaque type once ESLint et al support the syntax
-
-var NoWork = 0;
-var Sync = 1;
-var Never = MAX_SIGNED_31_BIT_INT;
-
-var UNIT_SIZE = 10;
-var MAGIC_NUMBER_OFFSET = 2;
-
-// 1 unit of expiration time represents 10ms.
-function msToExpirationTime(ms) {
-  // Always add an offset so that we don't clash with the magic number for NoWork.
-  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
-}
-
-function expirationTimeToMs(expirationTime) {
-  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
-}
-
-function ceiling(num, precision) {
-  return (((num / precision) | 0) + 1) * precision;
 }
 
-function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
-  return ceiling(
-    currentTime + expirationInMs / UNIT_SIZE,
-    bucketSizeMs / UNIT_SIZE
+var describeComponentFrame = function(name, source, ownerName) {
+  return (
+    "\n    in " +
+    (name || "Unknown") +
+    (source
+      ? " (at " +
+        source.fileName.replace(/^.*[\\\/]/, "") +
+        ":" +
+        source.lineNumber +
+        ")"
+      : ownerName ? " (created by " + ownerName + ")" : "")
   );
-}
-
-var NoContext = 0;
-var AsyncMode = 1;
-var StrictMode = 2;
-
-var hasBadMapPolyfill = void 0;
+};
 
-{
-  hasBadMapPolyfill = false;
-  try {
-    var nonExtensibleObject = Object.preventExtensions({});
-    var testMap = new Map([[nonExtensibleObject, null]]);
-    var testSet = new Set([nonExtensibleObject]);
-    // This is necessary for Rollup to not consider these unused.
-    // https://github.com/rollup/rollup/issues/1771
-    // TODO: we can remove these if Rollup fixes the bug.
-    testMap.set(0, 0);
-    testSet.add(0);
-  } catch (e) {
-    // TODO: Consider warning about bad polyfills
-    hasBadMapPolyfill = true;
+function describeFiber(fiber) {
+  switch (fiber.tag) {
+    case IndeterminateComponent:
+    case FunctionalComponent:
+    case ClassComponent:
+    case HostComponent:
+      var owner = fiber._debugOwner;
+      var source = fiber._debugSource;
+      var name = getComponentName(fiber);
+      var ownerName = null;
+      if (owner) {
+        ownerName = getComponentName(owner);
+      }
+      return describeComponentFrame(name, source, ownerName);
+    default:
+      return "";
   }
 }
 
-// A Fiber is work on a Component that needs to be done or was done. There can
-// be more than one per component.
-
-var debugCounter = void 0;
-
-{
-  debugCounter = 1;
+// This function can only be called with a work-in-progress fiber and
+// only during begin or complete phase. Do not call it under any other
+// circumstances.
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  var node = workInProgress;
+  do {
+    info += describeFiber(node);
+    // Otherwise this return pointer might point to the wrong tree:
+    node = node["return"];
+  } while (node);
+  return info;
 }
 
-function FiberNode(tag, pendingProps, key, mode) {
-  // Instance
-  this.tag = tag;
-  this.key = key;
-  this.type = null;
-  this.stateNode = null;
-
-  // Fiber
-  this["return"] = null;
-  this.child = null;
-  this.sibling = null;
-  this.index = 0;
-
-  this.ref = null;
-
-  this.pendingProps = pendingProps;
-  this.memoizedProps = null;
-  this.updateQueue = null;
-  this.memoizedState = null;
-
-  this.mode = mode;
+/**
+ * Forked from fbjs/warning:
+ * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
+ *
+ * Only change is we use console.warn instead of console.error,
+ * and do nothing when 'console' is not supported.
+ * This really simplifies the code.
+ * ---
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
 
-  // Effects
-  this.effectTag = NoEffect;
-  this.nextEffect = null;
+var lowPriorityWarning = function() {};
 
-  this.firstEffect = null;
-  this.lastEffect = null;
+{
+  var printWarning = function(format) {
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 1 ? _len - 1 : 0),
+        _key = 1;
+      _key < _len;
+      _key++
+    ) {
+      args[_key - 1] = arguments[_key];
+    }
 
-  this.expirationTime = NoWork;
+    var argIndex = 0;
+    var message =
+      "Warning: " +
+      format.replace(/%s/g, function() {
+        return args[argIndex++];
+      });
+    if (typeof console !== "undefined") {
+      console.warn(message);
+    }
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      throw new Error(message);
+    } catch (x) {}
+  };
 
-  this.alternate = null;
+  lowPriorityWarning = function(condition, format) {
+    if (format === undefined) {
+      throw new Error(
+        "`warning(condition, format, ...args)` requires a warning " +
+          "message argument"
+      );
+    }
+    if (!condition) {
+      for (
+        var _len2 = arguments.length,
+          args = Array(_len2 > 2 ? _len2 - 2 : 0),
+          _key2 = 2;
+        _key2 < _len2;
+        _key2++
+      ) {
+        args[_key2 - 2] = arguments[_key2];
+      }
 
-  {
-    this._debugID = debugCounter++;
-    this._debugSource = null;
-    this._debugOwner = null;
-    this._debugIsCurrentlyTiming = false;
-    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
-      Object.preventExtensions(this);
+      printWarning.apply(undefined, [format].concat(args));
     }
-  }
+  };
 }
 
-// This is a constructor function, rather than a POJO constructor, still
-// please ensure we do the following:
-// 1) Nobody should add any instance methods on this. Instance methods can be
-//    more difficult to predict when they get optimized and they are almost
-//    never inlined properly in static compilers.
-// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
-//    always know when it is a fiber.
-// 3) We might want to experiment with using numeric keys since they are easier
-//    to optimize in a non-JIT environment.
-// 4) We can easily go from a constructor to a createFiber object literal if that
-//    is faster.
-// 5) It should be easy to port this to a C struct and keep a C implementation
-//    compatible.
-var createFiber = function(tag, pendingProps, key, mode) {
-  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
-  return new FiberNode(tag, pendingProps, key, mode);
-};
+var lowPriorityWarning$1 = lowPriorityWarning;
 
-function shouldConstruct(Component) {
-  return !!(Component.prototype && Component.prototype.isReactComponent);
-}
+var ReactStrictModeWarnings = {
+  discardPendingWarnings: function() {},
+  flushPendingDeprecationWarnings: function() {},
+  flushPendingUnsafeLifecycleWarnings: function() {},
+  recordDeprecationWarnings: function(fiber, instance) {},
+  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
+};
 
-// This is used to create an alternate fiber to do work on.
-function createWorkInProgress(current, pendingProps, expirationTime) {
-  var workInProgress = current.alternate;
-  if (workInProgress === null) {
-    // We use a double buffering pooling technique because we know that we'll
-    // only ever need at most two versions of a tree. We pool the "other" unused
-    // node that we're free to reuse. This is lazily created to avoid allocating
-    // extra objects for things that are never updated. It also allow us to
-    // reclaim the extra memory if needed.
-    workInProgress = createFiber(
-      current.tag,
-      pendingProps,
-      current.key,
-      current.mode
-    );
-    workInProgress.type = current.type;
-    workInProgress.stateNode = current.stateNode;
+{
+  var LIFECYCLE_SUGGESTIONS = {
+    UNSAFE_componentWillMount: "componentDidMount",
+    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
+    UNSAFE_componentWillUpdate: "componentDidUpdate"
+  };
 
-    {
-      // DEV-only fields
-      workInProgress._debugID = current._debugID;
-      workInProgress._debugSource = current._debugSource;
-      workInProgress._debugOwner = current._debugOwner;
-    }
+  var pendingComponentWillMountWarnings = [];
+  var pendingComponentWillReceivePropsWarnings = [];
+  var pendingComponentWillUpdateWarnings = [];
+  var pendingUnsafeLifecycleWarnings = new Map();
 
-    workInProgress.alternate = current;
-    current.alternate = workInProgress;
-  } else {
-    workInProgress.pendingProps = pendingProps;
+  // Tracks components we have already warned about.
+  var didWarnAboutDeprecatedLifecycles = new Set();
+  var didWarnAboutUnsafeLifecycles = new Set();
 
-    // We already have an alternate.
-    // Reset the effect tag.
-    workInProgress.effectTag = NoEffect;
+  ReactStrictModeWarnings.discardPendingWarnings = function() {
+    pendingComponentWillMountWarnings = [];
+    pendingComponentWillReceivePropsWarnings = [];
+    pendingComponentWillUpdateWarnings = [];
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-    // The effect list is no longer valid.
-    workInProgress.nextEffect = null;
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
-  }
+  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
+    pendingUnsafeLifecycleWarnings.forEach(function(
+      lifecycleWarningsMap,
+      strictRoot
+    ) {
+      var lifecyclesWarningMesages = [];
 
-  workInProgress.expirationTime = expirationTime;
+      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
+        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
+        if (lifecycleWarnings.length > 0) {
+          var componentNames = new Set();
+          lifecycleWarnings.forEach(function(fiber) {
+            componentNames.add(getComponentName(fiber) || "Component");
+            didWarnAboutUnsafeLifecycles.add(fiber.type);
+          });
 
-  workInProgress.child = current.child;
-  workInProgress.memoizedProps = current.memoizedProps;
-  workInProgress.memoizedState = current.memoizedState;
-  workInProgress.updateQueue = current.updateQueue;
+          var formatted = lifecycle.replace("UNSAFE_", "");
+          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
+          var sortedComponentNames = Array.from(componentNames)
+            .sort()
+            .join(", ");
 
-  // These will be overridden during the parent's reconciliation
-  workInProgress.sibling = current.sibling;
-  workInProgress.index = current.index;
-  workInProgress.ref = current.ref;
+          lifecyclesWarningMesages.push(
+            formatted +
+              ": Please update the following components to use " +
+              (suggestion + " instead: " + sortedComponentNames)
+          );
+        }
+      });
 
-  return workInProgress;
-}
+      if (lifecyclesWarningMesages.length > 0) {
+        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
+          strictRoot
+        );
 
-function createHostRootFiber(isAsync) {
-  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
-  return createFiber(HostRoot, null, null, mode);
-}
+        warning(
+          false,
+          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
+            "\n\n%s" +
+            "\n\nLearn more about this warning here:" +
+            "\nhttps://fb.me/react-strict-mode-warnings",
+          strictRootComponentStack,
+          lifecyclesWarningMesages.join("\n\n")
+        );
+      }
+    });
 
-function createFiberFromElement(element, mode, expirationTime) {
-  var owner = null;
-  {
-    owner = element._owner;
-  }
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-  var fiber = void 0;
-  var type = element.type;
-  var key = element.key;
-  var pendingProps = element.props;
+  var getStrictRoot = function(fiber) {
+    var maybeStrictRoot = null;
 
-  var fiberTag = void 0;
-  if (typeof type === "function") {
-    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
-  } else if (typeof type === "string") {
-    fiberTag = HostComponent;
-  } else {
-    switch (type) {
-      case REACT_FRAGMENT_TYPE:
-        return createFiberFromFragment(
-          pendingProps.children,
-          mode,
-          expirationTime,
-          key
-        );
-      case REACT_ASYNC_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= AsyncMode | StrictMode;
-        break;
-      case REACT_STRICT_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= StrictMode;
-        break;
-      case REACT_CALL_TYPE:
-        fiberTag = CallComponent;
-        break;
-      case REACT_RETURN_TYPE:
-        fiberTag = ReturnComponent;
-        break;
-      default: {
-        if (typeof type === "object" && type !== null) {
-          switch (type.$$typeof) {
-            case REACT_PROVIDER_TYPE:
-              fiberTag = ContextProvider;
-              break;
-            case REACT_CONTEXT_TYPE:
-              // This is a consumer
-              fiberTag = ContextConsumer;
-              break;
-            case REACT_FORWARD_REF_TYPE:
-              fiberTag = ForwardRef;
-              break;
-            default:
-              if (typeof type.tag === "number") {
-                // Currently assumed to be a continuation and therefore is a
-                // fiber already.
-                // TODO: The yield system is currently broken for updates in
-                // some cases. The reified yield stores a fiber, but we don't
-                // know which fiber that is; the current or a workInProgress?
-                // When the continuation gets rendered here we don't know if we
-                // can reuse that fiber or if we need to clone it. There is
-                // probably a clever way to restructure this.
-                fiber = type;
-                fiber.pendingProps = pendingProps;
-                fiber.expirationTime = expirationTime;
-                return fiber;
-              } else {
-                throwOnInvalidElementType(type, owner);
-              }
-              break;
-          }
-        } else {
-          throwOnInvalidElementType(type, owner);
-        }
+    while (fiber !== null) {
+      if (fiber.mode & StrictMode) {
+        maybeStrictRoot = fiber;
       }
+
+      fiber = fiber["return"];
     }
-  }
 
-  fiber = createFiber(fiberTag, pendingProps, key, mode);
-  fiber.type = type;
-  fiber.expirationTime = expirationTime;
+    return maybeStrictRoot;
+  };
+
+  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
+    if (pendingComponentWillMountWarnings.length > 0) {
+      var uniqueNames = new Set();
+      pendingComponentWillMountWarnings.forEach(function(fiber) {
+        uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-  {
-    fiber._debugSource = element._source;
-    fiber._debugOwner = element._owner;
-  }
+      var sortedNames = Array.from(uniqueNames)
+        .sort()
+        .join(", ");
 
-  return fiber;
-}
+      lowPriorityWarning$1(
+        false,
+        "componentWillMount is deprecated and will be removed in the next major version. " +
+          "Use componentDidMount instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillMount." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        sortedNames
+      );
 
-function throwOnInvalidElementType(type, owner) {
-  var info = "";
-  {
-    if (
-      type === undefined ||
-      (typeof type === "object" &&
-        type !== null &&
-        Object.keys(type).length === 0)
-    ) {
-      info +=
-        " You likely forgot to export your component from the file " +
-        "it's defined in, or you might have mixed up default and " +
-        "named imports.";
+      pendingComponentWillMountWarnings = [];
     }
-    var ownerName = owner ? getComponentName(owner) : null;
-    if (ownerName) {
-      info += "\n\nCheck the render method of `" + ownerName + "`.";
+
+    if (pendingComponentWillReceivePropsWarnings.length > 0) {
+      var _uniqueNames = new Set();
+      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
+        _uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
+
+      var _sortedNames = Array.from(_uniqueNames)
+        .sort()
+        .join(", ");
+
+      lowPriorityWarning$1(
+        false,
+        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
+          "Use static getDerivedStateFromProps instead." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames
+      );
+
+      pendingComponentWillReceivePropsWarnings = [];
     }
-  }
-  invariant(
-    false,
-    "Element type is invalid: expected a string (for built-in " +
-      "components) or a class/function (for composite components) " +
-      "but got: %s.%s",
-    type == null ? type : typeof type,
-    info
-  );
-}
 
-function createFiberFromFragment(elements, mode, expirationTime, key) {
-  var fiber = createFiber(Fragment, elements, key, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
-}
+    if (pendingComponentWillUpdateWarnings.length > 0) {
+      var _uniqueNames2 = new Set();
+      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
+        _uniqueNames2.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-function createFiberFromText(content, mode, expirationTime) {
-  var fiber = createFiber(HostText, content, null, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
-}
+      var _sortedNames2 = Array.from(_uniqueNames2)
+        .sort()
+        .join(", ");
 
-function createFiberFromHostInstanceForDeletion() {
-  var fiber = createFiber(HostComponent, null, null, NoContext);
-  fiber.type = "DELETED";
-  return fiber;
-}
+      lowPriorityWarning$1(
+        false,
+        "componentWillUpdate is deprecated and will be removed in the next major version. " +
+          "Use componentDidUpdate instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillUpdate." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames2
+      );
 
-function createFiberFromPortal(portal, mode, expirationTime) {
-  var pendingProps = portal.children !== null ? portal.children : [];
-  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
-  fiber.expirationTime = expirationTime;
-  fiber.stateNode = {
-    containerInfo: portal.containerInfo,
-    pendingChildren: null, // Used by persistent updates
-    implementation: portal.implementation
+      pendingComponentWillUpdateWarnings = [];
+    }
   };
-  return fiber;
-}
 
-// TODO: This should be lifted into the renderer.
+  ReactStrictModeWarnings.recordDeprecationWarnings = function(
+    fiber,
+    instance
+  ) {
+    // Dedup strategy: Warn once per component.
+    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+      return;
+    }
 
-function createFiberRoot(containerInfo, isAsync, hydrate) {
-  // Cyclic construction. This cheats the type system right now because
-  // stateNode is any.
-  var uninitializedFiber = createHostRootFiber(isAsync);
-  var root = {
-    current: uninitializedFiber,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-    pendingCommitExpirationTime: NoWork,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    remainingExpirationTime: NoWork,
-    firstBatch: null,
-    nextScheduledRoot: null
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillMountWarnings.push(fiber);
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" &&
+      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillReceivePropsWarnings.push(fiber);
+    }
+    if (typeof instance.componentWillUpdate === "function") {
+      pendingComponentWillUpdateWarnings.push(fiber);
+    }
   };
-  uninitializedFiber.stateNode = root;
-  return root;
-}
 
-var onCommitFiberRoot = null;
-var onCommitFiberUnmount = null;
-var hasLoggedError = false;
+  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
+    fiber,
+    instance
+  ) {
+    var strictRoot = getStrictRoot(fiber);
 
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {
-      if (true && !hasLoggedError) {
-        hasLoggedError = true;
-        warning(false, "React DevTools encountered an error: %s", err);
-      }
+    // Dedup strategy: Warn once per component.
+    // This is difficult to track any other way since component names
+    // are often vague and are likely to collide between 3rd party libraries.
+    // An expand property is probably okay to use here since it's DEV-only,
+    // and will only be set in the event of serious warnings.
+    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+      return;
     }
-  };
-}
 
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
-  }
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
-  }
-  if (!hook.supportsFiber) {
-    {
-      warning(
-        false,
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://fb.me/react-devtools"
-      );
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    // Note that it is sufficient to check for the presence of a
+    // single lifecycle, componentWillMount, with the polyfill flag.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning === true
+    ) {
+      return;
+    }
+
+    var warningsForRoot = void 0;
+    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
+      warningsForRoot = {
+        UNSAFE_componentWillMount: [],
+        UNSAFE_componentWillReceiveProps: [],
+        UNSAFE_componentWillUpdate: []
+      };
+
+      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
+    } else {
+      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
+    }
+
+    var unsafeLifecycles = [];
+    if (
+      typeof instance.componentWillMount === "function" ||
+      typeof instance.UNSAFE_componentWillMount === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillMount");
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" ||
+      typeof instance.UNSAFE_componentWillReceiveProps === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
+    }
+    if (
+      typeof instance.componentWillUpdate === "function" ||
+      typeof instance.UNSAFE_componentWillUpdate === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
     }
-    // DevTools exists, even though it doesn't support Fiber.
-    return true;
-  }
-  try {
-    var rendererID = hook.inject(internals);
-    // We have successfully injected, so now it is safe to set up hooks.
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
-    {
-      warning(false, "React DevTools encountered an error: %s.", err);
+
+    if (unsafeLifecycles.length > 0) {
+      unsafeLifecycles.forEach(function(lifecycle) {
+        warningsForRoot[lifecycle].push(fiber);
+      });
     }
-  }
-  // DevTools exists
-  return true;
+  };
 }
 
-function onCommitRoot(root) {
-  if (typeof onCommitFiberRoot === "function") {
-    onCommitFiberRoot(root);
+var debugRenderPhaseSideEffects = false;
+var debugRenderPhaseSideEffectsForStrictMode = false;
+
+var enableUserTimingAPI = true;
+var enableGetDerivedStateFromCatch = false;
+var warnAboutDeprecatedLifecycles = false;
+var replayFailedUnitOfWorkWithInvokeGuardedCallback = true;
+
+// React Fabric uses persistent reconciler.
+var enableMutatingReconciler = false;
+var enableNoopReconciler = false;
+var enablePersistentReconciler = true;
+
+// Only used in www builds.
+
+function getCurrentFiberOwnerName() {
+  {
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
+    }
+    var owner = fiber._debugOwner;
+    if (owner !== null && typeof owner !== "undefined") {
+      return getComponentName(owner);
+    }
   }
+  return null;
 }
 
-function onCommitUnmount(fiber) {
-  if (typeof onCommitFiberUnmount === "function") {
-    onCommitFiberUnmount(fiber);
+function getCurrentFiberStackAddendum() {
+  {
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
+    }
+    // Safe because if current fiber exists, we are reconciling,
+    // and it is guaranteed to be the work-in-progress version.
+    return getStackAddendumByWorkInProgressFiber(fiber);
   }
+  return null;
 }
 
-/**
- * Forked from fbjs/warning:
- * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
- *
- * Only change is we use console.warn instead of console.error,
- * and do nothing when 'console' is not supported.
- * This really simplifies the code.
- * ---
- * Similar to invariant but only logs a warning if the condition is not met.
- * This can be used to log issues in development environments in critical
- * paths. Removing the logging code for production environments will keep the
- * same logic and follow the same code paths.
- */
+function resetCurrentFiber() {
+  ReactDebugCurrentFrame.getCurrentStack = null;
+  ReactDebugCurrentFiber.current = null;
+  ReactDebugCurrentFiber.phase = null;
+}
 
-var lowPriorityWarning = function() {};
+function setCurrentFiber(fiber) {
+  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
+  ReactDebugCurrentFiber.current = fiber;
+  ReactDebugCurrentFiber.phase = null;
+}
 
-{
-  var printWarning = function(format) {
-    for (
-      var _len = arguments.length,
-        args = Array(_len > 1 ? _len - 1 : 0),
-        _key = 1;
-      _key < _len;
-      _key++
-    ) {
-      args[_key - 1] = arguments[_key];
-    }
+function setCurrentPhase(phase) {
+  ReactDebugCurrentFiber.phase = phase;
+}
 
-    var argIndex = 0;
-    var message =
-      "Warning: " +
-      format.replace(/%s/g, function() {
-        return args[argIndex++];
-      });
-    if (typeof console !== "undefined") {
-      console.warn(message);
-    }
-    try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
-      throw new Error(message);
-    } catch (x) {}
-  };
+var ReactDebugCurrentFiber = {
+  current: null,
+  phase: null,
+  resetCurrentFiber: resetCurrentFiber,
+  setCurrentFiber: setCurrentFiber,
+  setCurrentPhase: setCurrentPhase,
+  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
+  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
+};
 
-  lowPriorityWarning = function(condition, format) {
-    if (format === undefined) {
-      throw new Error(
-        "`warning(condition, format, ...args)` requires a warning " +
-          "message argument"
-      );
-    }
-    if (!condition) {
-      for (
-        var _len2 = arguments.length,
-          args = Array(_len2 > 2 ? _len2 - 2 : 0),
-          _key2 = 2;
-        _key2 < _len2;
-        _key2++
-      ) {
-        args[_key2 - 2] = arguments[_key2];
-      }
+// Prefix measurements so that it's possible to filter them.
+// Longer prefixes are hard to read in DevTools.
+var reactEmoji = "\u269B";
+var warningEmoji = "\u26D4";
+var supportsUserTiming =
+  typeof performance !== "undefined" &&
+  typeof performance.mark === "function" &&
+  typeof performance.clearMarks === "function" &&
+  typeof performance.measure === "function" &&
+  typeof performance.clearMeasures === "function";
 
-      printWarning.apply(undefined, [format].concat(args));
-    }
-  };
-}
+// Keep track of current fiber so that we know the path to unwind on pause.
+// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
+var currentFiber = null;
+// If we're in the middle of user code, which fiber and method is it?
+// Reusing `currentFiber` would be confusing for this because user code fiber
+// can change during commit phase too, but we don't need to unwind it (since
+// lifecycles in the commit phase don't resemble a tree).
+var currentPhase = null;
+var currentPhaseFiber = null;
+// Did lifecycle hook schedule an update? This is often a performance problem,
+// so we will keep track of it, and include it in the report.
+// Track commits caused by cascading updates.
+var isCommitting = false;
+var hasScheduledUpdateInCurrentCommit = false;
+var hasScheduledUpdateInCurrentPhase = false;
+var commitCountInCurrentWorkLoop = 0;
+var effectCountInCurrentCommit = 0;
+var isWaitingForCallback = false;
+// During commits, we only show a measurement once per method name
+// to avoid stretch the commit phase with measurement overhead.
+var labelsInCurrentCommit = new Set();
 
-var lowPriorityWarning$1 = lowPriorityWarning;
+var formatMarkName = function(markName) {
+  return reactEmoji + " " + markName;
+};
 
-var ReactStrictModeWarnings = {
-  discardPendingWarnings: function() {},
-  flushPendingDeprecationWarnings: function() {},
-  flushPendingUnsafeLifecycleWarnings: function() {},
-  recordDeprecationWarnings: function(fiber, instance) {},
-  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
+var formatLabel = function(label, warning$$1) {
+  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
+  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
+  return "" + prefix + label + suffix;
 };
 
-{
-  var LIFECYCLE_SUGGESTIONS = {
-    UNSAFE_componentWillMount: "componentDidMount",
-    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
-    UNSAFE_componentWillUpdate: "componentDidUpdate"
-  };
+var beginMark = function(markName) {
+  performance.mark(formatMarkName(markName));
+};
 
-  var pendingComponentWillMountWarnings = [];
-  var pendingComponentWillReceivePropsWarnings = [];
-  var pendingComponentWillUpdateWarnings = [];
-  var pendingUnsafeLifecycleWarnings = new Map();
+var clearMark = function(markName) {
+  performance.clearMarks(formatMarkName(markName));
+};
 
-  // Tracks components we have already warned about.
-  var didWarnAboutDeprecatedLifecycles = new Set();
-  var didWarnAboutUnsafeLifecycles = new Set();
+var endMark = function(label, markName, warning$$1) {
+  var formattedMarkName = formatMarkName(markName);
+  var formattedLabel = formatLabel(label, warning$$1);
+  try {
+    performance.measure(formattedLabel, formattedMarkName);
+  } catch (err) {}
+  // If previous mark was missing for some reason, this will throw.
+  // This could only happen if React crashed in an unexpected place earlier.
+  // Don't pile on with more errors.
 
-  ReactStrictModeWarnings.discardPendingWarnings = function() {
-    pendingComponentWillMountWarnings = [];
-    pendingComponentWillReceivePropsWarnings = [];
-    pendingComponentWillUpdateWarnings = [];
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+  // Clear marks immediately to avoid growing buffer.
+  performance.clearMarks(formattedMarkName);
+  performance.clearMeasures(formattedLabel);
+};
 
-  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
-    pendingUnsafeLifecycleWarnings.forEach(function(
-      lifecycleWarningsMap,
-      strictRoot
-    ) {
-      var lifecyclesWarningMesages = [];
+var getFiberMarkName = function(label, debugID) {
+  return label + " (#" + debugID + ")";
+};
 
-      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
-        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
-        if (lifecycleWarnings.length > 0) {
-          var componentNames = new Set();
-          lifecycleWarnings.forEach(function(fiber) {
-            componentNames.add(getComponentName(fiber) || "Component");
-            didWarnAboutUnsafeLifecycles.add(fiber.type);
-          });
+var getFiberLabel = function(componentName, isMounted, phase) {
+  if (phase === null) {
+    // These are composite component total time measurements.
+    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
+  } else {
+    // Composite component methods.
+    return componentName + "." + phase;
+  }
+};
 
-          var formatted = lifecycle.replace("UNSAFE_", "");
-          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
-          var sortedComponentNames = Array.from(componentNames)
-            .sort()
-            .join(", ");
+var beginFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
 
-          lifecyclesWarningMesages.push(
-            formatted +
-              ": Please update the following components to use " +
-              (suggestion + " instead: " + sortedComponentNames)
-          );
-        }
-      });
+  if (isCommitting && labelsInCurrentCommit.has(label)) {
+    // During the commit phase, we don't show duplicate labels because
+    // there is a fixed overhead for every measurement, and we don't
+    // want to stretch the commit phase beyond necessary.
+    return false;
+  }
+  labelsInCurrentCommit.add(label);
 
-      if (lifecyclesWarningMesages.length > 0) {
-        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
-          strictRoot
-        );
+  var markName = getFiberMarkName(label, debugID);
+  beginMark(markName);
+  return true;
+};
 
-        warning(
-          false,
-          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
-            "\n\n%s" +
-            "\n\nLearn more about this warning here:" +
-            "\nhttps://fb.me/react-strict-mode-warnings",
-          strictRootComponentStack,
-          lifecyclesWarningMesages.join("\n\n")
-        );
-      }
-    });
+var clearFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  clearMark(markName);
+};
 
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+var endFiberMark = function(fiber, phase, warning$$1) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  endMark(label, markName, warning$$1);
+};
 
-  var getStrictRoot = function(fiber) {
-    var maybeStrictRoot = null;
+var shouldIgnoreFiber = function(fiber) {
+  // Host components should be skipped in the timeline.
+  // We could check typeof fiber.type, but does this work with RN?
+  switch (fiber.tag) {
+    case HostRoot:
+    case HostComponent:
+    case HostText:
+    case HostPortal:
+    case CallComponent:
+    case ReturnComponent:
+    case Fragment:
+    case ContextProvider:
+    case ContextConsumer:
+      return true;
+    default:
+      return false;
+  }
+};
 
-    while (fiber !== null) {
-      if (fiber.mode & StrictMode) {
-        maybeStrictRoot = fiber;
-      }
+var clearPendingPhaseMeasurement = function() {
+  if (currentPhase !== null && currentPhaseFiber !== null) {
+    clearFiberMark(currentPhaseFiber, currentPhase);
+  }
+  currentPhaseFiber = null;
+  currentPhase = null;
+  hasScheduledUpdateInCurrentPhase = false;
+};
 
-      fiber = fiber["return"];
+var pauseTimers = function() {
+  // Stops all currently active measurements so that they can be resumed
+  // if we continue in a later deferred loop from the same unit of work.
+  var fiber = currentFiber;
+  while (fiber) {
+    if (fiber._debugIsCurrentlyTiming) {
+      endFiberMark(fiber, null, null);
     }
+    fiber = fiber["return"];
+  }
+};
 
-    return maybeStrictRoot;
-  };
-
-  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
-    if (pendingComponentWillMountWarnings.length > 0) {
-      var uniqueNames = new Set();
-      pendingComponentWillMountWarnings.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
+var resumeTimersRecursively = function(fiber) {
+  if (fiber["return"] !== null) {
+    resumeTimersRecursively(fiber["return"]);
+  }
+  if (fiber._debugIsCurrentlyTiming) {
+    beginFiberMark(fiber, null);
+  }
+};
 
-      var sortedNames = Array.from(uniqueNames)
-        .sort()
-        .join(", ");
+var resumeTimers = function() {
+  // Resumes all measurements that were active during the last deferred loop.
+  if (currentFiber !== null) {
+    resumeTimersRecursively(currentFiber);
+  }
+};
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillMount is deprecated and will be removed in the next major version. " +
-          "Use componentDidMount instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillMount." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        sortedNames
-      );
+function recordEffect() {
+  if (enableUserTimingAPI) {
+    effectCountInCurrentCommit++;
+  }
+}
 
-      pendingComponentWillMountWarnings = [];
+function recordScheduleUpdate() {
+  if (enableUserTimingAPI) {
+    if (isCommitting) {
+      hasScheduledUpdateInCurrentCommit = true;
     }
+    if (
+      currentPhase !== null &&
+      currentPhase !== "componentWillMount" &&
+      currentPhase !== "componentWillReceiveProps"
+    ) {
+      hasScheduledUpdateInCurrentPhase = true;
+    }
+  }
+}
 
-    if (pendingComponentWillReceivePropsWarnings.length > 0) {
-      var _uniqueNames = new Set();
-      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
-        _uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames = Array.from(_uniqueNames)
-        .sort()
-        .join(", ");
+function startRequestCallbackTimer() {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming && !isWaitingForCallback) {
+      isWaitingForCallback = true;
+      beginMark("(Waiting for async callback...)");
+    }
+  }
+}
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
-          "Use static getDerivedStateFromProps instead." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames
+function stopRequestCallbackTimer(didExpire) {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming) {
+      isWaitingForCallback = false;
+      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
+      endMark(
+        "(Waiting for async callback...)",
+        "(Waiting for async callback...)",
+        warning$$1
       );
-
-      pendingComponentWillReceivePropsWarnings = [];
     }
+  }
+}
 
-    if (pendingComponentWillUpdateWarnings.length > 0) {
-      var _uniqueNames2 = new Set();
-      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
-        _uniqueNames2.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames2 = Array.from(_uniqueNames2)
-        .sort()
-        .join(", ");
+function startWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, this is the fiber to unwind from.
+    currentFiber = fiber;
+    if (!beginFiberMark(fiber, null)) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = true;
+  }
+}
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillUpdate is deprecated and will be removed in the next major version. " +
-          "Use componentDidUpdate instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillUpdate." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames2
-      );
+function cancelWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // Remember we shouldn't complete measurement for this fiber.
+    // Otherwise flamechart will be deep even for small updates.
+    fiber._debugIsCurrentlyTiming = false;
+    clearFiberMark(fiber, null);
+  }
+}
 
-      pendingComponentWillUpdateWarnings = [];
+function stopWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
     }
-  };
+    fiber._debugIsCurrentlyTiming = false;
+    endFiberMark(fiber, null, null);
+  }
+}
 
-  ReactStrictModeWarnings.recordDeprecationWarnings = function(
-    fiber,
-    instance
-  ) {
-    // Dedup strategy: Warn once per component.
-    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+function stopFailedWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
       return;
     }
+    fiber._debugIsCurrentlyTiming = false;
+    var warning$$1 = "An error was thrown inside this error boundary";
+    endFiberMark(fiber, null, warning$$1);
+  }
+}
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillMountWarnings.push(fiber);
+function startPhaseTimer(fiber, phase) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (
-      typeof instance.componentWillReceiveProps === "function" &&
-      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillReceivePropsWarnings.push(fiber);
+    clearPendingPhaseMeasurement();
+    if (!beginFiberMark(fiber, phase)) {
+      return;
     }
-    if (typeof instance.componentWillUpdate === "function") {
-      pendingComponentWillUpdateWarnings.push(fiber);
+    currentPhaseFiber = fiber;
+    currentPhase = phase;
+  }
+}
+
+function stopPhaseTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-  };
+    if (currentPhase !== null && currentPhaseFiber !== null) {
+      var warning$$1 = hasScheduledUpdateInCurrentPhase
+        ? "Scheduled a cascading update"
+        : null;
+      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
+    }
+    currentPhase = null;
+    currentPhaseFiber = null;
+  }
+}
 
-  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
-    fiber,
-    instance
-  ) {
-    var strictRoot = getStrictRoot(fiber);
+function startWorkLoopTimer(nextUnitOfWork) {
+  if (enableUserTimingAPI) {
+    currentFiber = nextUnitOfWork;
+    if (!supportsUserTiming) {
+      return;
+    }
+    commitCountInCurrentWorkLoop = 0;
+    // This is top level call.
+    // Any other measurements are performed within.
+    beginMark("(React Tree Reconciliation)");
+    // Resume any measurements that were in progress during the last loop.
+    resumeTimers();
+  }
+}
 
-    // Dedup strategy: Warn once per component.
-    // This is difficult to track any other way since component names
-    // are often vague and are likely to collide between 3rd party libraries.
-    // An expand property is probably okay to use here since it's DEV-only,
-    // and will only be set in the event of serious warnings.
-    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+function stopWorkLoopTimer(interruptedBy) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    var warning$$1 = null;
+    if (interruptedBy !== null) {
+      if (interruptedBy.tag === HostRoot) {
+        warning$$1 = "A top-level update interrupted the previous render";
+      } else {
+        var componentName = getComponentName(interruptedBy) || "Unknown";
+        warning$$1 =
+          "An update to " + componentName + " interrupted the previous render";
+      }
+    } else if (commitCountInCurrentWorkLoop > 1) {
+      warning$$1 = "There were cascading updates";
+    }
+    commitCountInCurrentWorkLoop = 0;
+    // Pause any measurements until the next loop.
+    pauseTimers();
+    endMark(
+      "(React Tree Reconciliation)",
+      "(React Tree Reconciliation)",
+      warning$$1
+    );
+  }
+}
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
-    ) {
+function startCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    isCommitting = true;
+    hasScheduledUpdateInCurrentCommit = false;
+    labelsInCurrentCommit.clear();
+    beginMark("(Committing Changes)");
+  }
+}
 
-    var warningsForRoot = void 0;
-    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
-      warningsForRoot = {
-        UNSAFE_componentWillMount: [],
-        UNSAFE_componentWillReceiveProps: [],
-        UNSAFE_componentWillUpdate: []
-      };
+function stopCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
 
-      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
-    } else {
-      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
+    var warning$$1 = null;
+    if (hasScheduledUpdateInCurrentCommit) {
+      warning$$1 = "Lifecycle hook scheduled a cascading update";
+    } else if (commitCountInCurrentWorkLoop > 0) {
+      warning$$1 = "Caused by a cascading update in earlier commit";
     }
+    hasScheduledUpdateInCurrentCommit = false;
+    commitCountInCurrentWorkLoop++;
+    isCommitting = false;
+    labelsInCurrentCommit.clear();
 
-    var unsafeLifecycles = [];
-    if (
-      typeof instance.componentWillMount === "function" ||
-      typeof instance.UNSAFE_componentWillMount === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillMount");
+    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
+  }
+}
+
+function startCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (
-      typeof instance.componentWillReceiveProps === "function" ||
-      typeof instance.UNSAFE_componentWillReceiveProps === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Host Effects)");
+  }
+}
+
+function stopCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (
-      typeof instance.componentWillUpdate === "function" ||
-      typeof instance.UNSAFE_componentWillUpdate === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Host Effects: " + count + " Total)",
+      "(Committing Host Effects)",
+      null
+    );
+  }
+}
+
+function startCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Calling Lifecycle Methods)");
+  }
+}
 
-    if (unsafeLifecycles.length > 0) {
-      unsafeLifecycles.forEach(function(lifecycle) {
-        warningsForRoot[lifecycle].push(fiber);
-      });
+function stopCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-  };
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Calling Lifecycle Methods: " + count + " Total)",
+      "(Calling Lifecycle Methods)",
+      null
+    );
+  }
 }
 
 var didWarnUpdateInsideUpdate = void 0;
@@ -6172,12 +5847,20 @@ function callGetDerivedStateFromCatch(ctor, capturedValues) {
 }
 
 var ReactFiberClassComponent = function(
+  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
   memoizeState
 ) {
+  var cacheContext = legacyContext.cacheContext,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    isContextConsumer = legacyContext.isContextConsumer,
+    hasContextChanged = legacyContext.hasContextChanged;
+
   // Class component state updater
+
   var updater = {
     isMounted: isMounted,
     enqueueSetState: function(instance, partialState, callback) {
@@ -8310,84 +7993,19 @@ function cloneChildFibers(current, workInProgress) {
     currentChild.pendingProps,
     currentChild.expirationTime
   );
-  workInProgress.child = newChild;
-
-  newChild["return"] = workInProgress;
-  while (currentChild.sibling !== null) {
-    currentChild = currentChild.sibling;
-    newChild = newChild.sibling = createWorkInProgress(
-      currentChild,
-      currentChild.pendingProps,
-      currentChild.expirationTime
-    );
-    newChild["return"] = workInProgress;
-  }
-  newChild.sibling = null;
-}
-
-var changedBitsStack = [];
-var currentValueStack = [];
-var stack = [];
-var index$1 = -1;
-
-var rendererSigil = void 0;
-{
-  // Use this to detect multiple renderers using the same context
-  rendererSigil = {};
-}
-
-function pushProvider(providerFiber) {
-  var context = providerFiber.type.context;
-  index$1 += 1;
-  changedBitsStack[index$1] = context._changedBits;
-  currentValueStack[index$1] = context._currentValue;
-  stack[index$1] = providerFiber;
-  context._currentValue = providerFiber.pendingProps.value;
-  context._changedBits = providerFiber.stateNode;
-
-  {
-    warning(
-      context._currentRenderer === null ||
-        context._currentRenderer === rendererSigil,
-      "Detected multiple renderers concurrently rendering the " +
-        "same context provider. This is currently unsupported."
-    );
-    context._currentRenderer = rendererSigil;
-  }
-}
-
-function popProvider(providerFiber) {
-  {
-    warning(
-      index$1 > -1 && providerFiber === stack[index$1],
-      "Unexpected pop."
-    );
-  }
-  var changedBits = changedBitsStack[index$1];
-  var currentValue = currentValueStack[index$1];
-  changedBitsStack[index$1] = null;
-  currentValueStack[index$1] = null;
-  stack[index$1] = null;
-  index$1 -= 1;
-  var context = providerFiber.type.context;
-  context._currentValue = currentValue;
-  context._changedBits = changedBits;
-}
+  workInProgress.child = newChild;
 
-function resetProviderStack() {
-  for (var i = index$1; i > -1; i--) {
-    var providerFiber = stack[i];
-    var context = providerFiber.type.context;
-    context._currentValue = context._defaultValue;
-    context._changedBits = 0;
-    changedBitsStack[i] = null;
-    currentValueStack[i] = null;
-    stack[i] = null;
-    {
-      context._currentRenderer = null;
-    }
+  newChild["return"] = workInProgress;
+  while (currentChild.sibling !== null) {
+    currentChild = currentChild.sibling;
+    newChild = newChild.sibling = createWorkInProgress(
+      currentChild,
+      currentChild.pendingProps,
+      currentChild.expirationTime
+    );
+    newChild["return"] = workInProgress;
   }
-  index$1 = -1;
+  newChild.sibling = null;
 }
 
 var didWarnAboutBadClass = void 0;
@@ -8403,6 +8021,8 @@ var didWarnAboutStatelessRefs = void 0;
 var ReactFiberBeginWork = function(
   config,
   hostContext,
+  legacyContext,
+  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
@@ -8411,12 +8031,20 @@ var ReactFiberBeginWork = function(
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree;
   var pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer;
+  var pushProvider = newContext.pushProvider;
+  var getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    hasLegacyContextChanged = legacyContext.hasContextChanged,
+    pushLegacyContextProvider = legacyContext.pushContextProvider,
+    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
+    invalidateContextProvider = legacyContext.invalidateContextProvider;
   var enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
 
   var _ReactFiberClassCompo = ReactFiberClassComponent(
+      legacyContext,
       scheduleWork,
       computeExpirationForFiber,
       memoizeProps,
@@ -8484,7 +8112,7 @@ var ReactFiberBeginWork = function(
 
   function updateFragment(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextChildren) {
@@ -8497,7 +8125,7 @@ var ReactFiberBeginWork = function(
 
   function updateMode(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps.children;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (
@@ -8526,7 +8154,7 @@ var ReactFiberBeginWork = function(
     var fn = workInProgress.type;
     var nextProps = workInProgress.pendingProps;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else {
@@ -8559,7 +8187,7 @@ var ReactFiberBeginWork = function(
     // Push context providers early to prevent context stack mismatches.
     // During mounting we don't know the child context yet as the instance doesn't exist.
     // We will invalidate the child context in finishClassComponent() right after rendering.
-    var hasContext = pushContextProvider(workInProgress);
+    var hasContext = pushLegacyContextProvider(workInProgress);
     var shouldUpdate = void 0;
     if (current === null) {
       if (workInProgress.stateNode === null) {
@@ -8784,7 +8412,7 @@ var ReactFiberBeginWork = function(
     var nextProps = workInProgress.pendingProps;
     var prevProps = current !== null ? current.memoizedProps : null;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (memoizedProps === nextProps) {
@@ -8919,7 +8547,7 @@ var ReactFiberBeginWork = function(
       // Push context providers early to prevent context stack mismatches.
       // During mounting we don't know the child context yet as the instance doesn't exist.
       // We will invalidate the child context in finishClassComponent() right after rendering.
-      var hasContext = pushContextProvider(workInProgress);
+      var hasContext = pushLegacyContextProvider(workInProgress);
       adoptClassInstance(workInProgress, value);
       mountClassInstance(workInProgress, renderExpirationTime);
       return finishClassComponent(
@@ -8992,7 +8620,7 @@ var ReactFiberBeginWork = function(
 
   function updateCallComponent(current, workInProgress, renderExpirationTime) {
     var nextProps = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextProps) {
@@ -9035,7 +8663,7 @@ var ReactFiberBeginWork = function(
   ) {
     pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
     var nextChildren = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextChildren) {
@@ -9069,6 +8697,10 @@ var ReactFiberBeginWork = function(
     renderExpirationTime
   ) {
     var fiber = workInProgress.child;
+    if (fiber !== null) {
+      // Set the return pointer of the child to the work-in-progress fiber.
+      fiber["return"] = workInProgress;
+    }
     while (fiber !== null) {
       var nextFiber = void 0;
       // Visit this fiber.
@@ -9161,7 +8793,7 @@ var ReactFiberBeginWork = function(
     var newProps = workInProgress.pendingProps;
     var oldProps = workInProgress.memoizedProps;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (oldProps === newProps) {
@@ -9257,7 +8889,7 @@ var ReactFiberBeginWork = function(
     var newValue = context._currentValue;
     var changedBits = context._changedBits;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (changedBits === 0 && oldProps === newProps) {
@@ -9354,7 +8986,7 @@ var ReactFiberBeginWork = function(
         pushHostRootContext(workInProgress);
         break;
       case ClassComponent:
-        pushContextProvider(workInProgress);
+        pushLegacyContextProvider(workInProgress);
         break;
       case HostPortal:
         pushHostContainer(
@@ -9467,7 +9099,13 @@ var ReactFiberBeginWork = function(
   };
 };
 
-var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
+var ReactFiberCompleteWork = function(
+  config,
+  hostContext,
+  legacyContext,
+  newContext,
+  hydrationContext
+) {
   var createInstance = config.createInstance,
     createTextInstance = config.createTextInstance,
     appendInitialChild = config.appendInitialChild,
@@ -9479,6 +9117,9 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer;
+  var popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
+  var popProvider = newContext.popProvider;
   var prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -9794,7 +9435,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
         return null;
       case ClassComponent: {
         // We are leaving this subtree, so pop context if any.
-        popContextProvider(workInProgress);
+        popLegacyContextProvider(workInProgress);
 
         // If this component caught an error, schedule an error log effect.
         var instance = workInProgress.stateNode;
@@ -9813,7 +9454,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
       }
       case HostRoot: {
         popHostContainer(workInProgress);
-        popTopLevelContextObject(workInProgress);
+        popTopLevelLegacyContextObject(workInProgress);
         var fiberRoot = workInProgress.stateNode;
         if (fiberRoot.pendingContext) {
           fiberRoot.context = fiberRoot.pendingContext;
@@ -10040,11 +9681,16 @@ function createCapturedValue(value, source) {
 
 var ReactFiberUnwindWork = function(
   hostContext,
+  legacyContext,
+  newContext,
   scheduleWork,
   isAlreadyFailedLegacyErrorBoundary
 ) {
   var popHostContainer = hostContext.popHostContainer,
     popHostContext = hostContext.popHostContext;
+  var popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
+  var popProvider = newContext.popProvider;
 
   function throwException(returnFiber, sourceFiber, rawValue) {
     // The source fiber did not complete.
@@ -10100,7 +9746,7 @@ var ReactFiberUnwindWork = function(
   function unwindWork(workInProgress) {
     switch (workInProgress.tag) {
       case ClassComponent: {
-        popContextProvider(workInProgress);
+        popLegacyContextProvider(workInProgress);
         var effectTag = workInProgress.effectTag;
         if (effectTag & ShouldCapture) {
           workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
@@ -10110,7 +9756,7 @@ var ReactFiberUnwindWork = function(
       }
       case HostRoot: {
         popHostContainer(workInProgress);
-        popTopLevelContextObject(workInProgress);
+        popTopLevelLegacyContextObject(workInProgress);
         var _effectTag = workInProgress.effectTag;
         if (_effectTag & ShouldCapture) {
           workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
@@ -10132,9 +9778,37 @@ var ReactFiberUnwindWork = function(
         return null;
     }
   }
+
+  function unwindInterruptedWork(interruptedWork) {
+    switch (interruptedWork.tag) {
+      case ClassComponent: {
+        popLegacyContextProvider(interruptedWork);
+        break;
+      }
+      case HostRoot: {
+        popHostContainer(interruptedWork);
+        popTopLevelLegacyContextObject(interruptedWork);
+        break;
+      }
+      case HostComponent: {
+        popHostContext(interruptedWork);
+        break;
+      }
+      case HostPortal:
+        popHostContainer(interruptedWork);
+        break;
+      case ContextProvider:
+        popProvider(interruptedWork);
+        break;
+      default:
+        break;
+    }
+  }
+
   return {
     throwException: throwException,
-    unwindWork: unwindWork
+    unwindWork: unwindWork,
+    unwindInterruptedWork: unwindInterruptedWork
   };
 };
 
@@ -10466,7 +10140,7 @@ var ReactFiberCommitWork = function(
             warning(
               false,
               "Unexpected ref object provided for %s. " +
-                "Use either a ref-setter function or Reacte.createRef().%s",
+                "Use either a ref-setter function or React.createRef().%s",
               getComponentName(finishedWork),
               getStackAddendumByWorkInProgressFiber(finishedWork)
             );
@@ -10972,9 +10646,12 @@ var ReactFiberCommitWork = function(
 
 var NO_CONTEXT = {};
 
-var ReactFiberHostContext = function(config) {
+var ReactFiberHostContext = function(config, stack) {
   var getChildHostContext = config.getChildHostContext,
     getRootHostContext = config.getRootHostContext;
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
 
   var contextStackCursor = createCursor(NO_CONTEXT);
   var contextFiberStackCursor = createCursor(NO_CONTEXT);
@@ -11045,19 +10722,13 @@ var ReactFiberHostContext = function(config) {
     pop(contextFiberStackCursor, fiber);
   }
 
-  function resetHostContainer() {
-    contextStackCursor.current = NO_CONTEXT;
-    rootInstanceStackCursor.current = NO_CONTEXT;
-  }
-
   return {
     getHostContext: getHostContext,
     getRootHostContainer: getRootHostContainer,
     popHostContainer: popHostContainer,
     popHostContext: popHostContext,
     pushHostContainer: pushHostContainer,
-    pushHostContext: pushHostContext,
-    resetHostContainer: resetHostContainer
+    pushHostContext: pushHostContext
   };
 };
 
@@ -11427,6 +11098,425 @@ var ReactFiberInstrumentation = {
 
 var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
 
+var warnedAboutMissingGetChildContext = void 0;
+
+{
+  warnedAboutMissingGetChildContext = {};
+}
+
+var ReactFiberLegacyContext = function(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
+
+  // A cursor to the current merged context object on the stack.
+
+  var contextStackCursor = createCursor(emptyObject);
+  // A cursor to a boolean indicating whether the context has changed.
+  var didPerformWorkStackCursor = createCursor(false);
+  // Keep track of the previous context object that was on the stack.
+  // We use this to get access to the parent context after we have already
+  // pushed the next context provider, and now need to merge their contexts.
+  var previousContext = emptyObject;
+
+  function getUnmaskedContext(workInProgress) {
+    var hasOwnContext = isContextProvider(workInProgress);
+    if (hasOwnContext) {
+      // If the fiber is a context provider itself, when we read its context
+      // we have already pushed its own child context on the stack. A context
+      // provider should not "see" its own child context. Therefore we read the
+      // previous (parent) context instead for a context provider.
+      return previousContext;
+    }
+    return contextStackCursor.current;
+  }
+
+  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+    var instance = workInProgress.stateNode;
+    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  }
+
+  function getMaskedContext(workInProgress, unmaskedContext) {
+    var type = workInProgress.type;
+    var contextTypes = type.contextTypes;
+    if (!contextTypes) {
+      return emptyObject;
+    }
+
+    // Avoid recreating masked context unless unmasked context has changed.
+    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+    // This may trigger infinite loops if componentWillReceiveProps calls setState.
+    var instance = workInProgress.stateNode;
+    if (
+      instance &&
+      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+    ) {
+      return instance.__reactInternalMemoizedMaskedChildContext;
+    }
+
+    var context = {};
+    for (var key in contextTypes) {
+      context[key] = unmaskedContext[key];
+    }
+
+    {
+      var name = getComponentName(workInProgress) || "Unknown";
+      checkPropTypes(
+        contextTypes,
+        context,
+        "context",
+        name,
+        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      );
+    }
+
+    // Cache unmasked context so we can avoid recreating masked context unless necessary.
+    // Context is created before the class component is instantiated so check for instance.
+    if (instance) {
+      cacheContext(workInProgress, unmaskedContext, context);
+    }
+
+    return context;
+  }
+
+  function hasContextChanged() {
+    return didPerformWorkStackCursor.current;
+  }
+
+  function isContextConsumer(fiber) {
+    return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
+  }
+
+  function isContextProvider(fiber) {
+    return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
+  }
+
+  function popContextProvider(fiber) {
+    if (!isContextProvider(fiber)) {
+      return;
+    }
+
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
+
+  function popTopLevelContextObject(fiber) {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
+
+  function pushTopLevelContextObject(fiber, context, didChange) {
+    invariant(
+      contextStackCursor.cursor == null,
+      "Unexpected context found on stack. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+
+    push(contextStackCursor, context, fiber);
+    push(didPerformWorkStackCursor, didChange, fiber);
+  }
+
+  function processChildContext(fiber, parentContext) {
+    var instance = fiber.stateNode;
+    var childContextTypes = fiber.type.childContextTypes;
+
+    // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
+    if (typeof instance.getChildContext !== "function") {
+      {
+        var componentName = getComponentName(fiber) || "Unknown";
+
+        if (!warnedAboutMissingGetChildContext[componentName]) {
+          warnedAboutMissingGetChildContext[componentName] = true;
+          warning(
+            false,
+            "%s.childContextTypes is specified but there is no getChildContext() method " +
+              "on the instance. You can either define getChildContext() on %s or remove " +
+              "childContextTypes from it.",
+            componentName,
+            componentName
+          );
+        }
+      }
+      return parentContext;
+    }
+
+    var childContext = void 0;
+    {
+      ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
+    }
+    startPhaseTimer(fiber, "getChildContext");
+    childContext = instance.getChildContext();
+    stopPhaseTimer();
+    {
+      ReactDebugCurrentFiber.setCurrentPhase(null);
+    }
+    for (var contextKey in childContext) {
+      invariant(
+        contextKey in childContextTypes,
+        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+        getComponentName(fiber) || "Unknown",
+        contextKey
+      );
+    }
+    {
+      var name = getComponentName(fiber) || "Unknown";
+      checkPropTypes(
+        childContextTypes,
+        childContext,
+        "child context",
+        name,
+        // In practice, there is one case in which we won't get a stack. It's when
+        // somebody calls unstable_renderSubtreeIntoContainer() and we process
+        // context from the parent component instance. The stack will be missing
+        // because it's outside of the reconciliation, and so the pointer has not
+        // been set. This is rare and doesn't matter. We'll also remove that API.
+        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      );
+    }
+
+    return Object.assign({}, parentContext, childContext);
+  }
+
+  function pushContextProvider(workInProgress) {
+    if (!isContextProvider(workInProgress)) {
+      return false;
+    }
+
+    var instance = workInProgress.stateNode;
+    // We push the context as early as possible to ensure stack integrity.
+    // If the instance does not exist yet, we will push null at first,
+    // and replace it on the stack later when invalidating the context.
+    var memoizedMergedChildContext =
+      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+      emptyObject;
+
+    // Remember the parent context so we can merge with it later.
+    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+    previousContext = contextStackCursor.current;
+    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+    push(
+      didPerformWorkStackCursor,
+      didPerformWorkStackCursor.current,
+      workInProgress
+    );
+
+    return true;
+  }
+
+  function invalidateContextProvider(workInProgress, didChange) {
+    var instance = workInProgress.stateNode;
+    invariant(
+      instance,
+      "Expected to have an instance by this point. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+
+    if (didChange) {
+      // Merge parent and own context.
+      // Skip this if we're not updating due to sCU.
+      // This avoids unnecessarily recomputing memoized values.
+      var mergedContext = processChildContext(workInProgress, previousContext);
+      instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+
+      // Replace the old (or empty) context with the new one.
+      // It is important to unwind the context in the reverse order.
+      pop(didPerformWorkStackCursor, workInProgress);
+      pop(contextStackCursor, workInProgress);
+      // Now push the new context and mark that it has changed.
+      push(contextStackCursor, mergedContext, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    } else {
+      pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    }
+  }
+
+  function findCurrentUnmaskedContext(fiber) {
+    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+    // makes sense elsewhere
+    invariant(
+      isFiberMounted(fiber) && fiber.tag === ClassComponent,
+      "Expected subtree parent to be a mounted class component. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+
+    var node = fiber;
+    while (node.tag !== HostRoot) {
+      if (isContextProvider(node)) {
+        return node.stateNode.__reactInternalMemoizedMergedChildContext;
+      }
+      var parent = node["return"];
+      invariant(
+        parent,
+        "Found unexpected detached subtree parent. " +
+          "This error is likely caused by a bug in React. Please file an issue."
+      );
+      node = parent;
+    }
+    return node.stateNode.context;
+  }
+
+  return {
+    getUnmaskedContext: getUnmaskedContext,
+    cacheContext: cacheContext,
+    getMaskedContext: getMaskedContext,
+    hasContextChanged: hasContextChanged,
+    isContextConsumer: isContextConsumer,
+    isContextProvider: isContextProvider,
+    popContextProvider: popContextProvider,
+    popTopLevelContextObject: popTopLevelContextObject,
+    pushTopLevelContextObject: pushTopLevelContextObject,
+    processChildContext: processChildContext,
+    pushContextProvider: pushContextProvider,
+    invalidateContextProvider: invalidateContextProvider,
+    findCurrentUnmaskedContext: findCurrentUnmaskedContext
+  };
+};
+
+var ReactFiberNewContext = function(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
+
+  var providerCursor = createCursor(null);
+  var valueCursor = createCursor(null);
+  var changedBitsCursor = createCursor(0);
+
+  var rendererSigil = void 0;
+  {
+    // Use this to detect multiple renderers using the same context
+    rendererSigil = {};
+  }
+
+  function pushProvider(providerFiber) {
+    var context = providerFiber.type.context;
+
+    push(changedBitsCursor, context._changedBits, providerFiber);
+    push(valueCursor, context._currentValue, providerFiber);
+    push(providerCursor, providerFiber, providerFiber);
+
+    context._currentValue = providerFiber.pendingProps.value;
+    context._changedBits = providerFiber.stateNode;
+
+    {
+      warning(
+        context._currentRenderer === null ||
+          context._currentRenderer === rendererSigil,
+        "Detected multiple renderers concurrently rendering the " +
+          "same context provider. This is currently unsupported."
+      );
+      context._currentRenderer = rendererSigil;
+    }
+  }
+
+  function popProvider(providerFiber) {
+    var changedBits = changedBitsCursor.current;
+    var currentValue = valueCursor.current;
+
+    pop(providerCursor, providerFiber);
+    pop(valueCursor, providerFiber);
+    pop(changedBitsCursor, providerFiber);
+
+    var context = providerFiber.type.context;
+    context._currentValue = currentValue;
+    context._changedBits = changedBits;
+  }
+
+  return {
+    pushProvider: pushProvider,
+    popProvider: popProvider
+  };
+};
+
+var ReactFiberStack = function() {
+  var valueStack = [];
+
+  var fiberStack = void 0;
+
+  {
+    fiberStack = [];
+  }
+
+  var index = -1;
+
+  function createCursor(defaultValue) {
+    return {
+      current: defaultValue
+    };
+  }
+
+  function isEmpty() {
+    return index === -1;
+  }
+
+  function pop(cursor, fiber) {
+    if (index < 0) {
+      {
+        warning(false, "Unexpected pop.");
+      }
+      return;
+    }
+
+    {
+      if (fiber !== fiberStack[index]) {
+        warning(false, "Unexpected Fiber popped.");
+      }
+    }
+
+    cursor.current = valueStack[index];
+
+    valueStack[index] = null;
+
+    {
+      fiberStack[index] = null;
+    }
+
+    index--;
+  }
+
+  function push(cursor, value, fiber) {
+    index++;
+
+    valueStack[index] = cursor.current;
+
+    {
+      fiberStack[index] = fiber;
+    }
+
+    cursor.current = value;
+  }
+
+  function checkThatStackIsEmpty() {
+    {
+      if (index !== -1) {
+        warning(
+          false,
+          "Expected an empty stack. Something was not reset properly."
+        );
+      }
+    }
+  }
+
+  function resetStackAfterFatalErrorInDev() {
+    {
+      index = -1;
+      valueStack.length = 0;
+      fiberStack.length = 0;
+    }
+  }
+
+  return {
+    createCursor: createCursor,
+    isEmpty: isEmpty,
+    pop: pop,
+    push: push,
+    checkThatStackIsEmpty: checkThatStackIsEmpty,
+    resetStackAfterFatalErrorInDev: resetStackAfterFatalErrorInDev
+  };
+};
+
 var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError = ReactErrorUtils.hasCaughtError;
 var clearCaughtError = ReactErrorUtils.clearCaughtError;
@@ -11487,16 +11577,23 @@ var warnAboutInvalidUpdates = void 0;
 }
 
 var ReactFiberScheduler = function(config) {
-  var hostContext = ReactFiberHostContext(config);
+  var stack = ReactFiberStack();
+  var hostContext = ReactFiberHostContext(config, stack);
+  var legacyContext = ReactFiberLegacyContext(stack);
+  var newContext = ReactFiberNewContext(stack);
   var popHostContext = hostContext.popHostContext,
     popHostContainer = hostContext.popHostContainer;
+  var popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popLegacyContextProvider = legacyContext.popContextProvider;
+  var popProvider = newContext.popProvider;
 
   var hydrationContext = ReactFiberHydrationContext(config);
-  var resetHostContainer = hostContext.resetHostContainer;
 
   var _ReactFiberBeginWork = ReactFiberBeginWork(
       config,
       hostContext,
+      legacyContext,
+      newContext,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
@@ -11506,17 +11603,22 @@ var ReactFiberScheduler = function(config) {
   var _ReactFiberCompleteWo = ReactFiberCompleteWork(
       config,
       hostContext,
+      legacyContext,
+      newContext,
       hydrationContext
     ),
     completeWork = _ReactFiberCompleteWo.completeWork;
 
   var _ReactFiberUnwindWork = ReactFiberUnwindWork(
       hostContext,
+      legacyContext,
+      newContext,
       scheduleWork,
       isAlreadyFailedLegacyErrorBoundary
     ),
     throwException = _ReactFiberUnwindWork.throwException,
-    unwindWork = _ReactFiberUnwindWork.unwindWork;
+    unwindWork = _ReactFiberUnwindWork.unwindWork,
+    unwindInterruptedWork = _ReactFiberUnwindWork.unwindInterruptedWork;
 
   var _ReactFiberCommitWork = ReactFiberCommitWork(
       config,
@@ -11585,13 +11687,13 @@ var ReactFiberScheduler = function(config) {
       switch (failedUnitOfWork.tag) {
         case HostRoot:
           popHostContainer(failedUnitOfWork);
-          popTopLevelContextObject(failedUnitOfWork);
+          popTopLevelLegacyContextObject(failedUnitOfWork);
           break;
         case HostComponent:
           popHostContext(failedUnitOfWork);
           break;
         case ClassComponent:
-          popContextProvider(failedUnitOfWork);
+          popLegacyContextProvider(failedUnitOfWork);
           break;
         case HostPortal:
           popHostContainer(failedUnitOfWork);
@@ -11611,18 +11713,18 @@ var ReactFiberScheduler = function(config) {
     };
   }
 
-  function resetContextStack() {
-    // Reset the stack
-    reset();
-    // Reset the cursors
-    resetContext();
-    resetHostContainer();
-
-    // TODO: Unify new context implementation with other stacks
-    resetProviderStack();
+  function resetStack() {
+    if (nextUnitOfWork !== null) {
+      var interruptedWork = nextUnitOfWork["return"];
+      while (interruptedWork !== null) {
+        unwindInterruptedWork(interruptedWork);
+        interruptedWork = interruptedWork["return"];
+      }
+    }
 
     {
       ReactStrictModeWarnings.discardPendingWarnings();
+      stack.checkThatStackIsEmpty();
     }
 
     nextRoot = null;
@@ -12146,7 +12248,7 @@ var ReactFiberScheduler = function(config) {
       nextUnitOfWork === null
     ) {
       // Reset the stack and start working from the root.
-      resetContextStack();
+      resetStack();
       nextRoot = root;
       nextRenderExpirationTime = expirationTime;
       nextUnitOfWork = createWorkInProgress(
@@ -12199,6 +12301,9 @@ var ReactFiberScheduler = function(config) {
     // Yield back to main thread.
     if (didFatal) {
       // There was a fatal error.
+      {
+        stack.resetStackAfterFatalErrorInDev();
+      }
       return null;
     } else if (nextUnitOfWork === null) {
       // We reached the root.
@@ -12399,7 +12504,7 @@ var ReactFiberScheduler = function(config) {
           ) {
             // This is an interruption. (Used for performance tracking.)
             interruptedBy = fiber;
-            resetContextStack();
+            resetStack();
           }
           if (nextRoot !== root || !isWorking) {
             requestWork(root, expirationTime);
@@ -12970,7 +13075,8 @@ var ReactFiberScheduler = function(config) {
     syncUpdates: syncUpdates,
     interactiveUpdates: interactiveUpdates,
     flushInteractiveUpdates: flushInteractiveUpdates,
-    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration
+    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration,
+    legacyContext: legacyContext
   };
 };
 
@@ -12983,18 +13089,6 @@ var didWarnAboutNestedUpdates = void 0;
 // 0 is PROD, 1 is DEV.
 // Might add PROFILE later.
 
-function getContextForSubtree(parentComponent) {
-  if (!parentComponent) {
-    return emptyObject;
-  }
-
-  var fiber = get(parentComponent);
-  var parentContext = findCurrentUnmaskedContext(fiber);
-  return isContextProvider(fiber)
-    ? processChildContext(fiber, parentContext)
-    : parentContext;
-}
-
 var ReactFiberReconciler$1 = function(config) {
   var getPublicInstance = config.getPublicInstance;
 
@@ -13013,7 +13107,24 @@ var ReactFiberReconciler$1 = function(config) {
     deferredUpdates = _ReactFiberScheduler.deferredUpdates,
     syncUpdates = _ReactFiberScheduler.syncUpdates,
     interactiveUpdates = _ReactFiberScheduler.interactiveUpdates,
-    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates;
+    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates,
+    legacyContext = _ReactFiberScheduler.legacyContext;
+
+  var findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
+    isContextProvider = legacyContext.isContextProvider,
+    processChildContext = legacyContext.processChildContext;
+
+  function getContextForSubtree(parentComponent) {
+    if (!parentComponent) {
+      return emptyObject;
+    }
+
+    var fiber = get(parentComponent);
+    var parentContext = findCurrentUnmaskedContext(fiber);
+    return isContextProvider(fiber)
+      ? processChildContext(fiber, parentContext)
+      : parentContext;
+  }
 
   function scheduleRootUpdate(
     current,
diff --git a/Libraries/Renderer/ReactFabric-prod.js b/Libraries/Renderer/ReactFabric-prod.js
index 637481f04146cb..08f112c70d4570 100644
--- a/Libraries/Renderer/ReactFabric-prod.js
+++ b/Libraries/Renderer/ReactFabric-prod.js
@@ -1633,136 +1633,6 @@ function findCurrentHostFiberWithNoPortals(parent) {
   }
   return null;
 }
-var valueStack = [],
-  index = -1;
-function pop(cursor) {
-  0 > index ||
-    ((cursor.current = valueStack[index]), (valueStack[index] = null), index--);
-}
-function push(cursor, value) {
-  index++;
-  valueStack[index] = cursor.current;
-  cursor.current = value;
-}
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  do {
-    a: switch (workInProgress.tag) {
-      case 0:
-      case 1:
-      case 2:
-      case 5:
-        var owner = workInProgress._debugOwner,
-          source = workInProgress._debugSource;
-        var JSCompiler_inline_result = getComponentName(workInProgress);
-        var ownerName = null;
-        owner && (ownerName = getComponentName(owner));
-        owner = source;
-        JSCompiler_inline_result =
-          "\n    in " +
-          (JSCompiler_inline_result || "Unknown") +
-          (owner
-            ? " (at " +
-              owner.fileName.replace(/^.*[\\\/]/, "") +
-              ":" +
-              owner.lineNumber +
-              ")"
-            : ownerName ? " (created by " + ownerName + ")" : "");
-        break a;
-      default:
-        JSCompiler_inline_result = "";
-    }
-    info += JSCompiler_inline_result;
-    workInProgress = workInProgress["return"];
-  } while (workInProgress);
-  return info;
-}
-new Set();
-var contextStackCursor = { current: emptyObject },
-  didPerformWorkStackCursor = { current: !1 },
-  previousContext = emptyObject;
-function getUnmaskedContext(workInProgress) {
-  return isContextProvider(workInProgress)
-    ? previousContext
-    : contextStackCursor.current;
-}
-function getMaskedContext(workInProgress, unmaskedContext) {
-  var contextTypes = workInProgress.type.contextTypes;
-  if (!contextTypes) return emptyObject;
-  var instance = workInProgress.stateNode;
-  if (
-    instance &&
-    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-  )
-    return instance.__reactInternalMemoizedMaskedChildContext;
-  var context = {},
-    key;
-  for (key in contextTypes) context[key] = unmaskedContext[key];
-  instance &&
-    ((workInProgress = workInProgress.stateNode),
-    (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
-    (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
-  return context;
-}
-function isContextProvider(fiber) {
-  return 2 === fiber.tag && null != fiber.type.childContextTypes;
-}
-function popContextProvider(fiber) {
-  isContextProvider(fiber) &&
-    (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
-}
-function pushTopLevelContextObject(fiber, context, didChange) {
-  invariant(
-    null == contextStackCursor.cursor,
-    "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
-  );
-  push(contextStackCursor, context, fiber);
-  push(didPerformWorkStackCursor, didChange, fiber);
-}
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode,
-    childContextTypes = fiber.type.childContextTypes;
-  if ("function" !== typeof instance.getChildContext) return parentContext;
-  instance = instance.getChildContext();
-  for (var contextKey in instance)
-    invariant(
-      contextKey in childContextTypes,
-      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
-      contextKey
-    );
-  return Object.assign({}, parentContext, instance);
-}
-function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) return !1;
-  var instance = workInProgress.stateNode;
-  instance =
-    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
-  previousContext = contextStackCursor.current;
-  push(contextStackCursor, instance, workInProgress);
-  push(
-    didPerformWorkStackCursor,
-    didPerformWorkStackCursor.current,
-    workInProgress
-  );
-  return !0;
-}
-function invalidateContextProvider(workInProgress, didChange) {
-  var instance = workInProgress.stateNode;
-  invariant(
-    instance,
-    "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
-  );
-  if (didChange) {
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    push(contextStackCursor, mergedContext, workInProgress);
-  } else pop(didPerformWorkStackCursor, workInProgress);
-  push(didPerformWorkStackCursor, didChange, workInProgress);
-}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -1929,6 +1799,40 @@ function onCommitRoot(root) {
 function onCommitUnmount(fiber) {
   "function" === typeof onCommitFiberUnmount && onCommitFiberUnmount(fiber);
 }
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  do {
+    a: switch (workInProgress.tag) {
+      case 0:
+      case 1:
+      case 2:
+      case 5:
+        var owner = workInProgress._debugOwner,
+          source = workInProgress._debugSource;
+        var JSCompiler_inline_result = getComponentName(workInProgress);
+        var ownerName = null;
+        owner && (ownerName = getComponentName(owner));
+        owner = source;
+        JSCompiler_inline_result =
+          "\n    in " +
+          (JSCompiler_inline_result || "Unknown") +
+          (owner
+            ? " (at " +
+              owner.fileName.replace(/^.*[\\\/]/, "") +
+              ":" +
+              owner.lineNumber +
+              ")"
+            : ownerName ? " (created by " + ownerName + ")" : "");
+        break a;
+      default:
+        JSCompiler_inline_result = "";
+    }
+    info += JSCompiler_inline_result;
+    workInProgress = workInProgress["return"];
+  } while (workInProgress);
+  return info;
+}
+new Set();
 function createUpdateQueue(baseState) {
   return {
     baseState: baseState,
@@ -2084,6 +1988,7 @@ function commitCallbacks(queue, context) {
     }
 }
 function ReactFiberClassComponent(
+  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
@@ -2140,62 +2045,66 @@ function ReactFiberClassComponent(
         workInProgress.memoizedState
       );
   }
-  var updater = {
-    isMounted: isMounted,
-    enqueueSetState: function(instance, partialState, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: partialState,
-        callback: callback,
-        isReplace: !1,
-        isForced: !1,
-        capturedValue: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    },
-    enqueueReplaceState: function(instance, state, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: state,
-        callback: callback,
-        isReplace: !0,
-        isForced: !1,
-        capturedValue: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    },
-    enqueueForceUpdate: function(instance, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: null,
-        callback: callback,
-        isReplace: !1,
-        isForced: !0,
-        capturedValue: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    }
-  };
+  var cacheContext = legacyContext.cacheContext,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    isContextConsumer = legacyContext.isContextConsumer,
+    hasContextChanged = legacyContext.hasContextChanged,
+    updater = {
+      isMounted: isMounted,
+      enqueueSetState: function(instance, partialState, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: partialState,
+          callback: callback,
+          isReplace: !1,
+          isForced: !1,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      },
+      enqueueReplaceState: function(instance, state, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: state,
+          callback: callback,
+          isReplace: !0,
+          isForced: !1,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      },
+      enqueueForceUpdate: function(instance, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: null,
+          callback: callback,
+          isReplace: !1,
+          isForced: !0,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      }
+    };
   return {
     adoptClassInstance: adoptClassInstance,
     callGetDerivedStateFromProps: callGetDerivedStateFromProps,
     constructClassInstance: function(workInProgress, props) {
       var ctor = workInProgress.type,
         unmaskedContext = getUnmaskedContext(workInProgress),
-        needsContext =
-          2 === workInProgress.tag && null != workInProgress.type.contextTypes,
+        needsContext = isContextConsumer(workInProgress),
         context = needsContext
           ? getMaskedContext(workInProgress, unmaskedContext)
           : emptyObject;
@@ -2212,10 +2121,7 @@ function ReactFiberClassComponent(
           workInProgress.memoizedState,
           props
         ));
-      needsContext &&
-        ((workInProgress = workInProgress.stateNode),
-        (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
-        (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
+      needsContext && cacheContext(workInProgress, unmaskedContext, context);
       return ctor;
     },
     mountClassInstance: function(workInProgress, renderExpirationTime) {
@@ -2300,7 +2206,7 @@ function ReactFiberClassComponent(
         !(
           oldProps !== newProps ||
           oldState !== renderExpirationTime ||
-          didPerformWorkStackCursor.current ||
+          hasContextChanged() ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -2389,7 +2295,7 @@ function ReactFiberClassComponent(
         !(
           oldProps !== newProps ||
           oldContext !== renderExpirationTime ||
-          didPerformWorkStackCursor.current ||
+          hasContextChanged() ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -3112,34 +3018,12 @@ function ChildReconciler(shouldTrackSideEffects) {
   };
 }
 var reconcileChildFibers = ChildReconciler(!0),
-  mountChildFibers = ChildReconciler(!1),
-  changedBitsStack = [],
-  currentValueStack = [],
-  stack = [],
-  index$1 = -1;
-function pushProvider(providerFiber) {
-  var context = providerFiber.type.context;
-  index$1 += 1;
-  changedBitsStack[index$1] = context._changedBits;
-  currentValueStack[index$1] = context._currentValue;
-  stack[index$1] = providerFiber;
-  context._currentValue = providerFiber.pendingProps.value;
-  context._changedBits = providerFiber.stateNode;
-}
-function popProvider(providerFiber) {
-  var changedBits = changedBitsStack[index$1],
-    currentValue = currentValueStack[index$1];
-  changedBitsStack[index$1] = null;
-  currentValueStack[index$1] = null;
-  stack[index$1] = null;
-  --index$1;
-  providerFiber = providerFiber.type.context;
-  providerFiber._currentValue = currentValue;
-  providerFiber._changedBits = changedBits;
-}
+  mountChildFibers = ChildReconciler(!1);
 function ReactFiberBeginWork(
   config,
   hostContext,
+  legacyContext,
+  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
@@ -3236,7 +3120,12 @@ function ReactFiberBeginWork(
     changedBits,
     renderExpirationTime
   ) {
-    for (var fiber = workInProgress.child; null !== fiber; ) {
+    var fiber = workInProgress.child;
+    for (
+      null !== fiber && (fiber["return"] = workInProgress);
+      null !== fiber;
+
+    ) {
       switch (fiber.tag) {
         case 12:
           var nextFiber = fiber.stateNode | 0;
@@ -3295,7 +3184,7 @@ function ReactFiberBeginWork(
     var context = workInProgress.type.context,
       newProps = workInProgress.pendingProps,
       oldProps = workInProgress.memoizedProps;
-    if (!didPerformWorkStackCursor.current && oldProps === newProps)
+    if (!hasLegacyContextChanged() && oldProps === newProps)
       return (
         (workInProgress.stateNode = 0),
         pushProvider(workInProgress),
@@ -3382,11 +3271,19 @@ function ReactFiberBeginWork(
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree,
     pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer,
+    pushProvider = newContext.pushProvider,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    hasLegacyContextChanged = legacyContext.hasContextChanged,
+    pushLegacyContextProvider = legacyContext.pushContextProvider,
+    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
+    invalidateContextProvider = legacyContext.invalidateContextProvider,
     enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
   config = ReactFiberClassComponent(
+    legacyContext,
     scheduleWork,
     computeExpirationForFiber,
     function(workInProgress, nextProps) {
@@ -3413,7 +3310,7 @@ function ReactFiberBeginWork(
             pushHostRootContext(workInProgress);
             break;
           case 2:
-            pushContextProvider(workInProgress);
+            pushLegacyContextProvider(workInProgress);
             break;
           case 4:
             pushHostContainer(
@@ -3459,7 +3356,7 @@ function ReactFiberBeginWork(
                     workInProgress.memoizedState,
                     props
                   ))),
-              (props = pushContextProvider(workInProgress)),
+              (props = pushLegacyContextProvider(workInProgress)),
               adoptClassInstance(workInProgress, fn),
               mountClassInstance(workInProgress, renderExpirationTime),
               (current = finishClassComponent(
@@ -3479,7 +3376,7 @@ function ReactFiberBeginWork(
           return (
             (props = workInProgress.type),
             (renderExpirationTime = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? ((fn = getUnmaskedContext(workInProgress)),
                 (fn = getMaskedContext(workInProgress, fn)),
@@ -3495,7 +3392,7 @@ function ReactFiberBeginWork(
             current
           );
         case 2:
-          props = pushContextProvider(workInProgress);
+          props = pushLegacyContextProvider(workInProgress);
           null === current
             ? null === workInProgress.stateNode
               ? (constructClassInstance(
@@ -3577,7 +3474,7 @@ function ReactFiberBeginWork(
             updateQueue = workInProgress.memoizedProps;
             fn = workInProgress.pendingProps;
             unmaskedContext = null !== current ? current.memoizedProps : null;
-            if (!didPerformWorkStackCursor.current && updateQueue === fn) {
+            if (!hasLegacyContextChanged() && updateQueue === fn) {
               if (
                 (updateQueue =
                   workInProgress.mode & 1 &&
@@ -3619,7 +3516,7 @@ function ReactFiberBeginWork(
         case 7:
           return (
             (props = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
               workInProgress.memoizedProps !== props ||
               (props = workInProgress.memoizedProps),
             (fn = props.children),
@@ -3649,8 +3546,7 @@ function ReactFiberBeginWork(
               workInProgress.stateNode.containerInfo
             ),
             (props = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
-            workInProgress.memoizedProps !== props
+            hasLegacyContextChanged() || workInProgress.memoizedProps !== props
               ? (null === current
                   ? (workInProgress.child = reconcileChildFibers(
                       workInProgress,
@@ -3681,7 +3577,7 @@ function ReactFiberBeginWork(
         case 10:
           return (
             (renderExpirationTime = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? (reconcileChildren(
                   current,
@@ -3699,7 +3595,7 @@ function ReactFiberBeginWork(
         case 11:
           return (
             (renderExpirationTime = workInProgress.pendingProps.children),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             (null !== renderExpirationTime &&
               workInProgress.memoizedProps !== renderExpirationTime)
               ? (reconcileChildren(
@@ -3729,7 +3625,7 @@ function ReactFiberBeginWork(
             props = fn._currentValue;
             var changedBits = fn._changedBits;
             if (
-              didPerformWorkStackCursor.current ||
+              hasLegacyContextChanged() ||
               0 !== changedBits ||
               updateQueue !== unmaskedContext
             ) {
@@ -3769,7 +3665,13 @@ function ReactFiberBeginWork(
     }
   };
 }
-function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
+function ReactFiberCompleteWork(
+  config,
+  hostContext,
+  legacyContext,
+  newContext,
+  hydrationContext
+) {
   function markUpdate(workInProgress) {
     workInProgress.effectTag |= 4;
   }
@@ -3802,6 +3704,9 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer,
+    popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popProvider = newContext.popProvider,
     prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -3901,7 +3806,7 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           return null;
         case 2:
           return (
-            popContextProvider(workInProgress),
+            popLegacyContextProvider(workInProgress),
             (current = workInProgress.stateNode),
             (newProps = workInProgress.updateQueue),
             null !== newProps &&
@@ -3914,8 +3819,7 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           );
         case 3:
           popHostContainer(workInProgress);
-          pop(didPerformWorkStackCursor, workInProgress);
-          pop(contextStackCursor, workInProgress);
+          popTopLevelLegacyContextObject(workInProgress);
           newProps = workInProgress.stateNode;
           newProps.pendingContext &&
             ((newProps.context = newProps.pendingContext),
@@ -4099,11 +4003,16 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
 }
 function ReactFiberUnwindWork(
   hostContext,
+  legacyContext,
+  newContext,
   scheduleWork,
   isAlreadyFailedLegacyErrorBoundary
 ) {
   var popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext;
+    popHostContext = hostContext.popHostContext,
+    popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popProvider = newContext.popProvider;
   return {
     throwException: function(returnFiber, sourceFiber, rawValue) {
       sourceFiber.effectTag |= 512;
@@ -4144,7 +4053,7 @@ function ReactFiberUnwindWork(
     unwindWork: function(workInProgress) {
       switch (workInProgress.tag) {
         case 2:
-          popContextProvider(workInProgress);
+          popLegacyContextProvider(workInProgress);
           var effectTag = workInProgress.effectTag;
           return effectTag & 1024
             ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4153,8 +4062,7 @@ function ReactFiberUnwindWork(
         case 3:
           return (
             popHostContainer(workInProgress),
-            pop(didPerformWorkStackCursor, workInProgress),
-            pop(contextStackCursor, workInProgress),
+            popTopLevelLegacyContextObject(workInProgress),
             (effectTag = workInProgress.effectTag),
             effectTag & 1024
               ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4170,6 +4078,25 @@ function ReactFiberUnwindWork(
         default:
           return null;
       }
+    },
+    unwindInterruptedWork: function(interruptedWork) {
+      switch (interruptedWork.tag) {
+        case 2:
+          popLegacyContextProvider(interruptedWork);
+          break;
+        case 3:
+          popHostContainer(interruptedWork);
+          popTopLevelLegacyContextObject(interruptedWork);
+          break;
+        case 5:
+          popHostContext(interruptedWork);
+          break;
+        case 4:
+          popHostContainer(interruptedWork);
+          break;
+        case 13:
+          popProvider(interruptedWork);
+      }
     }
   };
 }
@@ -4425,7 +4352,7 @@ function ReactFiberCommitWork(
   invariant(!1, "Mutating reconciler is disabled.");
 }
 var NO_CONTEXT = {};
-function ReactFiberHostContext(config) {
+function ReactFiberHostContext(config, stack) {
   function requiredContext(c) {
     invariant(
       c !== NO_CONTEXT,
@@ -4434,10 +4361,13 @@ function ReactFiberHostContext(config) {
     return c;
   }
   var getChildHostContext = config.getChildHostContext,
-    getRootHostContext = config.getRootHostContext,
-    contextStackCursor = { current: NO_CONTEXT },
-    contextFiberStackCursor = { current: NO_CONTEXT },
-    rootInstanceStackCursor = { current: NO_CONTEXT };
+    getRootHostContext = config.getRootHostContext;
+  config = stack.createCursor;
+  var push = stack.push,
+    pop = stack.pop,
+    contextStackCursor = config(NO_CONTEXT),
+    contextFiberStackCursor = config(NO_CONTEXT),
+    rootInstanceStackCursor = config(NO_CONTEXT);
   return {
     getHostContext: function() {
       return requiredContext(contextStackCursor.current);
@@ -4467,10 +4397,6 @@ function ReactFiberHostContext(config) {
       context !== rootInstance &&
         (push(contextFiberStackCursor, fiber, fiber),
         push(contextStackCursor, rootInstance, fiber));
-    },
-    resetHostContainer: function() {
-      contextStackCursor.current = NO_CONTEXT;
-      rootInstanceStackCursor.current = NO_CONTEXT;
     }
   };
 }
@@ -4630,22 +4556,198 @@ function ReactFiberHydrationContext(config) {
     }
   };
 }
-function ReactFiberScheduler(config) {
-  function resetContextStack() {
-    for (; -1 < index; ) (valueStack[index] = null), index--;
+function ReactFiberLegacyContext(stack) {
+  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+    workInProgress = workInProgress.stateNode;
+    workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    workInProgress.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  }
+  function isContextProvider(fiber) {
+    return 2 === fiber.tag && null != fiber.type.childContextTypes;
+  }
+  function processChildContext(fiber, parentContext) {
+    var instance = fiber.stateNode,
+      childContextTypes = fiber.type.childContextTypes;
+    if ("function" !== typeof instance.getChildContext) return parentContext;
+    instance = instance.getChildContext();
+    for (var contextKey in instance)
+      invariant(
+        contextKey in childContextTypes,
+        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+        getComponentName(fiber) || "Unknown",
+        contextKey
+      );
+    return Object.assign({}, parentContext, instance);
+  }
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop,
+    contextStackCursor = createCursor(emptyObject),
+    didPerformWorkStackCursor = createCursor(!1),
     previousContext = emptyObject;
-    contextStackCursor.current = emptyObject;
-    didPerformWorkStackCursor.current = !1;
-    resetHostContainer();
-    for (var i = index$1; -1 < i; i--) {
-      var context = stack[i].type.context;
-      context._currentValue = context._defaultValue;
-      context._changedBits = 0;
-      changedBitsStack[i] = null;
-      currentValueStack[i] = null;
-      stack[i] = null;
+  return {
+    getUnmaskedContext: function(workInProgress) {
+      return isContextProvider(workInProgress)
+        ? previousContext
+        : contextStackCursor.current;
+    },
+    cacheContext: cacheContext,
+    getMaskedContext: function(workInProgress, unmaskedContext) {
+      var contextTypes = workInProgress.type.contextTypes;
+      if (!contextTypes) return emptyObject;
+      var instance = workInProgress.stateNode;
+      if (
+        instance &&
+        instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+      )
+        return instance.__reactInternalMemoizedMaskedChildContext;
+      var context = {},
+        key;
+      for (key in contextTypes) context[key] = unmaskedContext[key];
+      instance && cacheContext(workInProgress, unmaskedContext, context);
+      return context;
+    },
+    hasContextChanged: function() {
+      return didPerformWorkStackCursor.current;
+    },
+    isContextConsumer: function(fiber) {
+      return 2 === fiber.tag && null != fiber.type.contextTypes;
+    },
+    isContextProvider: isContextProvider,
+    popContextProvider: function(fiber) {
+      isContextProvider(fiber) &&
+        (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
+    },
+    popTopLevelContextObject: function(fiber) {
+      pop(didPerformWorkStackCursor, fiber);
+      pop(contextStackCursor, fiber);
+    },
+    pushTopLevelContextObject: function(fiber, context, didChange) {
+      invariant(
+        null == contextStackCursor.cursor,
+        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
+      );
+      push(contextStackCursor, context, fiber);
+      push(didPerformWorkStackCursor, didChange, fiber);
+    },
+    processChildContext: processChildContext,
+    pushContextProvider: function(workInProgress) {
+      if (!isContextProvider(workInProgress)) return !1;
+      var instance = workInProgress.stateNode;
+      instance =
+        (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+        emptyObject;
+      previousContext = contextStackCursor.current;
+      push(contextStackCursor, instance, workInProgress);
+      push(
+        didPerformWorkStackCursor,
+        didPerformWorkStackCursor.current,
+        workInProgress
+      );
+      return !0;
+    },
+    invalidateContextProvider: function(workInProgress, didChange) {
+      var instance = workInProgress.stateNode;
+      invariant(
+        instance,
+        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+      );
+      if (didChange) {
+        var mergedContext = processChildContext(
+          workInProgress,
+          previousContext
+        );
+        instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+        pop(didPerformWorkStackCursor, workInProgress);
+        pop(contextStackCursor, workInProgress);
+        push(contextStackCursor, mergedContext, workInProgress);
+      } else pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    },
+    findCurrentUnmaskedContext: function(fiber) {
+      for (
+        invariant(
+          2 === isFiberMountedImpl(fiber) && 2 === fiber.tag,
+          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+        );
+        3 !== fiber.tag;
+
+      ) {
+        if (isContextProvider(fiber))
+          return fiber.stateNode.__reactInternalMemoizedMergedChildContext;
+        fiber = fiber["return"];
+        invariant(
+          fiber,
+          "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
+      return fiber.stateNode.context;
+    }
+  };
+}
+function ReactFiberNewContext(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop,
+    providerCursor = createCursor(null),
+    valueCursor = createCursor(null),
+    changedBitsCursor = createCursor(0);
+  return {
+    pushProvider: function(providerFiber) {
+      var context = providerFiber.type.context;
+      push(changedBitsCursor, context._changedBits, providerFiber);
+      push(valueCursor, context._currentValue, providerFiber);
+      push(providerCursor, providerFiber, providerFiber);
+      context._currentValue = providerFiber.pendingProps.value;
+      context._changedBits = providerFiber.stateNode;
+    },
+    popProvider: function(providerFiber) {
+      var changedBits = changedBitsCursor.current,
+        currentValue = valueCursor.current;
+      pop(providerCursor, providerFiber);
+      pop(valueCursor, providerFiber);
+      pop(changedBitsCursor, providerFiber);
+      providerFiber = providerFiber.type.context;
+      providerFiber._currentValue = currentValue;
+      providerFiber._changedBits = changedBits;
     }
-    index$1 = -1;
+  };
+}
+function ReactFiberStack() {
+  var valueStack = [],
+    index = -1;
+  return {
+    createCursor: function(defaultValue) {
+      return { current: defaultValue };
+    },
+    isEmpty: function() {
+      return -1 === index;
+    },
+    pop: function(cursor) {
+      0 > index ||
+        ((cursor.current = valueStack[index]),
+        (valueStack[index] = null),
+        index--);
+    },
+    push: function(cursor, value) {
+      index++;
+      valueStack[index] = cursor.current;
+      cursor.current = value;
+    },
+    checkThatStackIsEmpty: function() {},
+    resetStackAfterFatalErrorInDev: function() {}
+  };
+}
+function ReactFiberScheduler(config) {
+  function resetStack() {
+    if (null !== nextUnitOfWork)
+      for (
+        var interruptedWork = nextUnitOfWork["return"];
+        null !== interruptedWork;
+
+      )
+        unwindInterruptedWork(interruptedWork),
+          (interruptedWork = interruptedWork["return"]);
     nextRoot = null;
     nextRenderExpirationTime = 0;
     nextUnitOfWork = null;
@@ -4751,7 +4853,7 @@ function ReactFiberScheduler(config) {
       root !== nextRoot ||
       null === nextUnitOfWork
     )
-      resetContextStack(),
+      resetStack(),
         (nextRoot = root),
         (nextRenderExpirationTime = expirationTime),
         (nextUnitOfWork = createWorkInProgress(
@@ -4881,7 +4983,7 @@ function ReactFiberScheduler(config) {
             !isWorking &&
               0 !== nextRenderExpirationTime &&
               expirationTime < nextRenderExpirationTime &&
-              resetContextStack();
+              resetStack();
             (nextRoot === root && isWorking) ||
               requestWork(root, expirationTime);
             nestedUpdateCount > NESTED_UPDATE_LIMIT &&
@@ -5225,25 +5327,37 @@ function ReactFiberScheduler(config) {
     nextFlushedRoot.remainingExpirationTime = 0;
     hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
   }
-  var hostContext = ReactFiberHostContext(config),
-    hydrationContext = ReactFiberHydrationContext(config),
-    resetHostContainer = hostContext.resetHostContainer,
+  var stack = ReactFiberStack(),
+    hostContext = ReactFiberHostContext(config, stack),
+    legacyContext = ReactFiberLegacyContext(stack);
+  stack = ReactFiberNewContext(stack);
+  var hydrationContext = ReactFiberHydrationContext(config),
     beginWork = ReactFiberBeginWork(
       config,
       hostContext,
+      legacyContext,
+      stack,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
     ).beginWork,
-    completeWork = ReactFiberCompleteWork(config, hostContext, hydrationContext)
-      .completeWork;
+    completeWork = ReactFiberCompleteWork(
+      config,
+      hostContext,
+      legacyContext,
+      stack,
+      hydrationContext
+    ).completeWork;
   hostContext = ReactFiberUnwindWork(
     hostContext,
+    legacyContext,
+    stack,
     scheduleWork,
     isAlreadyFailedLegacyErrorBoundary
   );
   var throwException = hostContext.throwException,
-    unwindWork = hostContext.unwindWork;
+    unwindWork = hostContext.unwindWork,
+    unwindInterruptedWork = hostContext.unwindInterruptedWork;
   hostContext = ReactFiberCommitWork(
     config,
     onCommitPhaseError,
@@ -5402,7 +5516,8 @@ function ReactFiberScheduler(config) {
       result <= lastUniqueAsyncExpiration &&
         (result = lastUniqueAsyncExpiration + 1);
       return (lastUniqueAsyncExpiration = result);
-    }
+    },
+    legacyContext: legacyContext
   };
 }
 function ReactFiberReconciler$1(config) {
@@ -5417,27 +5532,7 @@ function ReactFiberReconciler$1(config) {
     currentTime = container.current;
     if (parentComponent) {
       parentComponent = parentComponent._reactInternalFiber;
-      var parentContext;
-      b: {
-        invariant(
-          2 === isFiberMountedImpl(parentComponent) &&
-            2 === parentComponent.tag,
-          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-        );
-        for (parentContext = parentComponent; 3 !== parentContext.tag; ) {
-          if (isContextProvider(parentContext)) {
-            parentContext =
-              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
-            break b;
-          }
-          parentContext = parentContext["return"];
-          invariant(
-            parentContext,
-            "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-          );
-        }
-        parentContext = parentContext.stateNode.context;
-      }
+      var parentContext = findCurrentUnmaskedContext(parentComponent);
       parentComponent = isContextProvider(parentComponent)
         ? processChildContext(parentComponent, parentContext)
         : parentContext;
@@ -5466,7 +5561,11 @@ function ReactFiberReconciler$1(config) {
   config = ReactFiberScheduler(config);
   var recalculateCurrentTime = config.recalculateCurrentTime,
     computeExpirationForFiber = config.computeExpirationForFiber,
-    scheduleWork = config.scheduleWork;
+    scheduleWork = config.scheduleWork,
+    legacyContext = config.legacyContext,
+    findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
+    isContextProvider = legacyContext.isContextProvider,
+    processChildContext = legacyContext.processChildContext;
   return {
     createContainer: function(containerInfo, isAsync, hydrate) {
       isAsync = new FiberNode(3, null, null, isAsync ? 3 : 0);
diff --git a/Libraries/Renderer/ReactNativeRenderer-dev.js b/Libraries/Renderer/ReactNativeRenderer-dev.js
index d54c9f31c6cda3..8ea8bcf85094fd 100644
--- a/Libraries/Renderer/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/ReactNativeRenderer-dev.js
@@ -26,9 +26,9 @@ var deepDiffer = require("deepDiffer");
 var flattenStyle = require("flattenStyle");
 var React = require("react");
 var emptyObject = require("fbjs/lib/emptyObject");
-var checkPropTypes = require("prop-types/checkPropTypes");
 var shallowEqual = require("fbjs/lib/shallowEqual");
 var ExceptionsManager = require("ExceptionsManager");
+var checkPropTypes = require("prop-types/checkPropTypes");
 var deepFreezeAndThrowOnMutationInDev = require("deepFreezeAndThrowOnMutationInDev");
 
 var invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
@@ -4389,1648 +4389,1323 @@ function findCurrentHostFiberWithNoPortals(parent) {
   return null;
 }
 
-var valueStack = [];
+// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
+// Math.pow(2, 30) - 1
+// 0b111111111111111111111111111111
+var MAX_SIGNED_31_BIT_INT = 1073741823;
 
-var fiberStack = void 0;
+// TODO: Use an opaque type once ESLint et al support the syntax
 
-{
-  fiberStack = [];
-}
+var NoWork = 0;
+var Sync = 1;
+var Never = MAX_SIGNED_31_BIT_INT;
 
-var index = -1;
+var UNIT_SIZE = 10;
+var MAGIC_NUMBER_OFFSET = 2;
 
-function createCursor(defaultValue) {
-  return {
-    current: defaultValue
-  };
+// 1 unit of expiration time represents 10ms.
+function msToExpirationTime(ms) {
+  // Always add an offset so that we don't clash with the magic number for NoWork.
+  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
 }
 
-function pop(cursor, fiber) {
-  if (index < 0) {
-    {
-      warning(false, "Unexpected pop.");
-    }
-    return;
-  }
+function expirationTimeToMs(expirationTime) {
+  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
+}
 
-  {
-    if (fiber !== fiberStack[index]) {
-      warning(false, "Unexpected Fiber popped.");
-    }
-  }
+function ceiling(num, precision) {
+  return (((num / precision) | 0) + 1) * precision;
+}
+
+function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
+  return ceiling(
+    currentTime + expirationInMs / UNIT_SIZE,
+    bucketSizeMs / UNIT_SIZE
+  );
+}
 
-  cursor.current = valueStack[index];
+var NoContext = 0;
+var AsyncMode = 1;
+var StrictMode = 2;
 
-  valueStack[index] = null;
+var hasBadMapPolyfill = void 0;
 
-  {
-    fiberStack[index] = null;
+{
+  hasBadMapPolyfill = false;
+  try {
+    var nonExtensibleObject = Object.preventExtensions({});
+    var testMap = new Map([[nonExtensibleObject, null]]);
+    var testSet = new Set([nonExtensibleObject]);
+    // This is necessary for Rollup to not consider these unused.
+    // https://github.com/rollup/rollup/issues/1771
+    // TODO: we can remove these if Rollup fixes the bug.
+    testMap.set(0, 0);
+    testSet.add(0);
+  } catch (e) {
+    // TODO: Consider warning about bad polyfills
+    hasBadMapPolyfill = true;
   }
+}
+
+// A Fiber is work on a Component that needs to be done or was done. There can
+// be more than one per component.
+
+var debugCounter = void 0;
 
-  index--;
+{
+  debugCounter = 1;
 }
 
-function push(cursor, value, fiber) {
-  index++;
+function FiberNode(tag, pendingProps, key, mode) {
+  // Instance
+  this.tag = tag;
+  this.key = key;
+  this.type = null;
+  this.stateNode = null;
 
-  valueStack[index] = cursor.current;
+  // Fiber
+  this["return"] = null;
+  this.child = null;
+  this.sibling = null;
+  this.index = 0;
 
-  {
-    fiberStack[index] = fiber;
-  }
+  this.ref = null;
 
-  cursor.current = value;
-}
+  this.pendingProps = pendingProps;
+  this.memoizedProps = null;
+  this.updateQueue = null;
+  this.memoizedState = null;
 
-function reset() {
-  while (index > -1) {
-    valueStack[index] = null;
+  this.mode = mode;
 
-    {
-      fiberStack[index] = null;
-    }
+  // Effects
+  this.effectTag = NoEffect;
+  this.nextEffect = null;
 
-    index--;
+  this.firstEffect = null;
+  this.lastEffect = null;
+
+  this.expirationTime = NoWork;
+
+  this.alternate = null;
+
+  {
+    this._debugID = debugCounter++;
+    this._debugSource = null;
+    this._debugOwner = null;
+    this._debugIsCurrentlyTiming = false;
+    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
+      Object.preventExtensions(this);
+    }
   }
 }
 
-var describeComponentFrame = function(name, source, ownerName) {
-  return (
-    "\n    in " +
-    (name || "Unknown") +
-    (source
-      ? " (at " +
-        source.fileName.replace(/^.*[\\\/]/, "") +
-        ":" +
-        source.lineNumber +
-        ")"
-      : ownerName ? " (created by " + ownerName + ")" : "")
-  );
+// This is a constructor function, rather than a POJO constructor, still
+// please ensure we do the following:
+// 1) Nobody should add any instance methods on this. Instance methods can be
+//    more difficult to predict when they get optimized and they are almost
+//    never inlined properly in static compilers.
+// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
+//    always know when it is a fiber.
+// 3) We might want to experiment with using numeric keys since they are easier
+//    to optimize in a non-JIT environment.
+// 4) We can easily go from a constructor to a createFiber object literal if that
+//    is faster.
+// 5) It should be easy to port this to a C struct and keep a C implementation
+//    compatible.
+var createFiber = function(tag, pendingProps, key, mode) {
+  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
+  return new FiberNode(tag, pendingProps, key, mode);
 };
 
-function describeFiber(fiber) {
-  switch (fiber.tag) {
-    case IndeterminateComponent:
-    case FunctionalComponent:
-    case ClassComponent:
-    case HostComponent:
-      var owner = fiber._debugOwner;
-      var source = fiber._debugSource;
-      var name = getComponentName(fiber);
-      var ownerName = null;
-      if (owner) {
-        ownerName = getComponentName(owner);
-      }
-      return describeComponentFrame(name, source, ownerName);
-    default:
-      return "";
-  }
+function shouldConstruct(Component) {
+  return !!(Component.prototype && Component.prototype.isReactComponent);
 }
 
-// This function can only be called with a work-in-progress fiber and
-// only during begin or complete phase. Do not call it under any other
-// circumstances.
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  var node = workInProgress;
-  do {
-    info += describeFiber(node);
-    // Otherwise this return pointer might point to the wrong tree:
-    node = node["return"];
-  } while (node);
-  return info;
-}
+// This is used to create an alternate fiber to do work on.
+function createWorkInProgress(current, pendingProps, expirationTime) {
+  var workInProgress = current.alternate;
+  if (workInProgress === null) {
+    // We use a double buffering pooling technique because we know that we'll
+    // only ever need at most two versions of a tree. We pool the "other" unused
+    // node that we're free to reuse. This is lazily created to avoid allocating
+    // extra objects for things that are never updated. It also allow us to
+    // reclaim the extra memory if needed.
+    workInProgress = createFiber(
+      current.tag,
+      pendingProps,
+      current.key,
+      current.mode
+    );
+    workInProgress.type = current.type;
+    workInProgress.stateNode = current.stateNode;
 
-function getCurrentFiberOwnerName() {
-  {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    var owner = fiber._debugOwner;
-    if (owner !== null && typeof owner !== "undefined") {
-      return getComponentName(owner);
+    {
+      // DEV-only fields
+      workInProgress._debugID = current._debugID;
+      workInProgress._debugSource = current._debugSource;
+      workInProgress._debugOwner = current._debugOwner;
     }
-  }
-  return null;
-}
 
-function getCurrentFiberStackAddendum() {
-  {
-    var fiber = ReactDebugCurrentFiber.current;
-    if (fiber === null) {
-      return null;
-    }
-    // Safe because if current fiber exists, we are reconciling,
-    // and it is guaranteed to be the work-in-progress version.
-    return getStackAddendumByWorkInProgressFiber(fiber);
+    workInProgress.alternate = current;
+    current.alternate = workInProgress;
+  } else {
+    workInProgress.pendingProps = pendingProps;
+
+    // We already have an alternate.
+    // Reset the effect tag.
+    workInProgress.effectTag = NoEffect;
+
+    // The effect list is no longer valid.
+    workInProgress.nextEffect = null;
+    workInProgress.firstEffect = null;
+    workInProgress.lastEffect = null;
   }
-  return null;
-}
 
-function resetCurrentFiber() {
-  ReactDebugCurrentFrame.getCurrentStack = null;
-  ReactDebugCurrentFiber.current = null;
-  ReactDebugCurrentFiber.phase = null;
-}
+  workInProgress.expirationTime = expirationTime;
 
-function setCurrentFiber(fiber) {
-  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
-  ReactDebugCurrentFiber.current = fiber;
-  ReactDebugCurrentFiber.phase = null;
+  workInProgress.child = current.child;
+  workInProgress.memoizedProps = current.memoizedProps;
+  workInProgress.memoizedState = current.memoizedState;
+  workInProgress.updateQueue = current.updateQueue;
+
+  // These will be overridden during the parent's reconciliation
+  workInProgress.sibling = current.sibling;
+  workInProgress.index = current.index;
+  workInProgress.ref = current.ref;
+
+  return workInProgress;
 }
 
-function setCurrentPhase(phase) {
-  ReactDebugCurrentFiber.phase = phase;
+function createHostRootFiber(isAsync) {
+  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
+  return createFiber(HostRoot, null, null, mode);
 }
 
-var ReactDebugCurrentFiber = {
-  current: null,
-  phase: null,
-  resetCurrentFiber: resetCurrentFiber,
-  setCurrentFiber: setCurrentFiber,
-  setCurrentPhase: setCurrentPhase,
-  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
-  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
-};
-
-// Re-export dynamic flags from the fbsource version.
-var _require = require("ReactFeatureFlags");
-
-var enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch;
-var debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects;
-var debugRenderPhaseSideEffectsForStrictMode =
-  _require.debugRenderPhaseSideEffectsForStrictMode;
-var warnAboutDeprecatedLifecycles = _require.warnAboutDeprecatedLifecycles;
-var replayFailedUnitOfWorkWithInvokeGuardedCallback =
-  _require.replayFailedUnitOfWorkWithInvokeGuardedCallback;
-
-var enableUserTimingAPI = true;
-var enableMutatingReconciler = true;
-var enableNoopReconciler = false;
-var enablePersistentReconciler = false;
-
-// Only used in www builds.
-
-// Prefix measurements so that it's possible to filter them.
-// Longer prefixes are hard to read in DevTools.
-var reactEmoji = "\u269B";
-var warningEmoji = "\u26D4";
-var supportsUserTiming =
-  typeof performance !== "undefined" &&
-  typeof performance.mark === "function" &&
-  typeof performance.clearMarks === "function" &&
-  typeof performance.measure === "function" &&
-  typeof performance.clearMeasures === "function";
-
-// Keep track of current fiber so that we know the path to unwind on pause.
-// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
-var currentFiber = null;
-// If we're in the middle of user code, which fiber and method is it?
-// Reusing `currentFiber` would be confusing for this because user code fiber
-// can change during commit phase too, but we don't need to unwind it (since
-// lifecycles in the commit phase don't resemble a tree).
-var currentPhase = null;
-var currentPhaseFiber = null;
-// Did lifecycle hook schedule an update? This is often a performance problem,
-// so we will keep track of it, and include it in the report.
-// Track commits caused by cascading updates.
-var isCommitting = false;
-var hasScheduledUpdateInCurrentCommit = false;
-var hasScheduledUpdateInCurrentPhase = false;
-var commitCountInCurrentWorkLoop = 0;
-var effectCountInCurrentCommit = 0;
-var isWaitingForCallback = false;
-// During commits, we only show a measurement once per method name
-// to avoid stretch the commit phase with measurement overhead.
-var labelsInCurrentCommit = new Set();
-
-var formatMarkName = function(markName) {
-  return reactEmoji + " " + markName;
-};
-
-var formatLabel = function(label, warning$$1) {
-  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
-  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
-  return "" + prefix + label + suffix;
-};
-
-var beginMark = function(markName) {
-  performance.mark(formatMarkName(markName));
-};
-
-var clearMark = function(markName) {
-  performance.clearMarks(formatMarkName(markName));
-};
-
-var endMark = function(label, markName, warning$$1) {
-  var formattedMarkName = formatMarkName(markName);
-  var formattedLabel = formatLabel(label, warning$$1);
-  try {
-    performance.measure(formattedLabel, formattedMarkName);
-  } catch (err) {}
-  // If previous mark was missing for some reason, this will throw.
-  // This could only happen if React crashed in an unexpected place earlier.
-  // Don't pile on with more errors.
-
-  // Clear marks immediately to avoid growing buffer.
-  performance.clearMarks(formattedMarkName);
-  performance.clearMeasures(formattedLabel);
-};
-
-var getFiberMarkName = function(label, debugID) {
-  return label + " (#" + debugID + ")";
-};
-
-var getFiberLabel = function(componentName, isMounted, phase) {
-  if (phase === null) {
-    // These are composite component total time measurements.
-    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
-  } else {
-    // Composite component methods.
-    return componentName + "." + phase;
-  }
-};
-
-var beginFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-
-  if (isCommitting && labelsInCurrentCommit.has(label)) {
-    // During the commit phase, we don't show duplicate labels because
-    // there is a fixed overhead for every measurement, and we don't
-    // want to stretch the commit phase beyond necessary.
-    return false;
-  }
-  labelsInCurrentCommit.add(label);
-
-  var markName = getFiberMarkName(label, debugID);
-  beginMark(markName);
-  return true;
-};
-
-var clearFiberMark = function(fiber, phase) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  clearMark(markName);
-};
-
-var endFiberMark = function(fiber, phase, warning$$1) {
-  var componentName = getComponentName(fiber) || "Unknown";
-  var debugID = fiber._debugID;
-  var isMounted = fiber.alternate !== null;
-  var label = getFiberLabel(componentName, isMounted, phase);
-  var markName = getFiberMarkName(label, debugID);
-  endMark(label, markName, warning$$1);
-};
-
-var shouldIgnoreFiber = function(fiber) {
-  // Host components should be skipped in the timeline.
-  // We could check typeof fiber.type, but does this work with RN?
-  switch (fiber.tag) {
-    case HostRoot:
-    case HostComponent:
-    case HostText:
-    case HostPortal:
-    case CallComponent:
-    case ReturnComponent:
-    case Fragment:
-    case ContextProvider:
-    case ContextConsumer:
-      return true;
-    default:
-      return false;
-  }
-};
-
-var clearPendingPhaseMeasurement = function() {
-  if (currentPhase !== null && currentPhaseFiber !== null) {
-    clearFiberMark(currentPhaseFiber, currentPhase);
-  }
-  currentPhaseFiber = null;
-  currentPhase = null;
-  hasScheduledUpdateInCurrentPhase = false;
-};
-
-var pauseTimers = function() {
-  // Stops all currently active measurements so that they can be resumed
-  // if we continue in a later deferred loop from the same unit of work.
-  var fiber = currentFiber;
-  while (fiber) {
-    if (fiber._debugIsCurrentlyTiming) {
-      endFiberMark(fiber, null, null);
-    }
-    fiber = fiber["return"];
-  }
-};
-
-var resumeTimersRecursively = function(fiber) {
-  if (fiber["return"] !== null) {
-    resumeTimersRecursively(fiber["return"]);
-  }
-  if (fiber._debugIsCurrentlyTiming) {
-    beginFiberMark(fiber, null);
-  }
-};
-
-var resumeTimers = function() {
-  // Resumes all measurements that were active during the last deferred loop.
-  if (currentFiber !== null) {
-    resumeTimersRecursively(currentFiber);
-  }
-};
-
-function recordEffect() {
-  if (enableUserTimingAPI) {
-    effectCountInCurrentCommit++;
-  }
-}
-
-function recordScheduleUpdate() {
-  if (enableUserTimingAPI) {
-    if (isCommitting) {
-      hasScheduledUpdateInCurrentCommit = true;
-    }
-    if (
-      currentPhase !== null &&
-      currentPhase !== "componentWillMount" &&
-      currentPhase !== "componentWillReceiveProps"
-    ) {
-      hasScheduledUpdateInCurrentPhase = true;
-    }
-  }
-}
-
-function startRequestCallbackTimer() {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming && !isWaitingForCallback) {
-      isWaitingForCallback = true;
-      beginMark("(Waiting for async callback...)");
-    }
-  }
-}
-
-function stopRequestCallbackTimer(didExpire) {
-  if (enableUserTimingAPI) {
-    if (supportsUserTiming) {
-      isWaitingForCallback = false;
-      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
-      endMark(
-        "(Waiting for async callback...)",
-        "(Waiting for async callback...)",
-        warning$$1
-      );
-    }
-  }
-}
-
-function startWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, this is the fiber to unwind from.
-    currentFiber = fiber;
-    if (!beginFiberMark(fiber, null)) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = true;
-  }
-}
-
-function cancelWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // Remember we shouldn't complete measurement for this fiber.
-    // Otherwise flamechart will be deep even for small updates.
-    fiber._debugIsCurrentlyTiming = false;
-    clearFiberMark(fiber, null);
-  }
-}
-
-function stopWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    endFiberMark(fiber, null, null);
-  }
-}
-
-function stopFailedWorkTimer(fiber) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
-      return;
-    }
-    // If we pause, its parent is the fiber to unwind from.
-    currentFiber = fiber["return"];
-    if (!fiber._debugIsCurrentlyTiming) {
-      return;
-    }
-    fiber._debugIsCurrentlyTiming = false;
-    var warning$$1 = "An error was thrown inside this error boundary";
-    endFiberMark(fiber, null, warning$$1);
-  }
-}
-
-function startPhaseTimer(fiber, phase) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    clearPendingPhaseMeasurement();
-    if (!beginFiberMark(fiber, phase)) {
-      return;
-    }
-    currentPhaseFiber = fiber;
-    currentPhase = phase;
-  }
-}
-
-function stopPhaseTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    if (currentPhase !== null && currentPhaseFiber !== null) {
-      var warning$$1 = hasScheduledUpdateInCurrentPhase
-        ? "Scheduled a cascading update"
-        : null;
-      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
-    }
-    currentPhase = null;
-    currentPhaseFiber = null;
-  }
-}
-
-function startWorkLoopTimer(nextUnitOfWork) {
-  if (enableUserTimingAPI) {
-    currentFiber = nextUnitOfWork;
-    if (!supportsUserTiming) {
-      return;
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // This is top level call.
-    // Any other measurements are performed within.
-    beginMark("(React Tree Reconciliation)");
-    // Resume any measurements that were in progress during the last loop.
-    resumeTimers();
-  }
-}
-
-function stopWorkLoopTimer(interruptedBy) {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var warning$$1 = null;
-    if (interruptedBy !== null) {
-      if (interruptedBy.tag === HostRoot) {
-        warning$$1 = "A top-level update interrupted the previous render";
-      } else {
-        var componentName = getComponentName(interruptedBy) || "Unknown";
-        warning$$1 =
-          "An update to " + componentName + " interrupted the previous render";
-      }
-    } else if (commitCountInCurrentWorkLoop > 1) {
-      warning$$1 = "There were cascading updates";
-    }
-    commitCountInCurrentWorkLoop = 0;
-    // Pause any measurements until the next loop.
-    pauseTimers();
-    endMark(
-      "(React Tree Reconciliation)",
-      "(React Tree Reconciliation)",
-      warning$$1
-    );
-  }
-}
-
-function startCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    isCommitting = true;
-    hasScheduledUpdateInCurrentCommit = false;
-    labelsInCurrentCommit.clear();
-    beginMark("(Committing Changes)");
-  }
-}
-
-function stopCommitTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-
-    var warning$$1 = null;
-    if (hasScheduledUpdateInCurrentCommit) {
-      warning$$1 = "Lifecycle hook scheduled a cascading update";
-    } else if (commitCountInCurrentWorkLoop > 0) {
-      warning$$1 = "Caused by a cascading update in earlier commit";
-    }
-    hasScheduledUpdateInCurrentCommit = false;
-    commitCountInCurrentWorkLoop++;
-    isCommitting = false;
-    labelsInCurrentCommit.clear();
-
-    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
-  }
-}
-
-function startCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Committing Host Effects)");
-  }
-}
-
-function stopCommitHostEffectsTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Committing Host Effects: " + count + " Total)",
-      "(Committing Host Effects)",
-      null
-    );
+function createFiberFromElement(element, mode, expirationTime) {
+  var owner = null;
+  {
+    owner = element._owner;
   }
-}
 
-function startCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
-    }
-    effectCountInCurrentCommit = 0;
-    beginMark("(Calling Lifecycle Methods)");
-  }
-}
+  var fiber = void 0;
+  var type = element.type;
+  var key = element.key;
+  var pendingProps = element.props;
 
-function stopCommitLifeCyclesTimer() {
-  if (enableUserTimingAPI) {
-    if (!supportsUserTiming) {
-      return;
+  var fiberTag = void 0;
+  if (typeof type === "function") {
+    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
+  } else if (typeof type === "string") {
+    fiberTag = HostComponent;
+  } else {
+    switch (type) {
+      case REACT_FRAGMENT_TYPE:
+        return createFiberFromFragment(
+          pendingProps.children,
+          mode,
+          expirationTime,
+          key
+        );
+      case REACT_ASYNC_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= AsyncMode | StrictMode;
+        break;
+      case REACT_STRICT_MODE_TYPE:
+        fiberTag = Mode;
+        mode |= StrictMode;
+        break;
+      case REACT_CALL_TYPE:
+        fiberTag = CallComponent;
+        break;
+      case REACT_RETURN_TYPE:
+        fiberTag = ReturnComponent;
+        break;
+      default: {
+        if (typeof type === "object" && type !== null) {
+          switch (type.$$typeof) {
+            case REACT_PROVIDER_TYPE:
+              fiberTag = ContextProvider;
+              break;
+            case REACT_CONTEXT_TYPE:
+              // This is a consumer
+              fiberTag = ContextConsumer;
+              break;
+            case REACT_FORWARD_REF_TYPE:
+              fiberTag = ForwardRef;
+              break;
+            default:
+              if (typeof type.tag === "number") {
+                // Currently assumed to be a continuation and therefore is a
+                // fiber already.
+                // TODO: The yield system is currently broken for updates in
+                // some cases. The reified yield stores a fiber, but we don't
+                // know which fiber that is; the current or a workInProgress?
+                // When the continuation gets rendered here we don't know if we
+                // can reuse that fiber or if we need to clone it. There is
+                // probably a clever way to restructure this.
+                fiber = type;
+                fiber.pendingProps = pendingProps;
+                fiber.expirationTime = expirationTime;
+                return fiber;
+              } else {
+                throwOnInvalidElementType(type, owner);
+              }
+              break;
+          }
+        } else {
+          throwOnInvalidElementType(type, owner);
+        }
+      }
     }
-    var count = effectCountInCurrentCommit;
-    effectCountInCurrentCommit = 0;
-    endMark(
-      "(Calling Lifecycle Methods: " + count + " Total)",
-      "(Calling Lifecycle Methods)",
-      null
-    );
   }
-}
 
-var warnedAboutMissingGetChildContext = void 0;
-
-{
-  warnedAboutMissingGetChildContext = {};
-}
-
-// A cursor to the current merged context object on the stack.
-var contextStackCursor = createCursor(emptyObject);
-// A cursor to a boolean indicating whether the context has changed.
-var didPerformWorkStackCursor = createCursor(false);
-// Keep track of the previous context object that was on the stack.
-// We use this to get access to the parent context after we have already
-// pushed the next context provider, and now need to merge their contexts.
-var previousContext = emptyObject;
+  fiber = createFiber(fiberTag, pendingProps, key, mode);
+  fiber.type = type;
+  fiber.expirationTime = expirationTime;
 
-function getUnmaskedContext(workInProgress) {
-  var hasOwnContext = isContextProvider(workInProgress);
-  if (hasOwnContext) {
-    // If the fiber is a context provider itself, when we read its context
-    // we have already pushed its own child context on the stack. A context
-    // provider should not "see" its own child context. Therefore we read the
-    // previous (parent) context instead for a context provider.
-    return previousContext;
+  {
+    fiber._debugSource = element._source;
+    fiber._debugOwner = element._owner;
   }
-  return contextStackCursor.current;
-}
 
-function cacheContext(workInProgress, unmaskedContext, maskedContext) {
-  var instance = workInProgress.stateNode;
-  instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
-  instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  return fiber;
 }
 
-function getMaskedContext(workInProgress, unmaskedContext) {
-  var type = workInProgress.type;
-  var contextTypes = type.contextTypes;
-  if (!contextTypes) {
-    return emptyObject;
-  }
-
-  // Avoid recreating masked context unless unmasked context has changed.
-  // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
-  // This may trigger infinite loops if componentWillReceiveProps calls setState.
-  var instance = workInProgress.stateNode;
-  if (
-    instance &&
-    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-  ) {
-    return instance.__reactInternalMemoizedMaskedChildContext;
-  }
-
-  var context = {};
-  for (var key in contextTypes) {
-    context[key] = unmaskedContext[key];
-  }
-
+function throwOnInvalidElementType(type, owner) {
+  var info = "";
   {
-    var name = getComponentName(workInProgress) || "Unknown";
-    checkPropTypes(
-      contextTypes,
-      context,
-      "context",
-      name,
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-    );
-  }
-
-  // Cache unmasked context so we can avoid recreating masked context unless necessary.
-  // Context is created before the class component is instantiated so check for instance.
-  if (instance) {
-    cacheContext(workInProgress, unmaskedContext, context);
+    if (
+      type === undefined ||
+      (typeof type === "object" &&
+        type !== null &&
+        Object.keys(type).length === 0)
+    ) {
+      info +=
+        " You likely forgot to export your component from the file " +
+        "it's defined in, or you might have mixed up default and " +
+        "named imports.";
+    }
+    var ownerName = owner ? getComponentName(owner) : null;
+    if (ownerName) {
+      info += "\n\nCheck the render method of `" + ownerName + "`.";
+    }
   }
-
-  return context;
-}
-
-function hasContextChanged() {
-  return didPerformWorkStackCursor.current;
+  invariant(
+    false,
+    "Element type is invalid: expected a string (for built-in " +
+      "components) or a class/function (for composite components) " +
+      "but got: %s.%s",
+    type == null ? type : typeof type,
+    info
+  );
 }
 
-function isContextConsumer(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
+function createFiberFromFragment(elements, mode, expirationTime, key) {
+  var fiber = createFiber(Fragment, elements, key, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
 }
 
-function isContextProvider(fiber) {
-  return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
+function createFiberFromText(content, mode, expirationTime) {
+  var fiber = createFiber(HostText, content, null, mode);
+  fiber.expirationTime = expirationTime;
+  return fiber;
 }
 
-function popContextProvider(fiber) {
-  if (!isContextProvider(fiber)) {
-    return;
-  }
-
-  pop(didPerformWorkStackCursor, fiber);
-  pop(contextStackCursor, fiber);
+function createFiberFromHostInstanceForDeletion() {
+  var fiber = createFiber(HostComponent, null, null, NoContext);
+  fiber.type = "DELETED";
+  return fiber;
 }
 
-function popTopLevelContextObject(fiber) {
-  pop(didPerformWorkStackCursor, fiber);
-  pop(contextStackCursor, fiber);
+function createFiberFromPortal(portal, mode, expirationTime) {
+  var pendingProps = portal.children !== null ? portal.children : [];
+  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
+  fiber.expirationTime = expirationTime;
+  fiber.stateNode = {
+    containerInfo: portal.containerInfo,
+    pendingChildren: null, // Used by persistent updates
+    implementation: portal.implementation
+  };
+  return fiber;
 }
 
-function pushTopLevelContextObject(fiber, context, didChange) {
-  invariant(
-    contextStackCursor.cursor == null,
-    "Unexpected context found on stack. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
+// TODO: This should be lifted into the renderer.
 
-  push(contextStackCursor, context, fiber);
-  push(didPerformWorkStackCursor, didChange, fiber);
+function createFiberRoot(containerInfo, isAsync, hydrate) {
+  // Cyclic construction. This cheats the type system right now because
+  // stateNode is any.
+  var uninitializedFiber = createHostRootFiber(isAsync);
+  var root = {
+    current: uninitializedFiber,
+    containerInfo: containerInfo,
+    pendingChildren: null,
+    pendingCommitExpirationTime: NoWork,
+    finishedWork: null,
+    context: null,
+    pendingContext: null,
+    hydrate: hydrate,
+    remainingExpirationTime: NoWork,
+    firstBatch: null,
+    nextScheduledRoot: null
+  };
+  uninitializedFiber.stateNode = root;
+  return root;
 }
 
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode;
-  var childContextTypes = fiber.type.childContextTypes;
-
-  // TODO (bvaughn) Replace this behavior with an invariant() in the future.
-  // It has only been added in Fiber to match the (unintentional) behavior in Stack.
-  if (typeof instance.getChildContext !== "function") {
-    {
-      var componentName = getComponentName(fiber) || "Unknown";
+var onCommitFiberRoot = null;
+var onCommitFiberUnmount = null;
+var hasLoggedError = false;
 
-      if (!warnedAboutMissingGetChildContext[componentName]) {
-        warnedAboutMissingGetChildContext[componentName] = true;
-        warning(
-          false,
-          "%s.childContextTypes is specified but there is no getChildContext() method " +
-            "on the instance. You can either define getChildContext() on %s or remove " +
-            "childContextTypes from it.",
-          componentName,
-          componentName
-        );
+function catchErrors(fn) {
+  return function(arg) {
+    try {
+      return fn(arg);
+    } catch (err) {
+      if (true && !hasLoggedError) {
+        hasLoggedError = true;
+        warning(false, "React DevTools encountered an error: %s", err);
       }
     }
-    return parentContext;
-  }
+  };
+}
 
-  var childContext = void 0;
-  {
-    ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
-  }
-  startPhaseTimer(fiber, "getChildContext");
-  childContext = instance.getChildContext();
-  stopPhaseTimer();
-  {
-    ReactDebugCurrentFiber.setCurrentPhase(null);
+function injectInternals(internals) {
+  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
+    // No DevTools
+    return false;
   }
-  for (var contextKey in childContext) {
-    invariant(
-      contextKey in childContextTypes,
-      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
-      contextKey
-    );
+  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (hook.isDisabled) {
+    // This isn't a real property on the hook, but it can be set to opt out
+    // of DevTools integration and associated warnings and logs.
+    // https://github.com/facebook/react/issues/3877
+    return true;
   }
-  {
-    var name = getComponentName(fiber) || "Unknown";
-    checkPropTypes(
-      childContextTypes,
-      childContext,
-      "child context",
-      name,
-      // In practice, there is one case in which we won't get a stack. It's when
-      // somebody calls unstable_renderSubtreeIntoContainer() and we process
-      // context from the parent component instance. The stack will be missing
-      // because it's outside of the reconciliation, and so the pointer has not
-      // been set. This is rare and doesn't matter. We'll also remove that API.
-      ReactDebugCurrentFiber.getCurrentFiberStackAddendum
-    );
+  if (!hook.supportsFiber) {
+    {
+      warning(
+        false,
+        "The installed version of React DevTools is too old and will not work " +
+          "with the current version of React. Please update React DevTools. " +
+          "https://fb.me/react-devtools"
+      );
+    }
+    // DevTools exists, even though it doesn't support Fiber.
+    return true;
   }
-
-  return Object.assign({}, parentContext, childContext);
-}
-
-function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) {
-    return false;
+  try {
+    var rendererID = hook.inject(internals);
+    // We have successfully injected, so now it is safe to set up hooks.
+    onCommitFiberRoot = catchErrors(function(root) {
+      return hook.onCommitFiberRoot(rendererID, root);
+    });
+    onCommitFiberUnmount = catchErrors(function(fiber) {
+      return hook.onCommitFiberUnmount(rendererID, fiber);
+    });
+  } catch (err) {
+    // Catch all errors because it is unsafe to throw during initialization.
+    {
+      warning(false, "React DevTools encountered an error: %s.", err);
+    }
   }
-
-  var instance = workInProgress.stateNode;
-  // We push the context as early as possible to ensure stack integrity.
-  // If the instance does not exist yet, we will push null at first,
-  // and replace it on the stack later when invalidating the context.
-  var memoizedMergedChildContext =
-    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
-
-  // Remember the parent context so we can merge with it later.
-  // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
-  previousContext = contextStackCursor.current;
-  push(contextStackCursor, memoizedMergedChildContext, workInProgress);
-  push(
-    didPerformWorkStackCursor,
-    didPerformWorkStackCursor.current,
-    workInProgress
-  );
-
+  // DevTools exists
   return true;
 }
 
-function invalidateContextProvider(workInProgress, didChange) {
-  var instance = workInProgress.stateNode;
-  invariant(
-    instance,
-    "Expected to have an instance by this point. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
-
-  if (didChange) {
-    // Merge parent and own context.
-    // Skip this if we're not updating due to sCU.
-    // This avoids unnecessarily recomputing memoized values.
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-
-    // Replace the old (or empty) context with the new one.
-    // It is important to unwind the context in the reverse order.
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    // Now push the new context and mark that it has changed.
-    push(contextStackCursor, mergedContext, workInProgress);
-    push(didPerformWorkStackCursor, didChange, workInProgress);
-  } else {
-    pop(didPerformWorkStackCursor, workInProgress);
-    push(didPerformWorkStackCursor, didChange, workInProgress);
+function onCommitRoot(root) {
+  if (typeof onCommitFiberRoot === "function") {
+    onCommitFiberRoot(root);
   }
 }
 
-function resetContext() {
-  previousContext = emptyObject;
-  contextStackCursor.current = emptyObject;
-  didPerformWorkStackCursor.current = false;
-}
-
-function findCurrentUnmaskedContext(fiber) {
-  // Currently this is only used with renderSubtreeIntoContainer; not sure if it
-  // makes sense elsewhere
-  invariant(
-    isFiberMounted(fiber) && fiber.tag === ClassComponent,
-    "Expected subtree parent to be a mounted class component. " +
-      "This error is likely caused by a bug in React. Please file an issue."
-  );
-
-  var node = fiber;
-  while (node.tag !== HostRoot) {
-    if (isContextProvider(node)) {
-      return node.stateNode.__reactInternalMemoizedMergedChildContext;
-    }
-    var parent = node["return"];
-    invariant(
-      parent,
-      "Found unexpected detached subtree parent. " +
-        "This error is likely caused by a bug in React. Please file an issue."
-    );
-    node = parent;
+function onCommitUnmount(fiber) {
+  if (typeof onCommitFiberUnmount === "function") {
+    onCommitFiberUnmount(fiber);
   }
-  return node.stateNode.context;
-}
-
-// Max 31 bit integer. The max integer size in V8 for 32-bit systems.
-// Math.pow(2, 30) - 1
-// 0b111111111111111111111111111111
-var MAX_SIGNED_31_BIT_INT = 1073741823;
-
-// TODO: Use an opaque type once ESLint et al support the syntax
-
-var NoWork = 0;
-var Sync = 1;
-var Never = MAX_SIGNED_31_BIT_INT;
-
-var UNIT_SIZE = 10;
-var MAGIC_NUMBER_OFFSET = 2;
-
-// 1 unit of expiration time represents 10ms.
-function msToExpirationTime(ms) {
-  // Always add an offset so that we don't clash with the magic number for NoWork.
-  return ((ms / UNIT_SIZE) | 0) + MAGIC_NUMBER_OFFSET;
-}
-
-function expirationTimeToMs(expirationTime) {
-  return (expirationTime - MAGIC_NUMBER_OFFSET) * UNIT_SIZE;
-}
-
-function ceiling(num, precision) {
-  return (((num / precision) | 0) + 1) * precision;
 }
 
-function computeExpirationBucket(currentTime, expirationInMs, bucketSizeMs) {
-  return ceiling(
-    currentTime + expirationInMs / UNIT_SIZE,
-    bucketSizeMs / UNIT_SIZE
+var describeComponentFrame = function(name, source, ownerName) {
+  return (
+    "\n    in " +
+    (name || "Unknown") +
+    (source
+      ? " (at " +
+        source.fileName.replace(/^.*[\\\/]/, "") +
+        ":" +
+        source.lineNumber +
+        ")"
+      : ownerName ? " (created by " + ownerName + ")" : "")
   );
-}
-
-var NoContext = 0;
-var AsyncMode = 1;
-var StrictMode = 2;
-
-var hasBadMapPolyfill = void 0;
+};
 
-{
-  hasBadMapPolyfill = false;
-  try {
-    var nonExtensibleObject = Object.preventExtensions({});
-    var testMap = new Map([[nonExtensibleObject, null]]);
-    var testSet = new Set([nonExtensibleObject]);
-    // This is necessary for Rollup to not consider these unused.
-    // https://github.com/rollup/rollup/issues/1771
-    // TODO: we can remove these if Rollup fixes the bug.
-    testMap.set(0, 0);
-    testSet.add(0);
-  } catch (e) {
-    // TODO: Consider warning about bad polyfills
-    hasBadMapPolyfill = true;
+function describeFiber(fiber) {
+  switch (fiber.tag) {
+    case IndeterminateComponent:
+    case FunctionalComponent:
+    case ClassComponent:
+    case HostComponent:
+      var owner = fiber._debugOwner;
+      var source = fiber._debugSource;
+      var name = getComponentName(fiber);
+      var ownerName = null;
+      if (owner) {
+        ownerName = getComponentName(owner);
+      }
+      return describeComponentFrame(name, source, ownerName);
+    default:
+      return "";
   }
 }
 
-// A Fiber is work on a Component that needs to be done or was done. There can
-// be more than one per component.
-
-var debugCounter = void 0;
-
-{
-  debugCounter = 1;
+// This function can only be called with a work-in-progress fiber and
+// only during begin or complete phase. Do not call it under any other
+// circumstances.
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  var node = workInProgress;
+  do {
+    info += describeFiber(node);
+    // Otherwise this return pointer might point to the wrong tree:
+    node = node["return"];
+  } while (node);
+  return info;
 }
 
-function FiberNode(tag, pendingProps, key, mode) {
-  // Instance
-  this.tag = tag;
-  this.key = key;
-  this.type = null;
-  this.stateNode = null;
-
-  // Fiber
-  this["return"] = null;
-  this.child = null;
-  this.sibling = null;
-  this.index = 0;
-
-  this.ref = null;
-
-  this.pendingProps = pendingProps;
-  this.memoizedProps = null;
-  this.updateQueue = null;
-  this.memoizedState = null;
-
-  this.mode = mode;
+/**
+ * Forked from fbjs/warning:
+ * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
+ *
+ * Only change is we use console.warn instead of console.error,
+ * and do nothing when 'console' is not supported.
+ * This really simplifies the code.
+ * ---
+ * Similar to invariant but only logs a warning if the condition is not met.
+ * This can be used to log issues in development environments in critical
+ * paths. Removing the logging code for production environments will keep the
+ * same logic and follow the same code paths.
+ */
 
-  // Effects
-  this.effectTag = NoEffect;
-  this.nextEffect = null;
+var lowPriorityWarning = function() {};
 
-  this.firstEffect = null;
-  this.lastEffect = null;
+{
+  var printWarning = function(format) {
+    for (
+      var _len = arguments.length,
+        args = Array(_len > 1 ? _len - 1 : 0),
+        _key = 1;
+      _key < _len;
+      _key++
+    ) {
+      args[_key - 1] = arguments[_key];
+    }
 
-  this.expirationTime = NoWork;
+    var argIndex = 0;
+    var message =
+      "Warning: " +
+      format.replace(/%s/g, function() {
+        return args[argIndex++];
+      });
+    if (typeof console !== "undefined") {
+      console.warn(message);
+    }
+    try {
+      // --- Welcome to debugging React ---
+      // This error was thrown as a convenience so that you can use this stack
+      // to find the callsite that caused this warning to fire.
+      throw new Error(message);
+    } catch (x) {}
+  };
 
-  this.alternate = null;
+  lowPriorityWarning = function(condition, format) {
+    if (format === undefined) {
+      throw new Error(
+        "`warning(condition, format, ...args)` requires a warning " +
+          "message argument"
+      );
+    }
+    if (!condition) {
+      for (
+        var _len2 = arguments.length,
+          args = Array(_len2 > 2 ? _len2 - 2 : 0),
+          _key2 = 2;
+        _key2 < _len2;
+        _key2++
+      ) {
+        args[_key2 - 2] = arguments[_key2];
+      }
 
-  {
-    this._debugID = debugCounter++;
-    this._debugSource = null;
-    this._debugOwner = null;
-    this._debugIsCurrentlyTiming = false;
-    if (!hasBadMapPolyfill && typeof Object.preventExtensions === "function") {
-      Object.preventExtensions(this);
+      printWarning.apply(undefined, [format].concat(args));
     }
-  }
+  };
 }
 
-// This is a constructor function, rather than a POJO constructor, still
-// please ensure we do the following:
-// 1) Nobody should add any instance methods on this. Instance methods can be
-//    more difficult to predict when they get optimized and they are almost
-//    never inlined properly in static compilers.
-// 2) Nobody should rely on `instanceof Fiber` for type testing. We should
-//    always know when it is a fiber.
-// 3) We might want to experiment with using numeric keys since they are easier
-//    to optimize in a non-JIT environment.
-// 4) We can easily go from a constructor to a createFiber object literal if that
-//    is faster.
-// 5) It should be easy to port this to a C struct and keep a C implementation
-//    compatible.
-var createFiber = function(tag, pendingProps, key, mode) {
-  // $FlowFixMe: the shapes are exact here but Flow doesn't like constructors
-  return new FiberNode(tag, pendingProps, key, mode);
-};
+var lowPriorityWarning$1 = lowPriorityWarning;
 
-function shouldConstruct(Component) {
-  return !!(Component.prototype && Component.prototype.isReactComponent);
-}
+var ReactStrictModeWarnings = {
+  discardPendingWarnings: function() {},
+  flushPendingDeprecationWarnings: function() {},
+  flushPendingUnsafeLifecycleWarnings: function() {},
+  recordDeprecationWarnings: function(fiber, instance) {},
+  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
+};
 
-// This is used to create an alternate fiber to do work on.
-function createWorkInProgress(current, pendingProps, expirationTime) {
-  var workInProgress = current.alternate;
-  if (workInProgress === null) {
-    // We use a double buffering pooling technique because we know that we'll
-    // only ever need at most two versions of a tree. We pool the "other" unused
-    // node that we're free to reuse. This is lazily created to avoid allocating
-    // extra objects for things that are never updated. It also allow us to
-    // reclaim the extra memory if needed.
-    workInProgress = createFiber(
-      current.tag,
-      pendingProps,
-      current.key,
-      current.mode
-    );
-    workInProgress.type = current.type;
-    workInProgress.stateNode = current.stateNode;
+{
+  var LIFECYCLE_SUGGESTIONS = {
+    UNSAFE_componentWillMount: "componentDidMount",
+    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
+    UNSAFE_componentWillUpdate: "componentDidUpdate"
+  };
 
-    {
-      // DEV-only fields
-      workInProgress._debugID = current._debugID;
-      workInProgress._debugSource = current._debugSource;
-      workInProgress._debugOwner = current._debugOwner;
-    }
+  var pendingComponentWillMountWarnings = [];
+  var pendingComponentWillReceivePropsWarnings = [];
+  var pendingComponentWillUpdateWarnings = [];
+  var pendingUnsafeLifecycleWarnings = new Map();
 
-    workInProgress.alternate = current;
-    current.alternate = workInProgress;
-  } else {
-    workInProgress.pendingProps = pendingProps;
+  // Tracks components we have already warned about.
+  var didWarnAboutDeprecatedLifecycles = new Set();
+  var didWarnAboutUnsafeLifecycles = new Set();
 
-    // We already have an alternate.
-    // Reset the effect tag.
-    workInProgress.effectTag = NoEffect;
+  ReactStrictModeWarnings.discardPendingWarnings = function() {
+    pendingComponentWillMountWarnings = [];
+    pendingComponentWillReceivePropsWarnings = [];
+    pendingComponentWillUpdateWarnings = [];
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-    // The effect list is no longer valid.
-    workInProgress.nextEffect = null;
-    workInProgress.firstEffect = null;
-    workInProgress.lastEffect = null;
-  }
+  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
+    pendingUnsafeLifecycleWarnings.forEach(function(
+      lifecycleWarningsMap,
+      strictRoot
+    ) {
+      var lifecyclesWarningMesages = [];
 
-  workInProgress.expirationTime = expirationTime;
+      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
+        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
+        if (lifecycleWarnings.length > 0) {
+          var componentNames = new Set();
+          lifecycleWarnings.forEach(function(fiber) {
+            componentNames.add(getComponentName(fiber) || "Component");
+            didWarnAboutUnsafeLifecycles.add(fiber.type);
+          });
 
-  workInProgress.child = current.child;
-  workInProgress.memoizedProps = current.memoizedProps;
-  workInProgress.memoizedState = current.memoizedState;
-  workInProgress.updateQueue = current.updateQueue;
+          var formatted = lifecycle.replace("UNSAFE_", "");
+          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
+          var sortedComponentNames = Array.from(componentNames)
+            .sort()
+            .join(", ");
 
-  // These will be overridden during the parent's reconciliation
-  workInProgress.sibling = current.sibling;
-  workInProgress.index = current.index;
-  workInProgress.ref = current.ref;
+          lifecyclesWarningMesages.push(
+            formatted +
+              ": Please update the following components to use " +
+              (suggestion + " instead: " + sortedComponentNames)
+          );
+        }
+      });
 
-  return workInProgress;
-}
+      if (lifecyclesWarningMesages.length > 0) {
+        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
+          strictRoot
+        );
 
-function createHostRootFiber(isAsync) {
-  var mode = isAsync ? AsyncMode | StrictMode : NoContext;
-  return createFiber(HostRoot, null, null, mode);
-}
+        warning(
+          false,
+          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
+            "\n\n%s" +
+            "\n\nLearn more about this warning here:" +
+            "\nhttps://fb.me/react-strict-mode-warnings",
+          strictRootComponentStack,
+          lifecyclesWarningMesages.join("\n\n")
+        );
+      }
+    });
 
-function createFiberFromElement(element, mode, expirationTime) {
-  var owner = null;
-  {
-    owner = element._owner;
-  }
+    pendingUnsafeLifecycleWarnings = new Map();
+  };
 
-  var fiber = void 0;
-  var type = element.type;
-  var key = element.key;
-  var pendingProps = element.props;
+  var getStrictRoot = function(fiber) {
+    var maybeStrictRoot = null;
 
-  var fiberTag = void 0;
-  if (typeof type === "function") {
-    fiberTag = shouldConstruct(type) ? ClassComponent : IndeterminateComponent;
-  } else if (typeof type === "string") {
-    fiberTag = HostComponent;
-  } else {
-    switch (type) {
-      case REACT_FRAGMENT_TYPE:
-        return createFiberFromFragment(
-          pendingProps.children,
-          mode,
-          expirationTime,
-          key
-        );
-      case REACT_ASYNC_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= AsyncMode | StrictMode;
-        break;
-      case REACT_STRICT_MODE_TYPE:
-        fiberTag = Mode;
-        mode |= StrictMode;
-        break;
-      case REACT_CALL_TYPE:
-        fiberTag = CallComponent;
-        break;
-      case REACT_RETURN_TYPE:
-        fiberTag = ReturnComponent;
-        break;
-      default: {
-        if (typeof type === "object" && type !== null) {
-          switch (type.$$typeof) {
-            case REACT_PROVIDER_TYPE:
-              fiberTag = ContextProvider;
-              break;
-            case REACT_CONTEXT_TYPE:
-              // This is a consumer
-              fiberTag = ContextConsumer;
-              break;
-            case REACT_FORWARD_REF_TYPE:
-              fiberTag = ForwardRef;
-              break;
-            default:
-              if (typeof type.tag === "number") {
-                // Currently assumed to be a continuation and therefore is a
-                // fiber already.
-                // TODO: The yield system is currently broken for updates in
-                // some cases. The reified yield stores a fiber, but we don't
-                // know which fiber that is; the current or a workInProgress?
-                // When the continuation gets rendered here we don't know if we
-                // can reuse that fiber or if we need to clone it. There is
-                // probably a clever way to restructure this.
-                fiber = type;
-                fiber.pendingProps = pendingProps;
-                fiber.expirationTime = expirationTime;
-                return fiber;
-              } else {
-                throwOnInvalidElementType(type, owner);
-              }
-              break;
-          }
-        } else {
-          throwOnInvalidElementType(type, owner);
-        }
+    while (fiber !== null) {
+      if (fiber.mode & StrictMode) {
+        maybeStrictRoot = fiber;
       }
+
+      fiber = fiber["return"];
+    }
+
+    return maybeStrictRoot;
+  };
+
+  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
+    if (pendingComponentWillMountWarnings.length > 0) {
+      var uniqueNames = new Set();
+      pendingComponentWillMountWarnings.forEach(function(fiber) {
+        uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
+
+      var sortedNames = Array.from(uniqueNames)
+        .sort()
+        .join(", ");
+
+      lowPriorityWarning$1(
+        false,
+        "componentWillMount is deprecated and will be removed in the next major version. " +
+          "Use componentDidMount instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillMount." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        sortedNames
+      );
+
+      pendingComponentWillMountWarnings = [];
     }
-  }
 
-  fiber = createFiber(fiberTag, pendingProps, key, mode);
-  fiber.type = type;
-  fiber.expirationTime = expirationTime;
+    if (pendingComponentWillReceivePropsWarnings.length > 0) {
+      var _uniqueNames = new Set();
+      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
+        _uniqueNames.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-  {
-    fiber._debugSource = element._source;
-    fiber._debugOwner = element._owner;
-  }
+      var _sortedNames = Array.from(_uniqueNames)
+        .sort()
+        .join(", ");
 
-  return fiber;
-}
+      lowPriorityWarning$1(
+        false,
+        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
+          "Use static getDerivedStateFromProps instead." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames
+      );
 
-function throwOnInvalidElementType(type, owner) {
-  var info = "";
-  {
-    if (
-      type === undefined ||
-      (typeof type === "object" &&
-        type !== null &&
-        Object.keys(type).length === 0)
-    ) {
-      info +=
-        " You likely forgot to export your component from the file " +
-        "it's defined in, or you might have mixed up default and " +
-        "named imports.";
-    }
-    var ownerName = owner ? getComponentName(owner) : null;
-    if (ownerName) {
-      info += "\n\nCheck the render method of `" + ownerName + "`.";
+      pendingComponentWillReceivePropsWarnings = [];
     }
-  }
-  invariant(
-    false,
-    "Element type is invalid: expected a string (for built-in " +
-      "components) or a class/function (for composite components) " +
-      "but got: %s.%s",
-    type == null ? type : typeof type,
-    info
-  );
-}
 
-function createFiberFromFragment(elements, mode, expirationTime, key) {
-  var fiber = createFiber(Fragment, elements, key, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
-}
+    if (pendingComponentWillUpdateWarnings.length > 0) {
+      var _uniqueNames2 = new Set();
+      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
+        _uniqueNames2.add(getComponentName(fiber) || "Component");
+        didWarnAboutDeprecatedLifecycles.add(fiber.type);
+      });
 
-function createFiberFromText(content, mode, expirationTime) {
-  var fiber = createFiber(HostText, content, null, mode);
-  fiber.expirationTime = expirationTime;
-  return fiber;
-}
+      var _sortedNames2 = Array.from(_uniqueNames2)
+        .sort()
+        .join(", ");
 
-function createFiberFromHostInstanceForDeletion() {
-  var fiber = createFiber(HostComponent, null, null, NoContext);
-  fiber.type = "DELETED";
-  return fiber;
-}
+      lowPriorityWarning$1(
+        false,
+        "componentWillUpdate is deprecated and will be removed in the next major version. " +
+          "Use componentDidUpdate instead. As a temporary workaround, " +
+          "you can rename to UNSAFE_componentWillUpdate." +
+          "\n\nPlease update the following components: %s" +
+          "\n\nLearn more about this warning here:" +
+          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
+        _sortedNames2
+      );
 
-function createFiberFromPortal(portal, mode, expirationTime) {
-  var pendingProps = portal.children !== null ? portal.children : [];
-  var fiber = createFiber(HostPortal, pendingProps, portal.key, mode);
-  fiber.expirationTime = expirationTime;
-  fiber.stateNode = {
-    containerInfo: portal.containerInfo,
-    pendingChildren: null, // Used by persistent updates
-    implementation: portal.implementation
+      pendingComponentWillUpdateWarnings = [];
+    }
   };
-  return fiber;
-}
 
-// TODO: This should be lifted into the renderer.
+  ReactStrictModeWarnings.recordDeprecationWarnings = function(
+    fiber,
+    instance
+  ) {
+    // Dedup strategy: Warn once per component.
+    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+      return;
+    }
 
-function createFiberRoot(containerInfo, isAsync, hydrate) {
-  // Cyclic construction. This cheats the type system right now because
-  // stateNode is any.
-  var uninitializedFiber = createHostRootFiber(isAsync);
-  var root = {
-    current: uninitializedFiber,
-    containerInfo: containerInfo,
-    pendingChildren: null,
-    pendingCommitExpirationTime: NoWork,
-    finishedWork: null,
-    context: null,
-    pendingContext: null,
-    hydrate: hydrate,
-    remainingExpirationTime: NoWork,
-    firstBatch: null,
-    nextScheduledRoot: null
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillMountWarnings.push(fiber);
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" &&
+      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
+    ) {
+      pendingComponentWillReceivePropsWarnings.push(fiber);
+    }
+    if (typeof instance.componentWillUpdate === "function") {
+      pendingComponentWillUpdateWarnings.push(fiber);
+    }
   };
-  uninitializedFiber.stateNode = root;
-  return root;
-}
 
-var onCommitFiberRoot = null;
-var onCommitFiberUnmount = null;
-var hasLoggedError = false;
+  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
+    fiber,
+    instance
+  ) {
+    var strictRoot = getStrictRoot(fiber);
 
-function catchErrors(fn) {
-  return function(arg) {
-    try {
-      return fn(arg);
-    } catch (err) {
-      if (true && !hasLoggedError) {
-        hasLoggedError = true;
-        warning(false, "React DevTools encountered an error: %s", err);
-      }
+    // Dedup strategy: Warn once per component.
+    // This is difficult to track any other way since component names
+    // are often vague and are likely to collide between 3rd party libraries.
+    // An expand property is probably okay to use here since it's DEV-only,
+    // and will only be set in the event of serious warnings.
+    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+      return;
+    }
+
+    // Don't warn about react-lifecycles-compat polyfilled components.
+    // Note that it is sufficient to check for the presence of a
+    // single lifecycle, componentWillMount, with the polyfill flag.
+    if (
+      typeof instance.componentWillMount === "function" &&
+      instance.componentWillMount.__suppressDeprecationWarning === true
+    ) {
+      return;
+    }
+
+    var warningsForRoot = void 0;
+    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
+      warningsForRoot = {
+        UNSAFE_componentWillMount: [],
+        UNSAFE_componentWillReceiveProps: [],
+        UNSAFE_componentWillUpdate: []
+      };
+
+      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
+    } else {
+      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
+    }
+
+    var unsafeLifecycles = [];
+    if (
+      typeof instance.componentWillMount === "function" ||
+      typeof instance.UNSAFE_componentWillMount === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillMount");
+    }
+    if (
+      typeof instance.componentWillReceiveProps === "function" ||
+      typeof instance.UNSAFE_componentWillReceiveProps === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
+    }
+    if (
+      typeof instance.componentWillUpdate === "function" ||
+      typeof instance.UNSAFE_componentWillUpdate === "function"
+    ) {
+      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
+    }
+
+    if (unsafeLifecycles.length > 0) {
+      unsafeLifecycles.forEach(function(lifecycle) {
+        warningsForRoot[lifecycle].push(fiber);
+      });
     }
   };
 }
 
-function injectInternals(internals) {
-  if (typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ === "undefined") {
-    // No DevTools
-    return false;
-  }
-  var hook = __REACT_DEVTOOLS_GLOBAL_HOOK__;
-  if (hook.isDisabled) {
-    // This isn't a real property on the hook, but it can be set to opt out
-    // of DevTools integration and associated warnings and logs.
-    // https://github.com/facebook/react/issues/3877
-    return true;
-  }
-  if (!hook.supportsFiber) {
-    {
-      warning(
-        false,
-        "The installed version of React DevTools is too old and will not work " +
-          "with the current version of React. Please update React DevTools. " +
-          "https://fb.me/react-devtools"
-      );
+// Re-export dynamic flags from the fbsource version.
+var _require = require("ReactFeatureFlags");
+
+var enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch;
+var debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects;
+var debugRenderPhaseSideEffectsForStrictMode =
+  _require.debugRenderPhaseSideEffectsForStrictMode;
+var warnAboutDeprecatedLifecycles = _require.warnAboutDeprecatedLifecycles;
+var replayFailedUnitOfWorkWithInvokeGuardedCallback =
+  _require.replayFailedUnitOfWorkWithInvokeGuardedCallback;
+
+var enableUserTimingAPI = true;
+var enableMutatingReconciler = true;
+var enableNoopReconciler = false;
+var enablePersistentReconciler = false;
+
+// Only used in www builds.
+
+function getCurrentFiberOwnerName() {
+  {
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
     }
-    // DevTools exists, even though it doesn't support Fiber.
-    return true;
-  }
-  try {
-    var rendererID = hook.inject(internals);
-    // We have successfully injected, so now it is safe to set up hooks.
-    onCommitFiberRoot = catchErrors(function(root) {
-      return hook.onCommitFiberRoot(rendererID, root);
-    });
-    onCommitFiberUnmount = catchErrors(function(fiber) {
-      return hook.onCommitFiberUnmount(rendererID, fiber);
-    });
-  } catch (err) {
-    // Catch all errors because it is unsafe to throw during initialization.
-    {
-      warning(false, "React DevTools encountered an error: %s.", err);
+    var owner = fiber._debugOwner;
+    if (owner !== null && typeof owner !== "undefined") {
+      return getComponentName(owner);
     }
   }
-  // DevTools exists
-  return true;
+  return null;
 }
 
-function onCommitRoot(root) {
-  if (typeof onCommitFiberRoot === "function") {
-    onCommitFiberRoot(root);
+function getCurrentFiberStackAddendum() {
+  {
+    var fiber = ReactDebugCurrentFiber.current;
+    if (fiber === null) {
+      return null;
+    }
+    // Safe because if current fiber exists, we are reconciling,
+    // and it is guaranteed to be the work-in-progress version.
+    return getStackAddendumByWorkInProgressFiber(fiber);
   }
+  return null;
 }
 
-function onCommitUnmount(fiber) {
-  if (typeof onCommitFiberUnmount === "function") {
-    onCommitFiberUnmount(fiber);
-  }
+function resetCurrentFiber() {
+  ReactDebugCurrentFrame.getCurrentStack = null;
+  ReactDebugCurrentFiber.current = null;
+  ReactDebugCurrentFiber.phase = null;
 }
 
-/**
- * Forked from fbjs/warning:
- * https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/__forks__/warning.js
- *
- * Only change is we use console.warn instead of console.error,
- * and do nothing when 'console' is not supported.
- * This really simplifies the code.
- * ---
- * Similar to invariant but only logs a warning if the condition is not met.
- * This can be used to log issues in development environments in critical
- * paths. Removing the logging code for production environments will keep the
- * same logic and follow the same code paths.
- */
-
-var lowPriorityWarning = function() {};
+function setCurrentFiber(fiber) {
+  ReactDebugCurrentFrame.getCurrentStack = getCurrentFiberStackAddendum;
+  ReactDebugCurrentFiber.current = fiber;
+  ReactDebugCurrentFiber.phase = null;
+}
 
-{
-  var printWarning = function(format) {
-    for (
-      var _len = arguments.length,
-        args = Array(_len > 1 ? _len - 1 : 0),
-        _key = 1;
-      _key < _len;
-      _key++
-    ) {
-      args[_key - 1] = arguments[_key];
-    }
+function setCurrentPhase(phase) {
+  ReactDebugCurrentFiber.phase = phase;
+}
 
-    var argIndex = 0;
-    var message =
-      "Warning: " +
-      format.replace(/%s/g, function() {
-        return args[argIndex++];
-      });
-    if (typeof console !== "undefined") {
-      console.warn(message);
-    }
-    try {
-      // --- Welcome to debugging React ---
-      // This error was thrown as a convenience so that you can use this stack
-      // to find the callsite that caused this warning to fire.
-      throw new Error(message);
-    } catch (x) {}
-  };
+var ReactDebugCurrentFiber = {
+  current: null,
+  phase: null,
+  resetCurrentFiber: resetCurrentFiber,
+  setCurrentFiber: setCurrentFiber,
+  setCurrentPhase: setCurrentPhase,
+  getCurrentFiberOwnerName: getCurrentFiberOwnerName,
+  getCurrentFiberStackAddendum: getCurrentFiberStackAddendum
+};
 
-  lowPriorityWarning = function(condition, format) {
-    if (format === undefined) {
-      throw new Error(
-        "`warning(condition, format, ...args)` requires a warning " +
-          "message argument"
-      );
-    }
-    if (!condition) {
-      for (
-        var _len2 = arguments.length,
-          args = Array(_len2 > 2 ? _len2 - 2 : 0),
-          _key2 = 2;
-        _key2 < _len2;
-        _key2++
-      ) {
-        args[_key2 - 2] = arguments[_key2];
-      }
+// Prefix measurements so that it's possible to filter them.
+// Longer prefixes are hard to read in DevTools.
+var reactEmoji = "\u269B";
+var warningEmoji = "\u26D4";
+var supportsUserTiming =
+  typeof performance !== "undefined" &&
+  typeof performance.mark === "function" &&
+  typeof performance.clearMarks === "function" &&
+  typeof performance.measure === "function" &&
+  typeof performance.clearMeasures === "function";
 
-      printWarning.apply(undefined, [format].concat(args));
-    }
-  };
-}
+// Keep track of current fiber so that we know the path to unwind on pause.
+// TODO: this looks the same as nextUnitOfWork in scheduler. Can we unify them?
+var currentFiber = null;
+// If we're in the middle of user code, which fiber and method is it?
+// Reusing `currentFiber` would be confusing for this because user code fiber
+// can change during commit phase too, but we don't need to unwind it (since
+// lifecycles in the commit phase don't resemble a tree).
+var currentPhase = null;
+var currentPhaseFiber = null;
+// Did lifecycle hook schedule an update? This is often a performance problem,
+// so we will keep track of it, and include it in the report.
+// Track commits caused by cascading updates.
+var isCommitting = false;
+var hasScheduledUpdateInCurrentCommit = false;
+var hasScheduledUpdateInCurrentPhase = false;
+var commitCountInCurrentWorkLoop = 0;
+var effectCountInCurrentCommit = 0;
+var isWaitingForCallback = false;
+// During commits, we only show a measurement once per method name
+// to avoid stretch the commit phase with measurement overhead.
+var labelsInCurrentCommit = new Set();
 
-var lowPriorityWarning$1 = lowPriorityWarning;
+var formatMarkName = function(markName) {
+  return reactEmoji + " " + markName;
+};
 
-var ReactStrictModeWarnings = {
-  discardPendingWarnings: function() {},
-  flushPendingDeprecationWarnings: function() {},
-  flushPendingUnsafeLifecycleWarnings: function() {},
-  recordDeprecationWarnings: function(fiber, instance) {},
-  recordUnsafeLifecycleWarnings: function(fiber, instance) {}
+var formatLabel = function(label, warning$$1) {
+  var prefix = warning$$1 ? warningEmoji + " " : reactEmoji + " ";
+  var suffix = warning$$1 ? " Warning: " + warning$$1 : "";
+  return "" + prefix + label + suffix;
 };
 
-{
-  var LIFECYCLE_SUGGESTIONS = {
-    UNSAFE_componentWillMount: "componentDidMount",
-    UNSAFE_componentWillReceiveProps: "static getDerivedStateFromProps",
-    UNSAFE_componentWillUpdate: "componentDidUpdate"
-  };
+var beginMark = function(markName) {
+  performance.mark(formatMarkName(markName));
+};
 
-  var pendingComponentWillMountWarnings = [];
-  var pendingComponentWillReceivePropsWarnings = [];
-  var pendingComponentWillUpdateWarnings = [];
-  var pendingUnsafeLifecycleWarnings = new Map();
+var clearMark = function(markName) {
+  performance.clearMarks(formatMarkName(markName));
+};
 
-  // Tracks components we have already warned about.
-  var didWarnAboutDeprecatedLifecycles = new Set();
-  var didWarnAboutUnsafeLifecycles = new Set();
+var endMark = function(label, markName, warning$$1) {
+  var formattedMarkName = formatMarkName(markName);
+  var formattedLabel = formatLabel(label, warning$$1);
+  try {
+    performance.measure(formattedLabel, formattedMarkName);
+  } catch (err) {}
+  // If previous mark was missing for some reason, this will throw.
+  // This could only happen if React crashed in an unexpected place earlier.
+  // Don't pile on with more errors.
 
-  ReactStrictModeWarnings.discardPendingWarnings = function() {
-    pendingComponentWillMountWarnings = [];
-    pendingComponentWillReceivePropsWarnings = [];
-    pendingComponentWillUpdateWarnings = [];
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+  // Clear marks immediately to avoid growing buffer.
+  performance.clearMarks(formattedMarkName);
+  performance.clearMeasures(formattedLabel);
+};
 
-  ReactStrictModeWarnings.flushPendingUnsafeLifecycleWarnings = function() {
-    pendingUnsafeLifecycleWarnings.forEach(function(
-      lifecycleWarningsMap,
-      strictRoot
-    ) {
-      var lifecyclesWarningMesages = [];
+var getFiberMarkName = function(label, debugID) {
+  return label + " (#" + debugID + ")";
+};
 
-      Object.keys(lifecycleWarningsMap).forEach(function(lifecycle) {
-        var lifecycleWarnings = lifecycleWarningsMap[lifecycle];
-        if (lifecycleWarnings.length > 0) {
-          var componentNames = new Set();
-          lifecycleWarnings.forEach(function(fiber) {
-            componentNames.add(getComponentName(fiber) || "Component");
-            didWarnAboutUnsafeLifecycles.add(fiber.type);
-          });
+var getFiberLabel = function(componentName, isMounted, phase) {
+  if (phase === null) {
+    // These are composite component total time measurements.
+    return componentName + " [" + (isMounted ? "update" : "mount") + "]";
+  } else {
+    // Composite component methods.
+    return componentName + "." + phase;
+  }
+};
 
-          var formatted = lifecycle.replace("UNSAFE_", "");
-          var suggestion = LIFECYCLE_SUGGESTIONS[lifecycle];
-          var sortedComponentNames = Array.from(componentNames)
-            .sort()
-            .join(", ");
+var beginFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
 
-          lifecyclesWarningMesages.push(
-            formatted +
-              ": Please update the following components to use " +
-              (suggestion + " instead: " + sortedComponentNames)
-          );
-        }
-      });
+  if (isCommitting && labelsInCurrentCommit.has(label)) {
+    // During the commit phase, we don't show duplicate labels because
+    // there is a fixed overhead for every measurement, and we don't
+    // want to stretch the commit phase beyond necessary.
+    return false;
+  }
+  labelsInCurrentCommit.add(label);
 
-      if (lifecyclesWarningMesages.length > 0) {
-        var strictRootComponentStack = getStackAddendumByWorkInProgressFiber(
-          strictRoot
-        );
+  var markName = getFiberMarkName(label, debugID);
+  beginMark(markName);
+  return true;
+};
 
-        warning(
-          false,
-          "Unsafe lifecycle methods were found within a strict-mode tree:%s" +
-            "\n\n%s" +
-            "\n\nLearn more about this warning here:" +
-            "\nhttps://fb.me/react-strict-mode-warnings",
-          strictRootComponentStack,
-          lifecyclesWarningMesages.join("\n\n")
-        );
-      }
-    });
+var clearFiberMark = function(fiber, phase) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  clearMark(markName);
+};
 
-    pendingUnsafeLifecycleWarnings = new Map();
-  };
+var endFiberMark = function(fiber, phase, warning$$1) {
+  var componentName = getComponentName(fiber) || "Unknown";
+  var debugID = fiber._debugID;
+  var isMounted = fiber.alternate !== null;
+  var label = getFiberLabel(componentName, isMounted, phase);
+  var markName = getFiberMarkName(label, debugID);
+  endMark(label, markName, warning$$1);
+};
 
-  var getStrictRoot = function(fiber) {
-    var maybeStrictRoot = null;
+var shouldIgnoreFiber = function(fiber) {
+  // Host components should be skipped in the timeline.
+  // We could check typeof fiber.type, but does this work with RN?
+  switch (fiber.tag) {
+    case HostRoot:
+    case HostComponent:
+    case HostText:
+    case HostPortal:
+    case CallComponent:
+    case ReturnComponent:
+    case Fragment:
+    case ContextProvider:
+    case ContextConsumer:
+      return true;
+    default:
+      return false;
+  }
+};
 
-    while (fiber !== null) {
-      if (fiber.mode & StrictMode) {
-        maybeStrictRoot = fiber;
-      }
+var clearPendingPhaseMeasurement = function() {
+  if (currentPhase !== null && currentPhaseFiber !== null) {
+    clearFiberMark(currentPhaseFiber, currentPhase);
+  }
+  currentPhaseFiber = null;
+  currentPhase = null;
+  hasScheduledUpdateInCurrentPhase = false;
+};
 
-      fiber = fiber["return"];
+var pauseTimers = function() {
+  // Stops all currently active measurements so that they can be resumed
+  // if we continue in a later deferred loop from the same unit of work.
+  var fiber = currentFiber;
+  while (fiber) {
+    if (fiber._debugIsCurrentlyTiming) {
+      endFiberMark(fiber, null, null);
     }
+    fiber = fiber["return"];
+  }
+};
 
-    return maybeStrictRoot;
-  };
-
-  ReactStrictModeWarnings.flushPendingDeprecationWarnings = function() {
-    if (pendingComponentWillMountWarnings.length > 0) {
-      var uniqueNames = new Set();
-      pendingComponentWillMountWarnings.forEach(function(fiber) {
-        uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
+var resumeTimersRecursively = function(fiber) {
+  if (fiber["return"] !== null) {
+    resumeTimersRecursively(fiber["return"]);
+  }
+  if (fiber._debugIsCurrentlyTiming) {
+    beginFiberMark(fiber, null);
+  }
+};
 
-      var sortedNames = Array.from(uniqueNames)
-        .sort()
-        .join(", ");
+var resumeTimers = function() {
+  // Resumes all measurements that were active during the last deferred loop.
+  if (currentFiber !== null) {
+    resumeTimersRecursively(currentFiber);
+  }
+};
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillMount is deprecated and will be removed in the next major version. " +
-          "Use componentDidMount instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillMount." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        sortedNames
-      );
+function recordEffect() {
+  if (enableUserTimingAPI) {
+    effectCountInCurrentCommit++;
+  }
+}
 
-      pendingComponentWillMountWarnings = [];
+function recordScheduleUpdate() {
+  if (enableUserTimingAPI) {
+    if (isCommitting) {
+      hasScheduledUpdateInCurrentCommit = true;
     }
+    if (
+      currentPhase !== null &&
+      currentPhase !== "componentWillMount" &&
+      currentPhase !== "componentWillReceiveProps"
+    ) {
+      hasScheduledUpdateInCurrentPhase = true;
+    }
+  }
+}
 
-    if (pendingComponentWillReceivePropsWarnings.length > 0) {
-      var _uniqueNames = new Set();
-      pendingComponentWillReceivePropsWarnings.forEach(function(fiber) {
-        _uniqueNames.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames = Array.from(_uniqueNames)
-        .sort()
-        .join(", ");
+function startRequestCallbackTimer() {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming && !isWaitingForCallback) {
+      isWaitingForCallback = true;
+      beginMark("(Waiting for async callback...)");
+    }
+  }
+}
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillReceiveProps is deprecated and will be removed in the next major version. " +
-          "Use static getDerivedStateFromProps instead." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames
+function stopRequestCallbackTimer(didExpire) {
+  if (enableUserTimingAPI) {
+    if (supportsUserTiming) {
+      isWaitingForCallback = false;
+      var warning$$1 = didExpire ? "React was blocked by main thread" : null;
+      endMark(
+        "(Waiting for async callback...)",
+        "(Waiting for async callback...)",
+        warning$$1
       );
-
-      pendingComponentWillReceivePropsWarnings = [];
     }
+  }
+}
 
-    if (pendingComponentWillUpdateWarnings.length > 0) {
-      var _uniqueNames2 = new Set();
-      pendingComponentWillUpdateWarnings.forEach(function(fiber) {
-        _uniqueNames2.add(getComponentName(fiber) || "Component");
-        didWarnAboutDeprecatedLifecycles.add(fiber.type);
-      });
-
-      var _sortedNames2 = Array.from(_uniqueNames2)
-        .sort()
-        .join(", ");
+function startWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, this is the fiber to unwind from.
+    currentFiber = fiber;
+    if (!beginFiberMark(fiber, null)) {
+      return;
+    }
+    fiber._debugIsCurrentlyTiming = true;
+  }
+}
 
-      lowPriorityWarning$1(
-        false,
-        "componentWillUpdate is deprecated and will be removed in the next major version. " +
-          "Use componentDidUpdate instead. As a temporary workaround, " +
-          "you can rename to UNSAFE_componentWillUpdate." +
-          "\n\nPlease update the following components: %s" +
-          "\n\nLearn more about this warning here:" +
-          "\nhttps://fb.me/react-async-component-lifecycle-hooks",
-        _sortedNames2
-      );
+function cancelWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // Remember we shouldn't complete measurement for this fiber.
+    // Otherwise flamechart will be deep even for small updates.
+    fiber._debugIsCurrentlyTiming = false;
+    clearFiberMark(fiber, null);
+  }
+}
 
-      pendingComponentWillUpdateWarnings = [];
+function stopWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
+      return;
     }
-  };
+    fiber._debugIsCurrentlyTiming = false;
+    endFiberMark(fiber, null, null);
+  }
+}
 
-  ReactStrictModeWarnings.recordDeprecationWarnings = function(
-    fiber,
-    instance
-  ) {
-    // Dedup strategy: Warn once per component.
-    if (didWarnAboutDeprecatedLifecycles.has(fiber.type)) {
+function stopFailedWorkTimer(fiber) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming || shouldIgnoreFiber(fiber)) {
+      return;
+    }
+    // If we pause, its parent is the fiber to unwind from.
+    currentFiber = fiber["return"];
+    if (!fiber._debugIsCurrentlyTiming) {
       return;
     }
+    fiber._debugIsCurrentlyTiming = false;
+    var warning$$1 = "An error was thrown inside this error boundary";
+    endFiberMark(fiber, null, warning$$1);
+  }
+}
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillMountWarnings.push(fiber);
+function startPhaseTimer(fiber, phase) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (
-      typeof instance.componentWillReceiveProps === "function" &&
-      instance.componentWillReceiveProps.__suppressDeprecationWarning !== true
-    ) {
-      pendingComponentWillReceivePropsWarnings.push(fiber);
+    clearPendingPhaseMeasurement();
+    if (!beginFiberMark(fiber, phase)) {
+      return;
     }
-    if (typeof instance.componentWillUpdate === "function") {
-      pendingComponentWillUpdateWarnings.push(fiber);
+    currentPhaseFiber = fiber;
+    currentPhase = phase;
+  }
+}
+
+function stopPhaseTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-  };
+    if (currentPhase !== null && currentPhaseFiber !== null) {
+      var warning$$1 = hasScheduledUpdateInCurrentPhase
+        ? "Scheduled a cascading update"
+        : null;
+      endFiberMark(currentPhaseFiber, currentPhase, warning$$1);
+    }
+    currentPhase = null;
+    currentPhaseFiber = null;
+  }
+}
 
-  ReactStrictModeWarnings.recordUnsafeLifecycleWarnings = function(
-    fiber,
-    instance
-  ) {
-    var strictRoot = getStrictRoot(fiber);
+function startWorkLoopTimer(nextUnitOfWork) {
+  if (enableUserTimingAPI) {
+    currentFiber = nextUnitOfWork;
+    if (!supportsUserTiming) {
+      return;
+    }
+    commitCountInCurrentWorkLoop = 0;
+    // This is top level call.
+    // Any other measurements are performed within.
+    beginMark("(React Tree Reconciliation)");
+    // Resume any measurements that were in progress during the last loop.
+    resumeTimers();
+  }
+}
 
-    // Dedup strategy: Warn once per component.
-    // This is difficult to track any other way since component names
-    // are often vague and are likely to collide between 3rd party libraries.
-    // An expand property is probably okay to use here since it's DEV-only,
-    // and will only be set in the event of serious warnings.
-    if (didWarnAboutUnsafeLifecycles.has(fiber.type)) {
+function stopWorkLoopTimer(interruptedBy) {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    var warning$$1 = null;
+    if (interruptedBy !== null) {
+      if (interruptedBy.tag === HostRoot) {
+        warning$$1 = "A top-level update interrupted the previous render";
+      } else {
+        var componentName = getComponentName(interruptedBy) || "Unknown";
+        warning$$1 =
+          "An update to " + componentName + " interrupted the previous render";
+      }
+    } else if (commitCountInCurrentWorkLoop > 1) {
+      warning$$1 = "There were cascading updates";
+    }
+    commitCountInCurrentWorkLoop = 0;
+    // Pause any measurements until the next loop.
+    pauseTimers();
+    endMark(
+      "(React Tree Reconciliation)",
+      "(React Tree Reconciliation)",
+      warning$$1
+    );
+  }
+}
 
-    // Don't warn about react-lifecycles-compat polyfilled components.
-    // Note that it is sufficient to check for the presence of a
-    // single lifecycle, componentWillMount, with the polyfill flag.
-    if (
-      typeof instance.componentWillMount === "function" &&
-      instance.componentWillMount.__suppressDeprecationWarning === true
-    ) {
+function startCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
       return;
     }
+    isCommitting = true;
+    hasScheduledUpdateInCurrentCommit = false;
+    labelsInCurrentCommit.clear();
+    beginMark("(Committing Changes)");
+  }
+}
 
-    var warningsForRoot = void 0;
-    if (!pendingUnsafeLifecycleWarnings.has(strictRoot)) {
-      warningsForRoot = {
-        UNSAFE_componentWillMount: [],
-        UNSAFE_componentWillReceiveProps: [],
-        UNSAFE_componentWillUpdate: []
-      };
+function stopCommitTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
 
-      pendingUnsafeLifecycleWarnings.set(strictRoot, warningsForRoot);
-    } else {
-      warningsForRoot = pendingUnsafeLifecycleWarnings.get(strictRoot);
+    var warning$$1 = null;
+    if (hasScheduledUpdateInCurrentCommit) {
+      warning$$1 = "Lifecycle hook scheduled a cascading update";
+    } else if (commitCountInCurrentWorkLoop > 0) {
+      warning$$1 = "Caused by a cascading update in earlier commit";
     }
+    hasScheduledUpdateInCurrentCommit = false;
+    commitCountInCurrentWorkLoop++;
+    isCommitting = false;
+    labelsInCurrentCommit.clear();
 
-    var unsafeLifecycles = [];
-    if (
-      typeof instance.componentWillMount === "function" ||
-      typeof instance.UNSAFE_componentWillMount === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillMount");
+    endMark("(Committing Changes)", "(Committing Changes)", warning$$1);
+  }
+}
+
+function startCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (
-      typeof instance.componentWillReceiveProps === "function" ||
-      typeof instance.UNSAFE_componentWillReceiveProps === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillReceiveProps");
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Host Effects)");
+  }
+}
+
+function stopCommitHostEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-    if (
-      typeof instance.componentWillUpdate === "function" ||
-      typeof instance.UNSAFE_componentWillUpdate === "function"
-    ) {
-      unsafeLifecycles.push("UNSAFE_componentWillUpdate");
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Host Effects: " + count + " Total)",
+      "(Committing Host Effects)",
+      null
+    );
+  }
+}
+
+function startCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Calling Lifecycle Methods)");
+  }
+}
 
-    if (unsafeLifecycles.length > 0) {
-      unsafeLifecycles.forEach(function(lifecycle) {
-        warningsForRoot[lifecycle].push(fiber);
-      });
+function stopCommitLifeCyclesTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
     }
-  };
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Calling Lifecycle Methods: " + count + " Total)",
+      "(Calling Lifecycle Methods)",
+      null
+    );
+  }
 }
 
 var didWarnUpdateInsideUpdate = void 0;
@@ -6430,12 +6105,20 @@ function callGetDerivedStateFromCatch(ctor, capturedValues) {
 }
 
 var ReactFiberClassComponent = function(
+  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
   memoizeState
 ) {
+  var cacheContext = legacyContext.cacheContext,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    isContextConsumer = legacyContext.isContextConsumer,
+    hasContextChanged = legacyContext.hasContextChanged;
+
   // Class component state updater
+
   var updater = {
     isMounted: isMounted,
     enqueueSetState: function(instance, partialState, callback) {
@@ -8568,84 +8251,19 @@ function cloneChildFibers(current, workInProgress) {
     currentChild.pendingProps,
     currentChild.expirationTime
   );
-  workInProgress.child = newChild;
-
-  newChild["return"] = workInProgress;
-  while (currentChild.sibling !== null) {
-    currentChild = currentChild.sibling;
-    newChild = newChild.sibling = createWorkInProgress(
-      currentChild,
-      currentChild.pendingProps,
-      currentChild.expirationTime
-    );
-    newChild["return"] = workInProgress;
-  }
-  newChild.sibling = null;
-}
-
-var changedBitsStack = [];
-var currentValueStack = [];
-var stack = [];
-var index$1 = -1;
-
-var rendererSigil = void 0;
-{
-  // Use this to detect multiple renderers using the same context
-  rendererSigil = {};
-}
-
-function pushProvider(providerFiber) {
-  var context = providerFiber.type.context;
-  index$1 += 1;
-  changedBitsStack[index$1] = context._changedBits;
-  currentValueStack[index$1] = context._currentValue;
-  stack[index$1] = providerFiber;
-  context._currentValue = providerFiber.pendingProps.value;
-  context._changedBits = providerFiber.stateNode;
-
-  {
-    warning(
-      context._currentRenderer === null ||
-        context._currentRenderer === rendererSigil,
-      "Detected multiple renderers concurrently rendering the " +
-        "same context provider. This is currently unsupported."
-    );
-    context._currentRenderer = rendererSigil;
-  }
-}
-
-function popProvider(providerFiber) {
-  {
-    warning(
-      index$1 > -1 && providerFiber === stack[index$1],
-      "Unexpected pop."
-    );
-  }
-  var changedBits = changedBitsStack[index$1];
-  var currentValue = currentValueStack[index$1];
-  changedBitsStack[index$1] = null;
-  currentValueStack[index$1] = null;
-  stack[index$1] = null;
-  index$1 -= 1;
-  var context = providerFiber.type.context;
-  context._currentValue = currentValue;
-  context._changedBits = changedBits;
-}
+  workInProgress.child = newChild;
 
-function resetProviderStack() {
-  for (var i = index$1; i > -1; i--) {
-    var providerFiber = stack[i];
-    var context = providerFiber.type.context;
-    context._currentValue = context._defaultValue;
-    context._changedBits = 0;
-    changedBitsStack[i] = null;
-    currentValueStack[i] = null;
-    stack[i] = null;
-    {
-      context._currentRenderer = null;
-    }
+  newChild["return"] = workInProgress;
+  while (currentChild.sibling !== null) {
+    currentChild = currentChild.sibling;
+    newChild = newChild.sibling = createWorkInProgress(
+      currentChild,
+      currentChild.pendingProps,
+      currentChild.expirationTime
+    );
+    newChild["return"] = workInProgress;
   }
-  index$1 = -1;
+  newChild.sibling = null;
 }
 
 var didWarnAboutBadClass = void 0;
@@ -8661,6 +8279,8 @@ var didWarnAboutStatelessRefs = void 0;
 var ReactFiberBeginWork = function(
   config,
   hostContext,
+  legacyContext,
+  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
@@ -8669,12 +8289,20 @@ var ReactFiberBeginWork = function(
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree;
   var pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer;
+  var pushProvider = newContext.pushProvider;
+  var getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    hasLegacyContextChanged = legacyContext.hasContextChanged,
+    pushLegacyContextProvider = legacyContext.pushContextProvider,
+    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
+    invalidateContextProvider = legacyContext.invalidateContextProvider;
   var enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
 
   var _ReactFiberClassCompo = ReactFiberClassComponent(
+      legacyContext,
       scheduleWork,
       computeExpirationForFiber,
       memoizeProps,
@@ -8742,7 +8370,7 @@ var ReactFiberBeginWork = function(
 
   function updateFragment(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextChildren) {
@@ -8755,7 +8383,7 @@ var ReactFiberBeginWork = function(
 
   function updateMode(current, workInProgress) {
     var nextChildren = workInProgress.pendingProps.children;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (
@@ -8784,7 +8412,7 @@ var ReactFiberBeginWork = function(
     var fn = workInProgress.type;
     var nextProps = workInProgress.pendingProps;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else {
@@ -8817,7 +8445,7 @@ var ReactFiberBeginWork = function(
     // Push context providers early to prevent context stack mismatches.
     // During mounting we don't know the child context yet as the instance doesn't exist.
     // We will invalidate the child context in finishClassComponent() right after rendering.
-    var hasContext = pushContextProvider(workInProgress);
+    var hasContext = pushLegacyContextProvider(workInProgress);
     var shouldUpdate = void 0;
     if (current === null) {
       if (workInProgress.stateNode === null) {
@@ -9042,7 +8670,7 @@ var ReactFiberBeginWork = function(
     var nextProps = workInProgress.pendingProps;
     var prevProps = current !== null ? current.memoizedProps : null;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (memoizedProps === nextProps) {
@@ -9177,7 +8805,7 @@ var ReactFiberBeginWork = function(
       // Push context providers early to prevent context stack mismatches.
       // During mounting we don't know the child context yet as the instance doesn't exist.
       // We will invalidate the child context in finishClassComponent() right after rendering.
-      var hasContext = pushContextProvider(workInProgress);
+      var hasContext = pushLegacyContextProvider(workInProgress);
       adoptClassInstance(workInProgress, value);
       mountClassInstance(workInProgress, renderExpirationTime);
       return finishClassComponent(
@@ -9250,7 +8878,7 @@ var ReactFiberBeginWork = function(
 
   function updateCallComponent(current, workInProgress, renderExpirationTime) {
     var nextProps = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextProps) {
@@ -9293,7 +8921,7 @@ var ReactFiberBeginWork = function(
   ) {
     pushHostContainer(workInProgress, workInProgress.stateNode.containerInfo);
     var nextChildren = workInProgress.pendingProps;
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (workInProgress.memoizedProps === nextChildren) {
@@ -9327,6 +8955,10 @@ var ReactFiberBeginWork = function(
     renderExpirationTime
   ) {
     var fiber = workInProgress.child;
+    if (fiber !== null) {
+      // Set the return pointer of the child to the work-in-progress fiber.
+      fiber["return"] = workInProgress;
+    }
     while (fiber !== null) {
       var nextFiber = void 0;
       // Visit this fiber.
@@ -9419,7 +9051,7 @@ var ReactFiberBeginWork = function(
     var newProps = workInProgress.pendingProps;
     var oldProps = workInProgress.memoizedProps;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (oldProps === newProps) {
@@ -9515,7 +9147,7 @@ var ReactFiberBeginWork = function(
     var newValue = context._currentValue;
     var changedBits = context._changedBits;
 
-    if (hasContextChanged()) {
+    if (hasLegacyContextChanged()) {
       // Normally we can bail out on props equality but if context has changed
       // we don't do the bailout and we have to reuse existing props instead.
     } else if (changedBits === 0 && oldProps === newProps) {
@@ -9612,7 +9244,7 @@ var ReactFiberBeginWork = function(
         pushHostRootContext(workInProgress);
         break;
       case ClassComponent:
-        pushContextProvider(workInProgress);
+        pushLegacyContextProvider(workInProgress);
         break;
       case HostPortal:
         pushHostContainer(
@@ -9725,7 +9357,13 @@ var ReactFiberBeginWork = function(
   };
 };
 
-var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
+var ReactFiberCompleteWork = function(
+  config,
+  hostContext,
+  legacyContext,
+  newContext,
+  hydrationContext
+) {
   var createInstance = config.createInstance,
     createTextInstance = config.createTextInstance,
     appendInitialChild = config.appendInitialChild,
@@ -9737,6 +9375,9 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer;
+  var popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
+  var popProvider = newContext.popProvider;
   var prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -10052,7 +9693,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
         return null;
       case ClassComponent: {
         // We are leaving this subtree, so pop context if any.
-        popContextProvider(workInProgress);
+        popLegacyContextProvider(workInProgress);
 
         // If this component caught an error, schedule an error log effect.
         var instance = workInProgress.stateNode;
@@ -10071,7 +9712,7 @@ var ReactFiberCompleteWork = function(config, hostContext, hydrationContext) {
       }
       case HostRoot: {
         popHostContainer(workInProgress);
-        popTopLevelContextObject(workInProgress);
+        popTopLevelLegacyContextObject(workInProgress);
         var fiberRoot = workInProgress.stateNode;
         if (fiberRoot.pendingContext) {
           fiberRoot.context = fiberRoot.pendingContext;
@@ -10298,11 +9939,16 @@ function createCapturedValue(value, source) {
 
 var ReactFiberUnwindWork = function(
   hostContext,
+  legacyContext,
+  newContext,
   scheduleWork,
   isAlreadyFailedLegacyErrorBoundary
 ) {
   var popHostContainer = hostContext.popHostContainer,
     popHostContext = hostContext.popHostContext;
+  var popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject;
+  var popProvider = newContext.popProvider;
 
   function throwException(returnFiber, sourceFiber, rawValue) {
     // The source fiber did not complete.
@@ -10358,7 +10004,7 @@ var ReactFiberUnwindWork = function(
   function unwindWork(workInProgress) {
     switch (workInProgress.tag) {
       case ClassComponent: {
-        popContextProvider(workInProgress);
+        popLegacyContextProvider(workInProgress);
         var effectTag = workInProgress.effectTag;
         if (effectTag & ShouldCapture) {
           workInProgress.effectTag = (effectTag & ~ShouldCapture) | DidCapture;
@@ -10368,7 +10014,7 @@ var ReactFiberUnwindWork = function(
       }
       case HostRoot: {
         popHostContainer(workInProgress);
-        popTopLevelContextObject(workInProgress);
+        popTopLevelLegacyContextObject(workInProgress);
         var _effectTag = workInProgress.effectTag;
         if (_effectTag & ShouldCapture) {
           workInProgress.effectTag = (_effectTag & ~ShouldCapture) | DidCapture;
@@ -10390,9 +10036,37 @@ var ReactFiberUnwindWork = function(
         return null;
     }
   }
+
+  function unwindInterruptedWork(interruptedWork) {
+    switch (interruptedWork.tag) {
+      case ClassComponent: {
+        popLegacyContextProvider(interruptedWork);
+        break;
+      }
+      case HostRoot: {
+        popHostContainer(interruptedWork);
+        popTopLevelLegacyContextObject(interruptedWork);
+        break;
+      }
+      case HostComponent: {
+        popHostContext(interruptedWork);
+        break;
+      }
+      case HostPortal:
+        popHostContainer(interruptedWork);
+        break;
+      case ContextProvider:
+        popProvider(interruptedWork);
+        break;
+      default:
+        break;
+    }
+  }
+
   return {
     throwException: throwException,
-    unwindWork: unwindWork
+    unwindWork: unwindWork,
+    unwindInterruptedWork: unwindInterruptedWork
   };
 };
 
@@ -10758,7 +10432,7 @@ var ReactFiberCommitWork = function(
             warning(
               false,
               "Unexpected ref object provided for %s. " +
-                "Use either a ref-setter function or Reacte.createRef().%s",
+                "Use either a ref-setter function or React.createRef().%s",
               getComponentName(finishedWork),
               getStackAddendumByWorkInProgressFiber(finishedWork)
             );
@@ -11264,9 +10938,12 @@ var ReactFiberCommitWork = function(
 
 var NO_CONTEXT = {};
 
-var ReactFiberHostContext = function(config) {
+var ReactFiberHostContext = function(config, stack) {
   var getChildHostContext = config.getChildHostContext,
     getRootHostContext = config.getRootHostContext;
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
 
   var contextStackCursor = createCursor(NO_CONTEXT);
   var contextFiberStackCursor = createCursor(NO_CONTEXT);
@@ -11337,19 +11014,13 @@ var ReactFiberHostContext = function(config) {
     pop(contextFiberStackCursor, fiber);
   }
 
-  function resetHostContainer() {
-    contextStackCursor.current = NO_CONTEXT;
-    rootInstanceStackCursor.current = NO_CONTEXT;
-  }
-
   return {
     getHostContext: getHostContext,
     getRootHostContainer: getRootHostContainer,
     popHostContainer: popHostContainer,
     popHostContext: popHostContext,
     pushHostContainer: pushHostContainer,
-    pushHostContext: pushHostContext,
-    resetHostContainer: resetHostContainer
+    pushHostContext: pushHostContext
   };
 };
 
@@ -11719,6 +11390,425 @@ var ReactFiberInstrumentation = {
 
 var ReactFiberInstrumentation_1 = ReactFiberInstrumentation;
 
+var warnedAboutMissingGetChildContext = void 0;
+
+{
+  warnedAboutMissingGetChildContext = {};
+}
+
+var ReactFiberLegacyContext = function(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
+
+  // A cursor to the current merged context object on the stack.
+
+  var contextStackCursor = createCursor(emptyObject);
+  // A cursor to a boolean indicating whether the context has changed.
+  var didPerformWorkStackCursor = createCursor(false);
+  // Keep track of the previous context object that was on the stack.
+  // We use this to get access to the parent context after we have already
+  // pushed the next context provider, and now need to merge their contexts.
+  var previousContext = emptyObject;
+
+  function getUnmaskedContext(workInProgress) {
+    var hasOwnContext = isContextProvider(workInProgress);
+    if (hasOwnContext) {
+      // If the fiber is a context provider itself, when we read its context
+      // we have already pushed its own child context on the stack. A context
+      // provider should not "see" its own child context. Therefore we read the
+      // previous (parent) context instead for a context provider.
+      return previousContext;
+    }
+    return contextStackCursor.current;
+  }
+
+  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+    var instance = workInProgress.stateNode;
+    instance.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    instance.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  }
+
+  function getMaskedContext(workInProgress, unmaskedContext) {
+    var type = workInProgress.type;
+    var contextTypes = type.contextTypes;
+    if (!contextTypes) {
+      return emptyObject;
+    }
+
+    // Avoid recreating masked context unless unmasked context has changed.
+    // Failing to do this will result in unnecessary calls to componentWillReceiveProps.
+    // This may trigger infinite loops if componentWillReceiveProps calls setState.
+    var instance = workInProgress.stateNode;
+    if (
+      instance &&
+      instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+    ) {
+      return instance.__reactInternalMemoizedMaskedChildContext;
+    }
+
+    var context = {};
+    for (var key in contextTypes) {
+      context[key] = unmaskedContext[key];
+    }
+
+    {
+      var name = getComponentName(workInProgress) || "Unknown";
+      checkPropTypes(
+        contextTypes,
+        context,
+        "context",
+        name,
+        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      );
+    }
+
+    // Cache unmasked context so we can avoid recreating masked context unless necessary.
+    // Context is created before the class component is instantiated so check for instance.
+    if (instance) {
+      cacheContext(workInProgress, unmaskedContext, context);
+    }
+
+    return context;
+  }
+
+  function hasContextChanged() {
+    return didPerformWorkStackCursor.current;
+  }
+
+  function isContextConsumer(fiber) {
+    return fiber.tag === ClassComponent && fiber.type.contextTypes != null;
+  }
+
+  function isContextProvider(fiber) {
+    return fiber.tag === ClassComponent && fiber.type.childContextTypes != null;
+  }
+
+  function popContextProvider(fiber) {
+    if (!isContextProvider(fiber)) {
+      return;
+    }
+
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
+
+  function popTopLevelContextObject(fiber) {
+    pop(didPerformWorkStackCursor, fiber);
+    pop(contextStackCursor, fiber);
+  }
+
+  function pushTopLevelContextObject(fiber, context, didChange) {
+    invariant(
+      contextStackCursor.cursor == null,
+      "Unexpected context found on stack. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+
+    push(contextStackCursor, context, fiber);
+    push(didPerformWorkStackCursor, didChange, fiber);
+  }
+
+  function processChildContext(fiber, parentContext) {
+    var instance = fiber.stateNode;
+    var childContextTypes = fiber.type.childContextTypes;
+
+    // TODO (bvaughn) Replace this behavior with an invariant() in the future.
+    // It has only been added in Fiber to match the (unintentional) behavior in Stack.
+    if (typeof instance.getChildContext !== "function") {
+      {
+        var componentName = getComponentName(fiber) || "Unknown";
+
+        if (!warnedAboutMissingGetChildContext[componentName]) {
+          warnedAboutMissingGetChildContext[componentName] = true;
+          warning(
+            false,
+            "%s.childContextTypes is specified but there is no getChildContext() method " +
+              "on the instance. You can either define getChildContext() on %s or remove " +
+              "childContextTypes from it.",
+            componentName,
+            componentName
+          );
+        }
+      }
+      return parentContext;
+    }
+
+    var childContext = void 0;
+    {
+      ReactDebugCurrentFiber.setCurrentPhase("getChildContext");
+    }
+    startPhaseTimer(fiber, "getChildContext");
+    childContext = instance.getChildContext();
+    stopPhaseTimer();
+    {
+      ReactDebugCurrentFiber.setCurrentPhase(null);
+    }
+    for (var contextKey in childContext) {
+      invariant(
+        contextKey in childContextTypes,
+        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+        getComponentName(fiber) || "Unknown",
+        contextKey
+      );
+    }
+    {
+      var name = getComponentName(fiber) || "Unknown";
+      checkPropTypes(
+        childContextTypes,
+        childContext,
+        "child context",
+        name,
+        // In practice, there is one case in which we won't get a stack. It's when
+        // somebody calls unstable_renderSubtreeIntoContainer() and we process
+        // context from the parent component instance. The stack will be missing
+        // because it's outside of the reconciliation, and so the pointer has not
+        // been set. This is rare and doesn't matter. We'll also remove that API.
+        ReactDebugCurrentFiber.getCurrentFiberStackAddendum
+      );
+    }
+
+    return Object.assign({}, parentContext, childContext);
+  }
+
+  function pushContextProvider(workInProgress) {
+    if (!isContextProvider(workInProgress)) {
+      return false;
+    }
+
+    var instance = workInProgress.stateNode;
+    // We push the context as early as possible to ensure stack integrity.
+    // If the instance does not exist yet, we will push null at first,
+    // and replace it on the stack later when invalidating the context.
+    var memoizedMergedChildContext =
+      (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+      emptyObject;
+
+    // Remember the parent context so we can merge with it later.
+    // Inherit the parent's did-perform-work value to avoid inadvertently blocking updates.
+    previousContext = contextStackCursor.current;
+    push(contextStackCursor, memoizedMergedChildContext, workInProgress);
+    push(
+      didPerformWorkStackCursor,
+      didPerformWorkStackCursor.current,
+      workInProgress
+    );
+
+    return true;
+  }
+
+  function invalidateContextProvider(workInProgress, didChange) {
+    var instance = workInProgress.stateNode;
+    invariant(
+      instance,
+      "Expected to have an instance by this point. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+
+    if (didChange) {
+      // Merge parent and own context.
+      // Skip this if we're not updating due to sCU.
+      // This avoids unnecessarily recomputing memoized values.
+      var mergedContext = processChildContext(workInProgress, previousContext);
+      instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+
+      // Replace the old (or empty) context with the new one.
+      // It is important to unwind the context in the reverse order.
+      pop(didPerformWorkStackCursor, workInProgress);
+      pop(contextStackCursor, workInProgress);
+      // Now push the new context and mark that it has changed.
+      push(contextStackCursor, mergedContext, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    } else {
+      pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    }
+  }
+
+  function findCurrentUnmaskedContext(fiber) {
+    // Currently this is only used with renderSubtreeIntoContainer; not sure if it
+    // makes sense elsewhere
+    invariant(
+      isFiberMounted(fiber) && fiber.tag === ClassComponent,
+      "Expected subtree parent to be a mounted class component. " +
+        "This error is likely caused by a bug in React. Please file an issue."
+    );
+
+    var node = fiber;
+    while (node.tag !== HostRoot) {
+      if (isContextProvider(node)) {
+        return node.stateNode.__reactInternalMemoizedMergedChildContext;
+      }
+      var parent = node["return"];
+      invariant(
+        parent,
+        "Found unexpected detached subtree parent. " +
+          "This error is likely caused by a bug in React. Please file an issue."
+      );
+      node = parent;
+    }
+    return node.stateNode.context;
+  }
+
+  return {
+    getUnmaskedContext: getUnmaskedContext,
+    cacheContext: cacheContext,
+    getMaskedContext: getMaskedContext,
+    hasContextChanged: hasContextChanged,
+    isContextConsumer: isContextConsumer,
+    isContextProvider: isContextProvider,
+    popContextProvider: popContextProvider,
+    popTopLevelContextObject: popTopLevelContextObject,
+    pushTopLevelContextObject: pushTopLevelContextObject,
+    processChildContext: processChildContext,
+    pushContextProvider: pushContextProvider,
+    invalidateContextProvider: invalidateContextProvider,
+    findCurrentUnmaskedContext: findCurrentUnmaskedContext
+  };
+};
+
+var ReactFiberNewContext = function(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop;
+
+  var providerCursor = createCursor(null);
+  var valueCursor = createCursor(null);
+  var changedBitsCursor = createCursor(0);
+
+  var rendererSigil = void 0;
+  {
+    // Use this to detect multiple renderers using the same context
+    rendererSigil = {};
+  }
+
+  function pushProvider(providerFiber) {
+    var context = providerFiber.type.context;
+
+    push(changedBitsCursor, context._changedBits, providerFiber);
+    push(valueCursor, context._currentValue, providerFiber);
+    push(providerCursor, providerFiber, providerFiber);
+
+    context._currentValue = providerFiber.pendingProps.value;
+    context._changedBits = providerFiber.stateNode;
+
+    {
+      warning(
+        context._currentRenderer === null ||
+          context._currentRenderer === rendererSigil,
+        "Detected multiple renderers concurrently rendering the " +
+          "same context provider. This is currently unsupported."
+      );
+      context._currentRenderer = rendererSigil;
+    }
+  }
+
+  function popProvider(providerFiber) {
+    var changedBits = changedBitsCursor.current;
+    var currentValue = valueCursor.current;
+
+    pop(providerCursor, providerFiber);
+    pop(valueCursor, providerFiber);
+    pop(changedBitsCursor, providerFiber);
+
+    var context = providerFiber.type.context;
+    context._currentValue = currentValue;
+    context._changedBits = changedBits;
+  }
+
+  return {
+    pushProvider: pushProvider,
+    popProvider: popProvider
+  };
+};
+
+var ReactFiberStack = function() {
+  var valueStack = [];
+
+  var fiberStack = void 0;
+
+  {
+    fiberStack = [];
+  }
+
+  var index = -1;
+
+  function createCursor(defaultValue) {
+    return {
+      current: defaultValue
+    };
+  }
+
+  function isEmpty() {
+    return index === -1;
+  }
+
+  function pop(cursor, fiber) {
+    if (index < 0) {
+      {
+        warning(false, "Unexpected pop.");
+      }
+      return;
+    }
+
+    {
+      if (fiber !== fiberStack[index]) {
+        warning(false, "Unexpected Fiber popped.");
+      }
+    }
+
+    cursor.current = valueStack[index];
+
+    valueStack[index] = null;
+
+    {
+      fiberStack[index] = null;
+    }
+
+    index--;
+  }
+
+  function push(cursor, value, fiber) {
+    index++;
+
+    valueStack[index] = cursor.current;
+
+    {
+      fiberStack[index] = fiber;
+    }
+
+    cursor.current = value;
+  }
+
+  function checkThatStackIsEmpty() {
+    {
+      if (index !== -1) {
+        warning(
+          false,
+          "Expected an empty stack. Something was not reset properly."
+        );
+      }
+    }
+  }
+
+  function resetStackAfterFatalErrorInDev() {
+    {
+      index = -1;
+      valueStack.length = 0;
+      fiberStack.length = 0;
+    }
+  }
+
+  return {
+    createCursor: createCursor,
+    isEmpty: isEmpty,
+    pop: pop,
+    push: push,
+    checkThatStackIsEmpty: checkThatStackIsEmpty,
+    resetStackAfterFatalErrorInDev: resetStackAfterFatalErrorInDev
+  };
+};
+
 var invokeGuardedCallback$2 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError = ReactErrorUtils.hasCaughtError;
 var clearCaughtError = ReactErrorUtils.clearCaughtError;
@@ -11779,16 +11869,23 @@ var warnAboutInvalidUpdates = void 0;
 }
 
 var ReactFiberScheduler = function(config) {
-  var hostContext = ReactFiberHostContext(config);
+  var stack = ReactFiberStack();
+  var hostContext = ReactFiberHostContext(config, stack);
+  var legacyContext = ReactFiberLegacyContext(stack);
+  var newContext = ReactFiberNewContext(stack);
   var popHostContext = hostContext.popHostContext,
     popHostContainer = hostContext.popHostContainer;
+  var popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popLegacyContextProvider = legacyContext.popContextProvider;
+  var popProvider = newContext.popProvider;
 
   var hydrationContext = ReactFiberHydrationContext(config);
-  var resetHostContainer = hostContext.resetHostContainer;
 
   var _ReactFiberBeginWork = ReactFiberBeginWork(
       config,
       hostContext,
+      legacyContext,
+      newContext,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
@@ -11798,17 +11895,22 @@ var ReactFiberScheduler = function(config) {
   var _ReactFiberCompleteWo = ReactFiberCompleteWork(
       config,
       hostContext,
+      legacyContext,
+      newContext,
       hydrationContext
     ),
     completeWork = _ReactFiberCompleteWo.completeWork;
 
   var _ReactFiberUnwindWork = ReactFiberUnwindWork(
       hostContext,
+      legacyContext,
+      newContext,
       scheduleWork,
       isAlreadyFailedLegacyErrorBoundary
     ),
     throwException = _ReactFiberUnwindWork.throwException,
-    unwindWork = _ReactFiberUnwindWork.unwindWork;
+    unwindWork = _ReactFiberUnwindWork.unwindWork,
+    unwindInterruptedWork = _ReactFiberUnwindWork.unwindInterruptedWork;
 
   var _ReactFiberCommitWork = ReactFiberCommitWork(
       config,
@@ -11877,13 +11979,13 @@ var ReactFiberScheduler = function(config) {
       switch (failedUnitOfWork.tag) {
         case HostRoot:
           popHostContainer(failedUnitOfWork);
-          popTopLevelContextObject(failedUnitOfWork);
+          popTopLevelLegacyContextObject(failedUnitOfWork);
           break;
         case HostComponent:
           popHostContext(failedUnitOfWork);
           break;
         case ClassComponent:
-          popContextProvider(failedUnitOfWork);
+          popLegacyContextProvider(failedUnitOfWork);
           break;
         case HostPortal:
           popHostContainer(failedUnitOfWork);
@@ -11903,18 +12005,18 @@ var ReactFiberScheduler = function(config) {
     };
   }
 
-  function resetContextStack() {
-    // Reset the stack
-    reset();
-    // Reset the cursors
-    resetContext();
-    resetHostContainer();
-
-    // TODO: Unify new context implementation with other stacks
-    resetProviderStack();
+  function resetStack() {
+    if (nextUnitOfWork !== null) {
+      var interruptedWork = nextUnitOfWork["return"];
+      while (interruptedWork !== null) {
+        unwindInterruptedWork(interruptedWork);
+        interruptedWork = interruptedWork["return"];
+      }
+    }
 
     {
       ReactStrictModeWarnings.discardPendingWarnings();
+      stack.checkThatStackIsEmpty();
     }
 
     nextRoot = null;
@@ -12438,7 +12540,7 @@ var ReactFiberScheduler = function(config) {
       nextUnitOfWork === null
     ) {
       // Reset the stack and start working from the root.
-      resetContextStack();
+      resetStack();
       nextRoot = root;
       nextRenderExpirationTime = expirationTime;
       nextUnitOfWork = createWorkInProgress(
@@ -12491,6 +12593,9 @@ var ReactFiberScheduler = function(config) {
     // Yield back to main thread.
     if (didFatal) {
       // There was a fatal error.
+      {
+        stack.resetStackAfterFatalErrorInDev();
+      }
       return null;
     } else if (nextUnitOfWork === null) {
       // We reached the root.
@@ -12691,7 +12796,7 @@ var ReactFiberScheduler = function(config) {
           ) {
             // This is an interruption. (Used for performance tracking.)
             interruptedBy = fiber;
-            resetContextStack();
+            resetStack();
           }
           if (nextRoot !== root || !isWorking) {
             requestWork(root, expirationTime);
@@ -13262,7 +13367,8 @@ var ReactFiberScheduler = function(config) {
     syncUpdates: syncUpdates,
     interactiveUpdates: interactiveUpdates,
     flushInteractiveUpdates: flushInteractiveUpdates,
-    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration
+    computeUniqueAsyncExpiration: computeUniqueAsyncExpiration,
+    legacyContext: legacyContext
   };
 };
 
@@ -13275,18 +13381,6 @@ var didWarnAboutNestedUpdates = void 0;
 // 0 is PROD, 1 is DEV.
 // Might add PROFILE later.
 
-function getContextForSubtree(parentComponent) {
-  if (!parentComponent) {
-    return emptyObject;
-  }
-
-  var fiber = get(parentComponent);
-  var parentContext = findCurrentUnmaskedContext(fiber);
-  return isContextProvider(fiber)
-    ? processChildContext(fiber, parentContext)
-    : parentContext;
-}
-
 var ReactFiberReconciler$1 = function(config) {
   var getPublicInstance = config.getPublicInstance;
 
@@ -13305,7 +13399,24 @@ var ReactFiberReconciler$1 = function(config) {
     deferredUpdates = _ReactFiberScheduler.deferredUpdates,
     syncUpdates = _ReactFiberScheduler.syncUpdates,
     interactiveUpdates = _ReactFiberScheduler.interactiveUpdates,
-    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates;
+    flushInteractiveUpdates = _ReactFiberScheduler.flushInteractiveUpdates,
+    legacyContext = _ReactFiberScheduler.legacyContext;
+
+  var findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
+    isContextProvider = legacyContext.isContextProvider,
+    processChildContext = legacyContext.processChildContext;
+
+  function getContextForSubtree(parentComponent) {
+    if (!parentComponent) {
+      return emptyObject;
+    }
+
+    var fiber = get(parentComponent);
+    var parentContext = findCurrentUnmaskedContext(fiber);
+    return isContextProvider(fiber)
+      ? processChildContext(fiber, parentContext)
+      : parentContext;
+  }
 
   function scheduleRootUpdate(
     current,
diff --git a/Libraries/Renderer/ReactNativeRenderer-prod.js b/Libraries/Renderer/ReactNativeRenderer-prod.js
index 258608b7f31a6b..f11aa6c82da4b1 100644
--- a/Libraries/Renderer/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/ReactNativeRenderer-prod.js
@@ -1822,141 +1822,6 @@ function findCurrentHostFiberWithNoPortals(parent) {
   }
   return null;
 }
-var valueStack = [],
-  index = -1;
-function pop(cursor) {
-  0 > index ||
-    ((cursor.current = valueStack[index]), (valueStack[index] = null), index--);
-}
-function push(cursor, value) {
-  index++;
-  valueStack[index] = cursor.current;
-  cursor.current = value;
-}
-function getStackAddendumByWorkInProgressFiber(workInProgress) {
-  var info = "";
-  do {
-    a: switch (workInProgress.tag) {
-      case 0:
-      case 1:
-      case 2:
-      case 5:
-        var owner = workInProgress._debugOwner,
-          source = workInProgress._debugSource;
-        var JSCompiler_inline_result = getComponentName(workInProgress);
-        var ownerName = null;
-        owner && (ownerName = getComponentName(owner));
-        owner = source;
-        JSCompiler_inline_result =
-          "\n    in " +
-          (JSCompiler_inline_result || "Unknown") +
-          (owner
-            ? " (at " +
-              owner.fileName.replace(/^.*[\\\/]/, "") +
-              ":" +
-              owner.lineNumber +
-              ")"
-            : ownerName ? " (created by " + ownerName + ")" : "");
-        break a;
-      default:
-        JSCompiler_inline_result = "";
-    }
-    info += JSCompiler_inline_result;
-    workInProgress = workInProgress["return"];
-  } while (workInProgress);
-  return info;
-}
-var _require = require("ReactFeatureFlags"),
-  enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch,
-  debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects,
-  debugRenderPhaseSideEffectsForStrictMode =
-    _require.debugRenderPhaseSideEffectsForStrictMode;
-new Set();
-var contextStackCursor = { current: emptyObject },
-  didPerformWorkStackCursor = { current: !1 },
-  previousContext = emptyObject;
-function getUnmaskedContext(workInProgress) {
-  return isContextProvider(workInProgress)
-    ? previousContext
-    : contextStackCursor.current;
-}
-function getMaskedContext(workInProgress, unmaskedContext) {
-  var contextTypes = workInProgress.type.contextTypes;
-  if (!contextTypes) return emptyObject;
-  var instance = workInProgress.stateNode;
-  if (
-    instance &&
-    instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
-  )
-    return instance.__reactInternalMemoizedMaskedChildContext;
-  var context = {},
-    key;
-  for (key in contextTypes) context[key] = unmaskedContext[key];
-  instance &&
-    ((workInProgress = workInProgress.stateNode),
-    (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
-    (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
-  return context;
-}
-function isContextProvider(fiber) {
-  return 2 === fiber.tag && null != fiber.type.childContextTypes;
-}
-function popContextProvider(fiber) {
-  isContextProvider(fiber) &&
-    (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
-}
-function pushTopLevelContextObject(fiber, context, didChange) {
-  invariant(
-    null == contextStackCursor.cursor,
-    "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
-  );
-  push(contextStackCursor, context, fiber);
-  push(didPerformWorkStackCursor, didChange, fiber);
-}
-function processChildContext(fiber, parentContext) {
-  var instance = fiber.stateNode,
-    childContextTypes = fiber.type.childContextTypes;
-  if ("function" !== typeof instance.getChildContext) return parentContext;
-  instance = instance.getChildContext();
-  for (var contextKey in instance)
-    invariant(
-      contextKey in childContextTypes,
-      '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
-      getComponentName(fiber) || "Unknown",
-      contextKey
-    );
-  return Object.assign({}, parentContext, instance);
-}
-function pushContextProvider(workInProgress) {
-  if (!isContextProvider(workInProgress)) return !1;
-  var instance = workInProgress.stateNode;
-  instance =
-    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
-    emptyObject;
-  previousContext = contextStackCursor.current;
-  push(contextStackCursor, instance, workInProgress);
-  push(
-    didPerformWorkStackCursor,
-    didPerformWorkStackCursor.current,
-    workInProgress
-  );
-  return !0;
-}
-function invalidateContextProvider(workInProgress, didChange) {
-  var instance = workInProgress.stateNode;
-  invariant(
-    instance,
-    "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
-  );
-  if (didChange) {
-    var mergedContext = processChildContext(workInProgress, previousContext);
-    instance.__reactInternalMemoizedMergedChildContext = mergedContext;
-    pop(didPerformWorkStackCursor, workInProgress);
-    pop(contextStackCursor, workInProgress);
-    push(contextStackCursor, mergedContext, workInProgress);
-  } else pop(didPerformWorkStackCursor, workInProgress);
-  push(didPerformWorkStackCursor, didChange, workInProgress);
-}
 function FiberNode(tag, pendingProps, key, mode) {
   this.tag = tag;
   this.key = key;
@@ -2123,6 +1988,45 @@ function onCommitRoot(root) {
 function onCommitUnmount(fiber) {
   "function" === typeof onCommitFiberUnmount && onCommitFiberUnmount(fiber);
 }
+function getStackAddendumByWorkInProgressFiber(workInProgress) {
+  var info = "";
+  do {
+    a: switch (workInProgress.tag) {
+      case 0:
+      case 1:
+      case 2:
+      case 5:
+        var owner = workInProgress._debugOwner,
+          source = workInProgress._debugSource;
+        var JSCompiler_inline_result = getComponentName(workInProgress);
+        var ownerName = null;
+        owner && (ownerName = getComponentName(owner));
+        owner = source;
+        JSCompiler_inline_result =
+          "\n    in " +
+          (JSCompiler_inline_result || "Unknown") +
+          (owner
+            ? " (at " +
+              owner.fileName.replace(/^.*[\\\/]/, "") +
+              ":" +
+              owner.lineNumber +
+              ")"
+            : ownerName ? " (created by " + ownerName + ")" : "");
+        break a;
+      default:
+        JSCompiler_inline_result = "";
+    }
+    info += JSCompiler_inline_result;
+    workInProgress = workInProgress["return"];
+  } while (workInProgress);
+  return info;
+}
+var _require = require("ReactFeatureFlags"),
+  enableGetDerivedStateFromCatch = _require.enableGetDerivedStateFromCatch,
+  debugRenderPhaseSideEffects = _require.debugRenderPhaseSideEffects,
+  debugRenderPhaseSideEffectsForStrictMode =
+    _require.debugRenderPhaseSideEffectsForStrictMode;
+new Set();
 function createUpdateQueue(baseState) {
   return {
     baseState: baseState,
@@ -2294,6 +2198,7 @@ function callGetDerivedStateFromCatch(ctor, capturedValues) {
   return resultState;
 }
 function ReactFiberClassComponent(
+  legacyContext,
   scheduleWork,
   computeExpirationForFiber,
   memoizeProps,
@@ -2360,62 +2265,66 @@ function ReactFiberClassComponent(
         )
       );
   }
-  var updater = {
-    isMounted: isMounted,
-    enqueueSetState: function(instance, partialState, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: partialState,
-        callback: callback,
-        isReplace: !1,
-        isForced: !1,
-        capturedValue: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    },
-    enqueueReplaceState: function(instance, state, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: state,
-        callback: callback,
-        isReplace: !0,
-        isForced: !1,
-        capturedValue: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    },
-    enqueueForceUpdate: function(instance, callback) {
-      instance = instance._reactInternalFiber;
-      callback = void 0 === callback ? null : callback;
-      var expirationTime = computeExpirationForFiber(instance);
-      insertUpdateIntoFiber(instance, {
-        expirationTime: expirationTime,
-        partialState: null,
-        callback: callback,
-        isReplace: !1,
-        isForced: !0,
-        capturedValue: null,
-        next: null
-      });
-      scheduleWork(instance, expirationTime);
-    }
-  };
+  var cacheContext = legacyContext.cacheContext,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    isContextConsumer = legacyContext.isContextConsumer,
+    hasContextChanged = legacyContext.hasContextChanged,
+    updater = {
+      isMounted: isMounted,
+      enqueueSetState: function(instance, partialState, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: partialState,
+          callback: callback,
+          isReplace: !1,
+          isForced: !1,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      },
+      enqueueReplaceState: function(instance, state, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: state,
+          callback: callback,
+          isReplace: !0,
+          isForced: !1,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      },
+      enqueueForceUpdate: function(instance, callback) {
+        instance = instance._reactInternalFiber;
+        callback = void 0 === callback ? null : callback;
+        var expirationTime = computeExpirationForFiber(instance);
+        insertUpdateIntoFiber(instance, {
+          expirationTime: expirationTime,
+          partialState: null,
+          callback: callback,
+          isReplace: !1,
+          isForced: !0,
+          capturedValue: null,
+          next: null
+        });
+        scheduleWork(instance, expirationTime);
+      }
+    };
   return {
     adoptClassInstance: adoptClassInstance,
     callGetDerivedStateFromProps: callGetDerivedStateFromProps,
     constructClassInstance: function(workInProgress, props) {
       var ctor = workInProgress.type,
         unmaskedContext = getUnmaskedContext(workInProgress),
-        needsContext =
-          2 === workInProgress.tag && null != workInProgress.type.contextTypes,
+        needsContext = isContextConsumer(workInProgress),
         context = needsContext
           ? getMaskedContext(workInProgress, unmaskedContext)
           : emptyObject;
@@ -2436,10 +2345,7 @@ function ReactFiberClassComponent(
           workInProgress.memoizedState,
           props
         ));
-      needsContext &&
-        ((workInProgress = workInProgress.stateNode),
-        (workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext),
-        (workInProgress.__reactInternalMemoizedMaskedChildContext = context));
+      needsContext && cacheContext(workInProgress, unmaskedContext, context);
       return ctor;
     },
     mountClassInstance: function(workInProgress, renderExpirationTime) {
@@ -2539,7 +2445,7 @@ function ReactFiberClassComponent(
         !(
           oldProps !== newProps ||
           oldState !== renderExpirationTime ||
-          didPerformWorkStackCursor.current ||
+          hasContextChanged() ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -2643,7 +2549,7 @@ function ReactFiberClassComponent(
         !(
           oldProps !== newProps ||
           oldContext !== renderExpirationTime ||
-          didPerformWorkStackCursor.current ||
+          hasContextChanged() ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
         )
@@ -3366,34 +3272,12 @@ function ChildReconciler(shouldTrackSideEffects) {
   };
 }
 var reconcileChildFibers = ChildReconciler(!0),
-  mountChildFibers = ChildReconciler(!1),
-  changedBitsStack = [],
-  currentValueStack = [],
-  stack = [],
-  index$1 = -1;
-function pushProvider(providerFiber) {
-  var context = providerFiber.type.context;
-  index$1 += 1;
-  changedBitsStack[index$1] = context._changedBits;
-  currentValueStack[index$1] = context._currentValue;
-  stack[index$1] = providerFiber;
-  context._currentValue = providerFiber.pendingProps.value;
-  context._changedBits = providerFiber.stateNode;
-}
-function popProvider(providerFiber) {
-  var changedBits = changedBitsStack[index$1],
-    currentValue = currentValueStack[index$1];
-  changedBitsStack[index$1] = null;
-  currentValueStack[index$1] = null;
-  stack[index$1] = null;
-  --index$1;
-  providerFiber = providerFiber.type.context;
-  providerFiber._currentValue = currentValue;
-  providerFiber._changedBits = changedBits;
-}
+  mountChildFibers = ChildReconciler(!1);
 function ReactFiberBeginWork(
   config,
   hostContext,
+  legacyContext,
+  newContext,
   hydrationContext,
   scheduleWork,
   computeExpirationForFiber
@@ -3499,7 +3383,12 @@ function ReactFiberBeginWork(
     changedBits,
     renderExpirationTime
   ) {
-    for (var fiber = workInProgress.child; null !== fiber; ) {
+    var fiber = workInProgress.child;
+    for (
+      null !== fiber && (fiber["return"] = workInProgress);
+      null !== fiber;
+
+    ) {
       switch (fiber.tag) {
         case 12:
           var nextFiber = fiber.stateNode | 0;
@@ -3558,7 +3447,7 @@ function ReactFiberBeginWork(
     var context = workInProgress.type.context,
       newProps = workInProgress.pendingProps,
       oldProps = workInProgress.memoizedProps;
-    if (!didPerformWorkStackCursor.current && oldProps === newProps)
+    if (!hasLegacyContextChanged() && oldProps === newProps)
       return (
         (workInProgress.stateNode = 0),
         pushProvider(workInProgress),
@@ -3645,11 +3534,19 @@ function ReactFiberBeginWork(
     shouldDeprioritizeSubtree = config.shouldDeprioritizeSubtree,
     pushHostContext = hostContext.pushHostContext,
     pushHostContainer = hostContext.pushHostContainer,
+    pushProvider = newContext.pushProvider,
+    getMaskedContext = legacyContext.getMaskedContext,
+    getUnmaskedContext = legacyContext.getUnmaskedContext,
+    hasLegacyContextChanged = legacyContext.hasContextChanged,
+    pushLegacyContextProvider = legacyContext.pushContextProvider,
+    pushTopLevelContextObject = legacyContext.pushTopLevelContextObject,
+    invalidateContextProvider = legacyContext.invalidateContextProvider,
     enterHydrationState = hydrationContext.enterHydrationState,
     resetHydrationState = hydrationContext.resetHydrationState,
     tryToClaimNextHydratableInstance =
       hydrationContext.tryToClaimNextHydratableInstance;
   config = ReactFiberClassComponent(
+    legacyContext,
     scheduleWork,
     computeExpirationForFiber,
     function(workInProgress, nextProps) {
@@ -3676,7 +3573,7 @@ function ReactFiberBeginWork(
             pushHostRootContext(workInProgress);
             break;
           case 2:
-            pushContextProvider(workInProgress);
+            pushLegacyContextProvider(workInProgress);
             break;
           case 4:
             pushHostContainer(
@@ -3722,7 +3619,7 @@ function ReactFiberBeginWork(
                     workInProgress.memoizedState,
                     props
                   ))),
-              (props = pushContextProvider(workInProgress)),
+              (props = pushLegacyContextProvider(workInProgress)),
               adoptClassInstance(workInProgress, fn),
               mountClassInstance(workInProgress, renderExpirationTime),
               (current = finishClassComponent(
@@ -3742,7 +3639,7 @@ function ReactFiberBeginWork(
           return (
             (props = workInProgress.type),
             (renderExpirationTime = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? ((fn = getUnmaskedContext(workInProgress)),
                 (fn = getMaskedContext(workInProgress, fn)),
@@ -3758,7 +3655,7 @@ function ReactFiberBeginWork(
             current
           );
         case 2:
-          props = pushContextProvider(workInProgress);
+          props = pushLegacyContextProvider(workInProgress);
           null === current
             ? null === workInProgress.stateNode
               ? (constructClassInstance(
@@ -3840,7 +3737,7 @@ function ReactFiberBeginWork(
             updateQueue = workInProgress.memoizedProps;
             fn = workInProgress.pendingProps;
             unmaskedContext = null !== current ? current.memoizedProps : null;
-            if (!didPerformWorkStackCursor.current && updateQueue === fn) {
+            if (!hasLegacyContextChanged() && updateQueue === fn) {
               if (
                 (updateQueue =
                   workInProgress.mode & 1 &&
@@ -3882,7 +3779,7 @@ function ReactFiberBeginWork(
         case 7:
           return (
             (props = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
               workInProgress.memoizedProps !== props ||
               (props = workInProgress.memoizedProps),
             (fn = props.children),
@@ -3912,8 +3809,7 @@ function ReactFiberBeginWork(
               workInProgress.stateNode.containerInfo
             ),
             (props = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
-            workInProgress.memoizedProps !== props
+            hasLegacyContextChanged() || workInProgress.memoizedProps !== props
               ? (null === current
                   ? (workInProgress.child = reconcileChildFibers(
                       workInProgress,
@@ -3944,7 +3840,7 @@ function ReactFiberBeginWork(
         case 10:
           return (
             (renderExpirationTime = workInProgress.pendingProps),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             workInProgress.memoizedProps !== renderExpirationTime
               ? (reconcileChildren(
                   current,
@@ -3962,7 +3858,7 @@ function ReactFiberBeginWork(
         case 11:
           return (
             (renderExpirationTime = workInProgress.pendingProps.children),
-            didPerformWorkStackCursor.current ||
+            hasLegacyContextChanged() ||
             (null !== renderExpirationTime &&
               workInProgress.memoizedProps !== renderExpirationTime)
               ? (reconcileChildren(
@@ -3992,7 +3888,7 @@ function ReactFiberBeginWork(
             props = fn._currentValue;
             var changedBits = fn._changedBits;
             if (
-              didPerformWorkStackCursor.current ||
+              hasLegacyContextChanged() ||
               0 !== changedBits ||
               updateQueue !== unmaskedContext
             ) {
@@ -4032,7 +3928,13 @@ function ReactFiberBeginWork(
     }
   };
 }
-function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
+function ReactFiberCompleteWork(
+  config,
+  hostContext,
+  legacyContext,
+  newContext,
+  hydrationContext
+) {
   function markUpdate(workInProgress) {
     workInProgress.effectTag |= 4;
   }
@@ -4046,6 +3948,9 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
     popHostContext = hostContext.popHostContext,
     getHostContext = hostContext.getHostContext,
     popHostContainer = hostContext.popHostContainer,
+    popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popProvider = newContext.popProvider,
     prepareToHydrateHostInstance =
       hydrationContext.prepareToHydrateHostInstance,
     prepareToHydrateHostTextInstance =
@@ -4074,7 +3979,7 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           return null;
         case 2:
           return (
-            popContextProvider(workInProgress),
+            popLegacyContextProvider(workInProgress),
             (current = workInProgress.stateNode),
             (newProps = workInProgress.updateQueue),
             null !== newProps &&
@@ -4087,8 +3992,7 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
           );
         case 3:
           popHostContainer(workInProgress);
-          pop(didPerformWorkStackCursor, workInProgress);
-          pop(contextStackCursor, workInProgress);
+          popTopLevelLegacyContextObject(workInProgress);
           newProps = workInProgress.stateNode;
           newProps.pendingContext &&
             ((newProps.context = newProps.pendingContext),
@@ -4304,11 +4208,16 @@ function ReactFiberCompleteWork(config, hostContext, hydrationContext) {
 }
 function ReactFiberUnwindWork(
   hostContext,
+  legacyContext,
+  newContext,
   scheduleWork,
   isAlreadyFailedLegacyErrorBoundary
 ) {
   var popHostContainer = hostContext.popHostContainer,
-    popHostContext = hostContext.popHostContext;
+    popHostContext = hostContext.popHostContext,
+    popLegacyContextProvider = legacyContext.popContextProvider,
+    popTopLevelLegacyContextObject = legacyContext.popTopLevelContextObject,
+    popProvider = newContext.popProvider;
   return {
     throwException: function(returnFiber, sourceFiber, rawValue) {
       sourceFiber.effectTag |= 512;
@@ -4352,7 +4261,7 @@ function ReactFiberUnwindWork(
     unwindWork: function(workInProgress) {
       switch (workInProgress.tag) {
         case 2:
-          popContextProvider(workInProgress);
+          popLegacyContextProvider(workInProgress);
           var effectTag = workInProgress.effectTag;
           return effectTag & 1024
             ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4361,8 +4270,7 @@ function ReactFiberUnwindWork(
         case 3:
           return (
             popHostContainer(workInProgress),
-            pop(didPerformWorkStackCursor, workInProgress),
-            pop(contextStackCursor, workInProgress),
+            popTopLevelLegacyContextObject(workInProgress),
             (effectTag = workInProgress.effectTag),
             effectTag & 1024
               ? ((workInProgress.effectTag = (effectTag & -1025) | 64),
@@ -4378,6 +4286,25 @@ function ReactFiberUnwindWork(
         default:
           return null;
       }
+    },
+    unwindInterruptedWork: function(interruptedWork) {
+      switch (interruptedWork.tag) {
+        case 2:
+          popLegacyContextProvider(interruptedWork);
+          break;
+        case 3:
+          popHostContainer(interruptedWork);
+          popTopLevelLegacyContextObject(interruptedWork);
+          break;
+        case 5:
+          popHostContext(interruptedWork);
+          break;
+        case 4:
+          popHostContainer(interruptedWork);
+          break;
+        case 13:
+          popProvider(interruptedWork);
+      }
     }
   };
 }
@@ -4819,7 +4746,7 @@ function ReactFiberCommitWork(
   };
 }
 var NO_CONTEXT = {};
-function ReactFiberHostContext(config) {
+function ReactFiberHostContext(config, stack) {
   function requiredContext(c) {
     invariant(
       c !== NO_CONTEXT,
@@ -4828,10 +4755,13 @@ function ReactFiberHostContext(config) {
     return c;
   }
   var getChildHostContext = config.getChildHostContext,
-    getRootHostContext = config.getRootHostContext,
-    contextStackCursor = { current: NO_CONTEXT },
-    contextFiberStackCursor = { current: NO_CONTEXT },
-    rootInstanceStackCursor = { current: NO_CONTEXT };
+    getRootHostContext = config.getRootHostContext;
+  config = stack.createCursor;
+  var push = stack.push,
+    pop = stack.pop,
+    contextStackCursor = config(NO_CONTEXT),
+    contextFiberStackCursor = config(NO_CONTEXT),
+    rootInstanceStackCursor = config(NO_CONTEXT);
   return {
     getHostContext: function() {
       return requiredContext(contextStackCursor.current);
@@ -4861,10 +4791,6 @@ function ReactFiberHostContext(config) {
       context !== rootInstance &&
         (push(contextFiberStackCursor, fiber, fiber),
         push(contextStackCursor, rootInstance, fiber));
-    },
-    resetHostContainer: function() {
-      contextStackCursor.current = NO_CONTEXT;
-      rootInstanceStackCursor.current = NO_CONTEXT;
     }
   };
 }
@@ -5024,22 +4950,198 @@ function ReactFiberHydrationContext(config) {
     }
   };
 }
-function ReactFiberScheduler(config) {
-  function resetContextStack() {
-    for (; -1 < index; ) (valueStack[index] = null), index--;
+function ReactFiberLegacyContext(stack) {
+  function cacheContext(workInProgress, unmaskedContext, maskedContext) {
+    workInProgress = workInProgress.stateNode;
+    workInProgress.__reactInternalMemoizedUnmaskedChildContext = unmaskedContext;
+    workInProgress.__reactInternalMemoizedMaskedChildContext = maskedContext;
+  }
+  function isContextProvider(fiber) {
+    return 2 === fiber.tag && null != fiber.type.childContextTypes;
+  }
+  function processChildContext(fiber, parentContext) {
+    var instance = fiber.stateNode,
+      childContextTypes = fiber.type.childContextTypes;
+    if ("function" !== typeof instance.getChildContext) return parentContext;
+    instance = instance.getChildContext();
+    for (var contextKey in instance)
+      invariant(
+        contextKey in childContextTypes,
+        '%s.getChildContext(): key "%s" is not defined in childContextTypes.',
+        getComponentName(fiber) || "Unknown",
+        contextKey
+      );
+    return Object.assign({}, parentContext, instance);
+  }
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop,
+    contextStackCursor = createCursor(emptyObject),
+    didPerformWorkStackCursor = createCursor(!1),
     previousContext = emptyObject;
-    contextStackCursor.current = emptyObject;
-    didPerformWorkStackCursor.current = !1;
-    resetHostContainer();
-    for (var i = index$1; -1 < i; i--) {
-      var context = stack[i].type.context;
-      context._currentValue = context._defaultValue;
-      context._changedBits = 0;
-      changedBitsStack[i] = null;
-      currentValueStack[i] = null;
-      stack[i] = null;
+  return {
+    getUnmaskedContext: function(workInProgress) {
+      return isContextProvider(workInProgress)
+        ? previousContext
+        : contextStackCursor.current;
+    },
+    cacheContext: cacheContext,
+    getMaskedContext: function(workInProgress, unmaskedContext) {
+      var contextTypes = workInProgress.type.contextTypes;
+      if (!contextTypes) return emptyObject;
+      var instance = workInProgress.stateNode;
+      if (
+        instance &&
+        instance.__reactInternalMemoizedUnmaskedChildContext === unmaskedContext
+      )
+        return instance.__reactInternalMemoizedMaskedChildContext;
+      var context = {},
+        key;
+      for (key in contextTypes) context[key] = unmaskedContext[key];
+      instance && cacheContext(workInProgress, unmaskedContext, context);
+      return context;
+    },
+    hasContextChanged: function() {
+      return didPerformWorkStackCursor.current;
+    },
+    isContextConsumer: function(fiber) {
+      return 2 === fiber.tag && null != fiber.type.contextTypes;
+    },
+    isContextProvider: isContextProvider,
+    popContextProvider: function(fiber) {
+      isContextProvider(fiber) &&
+        (pop(didPerformWorkStackCursor, fiber), pop(contextStackCursor, fiber));
+    },
+    popTopLevelContextObject: function(fiber) {
+      pop(didPerformWorkStackCursor, fiber);
+      pop(contextStackCursor, fiber);
+    },
+    pushTopLevelContextObject: function(fiber, context, didChange) {
+      invariant(
+        null == contextStackCursor.cursor,
+        "Unexpected context found on stack. This error is likely caused by a bug in React. Please file an issue."
+      );
+      push(contextStackCursor, context, fiber);
+      push(didPerformWorkStackCursor, didChange, fiber);
+    },
+    processChildContext: processChildContext,
+    pushContextProvider: function(workInProgress) {
+      if (!isContextProvider(workInProgress)) return !1;
+      var instance = workInProgress.stateNode;
+      instance =
+        (instance && instance.__reactInternalMemoizedMergedChildContext) ||
+        emptyObject;
+      previousContext = contextStackCursor.current;
+      push(contextStackCursor, instance, workInProgress);
+      push(
+        didPerformWorkStackCursor,
+        didPerformWorkStackCursor.current,
+        workInProgress
+      );
+      return !0;
+    },
+    invalidateContextProvider: function(workInProgress, didChange) {
+      var instance = workInProgress.stateNode;
+      invariant(
+        instance,
+        "Expected to have an instance by this point. This error is likely caused by a bug in React. Please file an issue."
+      );
+      if (didChange) {
+        var mergedContext = processChildContext(
+          workInProgress,
+          previousContext
+        );
+        instance.__reactInternalMemoizedMergedChildContext = mergedContext;
+        pop(didPerformWorkStackCursor, workInProgress);
+        pop(contextStackCursor, workInProgress);
+        push(contextStackCursor, mergedContext, workInProgress);
+      } else pop(didPerformWorkStackCursor, workInProgress);
+      push(didPerformWorkStackCursor, didChange, workInProgress);
+    },
+    findCurrentUnmaskedContext: function(fiber) {
+      for (
+        invariant(
+          2 === isFiberMountedImpl(fiber) && 2 === fiber.tag,
+          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
+        );
+        3 !== fiber.tag;
+
+      ) {
+        if (isContextProvider(fiber))
+          return fiber.stateNode.__reactInternalMemoizedMergedChildContext;
+        fiber = fiber["return"];
+        invariant(
+          fiber,
+          "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
+        );
+      }
+      return fiber.stateNode.context;
     }
-    index$1 = -1;
+  };
+}
+function ReactFiberNewContext(stack) {
+  var createCursor = stack.createCursor,
+    push = stack.push,
+    pop = stack.pop,
+    providerCursor = createCursor(null),
+    valueCursor = createCursor(null),
+    changedBitsCursor = createCursor(0);
+  return {
+    pushProvider: function(providerFiber) {
+      var context = providerFiber.type.context;
+      push(changedBitsCursor, context._changedBits, providerFiber);
+      push(valueCursor, context._currentValue, providerFiber);
+      push(providerCursor, providerFiber, providerFiber);
+      context._currentValue = providerFiber.pendingProps.value;
+      context._changedBits = providerFiber.stateNode;
+    },
+    popProvider: function(providerFiber) {
+      var changedBits = changedBitsCursor.current,
+        currentValue = valueCursor.current;
+      pop(providerCursor, providerFiber);
+      pop(valueCursor, providerFiber);
+      pop(changedBitsCursor, providerFiber);
+      providerFiber = providerFiber.type.context;
+      providerFiber._currentValue = currentValue;
+      providerFiber._changedBits = changedBits;
+    }
+  };
+}
+function ReactFiberStack() {
+  var valueStack = [],
+    index = -1;
+  return {
+    createCursor: function(defaultValue) {
+      return { current: defaultValue };
+    },
+    isEmpty: function() {
+      return -1 === index;
+    },
+    pop: function(cursor) {
+      0 > index ||
+        ((cursor.current = valueStack[index]),
+        (valueStack[index] = null),
+        index--);
+    },
+    push: function(cursor, value) {
+      index++;
+      valueStack[index] = cursor.current;
+      cursor.current = value;
+    },
+    checkThatStackIsEmpty: function() {},
+    resetStackAfterFatalErrorInDev: function() {}
+  };
+}
+function ReactFiberScheduler(config) {
+  function resetStack() {
+    if (null !== nextUnitOfWork)
+      for (
+        var interruptedWork = nextUnitOfWork["return"];
+        null !== interruptedWork;
+
+      )
+        unwindInterruptedWork(interruptedWork),
+          (interruptedWork = interruptedWork["return"]);
     nextRoot = null;
     nextRenderExpirationTime = 0;
     nextUnitOfWork = null;
@@ -5145,7 +5247,7 @@ function ReactFiberScheduler(config) {
       root !== nextRoot ||
       null === nextUnitOfWork
     )
-      resetContextStack(),
+      resetStack(),
         (nextRoot = root),
         (nextRenderExpirationTime = expirationTime),
         (nextUnitOfWork = createWorkInProgress(
@@ -5275,7 +5377,7 @@ function ReactFiberScheduler(config) {
             !isWorking &&
               0 !== nextRenderExpirationTime &&
               expirationTime < nextRenderExpirationTime &&
-              resetContextStack();
+              resetStack();
             (nextRoot === root && isWorking) ||
               requestWork(root, expirationTime);
             nestedUpdateCount > NESTED_UPDATE_LIMIT &&
@@ -5619,25 +5721,37 @@ function ReactFiberScheduler(config) {
     nextFlushedRoot.remainingExpirationTime = 0;
     hasUnhandledError || ((hasUnhandledError = !0), (unhandledError = error));
   }
-  var hostContext = ReactFiberHostContext(config),
-    hydrationContext = ReactFiberHydrationContext(config),
-    resetHostContainer = hostContext.resetHostContainer,
+  var stack = ReactFiberStack(),
+    hostContext = ReactFiberHostContext(config, stack),
+    legacyContext = ReactFiberLegacyContext(stack);
+  stack = ReactFiberNewContext(stack);
+  var hydrationContext = ReactFiberHydrationContext(config),
     beginWork = ReactFiberBeginWork(
       config,
       hostContext,
+      legacyContext,
+      stack,
       hydrationContext,
       scheduleWork,
       computeExpirationForFiber
     ).beginWork,
-    completeWork = ReactFiberCompleteWork(config, hostContext, hydrationContext)
-      .completeWork;
+    completeWork = ReactFiberCompleteWork(
+      config,
+      hostContext,
+      legacyContext,
+      stack,
+      hydrationContext
+    ).completeWork;
   hostContext = ReactFiberUnwindWork(
     hostContext,
+    legacyContext,
+    stack,
     scheduleWork,
     isAlreadyFailedLegacyErrorBoundary
   );
   var throwException = hostContext.throwException,
-    unwindWork = hostContext.unwindWork;
+    unwindWork = hostContext.unwindWork,
+    unwindInterruptedWork = hostContext.unwindInterruptedWork;
   hostContext = ReactFiberCommitWork(
     config,
     onCommitPhaseError,
@@ -5796,7 +5910,8 @@ function ReactFiberScheduler(config) {
       result <= lastUniqueAsyncExpiration &&
         (result = lastUniqueAsyncExpiration + 1);
       return (lastUniqueAsyncExpiration = result);
-    }
+    },
+    legacyContext: legacyContext
   };
 }
 function ReactFiberReconciler$1(config) {
@@ -5811,27 +5926,7 @@ function ReactFiberReconciler$1(config) {
     currentTime = container.current;
     if (parentComponent) {
       parentComponent = parentComponent._reactInternalFiber;
-      var parentContext;
-      b: {
-        invariant(
-          2 === isFiberMountedImpl(parentComponent) &&
-            2 === parentComponent.tag,
-          "Expected subtree parent to be a mounted class component. This error is likely caused by a bug in React. Please file an issue."
-        );
-        for (parentContext = parentComponent; 3 !== parentContext.tag; ) {
-          if (isContextProvider(parentContext)) {
-            parentContext =
-              parentContext.stateNode.__reactInternalMemoizedMergedChildContext;
-            break b;
-          }
-          parentContext = parentContext["return"];
-          invariant(
-            parentContext,
-            "Found unexpected detached subtree parent. This error is likely caused by a bug in React. Please file an issue."
-          );
-        }
-        parentContext = parentContext.stateNode.context;
-      }
+      var parentContext = findCurrentUnmaskedContext(parentComponent);
       parentComponent = isContextProvider(parentComponent)
         ? processChildContext(parentComponent, parentContext)
         : parentContext;
@@ -5860,7 +5955,11 @@ function ReactFiberReconciler$1(config) {
   config = ReactFiberScheduler(config);
   var recalculateCurrentTime = config.recalculateCurrentTime,
     computeExpirationForFiber = config.computeExpirationForFiber,
-    scheduleWork = config.scheduleWork;
+    scheduleWork = config.scheduleWork,
+    legacyContext = config.legacyContext,
+    findCurrentUnmaskedContext = legacyContext.findCurrentUnmaskedContext,
+    isContextProvider = legacyContext.isContextProvider,
+    processChildContext = legacyContext.processChildContext;
   return {
     createContainer: function(containerInfo, isAsync, hydrate) {
       isAsync = new FiberNode(3, null, null, isAsync ? 3 : 0);
diff --git a/Libraries/Renderer/shims/ReactFabric.js b/Libraries/Renderer/shims/ReactFabric.js
index 4a396c224cd4ff..6ab336bf11f058 100644
--- a/Libraries/Renderer/shims/ReactFabric.js
+++ b/Libraries/Renderer/shims/ReactFabric.js
@@ -9,6 +9,8 @@
  */
 'use strict';
 
+const BatchedBridge = require('BatchedBridge');
+
 // TODO @sema: Adjust types
 import type {ReactNativeType} from 'ReactNativeTypes';
 
@@ -20,4 +22,7 @@ if (__DEV__) {
   ReactFabric = require('ReactFabric-prod');
 }
 
+BatchedBridge.registerCallableModule('ReactFabric', ReactFabric);
+
 module.exports = (ReactFabric: ReactNativeType);
+

From f7f0a2208348e23d183c6bff7ea49c102bd26ecf Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Wed, 4 Apr 2018 15:11:21 -0700
Subject: [PATCH 254/267] React sync for revisions 9d484ed...1c2876d

Reviewed By: gaearon

Differential Revision: D7500761

fbshipit-source-id: 8dc1cda879942fc4990b23144a616039fdbe6dc0
---
 Libraries/Renderer/REVISION                   |    2 +-
 Libraries/Renderer/ReactFabric-dev.js         | 1186 ++++++++++++-----
 Libraries/Renderer/ReactFabric-prod.js        |  313 +++--
 Libraries/Renderer/ReactNativeRenderer-dev.js | 1185 +++++++++++-----
 .../Renderer/ReactNativeRenderer-prod.js      |  369 +++--
 Libraries/Renderer/shims/ReactFabric.js       |    1 -
 Libraries/Renderer/shims/ReactTypes.js        |    4 +-
 package.json                                  |    6 +-
 8 files changed, 2091 insertions(+), 975 deletions(-)

diff --git a/Libraries/Renderer/REVISION b/Libraries/Renderer/REVISION
index 7e989de9720393..fc81a7c7f28c85 100644
--- a/Libraries/Renderer/REVISION
+++ b/Libraries/Renderer/REVISION
@@ -1 +1 @@
-9d484edc4b64160cb335a23a2cb21667fb2cdf4c
\ No newline at end of file
+1c2876d5b558b8591feb335d8d7204bc46f7da8a
\ No newline at end of file
diff --git a/Libraries/Renderer/ReactFabric-dev.js b/Libraries/Renderer/ReactFabric-dev.js
index 22c77f2e072d9c..0b7a78516c11ba 100644
--- a/Libraries/Renderer/ReactFabric-dev.js
+++ b/Libraries/Renderer/ReactFabric-dev.js
@@ -509,11 +509,13 @@ var injection$1 = {
     getNodeFromInstance = Injected.getNodeFromInstance;
 
     {
-      warning(
-        getNodeFromInstance && getInstanceFromNode,
-        "EventPluginUtils.injection.injectComponentTree(...): Injected " +
-          "module is missing getNodeFromInstance or getInstanceFromNode."
-      );
+      !(getNodeFromInstance && getInstanceFromNode)
+        ? warning(
+            false,
+            "EventPluginUtils.injection.injectComponentTree(...): Injected " +
+              "module is missing getNodeFromInstance or getInstanceFromNode."
+          )
+        : void 0;
     }
   }
 };
@@ -549,10 +551,9 @@ var validateEventDispatches = void 0;
       ? dispatchInstances.length
       : dispatchInstances ? 1 : 0;
 
-    warning(
-      instancesIsArr === listenersIsArr && instancesLen === listenersLen,
-      "EventPluginUtils: Invalid `event`."
-    );
+    !(instancesIsArr === listenersIsArr && instancesLen === listenersLen)
+      ? warning(false, "EventPluginUtils: Invalid `event`.")
+      : void 0;
   };
 }
 
@@ -939,7 +940,7 @@ function listenerAtPhase(inst, event, propagationPhase) {
  */
 function accumulateDirectionalDispatches(inst, phase, event) {
   {
-    warning(inst, "Dispatching inst must not be null");
+    !inst ? warning(false, "Dispatching inst must not be null") : void 0;
   }
   var listener = listenerAtPhase(inst, event, phase);
   if (listener) {
@@ -1258,13 +1259,15 @@ SyntheticEvent.extend = function(Interface) {
               !target.constructor.Interface.hasOwnProperty(prop) &&
               shouldBeReleasedProperties.indexOf(prop) === -1
             ) {
-              warning(
-                didWarnForAddedNewProperty || target.isPersistent(),
-                "This synthetic event is reused for performance reasons. If you're " +
-                  "seeing this, you're adding a new property in the synthetic event object. " +
-                  "The property is never released. See " +
-                  "https://fb.me/react-event-pooling for more information."
-              );
+              !(didWarnForAddedNewProperty || target.isPersistent())
+                ? warning(
+                    false,
+                    "This synthetic event is reused for performance reasons. If you're " +
+                      "seeing this, you're adding a new property in the synthetic event object. " +
+                      "The property is never released. See " +
+                      "https://fb.me/react-event-pooling for more information."
+                  )
+                : void 0;
               didWarnForAddedNewProperty = true;
             }
             target[prop] = value;
@@ -1311,16 +1314,18 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
 
   function warn(action, result) {
     var warningCondition = false;
-    warning(
-      warningCondition,
-      "This synthetic event is reused for performance reasons. If you're seeing this, " +
-        "you're %s `%s` on a released/nullified synthetic event. %s. " +
-        "If you must keep the original synthetic event around, use event.persist(). " +
-        "See https://fb.me/react-event-pooling for more information.",
-      action,
-      propName,
-      result
-    );
+    !warningCondition
+      ? warning(
+          false,
+          "This synthetic event is reused for performance reasons. If you're seeing this, " +
+            "you're %s `%s` on a released/nullified synthetic event. %s. " +
+            "If you must keep the original synthetic event around, use event.persist(). " +
+            "See https://fb.me/react-event-pooling for more information.",
+          action,
+          propName,
+          result
+        )
+      : void 0;
   }
 }
 
@@ -1438,13 +1443,15 @@ function getTouchIdentifier(_ref) {
 
   invariant(identifier != null, "Touch object is missing identifier.");
   {
-    warning(
-      identifier <= MAX_TOUCH_BANK,
-      "Touch identifier %s is greater than maximum supported %s which causes " +
-        "performance issues backfilling array locations for all of the indices.",
-      identifier,
-      MAX_TOUCH_BANK
-    );
+    !(identifier <= MAX_TOUCH_BANK)
+      ? warning(
+          false,
+          "Touch identifier %s is greater than maximum supported %s which causes " +
+            "performance issues backfilling array locations for all of the indices.",
+          identifier,
+          MAX_TOUCH_BANK
+        )
+      : void 0;
   }
   return identifier;
 }
@@ -1543,10 +1550,9 @@ var ResponderTouchHistoryStore = {
         }
         {
           var activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
-          warning(
-            activeRecord != null && activeRecord.touchActive,
-            "Cannot find single active touch."
-          );
+          !(activeRecord != null && activeRecord.touchActive)
+            ? warning(false, "Cannot find single active touch.")
+            : void 0;
         }
       }
     }
@@ -2641,7 +2647,7 @@ var TouchHistoryMath = {
 
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.3.0-alpha.2";
+var ReactVersion = "16.3.1";
 
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -3311,15 +3317,17 @@ function findNodeHandle(componentOrHandle) {
   {
     var owner = ReactCurrentOwner.current;
     if (owner !== null && owner.stateNode !== null) {
-      warning(
-        owner.stateNode._warnedAboutRefsInRender,
-        "%s is accessing findNodeHandle inside its render(). " +
-          "render() should be a pure function of props and state. It should " +
-          "never access something that requires stale data from the previous " +
-          "render, such as refs. Move this logic to componentDidMount and " +
-          "componentDidUpdate instead.",
-        getComponentName(owner) || "A component"
-      );
+      !owner.stateNode._warnedAboutRefsInRender
+        ? warning(
+            false,
+            "%s is accessing findNodeHandle inside its render(). " +
+              "render() should be a pure function of props and state. It should " +
+              "never access something that requires stale data from the previous " +
+              "render, such as refs. Move this logic to componentDidMount and " +
+              "componentDidUpdate instead.",
+            getComponentName(owner) || "A component"
+          )
+        : void 0;
 
       owner.stateNode._warnedAboutRefsInRender = true;
     }
@@ -3777,7 +3785,8 @@ var frameDeadline = 0;
 var frameDeadlineObject = {
   timeRemaining: function() {
     return frameDeadline - now();
-  }
+  },
+  didTimeout: false
 };
 
 function setTimeoutCallback() {
@@ -3865,9 +3874,10 @@ var Callback = /*              */ 32;
 var DidCapture = /*            */ 64;
 var Ref = /*                   */ 128;
 var ErrLog = /*                */ 256;
+var Snapshot = /*              */ 2048;
 
 // Union of all host effects
-var HostEffectMask = /*        */ 511;
+var HostEffectMask = /*        */ 2559;
 
 var Incomplete = /*            */ 512;
 var ShouldCapture = /*         */ 1024;
@@ -3915,15 +3925,17 @@ function isMounted(component) {
     if (owner !== null && owner.tag === ClassComponent) {
       var ownerFiber = owner;
       var instance = ownerFiber.stateNode;
-      warning(
-        instance._warnedAboutRefsInRender,
-        "%s is accessing isMounted inside its render() function. " +
-          "render() should be a pure function of props and state. It should " +
-          "never access something that requires stale data from the previous " +
-          "render, such as refs. Move this logic to componentDidMount and " +
-          "componentDidUpdate instead.",
-        getComponentName(ownerFiber) || "A component"
-      );
+      !instance._warnedAboutRefsInRender
+        ? warning(
+            false,
+            "%s is accessing isMounted inside its render() function. " +
+              "render() should be a pure function of props and state. It should " +
+              "never access something that requires stale data from the previous " +
+              "render, such as refs. Move this logic to componentDidMount and " +
+              "componentDidUpdate instead.",
+            getComponentName(ownerFiber) || "A component"
+          )
+        : void 0;
       instance._warnedAboutRefsInRender = true;
     }
   }
@@ -4476,6 +4488,47 @@ function createFiberFromPortal(portal, mode, expirationTime) {
   return fiber;
 }
 
+// Used for stashing WIP properties to replay failed work in DEV.
+function assignFiberPropertiesInDEV(target, source) {
+  if (target === null) {
+    // This Fiber's initial properties will always be overwritten.
+    // We only use a Fiber to ensure the same hidden class so DEV isn't slow.
+    target = createFiber(IndeterminateComponent, null, null, NoContext);
+  }
+
+  // This is intentionally written as a list of all properties.
+  // We tried to use Object.assign() instead but this is called in
+  // the hottest path, and Object.assign() was too slow:
+  // https://github.com/facebook/react/issues/12502
+  // This code is DEV-only so size is not a concern.
+
+  target.tag = source.tag;
+  target.key = source.key;
+  target.type = source.type;
+  target.stateNode = source.stateNode;
+  target["return"] = source["return"];
+  target.child = source.child;
+  target.sibling = source.sibling;
+  target.index = source.index;
+  target.ref = source.ref;
+  target.pendingProps = source.pendingProps;
+  target.memoizedProps = source.memoizedProps;
+  target.updateQueue = source.updateQueue;
+  target.memoizedState = source.memoizedState;
+  target.mode = source.mode;
+  target.effectTag = source.effectTag;
+  target.nextEffect = source.nextEffect;
+  target.firstEffect = source.firstEffect;
+  target.lastEffect = source.lastEffect;
+  target.expirationTime = source.expirationTime;
+  target.alternate = source.alternate;
+  target._debugID = source._debugID;
+  target._debugSource = source._debugSource;
+  target._debugOwner = source._debugOwner;
+  target._debugIsCurrentlyTiming = source._debugIsCurrentlyTiming;
+  return target;
+}
+
 // TODO: This should be lifted into the renderer.
 
 function createFiberRoot(containerInfo, isAsync, hydrate) {
@@ -4881,7 +4934,10 @@ var ReactStrictModeWarnings = {
     ) {
       pendingComponentWillReceivePropsWarnings.push(fiber);
     }
-    if (typeof instance.componentWillUpdate === "function") {
+    if (
+      typeof instance.componentWillUpdate === "function" &&
+      instance.componentWillUpdate.__suppressDeprecationWarning !== true
+    ) {
       pendingComponentWillUpdateWarnings.push(fiber);
     }
   };
@@ -4954,7 +5010,6 @@ var ReactStrictModeWarnings = {
 
 var debugRenderPhaseSideEffects = false;
 var debugRenderPhaseSideEffectsForStrictMode = false;
-
 var enableUserTimingAPI = true;
 var enableGetDerivedStateFromCatch = false;
 var warnAboutDeprecatedLifecycles = false;
@@ -5223,13 +5278,15 @@ function startRequestCallbackTimer() {
   }
 }
 
-function stopRequestCallbackTimer(didExpire) {
+function stopRequestCallbackTimer(didExpire, expirationTime) {
   if (enableUserTimingAPI) {
     if (supportsUserTiming) {
       isWaitingForCallback = false;
       var warning$$1 = didExpire ? "React was blocked by main thread" : null;
       endMark(
-        "(Waiting for async callback...)",
+        "(Waiting for async callback... will force flush in " +
+          expirationTime +
+          " ms)",
         "(Waiting for async callback...)",
         warning$$1
       );
@@ -5339,7 +5396,7 @@ function startWorkLoopTimer(nextUnitOfWork) {
   }
 }
 
-function stopWorkLoopTimer(interruptedBy) {
+function stopWorkLoopTimer(interruptedBy, didCompleteRoot) {
   if (enableUserTimingAPI) {
     if (!supportsUserTiming) {
       return;
@@ -5357,13 +5414,12 @@ function stopWorkLoopTimer(interruptedBy) {
       warning$$1 = "There were cascading updates";
     }
     commitCountInCurrentWorkLoop = 0;
+    var label = didCompleteRoot
+      ? "(React Tree Reconciliation: Completed Root)"
+      : "(React Tree Reconciliation: Yielded)";
     // Pause any measurements until the next loop.
     pauseTimers();
-    endMark(
-      "(React Tree Reconciliation)",
-      "(React Tree Reconciliation)",
-      warning$$1
-    );
+    endMark(label, "(React Tree Reconciliation)", warning$$1);
   }
 }
 
@@ -5400,6 +5456,31 @@ function stopCommitTimer() {
   }
 }
 
+function startCommitSnapshotEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Snapshot Effects)");
+  }
+}
+
+function stopCommitSnapshotEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Snapshot Effects: " + count + " Total)",
+      "(Committing Snapshot Effects)",
+      null
+    );
+  }
+}
+
 function startCommitHostEffectsTimer() {
   if (enableUserTimingAPI) {
     if (!supportsUserTiming) {
@@ -5784,23 +5865,26 @@ var isArray = Array.isArray;
 var didWarnAboutStateAssignmentForComponent = void 0;
 var didWarnAboutUndefinedDerivedState = void 0;
 var didWarnAboutUninitializedState = void 0;
-var didWarnAboutWillReceivePropsAndDerivedState = void 0;
+var didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = void 0;
+var didWarnAboutLegacyLifecyclesAndDerivedState = void 0;
 var warnOnInvalidCallback = void 0;
 
 {
-  didWarnAboutStateAssignmentForComponent = {};
-  didWarnAboutUndefinedDerivedState = {};
-  didWarnAboutUninitializedState = {};
-  didWarnAboutWillReceivePropsAndDerivedState = {};
+  didWarnAboutStateAssignmentForComponent = new Set();
+  didWarnAboutUndefinedDerivedState = new Set();
+  didWarnAboutUninitializedState = new Set();
+  didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = new Set();
+  didWarnAboutLegacyLifecyclesAndDerivedState = new Set();
 
-  var didWarnOnInvalidCallback = {};
+  var didWarnOnInvalidCallback = new Set();
 
   warnOnInvalidCallback = function(callback, callerName) {
     if (callback === null || typeof callback === "function") {
       return;
     }
     var key = callerName + "_" + callback;
-    if (!didWarnOnInvalidCallback[key]) {
+    if (!didWarnOnInvalidCallback.has(key)) {
+      didWarnOnInvalidCallback.add(key);
       warning(
         false,
         "%s(...): Expected the last optional `callback` argument to be a " +
@@ -5808,7 +5892,6 @@ var warnOnInvalidCallback = void 0;
         callerName,
         callback
       );
-      didWarnOnInvalidCallback[key] = true;
     }
   };
 
@@ -5951,12 +6034,14 @@ var ReactFiberClassComponent = function(
       stopPhaseTimer();
 
       {
-        warning(
-          shouldUpdate !== undefined,
-          "%s.shouldComponentUpdate(): Returned undefined instead of a " +
-            "boolean value. Make sure to return true or false.",
-          getComponentName(workInProgress) || "Unknown"
-        );
+        !(shouldUpdate !== undefined)
+          ? warning(
+              false,
+              "%s.shouldComponentUpdate(): Returned undefined instead of a " +
+                "boolean value. Make sure to return true or false.",
+              getComponentName(workInProgress) || "Component"
+            )
+          : void 0;
       }
 
       return shouldUpdate;
@@ -5975,7 +6060,7 @@ var ReactFiberClassComponent = function(
     var instance = workInProgress.stateNode;
     var type = workInProgress.type;
     {
-      var name = getComponentName(workInProgress);
+      var name = getComponentName(workInProgress) || "Component";
       var renderPresent = instance.render;
 
       if (!renderPresent) {
@@ -6000,47 +6085,57 @@ var ReactFiberClassComponent = function(
         !instance.getInitialState ||
         instance.getInitialState.isReactClassApproved ||
         instance.state;
-      warning(
-        noGetInitialStateOnES6,
-        "getInitialState was defined on %s, a plain JavaScript class. " +
-          "This is only supported for classes created using React.createClass. " +
-          "Did you mean to define a state property instead?",
-        name
-      );
+      !noGetInitialStateOnES6
+        ? warning(
+            false,
+            "getInitialState was defined on %s, a plain JavaScript class. " +
+              "This is only supported for classes created using React.createClass. " +
+              "Did you mean to define a state property instead?",
+            name
+          )
+        : void 0;
       var noGetDefaultPropsOnES6 =
         !instance.getDefaultProps ||
         instance.getDefaultProps.isReactClassApproved;
-      warning(
-        noGetDefaultPropsOnES6,
-        "getDefaultProps was defined on %s, a plain JavaScript class. " +
-          "This is only supported for classes created using React.createClass. " +
-          "Use a static property to define defaultProps instead.",
-        name
-      );
+      !noGetDefaultPropsOnES6
+        ? warning(
+            false,
+            "getDefaultProps was defined on %s, a plain JavaScript class. " +
+              "This is only supported for classes created using React.createClass. " +
+              "Use a static property to define defaultProps instead.",
+            name
+          )
+        : void 0;
       var noInstancePropTypes = !instance.propTypes;
-      warning(
-        noInstancePropTypes,
-        "propTypes was defined as an instance property on %s. Use a static " +
-          "property to define propTypes instead.",
-        name
-      );
+      !noInstancePropTypes
+        ? warning(
+            false,
+            "propTypes was defined as an instance property on %s. Use a static " +
+              "property to define propTypes instead.",
+            name
+          )
+        : void 0;
       var noInstanceContextTypes = !instance.contextTypes;
-      warning(
-        noInstanceContextTypes,
-        "contextTypes was defined as an instance property on %s. Use a static " +
-          "property to define contextTypes instead.",
-        name
-      );
+      !noInstanceContextTypes
+        ? warning(
+            false,
+            "contextTypes was defined as an instance property on %s. Use a static " +
+              "property to define contextTypes instead.",
+            name
+          )
+        : void 0;
       var noComponentShouldUpdate =
         typeof instance.componentShouldUpdate !== "function";
-      warning(
-        noComponentShouldUpdate,
-        "%s has a method called " +
-          "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
-          "The name is phrased as a question because the function is " +
-          "expected to return a value.",
-        name
-      );
+      !noComponentShouldUpdate
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
+              "The name is phrased as a question because the function is " +
+              "expected to return a value.",
+            name
+          )
+        : void 0;
       if (
         type.prototype &&
         type.prototype.isPureReactComponent &&
@@ -6056,73 +6151,128 @@ var ReactFiberClassComponent = function(
       }
       var noComponentDidUnmount =
         typeof instance.componentDidUnmount !== "function";
-      warning(
-        noComponentDidUnmount,
-        "%s has a method called " +
-          "componentDidUnmount(). But there is no such lifecycle method. " +
-          "Did you mean componentWillUnmount()?",
-        name
-      );
+      !noComponentDidUnmount
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentDidUnmount(). But there is no such lifecycle method. " +
+              "Did you mean componentWillUnmount()?",
+            name
+          )
+        : void 0;
       var noComponentDidReceiveProps =
         typeof instance.componentDidReceiveProps !== "function";
-      warning(
-        noComponentDidReceiveProps,
-        "%s has a method called " +
-          "componentDidReceiveProps(). But there is no such lifecycle method. " +
-          "If you meant to update the state in response to changing props, " +
-          "use componentWillReceiveProps(). If you meant to fetch data or " +
-          "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
-        name
-      );
+      !noComponentDidReceiveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentDidReceiveProps(). But there is no such lifecycle method. " +
+              "If you meant to update the state in response to changing props, " +
+              "use componentWillReceiveProps(). If you meant to fetch data or " +
+              "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
+            name
+          )
+        : void 0;
       var noComponentWillRecieveProps =
         typeof instance.componentWillRecieveProps !== "function";
-      warning(
-        noComponentWillRecieveProps,
-        "%s has a method called " +
-          "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
-        name
-      );
+      !noComponentWillRecieveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
+            name
+          )
+        : void 0;
       var noUnsafeComponentWillRecieveProps =
         typeof instance.UNSAFE_componentWillRecieveProps !== "function";
-      warning(
-        noUnsafeComponentWillRecieveProps,
-        "%s has a method called " +
-          "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
-        name
-      );
+      !noUnsafeComponentWillRecieveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
+            name
+          )
+        : void 0;
       var hasMutatedProps = instance.props !== workInProgress.pendingProps;
-      warning(
-        instance.props === undefined || !hasMutatedProps,
-        "%s(...): When calling super() in `%s`, make sure to pass " +
-          "up the same props that your component's constructor was passed.",
-        name,
-        name
-      );
+      !(instance.props === undefined || !hasMutatedProps)
+        ? warning(
+            false,
+            "%s(...): When calling super() in `%s`, make sure to pass " +
+              "up the same props that your component's constructor was passed.",
+            name,
+            name
+          )
+        : void 0;
       var noInstanceDefaultProps = !instance.defaultProps;
-      warning(
-        noInstanceDefaultProps,
-        "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
-          " Instead, define defaultProps as a static property on %s.",
-        name,
-        name
-      );
-    }
+      !noInstanceDefaultProps
+        ? warning(
+            false,
+            "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
+              " Instead, define defaultProps as a static property on %s.",
+            name,
+            name
+          )
+        : void 0;
 
-    var state = instance.state;
-    if (state && (typeof state !== "object" || isArray(state))) {
-      warning(
-        false,
-        "%s.state: must be set to an object or null",
-        getComponentName(workInProgress)
-      );
-    }
-    if (typeof instance.getChildContext === "function") {
-      warning(
-        typeof type.childContextTypes === "object",
-        "%s.getChildContext(): childContextTypes must be defined in order to " +
-          "use getChildContext().",
-        getComponentName(workInProgress)
-      );
+      if (
+        typeof instance.getSnapshotBeforeUpdate === "function" &&
+        typeof instance.componentDidUpdate !== "function" &&
+        typeof instance.componentDidUpdate !== "function" &&
+        !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
+      ) {
+        didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
+        warning(
+          false,
+          "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
+            "This component defines getSnapshotBeforeUpdate() only.",
+          getComponentName(workInProgress)
+        );
+      }
+
+      var noInstanceGetDerivedStateFromProps =
+        typeof instance.getDerivedStateFromProps !== "function";
+      !noInstanceGetDerivedStateFromProps
+        ? warning(
+            false,
+            "%s: getDerivedStateFromProps() is defined as an instance method " +
+              "and will be ignored. Instead, declare it as a static method.",
+            name
+          )
+        : void 0;
+      var noInstanceGetDerivedStateFromCatch =
+        typeof instance.getDerivedStateFromCatch !== "function";
+      !noInstanceGetDerivedStateFromCatch
+        ? warning(
+            false,
+            "%s: getDerivedStateFromCatch() is defined as an instance method " +
+              "and will be ignored. Instead, declare it as a static method.",
+            name
+          )
+        : void 0;
+      var noStaticGetSnapshotBeforeUpdate =
+        typeof type.getSnapshotBeforeUpdate !== "function";
+      !noStaticGetSnapshotBeforeUpdate
+        ? warning(
+            false,
+            "%s: getSnapshotBeforeUpdate() is defined as a static method " +
+              "and will be ignored. Instead, declare it as an instance method.",
+            name
+          )
+        : void 0;
+      var _state = instance.state;
+      if (_state && (typeof _state !== "object" || isArray(_state))) {
+        warning(false, "%s.state: must be set to an object or null", name);
+      }
+      if (typeof instance.getChildContext === "function") {
+        !(typeof type.childContextTypes === "object")
+          ? warning(
+              false,
+              "%s.getChildContext(): childContextTypes must be defined in order to " +
+                "use getChildContext().",
+              name
+            )
+          : void 0;
+      }
     }
   }
 
@@ -6170,8 +6320,9 @@ var ReactFiberClassComponent = function(
         typeof ctor.getDerivedStateFromProps === "function" &&
         state === null
       ) {
-        var componentName = getComponentName(workInProgress) || "Unknown";
-        if (!didWarnAboutUninitializedState[componentName]) {
+        var componentName = getComponentName(workInProgress) || "Component";
+        if (!didWarnAboutUninitializedState.has(componentName)) {
+          didWarnAboutUninitializedState.add(componentName);
           warning(
             false,
             "%s: Did not properly initialize state during construction. " +
@@ -6179,7 +6330,75 @@ var ReactFiberClassComponent = function(
             componentName,
             instance.state === null ? "null" : "undefined"
           );
-          didWarnAboutUninitializedState[componentName] = true;
+        }
+      }
+
+      // If new component APIs are defined, "unsafe" lifecycles won't be called.
+      // Warn about these lifecycles if they are present.
+      // Don't warn about react-lifecycles-compat polyfilled methods though.
+      if (
+        typeof ctor.getDerivedStateFromProps === "function" ||
+        typeof instance.getSnapshotBeforeUpdate === "function"
+      ) {
+        var foundWillMountName = null;
+        var foundWillReceivePropsName = null;
+        var foundWillUpdateName = null;
+        if (
+          typeof instance.componentWillMount === "function" &&
+          instance.componentWillMount.__suppressDeprecationWarning !== true
+        ) {
+          foundWillMountName = "componentWillMount";
+        } else if (typeof instance.UNSAFE_componentWillMount === "function") {
+          foundWillMountName = "UNSAFE_componentWillMount";
+        }
+        if (
+          typeof instance.componentWillReceiveProps === "function" &&
+          instance.componentWillReceiveProps.__suppressDeprecationWarning !==
+            true
+        ) {
+          foundWillReceivePropsName = "componentWillReceiveProps";
+        } else if (
+          typeof instance.UNSAFE_componentWillReceiveProps === "function"
+        ) {
+          foundWillReceivePropsName = "UNSAFE_componentWillReceiveProps";
+        }
+        if (
+          typeof instance.componentWillUpdate === "function" &&
+          instance.componentWillUpdate.__suppressDeprecationWarning !== true
+        ) {
+          foundWillUpdateName = "componentWillUpdate";
+        } else if (typeof instance.UNSAFE_componentWillUpdate === "function") {
+          foundWillUpdateName = "UNSAFE_componentWillUpdate";
+        }
+        if (
+          foundWillMountName !== null ||
+          foundWillReceivePropsName !== null ||
+          foundWillUpdateName !== null
+        ) {
+          var _componentName = getComponentName(workInProgress) || "Component";
+          var newApiName =
+            typeof ctor.getDerivedStateFromProps === "function"
+              ? "getDerivedStateFromProps()"
+              : "getSnapshotBeforeUpdate()";
+          if (
+            !didWarnAboutLegacyLifecyclesAndDerivedState.has(_componentName)
+          ) {
+            didWarnAboutLegacyLifecyclesAndDerivedState.add(_componentName);
+            warning(
+              false,
+              "Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n" +
+                "%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n" +
+                "The above lifecycles should be removed. Learn more about this warning here:\n" +
+                "https://fb.me/react-async-component-lifecycle-hooks",
+              _componentName,
+              newApiName,
+              foundWillMountName !== null ? "\n  " + foundWillMountName : "",
+              foundWillReceivePropsName !== null
+                ? "\n  " + foundWillReceivePropsName
+                : "",
+              foundWillUpdateName !== null ? "\n  " + foundWillUpdateName : ""
+            );
+          }
         }
       }
     }
@@ -6189,7 +6408,8 @@ var ReactFiberClassComponent = function(
     var partialState = callGetDerivedStateFromProps(
       workInProgress,
       instance,
-      props
+      props,
+      state
     );
 
     if (partialState !== null && partialState !== undefined) {
@@ -6232,7 +6452,7 @@ var ReactFiberClassComponent = function(
           "%s.componentWillMount(): Assigning directly to this.state is " +
             "deprecated (except inside a component's " +
             "constructor). Use setState instead.",
-          getComponentName(workInProgress)
+          getComponentName(workInProgress) || "Component"
         );
       }
       updater.enqueueReplaceState(instance, instance.state, null);
@@ -6258,7 +6478,8 @@ var ReactFiberClassComponent = function(
     if (instance.state !== oldState) {
       {
         var componentName = getComponentName(workInProgress) || "Component";
-        if (!didWarnAboutStateAssignmentForComponent[componentName]) {
+        if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
+          didWarnAboutStateAssignmentForComponent.add(componentName);
           warning(
             false,
             "%s.componentWillReceiveProps(): Assigning directly to " +
@@ -6266,69 +6487,47 @@ var ReactFiberClassComponent = function(
               "constructor). Use setState instead.",
             componentName
           );
-          didWarnAboutStateAssignmentForComponent[componentName] = true;
         }
       }
       updater.enqueueReplaceState(instance, instance.state, null);
     }
   }
 
-  function callGetDerivedStateFromProps(workInProgress, instance, props) {
+  function callGetDerivedStateFromProps(
+    workInProgress,
+    instance,
+    nextProps,
+    prevState
+  ) {
     var type = workInProgress.type;
 
     if (typeof type.getDerivedStateFromProps === "function") {
-      {
-        // Don't warn about react-lifecycles-compat polyfilled components
-        if (
-          (typeof instance.componentWillReceiveProps === "function" &&
-            instance.componentWillReceiveProps.__suppressDeprecationWarning !==
-              true) ||
-          typeof instance.UNSAFE_componentWillReceiveProps === "function"
-        ) {
-          var componentName = getComponentName(workInProgress) || "Unknown";
-          if (!didWarnAboutWillReceivePropsAndDerivedState[componentName]) {
-            warning(
-              false,
-              "%s: Defines both componentWillReceiveProps() and static " +
-                "getDerivedStateFromProps() methods. We recommend using " +
-                "only getDerivedStateFromProps().",
-              componentName
-            );
-            didWarnAboutWillReceivePropsAndDerivedState[componentName] = true;
-          }
-        }
-      }
-
       if (
         debugRenderPhaseSideEffects ||
         (debugRenderPhaseSideEffectsForStrictMode &&
           workInProgress.mode & StrictMode)
       ) {
         // Invoke method an extra time to help detect side-effects.
-        type.getDerivedStateFromProps.call(
-          null,
-          props,
-          workInProgress.memoizedState
-        );
+        type.getDerivedStateFromProps.call(null, nextProps, prevState);
       }
 
       var partialState = type.getDerivedStateFromProps.call(
         null,
-        props,
-        workInProgress.memoizedState
+        nextProps,
+        prevState
       );
 
       {
         if (partialState === undefined) {
-          var _componentName = getComponentName(workInProgress) || "Unknown";
-          if (!didWarnAboutUndefinedDerivedState[_componentName]) {
+          var componentName = getComponentName(workInProgress) || "Component";
+          if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
+            didWarnAboutUndefinedDerivedState.add(componentName);
             warning(
               false,
               "%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. " +
                 "You have returned undefined.",
-              _componentName
+              componentName
             );
-            didWarnAboutUndefinedDerivedState[_componentName] = _componentName;
           }
         }
       }
@@ -6372,11 +6571,12 @@ var ReactFiberClassComponent = function(
     }
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      typeof ctor.getDerivedStateFromProps !== "function" &&
+      typeof instance.getSnapshotBeforeUpdate !== "function" &&
       (typeof instance.UNSAFE_componentWillMount === "function" ||
-        typeof instance.componentWillMount === "function") &&
-      typeof ctor.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillMount === "function")
     ) {
       callComponentWillMount(workInProgress, instance);
       // If we had additional state updates during this life-cycle, let's
@@ -6409,16 +6609,20 @@ var ReactFiberClassComponent = function(
     var newUnmaskedContext = getUnmaskedContext(workInProgress);
     var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
+    var hasNewLifecycles =
+      typeof ctor.getDerivedStateFromProps === "function" ||
+      typeof instance.getSnapshotBeforeUpdate === "function";
+
     // Note: During these life-cycles, instance.props/instance.state are what
     // ever the previously attempted to render - not the "current". However,
     // during componentDidUpdate we pass the "current" props.
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      !hasNewLifecycles &&
       (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function") &&
-      typeof ctor.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillReceiveProps === "function")
     ) {
       if (oldProps !== newProps || oldContext !== newContext) {
         callComponentWillReceiveProps(
@@ -6430,15 +6634,6 @@ var ReactFiberClassComponent = function(
       }
     }
 
-    var derivedStateFromProps = void 0;
-    if (oldProps !== newProps) {
-      derivedStateFromProps = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps
-      );
-    }
-
     // Compute the next state using the memoized state and the update queue.
     var oldState = workInProgress.memoizedState;
     // TODO: Previous state can be null.
@@ -6475,6 +6670,18 @@ var ReactFiberClassComponent = function(
       newState = oldState;
     }
 
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      // The prevState parameter should be the partially updated state.
+      // Otherwise, spreading state in return values could override updates.
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps,
+        newState
+      );
+    }
+
     if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
       // So that multiple render passes do not enqueue multiple updates.
@@ -6483,6 +6690,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromProps
           : Object.assign({}, newState, derivedStateFromProps);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue = workInProgress.updateQueue;
+      if (_updateQueue !== null) {
+        _updateQueue.baseState = Object.assign(
+          {},
+          _updateQueue.baseState,
+          derivedStateFromProps
+        );
+      }
     }
     if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
@@ -6492,6 +6710,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromCatch
           : Object.assign({}, newState, derivedStateFromCatch);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue2 = workInProgress.updateQueue;
+      if (_updateQueue2 !== null) {
+        _updateQueue2.baseState = Object.assign(
+          {},
+          _updateQueue2.baseState,
+          derivedStateFromCatch
+        );
+      }
     }
 
     if (
@@ -6522,11 +6751,11 @@ var ReactFiberClassComponent = function(
 
     if (shouldUpdate) {
       // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      // Unsafe lifecycles should not be invoked for components using the new APIs.
       if (
+        !hasNewLifecycles &&
         (typeof instance.UNSAFE_componentWillMount === "function" ||
-          typeof instance.componentWillMount === "function") &&
-        typeof ctor.getDerivedStateFromProps !== "function"
+          typeof instance.componentWillMount === "function")
       ) {
         startPhaseTimer(workInProgress, "componentWillMount");
         if (typeof instance.componentWillMount === "function") {
@@ -6574,16 +6803,20 @@ var ReactFiberClassComponent = function(
     var newUnmaskedContext = getUnmaskedContext(workInProgress);
     var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
+    var hasNewLifecycles =
+      typeof ctor.getDerivedStateFromProps === "function" ||
+      typeof instance.getSnapshotBeforeUpdate === "function";
+
     // Note: During these life-cycles, instance.props/instance.state are what
     // ever the previously attempted to render - not the "current". However,
     // during componentDidUpdate we pass the "current" props.
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      !hasNewLifecycles &&
       (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function") &&
-      typeof ctor.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillReceiveProps === "function")
     ) {
       if (oldProps !== newProps || oldContext !== newContext) {
         callComponentWillReceiveProps(
@@ -6595,20 +6828,12 @@ var ReactFiberClassComponent = function(
       }
     }
 
-    var derivedStateFromProps = void 0;
-    if (oldProps !== newProps) {
-      derivedStateFromProps = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps
-      );
-    }
-
     // Compute the next state using the memoized state and the update queue.
     var oldState = workInProgress.memoizedState;
     // TODO: Previous state can be null.
     var newState = void 0;
     var derivedStateFromCatch = void 0;
+
     if (workInProgress.updateQueue !== null) {
       newState = processUpdateQueue(
         current,
@@ -6640,6 +6865,18 @@ var ReactFiberClassComponent = function(
       newState = oldState;
     }
 
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      // The prevState parameter should be the partially updated state.
+      // Otherwise, spreading state in return values could override updates.
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps,
+        newState
+      );
+    }
+
     if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
       // So that multiple render passes do not enqueue multiple updates.
@@ -6648,6 +6885,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromProps
           : Object.assign({}, newState, derivedStateFromProps);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue3 = workInProgress.updateQueue;
+      if (_updateQueue3 !== null) {
+        _updateQueue3.baseState = Object.assign(
+          {},
+          _updateQueue3.baseState,
+          derivedStateFromProps
+        );
+      }
     }
     if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
@@ -6657,6 +6905,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromCatch
           : Object.assign({}, newState, derivedStateFromCatch);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue4 = workInProgress.updateQueue;
+      if (_updateQueue4 !== null) {
+        _updateQueue4.baseState = Object.assign(
+          {},
+          _updateQueue4.baseState,
+          derivedStateFromCatch
+        );
+      }
     }
 
     if (
@@ -6678,6 +6937,14 @@ var ReactFiberClassComponent = function(
           workInProgress.effectTag |= Update;
         }
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Snapshot;
+        }
+      }
       return false;
     }
 
@@ -6692,11 +6959,11 @@ var ReactFiberClassComponent = function(
 
     if (shouldUpdate) {
       // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      // Unsafe lifecycles should not be invoked for components using the new APIs.
       if (
+        !hasNewLifecycles &&
         (typeof instance.UNSAFE_componentWillUpdate === "function" ||
-          typeof instance.componentWillUpdate === "function") &&
-        typeof ctor.getDerivedStateFromProps !== "function"
+          typeof instance.componentWillUpdate === "function")
       ) {
         startPhaseTimer(workInProgress, "componentWillUpdate");
         if (typeof instance.componentWillUpdate === "function") {
@@ -6710,6 +6977,9 @@ var ReactFiberClassComponent = function(
       if (typeof instance.componentDidUpdate === "function") {
         workInProgress.effectTag |= Update;
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        workInProgress.effectTag |= Snapshot;
+      }
     } else {
       // If an update was already in progress, we should schedule an Update
       // effect even though we're bailing out, so that cWU/cDU are called.
@@ -6721,6 +6991,14 @@ var ReactFiberClassComponent = function(
           workInProgress.effectTag |= Update;
         }
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Snapshot;
+        }
+      }
 
       // If shouldComponentUpdate returned false, we should still update the
       // memoized props/state to indicate that this work can be reused.
@@ -7560,13 +7838,15 @@ function ChildReconciler(shouldTrackSideEffects) {
       if (typeof newChildrenIterable.entries === "function") {
         var possibleMap = newChildrenIterable;
         if (possibleMap.entries === iteratorFn) {
-          warning(
-            didWarnAboutMaps,
-            "Using Maps as children is unsupported and will likely yield " +
-              "unexpected results. Convert it to a sequence/iterable of keyed " +
-              "ReactElements instead.%s",
-            getCurrentFiberStackAddendum$1()
-          );
+          !didWarnAboutMaps
+            ? warning(
+                false,
+                "Using Maps as children is unsupported and will likely yield " +
+                  "unexpected results. Convert it to a sequence/iterable of keyed " +
+                  "ReactElements instead.%s",
+                getCurrentFiberStackAddendum$1()
+              )
+            : void 0;
           didWarnAboutMaps = true;
         }
       }
@@ -8532,7 +8812,8 @@ var ReactFiberBeginWork = function(
         var partialState = callGetDerivedStateFromProps(
           workInProgress,
           value,
-          props
+          props,
+          workInProgress.memoizedState
         );
 
         if (partialState !== null && partialState !== undefined) {
@@ -8565,11 +8846,13 @@ var ReactFiberBeginWork = function(
         var _Component = workInProgress.type;
 
         if (_Component) {
-          warning(
-            !_Component.childContextTypes,
-            "%s(...): childContextTypes cannot be defined on a functional component.",
-            _Component.displayName || _Component.name || "Component"
-          );
+          !!_Component.childContextTypes
+            ? warning(
+                false,
+                "%s(...): childContextTypes cannot be defined on a functional component.",
+                _Component.displayName || _Component.name || "Component"
+              )
+            : void 0;
         }
         if (workInProgress.ref !== null) {
           var info = "";
@@ -8788,7 +9071,7 @@ var ReactFiberBeginWork = function(
     renderExpirationTime
   ) {
     var providerType = workInProgress.type;
-    var context = providerType.context;
+    var context = providerType._context;
 
     var newProps = workInProgress.pendingProps;
     var oldProps = workInProgress.memoizedProps;
@@ -8841,12 +9124,14 @@ var ReactFiberBeginWork = function(
               ? context._calculateChangedBits(oldValue, newValue)
               : MAX_SIGNED_31_BIT_INT;
           {
-            warning(
-              (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
-              "calculateChangedBits: Expected the return value to be a " +
-                "31-bit integer. Instead received: %s",
-              changedBits
-            );
+            !((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits)
+              ? warning(
+                  false,
+                  "calculateChangedBits: Expected the return value to be a " +
+                    "31-bit integer. Instead received: %s",
+                  changedBits
+                )
+              : void 0;
           }
           changedBits |= 0;
 
@@ -8914,21 +9199,23 @@ var ReactFiberBeginWork = function(
         changedBits,
         renderExpirationTime
       );
-    } else if (oldProps !== null && oldProps.children === newProps.children) {
-      // No change. Bailout early if children are the same.
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
+    // There is no bailout on `children` equality because we expect people
+    // to often pass a bound method as a child, but it may reference
+    // `this.state` or `this.props` (and thus needs to re-render on `setState`).
 
     var render = newProps.children;
 
     {
-      warning(
-        typeof render === "function",
-        "A context consumer was rendered with multiple children, or a child " +
-          "that isn't a function. A context consumer expects a single child " +
-          "that is a function. If you did pass a function, make sure there " +
-          "is no trailing or leading whitespace around it."
-      );
+      !(typeof render === "function")
+        ? warning(
+            false,
+            "A context consumer was rendered with multiple children, or a child " +
+              "that isn't a function. A context consumer expects a single child " +
+              "that is a function. If you did pass a function, make sure there " +
+              "is no trailing or leading whitespace around it."
+          )
+        : void 0;
     }
 
     var newChildren = render(newValue);
@@ -9883,6 +10170,11 @@ var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
 var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
 
+var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
+{
+  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
+}
+
 function logError(boundary, errorInfo) {
   var source = errorInfo.source;
   var stack = errorInfo.stack;
@@ -9892,21 +10184,19 @@ function logError(boundary, errorInfo) {
 
   var capturedError = {
     componentName: source !== null ? getComponentName(source) : null,
-    error: errorInfo.value,
-    errorBoundary: boundary,
     componentStack: stack !== null ? stack : "",
+    error: errorInfo.value,
+    errorBoundary: null,
     errorBoundaryName: null,
     errorBoundaryFound: false,
     willRetry: false
   };
 
-  if (boundary !== null) {
+  if (boundary !== null && boundary.tag === ClassComponent) {
+    capturedError.errorBoundary = boundary.stateNode;
     capturedError.errorBoundaryName = getComponentName(boundary);
-    capturedError.errorBoundaryFound = capturedError.willRetry =
-      boundary.tag === ClassComponent;
-  } else {
-    capturedError.errorBoundaryName = null;
-    capturedError.errorBoundaryFound = capturedError.willRetry = false;
+    capturedError.errorBoundaryFound = true;
+    capturedError.willRetry = true;
   }
 
   try {
@@ -9975,6 +10265,58 @@ var ReactFiberCommitWork = function(
     }
   }
 
+  function commitBeforeMutationLifeCycles(current, finishedWork) {
+    switch (finishedWork.tag) {
+      case ClassComponent: {
+        if (finishedWork.effectTag & Snapshot) {
+          if (current !== null) {
+            var prevProps = current.memoizedProps;
+            var prevState = current.memoizedState;
+            startPhaseTimer(finishedWork, "getSnapshotBeforeUpdate");
+            var _instance = finishedWork.stateNode;
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            var snapshot = _instance.getSnapshotBeforeUpdate(
+              prevProps,
+              prevState
+            );
+            {
+              var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
+              if (
+                snapshot === undefined &&
+                !didWarnSet.has(finishedWork.type)
+              ) {
+                didWarnSet.add(finishedWork.type);
+                warning(
+                  false,
+                  "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
+                    "must be returned. You have returned undefined.",
+                  getComponentName(finishedWork)
+                );
+              }
+            }
+            _instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+            stopPhaseTimer();
+          }
+        }
+        return;
+      }
+      case HostRoot:
+      case HostComponent:
+      case HostText:
+      case HostPortal:
+        // Nothing to do for these component types
+        return;
+      default: {
+        invariant(
+          false,
+          "This unit of work tag should not have side-effects. This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
+      }
+    }
+  }
+
   function commitLifeCycles(
     finishedRoot,
     current,
@@ -9984,50 +10326,54 @@ var ReactFiberCommitWork = function(
   ) {
     switch (finishedWork.tag) {
       case ClassComponent: {
-        var _instance = finishedWork.stateNode;
+        var _instance2 = finishedWork.stateNode;
         if (finishedWork.effectTag & Update) {
           if (current === null) {
             startPhaseTimer(finishedWork, "componentDidMount");
-            _instance.props = finishedWork.memoizedProps;
-            _instance.state = finishedWork.memoizedState;
-            _instance.componentDidMount();
+            _instance2.props = finishedWork.memoizedProps;
+            _instance2.state = finishedWork.memoizedState;
+            _instance2.componentDidMount();
             stopPhaseTimer();
           } else {
             var prevProps = current.memoizedProps;
             var prevState = current.memoizedState;
             startPhaseTimer(finishedWork, "componentDidUpdate");
-            _instance.props = finishedWork.memoizedProps;
-            _instance.state = finishedWork.memoizedState;
-            _instance.componentDidUpdate(prevProps, prevState);
+            _instance2.props = finishedWork.memoizedProps;
+            _instance2.state = finishedWork.memoizedState;
+            _instance2.componentDidUpdate(
+              prevProps,
+              prevState,
+              _instance2.__reactInternalSnapshotBeforeUpdate
+            );
             stopPhaseTimer();
           }
         }
         var updateQueue = finishedWork.updateQueue;
         if (updateQueue !== null) {
-          commitCallbacks(updateQueue, _instance);
+          commitCallbacks(updateQueue, _instance2);
         }
         return;
       }
       case HostRoot: {
         var _updateQueue = finishedWork.updateQueue;
         if (_updateQueue !== null) {
-          var _instance2 = null;
+          var _instance3 = null;
           if (finishedWork.child !== null) {
             switch (finishedWork.child.tag) {
               case HostComponent:
-                _instance2 = getPublicInstance(finishedWork.child.stateNode);
+                _instance3 = getPublicInstance(finishedWork.child.stateNode);
                 break;
               case ClassComponent:
-                _instance2 = finishedWork.child.stateNode;
+                _instance3 = finishedWork.child.stateNode;
                 break;
             }
           }
-          commitCallbacks(_updateQueue, _instance2);
+          commitCallbacks(_updateQueue, _instance3);
         }
         return;
       }
       case HostComponent: {
-        var _instance3 = finishedWork.stateNode;
+        var _instance4 = finishedWork.stateNode;
 
         // Renderers may schedule work to be done after host components are mounted
         // (eg DOM renderer may schedule auto-focus for inputs and form controls).
@@ -10036,7 +10382,7 @@ var ReactFiberCommitWork = function(
         if (current === null && finishedWork.effectTag & Update) {
           var type = finishedWork.type;
           var props = finishedWork.memoizedProps;
-          commitMount(_instance3, type, props, finishedWork);
+          commitMount(_instance4, type, props, finishedWork);
         }
 
         return;
@@ -10064,7 +10410,7 @@ var ReactFiberCommitWork = function(
       case ClassComponent:
         {
           var ctor = finishedWork.type;
-          var _instance4 = finishedWork.stateNode;
+          var _instance5 = finishedWork.stateNode;
           var updateQueue = finishedWork.updateQueue;
           invariant(
             updateQueue !== null && updateQueue.capturedValues !== null,
@@ -10081,16 +10427,19 @@ var ReactFiberCommitWork = function(
             // This gets reset before we yield back to the browser.
             // TODO: Warn in strict mode if getDerivedStateFromCatch is
             // not defined.
-            markLegacyErrorBoundaryAsFailed(_instance4);
+            markLegacyErrorBoundaryAsFailed(_instance5);
           }
 
-          _instance4.props = finishedWork.memoizedProps;
-          _instance4.state = finishedWork.memoizedState;
+          _instance5.props = finishedWork.memoizedProps;
+          _instance5.state = finishedWork.memoizedState;
           for (var i = 0; i < capturedErrors.length; i++) {
             var errorInfo = capturedErrors[i];
             var _error = errorInfo.value;
+            var stack = errorInfo.stack;
             logError(finishedWork, errorInfo);
-            _instance4.componentDidCatch(_error);
+            _instance5.componentDidCatch(_error, {
+              componentStack: stack !== null ? stack : ""
+            });
           }
         }
         break;
@@ -10123,14 +10472,14 @@ var ReactFiberCommitWork = function(
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (ref !== null) {
-      var _instance5 = finishedWork.stateNode;
+      var _instance6 = finishedWork.stateNode;
       var instanceToUse = void 0;
       switch (finishedWork.tag) {
         case HostComponent:
-          instanceToUse = getPublicInstance(_instance5);
+          instanceToUse = getPublicInstance(_instance6);
           break;
         default:
-          instanceToUse = _instance5;
+          instanceToUse = _instance6;
       }
       if (typeof ref === "function") {
         ref(instanceToUse);
@@ -10174,9 +10523,9 @@ var ReactFiberCommitWork = function(
     switch (current.tag) {
       case ClassComponent: {
         safelyDetachRef(current);
-        var _instance6 = current.stateNode;
-        if (typeof _instance6.componentWillUnmount === "function") {
-          safelyCallComponentWillUnmount(current, _instance6);
+        var _instance7 = current.stateNode;
+        if (typeof _instance7.componentWillUnmount === "function") {
+          safelyCallComponentWillUnmount(current, _instance7);
         }
         return;
       }
@@ -10313,6 +10662,7 @@ var ReactFiberCommitWork = function(
         },
 
         commitLifeCycles: commitLifeCycles,
+        commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
         commitErrorLogging: commitErrorLogging,
         commitAttachRef: commitAttachRef,
         commitDetachRef: commitDetachRef
@@ -10571,8 +10921,8 @@ var ReactFiberCommitWork = function(
         return;
       }
       case HostComponent: {
-        var _instance7 = finishedWork.stateNode;
-        if (_instance7 != null) {
+        var _instance8 = finishedWork.stateNode;
+        if (_instance8 != null) {
           // Commit the work prepared earlier.
           var newProps = finishedWork.memoizedProps;
           // For hydration we reuse the update path but we treat the oldProps
@@ -10585,7 +10935,7 @@ var ReactFiberCommitWork = function(
           finishedWork.updateQueue = null;
           if (updatePayload !== null) {
             commitUpdate(
-              _instance7,
+              _instance8,
               updatePayload,
               type,
               oldProps,
@@ -10630,6 +10980,7 @@ var ReactFiberCommitWork = function(
 
   if (enableMutatingReconciler) {
     return {
+      commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
       commitResetTextContent: commitResetTextContent,
       commitPlacement: commitPlacement,
       commitDeletion: commitDeletion,
@@ -10675,12 +11026,19 @@ var ReactFiberHostContext = function(config, stack) {
     // Push current root instance onto the stack;
     // This allows us to reset root when portals are popped.
     push(rootInstanceStackCursor, nextRootInstance, fiber);
-
-    var nextRootContext = getRootHostContext(nextRootInstance);
-
     // Track the context and the Fiber that provided it.
     // This enables us to pop only Fibers that provide unique contexts.
     push(contextFiberStackCursor, fiber, fiber);
+
+    // Finally, we need to push the host context to the stack.
+    // However, we can't just call getRootHostContext() and push it because
+    // we'd have a different number of entries on the stack depending on
+    // whether getRootHostContext() throws somewhere in renderer code or not.
+    // So we push an empty value first. This lets us safely unwind on errors.
+    push(contextStackCursor, NO_CONTEXT, fiber);
+    var nextRootContext = getRootHostContext(nextRootInstance);
+    // Now that we know this function doesn't throw, replace it.
+    pop(contextStackCursor, fiber);
     push(contextStackCursor, nextRootContext, fiber);
   }
 
@@ -11391,7 +11749,7 @@ var ReactFiberNewContext = function(stack) {
   }
 
   function pushProvider(providerFiber) {
-    var context = providerFiber.type.context;
+    var context = providerFiber.type._context;
 
     push(changedBitsCursor, context._changedBits, providerFiber);
     push(valueCursor, context._currentValue, providerFiber);
@@ -11401,12 +11759,16 @@ var ReactFiberNewContext = function(stack) {
     context._changedBits = providerFiber.stateNode;
 
     {
-      warning(
+      !(
         context._currentRenderer === null ||
-          context._currentRenderer === rendererSigil,
-        "Detected multiple renderers concurrently rendering the " +
-          "same context provider. This is currently unsupported."
-      );
+        context._currentRenderer === rendererSigil
+      )
+        ? warning(
+            false,
+            "Detected multiple renderers concurrently rendering the " +
+              "same context provider. This is currently unsupported."
+          )
+        : void 0;
       context._currentRenderer = rendererSigil;
     }
   }
@@ -11419,7 +11781,7 @@ var ReactFiberNewContext = function(stack) {
     pop(valueCursor, providerFiber);
     pop(changedBitsCursor, providerFiber);
 
-    var context = providerFiber.type.context;
+    var context = providerFiber.type._context;
     context._currentValue = currentValue;
     context._changedBits = changedBits;
   }
@@ -11532,17 +11894,19 @@ var warnAboutInvalidUpdates = void 0;
   var didWarnStateUpdateForUnmountedComponent = {};
 
   warnAboutUpdateOnUnmounted = function(fiber) {
+    // We show the whole stack but dedupe on the top component's name because
+    // the problematic code almost always lies inside that component.
     var componentName = getComponentName(fiber) || "ReactClass";
     if (didWarnStateUpdateForUnmountedComponent[componentName]) {
       return;
     }
     warning(
       false,
-      "Can only update a mounted or mounting " +
-        "component. This usually means you called setState, replaceState, " +
-        "or forceUpdate on an unmounted component. This is a no-op.\n\nPlease " +
-        "check the code for the %s component.",
-      componentName
+      "Can't call setState (or forceUpdate) on an unmounted component. This " +
+        "is a no-op, but it indicates a memory leak in your application. To " +
+        "fix, cancel all subscriptions and asynchronous tasks in the " +
+        "componentWillUnmount method.%s",
+      getStackAddendumByWorkInProgressFiber(fiber)
     );
     didWarnStateUpdateForUnmountedComponent[componentName] = true;
   };
@@ -11628,6 +11992,8 @@ var ReactFiberScheduler = function(config) {
       markLegacyErrorBoundaryAsFailed,
       recalculateCurrentTime
     ),
+    commitBeforeMutationLifeCycles =
+      _ReactFiberCommitWork.commitBeforeMutationLifeCycles,
     commitResetTextContent = _ReactFiberCommitWork.commitResetTextContent,
     commitPlacement = _ReactFiberCommitWork.commitPlacement,
     commitDeletion = _ReactFiberCommitWork.commitDeletion,
@@ -11679,11 +12045,19 @@ var ReactFiberScheduler = function(config) {
 
   var stashedWorkInProgressProperties = void 0;
   var replayUnitOfWork = void 0;
+  var isReplayingFailedUnitOfWork = void 0;
+  var originalReplayError = void 0;
+  var rethrowOriginalError = void 0;
   if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
     stashedWorkInProgressProperties = null;
-    replayUnitOfWork = function(failedUnitOfWork, isAsync) {
-      // Retore the original state of the work-in-progress
-      Object.assign(failedUnitOfWork, stashedWorkInProgressProperties);
+    isReplayingFailedUnitOfWork = false;
+    originalReplayError = null;
+    replayUnitOfWork = function(failedUnitOfWork, error, isAsync) {
+      // Restore the original state of the work-in-progress
+      assignFiberPropertiesInDEV(
+        failedUnitOfWork,
+        stashedWorkInProgressProperties
+      );
       switch (failedUnitOfWork.tag) {
         case HostRoot:
           popHostContainer(failedUnitOfWork);
@@ -11703,14 +12077,22 @@ var ReactFiberScheduler = function(config) {
           break;
       }
       // Replay the begin phase.
+      isReplayingFailedUnitOfWork = true;
+      originalReplayError = error;
       invokeGuardedCallback$2(null, workLoop, null, isAsync);
+      isReplayingFailedUnitOfWork = false;
+      originalReplayError = null;
       if (hasCaughtError()) {
         clearCaughtError();
       } else {
-        // This should be unreachable because the render phase is
-        // idempotent
+        // If the begin phase did not fail the second time, set this pointer
+        // back to the original value.
+        nextUnitOfWork = failedUnitOfWork;
       }
     };
+    rethrowOriginalError = function() {
+      throw originalReplayError;
+    };
   }
 
   function resetStack() {
@@ -11742,6 +12124,7 @@ var ReactFiberScheduler = function(config) {
       recordEffect();
 
       var effectTag = nextEffect.effectTag;
+
       if (effectTag & ContentReset) {
         commitResetTextContent(nextEffect);
       }
@@ -11799,6 +12182,22 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
+  function commitBeforeMutationLifecycles() {
+    while (nextEffect !== null) {
+      var effectTag = nextEffect.effectTag;
+
+      if (effectTag & Snapshot) {
+        recordEffect();
+        var current = nextEffect.alternate;
+        commitBeforeMutationLifeCycles(current, nextEffect);
+      }
+
+      // Don't cleanup effects yet;
+      // This will be done by commitAllLifeCycles()
+      nextEffect = nextEffect.nextEffect;
+    }
+  }
+
   function commitAllLifeCycles(
     finishedRoot,
     currentTime,
@@ -11906,16 +12305,14 @@ var ReactFiberScheduler = function(config) {
 
     prepareForCommit(root.containerInfo);
 
-    // Commit all the side-effects within a tree. We'll do this in two passes.
-    // The first pass performs all the host insertions, updates, deletions and
-    // ref unmounts.
+    // Invoke instances of getSnapshotBeforeUpdate before mutation.
     nextEffect = firstEffect;
-    startCommitHostEffectsTimer();
+    startCommitSnapshotEffectsTimer();
     while (nextEffect !== null) {
       var didError = false;
       var error = void 0;
       {
-        invokeGuardedCallback$2(null, commitAllHostEffects, null);
+        invokeGuardedCallback$2(null, commitBeforeMutationLifecycles, null);
         if (hasCaughtError()) {
           didError = true;
           error = clearCaughtError();
@@ -11934,6 +12331,36 @@ var ReactFiberScheduler = function(config) {
         }
       }
     }
+    stopCommitSnapshotEffectsTimer();
+
+    // Commit all the side-effects within a tree. We'll do this in two passes.
+    // The first pass performs all the host insertions, updates, deletions and
+    // ref unmounts.
+    nextEffect = firstEffect;
+    startCommitHostEffectsTimer();
+    while (nextEffect !== null) {
+      var _didError = false;
+      var _error = void 0;
+      {
+        invokeGuardedCallback$2(null, commitAllHostEffects, null);
+        if (hasCaughtError()) {
+          _didError = true;
+          _error = clearCaughtError();
+        }
+      }
+      if (_didError) {
+        invariant(
+          nextEffect !== null,
+          "Should have next effect. This error is likely caused by a bug " +
+            "in React. Please file an issue."
+        );
+        onCommitPhaseError(nextEffect, _error);
+        // Clean-up
+        if (nextEffect !== null) {
+          nextEffect = nextEffect.nextEffect;
+        }
+      }
+    }
     stopCommitHostEffectsTimer();
 
     resetAfterCommit(root.containerInfo);
@@ -11951,8 +12378,8 @@ var ReactFiberScheduler = function(config) {
     nextEffect = firstEffect;
     startCommitLifeCyclesTimer();
     while (nextEffect !== null) {
-      var _didError = false;
-      var _error = void 0;
+      var _didError2 = false;
+      var _error2 = void 0;
       {
         invokeGuardedCallback$2(
           null,
@@ -11963,17 +12390,17 @@ var ReactFiberScheduler = function(config) {
           committedExpirationTime
         );
         if (hasCaughtError()) {
-          _didError = true;
-          _error = clearCaughtError();
+          _didError2 = true;
+          _error2 = clearCaughtError();
         }
       }
-      if (_didError) {
+      if (_didError2) {
         invariant(
           nextEffect !== null,
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        onCommitPhaseError(nextEffect, _error);
+        onCommitPhaseError(nextEffect, _error2);
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
         }
@@ -12197,12 +12624,21 @@ var ReactFiberScheduler = function(config) {
     }
 
     if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-      stashedWorkInProgressProperties = Object.assign({}, workInProgress);
+      stashedWorkInProgressProperties = assignFiberPropertiesInDEV(
+        stashedWorkInProgressProperties,
+        workInProgress
+      );
     }
     var next = beginWork(current, workInProgress, nextRenderExpirationTime);
-
     {
       ReactDebugCurrentFiber.resetCurrentFiber();
+      if (isReplayingFailedUnitOfWork) {
+        // Currently replaying a failed unit of work. This should be unreachable,
+        // because the render phase is meant to be idempotent, and it should
+        // have thrown again. Since it didn't, rethrow the original error, so
+        // React's internal stack is not misaligned.
+        rethrowOriginalError();
+      }
     }
     if (true && ReactFiberInstrumentation_1.debugTool) {
       ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
@@ -12276,13 +12712,18 @@ var ReactFiberScheduler = function(config) {
 
         if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
           var failedUnitOfWork = nextUnitOfWork;
-          replayUnitOfWork(failedUnitOfWork, isAsync);
+          replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
         }
 
         var sourceFiber = nextUnitOfWork;
         var returnFiber = sourceFiber["return"];
         if (returnFiber === null) {
-          // This is a fatal error.
+          // This is the root. The root could capture its own errors. However,
+          // we don't know if it errors before or after we pushed the host
+          // context. This information is needed to avoid a stack mismatch.
+          // Because we're not sure, treat this as a fatal error. We could track
+          // which phase it fails in, but doesn't seem worth it. At least
+          // for now.
           didFatal = true;
           onUncaughtError(thrownValue);
           break;
@@ -12294,12 +12735,13 @@ var ReactFiberScheduler = function(config) {
     } while (true);
 
     // We're done performing work. Time to clean up.
-    stopWorkLoopTimer(interruptedBy);
-    interruptedBy = null;
+    var didCompleteRoot = false;
     isWorking = false;
 
     // Yield back to main thread.
     if (didFatal) {
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
       // There was a fatal error.
       {
         stack.resetStackAfterFatalErrorInDev();
@@ -12308,12 +12750,17 @@ var ReactFiberScheduler = function(config) {
     } else if (nextUnitOfWork === null) {
       // We reached the root.
       if (isRootReadyForCommit) {
+        didCompleteRoot = true;
+        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+        interruptedBy = null;
         // The root successfully completed. It's ready for commit.
         root.pendingCommitExpirationTime = expirationTime;
         var finishedWork = root.current.alternate;
         return finishedWork;
       } else {
         // The root did not complete.
+        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+        interruptedBy = null;
         invariant(
           false,
           "Expired work should have completed. This error is likely caused " +
@@ -12321,6 +12768,8 @@ var ReactFiberScheduler = function(config) {
         );
       }
     } else {
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
       // There's more work to do, but we ran out of time. Yield back to
       // the renderer.
       return null;
@@ -12506,7 +12955,15 @@ var ReactFiberScheduler = function(config) {
             interruptedBy = fiber;
             resetStack();
           }
-          if (nextRoot !== root || !isWorking) {
+          if (
+            // If we're in the render phase, we don't need to schedule this root
+            // for an update, because we'll do it before we exit...
+            !isWorking ||
+            isCommitting ||
+            // ...unless this is a different root than the one we're rendering.
+            nextRoot !== root
+          ) {
+            // Add this root to the root schedule.
             requestWork(root, expirationTime);
           }
           if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
@@ -12766,7 +13223,8 @@ var ReactFiberScheduler = function(config) {
 
     if (enableUserTimingAPI && deadline !== null) {
       var didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
-      stopRequestCallbackTimer(didExpire);
+      var timeout = expirationTimeToMs(nextFlushedExpirationTime);
+      stopRequestCallbackTimer(didExpire, timeout);
     }
 
     if (isAsync) {
@@ -12826,7 +13284,11 @@ var ReactFiberScheduler = function(config) {
     // Perform work on root as if the given expiration time is the current time.
     // This has the effect of synchronously flushing all work up to and
     // including the given time.
+    nextFlushedRoot = root;
+    nextFlushedExpirationTime = expirationTime;
     performWorkOnRoot(root, expirationTime, false);
+    // Flush any sync work that was scheduled by lifecycles
+    performSyncWork();
     finishRendering();
   }
 
@@ -13153,12 +13615,14 @@ var ReactFiberReconciler$1 = function(config) {
 
     callback = callback === undefined ? null : callback;
     {
-      warning(
-        callback === null || typeof callback === "function",
-        "render(...): Expected the last optional `callback` argument to be a " +
-          "function. Instead received: %s.",
-        callback
-      );
+      !(callback === null || typeof callback === "function")
+        ? warning(
+            false,
+            "render(...): Expected the last optional `callback` argument to be a " +
+              "function. Instead received: %s.",
+            callback
+          )
+        : void 0;
     }
 
     var update = {
diff --git a/Libraries/Renderer/ReactFabric-prod.js b/Libraries/Renderer/ReactFabric-prod.js
index 08f112c70d4570..c12ebd601c84d0 100644
--- a/Libraries/Renderer/ReactFabric-prod.js
+++ b/Libraries/Renderer/ReactFabric-prod.js
@@ -1494,7 +1494,8 @@ var ReactNativeComponent = (function(_React$Component) {
   frameDeadlineObject = {
     timeRemaining: function() {
       return frameDeadline - now();
-    }
+    },
+    didTimeout: !1
   };
 function setTimeoutCallback() {
   frameDeadline = now() + 5;
@@ -2036,13 +2037,18 @@ function ReactFiberClassComponent(
     instance.state !== workInProgress &&
       updater.enqueueReplaceState(instance, instance.state, null);
   }
-  function callGetDerivedStateFromProps(workInProgress, instance, props) {
-    instance = workInProgress.type;
-    if ("function" === typeof instance.getDerivedStateFromProps)
-      return instance.getDerivedStateFromProps.call(
+  function callGetDerivedStateFromProps(
+    workInProgress,
+    instance,
+    nextProps,
+    prevState
+  ) {
+    workInProgress = workInProgress.type;
+    if ("function" === typeof workInProgress.getDerivedStateFromProps)
+      return workInProgress.getDerivedStateFromProps.call(
         null,
-        props,
-        workInProgress.memoizedState
+        nextProps,
+        prevState
       );
   }
   var cacheContext = legacyContext.cacheContext,
@@ -2113,7 +2119,7 @@ function ReactFiberClassComponent(
         null !== ctor.state && void 0 !== ctor.state ? ctor.state : null;
       adoptClassInstance(workInProgress, ctor);
       workInProgress.memoizedState = state;
-      props = callGetDerivedStateFromProps(workInProgress, ctor, props);
+      props = callGetDerivedStateFromProps(workInProgress, ctor, props, state);
       null !== props &&
         void 0 !== props &&
         (workInProgress.memoizedState = Object.assign(
@@ -2134,9 +2140,10 @@ function ReactFiberClassComponent(
       instance.state = workInProgress.memoizedState;
       instance.refs = emptyObject;
       instance.context = getMaskedContext(workInProgress, unmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillMount &&
-        "function" !== typeof instance.componentWillMount) ||
-        "function" === typeof ctor.getDerivedStateFromProps ||
+      "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate ||
+        ("function" !== typeof instance.UNSAFE_componentWillMount &&
+          "function" !== typeof instance.componentWillMount) ||
         ((ctor = instance.state),
         "function" === typeof instance.componentWillMount &&
           instance.componentWillMount(),
@@ -2167,9 +2174,11 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-        "function" !== typeof instance.componentWillReceiveProps) ||
+      (ctor =
         "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate) ||
+        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof instance.componentWillReceiveProps) ||
         ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
           callComponentWillReceiveProps(
             workInProgress,
@@ -2177,14 +2186,7 @@ function ReactFiberClassComponent(
             newProps,
             newUnmaskedContext
           ));
-      oldContext = void 0;
-      oldProps !== newProps &&
-        (oldContext = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps
-        ));
-      var oldState = workInProgress.memoizedState;
+      oldContext = workInProgress.memoizedState;
       renderExpirationTime =
         null !== workInProgress.updateQueue
           ? processUpdateQueue(
@@ -2195,17 +2197,32 @@ function ReactFiberClassComponent(
               newProps,
               renderExpirationTime
             )
-          : oldState;
-      null !== oldContext &&
-        void 0 !== oldContext &&
-        (renderExpirationTime =
+          : oldContext;
+      var derivedStateFromProps = void 0;
+      oldProps !== newProps &&
+        (derivedStateFromProps = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps,
+          renderExpirationTime
+        ));
+      if (null !== derivedStateFromProps && void 0 !== derivedStateFromProps) {
+        renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? oldContext
-            : Object.assign({}, renderExpirationTime, oldContext));
+            ? derivedStateFromProps
+            : Object.assign({}, renderExpirationTime, derivedStateFromProps);
+        var _updateQueue = workInProgress.updateQueue;
+        null !== _updateQueue &&
+          (_updateQueue.baseState = Object.assign(
+            {},
+            _updateQueue.baseState,
+            derivedStateFromProps
+          ));
+      }
       if (
         !(
           oldProps !== newProps ||
-          oldState !== renderExpirationTime ||
+          oldContext !== renderExpirationTime ||
           hasContextChanged() ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
@@ -2220,13 +2237,13 @@ function ReactFiberClassComponent(
         workInProgress,
         oldProps,
         newProps,
-        oldState,
+        oldContext,
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (("function" !== typeof instance.UNSAFE_componentWillMount &&
-            "function" !== typeof instance.componentWillMount) ||
-            "function" === typeof ctor.getDerivedStateFromProps ||
+        ? (ctor ||
+            ("function" !== typeof instance.UNSAFE_componentWillMount &&
+              "function" !== typeof instance.componentWillMount) ||
             ("function" === typeof instance.componentWillMount &&
               instance.componentWillMount(),
             "function" === typeof instance.UNSAFE_componentWillMount &&
@@ -2256,9 +2273,11 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-        "function" !== typeof instance.componentWillReceiveProps) ||
+      (ctor =
         "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate) ||
+        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof instance.componentWillReceiveProps) ||
         ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
           callComponentWillReceiveProps(
             workInProgress,
@@ -2266,13 +2285,6 @@ function ReactFiberClassComponent(
             newProps,
             newUnmaskedContext
           ));
-      var derivedStateFromProps = void 0;
-      oldProps !== newProps &&
-        (derivedStateFromProps = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps
-        ));
       oldContext = workInProgress.memoizedState;
       renderExpirationTime =
         null !== workInProgress.updateQueue
@@ -2285,12 +2297,27 @@ function ReactFiberClassComponent(
               renderExpirationTime
             )
           : oldContext;
-      null !== derivedStateFromProps &&
-        void 0 !== derivedStateFromProps &&
-        (renderExpirationTime =
+      var derivedStateFromProps = void 0;
+      oldProps !== newProps &&
+        (derivedStateFromProps = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps,
+          renderExpirationTime
+        ));
+      if (null !== derivedStateFromProps && void 0 !== derivedStateFromProps) {
+        renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
             ? derivedStateFromProps
-            : Object.assign({}, renderExpirationTime, derivedStateFromProps));
+            : Object.assign({}, renderExpirationTime, derivedStateFromProps);
+        var _updateQueue3 = workInProgress.updateQueue;
+        null !== _updateQueue3 &&
+          (_updateQueue3.baseState = Object.assign(
+            {},
+            _updateQueue3.baseState,
+            derivedStateFromProps
+          ));
+      }
       if (
         !(
           oldProps !== newProps ||
@@ -2305,6 +2332,10 @@ function ReactFiberClassComponent(
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
+          "function" !== typeof instance.getSnapshotBeforeUpdate ||
+            (oldProps === current.memoizedProps &&
+              oldContext === current.memoizedState) ||
+            (workInProgress.effectTag |= 2048),
           !1
         );
       (derivedStateFromProps = checkShouldComponentUpdate(
@@ -2315,9 +2346,9 @@ function ReactFiberClassComponent(
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
-            "function" !== typeof instance.componentWillUpdate) ||
-            "function" === typeof ctor.getDerivedStateFromProps ||
+        ? (ctor ||
+            ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
+              "function" !== typeof instance.componentWillUpdate) ||
             ("function" === typeof instance.componentWillUpdate &&
               instance.componentWillUpdate(
                 newProps,
@@ -2331,11 +2362,17 @@ function ReactFiberClassComponent(
                 newUnmaskedContext
               )),
           "function" === typeof instance.componentDidUpdate &&
-            (workInProgress.effectTag |= 4))
+            (workInProgress.effectTag |= 4),
+          "function" === typeof instance.getSnapshotBeforeUpdate &&
+            (workInProgress.effectTag |= 2048))
         : ("function" !== typeof instance.componentDidUpdate ||
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
+          "function" !== typeof instance.getSnapshotBeforeUpdate ||
+            (oldProps === current.memoizedProps &&
+              oldContext === current.memoizedState) ||
+            (workInProgress.effectTag |= 2048),
           memoizeProps(workInProgress, newProps),
           memoizeState(workInProgress, renderExpirationTime));
       instance.props = newProps;
@@ -3181,7 +3218,7 @@ function ReactFiberBeginWork(
     workInProgress,
     renderExpirationTime
   ) {
-    var context = workInProgress.type.context,
+    var context = workInProgress.type._context,
       newProps = workInProgress.pendingProps,
       oldProps = workInProgress.memoizedProps;
     if (!hasLegacyContextChanged() && oldProps === newProps)
@@ -3347,7 +3384,8 @@ function ReactFiberBeginWork(
                 ((props = callGetDerivedStateFromProps(
                   workInProgress,
                   fn,
-                  props
+                  props,
+                  workInProgress.memoizedState
                 )),
                 null !== props &&
                   void 0 !== props &&
@@ -3618,43 +3656,33 @@ function ReactFiberBeginWork(
             renderExpirationTime
           );
         case 12:
-          a: {
-            fn = workInProgress.type;
-            unmaskedContext = workInProgress.pendingProps;
-            updateQueue = workInProgress.memoizedProps;
-            props = fn._currentValue;
-            var changedBits = fn._changedBits;
-            if (
-              hasLegacyContextChanged() ||
-              0 !== changedBits ||
-              updateQueue !== unmaskedContext
-            ) {
-              workInProgress.memoizedProps = unmaskedContext;
-              var observedBits = unmaskedContext.unstable_observedBits;
-              if (void 0 === observedBits || null === observedBits)
-                observedBits = 1073741823;
-              workInProgress.stateNode = observedBits;
-              if (0 !== (changedBits & observedBits))
-                propagateContextChange(
-                  workInProgress,
-                  fn,
-                  changedBits,
-                  renderExpirationTime
-                );
-              else if (
-                null !== updateQueue &&
-                updateQueue.children === unmaskedContext.children
-              ) {
-                current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-                break a;
-              }
-              renderExpirationTime = unmaskedContext.children;
-              renderExpirationTime = renderExpirationTime(props);
-              reconcileChildren(current, workInProgress, renderExpirationTime);
-              current = workInProgress.child;
-            } else
-              current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-          }
+          fn = workInProgress.type;
+          unmaskedContext = workInProgress.pendingProps;
+          var oldProps = workInProgress.memoizedProps;
+          props = fn._currentValue;
+          updateQueue = fn._changedBits;
+          if (
+            hasLegacyContextChanged() ||
+            0 !== updateQueue ||
+            oldProps !== unmaskedContext
+          ) {
+            workInProgress.memoizedProps = unmaskedContext;
+            oldProps = unmaskedContext.unstable_observedBits;
+            if (void 0 === oldProps || null === oldProps) oldProps = 1073741823;
+            workInProgress.stateNode = oldProps;
+            0 !== (updateQueue & oldProps) &&
+              propagateContextChange(
+                workInProgress,
+                fn,
+                updateQueue,
+                renderExpirationTime
+              );
+            renderExpirationTime = unmaskedContext.children;
+            renderExpirationTime = renderExpirationTime(props);
+            reconcileChildren(current, workInProgress, renderExpirationTime);
+            current = workInProgress.child;
+          } else
+            current = bailoutOnAlreadyFinishedWork(current, workInProgress);
           return current;
         default:
           invariant(
@@ -4105,7 +4133,7 @@ function logError(boundary, errorInfo) {
   null === errorInfo.stack && getStackAddendumByWorkInProgressFiber(source);
   null !== source && getComponentName(source);
   errorInfo = errorInfo.value;
-  null !== boundary && getComponentName(boundary);
+  null !== boundary && 2 === boundary.tag && getComponentName(boundary);
   try {
     (errorInfo && errorInfo.suppressReactErrorLogging) ||
       console.error(errorInfo);
@@ -4131,6 +4159,31 @@ function ReactFiberCommitWork(
         }
       else ref.current = null;
   }
+  function commitBeforeMutationLifeCycles(current, finishedWork) {
+    switch (finishedWork.tag) {
+      case 2:
+        if (finishedWork.effectTag & 2048 && null !== current) {
+          var prevProps = current.memoizedProps,
+            prevState = current.memoizedState;
+          current = finishedWork.stateNode;
+          current.props = finishedWork.memoizedProps;
+          current.state = finishedWork.memoizedState;
+          finishedWork = current.getSnapshotBeforeUpdate(prevProps, prevState);
+          current.__reactInternalSnapshotBeforeUpdate = finishedWork;
+        }
+        break;
+      case 3:
+      case 5:
+      case 6:
+      case 4:
+        break;
+      default:
+        invariant(
+          !1,
+          "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+        );
+    }
+  }
   function commitLifeCycles(finishedRoot, current, finishedWork) {
     switch (finishedWork.tag) {
       case 2:
@@ -4145,7 +4198,11 @@ function ReactFiberCommitWork(
             current = current.memoizedState;
             finishedRoot.props = finishedWork.memoizedProps;
             finishedRoot.state = finishedWork.memoizedState;
-            finishedRoot.componentDidUpdate(prevProps, current);
+            finishedRoot.componentDidUpdate(
+              prevProps,
+              current,
+              finishedRoot.__reactInternalSnapshotBeforeUpdate
+            );
           }
         finishedWork = finishedWork.updateQueue;
         null !== finishedWork && commitCallbacks(finishedWork, finishedRoot);
@@ -4205,9 +4262,12 @@ function ReactFiberCommitWork(
         onUncaughtError.state = finishedWork.memoizedState;
         for (ctor = 0; ctor < capturedErrors.length; ctor++) {
           updateQueue = capturedErrors[ctor];
-          var _error = updateQueue.value;
+          var _error = updateQueue.value,
+            stack = updateQueue.stack;
           logError(finishedWork, updateQueue);
-          onUncaughtError.componentDidCatch(_error);
+          onUncaughtError.componentDidCatch(_error, {
+            componentStack: null !== stack ? stack : ""
+          });
         }
         break;
       case 3:
@@ -4233,13 +4293,13 @@ function ReactFiberCommitWork(
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (null !== ref) {
-      var _instance5 = finishedWork.stateNode;
+      var _instance6 = finishedWork.stateNode;
       switch (finishedWork.tag) {
         case 5:
-          finishedWork = getPublicInstance(_instance5);
+          finishedWork = getPublicInstance(_instance6);
           break;
         default:
-          finishedWork = _instance5;
+          finishedWork = _instance6;
       }
       "function" === typeof ref
         ? ref(finishedWork)
@@ -4260,12 +4320,12 @@ function ReactFiberCommitWork(
       switch (current.tag) {
         case 2:
           safelyDetachRef(current);
-          var _instance6 = current.stateNode;
-          if ("function" === typeof _instance6.componentWillUnmount)
+          var _instance7 = current.stateNode;
+          if ("function" === typeof _instance7.componentWillUnmount)
             try {
-              (_instance6.props = current.memoizedProps),
-                (_instance6.state = current.memoizedState),
-                _instance6.componentWillUnmount();
+              (_instance7.props = current.memoizedProps),
+                (_instance7.state = current.memoizedState),
+                _instance7.componentWillUnmount();
             } catch (unmountError) {
               captureError(current, unmountError);
             }
@@ -4343,6 +4403,7 @@ function ReactFiberCommitWork(
         commitContainer(finishedWork);
       },
       commitLifeCycles: commitLifeCycles,
+      commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
       commitErrorLogging: commitErrorLogging,
       commitAttachRef: commitAttachRef,
       commitDetachRef: commitDetachRef
@@ -4386,8 +4447,10 @@ function ReactFiberHostContext(config, stack) {
     },
     pushHostContainer: function(fiber, nextRootInstance) {
       push(rootInstanceStackCursor, nextRootInstance, fiber);
-      nextRootInstance = getRootHostContext(nextRootInstance);
       push(contextFiberStackCursor, fiber, fiber);
+      push(contextStackCursor, NO_CONTEXT, fiber);
+      nextRootInstance = getRootHostContext(nextRootInstance);
+      pop(contextStackCursor, fiber);
       push(contextStackCursor, nextRootInstance, fiber);
     },
     pushHostContext: function(fiber) {
@@ -4694,7 +4757,7 @@ function ReactFiberNewContext(stack) {
     changedBitsCursor = createCursor(0);
   return {
     pushProvider: function(providerFiber) {
-      var context = providerFiber.type.context;
+      var context = providerFiber.type._context;
       push(changedBitsCursor, context._changedBits, providerFiber);
       push(valueCursor, context._currentValue, providerFiber);
       push(providerCursor, providerFiber, providerFiber);
@@ -4707,7 +4770,7 @@ function ReactFiberNewContext(stack) {
       pop(providerCursor, providerFiber);
       pop(valueCursor, providerFiber);
       pop(changedBitsCursor, providerFiber);
-      providerFiber = providerFiber.type.context;
+      providerFiber = providerFiber.type._context;
       providerFiber._currentValue = currentValue;
       providerFiber._changedBits = changedBits;
     }
@@ -4820,7 +4883,7 @@ function ReactFiberScheduler(config) {
         workInProgress$jscomp$0 = unwindWork(workInProgress$jscomp$0);
         if (null !== workInProgress$jscomp$0)
           return (
-            (workInProgress$jscomp$0.effectTag &= 511), workInProgress$jscomp$0
+            (workInProgress$jscomp$0.effectTag &= 2559), workInProgress$jscomp$0
           );
         null !== returnFiber &&
           ((returnFiber.firstEffect = returnFiber.lastEffect = null),
@@ -4984,7 +5047,7 @@ function ReactFiberScheduler(config) {
               0 !== nextRenderExpirationTime &&
               expirationTime < nextRenderExpirationTime &&
               resetStack();
-            (nextRoot === root && isWorking) ||
+            (isWorking && !isCommitting && nextRoot === root) ||
               requestWork(root, expirationTime);
             nestedUpdateCount > NESTED_UPDATE_LIMIT &&
               invariant(
@@ -5048,7 +5111,7 @@ function ReactFiberScheduler(config) {
           (nextFlushedExpirationTime = 1),
           performWorkOnRoot(root, 1, !1))
         : 1 === expirationTime
-          ? performWork(1, !1, null)
+          ? performSyncWork()
           : scheduleCallbackWithExpiration(expirationTime));
   }
   function findHighestPriorityRoot() {
@@ -5108,6 +5171,9 @@ function ReactFiberScheduler(config) {
   function performAsyncWork(dl) {
     performWork(0, !0, dl);
   }
+  function performSyncWork() {
+    performWork(1, !1, null);
+  }
   function performWork(minExpirationTime, isAsync, dl) {
     deadline = dl;
     findHighestPriorityRoot();
@@ -5230,6 +5296,25 @@ function ReactFiberScheduler(config) {
     for (nextEffect = firstEffect; null !== nextEffect; ) {
       var didError = !1,
         error = void 0;
+      try {
+        for (; null !== nextEffect; )
+          nextEffect.effectTag & 2048 &&
+            commitBeforeMutationLifeCycles(nextEffect.alternate, nextEffect),
+            (nextEffect = nextEffect.nextEffect);
+      } catch (e) {
+        (didError = !0), (error = e);
+      }
+      didError &&
+        (invariant(
+          null !== nextEffect,
+          "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
+        ),
+        onCommitPhaseError(nextEffect, error),
+        null !== nextEffect && (nextEffect = nextEffect.nextEffect));
+    }
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
+      didError = !1;
+      error = void 0;
       try {
         for (; null !== nextEffect; ) {
           var effectTag = nextEffect.effectTag;
@@ -5370,7 +5455,9 @@ function ReactFiberScheduler(config) {
     },
     recalculateCurrentTime
   );
-  var commitResetTextContent = hostContext.commitResetTextContent,
+  var commitBeforeMutationLifeCycles =
+      hostContext.commitBeforeMutationLifeCycles,
+    commitResetTextContent = hostContext.commitResetTextContent,
     commitPlacement = hostContext.commitPlacement,
     commitDeletion = hostContext.commitDeletion,
     commitWork = hostContext.commitWork,
@@ -5425,7 +5512,10 @@ function ReactFiberScheduler(config) {
         !isRendering,
         "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
       );
+      nextFlushedRoot = root;
+      nextFlushedExpirationTime = expirationTime;
       performWorkOnRoot(root, expirationTime, !1);
+      performSyncWork();
       finishRendering();
     },
     batchedUpdates: function(fn, a) {
@@ -5436,7 +5526,7 @@ function ReactFiberScheduler(config) {
       } finally {
         (isBatchingUpdates = previousIsBatchingUpdates) ||
           isRendering ||
-          performWork(1, !1, null);
+          performSyncWork();
       }
     },
     unbatchedUpdates: function(fn, a) {
@@ -5460,8 +5550,7 @@ function ReactFiberScheduler(config) {
       try {
         return syncUpdates(fn, a);
       } finally {
-        (isBatchingUpdates = previousIsBatchingUpdates),
-          performWork(1, !1, null);
+        (isBatchingUpdates = previousIsBatchingUpdates), performSyncWork();
       }
     },
     flushControlled: function(fn) {
@@ -5502,7 +5591,7 @@ function ReactFiberScheduler(config) {
         (isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates),
           (isBatchingUpdates = previousIsBatchingUpdates) ||
             isRendering ||
-            performWork(1, !1, null);
+            performSyncWork();
       }
     },
     flushInteractiveUpdates: function() {
@@ -6003,7 +6092,7 @@ ReactFabricRenderer.injectIntoDevTools({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.3.0-alpha.2",
+  version: "16.3.1",
   rendererPackageName: "react-native-renderer"
 });
 var ReactFabric$2 = Object.freeze({ default: ReactFabric }),
diff --git a/Libraries/Renderer/ReactNativeRenderer-dev.js b/Libraries/Renderer/ReactNativeRenderer-dev.js
index 8ea8bcf85094fd..7fd62f11ca6ae4 100644
--- a/Libraries/Renderer/ReactNativeRenderer-dev.js
+++ b/Libraries/Renderer/ReactNativeRenderer-dev.js
@@ -510,11 +510,13 @@ var injection$1 = {
     getNodeFromInstance = Injected.getNodeFromInstance;
 
     {
-      warning(
-        getNodeFromInstance && getInstanceFromNode,
-        "EventPluginUtils.injection.injectComponentTree(...): Injected " +
-          "module is missing getNodeFromInstance or getInstanceFromNode."
-      );
+      !(getNodeFromInstance && getInstanceFromNode)
+        ? warning(
+            false,
+            "EventPluginUtils.injection.injectComponentTree(...): Injected " +
+              "module is missing getNodeFromInstance or getInstanceFromNode."
+          )
+        : void 0;
     }
   }
 };
@@ -550,10 +552,9 @@ var validateEventDispatches = void 0;
       ? dispatchInstances.length
       : dispatchInstances ? 1 : 0;
 
-    warning(
-      instancesIsArr === listenersIsArr && instancesLen === listenersLen,
-      "EventPluginUtils: Invalid `event`."
-    );
+    !(instancesIsArr === listenersIsArr && instancesLen === listenersLen)
+      ? warning(false, "EventPluginUtils: Invalid `event`.")
+      : void 0;
   };
 }
 
@@ -1094,7 +1095,7 @@ function listenerAtPhase(inst, event, propagationPhase) {
  */
 function accumulateDirectionalDispatches(inst, phase, event) {
   {
-    warning(inst, "Dispatching inst must not be null");
+    !inst ? warning(false, "Dispatching inst must not be null") : void 0;
   }
   var listener = listenerAtPhase(inst, event, phase);
   if (listener) {
@@ -1413,13 +1414,15 @@ SyntheticEvent.extend = function(Interface) {
               !target.constructor.Interface.hasOwnProperty(prop) &&
               shouldBeReleasedProperties.indexOf(prop) === -1
             ) {
-              warning(
-                didWarnForAddedNewProperty || target.isPersistent(),
-                "This synthetic event is reused for performance reasons. If you're " +
-                  "seeing this, you're adding a new property in the synthetic event object. " +
-                  "The property is never released. See " +
-                  "https://fb.me/react-event-pooling for more information."
-              );
+              !(didWarnForAddedNewProperty || target.isPersistent())
+                ? warning(
+                    false,
+                    "This synthetic event is reused for performance reasons. If you're " +
+                      "seeing this, you're adding a new property in the synthetic event object. " +
+                      "The property is never released. See " +
+                      "https://fb.me/react-event-pooling for more information."
+                  )
+                : void 0;
               didWarnForAddedNewProperty = true;
             }
             target[prop] = value;
@@ -1466,16 +1469,18 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
 
   function warn(action, result) {
     var warningCondition = false;
-    warning(
-      warningCondition,
-      "This synthetic event is reused for performance reasons. If you're seeing this, " +
-        "you're %s `%s` on a released/nullified synthetic event. %s. " +
-        "If you must keep the original synthetic event around, use event.persist(). " +
-        "See https://fb.me/react-event-pooling for more information.",
-      action,
-      propName,
-      result
-    );
+    !warningCondition
+      ? warning(
+          false,
+          "This synthetic event is reused for performance reasons. If you're seeing this, " +
+            "you're %s `%s` on a released/nullified synthetic event. %s. " +
+            "If you must keep the original synthetic event around, use event.persist(). " +
+            "See https://fb.me/react-event-pooling for more information.",
+          action,
+          propName,
+          result
+        )
+      : void 0;
   }
 }
 
@@ -1593,13 +1598,15 @@ function getTouchIdentifier(_ref) {
 
   invariant(identifier != null, "Touch object is missing identifier.");
   {
-    warning(
-      identifier <= MAX_TOUCH_BANK,
-      "Touch identifier %s is greater than maximum supported %s which causes " +
-        "performance issues backfilling array locations for all of the indices.",
-      identifier,
-      MAX_TOUCH_BANK
-    );
+    !(identifier <= MAX_TOUCH_BANK)
+      ? warning(
+          false,
+          "Touch identifier %s is greater than maximum supported %s which causes " +
+            "performance issues backfilling array locations for all of the indices.",
+          identifier,
+          MAX_TOUCH_BANK
+        )
+      : void 0;
   }
   return identifier;
 }
@@ -1698,10 +1705,9 @@ var ResponderTouchHistoryStore = {
         }
         {
           var activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
-          warning(
-            activeRecord != null && activeRecord.touchActive,
-            "Cannot find single active touch."
-          );
+          !(activeRecord != null && activeRecord.touchActive)
+            ? warning(false, "Cannot find single active touch.")
+            : void 0;
         }
       }
     }
@@ -2987,7 +2993,7 @@ var TouchHistoryMath = {
 
 // TODO: this is special because it gets imported during build.
 
-var ReactVersion = "16.3.0-alpha.2";
+var ReactVersion = "16.3.1";
 
 function _classCallCheck(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
@@ -3657,15 +3663,17 @@ function findNodeHandle(componentOrHandle) {
   {
     var owner = ReactCurrentOwner.current;
     if (owner !== null && owner.stateNode !== null) {
-      warning(
-        owner.stateNode._warnedAboutRefsInRender,
-        "%s is accessing findNodeHandle inside its render(). " +
-          "render() should be a pure function of props and state. It should " +
-          "never access something that requires stale data from the previous " +
-          "render, such as refs. Move this logic to componentDidMount and " +
-          "componentDidUpdate instead.",
-        getComponentName(owner) || "A component"
-      );
+      !owner.stateNode._warnedAboutRefsInRender
+        ? warning(
+            false,
+            "%s is accessing findNodeHandle inside its render(). " +
+              "render() should be a pure function of props and state. It should " +
+              "never access something that requires stale data from the previous " +
+              "render, such as refs. Move this logic to componentDidMount and " +
+              "componentDidUpdate instead.",
+            getComponentName(owner) || "A component"
+          )
+        : void 0;
 
       owner.stateNode._warnedAboutRefsInRender = true;
     }
@@ -4120,9 +4128,10 @@ var Callback = /*              */ 32;
 var DidCapture = /*            */ 64;
 var Ref = /*                   */ 128;
 var ErrLog = /*                */ 256;
+var Snapshot = /*              */ 2048;
 
 // Union of all host effects
-var HostEffectMask = /*        */ 511;
+var HostEffectMask = /*        */ 2559;
 
 var Incomplete = /*            */ 512;
 var ShouldCapture = /*         */ 1024;
@@ -4170,15 +4179,17 @@ function isMounted(component) {
     if (owner !== null && owner.tag === ClassComponent) {
       var ownerFiber = owner;
       var instance = ownerFiber.stateNode;
-      warning(
-        instance._warnedAboutRefsInRender,
-        "%s is accessing isMounted inside its render() function. " +
-          "render() should be a pure function of props and state. It should " +
-          "never access something that requires stale data from the previous " +
-          "render, such as refs. Move this logic to componentDidMount and " +
-          "componentDidUpdate instead.",
-        getComponentName(ownerFiber) || "A component"
-      );
+      !instance._warnedAboutRefsInRender
+        ? warning(
+            false,
+            "%s is accessing isMounted inside its render() function. " +
+              "render() should be a pure function of props and state. It should " +
+              "never access something that requires stale data from the previous " +
+              "render, such as refs. Move this logic to componentDidMount and " +
+              "componentDidUpdate instead.",
+            getComponentName(ownerFiber) || "A component"
+          )
+        : void 0;
       instance._warnedAboutRefsInRender = true;
     }
   }
@@ -4731,6 +4742,47 @@ function createFiberFromPortal(portal, mode, expirationTime) {
   return fiber;
 }
 
+// Used for stashing WIP properties to replay failed work in DEV.
+function assignFiberPropertiesInDEV(target, source) {
+  if (target === null) {
+    // This Fiber's initial properties will always be overwritten.
+    // We only use a Fiber to ensure the same hidden class so DEV isn't slow.
+    target = createFiber(IndeterminateComponent, null, null, NoContext);
+  }
+
+  // This is intentionally written as a list of all properties.
+  // We tried to use Object.assign() instead but this is called in
+  // the hottest path, and Object.assign() was too slow:
+  // https://github.com/facebook/react/issues/12502
+  // This code is DEV-only so size is not a concern.
+
+  target.tag = source.tag;
+  target.key = source.key;
+  target.type = source.type;
+  target.stateNode = source.stateNode;
+  target["return"] = source["return"];
+  target.child = source.child;
+  target.sibling = source.sibling;
+  target.index = source.index;
+  target.ref = source.ref;
+  target.pendingProps = source.pendingProps;
+  target.memoizedProps = source.memoizedProps;
+  target.updateQueue = source.updateQueue;
+  target.memoizedState = source.memoizedState;
+  target.mode = source.mode;
+  target.effectTag = source.effectTag;
+  target.nextEffect = source.nextEffect;
+  target.firstEffect = source.firstEffect;
+  target.lastEffect = source.lastEffect;
+  target.expirationTime = source.expirationTime;
+  target.alternate = source.alternate;
+  target._debugID = source._debugID;
+  target._debugSource = source._debugSource;
+  target._debugOwner = source._debugOwner;
+  target._debugIsCurrentlyTiming = source._debugIsCurrentlyTiming;
+  return target;
+}
+
 // TODO: This should be lifted into the renderer.
 
 function createFiberRoot(containerInfo, isAsync, hydrate) {
@@ -5136,7 +5188,10 @@ var ReactStrictModeWarnings = {
     ) {
       pendingComponentWillReceivePropsWarnings.push(fiber);
     }
-    if (typeof instance.componentWillUpdate === "function") {
+    if (
+      typeof instance.componentWillUpdate === "function" &&
+      instance.componentWillUpdate.__suppressDeprecationWarning !== true
+    ) {
       pendingComponentWillUpdateWarnings.push(fiber);
     }
   };
@@ -5481,13 +5536,15 @@ function startRequestCallbackTimer() {
   }
 }
 
-function stopRequestCallbackTimer(didExpire) {
+function stopRequestCallbackTimer(didExpire, expirationTime) {
   if (enableUserTimingAPI) {
     if (supportsUserTiming) {
       isWaitingForCallback = false;
       var warning$$1 = didExpire ? "React was blocked by main thread" : null;
       endMark(
-        "(Waiting for async callback...)",
+        "(Waiting for async callback... will force flush in " +
+          expirationTime +
+          " ms)",
         "(Waiting for async callback...)",
         warning$$1
       );
@@ -5597,7 +5654,7 @@ function startWorkLoopTimer(nextUnitOfWork) {
   }
 }
 
-function stopWorkLoopTimer(interruptedBy) {
+function stopWorkLoopTimer(interruptedBy, didCompleteRoot) {
   if (enableUserTimingAPI) {
     if (!supportsUserTiming) {
       return;
@@ -5615,13 +5672,12 @@ function stopWorkLoopTimer(interruptedBy) {
       warning$$1 = "There were cascading updates";
     }
     commitCountInCurrentWorkLoop = 0;
+    var label = didCompleteRoot
+      ? "(React Tree Reconciliation: Completed Root)"
+      : "(React Tree Reconciliation: Yielded)";
     // Pause any measurements until the next loop.
     pauseTimers();
-    endMark(
-      "(React Tree Reconciliation)",
-      "(React Tree Reconciliation)",
-      warning$$1
-    );
+    endMark(label, "(React Tree Reconciliation)", warning$$1);
   }
 }
 
@@ -5658,6 +5714,31 @@ function stopCommitTimer() {
   }
 }
 
+function startCommitSnapshotEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    effectCountInCurrentCommit = 0;
+    beginMark("(Committing Snapshot Effects)");
+  }
+}
+
+function stopCommitSnapshotEffectsTimer() {
+  if (enableUserTimingAPI) {
+    if (!supportsUserTiming) {
+      return;
+    }
+    var count = effectCountInCurrentCommit;
+    effectCountInCurrentCommit = 0;
+    endMark(
+      "(Committing Snapshot Effects: " + count + " Total)",
+      "(Committing Snapshot Effects)",
+      null
+    );
+  }
+}
+
 function startCommitHostEffectsTimer() {
   if (enableUserTimingAPI) {
     if (!supportsUserTiming) {
@@ -6042,23 +6123,26 @@ var isArray = Array.isArray;
 var didWarnAboutStateAssignmentForComponent = void 0;
 var didWarnAboutUndefinedDerivedState = void 0;
 var didWarnAboutUninitializedState = void 0;
-var didWarnAboutWillReceivePropsAndDerivedState = void 0;
+var didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = void 0;
+var didWarnAboutLegacyLifecyclesAndDerivedState = void 0;
 var warnOnInvalidCallback = void 0;
 
 {
-  didWarnAboutStateAssignmentForComponent = {};
-  didWarnAboutUndefinedDerivedState = {};
-  didWarnAboutUninitializedState = {};
-  didWarnAboutWillReceivePropsAndDerivedState = {};
+  didWarnAboutStateAssignmentForComponent = new Set();
+  didWarnAboutUndefinedDerivedState = new Set();
+  didWarnAboutUninitializedState = new Set();
+  didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate = new Set();
+  didWarnAboutLegacyLifecyclesAndDerivedState = new Set();
 
-  var didWarnOnInvalidCallback = {};
+  var didWarnOnInvalidCallback = new Set();
 
   warnOnInvalidCallback = function(callback, callerName) {
     if (callback === null || typeof callback === "function") {
       return;
     }
     var key = callerName + "_" + callback;
-    if (!didWarnOnInvalidCallback[key]) {
+    if (!didWarnOnInvalidCallback.has(key)) {
+      didWarnOnInvalidCallback.add(key);
       warning(
         false,
         "%s(...): Expected the last optional `callback` argument to be a " +
@@ -6066,7 +6150,6 @@ var warnOnInvalidCallback = void 0;
         callerName,
         callback
       );
-      didWarnOnInvalidCallback[key] = true;
     }
   };
 
@@ -6209,12 +6292,14 @@ var ReactFiberClassComponent = function(
       stopPhaseTimer();
 
       {
-        warning(
-          shouldUpdate !== undefined,
-          "%s.shouldComponentUpdate(): Returned undefined instead of a " +
-            "boolean value. Make sure to return true or false.",
-          getComponentName(workInProgress) || "Unknown"
-        );
+        !(shouldUpdate !== undefined)
+          ? warning(
+              false,
+              "%s.shouldComponentUpdate(): Returned undefined instead of a " +
+                "boolean value. Make sure to return true or false.",
+              getComponentName(workInProgress) || "Component"
+            )
+          : void 0;
       }
 
       return shouldUpdate;
@@ -6233,7 +6318,7 @@ var ReactFiberClassComponent = function(
     var instance = workInProgress.stateNode;
     var type = workInProgress.type;
     {
-      var name = getComponentName(workInProgress);
+      var name = getComponentName(workInProgress) || "Component";
       var renderPresent = instance.render;
 
       if (!renderPresent) {
@@ -6258,47 +6343,57 @@ var ReactFiberClassComponent = function(
         !instance.getInitialState ||
         instance.getInitialState.isReactClassApproved ||
         instance.state;
-      warning(
-        noGetInitialStateOnES6,
-        "getInitialState was defined on %s, a plain JavaScript class. " +
-          "This is only supported for classes created using React.createClass. " +
-          "Did you mean to define a state property instead?",
-        name
-      );
+      !noGetInitialStateOnES6
+        ? warning(
+            false,
+            "getInitialState was defined on %s, a plain JavaScript class. " +
+              "This is only supported for classes created using React.createClass. " +
+              "Did you mean to define a state property instead?",
+            name
+          )
+        : void 0;
       var noGetDefaultPropsOnES6 =
         !instance.getDefaultProps ||
         instance.getDefaultProps.isReactClassApproved;
-      warning(
-        noGetDefaultPropsOnES6,
-        "getDefaultProps was defined on %s, a plain JavaScript class. " +
-          "This is only supported for classes created using React.createClass. " +
-          "Use a static property to define defaultProps instead.",
-        name
-      );
+      !noGetDefaultPropsOnES6
+        ? warning(
+            false,
+            "getDefaultProps was defined on %s, a plain JavaScript class. " +
+              "This is only supported for classes created using React.createClass. " +
+              "Use a static property to define defaultProps instead.",
+            name
+          )
+        : void 0;
       var noInstancePropTypes = !instance.propTypes;
-      warning(
-        noInstancePropTypes,
-        "propTypes was defined as an instance property on %s. Use a static " +
-          "property to define propTypes instead.",
-        name
-      );
+      !noInstancePropTypes
+        ? warning(
+            false,
+            "propTypes was defined as an instance property on %s. Use a static " +
+              "property to define propTypes instead.",
+            name
+          )
+        : void 0;
       var noInstanceContextTypes = !instance.contextTypes;
-      warning(
-        noInstanceContextTypes,
-        "contextTypes was defined as an instance property on %s. Use a static " +
-          "property to define contextTypes instead.",
-        name
-      );
+      !noInstanceContextTypes
+        ? warning(
+            false,
+            "contextTypes was defined as an instance property on %s. Use a static " +
+              "property to define contextTypes instead.",
+            name
+          )
+        : void 0;
       var noComponentShouldUpdate =
         typeof instance.componentShouldUpdate !== "function";
-      warning(
-        noComponentShouldUpdate,
-        "%s has a method called " +
-          "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
-          "The name is phrased as a question because the function is " +
-          "expected to return a value.",
-        name
-      );
+      !noComponentShouldUpdate
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentShouldUpdate(). Did you mean shouldComponentUpdate()? " +
+              "The name is phrased as a question because the function is " +
+              "expected to return a value.",
+            name
+          )
+        : void 0;
       if (
         type.prototype &&
         type.prototype.isPureReactComponent &&
@@ -6314,73 +6409,128 @@ var ReactFiberClassComponent = function(
       }
       var noComponentDidUnmount =
         typeof instance.componentDidUnmount !== "function";
-      warning(
-        noComponentDidUnmount,
-        "%s has a method called " +
-          "componentDidUnmount(). But there is no such lifecycle method. " +
-          "Did you mean componentWillUnmount()?",
-        name
-      );
+      !noComponentDidUnmount
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentDidUnmount(). But there is no such lifecycle method. " +
+              "Did you mean componentWillUnmount()?",
+            name
+          )
+        : void 0;
       var noComponentDidReceiveProps =
         typeof instance.componentDidReceiveProps !== "function";
-      warning(
-        noComponentDidReceiveProps,
-        "%s has a method called " +
-          "componentDidReceiveProps(). But there is no such lifecycle method. " +
-          "If you meant to update the state in response to changing props, " +
-          "use componentWillReceiveProps(). If you meant to fetch data or " +
-          "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
-        name
-      );
+      !noComponentDidReceiveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentDidReceiveProps(). But there is no such lifecycle method. " +
+              "If you meant to update the state in response to changing props, " +
+              "use componentWillReceiveProps(). If you meant to fetch data or " +
+              "run side-effects or mutations after React has updated the UI, use componentDidUpdate().",
+            name
+          )
+        : void 0;
       var noComponentWillRecieveProps =
         typeof instance.componentWillRecieveProps !== "function";
-      warning(
-        noComponentWillRecieveProps,
-        "%s has a method called " +
-          "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
-        name
-      );
+      !noComponentWillRecieveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "componentWillRecieveProps(). Did you mean componentWillReceiveProps()?",
+            name
+          )
+        : void 0;
       var noUnsafeComponentWillRecieveProps =
         typeof instance.UNSAFE_componentWillRecieveProps !== "function";
-      warning(
-        noUnsafeComponentWillRecieveProps,
-        "%s has a method called " +
-          "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
-        name
-      );
+      !noUnsafeComponentWillRecieveProps
+        ? warning(
+            false,
+            "%s has a method called " +
+              "UNSAFE_componentWillRecieveProps(). Did you mean UNSAFE_componentWillReceiveProps()?",
+            name
+          )
+        : void 0;
       var hasMutatedProps = instance.props !== workInProgress.pendingProps;
-      warning(
-        instance.props === undefined || !hasMutatedProps,
-        "%s(...): When calling super() in `%s`, make sure to pass " +
-          "up the same props that your component's constructor was passed.",
-        name,
-        name
-      );
+      !(instance.props === undefined || !hasMutatedProps)
+        ? warning(
+            false,
+            "%s(...): When calling super() in `%s`, make sure to pass " +
+              "up the same props that your component's constructor was passed.",
+            name,
+            name
+          )
+        : void 0;
       var noInstanceDefaultProps = !instance.defaultProps;
-      warning(
-        noInstanceDefaultProps,
-        "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
-          " Instead, define defaultProps as a static property on %s.",
-        name,
-        name
-      );
-    }
+      !noInstanceDefaultProps
+        ? warning(
+            false,
+            "Setting defaultProps as an instance property on %s is not supported and will be ignored." +
+              " Instead, define defaultProps as a static property on %s.",
+            name,
+            name
+          )
+        : void 0;
 
-    var state = instance.state;
-    if (state && (typeof state !== "object" || isArray(state))) {
-      warning(
-        false,
-        "%s.state: must be set to an object or null",
-        getComponentName(workInProgress)
-      );
-    }
-    if (typeof instance.getChildContext === "function") {
-      warning(
-        typeof type.childContextTypes === "object",
-        "%s.getChildContext(): childContextTypes must be defined in order to " +
-          "use getChildContext().",
-        getComponentName(workInProgress)
-      );
+      if (
+        typeof instance.getSnapshotBeforeUpdate === "function" &&
+        typeof instance.componentDidUpdate !== "function" &&
+        typeof instance.componentDidUpdate !== "function" &&
+        !didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.has(type)
+      ) {
+        didWarnAboutGetSnapshotBeforeUpdateWithoutDidUpdate.add(type);
+        warning(
+          false,
+          "%s: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). " +
+            "This component defines getSnapshotBeforeUpdate() only.",
+          getComponentName(workInProgress)
+        );
+      }
+
+      var noInstanceGetDerivedStateFromProps =
+        typeof instance.getDerivedStateFromProps !== "function";
+      !noInstanceGetDerivedStateFromProps
+        ? warning(
+            false,
+            "%s: getDerivedStateFromProps() is defined as an instance method " +
+              "and will be ignored. Instead, declare it as a static method.",
+            name
+          )
+        : void 0;
+      var noInstanceGetDerivedStateFromCatch =
+        typeof instance.getDerivedStateFromCatch !== "function";
+      !noInstanceGetDerivedStateFromCatch
+        ? warning(
+            false,
+            "%s: getDerivedStateFromCatch() is defined as an instance method " +
+              "and will be ignored. Instead, declare it as a static method.",
+            name
+          )
+        : void 0;
+      var noStaticGetSnapshotBeforeUpdate =
+        typeof type.getSnapshotBeforeUpdate !== "function";
+      !noStaticGetSnapshotBeforeUpdate
+        ? warning(
+            false,
+            "%s: getSnapshotBeforeUpdate() is defined as a static method " +
+              "and will be ignored. Instead, declare it as an instance method.",
+            name
+          )
+        : void 0;
+      var _state = instance.state;
+      if (_state && (typeof _state !== "object" || isArray(_state))) {
+        warning(false, "%s.state: must be set to an object or null", name);
+      }
+      if (typeof instance.getChildContext === "function") {
+        !(typeof type.childContextTypes === "object")
+          ? warning(
+              false,
+              "%s.getChildContext(): childContextTypes must be defined in order to " +
+                "use getChildContext().",
+              name
+            )
+          : void 0;
+      }
     }
   }
 
@@ -6428,8 +6578,9 @@ var ReactFiberClassComponent = function(
         typeof ctor.getDerivedStateFromProps === "function" &&
         state === null
       ) {
-        var componentName = getComponentName(workInProgress) || "Unknown";
-        if (!didWarnAboutUninitializedState[componentName]) {
+        var componentName = getComponentName(workInProgress) || "Component";
+        if (!didWarnAboutUninitializedState.has(componentName)) {
+          didWarnAboutUninitializedState.add(componentName);
           warning(
             false,
             "%s: Did not properly initialize state during construction. " +
@@ -6437,7 +6588,75 @@ var ReactFiberClassComponent = function(
             componentName,
             instance.state === null ? "null" : "undefined"
           );
-          didWarnAboutUninitializedState[componentName] = true;
+        }
+      }
+
+      // If new component APIs are defined, "unsafe" lifecycles won't be called.
+      // Warn about these lifecycles if they are present.
+      // Don't warn about react-lifecycles-compat polyfilled methods though.
+      if (
+        typeof ctor.getDerivedStateFromProps === "function" ||
+        typeof instance.getSnapshotBeforeUpdate === "function"
+      ) {
+        var foundWillMountName = null;
+        var foundWillReceivePropsName = null;
+        var foundWillUpdateName = null;
+        if (
+          typeof instance.componentWillMount === "function" &&
+          instance.componentWillMount.__suppressDeprecationWarning !== true
+        ) {
+          foundWillMountName = "componentWillMount";
+        } else if (typeof instance.UNSAFE_componentWillMount === "function") {
+          foundWillMountName = "UNSAFE_componentWillMount";
+        }
+        if (
+          typeof instance.componentWillReceiveProps === "function" &&
+          instance.componentWillReceiveProps.__suppressDeprecationWarning !==
+            true
+        ) {
+          foundWillReceivePropsName = "componentWillReceiveProps";
+        } else if (
+          typeof instance.UNSAFE_componentWillReceiveProps === "function"
+        ) {
+          foundWillReceivePropsName = "UNSAFE_componentWillReceiveProps";
+        }
+        if (
+          typeof instance.componentWillUpdate === "function" &&
+          instance.componentWillUpdate.__suppressDeprecationWarning !== true
+        ) {
+          foundWillUpdateName = "componentWillUpdate";
+        } else if (typeof instance.UNSAFE_componentWillUpdate === "function") {
+          foundWillUpdateName = "UNSAFE_componentWillUpdate";
+        }
+        if (
+          foundWillMountName !== null ||
+          foundWillReceivePropsName !== null ||
+          foundWillUpdateName !== null
+        ) {
+          var _componentName = getComponentName(workInProgress) || "Component";
+          var newApiName =
+            typeof ctor.getDerivedStateFromProps === "function"
+              ? "getDerivedStateFromProps()"
+              : "getSnapshotBeforeUpdate()";
+          if (
+            !didWarnAboutLegacyLifecyclesAndDerivedState.has(_componentName)
+          ) {
+            didWarnAboutLegacyLifecyclesAndDerivedState.add(_componentName);
+            warning(
+              false,
+              "Unsafe legacy lifecycles will not be called for components using new component APIs.\n\n" +
+                "%s uses %s but also contains the following legacy lifecycles:%s%s%s\n\n" +
+                "The above lifecycles should be removed. Learn more about this warning here:\n" +
+                "https://fb.me/react-async-component-lifecycle-hooks",
+              _componentName,
+              newApiName,
+              foundWillMountName !== null ? "\n  " + foundWillMountName : "",
+              foundWillReceivePropsName !== null
+                ? "\n  " + foundWillReceivePropsName
+                : "",
+              foundWillUpdateName !== null ? "\n  " + foundWillUpdateName : ""
+            );
+          }
         }
       }
     }
@@ -6447,7 +6666,8 @@ var ReactFiberClassComponent = function(
     var partialState = callGetDerivedStateFromProps(
       workInProgress,
       instance,
-      props
+      props,
+      state
     );
 
     if (partialState !== null && partialState !== undefined) {
@@ -6490,7 +6710,7 @@ var ReactFiberClassComponent = function(
           "%s.componentWillMount(): Assigning directly to this.state is " +
             "deprecated (except inside a component's " +
             "constructor). Use setState instead.",
-          getComponentName(workInProgress)
+          getComponentName(workInProgress) || "Component"
         );
       }
       updater.enqueueReplaceState(instance, instance.state, null);
@@ -6516,7 +6736,8 @@ var ReactFiberClassComponent = function(
     if (instance.state !== oldState) {
       {
         var componentName = getComponentName(workInProgress) || "Component";
-        if (!didWarnAboutStateAssignmentForComponent[componentName]) {
+        if (!didWarnAboutStateAssignmentForComponent.has(componentName)) {
+          didWarnAboutStateAssignmentForComponent.add(componentName);
           warning(
             false,
             "%s.componentWillReceiveProps(): Assigning directly to " +
@@ -6524,69 +6745,47 @@ var ReactFiberClassComponent = function(
               "constructor). Use setState instead.",
             componentName
           );
-          didWarnAboutStateAssignmentForComponent[componentName] = true;
         }
       }
       updater.enqueueReplaceState(instance, instance.state, null);
     }
   }
 
-  function callGetDerivedStateFromProps(workInProgress, instance, props) {
+  function callGetDerivedStateFromProps(
+    workInProgress,
+    instance,
+    nextProps,
+    prevState
+  ) {
     var type = workInProgress.type;
 
     if (typeof type.getDerivedStateFromProps === "function") {
-      {
-        // Don't warn about react-lifecycles-compat polyfilled components
-        if (
-          (typeof instance.componentWillReceiveProps === "function" &&
-            instance.componentWillReceiveProps.__suppressDeprecationWarning !==
-              true) ||
-          typeof instance.UNSAFE_componentWillReceiveProps === "function"
-        ) {
-          var componentName = getComponentName(workInProgress) || "Unknown";
-          if (!didWarnAboutWillReceivePropsAndDerivedState[componentName]) {
-            warning(
-              false,
-              "%s: Defines both componentWillReceiveProps() and static " +
-                "getDerivedStateFromProps() methods. We recommend using " +
-                "only getDerivedStateFromProps().",
-              componentName
-            );
-            didWarnAboutWillReceivePropsAndDerivedState[componentName] = true;
-          }
-        }
-      }
-
       if (
         debugRenderPhaseSideEffects ||
         (debugRenderPhaseSideEffectsForStrictMode &&
           workInProgress.mode & StrictMode)
       ) {
         // Invoke method an extra time to help detect side-effects.
-        type.getDerivedStateFromProps.call(
-          null,
-          props,
-          workInProgress.memoizedState
-        );
+        type.getDerivedStateFromProps.call(null, nextProps, prevState);
       }
 
       var partialState = type.getDerivedStateFromProps.call(
         null,
-        props,
-        workInProgress.memoizedState
+        nextProps,
+        prevState
       );
 
       {
         if (partialState === undefined) {
-          var _componentName = getComponentName(workInProgress) || "Unknown";
-          if (!didWarnAboutUndefinedDerivedState[_componentName]) {
+          var componentName = getComponentName(workInProgress) || "Component";
+          if (!didWarnAboutUndefinedDerivedState.has(componentName)) {
+            didWarnAboutUndefinedDerivedState.add(componentName);
             warning(
               false,
               "%s.getDerivedStateFromProps(): A valid state object (or null) must be returned. " +
                 "You have returned undefined.",
-              _componentName
+              componentName
             );
-            didWarnAboutUndefinedDerivedState[_componentName] = _componentName;
           }
         }
       }
@@ -6630,11 +6829,12 @@ var ReactFiberClassComponent = function(
     }
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      typeof ctor.getDerivedStateFromProps !== "function" &&
+      typeof instance.getSnapshotBeforeUpdate !== "function" &&
       (typeof instance.UNSAFE_componentWillMount === "function" ||
-        typeof instance.componentWillMount === "function") &&
-      typeof ctor.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillMount === "function")
     ) {
       callComponentWillMount(workInProgress, instance);
       // If we had additional state updates during this life-cycle, let's
@@ -6667,16 +6867,20 @@ var ReactFiberClassComponent = function(
     var newUnmaskedContext = getUnmaskedContext(workInProgress);
     var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
+    var hasNewLifecycles =
+      typeof ctor.getDerivedStateFromProps === "function" ||
+      typeof instance.getSnapshotBeforeUpdate === "function";
+
     // Note: During these life-cycles, instance.props/instance.state are what
     // ever the previously attempted to render - not the "current". However,
     // during componentDidUpdate we pass the "current" props.
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      !hasNewLifecycles &&
       (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function") &&
-      typeof ctor.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillReceiveProps === "function")
     ) {
       if (oldProps !== newProps || oldContext !== newContext) {
         callComponentWillReceiveProps(
@@ -6688,15 +6892,6 @@ var ReactFiberClassComponent = function(
       }
     }
 
-    var derivedStateFromProps = void 0;
-    if (oldProps !== newProps) {
-      derivedStateFromProps = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps
-      );
-    }
-
     // Compute the next state using the memoized state and the update queue.
     var oldState = workInProgress.memoizedState;
     // TODO: Previous state can be null.
@@ -6733,6 +6928,18 @@ var ReactFiberClassComponent = function(
       newState = oldState;
     }
 
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      // The prevState parameter should be the partially updated state.
+      // Otherwise, spreading state in return values could override updates.
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps,
+        newState
+      );
+    }
+
     if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
       // So that multiple render passes do not enqueue multiple updates.
@@ -6741,6 +6948,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromProps
           : Object.assign({}, newState, derivedStateFromProps);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue = workInProgress.updateQueue;
+      if (_updateQueue !== null) {
+        _updateQueue.baseState = Object.assign(
+          {},
+          _updateQueue.baseState,
+          derivedStateFromProps
+        );
+      }
     }
     if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
@@ -6750,6 +6968,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromCatch
           : Object.assign({}, newState, derivedStateFromCatch);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue2 = workInProgress.updateQueue;
+      if (_updateQueue2 !== null) {
+        _updateQueue2.baseState = Object.assign(
+          {},
+          _updateQueue2.baseState,
+          derivedStateFromCatch
+        );
+      }
     }
 
     if (
@@ -6780,11 +7009,11 @@ var ReactFiberClassComponent = function(
 
     if (shouldUpdate) {
       // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      // Unsafe lifecycles should not be invoked for components using the new APIs.
       if (
+        !hasNewLifecycles &&
         (typeof instance.UNSAFE_componentWillMount === "function" ||
-          typeof instance.componentWillMount === "function") &&
-        typeof ctor.getDerivedStateFromProps !== "function"
+          typeof instance.componentWillMount === "function")
       ) {
         startPhaseTimer(workInProgress, "componentWillMount");
         if (typeof instance.componentWillMount === "function") {
@@ -6832,16 +7061,20 @@ var ReactFiberClassComponent = function(
     var newUnmaskedContext = getUnmaskedContext(workInProgress);
     var newContext = getMaskedContext(workInProgress, newUnmaskedContext);
 
+    var hasNewLifecycles =
+      typeof ctor.getDerivedStateFromProps === "function" ||
+      typeof instance.getSnapshotBeforeUpdate === "function";
+
     // Note: During these life-cycles, instance.props/instance.state are what
     // ever the previously attempted to render - not the "current". However,
     // during componentDidUpdate we pass the "current" props.
 
     // In order to support react-lifecycles-compat polyfilled components,
-    // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+    // Unsafe lifecycles should not be invoked for components using the new APIs.
     if (
+      !hasNewLifecycles &&
       (typeof instance.UNSAFE_componentWillReceiveProps === "function" ||
-        typeof instance.componentWillReceiveProps === "function") &&
-      typeof ctor.getDerivedStateFromProps !== "function"
+        typeof instance.componentWillReceiveProps === "function")
     ) {
       if (oldProps !== newProps || oldContext !== newContext) {
         callComponentWillReceiveProps(
@@ -6853,20 +7086,12 @@ var ReactFiberClassComponent = function(
       }
     }
 
-    var derivedStateFromProps = void 0;
-    if (oldProps !== newProps) {
-      derivedStateFromProps = callGetDerivedStateFromProps(
-        workInProgress,
-        instance,
-        newProps
-      );
-    }
-
     // Compute the next state using the memoized state and the update queue.
     var oldState = workInProgress.memoizedState;
     // TODO: Previous state can be null.
     var newState = void 0;
     var derivedStateFromCatch = void 0;
+
     if (workInProgress.updateQueue !== null) {
       newState = processUpdateQueue(
         current,
@@ -6898,6 +7123,18 @@ var ReactFiberClassComponent = function(
       newState = oldState;
     }
 
+    var derivedStateFromProps = void 0;
+    if (oldProps !== newProps) {
+      // The prevState parameter should be the partially updated state.
+      // Otherwise, spreading state in return values could override updates.
+      derivedStateFromProps = callGetDerivedStateFromProps(
+        workInProgress,
+        instance,
+        newProps,
+        newState
+      );
+    }
+
     if (derivedStateFromProps !== null && derivedStateFromProps !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
       // So that multiple render passes do not enqueue multiple updates.
@@ -6906,6 +7143,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromProps
           : Object.assign({}, newState, derivedStateFromProps);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue3 = workInProgress.updateQueue;
+      if (_updateQueue3 !== null) {
+        _updateQueue3.baseState = Object.assign(
+          {},
+          _updateQueue3.baseState,
+          derivedStateFromProps
+        );
+      }
     }
     if (derivedStateFromCatch !== null && derivedStateFromCatch !== undefined) {
       // Render-phase updates (like this) should not be added to the update queue,
@@ -6915,6 +7163,17 @@ var ReactFiberClassComponent = function(
         newState === null || newState === undefined
           ? derivedStateFromCatch
           : Object.assign({}, newState, derivedStateFromCatch);
+
+      // Update the base state of the update queue.
+      // FIXME: This is getting ridiculous. Refactor plz!
+      var _updateQueue4 = workInProgress.updateQueue;
+      if (_updateQueue4 !== null) {
+        _updateQueue4.baseState = Object.assign(
+          {},
+          _updateQueue4.baseState,
+          derivedStateFromCatch
+        );
+      }
     }
 
     if (
@@ -6936,6 +7195,14 @@ var ReactFiberClassComponent = function(
           workInProgress.effectTag |= Update;
         }
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Snapshot;
+        }
+      }
       return false;
     }
 
@@ -6950,11 +7217,11 @@ var ReactFiberClassComponent = function(
 
     if (shouldUpdate) {
       // In order to support react-lifecycles-compat polyfilled components,
-      // Unsafe lifecycles should not be invoked for any component with the new gDSFP.
+      // Unsafe lifecycles should not be invoked for components using the new APIs.
       if (
+        !hasNewLifecycles &&
         (typeof instance.UNSAFE_componentWillUpdate === "function" ||
-          typeof instance.componentWillUpdate === "function") &&
-        typeof ctor.getDerivedStateFromProps !== "function"
+          typeof instance.componentWillUpdate === "function")
       ) {
         startPhaseTimer(workInProgress, "componentWillUpdate");
         if (typeof instance.componentWillUpdate === "function") {
@@ -6968,6 +7235,9 @@ var ReactFiberClassComponent = function(
       if (typeof instance.componentDidUpdate === "function") {
         workInProgress.effectTag |= Update;
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        workInProgress.effectTag |= Snapshot;
+      }
     } else {
       // If an update was already in progress, we should schedule an Update
       // effect even though we're bailing out, so that cWU/cDU are called.
@@ -6979,6 +7249,14 @@ var ReactFiberClassComponent = function(
           workInProgress.effectTag |= Update;
         }
       }
+      if (typeof instance.getSnapshotBeforeUpdate === "function") {
+        if (
+          oldProps !== current.memoizedProps ||
+          oldState !== current.memoizedState
+        ) {
+          workInProgress.effectTag |= Snapshot;
+        }
+      }
 
       // If shouldComponentUpdate returned false, we should still update the
       // memoized props/state to indicate that this work can be reused.
@@ -7818,13 +8096,15 @@ function ChildReconciler(shouldTrackSideEffects) {
       if (typeof newChildrenIterable.entries === "function") {
         var possibleMap = newChildrenIterable;
         if (possibleMap.entries === iteratorFn) {
-          warning(
-            didWarnAboutMaps,
-            "Using Maps as children is unsupported and will likely yield " +
-              "unexpected results. Convert it to a sequence/iterable of keyed " +
-              "ReactElements instead.%s",
-            getCurrentFiberStackAddendum$1()
-          );
+          !didWarnAboutMaps
+            ? warning(
+                false,
+                "Using Maps as children is unsupported and will likely yield " +
+                  "unexpected results. Convert it to a sequence/iterable of keyed " +
+                  "ReactElements instead.%s",
+                getCurrentFiberStackAddendum$1()
+              )
+            : void 0;
           didWarnAboutMaps = true;
         }
       }
@@ -8790,7 +9070,8 @@ var ReactFiberBeginWork = function(
         var partialState = callGetDerivedStateFromProps(
           workInProgress,
           value,
-          props
+          props,
+          workInProgress.memoizedState
         );
 
         if (partialState !== null && partialState !== undefined) {
@@ -8823,11 +9104,13 @@ var ReactFiberBeginWork = function(
         var _Component = workInProgress.type;
 
         if (_Component) {
-          warning(
-            !_Component.childContextTypes,
-            "%s(...): childContextTypes cannot be defined on a functional component.",
-            _Component.displayName || _Component.name || "Component"
-          );
+          !!_Component.childContextTypes
+            ? warning(
+                false,
+                "%s(...): childContextTypes cannot be defined on a functional component.",
+                _Component.displayName || _Component.name || "Component"
+              )
+            : void 0;
         }
         if (workInProgress.ref !== null) {
           var info = "";
@@ -9046,7 +9329,7 @@ var ReactFiberBeginWork = function(
     renderExpirationTime
   ) {
     var providerType = workInProgress.type;
-    var context = providerType.context;
+    var context = providerType._context;
 
     var newProps = workInProgress.pendingProps;
     var oldProps = workInProgress.memoizedProps;
@@ -9099,12 +9382,14 @@ var ReactFiberBeginWork = function(
               ? context._calculateChangedBits(oldValue, newValue)
               : MAX_SIGNED_31_BIT_INT;
           {
-            warning(
-              (changedBits & MAX_SIGNED_31_BIT_INT) === changedBits,
-              "calculateChangedBits: Expected the return value to be a " +
-                "31-bit integer. Instead received: %s",
-              changedBits
-            );
+            !((changedBits & MAX_SIGNED_31_BIT_INT) === changedBits)
+              ? warning(
+                  false,
+                  "calculateChangedBits: Expected the return value to be a " +
+                    "31-bit integer. Instead received: %s",
+                  changedBits
+                )
+              : void 0;
           }
           changedBits |= 0;
 
@@ -9172,21 +9457,23 @@ var ReactFiberBeginWork = function(
         changedBits,
         renderExpirationTime
       );
-    } else if (oldProps !== null && oldProps.children === newProps.children) {
-      // No change. Bailout early if children are the same.
-      return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
+    // There is no bailout on `children` equality because we expect people
+    // to often pass a bound method as a child, but it may reference
+    // `this.state` or `this.props` (and thus needs to re-render on `setState`).
 
     var render = newProps.children;
 
     {
-      warning(
-        typeof render === "function",
-        "A context consumer was rendered with multiple children, or a child " +
-          "that isn't a function. A context consumer expects a single child " +
-          "that is a function. If you did pass a function, make sure there " +
-          "is no trailing or leading whitespace around it."
-      );
+      !(typeof render === "function")
+        ? warning(
+            false,
+            "A context consumer was rendered with multiple children, or a child " +
+              "that isn't a function. A context consumer expects a single child " +
+              "that is a function. If you did pass a function, make sure there " +
+              "is no trailing or leading whitespace around it."
+          )
+        : void 0;
     }
 
     var newChildren = render(newValue);
@@ -10175,6 +10462,11 @@ var invokeGuardedCallback$3 = ReactErrorUtils.invokeGuardedCallback;
 var hasCaughtError$1 = ReactErrorUtils.hasCaughtError;
 var clearCaughtError$1 = ReactErrorUtils.clearCaughtError;
 
+var didWarnAboutUndefinedSnapshotBeforeUpdate = null;
+{
+  didWarnAboutUndefinedSnapshotBeforeUpdate = new Set();
+}
+
 function logError(boundary, errorInfo) {
   var source = errorInfo.source;
   var stack = errorInfo.stack;
@@ -10184,21 +10476,19 @@ function logError(boundary, errorInfo) {
 
   var capturedError = {
     componentName: source !== null ? getComponentName(source) : null,
-    error: errorInfo.value,
-    errorBoundary: boundary,
     componentStack: stack !== null ? stack : "",
+    error: errorInfo.value,
+    errorBoundary: null,
     errorBoundaryName: null,
     errorBoundaryFound: false,
     willRetry: false
   };
 
-  if (boundary !== null) {
+  if (boundary !== null && boundary.tag === ClassComponent) {
+    capturedError.errorBoundary = boundary.stateNode;
     capturedError.errorBoundaryName = getComponentName(boundary);
-    capturedError.errorBoundaryFound = capturedError.willRetry =
-      boundary.tag === ClassComponent;
-  } else {
-    capturedError.errorBoundaryName = null;
-    capturedError.errorBoundaryFound = capturedError.willRetry = false;
+    capturedError.errorBoundaryFound = true;
+    capturedError.willRetry = true;
   }
 
   try {
@@ -10267,6 +10557,58 @@ var ReactFiberCommitWork = function(
     }
   }
 
+  function commitBeforeMutationLifeCycles(current, finishedWork) {
+    switch (finishedWork.tag) {
+      case ClassComponent: {
+        if (finishedWork.effectTag & Snapshot) {
+          if (current !== null) {
+            var prevProps = current.memoizedProps;
+            var prevState = current.memoizedState;
+            startPhaseTimer(finishedWork, "getSnapshotBeforeUpdate");
+            var _instance = finishedWork.stateNode;
+            _instance.props = finishedWork.memoizedProps;
+            _instance.state = finishedWork.memoizedState;
+            var snapshot = _instance.getSnapshotBeforeUpdate(
+              prevProps,
+              prevState
+            );
+            {
+              var didWarnSet = didWarnAboutUndefinedSnapshotBeforeUpdate;
+              if (
+                snapshot === undefined &&
+                !didWarnSet.has(finishedWork.type)
+              ) {
+                didWarnSet.add(finishedWork.type);
+                warning(
+                  false,
+                  "%s.getSnapshotBeforeUpdate(): A snapshot value (or null) " +
+                    "must be returned. You have returned undefined.",
+                  getComponentName(finishedWork)
+                );
+              }
+            }
+            _instance.__reactInternalSnapshotBeforeUpdate = snapshot;
+            stopPhaseTimer();
+          }
+        }
+        return;
+      }
+      case HostRoot:
+      case HostComponent:
+      case HostText:
+      case HostPortal:
+        // Nothing to do for these component types
+        return;
+      default: {
+        invariant(
+          false,
+          "This unit of work tag should not have side-effects. This error is " +
+            "likely caused by a bug in React. Please file an issue."
+        );
+      }
+    }
+  }
+
   function commitLifeCycles(
     finishedRoot,
     current,
@@ -10276,50 +10618,54 @@ var ReactFiberCommitWork = function(
   ) {
     switch (finishedWork.tag) {
       case ClassComponent: {
-        var _instance = finishedWork.stateNode;
+        var _instance2 = finishedWork.stateNode;
         if (finishedWork.effectTag & Update) {
           if (current === null) {
             startPhaseTimer(finishedWork, "componentDidMount");
-            _instance.props = finishedWork.memoizedProps;
-            _instance.state = finishedWork.memoizedState;
-            _instance.componentDidMount();
+            _instance2.props = finishedWork.memoizedProps;
+            _instance2.state = finishedWork.memoizedState;
+            _instance2.componentDidMount();
             stopPhaseTimer();
           } else {
             var prevProps = current.memoizedProps;
             var prevState = current.memoizedState;
             startPhaseTimer(finishedWork, "componentDidUpdate");
-            _instance.props = finishedWork.memoizedProps;
-            _instance.state = finishedWork.memoizedState;
-            _instance.componentDidUpdate(prevProps, prevState);
+            _instance2.props = finishedWork.memoizedProps;
+            _instance2.state = finishedWork.memoizedState;
+            _instance2.componentDidUpdate(
+              prevProps,
+              prevState,
+              _instance2.__reactInternalSnapshotBeforeUpdate
+            );
             stopPhaseTimer();
           }
         }
         var updateQueue = finishedWork.updateQueue;
         if (updateQueue !== null) {
-          commitCallbacks(updateQueue, _instance);
+          commitCallbacks(updateQueue, _instance2);
         }
         return;
       }
       case HostRoot: {
         var _updateQueue = finishedWork.updateQueue;
         if (_updateQueue !== null) {
-          var _instance2 = null;
+          var _instance3 = null;
           if (finishedWork.child !== null) {
             switch (finishedWork.child.tag) {
               case HostComponent:
-                _instance2 = getPublicInstance(finishedWork.child.stateNode);
+                _instance3 = getPublicInstance(finishedWork.child.stateNode);
                 break;
               case ClassComponent:
-                _instance2 = finishedWork.child.stateNode;
+                _instance3 = finishedWork.child.stateNode;
                 break;
             }
           }
-          commitCallbacks(_updateQueue, _instance2);
+          commitCallbacks(_updateQueue, _instance3);
         }
         return;
       }
       case HostComponent: {
-        var _instance3 = finishedWork.stateNode;
+        var _instance4 = finishedWork.stateNode;
 
         // Renderers may schedule work to be done after host components are mounted
         // (eg DOM renderer may schedule auto-focus for inputs and form controls).
@@ -10328,7 +10674,7 @@ var ReactFiberCommitWork = function(
         if (current === null && finishedWork.effectTag & Update) {
           var type = finishedWork.type;
           var props = finishedWork.memoizedProps;
-          commitMount(_instance3, type, props, finishedWork);
+          commitMount(_instance4, type, props, finishedWork);
         }
 
         return;
@@ -10356,7 +10702,7 @@ var ReactFiberCommitWork = function(
       case ClassComponent:
         {
           var ctor = finishedWork.type;
-          var _instance4 = finishedWork.stateNode;
+          var _instance5 = finishedWork.stateNode;
           var updateQueue = finishedWork.updateQueue;
           invariant(
             updateQueue !== null && updateQueue.capturedValues !== null,
@@ -10373,16 +10719,19 @@ var ReactFiberCommitWork = function(
             // This gets reset before we yield back to the browser.
             // TODO: Warn in strict mode if getDerivedStateFromCatch is
             // not defined.
-            markLegacyErrorBoundaryAsFailed(_instance4);
+            markLegacyErrorBoundaryAsFailed(_instance5);
           }
 
-          _instance4.props = finishedWork.memoizedProps;
-          _instance4.state = finishedWork.memoizedState;
+          _instance5.props = finishedWork.memoizedProps;
+          _instance5.state = finishedWork.memoizedState;
           for (var i = 0; i < capturedErrors.length; i++) {
             var errorInfo = capturedErrors[i];
             var _error = errorInfo.value;
+            var stack = errorInfo.stack;
             logError(finishedWork, errorInfo);
-            _instance4.componentDidCatch(_error);
+            _instance5.componentDidCatch(_error, {
+              componentStack: stack !== null ? stack : ""
+            });
           }
         }
         break;
@@ -10415,14 +10764,14 @@ var ReactFiberCommitWork = function(
   function commitAttachRef(finishedWork) {
     var ref = finishedWork.ref;
     if (ref !== null) {
-      var _instance5 = finishedWork.stateNode;
+      var _instance6 = finishedWork.stateNode;
       var instanceToUse = void 0;
       switch (finishedWork.tag) {
         case HostComponent:
-          instanceToUse = getPublicInstance(_instance5);
+          instanceToUse = getPublicInstance(_instance6);
           break;
         default:
-          instanceToUse = _instance5;
+          instanceToUse = _instance6;
       }
       if (typeof ref === "function") {
         ref(instanceToUse);
@@ -10466,9 +10815,9 @@ var ReactFiberCommitWork = function(
     switch (current.tag) {
       case ClassComponent: {
         safelyDetachRef(current);
-        var _instance6 = current.stateNode;
-        if (typeof _instance6.componentWillUnmount === "function") {
-          safelyCallComponentWillUnmount(current, _instance6);
+        var _instance7 = current.stateNode;
+        if (typeof _instance7.componentWillUnmount === "function") {
+          safelyCallComponentWillUnmount(current, _instance7);
         }
         return;
       }
@@ -10605,6 +10954,7 @@ var ReactFiberCommitWork = function(
         },
 
         commitLifeCycles: commitLifeCycles,
+        commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
         commitErrorLogging: commitErrorLogging,
         commitAttachRef: commitAttachRef,
         commitDetachRef: commitDetachRef
@@ -10863,8 +11213,8 @@ var ReactFiberCommitWork = function(
         return;
       }
       case HostComponent: {
-        var _instance7 = finishedWork.stateNode;
-        if (_instance7 != null) {
+        var _instance8 = finishedWork.stateNode;
+        if (_instance8 != null) {
           // Commit the work prepared earlier.
           var newProps = finishedWork.memoizedProps;
           // For hydration we reuse the update path but we treat the oldProps
@@ -10877,7 +11227,7 @@ var ReactFiberCommitWork = function(
           finishedWork.updateQueue = null;
           if (updatePayload !== null) {
             commitUpdate(
-              _instance7,
+              _instance8,
               updatePayload,
               type,
               oldProps,
@@ -10922,6 +11272,7 @@ var ReactFiberCommitWork = function(
 
   if (enableMutatingReconciler) {
     return {
+      commitBeforeMutationLifeCycles: commitBeforeMutationLifeCycles,
       commitResetTextContent: commitResetTextContent,
       commitPlacement: commitPlacement,
       commitDeletion: commitDeletion,
@@ -10967,12 +11318,19 @@ var ReactFiberHostContext = function(config, stack) {
     // Push current root instance onto the stack;
     // This allows us to reset root when portals are popped.
     push(rootInstanceStackCursor, nextRootInstance, fiber);
-
-    var nextRootContext = getRootHostContext(nextRootInstance);
-
     // Track the context and the Fiber that provided it.
     // This enables us to pop only Fibers that provide unique contexts.
     push(contextFiberStackCursor, fiber, fiber);
+
+    // Finally, we need to push the host context to the stack.
+    // However, we can't just call getRootHostContext() and push it because
+    // we'd have a different number of entries on the stack depending on
+    // whether getRootHostContext() throws somewhere in renderer code or not.
+    // So we push an empty value first. This lets us safely unwind on errors.
+    push(contextStackCursor, NO_CONTEXT, fiber);
+    var nextRootContext = getRootHostContext(nextRootInstance);
+    // Now that we know this function doesn't throw, replace it.
+    pop(contextStackCursor, fiber);
     push(contextStackCursor, nextRootContext, fiber);
   }
 
@@ -11683,7 +12041,7 @@ var ReactFiberNewContext = function(stack) {
   }
 
   function pushProvider(providerFiber) {
-    var context = providerFiber.type.context;
+    var context = providerFiber.type._context;
 
     push(changedBitsCursor, context._changedBits, providerFiber);
     push(valueCursor, context._currentValue, providerFiber);
@@ -11693,12 +12051,16 @@ var ReactFiberNewContext = function(stack) {
     context._changedBits = providerFiber.stateNode;
 
     {
-      warning(
+      !(
         context._currentRenderer === null ||
-          context._currentRenderer === rendererSigil,
-        "Detected multiple renderers concurrently rendering the " +
-          "same context provider. This is currently unsupported."
-      );
+        context._currentRenderer === rendererSigil
+      )
+        ? warning(
+            false,
+            "Detected multiple renderers concurrently rendering the " +
+              "same context provider. This is currently unsupported."
+          )
+        : void 0;
       context._currentRenderer = rendererSigil;
     }
   }
@@ -11711,7 +12073,7 @@ var ReactFiberNewContext = function(stack) {
     pop(valueCursor, providerFiber);
     pop(changedBitsCursor, providerFiber);
 
-    var context = providerFiber.type.context;
+    var context = providerFiber.type._context;
     context._currentValue = currentValue;
     context._changedBits = changedBits;
   }
@@ -11824,17 +12186,19 @@ var warnAboutInvalidUpdates = void 0;
   var didWarnStateUpdateForUnmountedComponent = {};
 
   warnAboutUpdateOnUnmounted = function(fiber) {
+    // We show the whole stack but dedupe on the top component's name because
+    // the problematic code almost always lies inside that component.
     var componentName = getComponentName(fiber) || "ReactClass";
     if (didWarnStateUpdateForUnmountedComponent[componentName]) {
       return;
     }
     warning(
       false,
-      "Can only update a mounted or mounting " +
-        "component. This usually means you called setState, replaceState, " +
-        "or forceUpdate on an unmounted component. This is a no-op.\n\nPlease " +
-        "check the code for the %s component.",
-      componentName
+      "Can't call setState (or forceUpdate) on an unmounted component. This " +
+        "is a no-op, but it indicates a memory leak in your application. To " +
+        "fix, cancel all subscriptions and asynchronous tasks in the " +
+        "componentWillUnmount method.%s",
+      getStackAddendumByWorkInProgressFiber(fiber)
     );
     didWarnStateUpdateForUnmountedComponent[componentName] = true;
   };
@@ -11920,6 +12284,8 @@ var ReactFiberScheduler = function(config) {
       markLegacyErrorBoundaryAsFailed,
       recalculateCurrentTime
     ),
+    commitBeforeMutationLifeCycles =
+      _ReactFiberCommitWork.commitBeforeMutationLifeCycles,
     commitResetTextContent = _ReactFiberCommitWork.commitResetTextContent,
     commitPlacement = _ReactFiberCommitWork.commitPlacement,
     commitDeletion = _ReactFiberCommitWork.commitDeletion,
@@ -11971,11 +12337,19 @@ var ReactFiberScheduler = function(config) {
 
   var stashedWorkInProgressProperties = void 0;
   var replayUnitOfWork = void 0;
+  var isReplayingFailedUnitOfWork = void 0;
+  var originalReplayError = void 0;
+  var rethrowOriginalError = void 0;
   if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
     stashedWorkInProgressProperties = null;
-    replayUnitOfWork = function(failedUnitOfWork, isAsync) {
-      // Retore the original state of the work-in-progress
-      Object.assign(failedUnitOfWork, stashedWorkInProgressProperties);
+    isReplayingFailedUnitOfWork = false;
+    originalReplayError = null;
+    replayUnitOfWork = function(failedUnitOfWork, error, isAsync) {
+      // Restore the original state of the work-in-progress
+      assignFiberPropertiesInDEV(
+        failedUnitOfWork,
+        stashedWorkInProgressProperties
+      );
       switch (failedUnitOfWork.tag) {
         case HostRoot:
           popHostContainer(failedUnitOfWork);
@@ -11995,14 +12369,22 @@ var ReactFiberScheduler = function(config) {
           break;
       }
       // Replay the begin phase.
+      isReplayingFailedUnitOfWork = true;
+      originalReplayError = error;
       invokeGuardedCallback$2(null, workLoop, null, isAsync);
+      isReplayingFailedUnitOfWork = false;
+      originalReplayError = null;
       if (hasCaughtError()) {
         clearCaughtError();
       } else {
-        // This should be unreachable because the render phase is
-        // idempotent
+        // If the begin phase did not fail the second time, set this pointer
+        // back to the original value.
+        nextUnitOfWork = failedUnitOfWork;
       }
     };
+    rethrowOriginalError = function() {
+      throw originalReplayError;
+    };
   }
 
   function resetStack() {
@@ -12034,6 +12416,7 @@ var ReactFiberScheduler = function(config) {
       recordEffect();
 
       var effectTag = nextEffect.effectTag;
+
       if (effectTag & ContentReset) {
         commitResetTextContent(nextEffect);
       }
@@ -12091,6 +12474,22 @@ var ReactFiberScheduler = function(config) {
     }
   }
 
+  function commitBeforeMutationLifecycles() {
+    while (nextEffect !== null) {
+      var effectTag = nextEffect.effectTag;
+
+      if (effectTag & Snapshot) {
+        recordEffect();
+        var current = nextEffect.alternate;
+        commitBeforeMutationLifeCycles(current, nextEffect);
+      }
+
+      // Don't cleanup effects yet;
+      // This will be done by commitAllLifeCycles()
+      nextEffect = nextEffect.nextEffect;
+    }
+  }
+
   function commitAllLifeCycles(
     finishedRoot,
     currentTime,
@@ -12198,16 +12597,14 @@ var ReactFiberScheduler = function(config) {
 
     prepareForCommit(root.containerInfo);
 
-    // Commit all the side-effects within a tree. We'll do this in two passes.
-    // The first pass performs all the host insertions, updates, deletions and
-    // ref unmounts.
+    // Invoke instances of getSnapshotBeforeUpdate before mutation.
     nextEffect = firstEffect;
-    startCommitHostEffectsTimer();
+    startCommitSnapshotEffectsTimer();
     while (nextEffect !== null) {
       var didError = false;
       var error = void 0;
       {
-        invokeGuardedCallback$2(null, commitAllHostEffects, null);
+        invokeGuardedCallback$2(null, commitBeforeMutationLifecycles, null);
         if (hasCaughtError()) {
           didError = true;
           error = clearCaughtError();
@@ -12226,6 +12623,36 @@ var ReactFiberScheduler = function(config) {
         }
       }
     }
+    stopCommitSnapshotEffectsTimer();
+
+    // Commit all the side-effects within a tree. We'll do this in two passes.
+    // The first pass performs all the host insertions, updates, deletions and
+    // ref unmounts.
+    nextEffect = firstEffect;
+    startCommitHostEffectsTimer();
+    while (nextEffect !== null) {
+      var _didError = false;
+      var _error = void 0;
+      {
+        invokeGuardedCallback$2(null, commitAllHostEffects, null);
+        if (hasCaughtError()) {
+          _didError = true;
+          _error = clearCaughtError();
+        }
+      }
+      if (_didError) {
+        invariant(
+          nextEffect !== null,
+          "Should have next effect. This error is likely caused by a bug " +
+            "in React. Please file an issue."
+        );
+        onCommitPhaseError(nextEffect, _error);
+        // Clean-up
+        if (nextEffect !== null) {
+          nextEffect = nextEffect.nextEffect;
+        }
+      }
+    }
     stopCommitHostEffectsTimer();
 
     resetAfterCommit(root.containerInfo);
@@ -12243,8 +12670,8 @@ var ReactFiberScheduler = function(config) {
     nextEffect = firstEffect;
     startCommitLifeCyclesTimer();
     while (nextEffect !== null) {
-      var _didError = false;
-      var _error = void 0;
+      var _didError2 = false;
+      var _error2 = void 0;
       {
         invokeGuardedCallback$2(
           null,
@@ -12255,17 +12682,17 @@ var ReactFiberScheduler = function(config) {
           committedExpirationTime
         );
         if (hasCaughtError()) {
-          _didError = true;
-          _error = clearCaughtError();
+          _didError2 = true;
+          _error2 = clearCaughtError();
         }
       }
-      if (_didError) {
+      if (_didError2) {
         invariant(
           nextEffect !== null,
           "Should have next effect. This error is likely caused by a bug " +
             "in React. Please file an issue."
         );
-        onCommitPhaseError(nextEffect, _error);
+        onCommitPhaseError(nextEffect, _error2);
         if (nextEffect !== null) {
           nextEffect = nextEffect.nextEffect;
         }
@@ -12489,12 +12916,21 @@ var ReactFiberScheduler = function(config) {
     }
 
     if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
-      stashedWorkInProgressProperties = Object.assign({}, workInProgress);
+      stashedWorkInProgressProperties = assignFiberPropertiesInDEV(
+        stashedWorkInProgressProperties,
+        workInProgress
+      );
     }
     var next = beginWork(current, workInProgress, nextRenderExpirationTime);
-
     {
       ReactDebugCurrentFiber.resetCurrentFiber();
+      if (isReplayingFailedUnitOfWork) {
+        // Currently replaying a failed unit of work. This should be unreachable,
+        // because the render phase is meant to be idempotent, and it should
+        // have thrown again. Since it didn't, rethrow the original error, so
+        // React's internal stack is not misaligned.
+        rethrowOriginalError();
+      }
     }
     if (true && ReactFiberInstrumentation_1.debugTool) {
       ReactFiberInstrumentation_1.debugTool.onBeginWork(workInProgress);
@@ -12568,13 +13004,18 @@ var ReactFiberScheduler = function(config) {
 
         if (true && replayFailedUnitOfWorkWithInvokeGuardedCallback) {
           var failedUnitOfWork = nextUnitOfWork;
-          replayUnitOfWork(failedUnitOfWork, isAsync);
+          replayUnitOfWork(failedUnitOfWork, thrownValue, isAsync);
         }
 
         var sourceFiber = nextUnitOfWork;
         var returnFiber = sourceFiber["return"];
         if (returnFiber === null) {
-          // This is a fatal error.
+          // This is the root. The root could capture its own errors. However,
+          // we don't know if it errors before or after we pushed the host
+          // context. This information is needed to avoid a stack mismatch.
+          // Because we're not sure, treat this as a fatal error. We could track
+          // which phase it fails in, but doesn't seem worth it. At least
+          // for now.
           didFatal = true;
           onUncaughtError(thrownValue);
           break;
@@ -12586,12 +13027,13 @@ var ReactFiberScheduler = function(config) {
     } while (true);
 
     // We're done performing work. Time to clean up.
-    stopWorkLoopTimer(interruptedBy);
-    interruptedBy = null;
+    var didCompleteRoot = false;
     isWorking = false;
 
     // Yield back to main thread.
     if (didFatal) {
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
       // There was a fatal error.
       {
         stack.resetStackAfterFatalErrorInDev();
@@ -12600,12 +13042,17 @@ var ReactFiberScheduler = function(config) {
     } else if (nextUnitOfWork === null) {
       // We reached the root.
       if (isRootReadyForCommit) {
+        didCompleteRoot = true;
+        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+        interruptedBy = null;
         // The root successfully completed. It's ready for commit.
         root.pendingCommitExpirationTime = expirationTime;
         var finishedWork = root.current.alternate;
         return finishedWork;
       } else {
         // The root did not complete.
+        stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+        interruptedBy = null;
         invariant(
           false,
           "Expired work should have completed. This error is likely caused " +
@@ -12613,6 +13060,8 @@ var ReactFiberScheduler = function(config) {
         );
       }
     } else {
+      stopWorkLoopTimer(interruptedBy, didCompleteRoot);
+      interruptedBy = null;
       // There's more work to do, but we ran out of time. Yield back to
       // the renderer.
       return null;
@@ -12798,7 +13247,15 @@ var ReactFiberScheduler = function(config) {
             interruptedBy = fiber;
             resetStack();
           }
-          if (nextRoot !== root || !isWorking) {
+          if (
+            // If we're in the render phase, we don't need to schedule this root
+            // for an update, because we'll do it before we exit...
+            !isWorking ||
+            isCommitting ||
+            // ...unless this is a different root than the one we're rendering.
+            nextRoot !== root
+          ) {
+            // Add this root to the root schedule.
             requestWork(root, expirationTime);
           }
           if (nestedUpdateCount > NESTED_UPDATE_LIMIT) {
@@ -13058,7 +13515,8 @@ var ReactFiberScheduler = function(config) {
 
     if (enableUserTimingAPI && deadline !== null) {
       var didExpire = nextFlushedExpirationTime < recalculateCurrentTime();
-      stopRequestCallbackTimer(didExpire);
+      var timeout = expirationTimeToMs(nextFlushedExpirationTime);
+      stopRequestCallbackTimer(didExpire, timeout);
     }
 
     if (isAsync) {
@@ -13118,7 +13576,11 @@ var ReactFiberScheduler = function(config) {
     // Perform work on root as if the given expiration time is the current time.
     // This has the effect of synchronously flushing all work up to and
     // including the given time.
+    nextFlushedRoot = root;
+    nextFlushedExpirationTime = expirationTime;
     performWorkOnRoot(root, expirationTime, false);
+    // Flush any sync work that was scheduled by lifecycles
+    performSyncWork();
     finishRendering();
   }
 
@@ -13445,12 +13907,14 @@ var ReactFiberReconciler$1 = function(config) {
 
     callback = callback === undefined ? null : callback;
     {
-      warning(
-        callback === null || typeof callback === "function",
-        "render(...): Expected the last optional `callback` argument to be a " +
-          "function. Instead received: %s.",
-        callback
-      );
+      !(callback === null || typeof callback === "function")
+        ? warning(
+            false,
+            "render(...): Expected the last optional `callback` argument to be a " +
+              "function. Instead received: %s.",
+            callback
+          )
+        : void 0;
     }
 
     var update = {
@@ -13772,7 +14236,8 @@ var frameDeadline = 0;
 var frameDeadlineObject = {
   timeRemaining: function() {
     return frameDeadline - now();
-  }
+  },
+  didTimeout: false
 };
 
 function setTimeoutCallback() {
diff --git a/Libraries/Renderer/ReactNativeRenderer-prod.js b/Libraries/Renderer/ReactNativeRenderer-prod.js
index f11aa6c82da4b1..055ddd7bb0c161 100644
--- a/Libraries/Renderer/ReactNativeRenderer-prod.js
+++ b/Libraries/Renderer/ReactNativeRenderer-prod.js
@@ -2246,23 +2246,20 @@ function ReactFiberClassComponent(
     instance.state !== workInProgress &&
       updater.enqueueReplaceState(instance, instance.state, null);
   }
-  function callGetDerivedStateFromProps(workInProgress, instance, props) {
+  function callGetDerivedStateFromProps(
+    workInProgress,
+    instance,
+    nextProps,
+    prevState
+  ) {
     instance = workInProgress.type;
     if ("function" === typeof instance.getDerivedStateFromProps)
       return (
         (debugRenderPhaseSideEffects ||
           (debugRenderPhaseSideEffectsForStrictMode &&
             workInProgress.mode & 2)) &&
-          instance.getDerivedStateFromProps.call(
-            null,
-            props,
-            workInProgress.memoizedState
-          ),
-        instance.getDerivedStateFromProps.call(
-          null,
-          props,
-          workInProgress.memoizedState
-        )
+          instance.getDerivedStateFromProps.call(null, nextProps, prevState),
+        instance.getDerivedStateFromProps.call(null, nextProps, prevState)
       );
   }
   var cacheContext = legacyContext.cacheContext,
@@ -2337,7 +2334,7 @@ function ReactFiberClassComponent(
         null !== ctor.state && void 0 !== ctor.state ? ctor.state : null;
       adoptClassInstance(workInProgress, ctor);
       workInProgress.memoizedState = state;
-      props = callGetDerivedStateFromProps(workInProgress, ctor, props);
+      props = callGetDerivedStateFromProps(workInProgress, ctor, props, state);
       null !== props &&
         void 0 !== props &&
         (workInProgress.memoizedState = Object.assign(
@@ -2358,9 +2355,10 @@ function ReactFiberClassComponent(
       instance.state = workInProgress.memoizedState;
       instance.refs = emptyObject;
       instance.context = getMaskedContext(workInProgress, unmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillMount &&
-        "function" !== typeof instance.componentWillMount) ||
-        "function" === typeof ctor.getDerivedStateFromProps ||
+      "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate ||
+        ("function" !== typeof instance.UNSAFE_componentWillMount &&
+          "function" !== typeof instance.componentWillMount) ||
         ((ctor = instance.state),
         "function" === typeof instance.componentWillMount &&
           instance.componentWillMount(),
@@ -2391,9 +2389,12 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-        "function" !== typeof instance.componentWillReceiveProps) ||
+      var hasNewLifecycles =
         "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate;
+      hasNewLifecycles ||
+        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof instance.componentWillReceiveProps) ||
         ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
           callComponentWillReceiveProps(
             workInProgress,
@@ -2401,15 +2402,8 @@ function ReactFiberClassComponent(
             newProps,
             newUnmaskedContext
           ));
-      oldContext = void 0;
-      oldProps !== newProps &&
-        (oldContext = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps
-        ));
-      var oldState = workInProgress.memoizedState,
-        derivedStateFromCatch = void 0;
+      oldContext = workInProgress.memoizedState;
+      var derivedStateFromCatch = void 0;
       if (null !== workInProgress.updateQueue) {
         renderExpirationTime = processUpdateQueue(
           null,
@@ -2428,23 +2422,45 @@ function ReactFiberClassComponent(
             ctor,
             updateQueue.capturedValues
           ));
-      } else renderExpirationTime = oldState;
-      null !== oldContext &&
-        void 0 !== oldContext &&
-        (renderExpirationTime =
+      } else renderExpirationTime = oldContext;
+      ctor = void 0;
+      oldProps !== newProps &&
+        (ctor = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps,
+          renderExpirationTime
+        ));
+      null !== ctor &&
+        void 0 !== ctor &&
+        ((renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? oldContext
-            : Object.assign({}, renderExpirationTime, oldContext));
+            ? ctor
+            : Object.assign({}, renderExpirationTime, ctor)),
+        (updateQueue = workInProgress.updateQueue),
+        null !== updateQueue &&
+          (updateQueue.baseState = Object.assign(
+            {},
+            updateQueue.baseState,
+            ctor
+          )));
       null !== derivedStateFromCatch &&
         void 0 !== derivedStateFromCatch &&
-        (renderExpirationTime =
+        ((renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
             ? derivedStateFromCatch
-            : Object.assign({}, renderExpirationTime, derivedStateFromCatch));
+            : Object.assign({}, renderExpirationTime, derivedStateFromCatch)),
+        (ctor = workInProgress.updateQueue),
+        null !== ctor &&
+          (ctor.baseState = Object.assign(
+            {},
+            ctor.baseState,
+            derivedStateFromCatch
+          )));
       if (
         !(
           oldProps !== newProps ||
-          oldState !== renderExpirationTime ||
+          oldContext !== renderExpirationTime ||
           hasContextChanged() ||
           (null !== workInProgress.updateQueue &&
             workInProgress.updateQueue.hasForceUpdate)
@@ -2459,13 +2475,13 @@ function ReactFiberClassComponent(
         workInProgress,
         oldProps,
         newProps,
-        oldState,
+        oldContext,
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (("function" !== typeof instance.UNSAFE_componentWillMount &&
-            "function" !== typeof instance.componentWillMount) ||
-            "function" === typeof ctor.getDerivedStateFromProps ||
+        ? (hasNewLifecycles ||
+            ("function" !== typeof instance.UNSAFE_componentWillMount &&
+              "function" !== typeof instance.componentWillMount) ||
             ("function" === typeof instance.componentWillMount &&
               instance.componentWillMount(),
             "function" === typeof instance.UNSAFE_componentWillMount &&
@@ -2495,9 +2511,12 @@ function ReactFiberClassComponent(
         oldContext = instance.context,
         newUnmaskedContext = getUnmaskedContext(workInProgress);
       newUnmaskedContext = getMaskedContext(workInProgress, newUnmaskedContext);
-      ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
-        "function" !== typeof instance.componentWillReceiveProps) ||
+      var hasNewLifecycles =
         "function" === typeof ctor.getDerivedStateFromProps ||
+        "function" === typeof instance.getSnapshotBeforeUpdate;
+      hasNewLifecycles ||
+        ("function" !== typeof instance.UNSAFE_componentWillReceiveProps &&
+          "function" !== typeof instance.componentWillReceiveProps) ||
         ((oldProps !== newProps || oldContext !== newUnmaskedContext) &&
           callComponentWillReceiveProps(
             workInProgress,
@@ -2505,13 +2524,6 @@ function ReactFiberClassComponent(
             newProps,
             newUnmaskedContext
           ));
-      var derivedStateFromProps = void 0;
-      oldProps !== newProps &&
-        (derivedStateFromProps = callGetDerivedStateFromProps(
-          workInProgress,
-          instance,
-          newProps
-        ));
       oldContext = workInProgress.memoizedState;
       var derivedStateFromCatch = void 0;
       if (null !== workInProgress.updateQueue) {
@@ -2533,18 +2545,40 @@ function ReactFiberClassComponent(
             updateQueue.capturedValues
           ));
       } else renderExpirationTime = oldContext;
-      null !== derivedStateFromProps &&
-        void 0 !== derivedStateFromProps &&
-        (renderExpirationTime =
+      ctor = void 0;
+      oldProps !== newProps &&
+        (ctor = callGetDerivedStateFromProps(
+          workInProgress,
+          instance,
+          newProps,
+          renderExpirationTime
+        ));
+      null !== ctor &&
+        void 0 !== ctor &&
+        ((renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
-            ? derivedStateFromProps
-            : Object.assign({}, renderExpirationTime, derivedStateFromProps));
+            ? ctor
+            : Object.assign({}, renderExpirationTime, ctor)),
+        (updateQueue = workInProgress.updateQueue),
+        null !== updateQueue &&
+          (updateQueue.baseState = Object.assign(
+            {},
+            updateQueue.baseState,
+            ctor
+          )));
       null !== derivedStateFromCatch &&
         void 0 !== derivedStateFromCatch &&
-        (renderExpirationTime =
+        ((renderExpirationTime =
           null === renderExpirationTime || void 0 === renderExpirationTime
             ? derivedStateFromCatch
-            : Object.assign({}, renderExpirationTime, derivedStateFromCatch));
+            : Object.assign({}, renderExpirationTime, derivedStateFromCatch)),
+        (ctor = workInProgress.updateQueue),
+        null !== ctor &&
+          (ctor.baseState = Object.assign(
+            {},
+            ctor.baseState,
+            derivedStateFromCatch
+          )));
       if (
         !(
           oldProps !== newProps ||
@@ -2559,9 +2593,13 @@ function ReactFiberClassComponent(
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
+          "function" !== typeof instance.getSnapshotBeforeUpdate ||
+            (oldProps === current.memoizedProps &&
+              oldContext === current.memoizedState) ||
+            (workInProgress.effectTag |= 2048),
           !1
         );
-      (derivedStateFromProps = checkShouldComponentUpdate(
+      (derivedStateFromCatch = checkShouldComponentUpdate(
         workInProgress,
         oldProps,
         newProps,
@@ -2569,9 +2607,9 @@ function ReactFiberClassComponent(
         renderExpirationTime,
         newUnmaskedContext
       ))
-        ? (("function" !== typeof instance.UNSAFE_componentWillUpdate &&
-            "function" !== typeof instance.componentWillUpdate) ||
-            "function" === typeof ctor.getDerivedStateFromProps ||
+        ? (hasNewLifecycles ||
+            ("function" !== typeof instance.UNSAFE_componentWillUpdate &&
+              "function" !== typeof instance.componentWillUpdate) ||
             ("function" === typeof instance.componentWillUpdate &&
               instance.componentWillUpdate(
                 newProps,
@@ -2585,17 +2623,23 @@ function ReactFiberClassComponent(
                 newUnmaskedContext
               )),
           "function" === typeof instance.componentDidUpdate &&
-            (workInProgress.effectTag |= 4))
+            (workInProgress.effectTag |= 4),
+          "function" === typeof instance.getSnapshotBeforeUpdate &&
+            (workInProgress.effectTag |= 2048))
         : ("function" !== typeof instance.componentDidUpdate ||
             (oldProps === current.memoizedProps &&
               oldContext === current.memoizedState) ||
             (workInProgress.effectTag |= 4),
+          "function" !== typeof instance.getSnapshotBeforeUpdate ||
+            (oldProps === current.memoizedProps &&
+              oldContext === current.memoizedState) ||
+            (workInProgress.effectTag |= 2048),
           memoizeProps(workInProgress, newProps),
           memoizeState(workInProgress, renderExpirationTime));
       instance.props = newProps;
       instance.state = renderExpirationTime;
       instance.context = newUnmaskedContext;
-      return derivedStateFromProps;
+      return derivedStateFromCatch;
     }
   };
 }
@@ -3444,7 +3488,7 @@ function ReactFiberBeginWork(
     workInProgress,
     renderExpirationTime
   ) {
-    var context = workInProgress.type.context,
+    var context = workInProgress.type._context,
       newProps = workInProgress.pendingProps,
       oldProps = workInProgress.memoizedProps;
     if (!hasLegacyContextChanged() && oldProps === newProps)
@@ -3610,7 +3654,8 @@ function ReactFiberBeginWork(
                 ((props = callGetDerivedStateFromProps(
                   workInProgress,
                   fn,
-                  props
+                  props,
+                  workInProgress.memoizedState
                 )),
                 null !== props &&
                   void 0 !== props &&
@@ -3881,43 +3926,33 @@ function ReactFiberBeginWork(
             renderExpirationTime
           );
         case 12:
-          a: {
-            fn = workInProgress.type;
-            unmaskedContext = workInProgress.pendingProps;
-            updateQueue = workInProgress.memoizedProps;
-            props = fn._currentValue;
-            var changedBits = fn._changedBits;
-            if (
-              hasLegacyContextChanged() ||
-              0 !== changedBits ||
-              updateQueue !== unmaskedContext
-            ) {
-              workInProgress.memoizedProps = unmaskedContext;
-              var observedBits = unmaskedContext.unstable_observedBits;
-              if (void 0 === observedBits || null === observedBits)
-                observedBits = 1073741823;
-              workInProgress.stateNode = observedBits;
-              if (0 !== (changedBits & observedBits))
-                propagateContextChange(
-                  workInProgress,
-                  fn,
-                  changedBits,
-                  renderExpirationTime
-                );
-              else if (
-                null !== updateQueue &&
-                updateQueue.children === unmaskedContext.children
-              ) {
-                current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-                break a;
-              }
-              renderExpirationTime = unmaskedContext.children;
-              renderExpirationTime = renderExpirationTime(props);
-              reconcileChildren(current, workInProgress, renderExpirationTime);
-              current = workInProgress.child;
-            } else
-              current = bailoutOnAlreadyFinishedWork(current, workInProgress);
-          }
+          fn = workInProgress.type;
+          unmaskedContext = workInProgress.pendingProps;
+          var oldProps = workInProgress.memoizedProps;
+          props = fn._currentValue;
+          updateQueue = fn._changedBits;
+          if (
+            hasLegacyContextChanged() ||
+            0 !== updateQueue ||
+            oldProps !== unmaskedContext
+          ) {
+            workInProgress.memoizedProps = unmaskedContext;
+            oldProps = unmaskedContext.unstable_observedBits;
+            if (void 0 === oldProps || null === oldProps) oldProps = 1073741823;
+            workInProgress.stateNode = oldProps;
+            0 !== (updateQueue & oldProps) &&
+              propagateContextChange(
+                workInProgress,
+                fn,
+                updateQueue,
+                renderExpirationTime
+              );
+            renderExpirationTime = unmaskedContext.children;
+            renderExpirationTime = renderExpirationTime(props);
+            reconcileChildren(current, workInProgress, renderExpirationTime);
+            current = workInProgress.child;
+          } else
+            current = bailoutOnAlreadyFinishedWork(current, workInProgress);
           return current;
         default:
           invariant(
@@ -4313,9 +4348,9 @@ function logError(boundary, errorInfo) {
     stack = errorInfo.stack;
   null === stack && (stack = getStackAddendumByWorkInProgressFiber(source));
   null !== source && getComponentName(source);
+  source = null !== stack ? stack : "";
   errorInfo = errorInfo.value;
-  stack = null !== stack ? stack : "";
-  null !== boundary && getComponentName(boundary);
+  null !== boundary && 2 === boundary.tag && getComponentName(boundary);
   try {
     if (errorInfo instanceof Error) {
       var message = errorInfo.message,
@@ -4325,13 +4360,13 @@ function logError(boundary, errorInfo) {
         errorToHandle.message =
           (message ? name + ": " + message : name) +
           "\n\nThis error is located at:" +
-          stack;
+          source;
       } catch (e) {}
     } else
       errorToHandle =
         "string" === typeof errorInfo
-          ? Error(errorInfo + "\n\nThis error is located at:" + stack)
-          : Error("Unspecified error at:" + stack);
+          ? Error(errorInfo + "\n\nThis error is located at:" + source)
+          : Error("Unspecified error at:" + source);
     ExceptionsManager.handleException(errorToHandle, !1);
   } catch (e) {
     (e && e.suppressReactErrorLogging) || console.error(e);
@@ -4360,12 +4395,12 @@ function ReactFiberCommitWork(
     switch (current.tag) {
       case 2:
         safelyDetachRef(current);
-        var _instance6 = current.stateNode;
-        if ("function" === typeof _instance6.componentWillUnmount)
+        var _instance7 = current.stateNode;
+        if ("function" === typeof _instance7.componentWillUnmount)
           try {
-            (_instance6.props = current.memoizedProps),
-              (_instance6.state = current.memoizedState),
-              _instance6.componentWillUnmount();
+            (_instance7.props = current.memoizedProps),
+              (_instance7.state = current.memoizedState),
+              _instance7.componentWillUnmount();
           } catch (unmountError) {
             captureError(current, unmountError);
           }
@@ -4475,6 +4510,34 @@ function ReactFiberCommitWork(
     removeChild = mutation.removeChild,
     removeChildFromContainer = mutation.removeChildFromContainer;
   return {
+    commitBeforeMutationLifeCycles: function(current, finishedWork) {
+      switch (finishedWork.tag) {
+        case 2:
+          if (finishedWork.effectTag & 2048 && null !== current) {
+            var prevProps = current.memoizedProps,
+              prevState = current.memoizedState;
+            current = finishedWork.stateNode;
+            current.props = finishedWork.memoizedProps;
+            current.state = finishedWork.memoizedState;
+            finishedWork = current.getSnapshotBeforeUpdate(
+              prevProps,
+              prevState
+            );
+            current.__reactInternalSnapshotBeforeUpdate = finishedWork;
+          }
+          break;
+        case 3:
+        case 5:
+        case 6:
+        case 4:
+          break;
+        default:
+          invariant(
+            !1,
+            "This unit of work tag should not have side-effects. This error is likely caused by a bug in React. Please file an issue."
+          );
+      }
+    },
     commitResetTextContent: function(current) {
       resetTextContent(current.stateNode);
     },
@@ -4580,8 +4643,8 @@ function ReactFiberCommitWork(
         case 2:
           break;
         case 5:
-          var _instance7 = finishedWork.stateNode;
-          if (null != _instance7) {
+          var _instance8 = finishedWork.stateNode;
+          if (null != _instance8) {
             var newProps = finishedWork.memoizedProps;
             current = null !== current ? current.memoizedProps : newProps;
             var type = finishedWork.type,
@@ -4589,7 +4652,7 @@ function ReactFiberCommitWork(
             finishedWork.updateQueue = null;
             null !== updatePayload &&
               commitUpdate(
-                _instance7,
+                _instance8,
                 updatePayload,
                 type,
                 current,
@@ -4603,11 +4666,11 @@ function ReactFiberCommitWork(
             null !== finishedWork.stateNode,
             "This should have a text node initialized. This error is likely caused by a bug in React. Please file an issue."
           );
-          _instance7 = finishedWork.memoizedProps;
+          _instance8 = finishedWork.memoizedProps;
           commitTextUpdate(
             finishedWork.stateNode,
-            null !== current ? current.memoizedProps : _instance7,
-            _instance7
+            null !== current ? current.memoizedProps : _instance8,
+            _instance8
           );
           break;
         case 3:
@@ -4633,7 +4696,11 @@ function ReactFiberCommitWork(
               current = current.memoizedState;
               finishedRoot.props = finishedWork.memoizedProps;
               finishedRoot.state = finishedWork.memoizedState;
-              finishedRoot.componentDidUpdate(prevProps, current);
+              finishedRoot.componentDidUpdate(
+                prevProps,
+                current,
+                finishedRoot.__reactInternalSnapshotBeforeUpdate
+              );
             }
           finishedWork = finishedWork.updateQueue;
           null !== finishedWork && commitCallbacks(finishedWork, finishedRoot);
@@ -4695,9 +4762,12 @@ function ReactFiberCommitWork(
           onUncaughtError.state = finishedWork.memoizedState;
           for (ctor = 0; ctor < capturedErrors.length; ctor++) {
             updateQueue = capturedErrors[ctor];
-            var _error = updateQueue.value;
+            var _error = updateQueue.value,
+              stack = updateQueue.stack;
             logError(finishedWork, updateQueue);
-            onUncaughtError.componentDidCatch(_error);
+            onUncaughtError.componentDidCatch(_error, {
+              componentStack: null !== stack ? stack : ""
+            });
           }
           break;
         case 3:
@@ -4723,13 +4793,13 @@ function ReactFiberCommitWork(
     commitAttachRef: function(finishedWork) {
       var ref = finishedWork.ref;
       if (null !== ref) {
-        var _instance5 = finishedWork.stateNode;
+        var _instance6 = finishedWork.stateNode;
         switch (finishedWork.tag) {
           case 5:
-            finishedWork = getPublicInstance(_instance5);
+            finishedWork = getPublicInstance(_instance6);
             break;
           default:
-            finishedWork = _instance5;
+            finishedWork = _instance6;
         }
         "function" === typeof ref
           ? ref(finishedWork)
@@ -4780,8 +4850,10 @@ function ReactFiberHostContext(config, stack) {
     },
     pushHostContainer: function(fiber, nextRootInstance) {
       push(rootInstanceStackCursor, nextRootInstance, fiber);
-      nextRootInstance = getRootHostContext(nextRootInstance);
       push(contextFiberStackCursor, fiber, fiber);
+      push(contextStackCursor, NO_CONTEXT, fiber);
+      nextRootInstance = getRootHostContext(nextRootInstance);
+      pop(contextStackCursor, fiber);
       push(contextStackCursor, nextRootInstance, fiber);
     },
     pushHostContext: function(fiber) {
@@ -5088,7 +5160,7 @@ function ReactFiberNewContext(stack) {
     changedBitsCursor = createCursor(0);
   return {
     pushProvider: function(providerFiber) {
-      var context = providerFiber.type.context;
+      var context = providerFiber.type._context;
       push(changedBitsCursor, context._changedBits, providerFiber);
       push(valueCursor, context._currentValue, providerFiber);
       push(providerCursor, providerFiber, providerFiber);
@@ -5101,7 +5173,7 @@ function ReactFiberNewContext(stack) {
       pop(providerCursor, providerFiber);
       pop(valueCursor, providerFiber);
       pop(changedBitsCursor, providerFiber);
-      providerFiber = providerFiber.type.context;
+      providerFiber = providerFiber.type._context;
       providerFiber._currentValue = currentValue;
       providerFiber._changedBits = changedBits;
     }
@@ -5214,7 +5286,7 @@ function ReactFiberScheduler(config) {
         workInProgress$jscomp$0 = unwindWork(workInProgress$jscomp$0);
         if (null !== workInProgress$jscomp$0)
           return (
-            (workInProgress$jscomp$0.effectTag &= 511), workInProgress$jscomp$0
+            (workInProgress$jscomp$0.effectTag &= 2559), workInProgress$jscomp$0
           );
         null !== returnFiber &&
           ((returnFiber.firstEffect = returnFiber.lastEffect = null),
@@ -5378,7 +5450,7 @@ function ReactFiberScheduler(config) {
               0 !== nextRenderExpirationTime &&
               expirationTime < nextRenderExpirationTime &&
               resetStack();
-            (nextRoot === root && isWorking) ||
+            (isWorking && !isCommitting && nextRoot === root) ||
               requestWork(root, expirationTime);
             nestedUpdateCount > NESTED_UPDATE_LIMIT &&
               invariant(
@@ -5442,7 +5514,7 @@ function ReactFiberScheduler(config) {
           (nextFlushedExpirationTime = 1),
           performWorkOnRoot(root, 1, !1))
         : 1 === expirationTime
-          ? performWork(1, !1, null)
+          ? performSyncWork()
           : scheduleCallbackWithExpiration(expirationTime));
   }
   function findHighestPriorityRoot() {
@@ -5502,6 +5574,9 @@ function ReactFiberScheduler(config) {
   function performAsyncWork(dl) {
     performWork(0, !0, dl);
   }
+  function performSyncWork() {
+    performWork(1, !1, null);
+  }
   function performWork(minExpirationTime, isAsync, dl) {
     deadline = dl;
     findHighestPriorityRoot();
@@ -5624,6 +5699,25 @@ function ReactFiberScheduler(config) {
     for (nextEffect = firstEffect; null !== nextEffect; ) {
       var didError = !1,
         error = void 0;
+      try {
+        for (; null !== nextEffect; )
+          nextEffect.effectTag & 2048 &&
+            commitBeforeMutationLifeCycles(nextEffect.alternate, nextEffect),
+            (nextEffect = nextEffect.nextEffect);
+      } catch (e) {
+        (didError = !0), (error = e);
+      }
+      didError &&
+        (invariant(
+          null !== nextEffect,
+          "Should have next effect. This error is likely caused by a bug in React. Please file an issue."
+        ),
+        onCommitPhaseError(nextEffect, error),
+        null !== nextEffect && (nextEffect = nextEffect.nextEffect));
+    }
+    for (nextEffect = firstEffect; null !== nextEffect; ) {
+      didError = !1;
+      error = void 0;
       try {
         for (; null !== nextEffect; ) {
           var effectTag = nextEffect.effectTag;
@@ -5764,7 +5858,9 @@ function ReactFiberScheduler(config) {
     },
     recalculateCurrentTime
   );
-  var commitResetTextContent = hostContext.commitResetTextContent,
+  var commitBeforeMutationLifeCycles =
+      hostContext.commitBeforeMutationLifeCycles,
+    commitResetTextContent = hostContext.commitResetTextContent,
     commitPlacement = hostContext.commitPlacement,
     commitDeletion = hostContext.commitDeletion,
     commitWork = hostContext.commitWork,
@@ -5819,7 +5915,10 @@ function ReactFiberScheduler(config) {
         !isRendering,
         "work.commit(): Cannot commit while already rendering. This likely means you attempted to commit from inside a lifecycle method."
       );
+      nextFlushedRoot = root;
+      nextFlushedExpirationTime = expirationTime;
       performWorkOnRoot(root, expirationTime, !1);
+      performSyncWork();
       finishRendering();
     },
     batchedUpdates: function(fn, a) {
@@ -5830,7 +5929,7 @@ function ReactFiberScheduler(config) {
       } finally {
         (isBatchingUpdates = previousIsBatchingUpdates) ||
           isRendering ||
-          performWork(1, !1, null);
+          performSyncWork();
       }
     },
     unbatchedUpdates: function(fn, a) {
@@ -5854,8 +5953,7 @@ function ReactFiberScheduler(config) {
       try {
         return syncUpdates(fn, a);
       } finally {
-        (isBatchingUpdates = previousIsBatchingUpdates),
-          performWork(1, !1, null);
+        (isBatchingUpdates = previousIsBatchingUpdates), performSyncWork();
       }
     },
     flushControlled: function(fn) {
@@ -5896,7 +5994,7 @@ function ReactFiberScheduler(config) {
         (isBatchingInteractiveUpdates = previousIsBatchingInteractiveUpdates),
           (isBatchingUpdates = previousIsBatchingUpdates) ||
             isRendering ||
-            performWork(1, !1, null);
+            performSyncWork();
       }
     },
     flushInteractiveUpdates: function() {
@@ -6128,7 +6226,8 @@ var ReactFiberReconciler$2 = Object.freeze({ default: ReactFiberReconciler$1 }),
   frameDeadlineObject = {
     timeRemaining: function() {
       return frameDeadline - now();
-    }
+    },
+    didTimeout: !1
   };
 function setTimeoutCallback() {
   frameDeadline = now() + 5;
@@ -6462,7 +6561,7 @@ NativeRenderer.injectIntoDevTools({
   findFiberByHostInstance: getInstanceFromTag,
   getInspectorDataForViewTag: getInspectorDataForViewTag,
   bundleType: 0,
-  version: "16.3.0-alpha.2",
+  version: "16.3.1",
   rendererPackageName: "react-native-renderer"
 });
 var ReactNativeRenderer$2 = Object.freeze({ default: ReactNativeRenderer }),
diff --git a/Libraries/Renderer/shims/ReactFabric.js b/Libraries/Renderer/shims/ReactFabric.js
index 6ab336bf11f058..4162ca62fef73d 100644
--- a/Libraries/Renderer/shims/ReactFabric.js
+++ b/Libraries/Renderer/shims/ReactFabric.js
@@ -25,4 +25,3 @@ if (__DEV__) {
 BatchedBridge.registerCallableModule('ReactFabric', ReactFabric);
 
 module.exports = (ReactFabric: ReactNativeType);
-
diff --git a/Libraries/Renderer/shims/ReactTypes.js b/Libraries/Renderer/shims/ReactTypes.js
index f6a56ccc96ed4e..689ed18bf95294 100644
--- a/Libraries/Renderer/shims/ReactTypes.js
+++ b/Libraries/Renderer/shims/ReactTypes.js
@@ -62,7 +62,7 @@ export type ReactProvider<T> = {
 
 export type ReactProviderType<T> = {
   $$typeof: Symbol | number,
-  context: ReactContext<T>,
+  _context: ReactContext<T>,
 };
 
 export type ReactConsumer<T> = {
@@ -72,7 +72,7 @@ export type ReactConsumer<T> = {
   ref: null,
   props: {
     children: (value: T) => ReactNodeList,
-    bits?: number,
+    unstable_observedBits?: number,
   },
 };
 
diff --git a/package.json b/package.json
index a0991064305048..c3a252f75e21fd 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "react-native": "local-cli/wrong-react-native.js"
   },
   "peerDependencies": {
-    "react": "^16.3.0-alpha.2"
+    "react": "16.3.1"
   },
   "dependencies": {
     "absolute-path": "^0.0.0",
@@ -219,8 +219,8 @@
     "jest": "22.4.2",
     "jest-junit": "3.6.0",
     "prettier": "1.9.1",
-    "react": "^16.3.0-alpha.2",
-    "react-test-renderer": "^16.3.0-alpha.2",
+    "react": "16.3.1",
+    "react-test-renderer": "16.3.1",
     "shelljs": "^0.7.8",
     "sinon": "^2.2.0"
   }

From 44f19f745b1d7e577f9835939c1167db4a5ad9ee Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Thu, 5 Apr 2018 23:56:49 +0200
Subject: [PATCH 255/267] [0.55.1] Bump version numbers

---
 Libraries/Core/ReactNativeVersion.js                            | 2 +-
 React/Base/RCTVersion.m                                         | 2 +-
 ReactAndroid/gradle.properties                                  | 2 +-
 .../facebook/react/modules/systeminfo/ReactNativeVersion.java   | 2 +-
 package.json                                                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index 747108bd4a3bdd..4c9016abdea0fb 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -13,6 +13,6 @@
 exports.version = {
   major: 0,
   minor: 55,
-  patch: 0,
+  patch: 1,
   prerelease: null,
 };
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
index e4330579230185..5474e99cf51a24 100644
--- a/React/Base/RCTVersion.m
+++ b/React/Base/RCTVersion.m
@@ -22,7 +22,7 @@ static void __makeVersion()
   __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(55),
-                  RCTVersionPatch: @(0),
+                  RCTVersionPatch: @(1),
                   RCTVersionPrerelease: [NSNull null],
                   };
 }
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index dc4822f31ead55..7369d1ebba619c 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=0.55.0
+VERSION_NAME=0.55.1
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
index e5ad72693918da..635a78a9118cb9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 55,
-      "patch", 0,
+      "patch", 1,
       "prerelease", null);
 }
diff --git a/package.json b/package.json
index c3a252f75e21fd..ae279de02e6626 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.55.0",
+  "version": "0.55.1",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {

From c2c4f486a202c1364d60ed9552d51dd5264b3bd3 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Fri, 6 Apr 2018 18:10:34 +0200
Subject: [PATCH 256/267] Revert "Fix: Added scroll Bounds check in
 scrollToOffset method in RCTScrollView on iOS"

This reverts commit 16c9e5b71500135a631480035af6cd2de3dafdc9.
---
 React/Views/ScrollView/RCTScrollView.m | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m
index 6a8f3353942625..f146ba0d2369a0 100644
--- a/React/Views/ScrollView/RCTScrollView.m
+++ b/React/Views/ScrollView/RCTScrollView.m
@@ -575,9 +575,6 @@ - (void)scrollToOffset:(CGPoint)offset
 - (void)scrollToOffset:(CGPoint)offset animated:(BOOL)animated
 {
   if (!CGPointEqualToPoint(_scrollView.contentOffset, offset)) {
-    CGFloat maxOffsetX = _scrollView.contentSize.width - _scrollView.bounds.size.width + _scrollView.contentInset.right;
-    CGFloat maxOffsetY = _scrollView.contentSize.height - _scrollView.bounds.size.height + _scrollView.contentInset.bottom;
-    offset = CGPointMake(MAX(0, MIN(maxOffsetX, offset.x)), MAX(0, MIN(maxOffsetY, offset.y)));
     // Ensure at least one scroll event will fire
     _allowNextScrollNoMatterWhat = YES;
     [_scrollView setContentOffset:offset animated:animated];

From 7fdf9d2efb9ee9231139f7665c1edcce06709c20 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Fri, 6 Apr 2018 18:13:33 +0200
Subject: [PATCH 257/267] Fix deprecation warnings

---
 Libraries/Renderer/shims/ReactFeatureFlags.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Renderer/shims/ReactFeatureFlags.js b/Libraries/Renderer/shims/ReactFeatureFlags.js
index 44add71fc5c5e2..5a2b32e747e601 100644
--- a/Libraries/Renderer/shims/ReactFeatureFlags.js
+++ b/Libraries/Renderer/shims/ReactFeatureFlags.js
@@ -12,7 +12,7 @@
 const ReactFeatureFlags = {
   debugRenderPhaseSideEffects: false,
   debugRenderPhaseSideEffectsForStrictMode: false,
-  warnAboutDeprecatedLifecycles: true,
+  warnAboutDeprecatedLifecycles: false,
 };
 
 module.exports = ReactFeatureFlags;

From a716e324a325259eb35b4f27f2ae316a4e46c9c8 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Fri, 6 Apr 2018 18:16:55 +0200
Subject: [PATCH 258/267] Revert temporarily to old launching logic

---
 local-cli/runIOS/runIOS.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/local-cli/runIOS/runIOS.js b/local-cli/runIOS/runIOS.js
index 569920653244bf..e52396b4b1a792 100644
--- a/local-cli/runIOS/runIOS.js
+++ b/local-cli/runIOS/runIOS.js
@@ -115,15 +115,12 @@ function runOnSimulator(xcodeProject, args, scheme) {
 
     if (!selectedSimulator.booted) {
       const simulatorFullName = formattedDeviceName(selectedSimulator);
-      console.log(`Booting ${simulatorFullName}...`);
+      console.log(`Launching ${simulatorFullName}...`);
       try {
-        child_process.execFileSync('xcrun', ['simctl', 'boot', selectedSimulator.udid]);
+        child_process.spawnSync('xcrun', ['instruments', '-w', selectedSimulator.udid]);
       } catch (e) {
-        throw new Error(
-`Could not boot ${args.simulator} simulator. Is there already a simulator running?
-Running multiple simulators is only supported from Xcode 9 and up.
-Try closing the simulator or run the command again without specifying a simulator.`
-        );
+        // instruments always fail with 255 because it expects more arguments,
+        // but we want it to only launch the simulator
       }
     }
 

From a05f85172e8f7dae98c979096f24a55ad94b7356 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Fri, 6 Apr 2018 18:20:54 +0200
Subject: [PATCH 259/267] [0.55.2] Bump version numbers

---
 Libraries/Core/ReactNativeVersion.js                            | 2 +-
 React/Base/RCTVersion.m                                         | 2 +-
 ReactAndroid/gradle.properties                                  | 2 +-
 .../facebook/react/modules/systeminfo/ReactNativeVersion.java   | 2 +-
 package.json                                                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index 4c9016abdea0fb..db8f480db6ea2b 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -13,6 +13,6 @@
 exports.version = {
   major: 0,
   minor: 55,
-  patch: 1,
+  patch: 2,
   prerelease: null,
 };
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
index 5474e99cf51a24..fe6d42dda97fe1 100644
--- a/React/Base/RCTVersion.m
+++ b/React/Base/RCTVersion.m
@@ -22,7 +22,7 @@ static void __makeVersion()
   __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(55),
-                  RCTVersionPatch: @(1),
+                  RCTVersionPatch: @(2),
                   RCTVersionPrerelease: [NSNull null],
                   };
 }
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 7369d1ebba619c..1d617de34ff67d 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=0.55.1
+VERSION_NAME=0.55.2
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
index 635a78a9118cb9..43d833a0c38e9e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 55,
-      "patch", 1,
+      "patch", 2,
       "prerelease", null);
 }
diff --git a/package.json b/package.json
index ae279de02e6626..a3161fb3a575d3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.55.1",
+  "version": "0.55.2",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {

From 4fc2886e1f6e3dae0fda551d8f147c59bdb25971 Mon Sep 17 00:00:00 2001
From: Gustav Ahlberg <gustav.ahlberg@gmail.com>
Date: Wed, 4 Apr 2018 13:20:35 -0700
Subject: [PATCH 260/267] exclude React/Fabric/ from core

Summary:
Thank you for sending the PR! We appreciate you spending the time to work on these changes.
Help us understand your motivation by explaining why you decided to make this change.

<!--
  Required: Write your motivation here.
  If this PR fixes an issue, type "Fixes #issueNumber" to automatically close the issue when the PR is merged.
-->

React native does not build on iOS when using Podspec environment. I tried the solution proposed in https://github.com/facebook/react-native/issues/18683 and got it to build.

Fixes https://github.com/facebook/react-native/issues/18683

<!--
  Required: Write your test plan here. If you changed any code, please provide us with
  clear instructions on how you verified your changes work. Bonus points for screenshots and videos!
-->

<!--
  Does this PR require a documentation change?
  Create a PR at https://github.com/facebook/react-native-website and add a link to it here.
-->

<!--
  Required.
  Help reviewers and the release process by writing your own release notes. See below for an example.
-->

[IOS] [BUGFIX] [React.podspec] - Exclude `React/Fabric/*` from Core subspec
<!--
  **INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

    CATEGORY
  [----------]      TYPE
  [ CLI      ] [-------------]    LOCATION
  [ DOCS     ] [ BREAKING    ] [-------------]
  [ GENERAL  ] [ BUGFIX      ] [ {Component} ]
  [ INTERNAL ] [ ENHANCEMENT ] [ {Filename}  ]
  [ IOS      ] [ FEATURE     ] [ {Directory} ]   |-----------|
  [ ANDROID  ] [ MINOR       ] [ {Framework} ] - | {Message} |
  [----------] [-------------] [-------------]   |-----------|

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
Closes https://github.com/facebook/react-native/pull/18688

Differential Revision: D7505267

Pulled By: hramos

fbshipit-source-id: 8e7138ee966d08209a74193e418feaecceefb86a
---
 React.podspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/React.podspec b/React.podspec
index 9d222499f38414..a9a4de5a523e3d 100644
--- a/React.podspec
+++ b/React.podspec
@@ -51,6 +51,7 @@ Pod::Spec.new do |s|
                               "React/Inspector/*",
                               "ReactCommon/yoga/*",
                               "React/Cxx*/*",
+                              "React/Fabric/*",
     ss.ios.exclude_files    = "React/**/RCTTV*.*"
     ss.tvos.exclude_files   = "React/Modules/RCTClipboard*",
                               "React/Views/RCTDatePicker*",

From 31a1b72d73f90d9f5c78e1a194f7ee80a53e9bb0 Mon Sep 17 00:00:00 2001
From: Eric Rozell <erozell@outlook.com>
Date: Sun, 8 Apr 2018 18:06:21 -0700
Subject: [PATCH 261/267] Revert "Remove Platform check from WebSocket module"

Summary:
This reverts commit b9be28915cf323eb36f1d7c77821cdf994954074.

Thank you for sending the PR! We appreciate you spending the time to work on these changes.
Help us understand your motivation by explaining why you decided to make this change.

<!--
  Required: Write your motivation here.
  If this PR fixes an issue, type "Fixes #issueNumber" to automatically close the issue when the PR is merged.
-->

Fix #18696

<!--
  Required: Write your test plan here. If you changed any code, please provide us with
  clear instructions on how you verified your changes work. Bonus points for screenshots and videos!
-->

Run Jest tests.
Run WebSocket example from RNTester on Android.

<!--
  Does this PR require a documentation change?
  Create a PR at https://github.com/facebook/react-native-website and add a link to it here.
-->

<!--
  Required.
  Help reviewers and the release process by writing your own release notes. See below for an example.
-->

[CATEGORY] [TYPE] [LOCATION] - Message

<!--
  **INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.**

    CATEGORY
  [----------]      TYPE
  [ CLI      ] [-------------]    LOCATION
  [ DOCS     ] [ BREAKING    ] [-------------]
  [ GENERAL  ] [ BUGFIX      ] [ {Component} ]
  [ INTERNAL ] [ ENHANCEMENT ] [ {Filename}  ]
  [ IOS      ] [ FEATURE     ] [ {Directory} ]   |-----------|
  [ ANDROID  ] [ MINOR       ] [ {Framework} ] - | {Message} |
  [----------] [-------------] [-------------]   |-----------|

 EXAMPLES:

 [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things
 [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput
 [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with
 [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word
 [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position
 [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see
-->
[ANDROID][BUGFIX][WebSocketModule] - revert change that regresses WebSocketModule
Closes https://github.com/facebook/react-native/pull/18733

Differential Revision: D7548850

Pulled By: hramos

fbshipit-source-id: b8c79810c1cd6e5a30ec4118bd5ff8ad719f04b9
---
 Libraries/WebSocket/WebSocket.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Libraries/WebSocket/WebSocket.js b/Libraries/WebSocket/WebSocket.js
index daa1ed77ca050d..13e614557d78b4 100644
--- a/Libraries/WebSocket/WebSocket.js
+++ b/Libraries/WebSocket/WebSocket.js
@@ -14,6 +14,7 @@ const EventTarget = require('event-target-shim');
 const NativeEventEmitter = require('NativeEventEmitter');
 const BlobManager = require('BlobManager');
 const NativeModules = require('NativeModules');
+const Platform = require('Platform');
 const WebSocketEvent = require('WebSocketEvent');
 
 /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
@@ -202,7 +203,7 @@ class WebSocket extends EventTarget(...WEBSOCKET_EVENTS) {
   }
 
   _close(code?: number, reason?: string): void {
-    if (WebSocketModule.close.length === 3) {
+    if (Platform.OS === 'android') {
       // See https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
       const statusCode = typeof code === 'number' ? code : CLOSE_NORMAL;
       const closeReason = typeof reason === 'string' ? reason : '';

From 2845a8661cf1a3cbb8e6148b181a96f6a55b149d Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Tue, 17 Apr 2018 13:43:40 -0700
Subject: [PATCH 262/267] [0.55.3] Bump version numbers

---
 Libraries/Core/ReactNativeVersion.js                            | 2 +-
 React/Base/RCTVersion.m                                         | 2 +-
 ReactAndroid/gradle.properties                                  | 2 +-
 .../facebook/react/modules/systeminfo/ReactNativeVersion.java   | 2 +-
 package.json                                                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index db8f480db6ea2b..3d65d9cd909b5f 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -13,6 +13,6 @@
 exports.version = {
   major: 0,
   minor: 55,
-  patch: 2,
+  patch: 3,
   prerelease: null,
 };
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
index fe6d42dda97fe1..fc8a1a5608450e 100644
--- a/React/Base/RCTVersion.m
+++ b/React/Base/RCTVersion.m
@@ -22,7 +22,7 @@ static void __makeVersion()
   __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(55),
-                  RCTVersionPatch: @(2),
+                  RCTVersionPatch: @(3),
                   RCTVersionPrerelease: [NSNull null],
                   };
 }
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 1d617de34ff67d..006d181aab06c0 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=0.55.2
+VERSION_NAME=0.55.3
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
index 43d833a0c38e9e..be202583e09712 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 55,
-      "patch", 2,
+      "patch", 3,
       "prerelease", null);
 }
diff --git a/package.json b/package.json
index a3161fb3a575d3..429e6586301b3f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.55.2",
+  "version": "0.55.3",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {

From e187b076904de5d283c80145f228fee0d3aa0ea5 Mon Sep 17 00:00:00 2001
From: Mehdi Mulani <mehdi@fb.com>
Date: Mon, 19 Mar 2018 10:51:01 -0700
Subject: [PATCH 263/267] Properly tear down the reachabilityRef in RCTNetInfo

Summary: The pull request that added this (#17397) simply forgot to remove the callback, which would cause crashes if the RCTNetInfo module was ever deallocated. While that usually doesn't happen in apps, it can if the user logs out and you need to wipe all the RCT modules (to remove user data, for instance).

Reviewed By: PeteTheHeat

Differential Revision: D7322999

fbshipit-source-id: e49ec7311b39920f7b7743a5854c0dda1dbccc73
---
 Libraries/Network/RCTNetInfo.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Libraries/Network/RCTNetInfo.m b/Libraries/Network/RCTNetInfo.m
index afc3d1db33334c..9b51a5c1ab4ff6 100644
--- a/Libraries/Network/RCTNetInfo.m
+++ b/Libraries/Network/RCTNetInfo.m
@@ -164,6 +164,7 @@ - (BOOL)setReachabilityStatus:(SCNetworkReachabilityFlags)flags
                   reject:(__unused RCTPromiseRejectBlock)reject)
 {
   SCNetworkReachabilityRef reachability = [self getReachabilityRef];
+  SCNetworkReachabilityUnscheduleFromRunLoop(reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
   CFRelease(reachability);
   resolve(@{@"connectionType": _connectionType ?: RCTConnectionTypeUnknown,
             @"effectiveConnectionType": _effectiveConnectionType ?: RCTEffectiveConnectionTypeUnknown,

From f8091fac04728fb69a1fe452c3ff4cef6db6b17e Mon Sep 17 00:00:00 2001
From: Gabriele Mondada <gmondada@recolive.com>
Date: Sun, 8 Apr 2018 22:57:49 -0700
Subject: [PATCH 264/267] fix use of C++ syntax in an header file

Summary:
All public header files can be included from Obj-C and Swift, except RCTSurfaceSizeMeasureMode.h which contains C++ code.

Change is trivial and can be validated by review.

None.

[IOS][BUGFIX][{RCTSurfaceSizeMeasureMode.h}] - fix use of C++ syntax in an header file that could be included from Obj-C and Swift
Closes https://github.com/facebook/react-native/pull/18730

Differential Revision: D7550290

Pulled By: shergin

fbshipit-source-id: 3835e2c57697a067ff94afdaeaca06bce132ef66
---
 .../RCTSurfaceHostingView.mm                  |  8 ++++----
 .../RCTSurfaceSizeMeasureMode.h               |  4 ++--
 .../RCTSurfaceSizeMeasureMode.mm              | 20 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
index 3c3ab2bf7fa8a5..25b0f73337d353 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
@@ -73,8 +73,8 @@ - (void)setFrame:(CGRect)frame
   RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
     self.bounds.size,
     _sizeMeasureMode,
-    minimumSize,
-    maximumSize
+    &minimumSize,
+    &maximumSize
   );
 
   [_surface setMinimumSize:minimumSize
@@ -110,8 +110,8 @@ - (CGSize)sizeThatFits:(CGSize)size
   RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
     size,
     _sizeMeasureMode,
-    minimumSize,
-    maximumSize
+    &minimumSize,
+    &maximumSize
   );
 
   return [_surface sizeThatFitsMinimumSize:minimumSize
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h
index d463d36d091aff..ead7429b557419 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h
@@ -28,6 +28,6 @@ typedef NS_OPTIONS(NSInteger, RCTSurfaceSizeMeasureMode) {
 RCT_EXTERN void RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
   CGSize size,
   RCTSurfaceSizeMeasureMode sizeMeasureMode,
-  CGSize &minimumSize,
-  CGSize &maximumSize
+  CGSize *minimumSize,
+  CGSize *maximumSize
 );
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm
index 5d1689b1b369a9..946b027d8c0ac1 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm
@@ -12,25 +12,25 @@
 void RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
   CGSize size,
   RCTSurfaceSizeMeasureMode sizeMeasureMode,
-  CGSize &minimumSize,
-  CGSize &maximumSize
+  CGSize *minimumSize,
+  CGSize *maximumSize
 ) {
-  minimumSize = CGSizeZero;
-  maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
+  *minimumSize = CGSizeZero;
+  *maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
 
   if (sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthExact) {
-    minimumSize.width = size.width;
-    maximumSize.width = size.width;
+    minimumSize->width = size.width;
+    maximumSize->width = size.width;
   }
   else if (sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthAtMost) {
-    maximumSize.width = size.width;
+    maximumSize->width = size.width;
   }
 
   if (sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightExact) {
-    minimumSize.height = size.height;
-    maximumSize.height = size.height;
+    minimumSize->height = size.height;
+    maximumSize->height = size.height;
   }
   else if (sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightAtMost) {
-    maximumSize.height = size.height;
+    maximumSize->height = size.height;
   }
 }

From 5bb2e83f65dfe8b6d016ab03a2e8f08221876cf2 Mon Sep 17 00:00:00 2001
From: shockdesign <rajesh@shockdesign.com.au>
Date: Tue, 17 Apr 2018 13:21:09 -0700
Subject: [PATCH 265/267] Switch equality check in BlobModule.java

Summary:
Switch the equality check to avoid crash on the first item. The check can be on a null object and return the correct result.

Fixes #18709

Just a simple switch on equals, to make sure we're not bombing out by having a null scheme.

No related PRs and does not require a document change.

[ANDROID][BUGFIX][BlobModule] Switch equality check in BlobModule.java
Closes https://github.com/facebook/react-native/pull/18893

Differential Revision: D7658036

Pulled By: hramos

fbshipit-source-id: db61b98dae178dbbb645070f7b0d73ab43d30541
---
 .../main/java/com/facebook/react/modules/blob/BlobModule.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
index 0c2adc91d43fb7..ee62d2cd278466 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
@@ -79,7 +79,7 @@ public void onMessage(ByteString bytes, WritableMap params) {
       @Override
       public boolean supports(Uri uri, String responseType) {
         String scheme = uri.getScheme();
-        boolean isRemote = scheme.equals("http") || scheme.equals("https");
+        boolean isRemote = "http".equals(scheme) || "https".equals(scheme);
 
         return (!isRemote && responseType.equals("blob"));
       }

From 370bcffba748e895ad8afa825bfef40bff859c95 Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Fri, 27 Apr 2018 18:34:36 +0200
Subject: [PATCH 266/267] [0.55.4] Bump version numbers

---
 Libraries/Core/ReactNativeVersion.js                            | 2 +-
 React/Base/RCTVersion.m                                         | 2 +-
 ReactAndroid/gradle.properties                                  | 2 +-
 .../facebook/react/modules/systeminfo/ReactNativeVersion.java   | 2 +-
 package.json                                                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js
index 3d65d9cd909b5f..bc67d865d8eceb 100644
--- a/Libraries/Core/ReactNativeVersion.js
+++ b/Libraries/Core/ReactNativeVersion.js
@@ -13,6 +13,6 @@
 exports.version = {
   major: 0,
   minor: 55,
-  patch: 3,
+  patch: 4,
   prerelease: null,
 };
diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m
index fc8a1a5608450e..aeb997451f2e42 100644
--- a/React/Base/RCTVersion.m
+++ b/React/Base/RCTVersion.m
@@ -22,7 +22,7 @@ static void __makeVersion()
   __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(55),
-                  RCTVersionPatch: @(3),
+                  RCTVersionPatch: @(4),
                   RCTVersionPrerelease: [NSNull null],
                   };
 }
diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 006d181aab06c0..aff1e36757f5c2 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=0.55.3
+VERSION_NAME=0.55.4
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
index be202583e09712..57ee1c8cc62ec2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 55,
-      "patch", 3,
+      "patch", 4,
       "prerelease", null);
 }
diff --git a/package.json b/package.json
index 429e6586301b3f..bd1562054a5852 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.55.3",
+  "version": "0.55.4",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {

From f5bd491b0614a7630a1bb06512233ba16be04426 Mon Sep 17 00:00:00 2001
From: Shopped <patrickgesarcarroll@gmail.com>
Date: Fri, 13 Jul 2018 11:47:38 -0700
Subject: [PATCH 267/267] Buildfix for new filename type

---
 react.gradle | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/react.gradle b/react.gradle
index 64b2f02f8cbf26..c08bdaa3e3f040 100644
--- a/react.gradle
+++ b/react.gradle
@@ -70,6 +70,22 @@ gradle.projectsEvaluated {
                     resourcesDir.mkdirs()
                 }
 
+                doLast {
+                    def moveFunc = { resSuffix ->
+                        File originalDir = file("${resourcesDir}/drawable-${resSuffix}")
+                        if (originalDir.exists()) {
+                            File destDir = file("${resourcesDir}/drawable-${resSuffix}-v4")
+                            ant.move(file: originalDir, tofile: destDir)
+                        }
+                    }
+                    moveFunc.curry("ldpi").call()
+                    moveFunc.curry("mdpi").call()
+                    moveFunc.curry("hdpi").call()
+                    moveFunc.curry("xhdpi").call()
+                    moveFunc.curry("xxhdpi").call()
+                    moveFunc.curry("xxxhdpi").call()
+                }
+
                 // Set up inputs and outputs so gradle can cache the result
                 inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
                 outputs.dir jsBundleDir
@@ -115,3 +131,4 @@ gradle.projectsEvaluated {
         }
     }
 }
+