Align to React version 16.8.3, fix build issues

examples/components/package.json

@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@apollo/react-testing": "beta",
-    "react-testing-library": "6.1.2"
+    "@testing-library/react": "8.0.1"
   },
   "browserslist": [
     ">0.2%",

examples/components/src/__tests__/app.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { MockedProvider } from '@apollo/react-testing';
-import { render, wait } from 'react-testing-library';
+import { render, wait } from '@testing-library/react';
 
 import App, { HERO_QUERY } from '../app';
 import { full } from '../__mocks__/data';

examples/components/src/__tests__/character.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from 'react-testing-library';
+import { render } from '@testing-library/react';
 
 import Character from '../Character';
 

examples/mutation/package.json

@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@apollo/react-testing": "beta",
-    "react-testing-library": "6.1.2"
+    "@testing-library/react": "^8.0.1"
   },
   "browserslist": [
     ">0.2%",

examples/mutation/src/addUser.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, fireEvent, wait } from 'react-testing-library';
+import { render, fireEvent, wait } from '@testing-library/react';
 import { MockedProvider } from '@apollo/react-testing';
 
 import AddUser, { ADD_USER } from './AddUser';

package.json

@@ -51,7 +51,7 @@
     "lodash.times": "^4.3.2",
     "react": "^16.9.0-alpha.0",
     "react-dom": "^16.9.0-alpha.0",
-    "react-testing-library": "^7.0.0",
+    "@testing-library/react": "^8.0.1",
     "recompose": "^0.30.0",
     "rollup": "^1.9.3",
     "rollup-plugin-commonjs": "^9.3.4",

packages/all/package.json

@@ -21,18 +21,18 @@
   },
   "sideEffects": false,
   "scripts": {
-    "clean": "rm -Rf ./node_modules ./lib/* ./meta/bundlesize/* ./meta/coverage/*",
+    "clean": "rm -Rf ./lib/* ./meta/bundlesize/* ./meta/coverage/*",
     "prepare": "npm run build",
     "prebuild": "npm run clean",
-    "build": "../../node_modules/.bin/tsc -p ./config",
-    "postbuild": "../../node_modules/.bin/rollup -c ./config/rollup.config.js",
+    "build": "npx tsc -p ./config",
+    "postbuild": "npx rollup -c ./config/rollup.config.js",
     "predeploy": "npm run build",
     "deploy": "npm publish --tag beta"
   },
   "peerDependencies": {
     "apollo-client": "^2.6.0",
     "graphql": "^14.2.1",
-    "react": "^16.8.6"
+    "react": "^16.8.0"
   },
   "dependencies": {
     "@apollo/react-common": "file:../common",
@@ -45,5 +45,9 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "devDependencies": {
+    "rollup": "^1.15.5",
+    "typescript": "^3.5.2"
   }
 }

packages/common/package.json

@@ -18,24 +18,24 @@
   },
   "sideEffects": false,
   "scripts": {
-    "clean": "rm -Rf ./node_modules ./lib/* ./meta/bundlesize/* ./meta/coverage/*",
+    "clean": "rm -Rf ./lib/* ./meta/bundlesize/* ./meta/coverage/*",
     "prepare": "npm run build",
     "prebuild": "npm run clean",
-    "build": "../../node_modules/.bin/tsc -p ./config",
-    "postbuild": "../../node_modules/.bin/rollup -c ./config/rollup.config.js",
-    "watch": "node ../../node_modules/tsc-watch/lib/tsc-watch.js --onSuccess \"npm run postbuild\" -p ./config",
+    "build": "npx tsc -p ./config",
+    "postbuild": "npx rollup -c ./config/rollup.config.js",
+    "watch": "npx tsc-watch --onSuccess \"npm run postbuild\" -p ./config",
     "predeploy": "npm run build",
     "deploy": "npm publish --tag beta",
-    "test": "../../node_modules/jest/bin/jest.js --config ../../config/jest.config.js --testPathPattern packages/common",
-    "test:watch": "../../node_modules/jest/bin/jest.js --config ../../config/jest.config.js --testPathPattern packages/common --watch",
-    "test:cjs": "npm run build && ../../node_modules/jest/bin/jest.js --config ../../config/jest.cjs.config.js --testPathPattern packages/common",
-    "test:umd": "npm run build && ../../node_modules/jest/bin/jest.js --config ../../config/jest.umd.config.js --testPathPattern packages/common"
+    "test": "npx jest --config ../../config/jest.config.js --testPathPattern packages/common",
+    "test:watch": "npx jest --config ../../config/jest.config.js --testPathPattern packages/common --watch",
+    "test:cjs": "npm run build && npx jest --config ../../config/jest.cjs.config.js --testPathPattern packages/common",
+    "test:umd": "npm run build && npx jest --config ../../config/jest.umd.config.js --testPathPattern packages/common"
   },
   "peerDependencies": {
     "apollo-client": "^2.6.0",
     "apollo-utilities": "^1.3.0",
     "graphql": "^14.2.1",
-    "react": "^16.8.6"
+    "react": "^16.8.0"
   },
   "dependencies": {
     "ts-invariant": "^0.4.2",
@@ -46,5 +46,11 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "devDependencies": {
+    "jest": "^24.8.0",
+    "rollup": "^1.15.5",
+    "tsc-watch": "^2.2.1",
+    "typescript": "^3.5.2"
   }
 }

