Merge remote-tracking branch 'react-query/master' into alpha

Author: TkDodo

docs/src/pages/guides/testing.md

@@ -128,7 +128,7 @@ await waitFor(() => {
 expect(result.current.data).toEqual({answer: 42});
 ```
 
-Here we are making use of `waitFor` and waiting until our the query status indicates that the request has succeeded. This way we know that our hook has finished and should have the correct data.
+Here we are making use of `waitFor` and waiting until the query status indicates that the request has succeeded. This way we know that our hook has finished and should have the correct data.
 
 ## Testing Load More / Infinite Scroll
 

docs/src/pages/reference/useQuery.md

@@ -41,6 +41,7 @@ const {
   onError,
   onSettled,
   onSuccess,
+  placeholderData,
   queryKeyHashFn,
   refetchInterval,
   refetchIntervalInBackground,

src/devtools/styledComponents.ts

@@ -66,6 +66,7 @@ export const QueryKey = styled('span', {
 export const Code = styled('code', {
   fontSize: '.9em',
   color: 'inherit',
+  background: 'inherit',
 })
 
 export const Input = styled('input', (_props, theme) => ({