Migrate to Relay Modern

.babelrc

@@ -1,4 +1,4 @@
 {
-  "plugins": ["./data/schema"],
+  "plugins": ["relay"],
   "presets": ["react-native"]
 }

.gitignore

@@ -3,6 +3,8 @@
 ## Build generated
 build/
 DerivedData
+__generated__
+dist
 
 ## Various settings
 *.pbxuser

.gqlconfig

@@ -0,0 +1,20 @@
+{
+  "schema": {
+    "files": "data/schema.graphql"
+  },
+  "query": {
+    "files": [
+      {
+        "match": "src/**/*.ts*",
+        "parser": ["EmbeddedQueryParser", { "startTag": "graphql(\\.experimental)?`", "endTag": "`" }],
+        "isRelay": true,
+        "validate": {
+          "extends": "gql-rules-query-relay",
+          "rules": {
+            "KnownDirectives": "off"
+          }
+        }
+      }
+    ]
+  }
+}

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ###### Dev
 
+-   Upgrades React Native to v0.48.0 - sarah
 -   Extracts connectivity banner into its own component - sarah
 -   Adds stylelint to the dev-experience, not validated on CI yet - orta
 -   Updates Storybooks to 3.2 - orta

Example/Podfile.lock

@@ -15,16 +15,16 @@ PODS:
     - Artsy+UIColors
     - Artsy+UIFonts (>= 3.0.0)
     - Extraction (>= 1.2.1)
-    - React/BatchedBridge (= 0.45.0-rc.2)
-    - React/Core (= 0.45.0-rc.2)
-    - React/RCTAnimation (= 0.45.0-rc.2)
-    - React/RCTCameraRoll (= 0.45.0-rc.2)
-    - React/RCTImage (= 0.45.0-rc.2)
-    - React/RCTNetwork (= 0.45.0-rc.2)
-    - React/RCTText (= 0.45.0-rc.2)
+    - React/BatchedBridge (= 0.48.0)
+    - React/Core (= 0.48.0)
+    - React/RCTAnimation (= 0.48.0)
+    - React/RCTCameraRoll (= 0.48.0)
+    - React/RCTImage (= 0.48.0)
+    - React/RCTNetwork (= 0.48.0)
+    - React/RCTText (= 0.48.0)
     - SDWebImage (< 4, >= 3.7.2)
     - SentryReactNative (= 0.14.5)
-    - Yoga (= 0.45.0-rc.2.React)
+    - Yoga (= 0.48.0.React)
   - Extraction (1.2.3):
     - Extraction/ARAnimationContinuation (= 1.2.3)
     - Extraction/ARLoadFailureView (= 1.2.3)
@@ -63,33 +63,36 @@ PODS:
   - NSURL+QueryDictionary (1.2.0)
   - ORStackView (2.0.3):
     - FLKAutoLayout
-  - React (0.45.0-rc.2):
-    - React/Core (= 0.45.0-rc.2)
-  - React/BatchedBridge (0.45.0-rc.2):
+  - React (0.48.0):
+    - React/Core (= 0.48.0)
+  - React/BatchedBridge (0.48.0):
     - React/Core
     - React/cxxreact_legacy
-  - React/Core (0.45.0-rc.2):
-    - Yoga (= 0.45.0-rc.2.React)
-  - React/cxxreact_legacy (0.45.0-rc.2):
+  - React/Core (0.48.0):
+    - Yoga (= 0.48.0.React)
+  - React/cxxreact_legacy (0.48.0):
     - React/jschelpers_legacy
-  - React/DevSupport (0.45.0-rc.2):
+  - React/DevSupport (0.48.0):
     - React/Core
     - React/RCTWebSocket
-  - React/jschelpers_legacy (0.45.0-rc.2)
-  - React/RCTAnimation (0.45.0-rc.2):
+  - React/jschelpers_legacy (0.48.0)
+  - React/RCTAnimation (0.48.0):
     - React/Core
-  - React/RCTCameraRoll (0.45.0-rc.2):
+  - React/RCTBlob (0.48.0):
+    - React/Core
+  - React/RCTCameraRoll (0.48.0):
     - React/Core
     - React/RCTImage
-  - React/RCTImage (0.45.0-rc.2):
+  - React/RCTImage (0.48.0):
     - React/Core
     - React/RCTNetwork
-  - React/RCTNetwork (0.45.0-rc.2):
+  - React/RCTNetwork (0.48.0):
     - React/Core
-  - React/RCTText (0.45.0-rc.2):
+  - React/RCTText (0.48.0):
     - React/Core
-  - React/RCTWebSocket (0.45.0-rc.2):
+  - React/RCTWebSocket (0.48.0):
     - React/Core
+    - React/RCTBlob
   - SAMKeychain (1.5.0)
   - SDWebImage (3.7.5):
     - SDWebImage/Core (= 3.7.5)
@@ -104,7 +107,7 @@ PODS:
     - Sentry (~> 3.1.2)
     - Sentry/KSCrash (~> 3.1.2)
   - UIView+BooleanAnimations (1.0.2)
-  - Yoga (0.45.0-rc.2.React)
+  - Yoga (0.48.0.React)
 
 DEPENDENCIES:
   - AppHub (from `https://github.com/orta/apphub.git`, branch `build_list`)
@@ -151,20 +154,20 @@ SPEC CHECKSUMS:
   Artsy+UIColors: 31c03c4146f5e6618a9b950f37dfe02dd9ac09a6
   Artsy+UIFonts: e66afb5c40100e2fc5bba28feb7487e252f2d06f
   Artsy-UIButtons: cdcc3ccf4d0d31ee80f45c1d11ffd2d772695b74
-  Emission: 6fc77205363e5070b0d4a99bf38a0763ea87b543
+  Emission: 7cd023eeebd140217dc39f30b311a402af4ac4bc
   Extraction: 612cf0866f74d4c0dd616677ff24146efa200958
   FLKAutoLayout: 106b14dbae09d32c6730190f4e78a959759ba4a4
   ISO8601DateFormatter: 4551b6ce4f83185425f583b0b3feb3c7b59b942c
   KSCrash: 7bd106ca4a2247774deeeb587c740ce0207de8f3
   NSURL+QueryDictionary: bae616404e2adf6409d3d5c02a093cbf44c8a236
   ORStackView: b9507271cb41fb9e0b3eecc6414d831201e7cf7c
-  React: c30b44eb8e84d2071fb78cd1ed58e1512a822a57
+  React: 830e32675a1cef76f854240fbda322282b150f98
   SAMKeychain: 1fc9ae02f576365395758b12888c84704eebc423
   SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461
   Sentry: 5a578891f177e994d89d57effc70adb97bfb29db
   SentryReactNative: 8f251df76f03c5ee42e702f37a41803709632217
   UIView+BooleanAnimations: a760be9a066036e55f298b7b7350a6cb14cfcd97
-  Yoga: d43165f478a090e7b603edc5796965a1de27d473
+  Yoga: 056a82a5b4abd6b145f3d341176406e7174afff6
 
 PODFILE CHECKSUM: 0c385e9313daa3b7b7130176793f59f9c6ee2778
 

Pod/Classes/Core/RCTScrollView+EnclosingScrollView.m

@@ -21,98 +21,107 @@
 @interface RCTScrollEvent : NSObject <RCTEvent>
 - (instancetype)initWithEventName:(NSString *)eventName
                          reactTag:(NSNumber *)reactTag
-                       scrollView:(UIScrollView *)scrollView
+          scrollViewContentOffset:(CGPoint)scrollViewContentOffset
+           scrollViewContentInset:(UIEdgeInsets)scrollViewContentInset
+            scrollViewContentSize:(CGSize)scrollViewContentSize
+                  scrollViewFrame:(CGRect)scrollViewFrame
+              scrollViewZoomScale:(CGFloat)scrollViewZoomScale
                          userData:(NSDictionary *)userData
                     coalescingKey:(uint16_t)coalescingKey NS_DESIGNATED_INITIALIZER;
 @end
 
 
 @interface RCTDescendantScrollEvent : RCTScrollEvent
+@property (nonatomic, strong, readonly) NSDictionary *body;
 @end
 
 @implementation RCTDescendantScrollEvent
-{
-  NSDictionary *__userData;
-  UIScrollView *__scrollView;
-  UIScrollView *_enclosingScrollView;
-}
+
+@synthesize body = _body;
 
 - (instancetype)initWithEventName:(NSString *)eventName
                          reactTag:(NSNumber *)reactTag
