Unverified Commit afddb6eb authored by Fonger's avatar Fonger Committed by GitHub

fix(image): preload should respect referrerPolicy (#49584)

This is a bug fix PR.

We should respect referrerPolicy when preloading a priority next/image

Reproduce codesandbox: https://codesandbox.io/p/sandbox/boring-fog-4o28oi
As you can see, the image still request with `referer` header although we have `referrerPolicy="no-referrer" in img attribute.

<img width="645" alt="image" src="https://github.com/vercel/next.js/assets/5862369/6a2779d3-e0e2-4dfe-80d2-c8a4243f430b">
parent 5ccf71a4
...@@ -970,6 +970,7 @@ const Image = forwardRef<HTMLImageElement | null, ImageProps>( ...@@ -970,6 +970,7 @@ const Image = forwardRef<HTMLImageElement | null, ImageProps>(
imageSrcSet={imgAttributes.srcSet} imageSrcSet={imgAttributes.srcSet}
imageSizes={imgAttributes.sizes} imageSizes={imgAttributes.sizes}
crossOrigin={rest.crossOrigin} crossOrigin={rest.crossOrigin}
referrerPolicy={rest.referrerPolicy}
{...getDynamicProps(fetchPriority)} {...getDynamicProps(fetchPriority)}
/> />
</Head> </Head>
......
...@@ -979,6 +979,7 @@ export default function Image({ ...@@ -979,6 +979,7 @@ export default function Image({
imageSrcSet: imgAttributes.srcSet, imageSrcSet: imgAttributes.srcSet,
imageSizes: imgAttributes.sizes, imageSizes: imgAttributes.sizes,
crossOrigin: rest.crossOrigin, crossOrigin: rest.crossOrigin,
referrerPolicy: rest.referrerPolicy,
} }
const useLayoutEffect = const useLayoutEffect =
......
...@@ -20,6 +20,14 @@ const Page = () => { ...@@ -20,6 +20,14 @@ const Page = () => {
width="400" width="400"
height="400" height="400"
></Image> ></Image>
<Image
priority
id="basic-image-with-referrerpolicy"
referrerPolicy="no-referrer"
src="/test.png"
width="400"
height="400"
></Image>
<Image <Image
loading="eager" loading="eager"
id="load-eager" id="load-eager"
......
...@@ -131,6 +131,11 @@ function runTests(mode) { ...@@ -131,6 +131,11 @@ function runTests(mode) {
imagesrcset: imagesrcset:
'/_next/image?url=%2Ftest.jpg&w=640&q=75 1x, /_next/image?url=%2Ftest.jpg&w=828&q=75 2x', '/_next/image?url=%2Ftest.jpg&w=640&q=75 1x, /_next/image?url=%2Ftest.jpg&w=828&q=75 2x',
}, },
{
imagesizes: '',
imagesrcset:
'/_next/image?url=%2Ftest.png&w=640&q=75 1x, /_next/image?url=%2Ftest.png&w=828&q=75 2x',
},
{ {
imagesizes: '100vw', imagesizes: '100vw',
imagesrcset: imagesrcset:
...@@ -147,6 +152,11 @@ function runTests(mode) { ...@@ -147,6 +152,11 @@ function runTests(mode) {
.elementById('basic-image-with-crossorigin') .elementById('basic-image-with-crossorigin')
.getAttribute('loading') .getAttribute('loading')
).toBe(null) ).toBe(null)
expect(
await browser
.elementById('basic-image-with-referrerpolicy')
.getAttribute('loading')
).toBe(null)
expect( expect(
await browser.elementById('load-eager').getAttribute('loading') await browser.elementById('load-eager').getAttribute('loading')
).toBe(null) ).toBe(null)
...@@ -170,6 +180,13 @@ function runTests(mode) { ...@@ -170,6 +180,13 @@ function runTests(mode) {
'link[rel=preload][as=image][crossorigin=anonymous][imagesrcset*="test.jpg"]' 'link[rel=preload][as=image][crossorigin=anonymous][imagesrcset*="test.jpg"]'
) )
).toHaveLength(1) ).toHaveLength(1)
// should preload with referrerpolicy
expect(
await browser.elementsByCss(
'link[rel=preload][as=image][referrerpolicy="no-referrer"][imagesrcset*="test.png"]'
)
).toHaveLength(1)
} finally { } finally {
if (browser) { if (browser) {
await browser.close() await browser.close()
......
...@@ -22,6 +22,15 @@ const Page = () => { ...@@ -22,6 +22,15 @@ const Page = () => {
height="400" height="400"
crossOrigin="anonymous" crossOrigin="anonymous"
></Image> ></Image>
<Image
priority
id="basic-image-referrerpolicy"
alt="basic-image-referrerpolicy"
src="/test.png"
width="400"
height="400"
referrerPolicy="no-referrer"
></Image>
<Image <Image
loading="eager" loading="eager"
id="load-eager" id="load-eager"
......
...@@ -204,6 +204,13 @@ function runTests(mode) { ...@@ -204,6 +204,13 @@ function runTests(mode) {
'link[rel=preload][as=image][crossorigin=anonymous][imagesrcset*="test.jpg"]' 'link[rel=preload][as=image][crossorigin=anonymous][imagesrcset*="test.jpg"]'
) )
).toHaveLength(1) ).toHaveLength(1)
// should preload with referrerpolicy
expect(
await browser.elementsByCss(
'link[rel=preload][as=image][referrerpolicy="no-referrer"][imagesrcset*="test.png"]'
)
).toHaveLength(1)
} finally { } finally {
if (browser) { if (browser) {
await browser.close() await browser.close()
......
...@@ -22,6 +22,15 @@ const Page = () => { ...@@ -22,6 +22,15 @@ const Page = () => {
height="400" height="400"
crossOrigin="anonymous" crossOrigin="anonymous"
></Image> ></Image>
<Image
priority
id="basic-image-referrerpolicy"
alt="basic-image-referrerpolicy"
src="/test.png"
width="400"
height="400"
referrerPolicy="no-referrer"
></Image>
<Image <Image
loading="eager" loading="eager"
id="load-eager" id="load-eager"
......
...@@ -204,6 +204,13 @@ function runTests(mode) { ...@@ -204,6 +204,13 @@ function runTests(mode) {
) )
).length ).length
).toBeGreaterThanOrEqual(1) ).toBeGreaterThanOrEqual(1)
// should preload with referrerpolicy
expect(
await browser.elementsByCss(
'link[rel=preload][as=image][referrerpolicy="no-referrer"][imagesrcset*="test.png"]'
)
).toHaveLength(1)
} finally { } finally {
if (browser) { if (browser) {
await browser.close() await browser.close()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment