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

boschni · boschni · commit 70647f92fe14 · 2020-11-20T09:25:38.000+01:00
diff --git a/docs/src/pages/guides/ssr.md b/docs/src/pages/guides/ssr.md
@@ -172,7 +172,8 @@ ReactDOM.hydrate(
     <Hydrate state={dehydratedState}>
       <App />
     </Hydrate>
-  </ReactQueryClientProvider>
+  </ReactQueryClientProvider>,
+  document.getElementById('root')
 )
 ```
 
diff --git a/src/core/queryObserver.ts b/src/core/queryObserver.ts
@@ -330,7 +330,7 @@ export class QueryObserver<
   }
 
   private clearStaleTimeout(): void {
-    clearInterval(this.staleTimeoutId)
+    clearTimeout(this.staleTimeoutId)
     this.staleTimeoutId = undefined
   }
 

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,8 @@ ReactDOM.hydrate(`
`172`	`172`	`<Hydrate state={dehydratedState}>`
`173`	`173`	`<App />`
`174`	`174`	`</Hydrate>`
`175`		`- </ReactQueryClientProvider>`
	`175`	`+ </ReactQueryClientProvider>,`
	`176`	`+ document.getElementById('root')`
`176`	`177`	`)`
`177`	`178`	```
`178`	`179`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ export class QueryObserver<`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`private clearStaleTimeout(): void {`
`333`		`- clearInterval(this.staleTimeoutId)`
	`333`	`+ clearTimeout(this.staleTimeoutId)`
`334`	`334`	`this.staleTimeoutId = undefined`
`335`	`335`	`}`
`336`	`336`