Merge branch 'canary' into fix-38106

vercel · Jun 29, 2022 · 8704909 · 8704909
2 parents 2107102 + 9aa282b
commit 8704909
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 45 deletions.
diff --git a/docs/api-reference/next/future/image.md b/docs/api-reference/next/future/image.md
@@ -205,50 +205,6 @@ Try it out:
 
 You can also [generate a solid color Data URL](https://png-pixel.com) to match the image.
 
-**Example pointing to a DOM element**
-
-```jsx
-import Image from 'next/future/image'
-import React from 'react'
-
-const lazyRoot = React.useRef(null)
-
-const Example = () => (
-  <div ref={lazyRoot} style={{ overflowX: 'scroll', width: '500px' }}>
-    <Image lazyRoot={lazyRoot} src="/one.jpg" width="500" height="500" />
-    <Image lazyRoot={lazyRoot} src="/two.jpg" width="500" height="500" />
-  </div>
-)
-```
-
-**Example pointing to a React component**
-
-```jsx
-import Image from 'next/future/image'
-import React from 'react'
-
-const Container = React.forwardRef((props, ref) => {
-  return (
-    <div ref={ref} style={{ overflowX: 'scroll', width: '500px' }}>
-      {props.children}
-    </div>
-  )
-})
-
-const Example = () => {
-  const lazyRoot = React.useRef(null)
-
-  return (
-    <Container ref={lazyRoot}>
-      <Image lazyRoot={lazyRoot} src="/one.jpg" width="500" height="500" />
-      <Image lazyRoot={lazyRoot} src="/two.jpg" width="500" height="500" />
-    </Container>
-  )
-}
-```
-
-[Learn more](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver/root)
-
 ### unoptimized
 
 When true, the source image will be served as-is instead of changing quality,

diff --git a/docs/api-reference/next/router.md b/docs/api-reference/next/router.md
@@ -42,7 +42,7 @@ export default ActiveLink
 The following is the definition of the `router` object returned by both [`useRouter`](#useRouter) and [`withRouter`](#withRouter):
 
 - `pathname`: `String` - Current route. That is the path of the page in `/pages`, the configured `basePath` or `locale` is not included.
-- `query`: `Object` - The query string parsed to an object, including [dynamic route](/docs/routing/dynamic-routes.md) parameters. It will be an empty object during prerendering if the page doesn't have [data fetching requirements](/docs/basic-features/data-fetching/overview.md). Defaults to `{}`
+- `query`: `Object` - The query string parsed to an object, including [dynamic route](/docs/routing/dynamic-routes.md) parameters. It will be an empty object during prerendering if the page doesn't use [Server-side Rendering](/docs/basic-features/data-fetching/get-server-side-props.md). Defaults to `{}`
 - `asPath`: `String` - The path (including the query) shown in the browser without the configured `basePath` or `locale`.
 - `isFallback`: `boolean` - Whether the current page is in [fallback mode](/docs/api-reference/data-fetching/get-static-paths.md#fallback-pages).
 - `basePath`: `String` - The active [basePath](/docs/api-reference/next.config.js/basepath.md) (if enabled).