react-relay 20.1.1 → 21.0.1

package/__flowtests__/ReactRelayRefetchContainer-flowtest.js.flow

@@ -38,10 +38,10 @@ class FooComponent extends React.Component<$FlowFixMe> {
     const reqLen = this.props.requiredProp.length;
     const optionalProp = this.props.optionalProp;
 
-    /** $FlowExpectedError: `optionalProp` might be null **/
+    /** $FlowExpectedError[incompatible-use] : `optionalProp` might be null **/
     const optionalFoo = this.props.optionalProp.foo;
 
-    /** $FlowExpectedError: there is no prop `missingProp` **/
+    /** $FlowExpectedError[prop-missing] : there is no prop `missingProp` **/
     const missing = this.props.missingProp;
 
     const defLen = this.props.defaultProp.length; // always a valid string, so no error
@@ -123,7 +123,7 @@ module.exports = {
     return <Foo {...props} />;
   },
   checkStaticsAndMethodsProxying(): React.Node {
-    /* $FlowFixMe(>=0.53.0) This comment suppresses an
+    /* $FlowFixMe[missing-type-arg](>=0.53.0) This comment suppresses an
      * error when upgrading Flow's support for React. Common errors found when
      * upgrading Flow's React support are documented at
      * https://fburl.com/eq7bs81w */
@@ -132,10 +132,10 @@ module.exports = {
       getString(): string {
         const ok = this._fooRef ? this._fooRef.getNum() : 'default'; // legit
 
-        /** $FlowExpectedError: Foo does not have `missingMethod` **/
+        /** $FlowExpectedError[prop-missing] : Foo does not have `missingMethod` **/
         const bad = this._fooRef ? this._fooRef.missingMethod() : 'default';
 
-        /** $FlowExpectedError: Foo `getNum` gives number, but `getString` assumes string  **/
+        /** $FlowExpectedError[incompatible-type] : Foo `getNum` gives number, but `getString` assumes string  **/
         return bad ? 'not good' : ok;
       }
       render(): React.Node {

package/__flowtests__/RelayModern-flowtest.js.flow

@@ -54,10 +54,10 @@ class BadReferenceTest_ extends React.Component<{
   ...
 }> {
   render(): React.Node {
-    (this.props.badref.id: string);
-    // $FlowExpectedError
+    this.props.badref.id as string;
+    // $FlowExpectedError[prop-missing]
     this.props.badref.name;
-    // $FlowExpectedError The notref fragment was not used.
+    // $FlowExpectedError[incompatible-type]  The notref fragment was not used.
     return <NotReferencedTest notref={this.props.badref} />;
   }
 }
@@ -85,13 +85,13 @@ class SingularTest extends React.Component<{
   ...
 }> {
   render(): React.Node {
-    (nullthrows(this.props.user.name): string);
-    // $FlowExpectedError
+    nullthrows(this.props.user.name) as string;
+    // $FlowExpectedError[incompatible-use]
     this.props.nullableUser.name;
-    // $FlowExpectedError
+    // $FlowExpectedError[incompatible-use]
     this.props.optionalUser.name;
-    (nullthrows(nullthrows(this.props.nullableUser).name): string);
-    (nullthrows(nullthrows(this.props.optionalUser).name): string);
+    nullthrows(nullthrows(this.props.nullableUser).name) as string;
+    nullthrows(nullthrows(this.props.optionalUser).name) as string;
     return null;
   }
 }
@@ -111,10 +111,9 @@ class PluralTest extends React.Component<{
 }> {
   render(): React.Node {
     const names = this.props.users.map(user => user.name).filter(Boolean);
-    // $FlowExpectedError
-    (names: Array<string>);
-    // $FlowExpectedError
-    (names: Array<number>);
+    names as Array<string>;
+    // $FlowExpectedError[incompatible-type]
+    names as Array<number>;
     return null;
   }
 }
@@ -127,22 +126,22 @@ const PluralTestFragment = createFragmentContainer(PluralTest, {
 });
 
 declare var aUserRef: {
-  +$fragmentSpreads: RelayModernFlowtest_user$ref,
+  readonly $fragmentSpreads: RelayModernFlowtest_user$ref,
   ...
 };
 
 declare var oneOfUsersRef: {
-  +$fragmentSpreads: RelayModernFlowtest_users$ref,
+  readonly $fragmentSpreads: RelayModernFlowtest_users$ref,
   ...
 };
 
-declare var usersRef: $ReadOnlyArray<{
-  +$fragmentSpreads: RelayModernFlowtest_users$ref,
+declare var usersRef: ReadonlyArray<{
+  readonly $fragmentSpreads: RelayModernFlowtest_users$ref,
   ...
 }>;
 
 declare var nonUserRef: {
-  +$fragmentSpreads: {thing: true, ...},
+  readonly $fragmentSpreads: {thing: true, ...},
   ...
 };
 
@@ -151,21 +150,21 @@ function cb(): void {}
 <SingularTestFragment
   onClick={cb}
   string="x"
-  // $FlowExpectedError - can't pass null for user
+  // $FlowExpectedError[incompatible-type]  - can't pass null for user
   user={null}
   nullableUser={null}
 />;
-// $FlowExpectedError - user is required
+// $FlowExpectedError[incompatible-type]  - user is required
 <SingularTestFragment onClick={cb} string="x" nullableUser={null} />;
 <SingularTestFragment
   onClick={cb}
   string="x"
-  // $FlowExpectedError - can't pass non-user ref for user
+  // $FlowExpectedError[incompatible-type]  - can't pass non-user ref for user
   user={nonUserRef}
   nullableUser={null}
 />;
 <SingularTestFragment
-  // $FlowExpectedError - `cb` prop is not a function
+  // $FlowExpectedError[incompatible-type]  - `cb` prop is not a function
   onClick="cb"
   string="x"
   user={aUserRef}
@@ -173,7 +172,7 @@ function cb(): void {}
 />;
 <SingularTestFragment
   onClick={cb}
-  // $FlowExpectedError - `string` prop is not a string
+  // $FlowExpectedError[incompatible-type]  - `string` prop is not a string
   string={1}
   user={aUserRef}
   nullableUser={null}
@@ -199,17 +198,19 @@ function cb(): void {}
   optionalUser={aUserRef}
 />;
 
-// $FlowExpectedError - onClick is required
+// $FlowExpectedError[incompatible-type]  - onClick is required
 <SingularTestFragment
   string="x"
   user={aUserRef}
   nullableUser={null}
-  // $FlowExpectedError - optional, not nullable!
   optionalUser={null}
 />;
 
 declare var aComplexUserRef: {
-  +$fragmentSpreads: {thing1: true, ...} & RelayModernFlowtest_user$ref & {
+  readonly $fragmentSpreads: {
+    thing1: true,
+    ...
+  } & RelayModernFlowtest_user$ref & {
       thing2: true,
       ...
     },
@@ -223,17 +224,17 @@ declare var aComplexUserRef: {
   optionalUser={aComplexUserRef}
 />;
 
-// $FlowExpectedError - can't pass null for user
+// $FlowExpectedError[incompatible-type]  - can't pass null for user
 <PluralTestFragment users={null} nullableUsers={null} />;
-// $FlowExpectedError - users is required
+// $FlowExpectedError[incompatible-type]  - users is required
 <PluralTestFragment nullableUsers={null} />;
-// $FlowExpectedError - can't pass non-user refs for user
+// $FlowExpectedError[incompatible-type]  - can't pass non-user refs for user
 <PluralTestFragment users={[nonUserRef]} nullableUsers={null} />;
 
 <PluralTestFragment users={usersRef} nullableUsers={null} />;
 
 <PluralTestFragment
-  users={([oneOfUsersRef]: Array<typeof oneOfUsersRef>)}
+  users={[oneOfUsersRef] as Array<typeof oneOfUsersRef>}
   nullableUsers={null}
 />;
 <PluralTestFragment users={[oneOfUsersRef]} nullableUsers={null} />;
@@ -247,7 +248,6 @@ declare var aComplexUserRef: {
 <PluralTestFragment
   users={usersRef}
   nullableUsers={null}
-  // $FlowExpectedError - optional, not nullable!
   optionalUsers={null}
 />;
 
@@ -259,7 +259,7 @@ const AnyTestContainer = createFragmentContainer(AnyTest, {});
 <AnyTestContainer anything={42} />;
 <AnyTestContainer anything={null} />;
 <AnyTestContainer anything={() => {}} />;
-// $FlowExpectedError - any other prop can not be passed
+// $FlowExpectedError[incompatible-type]  - any other prop can not be passed
 <AnyTestContainer anything={null} anythingElse={42} />;
-// $FlowExpectedError - anything has to be passed
+// $FlowExpectedError[incompatible-type]  - anything has to be passed
 <AnyTestContainer />;

package/__flowtests__/RelayModernFlowtest_users.graphql.js.flow

@@ -14,7 +14,7 @@
 import type {FragmentType} from 'relay-runtime';
 
 declare export opaque type RelayModernFlowtest_users$ref: FragmentType;
-export type RelayModernFlowtest_users = $ReadOnlyArray<{
+export type RelayModernFlowtest_users = ReadonlyArray<{
   +name: ?string,
   +$fragmentType: RelayModernFlowtest_users$ref,
 }>;

package/__flowtests__/__generated__/ReactRelayFragmentContainerFlowtest_viewer.graphql.js.flow

@@ -6,10 +6,9 @@
  *
  * @oncall relay
  *
- * @generated SignedSource<<97ebbfa87de00690617b84f5dc0b3dd7>>
+ * @generated SignedSource<<2034f0572b67fa53eeb04dcd78545d61>>
  * @flow
  * @lightSyntaxTransform
- * @nogrep
  */
 
 /* eslint-disable */
@@ -63,10 +62,10 @@ var node/*: ReaderFragment*/ = {
 };
 
 if (__DEV__) {
-  (node/*: any*/).hash = "75147ebd599fe1c406f2dfc7abb164f8";
+  (node/*:: as any*/).hash = "75147ebd599fe1c406f2dfc7abb164f8";
 }
 
-module.exports = ((node/*: any*/)/*: Fragment<
+module.exports = ((node/*:: as any*/)/*:: as Fragment<
   ReactRelayFragmentContainerFlowtest_viewer$fragmentType,
   ReactRelayFragmentContainerFlowtest_viewer$data,
 >*/);

package/__flowtests__/__generated__/ReactRelayFragmentContainerFlowtest_viewer2.graphql.js.flow

@@ -6,10 +6,9 @@
  *
  * @oncall relay
  *
- * @generated SignedSource<<493af2df808158f1c08ec6aafda2e783>>
+ * @generated SignedSource<<aea64ad988451a135fcb765d0cd946c2>>
  * @flow
  * @lightSyntaxTransform
- * @nogrep
  */
 
 /* eslint-disable */
@@ -63,10 +62,10 @@ var node/*: ReaderFragment*/ = {
 };
 
 if (__DEV__) {
-  (node/*: any*/).hash = "0f55965b7c9aca0d661ebdd96c70e384";
+  (node/*:: as any*/).hash = "0f55965b7c9aca0d661ebdd96c70e384";
 }
 
-module.exports = ((node/*: any*/)/*: Fragment<
+module.exports = ((node/*:: as any*/)/*:: as Fragment<
   ReactRelayFragmentContainerFlowtest_viewer2$fragmentType,
   ReactRelayFragmentContainerFlowtest_viewer2$data,
 >*/);

package/__flowtests__/__generated__/ReactRelayPaginationContainerFlowtestQuery.graphql.js.flow

@@ -6,10 +6,9 @@
  *
  * @oncall relay
  *
- * @generated SignedSource<<073d1d174775daaac06d462623886192>>
+ * @generated SignedSource<<1c9560651db1e7a97aea91331c3d65f8>>
  * @flow
  * @lightSyntaxTransform
- * @nogrep
  */
 
 /* eslint-disable */
@@ -68,7 +67,7 @@ v2 = {
 };
 return {
   "fragment": {
-    "argumentDefinitions": (v0/*: any*/),
+    "argumentDefinitions": (v0/*:: as any*/),
     "kind": "Fragment",
     "metadata": null,
     "name": "ReactRelayPaginationContainerFlowtestQuery",
@@ -95,7 +94,7 @@ return {
   },
   "kind": "Request",
   "operation": {
-    "argumentDefinitions": (v0/*: any*/),
+    "argumentDefinitions": (v0/*:: as any*/),
     "kind": "Operation",
     "name": "ReactRelayPaginationContainerFlowtestQuery",
     "selections": [
@@ -117,7 +116,7 @@ return {
             "selections": [
               {
                 "alias": null,
-                "args": (v1/*: any*/),
+                "args": (v1/*:: as any*/),
                 "concreteType": "FriendsConnection",
                 "kind": "LinkedField",
                 "name": "friends",
@@ -146,7 +145,7 @@ return {
                             "name": "__typename",
                             "storageKey": null
                           },
-                          (v2/*: any*/)
+                          (v2/*:: as any*/)
                         ],
                         "storageKey": null
                       },
@@ -190,14 +189,14 @@ return {
               },
               {
                 "alias": null,
-                "args": (v1/*: any*/),
+                "args": (v1/*:: as any*/),
                 "filters": null,
                 "handle": "connection",
                 "key": "ReactRelayPaginationContainerFlowtest_viewer__friends",
                 "kind": "LinkedHandle",
                 "name": "friends"
               },
-              (v2/*: any*/)
+              (v2/*:: as any*/)
             ],
             "storageKey": null
           }
@@ -218,10 +217,10 @@ return {
 })();
 
 if (__DEV__) {
-  (node/*: any*/).hash = "712afeafa1f51bfe391719629a0fcea0";
+  (node/*:: as any*/).hash = "712afeafa1f51bfe391719629a0fcea0";
 }
 
-module.exports = ((node/*: any*/)/*: Query<
+module.exports = ((node/*:: as any*/)/*:: as Query<
   ReactRelayPaginationContainerFlowtestQuery$variables,
   ReactRelayPaginationContainerFlowtestQuery$data,
 >*/);

package/__flowtests__/__generated__/ReactRelayPaginationContainerFlowtest_viewer.graphql.js.flow

@@ -6,10 +6,9 @@
  *
  * @oncall relay
  *
- * @generated SignedSource<<03cbc84be1e0fb9c3986ea29a3e335db>>
+ * @generated SignedSource<<019829c7b1641c9b37e656f022dd56c7>>
  * @flow
  * @lightSyntaxTransform
- * @nogrep
  */
 
 /* eslint-disable */
@@ -23,7 +22,7 @@ declare export opaque type ReactRelayPaginationContainerFlowtest_viewer$fragment
 export type ReactRelayPaginationContainerFlowtest_viewer$data = {|
   +account_user: ?{|
     +friends: ?{|
-      +edges: ?$ReadOnlyArray<?{|
+      +edges: ?ReadonlyArray<?{|
         +node: ?{|
           +__typename: "User",
         |},
@@ -155,10 +154,10 @@ var node/*: ReaderFragment*/ = {
 };
 
 if (__DEV__) {
-  (node/*: any*/).hash = "0db8995009ebfee6165f6bbaa465d13f";
+  (node/*:: as any*/).hash = "0db8995009ebfee6165f6bbaa465d13f";
 }
 
-module.exports = ((node/*: any*/)/*: Fragment<
+module.exports = ((node/*:: as any*/)/*:: as Fragment<
   ReactRelayPaginationContainerFlowtest_viewer$fragmentType,
   ReactRelayPaginationContainerFlowtest_viewer$data,
 >*/);

package/__flowtests__/__generated__/ReactRelayRefetchContainerFlowtestQuery.graphql.js.flow

@@ -6,10 +6,9 @@
  *
  * @oncall relay
  *
- * @generated SignedSource<<909036439f4d2e9e2d5728ade52035dc>>
+ * @generated SignedSource<<9d4aa8f307189ead66500df17b9f4134>>
  * @flow
  * @lightSyntaxTransform
- * @nogrep
  */
 
 /* eslint-disable */
@@ -68,7 +67,7 @@ v2 = {
 };
 return {
   "fragment": {
-    "argumentDefinitions": (v0/*: any*/),
+    "argumentDefinitions": (v0/*:: as any*/),
     "kind": "Fragment",
     "metadata": null,
     "name": "ReactRelayRefetchContainerFlowtestQuery",
@@ -95,7 +94,7 @@ return {
   },
   "kind": "Request",
   "operation": {
-    "argumentDefinitions": (v0/*: any*/),
+    "argumentDefinitions": (v0/*:: as any*/),
     "kind": "Operation",
     "name": "ReactRelayRefetchContainerFlowtestQuery",
     "selections": [
@@ -117,7 +116,7 @@ return {
             "selections": [
               {
                 "alias": null,
-                "args": (v1/*: any*/),
+                "args": (v1/*:: as any*/),
                 "concreteType": "FriendsConnection",
                 "kind": "LinkedField",
                 "name": "friends",
@@ -146,7 +145,7 @@ return {
                             "name": "__typename",
                             "storageKey": null
                           },
-                          (v2/*: any*/)
+                          (v2/*:: as any*/)
                         ],
                         "storageKey": null
                       },
@@ -190,14 +189,14 @@ return {
               },
               {
                 "alias": null,
-                "args": (v1/*: any*/),
+                "args": (v1/*:: as any*/),
                 "filters": null,
                 "handle": "connection",
                 "key": "ReactRelayRefetchContainerFlowtest_viewer__friends",
                 "kind": "LinkedHandle",
                 "name": "friends"
               },
-              (v2/*: any*/)
+              (v2/*:: as any*/)
             ],
             "storageKey": null
           }
@@ -218,10 +217,10 @@ return {
 })();
 
 if (__DEV__) {
-  (node/*: any*/).hash = "ce05ae9de6327d14ff0f3813ec77e594";
+  (node/*:: as any*/).hash = "ce05ae9de6327d14ff0f3813ec77e594";
 }
 
-module.exports = ((node/*: any*/)/*: Query<
+module.exports = ((node/*:: as any*/)/*:: as Query<
   ReactRelayRefetchContainerFlowtestQuery$variables,
   ReactRelayRefetchContainerFlowtestQuery$data,
 >*/);

package/__flowtests__/__generated__/ReactRelayRefetchContainerFlowtest_viewer.graphql.js.flow

@@ -6,10 +6,9 @@
  *
  * @oncall relay
  *
- * @generated SignedSource<<6f9cebfabb127ad6db1de1705f8a9764>>
+ * @generated SignedSource<<48593a8ed28fec622cbc4e20e8292494>>
  * @flow
  * @lightSyntaxTransform
- * @nogrep
  */
 
 /* eslint-disable */
@@ -23,7 +22,7 @@ declare export opaque type ReactRelayRefetchContainerFlowtest_viewer$fragmentTyp
 export type ReactRelayRefetchContainerFlowtest_viewer$data = {|
   +account_user: ?{|
     +friends: ?{|
-      +edges: ?$ReadOnlyArray<?{|
+      +edges: ?ReadonlyArray<?{|
         +node: ?{|
           +__typename: "User",
         |},
@@ -155,10 +154,10 @@ var node/*: ReaderFragment*/ = {
 };
 
 if (__DEV__) {
-  (node/*: any*/).hash = "cf098b4248d8ddfacfc0d356838697bb";
+  (node/*:: as any*/).hash = "cf098b4248d8ddfacfc0d356838697bb";
 }
 
-module.exports = ((node/*: any*/)/*: Fragment<
+module.exports = ((node/*:: as any*/)/*:: as Fragment<
   ReactRelayRefetchContainerFlowtest_viewer$fragmentType,
   ReactRelayRefetchContainerFlowtest_viewer$data,
 >*/);

package/__flowtests__/__generated__/RelayModernFlowtest_badref.graphql.js.flow

@@ -6,10 +6,9 @@
  *
  * @oncall relay
  *
- * @generated SignedSource<<1d67fc8ab171aeb4c45cb1df2d036371>>
+ * @generated SignedSource<<2693dada5777cc6dc61cb195adeba6c9>>
  * @flow
  * @lightSyntaxTransform
- * @nogrep
  */
 
 /* eslint-disable */
@@ -57,10 +56,10 @@ var node/*: ReaderFragment*/ = {
 };
 
 if (__DEV__) {
-  (node/*: any*/).hash = "a04dc2854770919bd070bdc717de7812";
+  (node/*:: as any*/).hash = "a04dc2854770919bd070bdc717de7812";
 }
 
-module.exports = ((node/*: any*/)/*: Fragment<
+module.exports = ((node/*:: as any*/)/*:: as Fragment<
   RelayModernFlowtest_badref$fragmentType,
   RelayModernFlowtest_badref$data,
 >*/);

package/__flowtests__/__generated__/RelayModernFlowtest_notref.graphql.js.flow

@@ -6,10 +6,9 @@
  *
  * @oncall relay
  *
- * @generated SignedSource<<43b1e678169a4cde5a3a2312c2dca669>>
+ * @generated SignedSource<<ba6e97b77f0002238c6c7810d738d92f>>
  * @flow
  * @lightSyntaxTransform
- * @nogrep
  */
 
 /* eslint-disable */
@@ -57,10 +56,10 @@ var node/*: ReaderFragment*/ = {
 };
 
 if (__DEV__) {
-  (node/*: any*/).hash = "d61c43d07b2fe8f623c9b84fcdf70ac8";
+  (node/*:: as any*/).hash = "d61c43d07b2fe8f623c9b84fcdf70ac8";
 }
 
-module.exports = ((node/*: any*/)/*: Fragment<
+module.exports = ((node/*:: as any*/)/*:: as Fragment<
   RelayModernFlowtest_notref$fragmentType,
   RelayModernFlowtest_notref$data,
 >*/);

package/__flowtests__/__generated__/RelayModernFlowtest_user.graphql.js.flow

@@ -6,10 +6,9 @@
  *
  * @oncall relay
  *
- * @generated SignedSource<<9d848fb441343089b23a4a389281bffb>>
+ * @generated SignedSource<<b9581ad468793bb28a69abed562d378c>>
  * @flow
  * @lightSyntaxTransform
- * @nogrep
  */
 
 /* eslint-disable */
@@ -50,10 +49,10 @@ var node/*: ReaderFragment*/ = {
 };
 
 if (__DEV__) {
-  (node/*: any*/).hash = "18a730295ff54e88446f4f000f5fef7e";
+  (node/*:: as any*/).hash = "18a730295ff54e88446f4f000f5fef7e";
 }
 
-module.exports = ((node/*: any*/)/*: Fragment<
+module.exports = ((node/*:: as any*/)/*:: as Fragment<
   RelayModernFlowtest_user$fragmentType,
   RelayModernFlowtest_user$data,
 >*/);

package/__flowtests__/__generated__/RelayModernFlowtest_users.graphql.js.flow

@@ -6,10 +6,9 @@
  *
  * @oncall relay
  *
- * @generated SignedSource<<36c03d8fd5d95624c243a32c2b4791e4>>
+ * @generated SignedSource<<5b479f9774127420b57137125b4efd98>>
  * @flow
  * @lightSyntaxTransform
- * @nogrep
  */
 
 /* eslint-disable */
@@ -20,11 +19,11 @@
 import type { Fragment, ReaderFragment } from 'relay-runtime';
 import type { FragmentType } from "relay-runtime";
 declare export opaque type RelayModernFlowtest_users$fragmentType: FragmentType;
-export type RelayModernFlowtest_users$data = $ReadOnlyArray<{|
+export type RelayModernFlowtest_users$data = ReadonlyArray<{|
   +name: ?string,
   +$fragmentType: RelayModernFlowtest_users$fragmentType,
 |}>;
-export type RelayModernFlowtest_users$key = $ReadOnlyArray<{
+export type RelayModernFlowtest_users$key = ReadonlyArray<{
   +$data?: RelayModernFlowtest_users$data,
   +$fragmentSpreads: RelayModernFlowtest_users$fragmentType,
   ...
@@ -52,10 +51,10 @@ var node/*: ReaderFragment*/ = {
 };
 
 if (__DEV__) {
-  (node/*: any*/).hash = "4e6f0e70d48ec58651c17e3150c63d05";
+  (node/*:: as any*/).hash = "4e6f0e70d48ec58651c17e3150c63d05";
 }
 
-module.exports = ((node/*: any*/)/*: Fragment<
+module.exports = ((node/*:: as any*/)/*:: as Fragment<
   RelayModernFlowtest_users$fragmentType,
   RelayModernFlowtest_users$data,
 >*/);

package/buildReactRelayContainer.js.flow

@@ -36,7 +36,7 @@ type ContainerCreator = (
  * Helper to create the Relay HOCs with ref forwarding, setting the displayName
  * and reading the React context.
  */
-function buildReactRelayContainer<TBase: component(...empty)>(
+function buildReactRelayContainer<TBase extends component(...empty)>(
   ComponentClass: TBase,
   fragmentSpec: GeneratedNodeMap,
   createContainerWithFragments: ContainerCreator,
@@ -55,8 +55,8 @@ function buildReactRelayContainer<TBase: component(...empty)>(
   function ForwardRef(
     props: any,
     ref:
-      | ((null | React.ElementRef<TBase>) => mixed)
-      | {-current: null | React.ElementRef<TBase>, ...},
+      | ((null | React.ElementRef<TBase>) => unknown)
+      | {writeonly current: null | React.ElementRef<TBase>, ...},
   ) {
     // $FlowFixMe[react-rule-hook]
     const context = useContext(ReactRelayContext);
@@ -86,11 +86,11 @@ function buildReactRelayContainer<TBase: component(...empty)>(
 
   if (__DEV__) {
     // Used by RelayModernTestUtils
-    (ForwardContainer: any).__ComponentClass = ComponentClass;
+    (ForwardContainer as any).__ComponentClass = ComponentClass;
     ForwardContainer.displayName = containerName;
   }
 
-  // $FlowFixMe[incompatible-return]
+  // $FlowFixMe[incompatible-type]
   return ForwardContainer;
 }
 

package/getRootVariablesForFragments.js.flow

@@ -15,7 +15,7 @@ import type {FragmentMap, Variables} from 'relay-runtime';
 
 const {getSelector} = require('relay-runtime');
 
-function getRootVariablesForFragments<TProps: {...}>(
+function getRootVariablesForFragments<TProps extends {...}>(
   fragments: FragmentMap,
   props: TProps,
 ): Variables {