Merge remote-tracking branch 'origin/master' into beta

Author: boschni

docs/src/pages/graphql.md

@@ -9,4 +9,4 @@ Because React Query's fetching mechanisms are agnostically built on Promises, yo
 
 ## Examples
 
-- [basic-graphql-request](../docs/examples/basic-graphql-request) (The "basic" example, but implemented with [`graphq-request`](https://github.com/prisma-labs/graphql-request))
+- [basic-graphql-request](../docs/examples/basic-graphql-request) (The "basic" example, but implemented with [`graphql-request`](https://github.com/prisma-labs/graphql-request))

docs/src/pages/guides/infinite-queries.md

@@ -48,6 +48,7 @@ function Projects() {
 
   const {
     data,
+    error,
     fetchNextPage,
     hasNextPage,
     isFetching,

docs/src/pages/guides/testing.md

@@ -35,7 +35,9 @@ const wrapper = ({ children }) => (
     {children}
   </ReactQueryCacheProvider>
 );
+
 const { result } = renderHook(() => useCustomHook(), { wrapper });
+
 expect(result.current).toEqual('Hello');
 ```
 
@@ -67,15 +69,19 @@ const wrapper = ({ children }) => (
     {children}
   </ReactQueryCacheProvider>
 );
+
 const expectation = nock('http://example.com')
   .get('/api/data')
   .reply(200, {
     answer: 42
   });
+
 const { result, waitFor } = renderHook(() => useFetchData(), { wrapper });
+
 await waitFor(() => {
-  return result.current.isSuccess();
+  return result.current.isSuccess;
 });
+
 expect(result.current).toEqual({answer: 42});
 ```
 

docs/src/pages/index.js

@@ -10,12 +10,14 @@ import { Seo } from 'components/Seo'
 import Head from 'next/head'
 
 const supporters = [
-  ['Kent C. Dodds (kentcdodds.com)', 'https://kentcdodds.com/'],
+  ['Kent C. Dodds', 'https://kentcdodds.com/'],
   ['@bgazzera', 'https://github.com/bgazzera'],
   ['Gabe Ragland', 'https://github.com/gragland'],
   ['Matt Wood', 'https://github.com/mattwoodnyc'],
   ['Joshua Turner', 'https://github.com/joshua-turner'],
   ['Fillip Peyton', 'https://github.com/fillippeyton'],
+  ['Tim Myers', 'https://github.com/denvercoder'],
+  ['Andy Slezak', 'https://github.com/amslezak'],
 ]
 
 const fans = [
@@ -31,11 +33,14 @@ const fans = [
   'Johnny Bell (@johnnyxbell)',
   'Garrett Fritz (@gfritzdev)',
   'Juliano Farias (@frontendwizard)',
-  'Kristóf Poduszló (@kripod)',
   'Peter Pistorius (@peterp)',
   'Agustín Villalobos (@agustin-v)',
   'Panigo (@rangigo)',
   'Jesse Jafa, (@awareness481)',
+  'Arijit Bhattacharya, (@hoodwink73)',
+  'Bryan Grill, (@brygrill)',
+  'Peter Hozák, (@Aprillion)',
+  'Arijit Bhattacharya, (@hoodwink73)',
 ]
 
 const Home = () => {

docs/src/pages/videos.mdx

@@ -16,3 +16,51 @@ title: Videos & Talks
 ></iframe>
 
 [Click here to view the Repository used for the above presentation](https://github.com/tannerlinsley/react-query-blog-refactor-example)
+
+<iframe
+  width="280"
+  height="400"
+  src="https://www.youtube.com/embed/DocXo3gqGdI"
+  frameborder="0"
+  allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+  allowfullscreen
+  style={{
+    width: '100%',
+  }}
+></iframe>
+
+<iframe
+  width="280"
+  height="400"
+  src="https://www.youtube.com/embed/PPvWXbSCtBU"
+  frameborder="0"
+  allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+  allowfullscreen
+  style={{
+    width: '100%',
+  }}
+></iframe>
+
+<iframe
+  width="280"
+  height="400"
+  src="https://www.youtube.com/embed/B3cJDT3j19I"
+  frameborder="0"
+  allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+  allowfullscreen
+  style={{
+    width: '100%',
+  }}
+></iframe>
+
+<iframe
+  width="280"
+  height="400"
+  src="https://www.youtube.com/embed/_ehibado6rU"
+  frameborder="0"
+  allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+  allowfullscreen
+  style={{
+    width: '100%',
+  }}
+></iframe>

package.json

@@ -61,7 +61,7 @@
     "@babel/runtime": "^7.5.5"
   },
   "peerDependencies": {
-    "react": "^16.8.0"
+    "react": "^16.8.0 || ^17.0.0"
   },
   "peerDependenciesMeta": {
     "react-dom": {