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

fix(assets): avoid splitting , inside base64 value of srcset attribute #15422

Merged
merged 7 commits into from
Dec 30, 2023
Merged

fix(assets): avoid splitting , inside base64 value of srcset attribute #15422

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
69f02fc
fix: add `data:...` to RE
chaejunlee Dec 25, 2023
030bb12
test: add unit test to `processSrcSetSync`
chaejunlee Dec 25, 2023
29f3bbd
chore: add `data:...` case to the comment
chaejunlee Dec 25, 2023
a82a59f
fix: remove empty test
chaejunlee Dec 26, 2023
2d253da
test: improve image base64 string
chaejunlee Dec 26, 2023
2722e7f
fix: improve `cleanSrcSetRE` to catch base64 values properly
chaejunlee Dec 26, 2023
553f325
fix: loosen regex
chaejunlee Dec 26, 2023
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
8 changes: 8 additions & 0 deletions packages/vite/src/node/__tests__/utils.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,14 @@ describe('processSrcSetSync', () => {
),
).toBe('/base/nested/asset.png 1x, /base/nested/asset.png 2x')
})

test('should not split the comma inside base64 value', async () => {
const base64 =
'data:image/avif;base64,AAAA 400w, data:image/avif;base64,BBBB 800w'
expect(processSrcSetSync(base64, ({ url }) => url)).toBe(base64)
})

test('should not split ')
chaejunlee marked this conversation as resolved.
Show resolved Hide resolved
})

describe('flattenId', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/vite/src/node/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,10 +787,10 @@ export function processSrcSetSync(
}

const cleanSrcSetRE =
/(?:url|image|gradient|cross-fade)\([^)]*\)|"([^"]|(?<=\\)")*"|'([^']|(?<=\\)')*'/g
/(?:url|image|gradient|cross-fade)\([^)]*\)|"([^"]|(?<=\\)")*"|'([^']|(?<=\\)')*'|data:[/;,\w]+/g
bluwy marked this conversation as resolved.
Show resolved Hide resolved
function splitSrcSet(srcs: string) {
const parts: string[] = []
// There could be a ',' inside of url(data:...), linear-gradient(...) or "data:..."
// There could be a ',' inside of url(data:...), linear-gradient(...), "data:..." or data:...
const cleanedSrcs = srcs.replace(cleanSrcSetRE, blankReplacer)
let startIndex = 0
let splitIndex: number
Expand Down
Loading