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

Disable image optimization for Data URLs #18804

Merged
merged 5 commits into from
Nov 4, 2020
Merged

Disable image optimization for Data URLs #18804

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbf10b4
Disable image optimization for Data URLs
styfle Nov 4, 2020
5db0958
Merge branch 'canary' into img-data-proto-unoptimize
kodiakhq[bot] Nov 4, 2020
96ab2c6
Fix tests
styfle Nov 4, 2020
808f137
Apply suggestions from code review
Timer Nov 4, 2020
f8bc67c
Merge branch 'canary' into img-data-proto-unoptimize
kodiakhq[bot] Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/next/client/image.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,12 @@ export default function Image({
lazy = false
}

if (src.startsWith('data:')) {
Timer marked this conversation as resolved.
Show resolved Hide resolved
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
unoptimized = true
lazy = false
}

useEffect(() => {
const target = thisEl.current

Expand Down
6 changes: 6 additions & 0 deletions test/integration/image-component/typescript/pages/valid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ const Page = () => {
width={500}
height={500}
/>
<Image
id="data-protocol"
src="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="
width={100}
height={100}
/>
<p id="stubtext">This is valid usage of the Image component</p>
</div>
)
Expand Down
4 changes: 1 addition & 3 deletions test/integration/image-component/typescript/test/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ describe('TypeScript Image Component', () => {
it('should render the valid Image usage and not print error', async () => {
const html = await renderViaHTTP(appPort, '/valid', {})
expect(html).toMatch(/This is valid usage of the Image component/)
expect(output).not.toMatch(
/must use "width" and "height" properties or "layout='fill'" property/
)
expect(output).not.toMatch(/Error/)
})

it('should print error when invalid Image usage', async () => {
Expand Down