react-relay 2.0.0-rc.2 → 5.0.0

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v2.0.0-rc.2
+ * Relay v5.0.0
  *
  * Copyright (c) 2013-present, Facebook, Inc.
  *
@@ -7,4 +7,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-module.exports = require('./lib/ReactRelayPublic.js');
+module.exports = require('./lib/index.js');

package/lib/ReactRelayContext.js

@@ -4,11 +4,14 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict-local
+ * 
  * @format
  */
 'use strict';
 
-var ReactRelayContext = require("react").createContext(null);
+var React = require("react");
 
-module.exports = ReactRelayContext;
+var _require = require("relay-runtime"),
+    createRelayContext = _require.__internal.createRelayContext;
+
+module.exports = createRelayContext(React);

package/lib/ReactRelayFragmentContainer.js

@@ -4,20 +4,37 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict-local
+ * 
  * @format
  */
 'use strict';
 
-var _objectSpread2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/objectSpread"));
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectWithoutPropertiesLoose2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
 
-var _inheritsLoose2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/inheritsLoose"));
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
-var _assertThisInitialized2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/assertThisInitialized"));
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 
-var _defineProperty2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/defineProperty"));
+var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var React = require("react");
+
+var areEqual = require("fbjs/lib/areEqual");
+
+var buildReactRelayContainer = require("./buildReactRelayContainer");
+
+var _require = require("./ReactRelayContainerUtils"),
+    getContainerName = _require.getContainerName;
+
+var _require2 = require("./RelayContext"),
+    assertRelayContext = _require2.assertRelayContext;
+
+var _require3 = require("relay-runtime"),
+    isScalarAndEqual = _require3.isScalarAndEqual;
 
 /**
  * Composes a React component class, returning a new class that intercepts
@@ -25,38 +42,32 @@ var _defineProperty2 = require("@babel/runtime/helpers/interopRequireDefault")(r
  * updates.
  */
 function createContainerWithFragments(Component, fragments) {
-  var containerName = require("./ReactRelayContainerUtils").getContainerName(Component);
+  var _class, _temp;
 
-  var Container =
+  var containerName = getContainerName(Component);
+  return _temp = _class =
   /*#__PURE__*/
   function (_React$Component) {
-    (0, _inheritsLoose2["default"])(Container, _React$Component);
+    (0, _inheritsLoose2["default"])(_class, _React$Component);
 
-    function Container(props) {
+    function _class(props) {
       var _this;
 
       _this = _React$Component.call(this, props) || this;
-      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])((0, _assertThisInitialized2["default"])(_this)), "_handleFragmentDataUpdate", function () {
-        var profiler = require("relay-runtime").RelayProfiler.profile('ReactRelayFragmentContainer.handleFragmentDataUpdate');
-
+      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "_handleFragmentDataUpdate", function () {
         var resolverFromThisUpdate = _this.state.resolver;
 
         _this.setState(function (updatedState) {
-          // If this event belongs to the current data source, update.
-          // Otherwise we should ignore it.
-          if (resolverFromThisUpdate === updatedState.resolver) {
-            return {
+          return (// If this event belongs to the current data source, update.
+            // Otherwise we should ignore it.
+            resolverFromThisUpdate === updatedState.resolver ? {
               data: updatedState.resolver.resolve(),
               relayProp: getRelayProp(updatedState.relayProp.environment)
-            };
-          }
-
-          return null;
-        }, profiler.stop);
+            } : null
+          );
+        });
       });
-
-      var relayContext = require("./RelayContext").assertRelayContext(props.__relayContext);
-
+      var relayContext = assertRelayContext(props.__relayContext);
       var createFragmentSpecResolver = relayContext.environment.unstable_internal.createFragmentSpecResolver; // Do not provide a subscription/callback here.
       // It is possible for this render to be interrupted or aborted,
       // In which case the subscription would cause a leak.