-                       scrollView:(UIScrollView *)scrollView
-              enclosingScrollView:(UIScrollView *)enclosingScrollView
+          scrollViewContentOffset:(CGPoint)scrollViewContentOffset
+           scrollViewContentInset:(UIEdgeInsets)scrollViewContentInset
+            scrollViewContentSize:(CGSize)scrollViewContentSize
+              scrollViewZoomScale:(CGFloat)scrollViewZoomScale
+         enclosingScrollViewFrame:(CGRect)enclosingScrollViewFrame
                          userData:(NSDictionary *)userData
                     coalescingKey:(uint16_t)coalescingKey
 {
-    if ((self = [super initWithEventName:eventName
-                                reactTag:reactTag
-                              scrollView:scrollView
-                                userData:userData
-                           coalescingKey:coalescingKey])) {
-    __userData = userData;
-    __scrollView = scrollView;
-    _enclosingScrollView = enclosingScrollView;
+  // Use the enclosing scrollview’s dimensions for `scrollViewFrame``, because it is likely that the receiver wants to
+  // do calculations based on the location of the content in the enclosing scrollview.
+  if ((self = [super initWithEventName:(NSString *)eventName
+                              reactTag:(NSNumber *)reactTag
+               scrollViewContentOffset:(CGPoint)scrollViewContentOffset
+                scrollViewContentInset:(UIEdgeInsets)scrollViewContentInset
+                 scrollViewContentSize:(CGSize)scrollViewContentSize
+                       scrollViewFrame:(CGRect)enclosingScrollViewFrame
+                   scrollViewZoomScale:(CGFloat)scrollViewZoomScale
+                              userData:(NSDictionary *)userData
+                         coalescingKey:(uint16_t)coalescingKey])) {
+    // Theoretically it’s probably better to calculate this once `body` is actually used (which is what the superclass
+    // does) but that probably works in conjunction with coalescing, something we don’t do atm anyways.
+    NSDictionary *body = @{
+      @"contentOffset": @{
+        @"x": @(scrollViewContentOffset.x),
+        @"y": @(scrollViewContentOffset.y)
+      },
+      @"contentInset": @{
+        @"top": @(scrollViewContentInset.top),
+        @"left": @(scrollViewContentInset.left),
+        @"bottom": @(scrollViewContentInset.bottom),
+        @"right": @(scrollViewContentInset.right)
+      },
+      @"contentSize": @{
+        @"width": @(scrollViewContentSize.width),
+        @"height": @(scrollViewContentSize.height)
+      },
+      @"layoutMeasurement": @{
+        @"width": @(enclosingScrollViewFrame.size.width),
+        @"height": @(enclosingScrollViewFrame.size.height)
+      },
+      @"zoomScale": @(scrollViewZoomScale ?: 1),
+    };
+
+    if (userData) {
+      NSMutableDictionary *mutableBody = [body mutableCopy];
+      [mutableBody addEntriesFromDictionary:userData];
+      body = [mutableBody copy];
+    }
+
+    _body = body;
   }
   return self;
 }
 
-- (NSDictionary *)body
-{
-  CGPoint originOffset = [__scrollView convertPoint:CGPointZero toView:_enclosingScrollView];
-
-  CGPoint contentOffset = _enclosingScrollView.contentOffset;
-  // TODO: contentOffset.x -= originOffset.x;
-  contentOffset.x = __scrollView.contentOffset.x;
-  contentOffset.y -= originOffset.y;
-
-  NSDictionary *body = @{
-                         @"contentOffset": @{
-                             @"x": @(contentOffset.x),
-                             @"y": @(contentOffset.y)
-                             },
-                         @"contentInset": @{
-                             @"top": @(__scrollView.contentInset.top),
-                             @"left": @(__scrollView.contentInset.left),
-                             @"bottom": @(__scrollView.contentInset.bottom),
-                             @"right": @(__scrollView.contentInset.right)
-                             },
-                         @"contentSize": @{
-                             @"width": @(__scrollView.contentSize.width),
-                             @"height": @(__scrollView.contentSize.height)
-                             },
-                         // Use the enclosing scrollview’s dimensions here, because it is likely that the receiver
-                         // wants to do calculations based on the location of the content in the enclosing scrollview.
-                         @"layoutMeasurement": @{
-                             @"width": @(_enclosingScrollView.frame.size.width),
-                             @"height": @(_enclosingScrollView.frame.size.height)
-                             },
-                         @"zoomScale": @(__scrollView.zoomScale ?: 1),
-                         };
-
-  if (__userData) {
-    NSMutableDictionary *mutableBody = [body mutableCopy];
-    [mutableBody addEntriesFromDictionary:__userData];
-    body = mutableBody;
-  }
-
-  return body;
-}
-
 @end
 
 
 @implementation RCTScrollEvent (RCTEnclosingScrollView)
 
-- (RCTDescendantScrollEvent *)scrollEventRelativeToDescendant:(UIScrollView *)descendantScrollView
-                                                     reactTag:(NSNumber *)reactTag
-                                                coalescingKey:(uint16_t)coalescingKey
+- (RCTDescendantScrollEvent *)scrollEventForScrollView:(UIScrollView *)scrollView
+                       relativeFromEnclosingScrollView:(UIScrollView *)enclosingScrollView
+                                              reactTag:(NSNumber *)reactTag
+                                         coalescingKey:(uint16_t)coalescingKey
 {
+  // TODO: Is this not simply scrollView.frame.origin ?
+  CGPoint originOffset = [scrollView convertPoint:CGPointZero toView:enclosingScrollView];
+  CGPoint contentOffset = enclosingScrollView.contentOffset;
+  // TODO: contentOffset.x -= originOffset.x;
+  contentOffset.x = scrollView.contentOffset.x;
+  contentOffset.y -= originOffset.y;
+
   return [[RCTDescendantScrollEvent alloc] initWithEventName:self.eventName
                                                     reactTag:reactTag
-                                                  scrollView:descendantScrollView
-                                         enclosingScrollView:[self valueForKey:@"_scrollView"]
+                                     scrollViewContentOffset:contentOffset
+                                      scrollViewContentInset:scrollView.contentInset
+                                       scrollViewContentSize:scrollView.contentSize
+                                         scrollViewZoomScale:scrollView.zoomScale
+                                    enclosingScrollViewFrame:enclosingScrollView.frame
                                                     userData:[self valueForKey:@"_userData"]
                                                coalescingKey:coalescingKey];
+
 }
 
 @end
@@ -136,10 +145,10 @@ - (void)sendScrollEventWithName:(NSString *)eventName
 //                                                                   userData:userData
 //                                                              coalescingKey:_coalescingKey];
 //    [_eventDispatcher sendEvent:scrollEvent];
-    
-    
+
+
   uint16_t coalescingKey = [[self valueForKey:@"_coalescingKey"] unsignedIntegerValue];
-  
+
   if (![eventName isEqualToString:[self valueForKey:@"_lastEmittedEventName"]]) {
     coalescingKey++;
     [self setValue:@(coalescingKey) forKey:@"_coalescingKey"];
@@ -148,7 +157,11 @@ - (void)sendScrollEventWithName:(NSString *)eventName
 
   RCTScrollEvent *scrollEvent = [[RCTScrollEvent alloc] initWithEventName:eventName
                                                                  reactTag:self.reactTag
-                                                               scrollView:scrollView
+                                                  scrollViewContentOffset:self.scrollView.contentOffset
+                                                   scrollViewContentInset:self.contentInset
+                                                    scrollViewContentSize:self.contentSize
+                                                          scrollViewFrame:self.frame
+                                                      scrollViewZoomScale:self.scrollView.zoomScale
                                                                  userData:userData
                                                             coalescingKey:coalescingKey];
   [[self valueForKey:@"_eventDispatcher"] sendEvent:scrollEvent];
@@ -164,33 +177,34 @@ - (void)_enclosingRCTScrollViewEvent:(NSNotification *)notification;
   //       I was not able to find a great place in RN where the ancestor view hierarchy
   //       is guaranteed to exist.
   //
-  RCTScrollView *scrollView = notification.object;
+  RCTScrollView *enclosingScrollView = notification.object;
   // Only handle events of scrollviews that actually enclose this scrollview.
-  if (scrollView == self || ![self isDescendantOfView:scrollView]) {
+  if (enclosingScrollView == self || ![self isDescendantOfView:enclosingScrollView]) {
     return;
   }
 
   // TODO: This is even more of a hack than all the rest of the change!!!
   //       The enclosing scroll view *must* have a throttle amount set or
   //       it won’t send more scroll move events.
   //
-  if (scrollView.scrollEventThrottle == 0) {
-    scrollView.scrollEventThrottle = self.scrollEventThrottle;
+  if (enclosingScrollView.scrollEventThrottle == 0) {
+    enclosingScrollView.scrollEventThrottle = self.scrollEventThrottle;
   }
-  
+
   RCTScrollEvent *scrollEvent = notification.userInfo[@"event"];
-  
+
   uint16_t coalescingKey = [[self valueForKey:@"_coalescingKey"] unsignedIntegerValue];
-    
+
   if (![scrollEvent.eventName isEqualToString:[self valueForKey:@"_lastEmittedEventName"]]) {
     coalescingKey++;
     [self setValue:@(coalescingKey) forKey:@"_coalescingKey"];
     [self setValue:scrollEvent.eventName forKey:@"_lastEmittedEventName"];
   }
 
-  scrollEvent = [scrollEvent scrollEventRelativeToDescendant:self.scrollView
-                                                    reactTag:self.reactTag
-                                               coalescingKey:coalescingKey];
+  scrollEvent = [scrollEvent scrollEventForScrollView:self.scrollView
+                      relativeFromEnclosingScrollView:enclosingScrollView.scrollView
+                                             reactTag:self.reactTag
+                                        coalescingKey:coalescingKey];
   [[self valueForKey:@"_eventDispatcher"] sendEvent:scrollEvent];
 }