From ca975b4ef85037e2c5e3a48bbc1369f745bba265 Mon Sep 17 00:00:00 2001 From: Paul Tiedtke Date: Sat, 9 Mar 2019 21:46:22 +0100 Subject: [PATCH] Sync versions of react packages --- examples/typescript/src/Character.tsx | 2 +- package-lock.json | 73 +++++++++++++-------------- package.json | 12 ++--- src/ApolloConsumer.tsx | 2 +- test/client/getDataFromTree.test.tsx | 8 +-- test/test-utils.test.tsx | 2 +- 6 files changed, 49 insertions(+), 50 deletions(-) diff --git a/examples/typescript/src/Character.tsx b/examples/typescript/src/Character.tsx index eb4485cfda..76674e0995 100644 --- a/examples/typescript/src/Character.tsx +++ b/examples/typescript/src/Character.tsx @@ -7,7 +7,7 @@ export interface CharacterProps { episode: Episode; } -export const Character: React.SFC = props => { +export const Character: React.FC = props => { const { episode } = props; return ( diff --git a/package-lock.json b/package-lock.json index 5d23cd5a63..7961bfb123 100644 --- a/package-lock.json +++ b/package-lock.json @@ -438,9 +438,9 @@ "dev": true }, "@types/react": { - "version": "16.4.18", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.4.18.tgz", - "integrity": "sha512-eFzJKEg6pdeaukVLVZ8Xb79CTl/ysX+ExmOfAAqcFlCCK5TgFDD9kWR0S18sglQ3EmM8U+80enjUqbfnUyqpdA==", + "version": "16.8.4", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.4.tgz", + "integrity": "sha512-Mpz1NNMJvrjf0GcDqiK8+YeOydXfD8Mgag3UtqQ5lXYTsMnOiHcKmO48LiSWMb1rSHB9MV/jlgyNzeAVxWMZRQ==", "dev": true, "requires": { "@types/prop-types": "*", @@ -448,18 +448,18 @@ } }, "@types/react-dom": { - "version": "16.8.0", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.8.0.tgz", - "integrity": "sha512-Jp4ufcEEjVJEB0OHq2MCZcE1u3KYUKO6WnSuiU/tZeYeiZxUoQavfa/TZeiIT+1XoN6l0lQVNM30VINZFDeolQ==", + "version": "16.8.2", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.8.2.tgz", + "integrity": "sha512-MX7n1wq3G/De15RGAAqnmidzhr2Y9O/ClxPxyqaNg96pGyeXUYPSvujgzEVpLo9oIP4Wn1UETl+rxTN02KEpBw==", "dev": true, "requires": { "@types/react": "*" } }, "@types/react-test-renderer": { - "version": "16.8.0", - "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-16.8.0.tgz", - "integrity": "sha512-m563EQSTVB2g6h+FDUH2cgfiRdjL1KHVyi643EQQSFIblMPrWwJh/adqTcMS/FhJHvhEboR4pmhrhEXyHDDsmQ==", + "version": "16.8.1", + "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-16.8.1.tgz", + "integrity": "sha512-8gU69ELfJGxzVWVYj4MTtuHxz9nO+d175XeQ1XrXXxesUBsB4KK6OCfzVhEX6leZWWBDVtMJXp/rUjhClzL7gw==", "dev": true, "requires": { "@types/react": "*" @@ -2813,9 +2813,9 @@ } }, "csstype": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.2.tgz", - "integrity": "sha512-Rl7PvTae0pflc1YtxtKbiSqq20Ts6vpIYOD5WBafl4y123DyHUeLrRdQP66sQW8/6gmX8jrYJLXwNeMqYVJcow==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.3.tgz", + "integrity": "sha512-rINUZXOkcBmoHWEyu7JdHu5JMzkGRoMX4ov9830WNgxf5UYxcBUO0QTKAqeJ5EZfSdlrcJYkC8WwfVW7JYi4yg==", "dev": true }, "danger": { @@ -12216,27 +12216,27 @@ } }, "react": { - "version": "16.5.2", - "resolved": "https://registry.npmjs.org/react/-/react-16.5.2.tgz", - "integrity": "sha512-FDCSVd3DjVTmbEAjUNX6FgfAmQ+ypJfHUsqUJOYNCBUp1h8lqmtC+0mXJ+JjsWx4KAVTkk1vKd1hLQPvEviSuw==", + "version": "16.8.4", + "resolved": "https://registry.npmjs.org/react/-/react-16.8.4.tgz", + "integrity": "sha512-0GQ6gFXfUH7aZcjGVymlPOASTuSjlQL4ZtVC5YKH+3JL6bBLCVO21DknzmaPlI90LN253ojj02nsapy+j7wIjg==", "dev": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "schedule": "^0.5.0" + "scheduler": "^0.13.4" } }, "react-dom": { - "version": "16.8.1", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.1.tgz", - "integrity": "sha512-N74IZUrPt6UiDjXaO7UbDDFXeUXnVhZzeRLy/6iqqN1ipfjrhR60Bp5NuBK+rv3GMdqdIuwIl22u1SYwf330bg==", + "version": "16.8.4", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.4.tgz", + "integrity": "sha512-Ob2wK7XG2tUDt7ps7LtLzGYYB6DXMCLj0G5fO6WeEICtT4/HdpOi7W/xLzZnR6RCG1tYza60nMdqtxzA8FaPJQ==", "dev": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.13.1" + "scheduler": "^0.13.4" } }, "react-is": { @@ -12251,15 +12251,23 @@ "dev": true }, "react-test-renderer": { - "version": "16.8.1", - "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.8.1.tgz", - "integrity": "sha512-Bd21TN3+YVl6GZwav6O0T6m5UwGfOj+2+xZH5VH93ToD6M5uclN/c+R1DGX49ueG413KZPUx7Kw3sOYz2aJgfg==", + "version": "16.8.4", + "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.8.4.tgz", + "integrity": "sha512-jQ9Tf/ilIGSr55Cz23AZ/7H3ABEdo9oy2zF9nDHZyhLHDSLKuoILxw2ifpBfuuwQvj4LCoqdru9iZf7gwFH28A==", "dev": true, "requires": { "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "react-is": "^16.8.1", - "scheduler": "^0.13.1" + "react-is": "^16.8.4", + "scheduler": "^0.13.4" + }, + "dependencies": { + "react-is": { + "version": "16.8.4", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.4.tgz", + "integrity": "sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==", + "dev": true + } } }, "read-pkg": { @@ -13595,19 +13603,10 @@ "xmlchars": "^1.3.1" } }, - "schedule": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/schedule/-/schedule-0.5.0.tgz", - "integrity": "sha512-HUcJicG5Ou8xfR//c2rPT0lPIRR09vVvN81T9fqfVgBmhERUbDEQoYKjpBxbueJnCPpSu2ujXzOnRQt6x9o/jw==", - "dev": true, - "requires": { - "object-assign": "^4.1.1" - } - }, "scheduler": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.3.tgz", - "integrity": "sha512-UxN5QRYWtpR1egNWzJcVLk8jlegxAugswQc984lD3kU7NuobsO37/sRfbpTdBjtnD5TBNFA2Q2oLV5+UmPSmEQ==", + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.4.tgz", + "integrity": "sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA==", "dev": true, "requires": { "loose-envify": "^1.1.0", diff --git a/package.json b/package.json index 21e9bdc5bf..0771ad89f5 100644 --- a/package.json +++ b/package.json @@ -115,9 +115,9 @@ "@types/jest": "24.0.9", "@types/object-assign": "4.0.30", "@types/prop-types": "15.7.0", - "@types/react": "16.4.18", - "@types/react-dom": "16.8.0", - "@types/react-test-renderer": "16.8.0", + "@types/react": "16.8.4", + "@types/react-dom": "16.8.2", + "@types/react-test-renderer": "16.8.1", "@types/recompose": "0.30.3", "@types/zen-observable": "0.8.0", "apollo-cache": "1.2.1", @@ -142,9 +142,9 @@ "preact": "8.4.2", "preact-compat": "3.18.4", "prettier": "1.16.4", - "react": "16.5.2", - "react-dom": "16.8.1", - "react-test-renderer": "16.8.1", + "react": "16.8.4", + "react-dom": "16.8.4", + "react-test-renderer": "16.8.4", "recompose": "0.30.0", "recursive-rename": "2.0.0", "rimraf": "2.6.3", diff --git a/src/ApolloConsumer.tsx b/src/ApolloConsumer.tsx index d685133dd2..0d61582529 100644 --- a/src/ApolloConsumer.tsx +++ b/src/ApolloConsumer.tsx @@ -8,7 +8,7 @@ export interface ApolloConsumerProps { children: (client: ApolloClient) => React.ReactElement | null; } -const ApolloConsumer: React.StatelessComponent = (props, context) => { +const ApolloConsumer: React.FC = (props, context) => { invariant( !!context.client, `Could not find "client" in the context of ApolloConsumer. Wrap the root component in an `, diff --git a/test/client/getDataFromTree.test.tsx b/test/client/getDataFromTree.test.tsx index f562be8414..190592836c 100644 --- a/test/client/getDataFromTree.test.tsx +++ b/test/client/getDataFromTree.test.tsx @@ -786,7 +786,7 @@ describe('SSR', () => { variables: { id: data!.currentUser!.id }, }), }); - const Component: React.StatelessComponent = ({ data }) => ( + const Component: React.FC = ({ data }) => (
{!data || data.loading || !data.user ? 'loading' : data.user.firstName}
); @@ -860,7 +860,7 @@ describe('SSR', () => { const WrappedBorkedComponent = withLastName(BorkedComponent); - const ContainerComponent: React.StatelessComponent = ({ data }) => ( + const ContainerComponent: React.FC = ({ data }) => (
{!data || data.loading || !data.currentUser ? 'loading' : data.currentUser.lastName} @@ -1408,7 +1408,7 @@ describe('SSR', () => { }, }); - const Element: React.StatelessComponent< + const Element: React.FC< QueryChildProps & { action: (variables: {}) => Promise } > = ({ data }) => (
{data.loading || !data.currentUser ? 'loading' : data.currentUser.firstName}
@@ -1484,7 +1484,7 @@ describe('SSR', () => { }, }); - const Element: React.StatelessComponent< + const Element: React.FC< ChildProps, QueryData, {}> > = ({ data }) => (
diff --git a/test/test-utils.test.tsx b/test/test-utils.test.tsx index 9761e5e7e2..56b5c78a4b 100644 --- a/test/test-utils.test.tsx +++ b/test/test-utils.test.tsx @@ -130,7 +130,7 @@ it('allows for using a custom cache', done => { data: { user }, }); - const Container: React.SFC> = props => { + const Container: React.FC> = props => { expect(props.data).toMatchObject({ user }); done();