@@ -79,13 +90,11 @@ function createContainerWithFragments(Component, fragments) {
      */
 
 
-    Container.getDerivedStateFromProps = function getDerivedStateFromProps(nextProps, prevState) {
+    _class.getDerivedStateFromProps = function getDerivedStateFromProps(nextProps, prevState) {
       // Any props change could impact the query, so we mirror props in state.
       // This is an unusual pattern, but necessary for this container usecase.
       var prevProps = prevState.prevProps;
-
-      var relayContext = require("./RelayContext").assertRelayContext(nextProps.__relayContext);
-
+      var relayContext = assertRelayContext(nextProps.__relayContext);
       var _relayContext$environ = relayContext.environment.unstable_internal,
           createFragmentSpecResolver = _relayContext$environ.createFragmentSpecResolver,
           getDataIDsFromObject = _relayContext$environ.getDataIDsFromObject;
@@ -97,7 +106,7 @@ function createContainerWithFragments(Component, fragments) {
       // - Existing references are based on old variables.
       // - Pending fetches are for the previous records.
 
-      if (prevState.prevPropsContext.environment !== relayContext.environment || prevState.prevPropsContext.variables !== relayContext.variables || !require("fbjs/lib/areEqual")(prevIDs, nextIDs)) {
+      if (prevState.prevPropsContext.environment !== relayContext.environment || prevState.prevPropsContext.variables !== relayContext.variables || !areEqual(prevIDs, nextIDs)) {
         // Do not provide a subscription/callback here.
         // It is possible for this render to be interrupted or aborted,
         // In which case the subscription would cause a leak.
@@ -127,7 +136,7 @@ function createContainerWithFragments(Component, fragments) {
       return null;
     };
 
-    var _proto = Container.prototype;
+    var _proto = _class.prototype;
 
     _proto.componentDidMount = function componentDidMount() {
       this._subscribeToNewResolver();
@@ -167,18 +176,18 @@ function createContainerWithFragments(Component, fragments) {
             return true;
           }
         } else {
-          if (!fragments.hasOwnProperty(_key) && !require("relay-runtime").isScalarAndEqual(nextProps[_key], this.props[_key])) {
+          if (!fragments.hasOwnProperty(_key) && !isScalarAndEqual(nextProps[_key], this.props[_key])) {
             return true;
           }
         }
       }
 
       return false;
-    };
+    }
     /**
      * Render new data for the existing props/context.
      */
-
+    ;
 
     _proto._rerenderIfStoreHasChanged = function _rerenderIfStoreHasChanged() {
       var _this$state = this.state,
@@ -207,20 +216,14 @@ function createContainerWithFragments(Component, fragments) {
           componentRef = _this$props.componentRef,
           _ = _this$props.__relayContext,
           props = (0, _objectWithoutPropertiesLoose2["default"])(_this$props, ["componentRef", "__relayContext"]);
-      return require("react").createElement(Component, (0, _objectSpread2["default"])({}, props, this.state.data, {
+      return React.createElement(Component, (0, _objectSpread2["default"])({}, props, this.state.data, {
         ref: componentRef,
         relay: this.state.relayProp
       }));
     };
 
-    return Container;
-  }(require("react").Component);
-
-  (0, _defineProperty2["default"])(Container, "displayName", containerName);
-
-  require("./ReactRelayContainerProfiler").profileContainer(Container, 'ReactRelayFragmentContainer');
-
-  return Container;
+    return _class;
+  }(React.Component), (0, _defineProperty2["default"])(_class, "displayName", containerName), _temp;
 }
 
 function getRelayProp(environment) {
@@ -238,10 +241,9 @@ function getRelayProp(environment) {
 
 
 function createContainer(Component, fragmentSpec) {
-  return require("./buildReactRelayContainer")(Component, fragmentSpec, createContainerWithFragments);
+  return buildReactRelayContainer(Component, fragmentSpec, createContainerWithFragments);
 }
 
 module.exports = {
-  createContainer: createContainer,
-  createContainerWithFragments: createContainerWithFragments
+  createContainer: createContainer
 };

package/lib/ReactRelayFragmentMockRenderer.js

@@ -9,8 +9,12 @@
  */
 'use strict';
 
+var React = require("react");
+
+var ReactRelayContext = require("./ReactRelayContext");
+
 function ReactRelayFragmentMockRenderer(props) {
-  return require("react").createElement(require("./ReactRelayContext").Provider, {
+  return React.createElement(ReactRelayContext.Provider, {
     value: {
       environment: props.environment,
       variables: {}

package/lib/ReactRelayPaginationContainer.js

@@ -9,17 +9,48 @@
  */
 'use strict';
 
-var _extends2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/extends"));
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectWithoutPropertiesLoose2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _inheritsLoose2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/inheritsLoose"));
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
-var _assertThisInitialized2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/assertThisInitialized"));
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 
-var _defineProperty2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/defineProperty"));
+var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 
-var _objectSpread3 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/objectSpread"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+
+var React = require("react");
+
+var ReactRelayContext = require("./ReactRelayContext");
+
+var ReactRelayQueryFetcher = require("./ReactRelayQueryFetcher");
+
+var areEqual = require("fbjs/lib/areEqual");
+
+var buildReactRelayContainer = require("./buildReactRelayContainer");
+
+var forEachObject = require("fbjs/lib/forEachObject");
+
+var invariant = require("fbjs/lib/invariant");
+
+var warning = require("fbjs/lib/warning");
+
+var _require = require("./ReactRelayContainerUtils"),
+    getComponentName = _require.getComponentName,
+    getContainerName = _require.getContainerName;
+
+var _require2 = require("./RelayContext"),
+    assertRelayContext = _require2.assertRelayContext;
+
+var _require3 = require("relay-runtime"),
+    ConnectionInterface = _require3.ConnectionInterface,
+    Observable = _require3.Observable,
+    getFragmentOwners = _require3.getFragmentOwners,
+    isScalarAndEqual = _require3.isScalarAndEqual;
 
 var FORWARD = 'forward';
 
@@ -156,7 +187,7 @@ var FORWARD = 'forward';
  */
 function createGetConnectionFromProps(metadata) {
   var path = metadata.path;
-  !path ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'ReactRelayPaginationContainer: Unable to synthesize a ' + 'getConnectionFromProps function.') : require("fbjs/lib/invariant")(false) : void 0;
+  !path ? process.env.NODE_ENV !== "production" ? invariant(false, 'ReactRelayPaginationContainer: Unable to synthesize a ' + 'getConnectionFromProps function.') : invariant(false) : void 0;
   return function (props) {
     var data = props[metadata.fragmentName];
 
@@ -174,7 +205,7 @@ function createGetConnectionFromProps(metadata) {
 
 function createGetFragmentVariables(metadata) {
   var countVariable = metadata.count;
-  !countVariable ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'ReactRelayPaginationContainer: Unable to synthesize a ' + 'getFragmentVariables function.') : require("fbjs/lib/invariant")(false) : void 0;
+  !countVariable ? process.env.NODE_ENV !== "production" ? invariant(false, 'ReactRelayPaginationContainer: Unable to synthesize a ' + 'getFragmentVariables function.') : invariant(false) : void 0;
   return function (prevVars, totalCount) {
     return (0, _objectSpread3["default"])({}, prevVars, (0, _defineProperty2["default"])({}, countVariable, totalCount));
   };
@@ -195,15 +226,15 @@ function findConnectionMetadata(fragments) {
     }
 
     if (connectionMetadata) {
-      !(connectionMetadata.length === 1) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'ReactRelayPaginationContainer: Only a single @connection is ' + 'supported, `%s` has %s.', fragmentName, connectionMetadata.length) : require("fbjs/lib/invariant")(false) : void 0;
-      !!foundConnectionMetadata ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'ReactRelayPaginationContainer: Only a single fragment with ' + '@connection is supported.') : require("fbjs/lib/invariant")(false) : void 0;
+      !(connectionMetadata.length === 1) ? process.env.NODE_ENV !== "production" ? invariant(false, 'ReactRelayPaginationContainer: Only a single @connection is ' + 'supported, `%s` has %s.', fragmentName, connectionMetadata.length) : invariant(false) : void 0;
+      !!foundConnectionMetadata ? process.env.NODE_ENV !== "production" ? invariant(false, 'ReactRelayPaginationContainer: Only a single fragment with ' + '@connection is supported.') : invariant(false) : void 0;
       foundConnectionMetadata = (0, _objectSpread3["default"])({}, connectionMetadata[0], {
         fragmentName: fragmentName
       });
     }
   }
 
-  !(!isRelayModern || foundConnectionMetadata !== null) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'ReactRelayPaginationContainer: A @connection directive must be present.') : require("fbjs/lib/invariant")(false) : void 0;
+  !(!isRelayModern || foundConnectionMetadata !== null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'ReactRelayPaginationContainer: A @connection directive must be present.') : invariant(false) : void 0;
   return foundConnectionMetadata || {};
 }
 
@@ -218,41 +249,38 @@ function toObserver(observerOrCallback) {
 }
 
 function createContainerWithFragments(Component, fragments, connectionConfig) {
-  var componentName = require("./ReactRelayContainerUtils").getComponentName(Component);
-
-  var containerName = require("./ReactRelayContainerUtils").getContainerName(Component);
+  var _class, _temp;
 
+  var componentName = getComponentName(Component);
+  var containerName = getContainerName(Component);
   var metadata = findConnectionMetadata(fragments);
   var getConnectionFromProps = connectionConfig.getConnectionFromProps || createGetConnectionFromProps(metadata);
   var direction = connectionConfig.direction || metadata.direction;
-  !direction ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'ReactRelayPaginationContainer: Unable to infer direction of the ' + 'connection, possibly because both first and last are provided.') : require("fbjs/lib/invariant")(false) : void 0;
+  !direction ? process.env.NODE_ENV !== "production" ? invariant(false, 'ReactRelayPaginationContainer: Unable to infer direction of the ' + 'connection, possibly because both first and last are provided.') : invariant(false) : void 0;
   var getFragmentVariables = connectionConfig.getFragmentVariables || createGetFragmentVariables(metadata);
-
-  var Container =
+  return _temp = _class =
   /*#__PURE__*/
   function (_React$Component) {
-    (0, _inheritsLoose2["default"])(Container, _React$Component);
+    (0, _inheritsLoose2["default"])(_class, _React$Component);
 
-    function Container(props) {
+    function _class(props) {
       var _this;
 
       _this = _React$Component.call(this, props) || this;
-      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])((0, _assertThisInitialized2["default"])(_this)), "_handleFragmentDataUpdate", function () {
-        var profiler = require("relay-runtime").RelayProfiler.profile('ReactRelayPaginationContainer.handleFragmentDataUpdate');
-
+      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "_handleFragmentDataUpdate", function () {
         _this.setState({
           data: _this._resolver.resolve()
-        }, profiler.stop);
+        });
       });
-      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])((0, _assertThisInitialized2["default"])(_this)), "_hasMore", function () {
+      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "_hasMore", function () {
         var connectionData = _this._getConnectionData();
 
         return !!(connectionData && connectionData.hasMore && connectionData.cursor);
       });
-      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])((0, _assertThisInitialized2["default"])(_this)), "_isLoading", function () {
+      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "_isLoading", function () {
         return !!_this._refetchSubscription;
       });
-      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])((0, _assertThisInitialized2["default"])(_this)), "_refetchConnection", function (totalCount, observerOrCallback, refetchVariables) {
+      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "_refetchConnection", function (totalCount, observerOrCallback, refetchVariables) {
         if (!_this._canFetchPage('refetchConnection')) {
           return {
             dispose: function dispose() {}
@@ -274,7 +302,7 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
           dispose: fetch.unsubscribe
         };
       });
-      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])((0, _assertThisInitialized2["default"])(_this)), "_loadMore", function (pageSize, observerOrCallback, options) {
+      (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "_loadMore", function (pageSize, observerOrCallback, options) {
         if (!_this._canFetchPage('loadMore')) {
           return {
             dispose: function dispose() {}
@@ -286,10 +314,9 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
         var connectionData = _this._getConnectionData();
 
         if (!connectionData) {
-          require("relay-runtime").Observable.create(function (sink) {
+          Observable.create(function (sink) {
             return sink.complete();
           }).subscribe(observer);
-
           return null;
         }
 
@@ -299,12 +326,12 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
           return _this._refetchConnection(totalCount, observerOrCallback);
         }
 
-        var _ConnectionInterface$ = require("relay-runtime").ConnectionInterface.get(),
+        var _ConnectionInterface$ = ConnectionInterface.get(),
             END_CURSOR = _ConnectionInterface$.END_CURSOR,
             START_CURSOR = _ConnectionInterface$.START_CURSOR;
 
         var cursor = connectionData.cursor;
-        process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(cursor, 'ReactRelayPaginationContainer: Cannot `loadMore` without valid `%s` (got `%s`)', direction === FORWARD ? END_CURSOR : START_CURSOR, cursor) : void 0;
+        process.env.NODE_ENV !== "production" ? warning(cursor, 'ReactRelayPaginationContainer: Cannot `loadMore` without valid `%s` (got `%s`)', direction === FORWARD ? END_CURSOR : START_CURSOR, cursor) : void 0;
         var paginatingVariables = {
           count: pageSize,
           cursor: cursor,
@@ -317,9 +344,7 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
           dispose: fetch.unsubscribe
         };
       });
-
-      var relayContext = require("./RelayContext").assertRelayContext(props.__relayContext);
-
+      var relayContext = assertRelayContext(props.__relayContext);
       var createFragmentSpecResolver = relayContext.environment.unstable_internal.createFragmentSpecResolver;
       _this._isARequestInFlight = false;
       _this._refetchSubscription = null;
@@ -342,11 +367,10 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
      */
 
 
-    var _proto = Container.prototype;
+    var _proto = _class.prototype;
 
     _proto.UNSAFE_componentWillReceiveProps = function UNSAFE_componentWillReceiveProps(nextProps) {
-      var relayContext = require("./RelayContext").assertRelayContext(nextProps.__relayContext);
-
+      var relayContext = assertRelayContext(nextProps.__relayContext);
       var _relayContext$environ = relayContext.environment.unstable_internal,
           createFragmentSpecResolver = _relayContext$environ.createFragmentSpecResolver,
           getDataIDsFromObject = _relayContext$environ.getDataIDsFromObject;
@@ -357,7 +381,7 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
       // - Existing references are based on old variables.
       // - Pending fetches are for the previous records.
 
-      if (relayContext.environment !== this.state.prevContext.environment || relayContext.variables !== this.state.prevContext.variables || !require("fbjs/lib/areEqual")(prevIDs, nextIDs)) {
+      if (relayContext.environment !== this.state.prevContext.environment || relayContext.variables !== this.state.prevContext.variables || !areEqual(prevIDs, nextIDs)) {
         this._cleanup(); // Child containers rely on context.relay being mutated (for gDSFP).
 
 
@@ -404,7 +428,7 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
             return true;
           }
         } else {
-          if (!fragments.hasOwnProperty(_key) && !require("relay-runtime").isScalarAndEqual(nextProps[_key], this.props[_key])) {
+          if (!fragments.hasOwnProperty(_key) && !isScalarAndEqual(nextProps[_key], this.props[_key])) {
             return true;
           }
         }
@@ -421,11 +445,11 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
         refetchConnection: this._refetchConnection,
         environment: relayContext.environment
       };
-    };
+    }
     /**
      * Render new data for the existing props/context.
      */
-
+    ;
 
     _proto._getConnectionData = function _getConnectionData() {
       // Extract connection data and verify there are more edges to fetch
@@ -439,7 +463,7 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
         return null;
       }
 
-      var _ConnectionInterface$2 = require("relay-runtime").ConnectionInterface.get(),
+      var _ConnectionInterface$2 = ConnectionInterface.get(),
           EDGES = _ConnectionInterface$2.EDGES,
           PAGE_INFO = _ConnectionInterface$2.PAGE_INFO,
           HAS_NEXT_PAGE = _ConnectionInterface$2.HAS_NEXT_PAGE,
@@ -447,7 +471,7 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
           END_CURSOR = _ConnectionInterface$2.END_CURSOR,
           START_CURSOR = _ConnectionInterface$2.START_CURSOR;
 
-      !(typeof connectionData === 'object') ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'ReactRelayPaginationContainer: Expected `getConnectionFromProps()` in `%s`' + 'to return `null` or a plain object with %s and %s properties, got `%s`.', componentName, EDGES, PAGE_INFO, connectionData) : require("fbjs/lib/invariant")(false) : void 0;
+      !(typeof connectionData === 'object') ? process.env.NODE_ENV !== "production" ? invariant(false, 'ReactRelayPaginationContainer: Expected `getConnectionFromProps()` in `%s`' + 'to return `null` or a plain object with %s and %s properties, got `%s`.', componentName, EDGES, PAGE_INFO, connectionData) : invariant(false) : void 0;
       var edges = connectionData[EDGES];
       var pageInfo = connectionData[PAGE_INFO];
 
@@ -455,13 +479,13 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
         return null;
       }
 
-      !Array.isArray(edges) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'ReactRelayPaginationContainer: Expected `getConnectionFromProps()` in `%s`' + 'to return an object with %s: Array, got `%s`.', componentName, EDGES, edges) : require("fbjs/lib/invariant")(false) : void 0;
-      !(typeof pageInfo === 'object') ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'ReactRelayPaginationContainer: Expected `getConnectionFromProps()` in `%s`' + 'to return an object with %s: Object, got `%s`.', componentName, PAGE_INFO, pageInfo) : require("fbjs/lib/invariant")(false) : void 0;
+      !Array.isArray(edges) ? process.env.NODE_ENV !== "production" ? invariant(false, 'ReactRelayPaginationContainer: Expected `getConnectionFromProps()` in `%s`' + 'to return an object with %s: Array, got `%s`.', componentName, EDGES, edges) : invariant(false) : void 0;
+      !(typeof pageInfo === 'object') ? process.env.NODE_ENV !== "production" ? invariant(false, 'ReactRelayPaginationContainer: Expected `getConnectionFromProps()` in `%s`' + 'to return an object with %s: Object, got `%s`.', componentName, PAGE_INFO, pageInfo) : invariant(false) : void 0;
       var hasMore = direction === FORWARD ? pageInfo[HAS_NEXT_PAGE] : pageInfo[HAS_PREV_PAGE];
       var cursor = direction === FORWARD ? pageInfo[END_CURSOR] : pageInfo[START_CURSOR];
 
       if (typeof hasMore !== 'boolean' || edges.length !== 0 && typeof cursor === 'undefined') {
-        process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(false, 'ReactRelayPaginationContainer: Cannot paginate without %s fields in `%s`. ' + 'Be sure to fetch %s (got `%s`) and %s (got `%s`).', PAGE_INFO, componentName, direction === FORWARD ? HAS_NEXT_PAGE : HAS_PREV_PAGE, hasMore, direction === FORWARD ? END_CURSOR : START_CURSOR, cursor) : void 0;
+        process.env.NODE_ENV !== "production" ? warning(false, 'ReactRelayPaginationContainer: Cannot paginate without %s fields in `%s`. ' + 'Be sure to fetch %s (got `%s`) and %s (got `%s`).', PAGE_INFO, componentName, direction === FORWARD ? HAS_NEXT_PAGE : HAS_PREV_PAGE, hasMore, direction === FORWARD ? END_CURSOR : START_CURSOR, cursor) : void 0;
         return null;
       }
 
@@ -474,7 +498,7 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
 
     _proto._getQueryFetcher = function _getQueryFetcher() {
       if (!this._queryFetcher) {
-        this._queryFetcher = new (require("./ReactRelayQueryFetcher"))();
+        this._queryFetcher = new ReactRelayQueryFetcher();
       }
 
       return this._queryFetcher;
@@ -482,7 +506,7 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
 
     _proto._canFetchPage = function _canFetchPage(method) {
       if (this._isUnmounted) {
-        process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(false, 'ReactRelayPaginationContainer: Unexpected call of `%s` ' + 'on unmounted container `%s`. It looks like some instances ' + 'of your container still trying to fetch data but they already ' + 'unmounted. Please make sure you clear all timers, intervals, async ' + 'calls, etc that may trigger `%s` call.', method, containerName, method) : void 0;
+        process.env.NODE_ENV !== "production" ? warning(false, 'ReactRelayPaginationContainer: Unexpected call of `%s` ' + 'on unmounted container `%s`. It looks like some instances ' + 'of your container still trying to fetch data but they already ' + 'unmounted. Please make sure you clear all timers, intervals, async ' + 'calls, etc that may trigger `%s` call.', method, containerName, method) : void 0;
         return false;
       }
 
@@ -492,7 +516,7 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
     _proto._fetchPage = function _fetchPage(paginatingVariables, observer, options) {
       var _this2 = this;
 
-      var _assertRelayContext = require("./RelayContext").assertRelayContext(this.props.__relayContext),
+      var _assertRelayContext = assertRelayContext(this.props.__relayContext),
           environment = _assertRelayContext.environment;
 
       var _environment$unstable = environment.unstable_internal,
@@ -504,15 +528,32 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
           __relayContext = _this$props2.__relayContext,
           restProps = (0, _objectWithoutPropertiesLoose2["default"])(_this$props2, ["componentRef", "__relayContext"]);
       var props = (0, _objectSpread3["default"])({}, restProps, this.state.data);
-      var rootVariables = this.props.__relayContext.variables;
-      var fragmentVariables = getVariablesFromObject(rootVariables, fragments, restProps);
+      var rootVariables;
+      var fragmentVariables;
+      var fragmentOwners = getFragmentOwners(fragments, restProps); // NOTE: rootVariables are spread down below in a couple of places,
+      // so we compute them here from the fragment owners.
+      // For extra safety, we make sure the rootVariables include the
+      // variables from all owners in this fragmentSpec, even though they
+      // should all point to the same owner
+
+      forEachObject(fragments, function (__, key) {
+        var _ref, _fragmentOwner$, _ref2;
+
+        var fragmentOwner = fragmentOwners[key];
+        var fragmentOwnerVariables = Array.isArray(fragmentOwner) ? (_ref = (_fragmentOwner$ = fragmentOwner[0]) === null || _fragmentOwner$ === void 0 ? void 0 : _fragmentOwner$.variables) !== null && _ref !== void 0 ? _ref : {} : (_ref2 = fragmentOwner === null || fragmentOwner === void 0 ? void 0 : fragmentOwner.variables) !== null && _ref2 !== void 0 ? _ref2 : {};
+        rootVariables = (0, _objectSpread3["default"])({}, rootVariables, fragmentOwnerVariables);
+      });
+      fragmentVariables = getVariablesFromObject( // NOTE: We pass empty operationVariables because we want to prefer
+      // the variables from the fragment owner
+      {}, fragments, restProps, fragmentOwners);
       fragmentVariables = (0, _objectSpread3["default"])({}, rootVariables, fragmentVariables, this._refetchVariables);
       var fetchVariables = connectionConfig.getVariables(props, {
         count: paginatingVariables.count,
         cursor: paginatingVariables.cursor
       }, fragmentVariables);
-      !(typeof fetchVariables === 'object' && fetchVariables !== null) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'ReactRelayPaginationContainer: Expected `getVariables()` to ' + 'return an object, got `%s` in `%s`.', fetchVariables, componentName) : require("fbjs/lib/invariant")(false) : void 0;
+      !(typeof fetchVariables === 'object' && fetchVariables !== null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'ReactRelayPaginationContainer: Expected `getVariables()` to ' + 'return an object, got `%s` in `%s`.', fetchVariables, componentName) : invariant(false) : void 0;
       fetchVariables = (0, _objectSpread3["default"])({}, fetchVariables, this._refetchVariables);
+      fragmentVariables = (0, _objectSpread3["default"])({}, fetchVariables, fragmentVariables);
       var cacheConfig = options ? {
         force: !!options.force
       } : undefined;
@@ -531,7 +572,7 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
 
         var prevData = _this2._resolver.resolve();
 
-        _this2._resolver.setVariables(getFragmentVariables(fragmentVariables, paginatingVariables.totalCount));
+        _this2._resolver.setVariables(getFragmentVariables(fragmentVariables, paginatingVariables.totalCount), operation.node);
 
         var nextData = _this2._resolver.resolve(); // Workaround slightly different handling for connection in different
         // core implementations:
@@ -544,7 +585,7 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
         // TODO #14894725: remove PaginationContainer equal check
 
 
-        if (!require("fbjs/lib/areEqual")(prevData, nextData)) {
+        if (!areEqual(prevData, nextData)) {
           _this2.setState({
             data: nextData,
             contextForChildren: {
@@ -571,7 +612,7 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
         cacheConfig: cacheConfig,
         preservePreviousReferences: true
       }).mergeMap(function (payload) {
-        return require("relay-runtime").Observable.create(function (sink) {
+        return Observable.create(function (sink) {
           onNext(payload, function () {
             sink.next(); // pass void to public observer's `next`
 
@@ -611,22 +652,16 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
           componentRef = _this$props3.componentRef,
           __relayContext = _this$props3.__relayContext,
           props = (0, _objectWithoutPropertiesLoose2["default"])(_this$props3, ["componentRef", "__relayContext"]);
-      return require("react").createElement(require("./ReactRelayContext").Provider, {
+      return React.createElement(ReactRelayContext.Provider, {
         value: this.state.contextForChildren
-      }, require("react").createElement(Component, (0, _extends2["default"])({}, props, this.state.data, {
+      }, React.createElement(Component, (0, _extends2["default"])({}, props, this.state.data, {
         ref: componentRef,
         relay: this.state.relayProp
       })));
     };
 
-    return Container;
-  }(require("react").Component);
-
-  (0, _defineProperty2["default"])(Container, "displayName", containerName);
-
-  require("./ReactRelayContainerProfiler").profileContainer(Container, 'ReactRelayPaginationContainer');
-
-  return Container;
+    return _class;
+  }(React.Component), (0, _defineProperty2["default"])(_class, "displayName", containerName), _temp;
 }
 /**
  * Wrap the basic `createContainer()` function with logic to adapt to the
@@ -638,12 +673,11 @@ function createContainerWithFragments(Component, fragments, connectionConfig) {
 
 
 function createContainer(Component, fragmentSpec, connectionConfig) {
-  return require("./buildReactRelayContainer")(Component, fragmentSpec, function (ComponentClass, fragments) {
+  return buildReactRelayContainer(Component, fragmentSpec, function (ComponentClass, fragments) {
     return createContainerWithFragments(ComponentClass, fragments, connectionConfig);
   });
 }
 
 module.exports = {
-  createContainer: createContainer,
-  createContainerWithFragments: createContainerWithFragments
+  createContainer: createContainer
 };