react-relay 18.2.0 → 19.0.0

package/ReactRelayContainerUtils.js.flow

@@ -11,11 +11,11 @@
 
 'use strict';
 
-function getComponentName(component: React.ComponentType<any>): string {
+function getComponentName(component: component(...empty)): string {
   return component.displayName || component.name || 'Component';
 }
 
-function getContainerName(Component: React.ComponentType<any>): string {
+function getContainerName(Component: component(...empty)): string {
   return 'Relay(' + getComponentName(Component) + ')';
 }
 

package/ReactRelayContext.js

@@ -1,5 +1,5 @@
 /**
- * Relay v18.2.0
+ * Relay v19.0.0
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/ReactRelayFragmentContainer.js.flow

@@ -46,13 +46,11 @@ type ContainerState = {
  */
 function createContainerWithFragments<
   Props: {...},
-  TComponent: React.ComponentType<Props>,
+  TComponent: component(...Props),
 >(
   Component: TComponent,
   fragments: FragmentMap,
-): React.ComponentType<
-  $RelayProps<React.ElementConfig<TComponent>, RelayProp>,
-> {
+): component(...$RelayProps<React.ElementConfig<TComponent>, RelayProp>) {
   const containerName = getContainerName(Component);
 
   return class extends React.Component<ContainerProps, ContainerState> {
@@ -269,12 +267,12 @@ function getRelayProp(environment: IEnvironment) {
  */
 function createContainer<
   Props: {...},
-  Instance,
-  TComponent: component(ref: React.RefSetter<Instance>, ...Props),
+  Ref,
+  TComponent: component(ref: Ref, ...Props),
 >(
   Component: TComponent,
   fragmentSpec: GeneratedNodeMap,
-): component(ref: React.RefSetter<Instance>, ...$RelayProps<Props, RelayProp>) {
+): component(ref: Ref, ...$RelayProps<Props, RelayProp>) {
   // $FlowFixMe[incompatible-return]
   return buildReactRelayContainer(
     Component,

package/ReactRelayLoggingContext.js.flow

@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ * @oncall relay
+ */
+
+'use strict';
+
+const React = require('react');
+const {
+  __internal: {createRelayLoggingContext},
+} = require('relay-runtime');
+
+module.exports = (createRelayLoggingContext(React): React.Context<
+  mixed | null,
+>);

package/ReactRelayPaginationContainer.js.flow

@@ -319,14 +319,14 @@ function toObserver(observerOrCallback: ?ObserverOrCallback): Observer<void> {
 
 function createContainerWithFragments<
   Props: {...},
-  TComponent: React.ComponentType<Props>,
+  TComponent: component(...Props),
 >(
   Component: TComponent,
   fragments: FragmentMap,
   connectionConfig: ConnectionConfig,
-): React.ComponentType<
-  $RelayProps<React.ElementConfig<TComponent>, RelayPaginationProp>,
-> {
+): component(
+  ...$RelayProps<React.ElementConfig<TComponent>, RelayPaginationProp>
+) {
   const componentName = getComponentName(Component);
   const containerName = getContainerName(Component);
 
@@ -937,13 +937,13 @@ function createContainerWithFragments<
  * `fragmentSpec` is memoized once per environment, rather than once per
  * instance of the container constructed/rendered.
  */
-function createContainer<Props: {...}, TComponent: React.ComponentType<Props>>(
+function createContainer<Props: {...}, TComponent: component(...Props)>(
   Component: TComponent,
   fragmentSpec: GeneratedNodeMap,
   connectionConfig: ConnectionConfig,
-): React.ComponentType<
-  $RelayProps<React.ElementConfig<TComponent>, RelayPaginationProp>,
-> {
+): component(
+  ...$RelayProps<React.ElementConfig<TComponent>, RelayPaginationProp>
+) {
   // $FlowFixMe[incompatible-return]
   return buildReactRelayContainer(
     Component,

package/ReactRelayRefetchContainer.js.flow

@@ -69,14 +69,14 @@ type ContainerState = {
  */
 function createContainerWithFragments<
   Props: {...},
-  TComponent: React.ComponentType<Props>,
+  TComponent: component(...Props),
 >(
   Component: TComponent,
   fragments: FragmentMap,
   taggedNode: GraphQLTaggedNode,
-): React.ComponentType<
-  $RelayProps<React.ElementConfig<TComponent>, RelayRefetchProp>,
-> {
+): component(
+  ...$RelayProps<React.ElementConfig<TComponent>, RelayRefetchProp>
+) {
   const containerName = getContainerName(Component);
 
   return class extends React.Component<ContainerProps, ContainerState> {
@@ -486,13 +486,13 @@ function getRelayProp(
  * `fragmentSpec` is memoized once per environment, rather than once per
  * instance of the container constructed/rendered.
  */
-function createContainer<Props: {...}, TComponent: React.ComponentType<Props>>(
+function createContainer<Props: {...}, TComponent: component(...Props)>(
   Component: TComponent,
   fragmentSpec: GeneratedNodeMap,
   taggedNode: GraphQLTaggedNode,
-): React.ComponentType<
-  $RelayProps<React.ElementConfig<TComponent>, RelayRefetchProp>,
-> {
+): component(
+  ...$RelayProps<React.ElementConfig<TComponent>, RelayRefetchProp>
+) {
   // $FlowFixMe[incompatible-return]
   return buildReactRelayContainer(
     Component,

package/ReactRelayTypes.js.flow

@@ -97,14 +97,20 @@ export type $FragmentRef<T> = {
   ...
 };
 
+/* $FlowExpectedError[unclear-type]: Intentional so that it won't fail,
+ * even if the type we want to exclude doesn't exist in Props */
+type LooseOmitRelayProps<Props, K: $Keys<any>> = Pick<
+  Props,
+  Exclude<$Keys<Props>, K>,
+>;
 /**
  * A utility type that takes the Props of a component and the type of
  * `props.relay` and returns the props of the container.
  */
 // prettier-ignore
 // $FlowFixMe[extra-type-arg] xplat redux flow type error
-export type $RelayProps<Props, RelayPropT = RelayProp> = MapRelayProps<
-  $Diff<Props, {relay: RelayPropT | void, ...}>,
+export type $RelayProps<Props, _RelayPropT = RelayProp> = MapRelayProps<
+  LooseOmitRelayProps<Props, 'relay'>,
 >;
 
 type MapRelayProps<Props> = {[K in keyof Props]: MapRelayProp<Props[K]>};
@@ -144,14 +150,15 @@ type MapRelayProp<T> = [+t: T] extends [+t: {+$fragmentType: empty, ...}]
                 ? ?$ReadOnlyArray<?$FragmentRef<$NonMaybeType<V>>>
                 : T;
 
-export type RelayFragmentContainer<TComponent> = React.ComponentType<
-  $RelayProps<React.ElementConfig<TComponent>, RelayProp>,
->;
+export type RelayFragmentContainer<TComponent: component(...empty)> = component(
+  ...$RelayProps<React.ElementConfig<TComponent>, RelayProp>
+);
 
-export type RelayPaginationContainer<TComponent> = React.ComponentType<
-  $RelayProps<React.ElementConfig<TComponent>, RelayPaginationProp>,
->;
+export type RelayPaginationContainer<TComponent: component(...empty)> =
+  component(
+    ...$RelayProps<React.ElementConfig<TComponent>, RelayPaginationProp>
+  );
 
-export type RelayRefetchContainer<TComponent> = React.ComponentType<
-  $RelayProps<React.ElementConfig<TComponent>, RelayRefetchProp>,
->;
+export type RelayRefetchContainer<TComponent: component(...empty)> = component(
+  ...$RelayProps<React.ElementConfig<TComponent>, RelayRefetchProp>
+);

package/__flowtests__/ReactRelayFragmentContainer-flowtest.js.flow

@@ -138,14 +138,7 @@ module.exports = {
         return bad ? 'not good' : ok;
       }
       render(): React.MixedElement {
-        return (
-          <Bar
-            componentRef={(ref: empty) => {
-              this._barRef = (ref: empty);
-            }}
-            requiredProp="bar"
-          />
-        );
+        return <Bar requiredProp="bar" />;
       }
     }
     return <ProxyChecker />;

package/__flowtests__/ReactRelayPaginationContainer-flowtest.js.flow

@@ -22,10 +22,7 @@ const {graphql} = require('relay-runtime');
  * type-checked correctly on Relay components.
  */
 
-/* $FlowFixMe(>=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 */
-class FooComponent extends React.Component {
+class FooComponent extends React.Component<$FlowFixMe> {
   props: {
     optionalProp?: {foo: number, ...},
     defaultProp: string,
@@ -56,7 +53,7 @@ class FooComponent extends React.Component {
 }
 // Note that we must reassign to a new identifier to make sure flow doesn't propogate types without
 // the relay type definition doing the work.
-const Foo = createPaginationContainer(
+const Foo = createPaginationContainer<$FlowFixMe, _>(
   FooComponent,
   {
     viewer: graphql`

package/__flowtests__/ReactRelayRefetchContainer-flowtest.js.flow

@@ -21,10 +21,7 @@ const {graphql} = require('relay-runtime');
  * Verifies that normal prop type checking works correctly on Relay components.
  */
 
-/* $FlowFixMe(>=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 */
-class FooComponent extends React.Component {
+class FooComponent extends React.Component<$FlowFixMe> {
   props: {
     optionalProp?: {foo: number, ...},
     defaultProp: string,
@@ -55,7 +52,7 @@ class FooComponent extends React.Component {
 }
 // Note that we must reassign to a new identifier to make sure flow doesn't propogate types without
 // the relay type definition doing the work.
-const Foo = createRefetchContainer(
+const Foo = createRefetchContainer<$FlowFixMe, _>(
   FooComponent,
   {
     viewer: graphql`

package/buildReactRelayContainer.js.flow

@@ -28,15 +28,15 @@ const {getFragment} = require('relay-runtime');
 const {useContext} = React;
 
 type ContainerCreator = (
-  Component: React.ComponentType<any>,
+  Component: component(...any),
   fragments: FragmentMap,
-) => React.ComponentType<any>;
+) => component(...any);
 
 /**
  * Helper to create the Relay HOCs with ref forwarding, setting the displayName
  * and reading the React context.
  */
-function buildReactRelayContainer<TBase: React.ComponentType<any>>(
+function buildReactRelayContainer<TBase: component(...empty)>(
   ComponentClass: TBase,
   fragmentSpec: GeneratedNodeMap,
   createContainerWithFragments: ContainerCreator,

package/hooks.js

@@ -1,5 +1,5 @@
 /**
- * Relay v18.2.0
+ * Relay v19.0.0
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v18.2.0
+ * Relay v19.0.0
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/index.js.flow

@@ -28,7 +28,7 @@ const useFragment = require('./relay-hooks/useFragment');
 const useLazyLoadQuery = require('./relay-hooks/useLazyLoadQuery');
 const useMutation = require('./relay-hooks/useMutation');
 const usePaginationFragment = require('./relay-hooks/usePaginationFragment');
-const usePrefetchableForwardPaginationFragment_EXPERIMENTAL = require('./relay-hooks/usePrefetchableForwardPaginationFragment_EXPERIMENTAL');
+const usePrefetchableForwardPaginationFragment = require('./relay-hooks/usePrefetchableForwardPaginationFragment');
 const usePreloadedQuery = require('./relay-hooks/usePreloadedQuery');
 const useQueryLoader = require('./relay-hooks/useQueryLoader');
 const useRefetchableFragment = require('./relay-hooks/useRefetchableFragment');
@@ -126,8 +126,8 @@ module.exports = {
   usePaginationFragment: usePaginationFragment,
   usePreloadedQuery: usePreloadedQuery,
   useRefetchableFragment: useRefetchableFragment,
-  usePrefetchableForwardPaginationFragment_EXPERIMENTAL:
-    usePrefetchableForwardPaginationFragment_EXPERIMENTAL,
+  usePrefetchableForwardPaginationFragment:
+    usePrefetchableForwardPaginationFragment,
   useRelayEnvironment: useRelayEnvironment,
   useSubscribeToInvalidationState: useSubscribeToInvalidationState,
   useSubscription: useSubscription,

package/legacy.js

@@ -1,5 +1,5 @@
 /**
- * Relay v18.2.0
+ * Relay v19.0.0
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/lib/ReactRelayLoggingContext.js

@@ -0,0 +1,6 @@
+'use strict';
+
+var React = require('react');
+var _require = require('relay-runtime'),
+  createRelayLoggingContext = _require.__internal.createRelayLoggingContext;
+module.exports = createRelayLoggingContext(React);

package/lib/index.js

@@ -18,7 +18,7 @@ var useFragment = require('./relay-hooks/useFragment');
 var useLazyLoadQuery = require('./relay-hooks/useLazyLoadQuery');
 var useMutation = require('./relay-hooks/useMutation');
 var usePaginationFragment = require('./relay-hooks/usePaginationFragment');
-var usePrefetchableForwardPaginationFragment_EXPERIMENTAL = require('./relay-hooks/usePrefetchableForwardPaginationFragment_EXPERIMENTAL');
+var usePrefetchableForwardPaginationFragment = require('./relay-hooks/usePrefetchableForwardPaginationFragment');
 var usePreloadedQuery = require('./relay-hooks/usePreloadedQuery');
 var useQueryLoader = require('./relay-hooks/useQueryLoader');
 var useRefetchableFragment = require('./relay-hooks/useRefetchableFragment');
@@ -58,7 +58,7 @@ module.exports = {
   usePaginationFragment: usePaginationFragment,
   usePreloadedQuery: usePreloadedQuery,
   useRefetchableFragment: useRefetchableFragment,
-  usePrefetchableForwardPaginationFragment_EXPERIMENTAL: usePrefetchableForwardPaginationFragment_EXPERIMENTAL,
+  usePrefetchableForwardPaginationFragment: usePrefetchableForwardPaginationFragment,
   useRelayEnvironment: useRelayEnvironment,
   useSubscribeToInvalidationState: useSubscribeToInvalidationState,
   useSubscription: useSubscription

package/lib/relay-hooks/legacy/FragmentResource.js

@@ -308,10 +308,10 @@ var FragmentResourceImpl = /*#__PURE__*/function () {
     var _this4 = this;
     if (Array.isArray(snapshot)) {
       snapshot.forEach(function (s) {
-        handlePotentialSnapshotErrors(_this4._environment, s.errorResponseFields);
+        handlePotentialSnapshotErrors(_this4._environment, s.fieldErrors);
       });
     } else {
-      handlePotentialSnapshotErrors(this._environment, snapshot.errorResponseFields);
+      handlePotentialSnapshotErrors(this._environment, snapshot.fieldErrors);
     }
   };
   _proto2.readSpec = function readSpec(fragmentNodes, fragmentRefs, componentDisplayName) {
@@ -453,7 +453,7 @@ var FragmentResourceImpl = /*#__PURE__*/function () {
       missingLiveResolverFields: currentSnapshot.missingLiveResolverFields,
       seenRecords: currentSnapshot.seenRecords,
       selector: currentSnapshot.selector,
-      errorResponseFields: currentSnapshot.errorResponseFields
+      fieldErrors: currentSnapshot.fieldErrors
     };
     if (updatedData !== renderData) {
       var _result = getFragmentResult(cacheKey, updatedCurrentSnapshot, storeEpoch);

package/lib/relay-hooks/legacy/useRefetchableFragmentNode.js

@@ -234,7 +234,7 @@ if (process.env.NODE_ENV !== "production") {
       }
     },
     checkSameIDAfterRefetch: function checkSameIDAfterRefetch(previousIDAndTypename, refetchedFragmentRef, fragmentNode, componentDisplayName) {
-      if (previousIDAndTypename == null) {
+      if (previousIDAndTypename == null || refetchedFragmentRef == null) {
         return;
       }
       var _require7 = require('relay-runtime'),

package/lib/relay-hooks/loadEntryPoint.js

@@ -24,6 +24,9 @@ function loadEntryPoint(environmentProvider, entryPoint, entryPointParams) {
         options = query.options,
         parameters = query.parameters,
         variables = query.variables;
+      if ((options === null || options === void 0 ? void 0 : options.includeIf) === false) {
+        return;
+      }
       var environment = environmentProvider.getEnvironment(environmentProviderOptions);
       preloadedQueries[queryPropName] = loadQuery(environment, parameters, variables, {
         fetchPolicy: options === null || options === void 0 ? void 0 : options.fetchPolicy,

package/lib/relay-hooks/loadQuery.js

@@ -35,13 +35,13 @@ function loadQuery(environment, preloadableRequest, variables, options, environm
   var unsubscribeFromNetworkRequest;
   var networkError = null;
   var didMakeNetworkRequest = false;
-  var makeNetworkRequest = function makeNetworkRequest(params) {
+  var makeNetworkRequest = function makeNetworkRequest(params, checkOperation) {
     didMakeNetworkRequest = true;
     var subject = new ReplaySubject();
     var identifier = 'raw-network-request-' + getRequestIdentifier(params, variables);
     var observable = fetchQueryDeduped(environment, identifier, function () {
       var network = environment.getNetwork();
-      return network.execute(params, variables, networkCacheConfig);
+      return network.execute(params, variables, networkCacheConfig, undefined, undefined, undefined, undefined, checkOperation);
     });
     var _observable$subscribe = observable.subscribe({
         error: function error(err) {
@@ -90,7 +90,9 @@ function loadQuery(environment, preloadableRequest, variables, options, environm
     var shouldFetch = fetchPolicy !== 'store-or-network' || environment.check(operation).status !== 'available';
     if (shouldFetch) {
       executeDeduped(operation, function () {
-        var networkObservable = makeNetworkRequest(concreteRequest.params);
+        var networkObservable = makeNetworkRequest(concreteRequest.params, function () {
+          return environment.check(operation);
+        });
         var executeObservable = executeWithNetworkSource(operation, networkObservable);
         return executeObservable;
       });

package/lib/relay-hooks/preloadQuery_DEPRECATED.js

@@ -78,7 +78,12 @@ function preloadQueryDeduped(environment, pendingQueries, preloadableRequest, va
   }, options === null || options === void 0 ? void 0 : options.networkCacheConfig);
   var cacheKey = "".concat(getRequestIdentifier(params, variables)).concat(fetchKey != null ? "-".concat(fetchKey) : '');
   var prevQueryEntry = pendingQueries.get(cacheKey);
-  var availability = fetchPolicy === STORE_OR_NETWORK_DEFAULT && query != null && query != null ? environment.check(createOperationDescriptor(query, variables, networkCacheConfig)) : {
+  function checkOperation() {
+    return query != null ? environment.check(createOperationDescriptor(query, variables, networkCacheConfig)) : {
+      status: 'missing'
+    };
+  }
+  var availability = fetchPolicy === STORE_OR_NETWORK_DEFAULT ? checkOperation() : {
     status: 'missing'
   };
   var nextQueryEntry;
@@ -105,7 +110,7 @@ function preloadQueryDeduped(environment, pendingQueries, preloadableRequest, va
       }, DEFAULT_PREFETCH_TIMEOUT);
     }
   } else if (prevQueryEntry == null || prevQueryEntry.kind !== 'network') {
-    var source = network.execute(params, variables, networkCacheConfig, null);
+    var source = network.execute(params, variables, networkCacheConfig, null, undefined, undefined, undefined, checkOperation);
     var subject = new ReplaySubject();
     nextQueryEntry = {
       cacheKey: cacheKey,

package/lib/relay-hooks/readFragmentInternal.js

@@ -66,14 +66,14 @@ function getMissingClientEdges(state) {
 }
 function handlePotentialSnapshotErrorsForState(environment, state) {
   if (state.kind === 'singular') {
-    handlePotentialSnapshotErrors(environment, state.snapshot.errorResponseFields);
+    handlePotentialSnapshotErrors(environment, state.snapshot.fieldErrors);
   } else if (state.kind === 'plural') {
     var _iterator3 = (0, _createForOfIteratorHelper2["default"])(state.snapshots),
       _step3;
     try {
       for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
         var snapshot = _step3.value;
-        handlePotentialSnapshotErrors(environment, snapshot.errorResponseFields);
+        handlePotentialSnapshotErrors(environment, snapshot.fieldErrors);
       }
     } catch (err) {
       _iterator3.e(err);

package/lib/relay-hooks/useFragmentInternal_CURRENT.js

@@ -7,6 +7,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _require = require('./QueryResource'),
   getQueryResourceForEnvironment = _require.getQueryResourceForEnvironment;
 var useRelayEnvironment = require('./useRelayEnvironment');
+var useRelayLoggingContext = require('./useRelayLoggingContext');
 var invariant = require('invariant');
 var _require2 = require('react'),
   useDebugValue = _require2.useDebugValue,
@@ -114,16 +115,16 @@ function getSuspendingLiveResolver(state) {
     return missingFields;
   }
 }
-function handlePotentialSnapshotErrorsForState(environment, state) {
+function handlePotentialSnapshotErrorsForState(environment, state, loggingContext) {
   if (state.kind === 'singular') {
-    handlePotentialSnapshotErrors(environment, state.snapshot.errorResponseFields);
+    handlePotentialSnapshotErrors(environment, state.snapshot.fieldErrors, loggingContext);
   } else if (state.kind === 'plural') {
     var _iterator5 = (0, _createForOfIteratorHelper2["default"])(state.snapshots),
       _step5;
     try {
       for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
         var snapshot = _step5.value;
-        handlePotentialSnapshotErrors(environment, snapshot.errorResponseFields);
+        handlePotentialSnapshotErrors(environment, snapshot.fieldErrors, loggingContext);
       }
     } catch (err) {
       _iterator5.e(err);
@@ -150,7 +151,7 @@ function handleMissedUpdates(environment, state) {
       missingLiveResolverFields: currentSnapshot.missingLiveResolverFields,
       seenRecords: currentSnapshot.seenRecords,
       selector: currentSnapshot.selector,
-      errorResponseFields: currentSnapshot.errorResponseFields
+      fieldErrors: currentSnapshot.fieldErrors
     };
     return [updatedData !== state.snapshot.data, {
       kind: 'singular',
@@ -171,7 +172,7 @@ function handleMissedUpdates(environment, state) {
         missingLiveResolverFields: _currentSnapshot.missingLiveResolverFields,
         seenRecords: _currentSnapshot.seenRecords,
         selector: _currentSnapshot.selector,
-        errorResponseFields: _currentSnapshot.errorResponseFields
+        fieldErrors: _currentSnapshot.fieldErrors
       };
       if (_updatedData !== snapshot.data) {
         didMissUpdates = true;
@@ -309,6 +310,10 @@ function useFragmentInternal(fragmentNode, fragmentRef, hookDisplayName, queryOp
   }
   !(fragmentRef == null || isPlural && Array.isArray(fragmentRef) && fragmentRef.length === 0 || fragmentSelector != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'Relay: Expected to receive an object where `...%s` was spread, ' + 'but the fragment reference was not found`. This is most ' + 'likely the result of:\n' + "- Forgetting to spread `%s` in `%s`'s parent's fragment.\n" + '- Conditionally fetching `%s` but unconditionally passing %s prop ' + 'to `%s`. If the parent fragment only fetches the fragment conditionally ' + '- with e.g. `@include`, `@skip`, or inside a `... on SomeType { }` ' + 'spread  - then the fragment reference will not exist. ' + 'In this case, pass `null` if the conditions for evaluating the ' + 'fragment are not met (e.g. if the `@include(if)` value is false.)', fragmentNode.name, fragmentNode.name, hookDisplayName, fragmentNode.name, hookDisplayName) : invariant(false) : void 0;
   var environment = useRelayEnvironment();
+  var loggerContext;
+  if (RelayFeatureFlags.ENABLE_UI_CONTEXT_ON_RELAY_LOGGER) {
+    loggerContext = useRelayLoggingContext();
+  }
   var _useState = useState(function () {
       return getFragmentState(environment, fragmentSelector);
     }),
@@ -412,7 +417,7 @@ function useFragmentInternal(fragmentNode, fragmentRef, hookDisplayName, queryOp
       }
     }
   }
-  handlePotentialSnapshotErrorsForState(environment, state);
+  handlePotentialSnapshotErrorsForState(environment, state, loggerContext);
   var hasPendingStateChanges = useRef(false);
   useEffect(function () {
     var currentState = subscribedState;

package/lib/relay-hooks/useFragmentInternal_EXPERIMENTAL.js

@@ -7,6 +7,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _require = require('./QueryResource'),
   getQueryResourceForEnvironment = _require.getQueryResourceForEnvironment;
 var useRelayEnvironment = require('./useRelayEnvironment');
+var useRelayLoggingContext = require('./useRelayLoggingContext');
 var invariant = require('invariant');
 var _require2 = require('react'),
   useDebugValue = _require2.useDebugValue,
@@ -114,16 +115,16 @@ function getSuspendingLiveResolver(state) {
     return missingFields;
   }
 }
-function handlePotentialSnapshotErrorsForState(environment, state) {
+function handlePotentialSnapshotErrorsForState(environment, state, loggingContext) {
   if (state.kind === 'singular') {
-    handlePotentialSnapshotErrors(environment, state.snapshot.errorResponseFields);
+    handlePotentialSnapshotErrors(environment, state.snapshot.fieldErrors, loggingContext);
   } else if (state.kind === 'plural') {
     var _iterator5 = (0, _createForOfIteratorHelper2["default"])(state.snapshots),
       _step5;
     try {
       for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
         var snapshot = _step5.value;
-        handlePotentialSnapshotErrors(environment, snapshot.errorResponseFields);
+        handlePotentialSnapshotErrors(environment, snapshot.fieldErrors, loggingContext);
       }
     } catch (err) {
       _iterator5.e(err);
@@ -150,7 +151,7 @@ function handleMissedUpdates(environment, state) {
       missingLiveResolverFields: currentSnapshot.missingLiveResolverFields,
       seenRecords: currentSnapshot.seenRecords,
       selector: currentSnapshot.selector,
-      errorResponseFields: currentSnapshot.errorResponseFields
+      fieldErrors: currentSnapshot.fieldErrors
     };
     return [updatedData !== state.snapshot.data, {
       kind: 'singular',
@@ -173,7 +174,7 @@ function handleMissedUpdates(environment, state) {
         missingLiveResolverFields: _currentSnapshot.missingLiveResolverFields,
         seenRecords: _currentSnapshot.seenRecords,
         selector: _currentSnapshot.selector,
-        errorResponseFields: _currentSnapshot.errorResponseFields
+        fieldErrors: _currentSnapshot.fieldErrors
       };
       if (_updatedData !== snapshot.data) {
         didMissUpdates = true;
@@ -324,6 +325,10 @@ function useFragmentInternal_EXPERIMENTAL(fragmentNode, fragmentRef, hookDisplay
   }
   !(fragmentRef == null || isPlural && Array.isArray(fragmentRef) && fragmentRef.length === 0 || fragmentSelector != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'Relay: Expected to receive an object where `...%s` was spread, ' + 'but the fragment reference was not found`. This is most ' + 'likely the result of:\n' + "- Forgetting to spread `%s` in `%s`'s parent's fragment.\n" + '- Conditionally fetching `%s` but unconditionally passing %s prop ' + 'to `%s`. If the parent fragment only fetches the fragment conditionally ' + '- with e.g. `@include`, `@skip`, or inside a `... on SomeType { }` ' + 'spread  - then the fragment reference will not exist. ' + 'In this case, pass `null` if the conditions for evaluating the ' + 'fragment are not met (e.g. if the `@include(if)` value is false.)', fragmentNode.name, fragmentNode.name, hookDisplayName, fragmentNode.name, hookDisplayName) : invariant(false) : void 0;
   var environment = useRelayEnvironment();
+  var loggerContext;
+  if (RelayFeatureFlags.ENABLE_UI_CONTEXT_ON_RELAY_LOGGER) {
+    loggerContext = useRelayLoggingContext();
+  }
   var _useState = useState(function () {
       return getFragmentState(environment, fragmentSelector);
     }),
@@ -414,7 +419,7 @@ function useFragmentInternal_EXPERIMENTAL(fragmentNode, fragmentRef, hookDisplay
       }
     }
   }
-  handlePotentialSnapshotErrorsForState(environment, state);
+  handlePotentialSnapshotErrorsForState(environment, state, loggerContext);
   var storeSubscriptionRef = useRef(null);
   useEffect(function () {
     var storeSubscription = storeSubscriptionRef.current;

package/lib/relay-hooks/useLoadMoreFunction.js

@@ -71,6 +71,7 @@ function useLoadMoreFunction_CURRENT(args) {
       disposeFetch();
     };
   }, [disposeFetch]);
+  var isRequestInvalid = fragmentData == null || isParentQueryActive;
   var loadMore = useCallback(function (count, options) {
     var onComplete = options === null || options === void 0 ? void 0 : options.onComplete;
     if (isMountedRef.current !== true) {
@@ -80,7 +81,7 @@ function useLoadMoreFunction_CURRENT(args) {
       };
     }
     var fragmentSelector = getSelector(fragmentNode, fragmentRef);
-    if (isFetchingRef.current === true || fragmentData == null || isParentQueryActive) {
+    if (isFetchingRef.current === true || isRequestInvalid) {
       if (fragmentSelector == null) {
         process.env.NODE_ENV !== "production" ? warning(false, 'Relay: Unexpected fetch while using a null fragment ref ' + 'for fragment `%s` in `%s`. When fetching more items, we expect ' + "initial fragment data to be non-null. Please make sure you're " + 'passing a valid fragment ref to `%s` before paginating.', fragmentNode.name, componentDisplayName, componentDisplayName) : void 0;
       }
@@ -125,7 +126,7 @@ function useLoadMoreFunction_CURRENT(args) {
     return {
       dispose: disposeFetch
     };
-  }, [environment, identifierValue, direction, cursor, startFetch, disposeFetch, completeFetch, isFetchingRef, isParentQueryActive, fragmentData, fragmentNode.name, fragmentRef, componentDisplayName]);
+  }, [environment, identifierValue, direction, cursor, startFetch, disposeFetch, completeFetch, isFetchingRef, isRequestInvalid, fragmentNode.name, fragmentRef, componentDisplayName]);
   return [loadMore, hasMore, disposeFetch];
 }
 module.exports = useLoadMoreFunction;