Unverified Commit 03b61778 authored by Steven's avatar Steven Committed by GitHub

Fix immutable header for image with static import & unoptimized (#26836)

Fixes #26587 
parent 0562cc77
...@@ -689,6 +689,7 @@ export default class Server { ...@@ -689,6 +689,7 @@ export default class Server {
params.path[0] === CLIENT_STATIC_FILES_RUNTIME || params.path[0] === CLIENT_STATIC_FILES_RUNTIME ||
params.path[0] === 'chunks' || params.path[0] === 'chunks' ||
params.path[0] === 'css' || params.path[0] === 'css' ||
params.path[0] === 'image' ||
params.path[0] === 'media' || params.path[0] === 'media' ||
params.path[0] === this.buildId || params.path[0] === this.buildId ||
params.path[0] === 'pages' || params.path[0] === 'pages' ||
......
...@@ -45,6 +45,8 @@ const Page = () => { ...@@ -45,6 +45,8 @@ const Page = () => {
<Image id="static-gif" src={testGIF} /> <Image id="static-gif" src={testGIF} />
<Image id="static-bmp" src={testBMP} /> <Image id="static-bmp" src={testBMP} />
<Image id="static-ico" src={testICO} /> <Image id="static-ico" src={testICO} />
<br />
<Image id="static-unoptimized" src={testJPG} unoptimized />
</div> </div>
) )
} }
......
...@@ -5,6 +5,7 @@ import { ...@@ -5,6 +5,7 @@ import {
nextStart, nextStart,
renderViaHTTP, renderViaHTTP,
File, File,
waitFor,
} from 'next-test-utils' } from 'next-test-utils'
import webdriver from 'next-webdriver' import webdriver from 'next-webdriver'
import { join } from 'path' import { join } from 'path'
...@@ -23,11 +24,39 @@ const runTests = () => { ...@@ -23,11 +24,39 @@ const runTests = () => {
it('Should allow an image with a static src to omit height and width', async () => { it('Should allow an image with a static src to omit height and width', async () => {
expect(await browser.elementById('basic-static')).toBeTruthy() expect(await browser.elementById('basic-static')).toBeTruthy()
expect(await browser.elementById('blur-png')).toBeTruthy() expect(await browser.elementById('blur-png')).toBeTruthy()
expect(await browser.elementById('blur-webp')).toBeTruthy()
expect(await browser.elementById('blur-jpg')).toBeTruthy() expect(await browser.elementById('blur-jpg')).toBeTruthy()
expect(await browser.elementById('static-svg')).toBeTruthy() expect(await browser.elementById('static-svg')).toBeTruthy()
expect(await browser.elementById('static-gif')).toBeTruthy() expect(await browser.elementById('static-gif')).toBeTruthy()
expect(await browser.elementById('static-bmp')).toBeTruthy() expect(await browser.elementById('static-bmp')).toBeTruthy()
expect(await browser.elementById('static-ico')).toBeTruthy() expect(await browser.elementById('static-ico')).toBeTruthy()
expect(await browser.elementById('static-unoptimized')).toBeTruthy()
})
it('Should use immutable cache-control header for static import', async () => {
await browser.eval(
`document.getElementById("basic-static").scrollIntoView()`
)
await waitFor(1000)
const url = await browser.eval(
`document.getElementById("basic-static").src`
)
const res = await fetch(url)
expect(res.headers.get('cache-control')).toBe(
'public, max-age=315360000, immutable'
)
})
it('Should use immutable cache-control header even when unoptimized', async () => {
await browser.eval(
`document.getElementById("static-unoptimized").scrollIntoView()`
)
await waitFor(1000)
const url = await browser.eval(
`document.getElementById("static-unoptimized").src`
)
const res = await fetch(url)
expect(res.headers.get('cache-control')).toBe(
'public, max-age=31536000, immutable'
)
}) })
it('Should automatically provide an image height and width', async () => { it('Should automatically provide an image height and width', async () => {
expect(html).toContain('width:400px;height:300px') expect(html).toContain('width:400px;height:300px')
......
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