Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make the image post-processor ignore SVG images #16732

Merged
merged 6 commits into from Sep 2, 2020
Merged

Make the image post-processor ignore SVG images #16732

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
001793d
Add at attribute to image preload link
atcastle Aug 18, 2020
b3cc250
Fix tests for new image link attribute
atcastle Aug 18, 2020
2a22432
Merge remote-tracking branch 'origin/canary' into fix-image-preload-tag
atcastle Aug 31, 2020
85b087e
Don't add preload links for svg images
atcastle Aug 31, 2020
f8b4462
Update packages/next/next-server/lib/post-process.ts
Timer Sep 2, 2020
d2ce0ec
Merge branch 'canary' into fix-image-preload-tag
Timer Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/next/next-server/lib/post-process.ts
View file
Open in desktop
Expand Up @@ -191,8 +191,10 @@ class ImageOptimizerMiddleware implements PostProcessMiddleware {
}

function isImgEligible(imgElement: HTMLElement): boolean {
let imgSrc = imgElement.getAttribute('src')
return (
imgElement.hasAttribute('src') &&
!!imgSrc &&
sourceIsSupportedType(imgSrc) &&
imageIsNotTooSmall(imgElement) &&
imageIsNotHidden(imgElement)
)
Expand Down Expand Up @@ -243,6 +245,11 @@ function imageIsNotHidden(imgElement: HTMLElement): boolean {
return true
}

// Currently only filters out svg images--could be made more specific in the future.
function sourceIsSupportedType(imgSrc: string): boolean {
return !imgSrc.match(/\.svg/)
Timer marked this conversation as resolved.
Show resolved Hide resolved
}

// Initialization
registerPostProcessor(
'Inline-Fonts',
Expand Down
1 change: 1 addition & 0 deletions test/integration/image-optimization/pages/index.js
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@ const Page = () => {
<link rel="preload" href="already-preloaded.jpg" />
<img src="already-preloaded.jpg" />
<img src="tiny-image.jpg" width="20" height="20" />
<img src="vector-image.svg" />
<img src="hidden-image-1.jpg" hidden />
<div hidden>
<img src="hidden-image-2.jpg" />
Expand Down
1 change: 1 addition & 0 deletions test/integration/image-optimization/pages/stars.js
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@ function Home({ stars }) {
<link rel="preload" href="already-preloaded.jpg" />
<img src="already-preloaded.jpg" />
<img src="tiny-image.jpg" width="20" height="20" />
<img src="vector-image.svg" />
<img src="hidden-image-1.jpg" hidden />
<div hidden>
<img src="hidden-image-2.jpg" />
Expand Down
6 changes: 6 additions & 0 deletions test/integration/image-optimization/test/index.test.js
View file
Open in desktop
Expand Up @@ -53,6 +53,12 @@ function checkImagesOnPage(path) {
'<link rel="preload" href="hidden-image-2.jpg" as="image"/>'
)
})
it('should not preload SVG images', async () => {
const html = await renderViaHTTP(appPort, path)
expect(html).not.toContain(
'<link rel="preload" href="vector-image.svg" as="image"/>'
)
})
it('should preload exactly two eligible images', async () => {
const html = await renderViaHTTP(appPort, path)
expect(html).toContain(
Expand Down