react-relay 20.1.1 → 21.0.1

package/hooks.d.ts

@@ -0,0 +1,89 @@
+/**
+ * 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.
+ */
+
+export {
+    EntryPoint,
+    EntryPointComponent,
+    EntryPointProps,
+    EnvironmentProviderOptions,
+    IEnvironmentProvider,
+    JSResourceReference,
+    LoadQueryOptions,
+    PreloadedEntryPoint,
+    PreloadedQuery,
+    PreloadFetchPolicy,
+    PreloadOptions,
+    PreloadProps,
+    PreloadQueryStatus,
+    ThinNestedEntryPointParams,
+    ThinQueryParams,
+    VariablesOf,
+} from './ReactRelayTypes';
+
+export {
+    DataID,
+    DeclarativeMutationConfig,
+    Disposable,
+    FetchPolicy,
+    GraphQLTaggedNode,
+    // RelayRuntime has two environment exports: one interface, one concrete.
+    IEnvironment as Environment,
+    MutationType,
+    MutationTypes,
+    NormalizationSelector,
+    OperationDescriptor,
+    RangeOperation,
+    RangeOperations,
+    ReaderSelector,
+    RelayContext,
+    Snapshot,
+    Variables,
+} from 'relay-runtime';
+export { MatchContainerProps, MatchPointer } from './relay-hooks/MatchContainer';
+export { ProfilerContextType } from './relay-hooks/ProfilerContext';
+export { Direction, LoadMoreFn } from './relay-hooks/useLoadMoreFunction';
+export { UseMutationConfig } from './relay-hooks/useMutation';
+export { UseQueryLoaderLoadQueryOptions } from './relay-hooks/useQueryLoader';
+export { RefetchableOptions as RefetchOptions, RefetchFn, RefetchFnDynamic } from './ReactRelayTypes';
+
+// /**
+//  * The public interface for Relay Hooks.
+//  */
+
+export { graphql } from 'relay-runtime';
+
+export { ConnectionHandler } from 'relay-runtime';
+
+export { applyOptimisticMutation } from 'relay-runtime';
+export { commitLocalUpdate } from 'relay-runtime';
+export { commitMutation } from 'relay-runtime';
+
+export { readInlineData } from 'relay-runtime';
+export { requestSubscription } from 'relay-runtime';
+
+export { EntryPointContainer } from './relay-hooks/EntryPointContainer.react';
+export { RelayEnvironmentProvider } from './relay-hooks/RelayEnvironmentProvider';
+
+export { ProfilerContext } from './relay-hooks/ProfilerContext';
+
+export { fetchQuery } from 'relay-runtime';
+
+export { loadEntryPoint } from './relay-hooks/loadEntryPoint';
+export { loadQuery } from './relay-hooks/loadQuery';
+
+export { useClientQuery } from './relay-hooks/useClientQuery';
+export { useEntryPointLoader } from './relay-hooks/useEntryPointLoader';
+export { useFragment } from './relay-hooks/useFragment';
+export { useLazyLoadQuery } from './relay-hooks/useLazyLoadQuery';
+export { useMutation } from './relay-hooks/useMutation';
+export { usePaginationFragment } from './relay-hooks/usePaginationFragment';
+export { usePreloadedQuery } from './relay-hooks/usePreloadedQuery';
+export { useQueryLoader } from './relay-hooks/useQueryLoader';
+export { useRefetchableFragment } from './relay-hooks/useRefetchableFragment';
+export { useRelayEnvironment } from './relay-hooks/useRelayEnvironment';
+export { useSubscribeToInvalidationState } from './relay-hooks/useSubscribeToInvalidationState';
+export { useSubscription } from './relay-hooks/useSubscription';

package/hooks.js

@@ -1,5 +1,5 @@
 /**
- * Relay v20.1.1
+ * Relay v21.0.1
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/hooks.js.flow

@@ -11,6 +11,8 @@
 
 'use strict';
 
+/* eslint relay-internal/esm-compatible-cjs: error */
+
 const EntryPointContainer = require('./relay-hooks/EntryPointContainer.react');
 const loadEntryPoint = require('./relay-hooks/loadEntryPoint');
 const {loadQuery} = require('./relay-hooks/loadQuery');
@@ -20,6 +22,7 @@ const useEntryPointLoader = require('./relay-hooks/useEntryPointLoader');
 const useFragment = require('./relay-hooks/useFragment');
 const useLazyLoadQuery = require('./relay-hooks/useLazyLoadQuery');
 const useMutation = require('./relay-hooks/useMutation');