packages/common/src/context/__tests__/ApolloConsumer.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import ApolloClient from 'apollo-client';
 import { InMemoryCache as Cache } from 'apollo-cache-inmemory';
 import { ApolloLink } from 'apollo-link';
-import { render, cleanup } from 'react-testing-library';
+import { render, cleanup } from '@testing-library/react';
 
 import {
   ApolloProvider,

packages/common/src/context/__tests__/ApolloProvider.test.tsx

@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { render, cleanup } from 'react-testing-library';
+import { render, cleanup } from '@testing-library/react';
 import ApolloClient from 'apollo-client';
 import { InMemoryCache as Cache } from 'apollo-cache-inmemory';
 import { ApolloLink } from 'apollo-link';

packages/components/package.json

@@ -19,27 +19,27 @@
   },
   "sideEffects": false,
   "scripts": {
-    "clean": "rm -Rf ./node_modules ./lib/* ./meta/bundlesize/* ./meta/coverage/*",
+    "clean": "rm -Rf ./lib/* ./meta/bundlesize/* ./meta/coverage/*",
     "prepare": "npm run build",
     "prebuild": "npm run clean",
-    "build": "../../node_modules/.bin/tsc -p ./config",
-    "postbuild": "../../node_modules/.bin/rollup -c ./config/rollup.config.js",
-    "watch": "node ../../node_modules/tsc-watch/lib/tsc-watch.js --onSuccess \"npm run postbuild\" -p ./config",
+    "build": "npx tsc -p ./config",
+    "postbuild": "npx rollup -c ./config/rollup.config.js",
+    "watch": "npx tsc-watch --onSuccess \"npm run postbuild\" -p ./config",
     "predeploy": "npm run build",
     "deploy": "npm publish --tag beta",
-    "test": "../../node_modules/jest/bin/jest.js --config ../../config/jest.config.js --testPathPattern packages/components",
-    "test:watch": "../../node_modules/jest/bin/jest.js --config ../../config/jest.config.js --testPathPattern packages/components --watch",
-    "test:cjs": "npm run build && ../../node_modules/jest/bin/jest.js --config ../../config/jest.cjs.config.js --testPathPattern packages/components",
-    "test:umd": "npm run build && ../../node_modules/jest/bin/jest.js --config ../../config/jest.umd.config.js --testPathPattern packages/components"
+    "test": "npx jest --config ../../config/jest.config.js --testPathPattern packages/components",
+    "test:watch": "npx jest --config ../../config/jest.config.js --testPathPattern packages/components --watch",
+    "test:cjs": "npm run build && npx jest --config ../../config/jest.cjs.config.js --testPathPattern packages/components",
+    "test:umd": "npm run build && npx jest --config ../../config/jest.umd.config.js --testPathPattern packages/components"
   },
   "peerDependencies": {
     "apollo-cache": "^1.3.0",
     "apollo-client": "^2.6.0",
     "apollo-link": "^1.2.11",
     "apollo-utilities": "^1.3.0",
     "graphql": "^14.2.1",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6"
+    "react": "^16.8.3",
+    "react-dom": "^16.8.3"
   },
   "dependencies": {
     "@apollo/react-common": "file:../common",
@@ -54,5 +54,11 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "devDependencies": {
+    "jest": "^24.8.0",
+    "rollup": "^1.15.5",
+    "tsc-watch": "^2.2.1",
+    "typescript": "^3.5.2"
   }
 }

packages/components/src/__tests__/client/Mutation.test.tsx

@@ -11,7 +11,7 @@ import {
   mockSingleLink,
   stripSymbols
 } from '@apollo/react-testing';
-import { render, cleanup, fireEvent } from 'react-testing-library';
+import { render, cleanup, fireEvent } from '@testing-library/react';
 import { Query, Mutation } from '@apollo/react-components';
 
 const mutation = gql`

packages/components/src/__tests__/client/Query.test.tsx

@@ -9,7 +9,7 @@ import {
 } from '@apollo/react-testing';
 import { DocumentNode } from 'graphql';
 import gql from 'graphql-tag';
-import { render, cleanup } from 'react-testing-library';
+import { render, cleanup } from '@testing-library/react';
 import { ApolloLink } from 'apollo-link';
 import { Query } from '@apollo/react-components';
 

packages/components/src/__tests__/client/Subscription.test.tsx

@@ -5,7 +5,7 @@ import { ApolloLink, Operation } from 'apollo-link';
 import { InMemoryCache as Cache } from 'apollo-cache-inmemory';
 import { MockSubscriptionLink } from '@apollo/react-testing';
 import { ApolloProvider } from '@apollo/react-common';
-import { render, cleanup } from 'react-testing-library';
+import { render, cleanup } from '@testing-library/react';
 import { Subscription } from '@apollo/react-components';
 
 const results = [