Unverified Commit 628e6aca authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

use text data url instead of base64 for shorter encoding (#33218)

and text is easier to gzip

and it avoid the reference to `Buffer` from next

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `yarn lint`
parent 5572eb39
import React from 'react' import React from 'react'
import Head from '../shared/lib/head' import Head from '../shared/lib/head'
import { toBase64 } from '../shared/lib/to-base-64'
import { import {
ImageConfigComplete, ImageConfigComplete,
imageConfigDefault, imageConfigDefault,
...@@ -535,7 +534,7 @@ export default function Image({ ...@@ -535,7 +534,7 @@ export default function Image({
padding: 0, padding: 0,
} }
let hasSizer = false let hasSizer = false
let sizerSvg: string | undefined let sizerSvgUrl: string | undefined
const imgStyle: ImgElementStyle = { const imgStyle: ImgElementStyle = {
position: 'absolute', position: 'absolute',
top: 0, top: 0,
...@@ -596,7 +595,8 @@ export default function Image({ ...@@ -596,7 +595,8 @@ export default function Image({
wrapperStyle.maxWidth = '100%' wrapperStyle.maxWidth = '100%'
hasSizer = true hasSizer = true
sizerStyle.maxWidth = '100%' sizerStyle.maxWidth = '100%'
sizerSvg = `<svg width="${widthInt}" height="${heightInt}" xmlns="http://www.w3.org/2000/svg" version="1.1"/>` // url encoded svg is a little bit shorten than base64 encoding
sizerSvgUrl = `data:image/svg+xml,%3csvg xmlns=%27http://www.w3.org/2000/svg%27 version=%271.1%27 width=%27${widthInt}%27 height=%27${heightInt}%27/%3e`
} else if (layout === 'fixed') { } else if (layout === 'fixed') {
// <Image src="i.png" width="100" height="100" layout="fixed" /> // <Image src="i.png" width="100" height="100" layout="fixed" />
wrapperStyle.display = 'inline-block' wrapperStyle.display = 'inline-block'
...@@ -661,7 +661,7 @@ export default function Image({ ...@@ -661,7 +661,7 @@ export default function Image({
<span style={wrapperStyle}> <span style={wrapperStyle}>
{hasSizer ? ( {hasSizer ? (
<span style={sizerStyle}> <span style={sizerStyle}>
{sizerSvg ? ( {sizerSvgUrl ? (
<img <img
style={{ style={{
display: 'block', display: 'block',
...@@ -676,7 +676,7 @@ export default function Image({ ...@@ -676,7 +676,7 @@ export default function Image({
}} }}
alt="" alt=""
aria-hidden={true} aria-hidden={true}
src={`data:image/svg+xml;base64,${toBase64(sizerSvg)}`} src={sizerSvgUrl}
/> />
) : null} ) : null}
</span> </span>
......
/**
* Isomorphic base64 that works on the server and client
*/
export function toBase64(str: string) {
if (typeof window === 'undefined') {
return Buffer.from(str).toString('base64')
} else {
return window.btoa(str)
}
}
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