Upgrade

mixcloud · Jul 3, 2017 · bb2833e · bb2833e
1 parent 03b58b6
commit bb2833e
Show file tree

Hide file tree

Showing 21 changed files with 67 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ npm install relay-helpers
 `relay-helpers`.
 
 ```javascript
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import {RelayEnvProvider} from 'relay-helpers';
 
 
@@ -55,7 +55,7 @@ Under some circumstances you will want to reset the entire store (e.g. log in or
 `RelayEnvProvider` has a `reset()` method:
 
 ```javascript
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import {RelayEnvProvider, RelayEnvContextType} from 'relay-helpers';
 
 
@@ -473,9 +473,9 @@ import {Relay as MockedRelay} from 'relay-helpers/lib/tests/mocks';
 Usage (example using jest, but jest isn't required):
 
 ```javascript
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 
-jest.mock('react-relay', () => {
+jest.mock('react-relay/classic', () => {
     return require('relay-helpers/lib/tests/mocks').Relay;
 });
 

diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "deep-equal": "^1.0.1",
     "hoist-non-react-statics": "^1.0.3",
-    "react-relay": "0.10.0"
+    "react-relay": "1.1.0"
   },
   "devDependencies": {
     "babel": "^6.23.0",

diff --git a/src/__tests__/testCache.js b/src/__tests__/testCache.js
@@ -1,6 +1,6 @@
 /* @noflow */
 import React from 'react';
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import withRelayQuery from '../components/decorators/withRelayQuery';
 import ClientEnvironment from '../environment/client';
 import {querySubscriberDecorator} from "../cache";

diff --git a/src/__tests__/testMutate.js b/src/__tests__/testMutate.js
@@ -1,8 +1,8 @@
 /* @noflow */
 import mutate from '../mutate';
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 
-jest.mock('react-relay', () => {
+jest.mock('react-relay/classic', () => {
     const Relay = {
         mutations: [],
     };

diff --git a/src/__tests__/testUtils.js b/src/__tests__/testUtils.js
@@ -1,5 +1,5 @@
 /* @noflow */
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import RelayFragmentReference from 'react-relay/lib/RelayFragmentReference';
 import {wraps, splitQuery, namedQuery} from '../utils';
 import createRelayContainer from '../components/decorators/createRelayContainer';

diff --git a/src/components/RelayEnvProvider/__tests__/testRelayEnvProvider.js b/src/components/RelayEnvProvider/__tests__/testRelayEnvProvider.js
@@ -1,6 +1,6 @@
 /* @noflow */
 import React from 'react';
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import RelayEnvProvider from '../';
 import {shallow} from 'enzyme';
 import mutate from '../../../mutate';

diff --git a/src/components/RelayEnvProvider/index.js b/src/components/RelayEnvProvider/index.js
@@ -1,6 +1,6 @@
 /* @flow */
 import React, {Children, PropTypes} from 'react';
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import QueryFetchCache from "./queryFetchCache";
 import mutate from '../../mutate';
 import type {MutationConfig} from '../../mutate';

diff --git a/src/components/decorators/__tests__/testCreateRelayContainer.js b/src/components/decorators/__tests__/testCreateRelayContainer.js
@@ -1,8 +1,8 @@
 /* @noflow */
 import createRelayContainer from '../createRelayContainer';
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 
-jest.mock('react-relay', () => ({
+jest.mock('react-relay/classic', () => ({
     createContainer: jest.fn(() => ({test: 'component'}))
 }));
 

diff --git a/src/components/decorators/__tests__/testWithRelayQuery.js b/src/components/decorators/__tests__/testWithRelayQuery.js
@@ -1,6 +1,6 @@
 /* @noflow */
 import React from 'react';
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import withRelayQuery from '../withRelayQuery';
 import {shallow, mount} from 'enzyme';
 import createMockRelayEnv from "../../../tests/mocks/createMockRelayEnv";

diff --git a/src/components/decorators/__tests__/testWithRelayRenderer.js b/src/components/decorators/__tests__/testWithRelayRenderer.js
@@ -1,6 +1,6 @@
 /* @noflow */
 import React from 'react';
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import withRelayRenderer from '../withRelayRenderer';
 import {shallow} from 'enzyme';
 import createMockRelayEnv from '../../../tests/mocks/createMockRelayEnv';

diff --git a/src/components/decorators/createRelayContainer.js b/src/components/decorators/createRelayContainer.js
@@ -1,5 +1,5 @@
 /* @flow */
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import type {WrappedComponent} from '../../utils';
 import type {RelayContainerSpec} from 'react-relay/lib/RelayContainer';
 

diff --git a/src/components/decorators/withRelayQuery.js b/src/components/decorators/withRelayQuery.js
@@ -1,5 +1,5 @@
 /* @flow */
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import withRelayRenderer from './withRelayRenderer';
 import withRelayHelpersDecorator from './withRelayHelpers';
 import createRelayContainer from './createRelayContainer';

diff --git a/src/components/decorators/withRelayRenderer.js b/src/components/decorators/withRelayRenderer.js
@@ -1,6 +1,6 @@
 /* @flow */
 import React from 'react';
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import {wraps} from '../../utils';
 import deepEqual from 'deep-equal';
 import {RelayEnvContextType} from "../RelayEnvProvider/index";

diff --git a/src/environment/__tests__/testEnvironments.js b/src/environment/__tests__/testEnvironments.js
@@ -1,7 +1,7 @@
 /* @noflow */
 import React from 'react';
 import ReactDOMServer from 'react-dom/server';
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import ClientEnvironment from '../client';
 import ServerEnvironment from '../server';
 import {shallow} from 'enzyme';

diff --git a/src/environment/base.js b/src/environment/base.js
@@ -1,5 +1,5 @@
 /* @flow */
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import QuerySetMap from './querySetMap';
 import type {QuerySet} from './querySetMap';
 

diff --git a/src/mutate.js b/src/mutate.js
@@ -1,5 +1,5 @@
 /* @flow */
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import type {FileMap} from 'react-relay/lib/RelayTypes';
 
 type RangeBehavior = 'prepend' | 'append' | 'ignore' | 'refetch' | 'remove';

diff --git a/src/networkLayer/server.js b/src/networkLayer/server.js
@@ -1,5 +1,5 @@
 /* @flow */
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 export type FetchQueryFunction = (query: {query: string, variables: Object}) => Promise<{errors?: Array<Object>, data?: Object}>;
 
 

diff --git a/src/tests/mocks/__tests__/testMockRelayRenderer.js b/src/tests/mocks/__tests__/testMockRelayRenderer.js
@@ -1,15 +1,15 @@
 /* @noflow */
 import React from 'react';
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import withRelayQuery from '../../../components/decorators/withRelayQuery';
 import {shallow} from 'enzyme';
 import createMockRelayEnv from '../createMockRelayEnv';
 
 
-jest.mock('react-relay', () => {
+jest.mock('react-relay/classic', () => {
     const Renderer = require('../MockRelayRenderer').default;
     return {
-        ...require.requireActual('react-relay'),
+        ...require.requireActual('react-relay/classic'),
         Renderer
     };
 });

diff --git a/src/tests/mocks/createMockRelayEnv.js b/src/tests/mocks/createMockRelayEnv.js
@@ -1,5 +1,5 @@
 /* @noflow */
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 
 
 export default function createMockRelayEnv() {

diff --git a/src/utils.js b/src/utils.js
@@ -1,6 +1,6 @@
 /* @flow */
 import React from 'react';
-import Relay from 'react-relay';
+import Relay from 'react-relay/classic';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 
 export type WrappedComponent<P> = ReactClass<P> | (props: P) => ?React.Element<*>;

diff --git a/yarn.lock b/yarn.lock
@@ -1,5 +1,7 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
+# yarn v0.25.4
+# node v7.9.0
 
 
 abab@^1.0.3:
@@ -889,7 +891,7 @@ babel-relay-plugin@^0.11.0:
   dependencies:
     graphql "0.9.1"
 
-babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.6.1:
+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
   dependencies:
@@ -1187,6 +1189,14 @@ core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+create-react-class@^15.6.0:
+  version "15.6.0"
+  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.0.tgz#ab448497c26566e1e29413e883207d57cfe7bed4"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 [email protected]:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -1625,7 +1635,7 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "^2.0.0"
 
-fbjs@^0.8.1, fbjs@^0.8.4:
+fbjs@^0.8.1, fbjs@^0.8.4, fbjs@^0.8.9:
   version "0.8.9"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.9.tgz#180247fbd347dcc9004517b904f865400a0c8f14"
   dependencies:
@@ -1950,14 +1960,10 @@ http-signature@~1.1.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-[email protected]:
+[email protected], iconv-lite@~0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@~0.4.13:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
-
 ignore@^3.2.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.4.tgz#4055e03596729a8fabe45a43c100ad5ed815c4e8"
@@ -2654,7 +2660,7 @@ longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
@@ -2818,7 +2824,7 @@ oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
@@ -3028,6 +3034,13 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+prop-types@^15.5.10, prop-types@^15.5.8:
+  version "15.5.10"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.3.1"
+
 prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
@@ -3071,25 +3084,29 @@ react-dom@^15.4.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
 
-react-relay@0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/react-relay/-/react-relay-0.10.0.tgz#4b19c4450e0140b9f04fd6fe96d8f451f0804078"
+react-relay@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/react-relay/-/react-relay-1.1.0.tgz#56cd76885a886d93dd052efebbc0af5b6ceea998"
   dependencies:
-    babel-runtime "^6.6.1"
+    babel-runtime "^6.23.0"
     fbjs "^0.8.1"
+    prop-types "^15.5.8"
     react-static-container "^1.0.1"
+    relay-runtime "1.1.0"
 
 react-static-container@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/react-static-container/-/react-static-container-1.0.1.tgz#694c0dd68a896b879519afb548399cc1989c9ab0"
 
 "[email protected] || 15.* || ^15.0.0":
-  version "15.4.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef"
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df"
   dependencies:
-    fbjs "^0.8.4"
+    create-react-class "^15.6.0"
+    fbjs "^0.8.9"
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
+    prop-types "^15.5.10"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
@@ -3194,6 +3211,13 @@ regjsparser@^0.1.4:
   dependencies:
     jsesc "~0.5.0"
 
+[email protected]:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-1.1.0.tgz#2441a97c18e3c9035960cad48414a95844623b69"
+  dependencies:
+    babel-runtime "^6.23.0"
+    fbjs "^0.8.1"
+
 repeat-element@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"