+const useMutationAction_EXPERIMENTAL = require('./relay-hooks/useMutationAction_EXPERIMENTAL');
 const usePaginationFragment = require('./relay-hooks/usePaginationFragment');
 const usePreloadedQuery = require('./relay-hooks/usePreloadedQuery');
 const useQueryLoader = require('./relay-hooks/useQueryLoader');
@@ -62,26 +65,37 @@ export type {
   FetchPolicy,
 } from 'relay-runtime';
 
+const {
+  ConnectionHandler,
+  applyOptimisticMutation,
+  commitLocalUpdate,
+  commitMutation,
+  graphql,
+  readInlineData,
+  requestSubscription,
+  fetchQuery,
+} = RelayRuntime;
+
 /**
  * The public interface for Relay Hooks.
  * This will eventually become the main public interface for react-relay.
  */
 module.exports = {
-  ConnectionHandler: RelayRuntime.ConnectionHandler,
+  ConnectionHandler,
 
-  applyOptimisticMutation: RelayRuntime.applyOptimisticMutation,
-  commitLocalUpdate: RelayRuntime.commitLocalUpdate,
-  commitMutation: RelayRuntime.commitMutation,
-  graphql: RelayRuntime.graphql,
-  readInlineData: RelayRuntime.readInlineData,
-  requestSubscription: RelayRuntime.requestSubscription,
+  applyOptimisticMutation,
+  commitLocalUpdate,
+  commitMutation,
+  graphql,
+  readInlineData,
+  requestSubscription,
 
   EntryPointContainer: EntryPointContainer,
   RelayEnvironmentProvider: RelayEnvironmentProvider,
 
   ProfilerContext: ProfilerContext,
 
-  fetchQuery: RelayRuntime.fetchQuery,
+  fetchQuery,
 
   loadQuery: loadQuery,
   loadEntryPoint: loadEntryPoint,
@@ -91,6 +105,7 @@ module.exports = {
   useEntryPointLoader: useEntryPointLoader,
   useQueryLoader: useQueryLoader,
   useMutation: useMutation,
+  useMutationAction_EXPERIMENTAL: useMutationAction_EXPERIMENTAL,
   usePaginationFragment: usePaginationFragment,
   usePreloadedQuery: usePreloadedQuery,
   useRefetchableFragment: useRefetchableFragment,

package/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 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.
+ */
+
+export * from './hooks';
+export * from './legacy';

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v20.1.1
+ * Relay v21.0.1
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/index.js.flow

@@ -9,8 +9,14 @@
  * @oncall relay
  */
 
+/**
+ * LLM/AI Agent: Relay documentation is available in node_modules/relay-runtime/llm-docs/
+ */
+
 'use strict';
 
+/* eslint relay-internal/esm-compatible-cjs: error */
+
 const ReactRelayContext = require('./ReactRelayContext');
 const ReactRelayFragmentContainer = require('./ReactRelayFragmentContainer');
 const ReactRelayLocalQueryRenderer = require('./ReactRelayLocalQueryRenderer');
@@ -27,6 +33,7 @@ const useEntryPointLoader = require('./relay-hooks/useEntryPointLoader');
 const useFragment = require('./relay-hooks/useFragment');
 const useLazyLoadQuery = require('./relay-hooks/useLazyLoadQuery');
 const useMutation = require('./relay-hooks/useMutation');
+const useMutationAction_EXPERIMENTAL = require('./relay-hooks/useMutationAction_EXPERIMENTAL');
 const usePaginationFragment = require('./relay-hooks/usePaginationFragment');
 const usePrefetchableForwardPaginationFragment = require('./relay-hooks/usePrefetchableForwardPaginationFragment');
 const usePreloadedQuery = require('./relay-hooks/usePreloadedQuery');
@@ -80,31 +87,49 @@ export type {
   FetchPolicy,
 } from 'relay-runtime';
 
+const {
+  ConnectionHandler,
+  MutationTypes,
+  RangeOperations,
+  applyOptimisticMutation,
+  commitLocalUpdate,
+  commitMutation,
+  fetchQuery_DEPRECATED,
+  graphql,
+  readInlineData,
+  requestSubscription,
+  fetchQuery,
+} = RelayRuntime;
+
+const createFragmentContainer = ReactRelayFragmentContainer.createContainer;
+const createPaginationContainer = ReactRelayPaginationContainer.createContainer;
+const createRefetchContainer = ReactRelayRefetchContainer.createContainer;
+
 /**
  * The public interface to react-relay.
  * Currently contains both Relay Hooks and legacy Container APIs.
  * Will eventually only export the interface from ./hooks.js.
  */
 module.exports = {
-  ConnectionHandler: RelayRuntime.ConnectionHandler,
+  ConnectionHandler,
   QueryRenderer: ReactRelayQueryRenderer,
   LocalQueryRenderer: ReactRelayLocalQueryRenderer,
 
-  MutationTypes: RelayRuntime.MutationTypes,
-  RangeOperations: RelayRuntime.RangeOperations,
+  MutationTypes,
+  RangeOperations,
 
   ReactRelayContext,
 
-  applyOptimisticMutation: RelayRuntime.applyOptimisticMutation,
-  commitLocalUpdate: RelayRuntime.commitLocalUpdate,
-  commitMutation: RelayRuntime.commitMutation,
-  createFragmentContainer: ReactRelayFragmentContainer.createContainer,
-  createPaginationContainer: ReactRelayPaginationContainer.createContainer,
-  createRefetchContainer: ReactRelayRefetchContainer.createContainer,
-  fetchQuery_DEPRECATED: RelayRuntime.fetchQuery_DEPRECATED,
-  graphql: RelayRuntime.graphql,
-  readInlineData: RelayRuntime.readInlineData,
-  requestSubscription: RelayRuntime.requestSubscription,
+  applyOptimisticMutation,
+  commitLocalUpdate,
+  commitMutation,
+  createFragmentContainer,
+  createPaginationContainer,
+  createRefetchContainer,
+  fetchQuery_DEPRECATED,
+  graphql,
+  readInlineData,
+  requestSubscription,
 
   // Relay Hooks
   EntryPointContainer: EntryPointContainer,
@@ -112,7 +137,7 @@ module.exports = {
 
   ProfilerContext: ProfilerContext,
 
-  fetchQuery: RelayRuntime.fetchQuery,
+  fetchQuery,
 
   loadQuery: loadQuery,
   loadEntryPoint: loadEntryPoint,
@@ -123,6 +148,7 @@ module.exports = {
   useEntryPointLoader: useEntryPointLoader,
   useQueryLoader: useQueryLoader,
   useMutation: useMutation,
+  useMutationAction_EXPERIMENTAL: useMutationAction_EXPERIMENTAL,
   usePaginationFragment: usePaginationFragment,
   usePreloadedQuery: usePreloadedQuery,
   useRefetchableFragment: useRefetchableFragment,

package/isRelayEnvironment.js.flow

@@ -15,7 +15,7 @@
  * Determine if a given value is an object that implements the `Environment`
  * interface defined in `RelayEnvironmentTypes`.
  */
-function isRelayEnvironment(environment: mixed): boolean {
+function isRelayEnvironment(environment: unknown): boolean {
   return (
     typeof environment === 'object' &&
     environment !== null &&

package/jest-react/internalAct.js.flow

@@ -30,7 +30,7 @@ const Scheduler = require('scheduler/unstable_mock');
 interface Thenable<+R> {
   then<U>(
     onFulfill: (value: R) => void | Thenable<U> | U,
-    onReject: (error: mixed) => void | Thenable<U> | U,
+    onReject: (error: unknown) => void | Thenable<U> | U,
   ): void | Thenable<U>;
 }
 

package/legacy.d.ts

@@ -0,0 +1,143 @@
+/**
+ * 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.
+ */
+
+import {MappedFragmentProps, RelayPaginationProp, RelayProp, RelayRefetchProp} from './ReactRelayTypes';
+import * as React from 'react';
+import {
+  _FragmentRefs,
+  _RefType,
+  CacheConfig,
+  FetchPolicy,
+  GraphQLTaggedNode,
+  IEnvironment,
+  OperationType,
+  PageInfo,
+  RelayContext,
+  Variables,
+} from 'relay-runtime';
+
+export { FragmentRef, RelayPaginationProp, RelayProp, RelayRefetchProp } from './ReactRelayTypes';
+
+export {
+    DataID,
+    DeclarativeMutationConfig,
+    Disposable,
+    FetchPolicy,
+    GraphQLTaggedNode,
+    // RelayRuntime has two environment exports: one interface, one concrete.
+    IEnvironment as Environment,
+    MutationType,
+    NormalizationSelector,
+    OperationDescriptor,
+    RangeOperation,
+    ReaderSelector,
+    RelayContext,
+    Snapshot,
+    Variables,
+} from 'relay-runtime';
+
+/**
+ * Legacy react-relay exports.
+ * Should prefer using interface defined in ./hooks.js
+ */
+export { ConnectionHandler } from 'relay-runtime';
+export interface QueryRendererProps<TOperation extends OperationType> {
+    environment: IEnvironment;
+    query: GraphQLTaggedNode | null | undefined;
+    render: (renderProps: {
+        error: Error | null;
+        props: TOperation['response'] | null;
+        retry: (() => void) | null;
+    }) => React.ReactNode;
+    variables: TOperation['variables'];
+}
+declare class ReactRelayQueryRenderer<TOperation extends OperationType> extends React.Component<
+    {
+        cacheConfig?: CacheConfig | null | undefined;
+        fetchPolicy?: FetchPolicy | undefined;
+    } & QueryRendererProps<TOperation>
+> {}
+export { ReactRelayQueryRenderer as QueryRenderer };
+
+declare class ReactRelayLocalQueryRenderer<TOperation extends OperationType> extends React.Component<
+    QueryRendererProps<TOperation>
+> {}
+export { ReactRelayLocalQueryRenderer as LocalQueryRenderer };
+
+export { MutationTypes } from 'relay-runtime';
+export { RangeOperations } from 'relay-runtime';
+
+export const ReactRelayContext: React.Context<RelayContext | null>;
+
+export { applyOptimisticMutation } from 'relay-runtime';
+export { commitLocalUpdate } from 'relay-runtime';
+export { commitMutation } from 'relay-runtime';
+
+export type ContainerProps<Props> = MappedFragmentProps<Pick<Props, Exclude<keyof Props, 'relay'>>>;
+export type RelayProps<Props> = ContainerProps<Props>; // TODO: validate this
+export type Container<Props> = React.ComponentType<
+    ContainerProps<Props> & { componentRef?: ((ref: any) => void) | undefined }
+>;
+
+// TODO: validate the bellow three
+export type RelayFragmentContainer<TComponent extends React.ElementType> = React.ComponentType<
+    ContainerProps<React.ComponentPropsWithoutRef<TComponent>>
+>;
+
+export type RelayPaginationContainer<TComponent extends React.ElementType> = React.ComponentType<
+    ContainerProps<React.ComponentPropsWithoutRef<TComponent>>
+>;
+
+export type RelayRefetchContainer<TComponent extends React.ElementType> = React.ComponentType<
+    ContainerProps<React.ComponentPropsWithoutRef<TComponent>>
+>;
+
+type PropsWithoutRelay<C extends keyof React.JSX.IntrinsicElements | React.JSXElementConstructor<any>> =
+    React.JSX.LibraryManagedAttributes<C, Omit<React.ComponentProps<C>, 'relay'>>;
+
+export function createFragmentContainer<
+    C extends React.ComponentType<React.ComponentProps<C> & { relay?: RelayProp | undefined }>,
+>(Component: C, fragmentSpec: Record<string, GraphQLTaggedNode>): Container<PropsWithoutRelay<C>>;
+
+export { fetchQuery_DEPRECATED } from 'relay-runtime';
+
+export { graphql } from 'relay-runtime';
+export { readInlineData } from 'relay-runtime';
+export { requestSubscription } from 'relay-runtime';
+
+export function createPaginationContainer<
+    C extends React.ComponentType<React.ComponentProps<C> & { relay: RelayPaginationProp }>,
+>(
+    Component: C,
+    fragmentSpec: Record<string, GraphQLTaggedNode>,
+    connectionConfig: ConnectionConfig<PropsWithoutRelay<C>>,
+): Container<PropsWithoutRelay<C>>;
+
+export function createRefetchContainer<
+    C extends React.ComponentType<React.ComponentProps<C> & { relay: RelayRefetchProp }>,
+>(
+    Component: C,
+    fragmentSpec: Record<string, GraphQLTaggedNode>,
+    refetchQuery: GraphQLTaggedNode,
+): Container<PropsWithoutRelay<C>>;
+
+export interface ConnectionConfig<Props = object> {
+    direction?: 'backward' | 'forward' | undefined;
+    getConnectionFromProps?: ((props: Props) => ConnectionData | null | undefined) | undefined;
+    getFragmentVariables?: ((prevVars: Variables, totalCount: number) => Variables) | undefined;
+    getVariables: (
+        props: Props,
+        paginationInfo: { count: number; cursor?: string | null | undefined },
+        fragmentVariables: Variables,
+    ) => Variables;
+    query: GraphQLTaggedNode;
+}
+
+interface ConnectionData {
+    edges?: readonly any[] | null | undefined;
+    pageInfo?: Partial<PageInfo> | null | undefined;
+}

package/legacy.js

@@ -1,5 +1,5 @@
 /**
- * Relay v20.1.1
+ * Relay v21.0.1
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/legacy.js.flow

@@ -11,6 +11,8 @@
 
 'use strict';
 
+/* eslint relay-internal/esm-compatible-cjs: error */
+
 const ReactRelayContext = require('./ReactRelayContext');
 const ReactRelayFragmentContainer = require('./ReactRelayFragmentContainer');
 const ReactRelayLocalQueryRenderer = require('./ReactRelayLocalQueryRenderer');
@@ -47,28 +49,45 @@ export type {
   FetchPolicy,
 } from 'relay-runtime';
 
+const {
+  ConnectionHandler,
+  MutationTypes,
+  RangeOperations,
+  applyOptimisticMutation,
+  commitLocalUpdate,
+  commitMutation,
+  fetchQuery_DEPRECATED,
+  graphql,
+  readInlineData,
+  requestSubscription,
+} = RelayRuntime;
+
+const createFragmentContainer = ReactRelayFragmentContainer.createContainer;
+const createPaginationContainer = ReactRelayPaginationContainer.createContainer;
+const createRefetchContainer = ReactRelayRefetchContainer.createContainer;
+
 /**
  * Legacy react-relay exports.
  * Should prefer using interface defined in ./hooks.js
  */
 module.exports = {
-  ConnectionHandler: RelayRuntime.ConnectionHandler,
+  ConnectionHandler,
   QueryRenderer: ReactRelayQueryRenderer,
   LocalQueryRenderer: ReactRelayLocalQueryRenderer,
 
-  MutationTypes: RelayRuntime.MutationTypes,
-  RangeOperations: RelayRuntime.RangeOperations,
+  MutationTypes,
+  RangeOperations,
 
   ReactRelayContext,
 
-  applyOptimisticMutation: RelayRuntime.applyOptimisticMutation,
-  commitLocalUpdate: RelayRuntime.commitLocalUpdate,
-  commitMutation: RelayRuntime.commitMutation,
-  createFragmentContainer: ReactRelayFragmentContainer.createContainer,
-  createPaginationContainer: ReactRelayPaginationContainer.createContainer,
-  createRefetchContainer: ReactRelayRefetchContainer.createContainer,
-  fetchQuery_DEPRECATED: RelayRuntime.fetchQuery_DEPRECATED,
-  graphql: RelayRuntime.graphql,
-  readInlineData: RelayRuntime.readInlineData,
-  requestSubscription: RelayRuntime.requestSubscription,
+  applyOptimisticMutation,
+  commitLocalUpdate,
+  commitMutation,
+  createFragmentContainer,
+  createPaginationContainer,
+  createRefetchContainer,
+  fetchQuery_DEPRECATED,
+  graphql,
+  readInlineData,
+  requestSubscription,
 };

package/lib/ReactRelayFragmentContainer.js

@@ -59,8 +59,8 @@ function createContainerWithFragments(Component, fragments) {
         resolver = createFragmentSpecResolver(relayContext, containerName, fragments, nextProps, rootIsQueryRenderer);
         return {
           data: resolver.resolve(),
-          prevPropsContext: relayContext,
           prevProps: nextProps,
+          prevPropsContext: relayContext,
           relayProp: getRelayProp(relayContext.environment),
           resolver: resolver
         };

package/lib/ReactRelayPaginationContainer.js

@@ -77,8 +77,8 @@ function findConnectionMetadata(fragments) {
 }
 function toObserver(observerOrCallback) {
   return typeof observerOrCallback === 'function' ? {
-    error: observerOrCallback,
     complete: observerOrCallback,
+    error: observerOrCallback,
     unsubscribe: function unsubscribe(subscription) {
       typeof observerOrCallback === 'function' && observerOrCallback();
     }
@@ -173,9 +173,9 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
         _this._resolver = createFragmentSpecResolver(relayContext, containerName, fragments, props, rootIsQueryRenderer, _this._handleFragmentDataUpdate);
       }
       _this.state = {
+        contextForChildren: relayContext,
         data: _this._resolver.resolve(),
         prevContext: relayContext,
-        contextForChildren: relayContext,
         relayProp: _this._buildRelayProp(relayContext),
         resolverGeneration: 0
       };
@@ -217,8 +217,8 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
         }
         this.setState(function (prevState) {
           return {
-            prevContext: relayContext,
             contextForChildren: relayContext,
+            prevContext: relayContext,
             relayProp: _this2._buildRelayProp(relayContext),
             resolverGeneration: prevState.resolverGeneration + 1
           };
@@ -258,11 +258,11 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
     };
     _proto._buildRelayProp = function _buildRelayProp(relayContext) {
       return {
+        environment: relayContext.environment,
         hasMore: this._hasMore,
         isLoading: this._isLoading,
         loadMore: this._loadMore,
-        refetchConnection: this._refetchConnection,
-        environment: relayContext.environment
+        refetchConnection: this._refetchConnection
       };
     };
     _proto._rerenderIfStoreHasChanged = function _rerenderIfStoreHasChanged() {
@@ -373,10 +373,10 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
         var nextData = _this3._resolver.resolve();
         if (!areEqual(prevData, nextData)) {
           _this3.setState({
-            data: nextData,
             contextForChildren: {
               environment: _this3.props.__relayContext.environment
-            }
+            },
+            data: nextData
           }, complete);
         } else {
           complete();
@@ -401,8 +401,8 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
           });
         });
       })["do"]({
-        error: cleanup,
         complete: cleanup,
+        error: cleanup,
         unsubscribe: cleanup
       }).subscribe(observer || {});
       this._refetchSubscription = this._isARequestInFlight ? refetchSubscription : null;

package/lib/ReactRelayRefetchContainer.js

@@ -63,8 +63,8 @@ function createContainerWithFragments(Component, fragments, taggedNode) {
           cacheConfig.metadata = options === null || options === void 0 ? void 0 : options.metadata;
         }
         var observer = typeof observerOrCallback === 'function' ? {
-          next: observerOrCallback,
-          error: observerOrCallback
+          error: observerOrCallback,
+          next: observerOrCallback
         } : observerOrCallback || {};
         var query = getRequest(taggedNode);
         var operation = createOperationDescriptor(query, fetchVariables, cacheConfig);
@@ -76,10 +76,10 @@ function createContainerWithFragments(Component, fragments, taggedNode) {
           _this.state.resolver.setVariables(fragmentVariables, operation.request.node);
           _this.setState(function (latestState) {
             return {
-              data: latestState.resolver.resolve(),
               contextForChildren: {
                 environment: _this.props.__relayContext.environment
-              }
+              },
+              data: latestState.resolver.resolve()
             };
           }, function () {
             observer.next && observer.next();
@@ -98,10 +98,10 @@ function createContainerWithFragments(Component, fragments, taggedNode) {
           return Observable.create(function (sink) {
             return _this.setState(function (latestState) {
               return {
-                data: latestState.resolver.resolve(),
                 contextForChildren: {
                   environment: _this.props.__relayContext.environment
-                }
+                },
+                data: latestState.resolver.resolve()
               };
             }, function () {
               sink.next();
@@ -129,11 +129,11 @@ function createContainerWithFragments(Component, fragments, taggedNode) {
       _this._refetchSubscription = null;
       var resolver = createFragmentSpecResolver(relayContext, containerName, fragments, props, rootIsQueryRenderer);
       _this.state = {
+        contextForChildren: relayContext,
         data: resolver.resolve(),
         localVariables: null,
         prevProps: props,
         prevPropsContext: relayContext,
-        contextForChildren: relayContext,
         relayProp: getRelayProp(relayContext.environment, _this._refetch),
         resolver: resolver
       };
@@ -168,11 +168,11 @@ function createContainerWithFragments(Component, fragments, taggedNode) {
       if (prevState.prevPropsContext.environment !== relayContext.environment || !areEqual(prevRootVariables, nextRootVariables) || !areEqual(prevIDs, nextIDs)) {
         resolver = createFragmentSpecResolver(relayContext, containerName, fragments, nextProps, rootIsQueryRenderer);
         return {
+          contextForChildren: relayContext,
           data: resolver.resolve(),
           localVariables: null,
           prevProps: nextProps,
           prevPropsContext: relayContext,
-          contextForChildren: relayContext,
           relayProp: getRelayProp(relayContext.environment, prevState.relayProp.refetch),
           resolver: resolver
         };