Skip to content

fix(html): resolve percent-encoded srcset urls #23609

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

Merged
sapphi-red merged 3 commits into from
Sep 30, 2026
+13 −1
Merged

fix(html): resolve percent-encoded srcset urls #23609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30aea29
fix(html): resolve percent-encoded srcset urls
shoutoutuoadi325 Sep 29, 2026
f04e502
ci: re-run
shoutoutuoadi325 Sep 29, 2026
a52a5f6
test: simplify the tests
sapphi-red Sep 30, 2026
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
2 changes: 1 addition & 1 deletion packages/vite/src/node/plugins/html.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
!isExcludedUrl(decodedUrl)
) {
const result = await processAssetUrl(
url,
decodedUrl,

@sapphi-red sapphi-red Sep 30, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change makes sense as the decoded url is passed to processAssetUrl as well.
https://github.com/shoutoutuoadi325/vite/blob/f04e502d895918bae9e7ed4fb286c7a4e9219b9e/packages/vite/src/node/plugins/html.ts#L672
https://github.com/shoutoutuoadi325/vite/blob/f04e502d895918bae9e7ed4fb286c7a4e9219b9e/packages/vite/src/node/plugins/html.ts#L700

getLinkShouldInline(node, attr.attributes),
)
return result !== decodedUrl
Expand Down
8 changes: 8 additions & 0 deletions playground/assets/__tests__/assets.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,14 @@ describe.runIf(isBuild)('encodeURI', () => {
const img = await page.$('.encodeURI')
expect(await img.getAttribute('src')).toMatch(/^data:image\/png;base64,/)
})

test('img srcset with encodeURI', async () => {
const img = await page.$('.encodeURI')
const srcset = await img.getAttribute('srcset')
srcset.split(', ').forEach((candidate) => {
expect(candidate).toMatch(/^data:image\/png;base64,\S+ \dx$/)
})
})
})

test('new URL(..., import.meta.url)', async () => {
Expand Down
4 changes: 4 additions & 0 deletions playground/assets/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,10 @@ <h2>encodeURI for the address</h2>
<img
class="encodeURI"
src="./nested/%E3%83%86%E3%82%B9%E3%83%88-%E6%B8%AC%E8%A9%A6-white%20space.png"
srcset="
./nested/%E3%83%86%E3%82%B9%E3%83%88-%E6%B8%AC%E8%A9%A6-white%20space.png 1x,
./nested/%E3%83%86%E3%82%B9%E3%83%88-%E6%B8%AC%E8%A9%A6-white%20space.png 2x
"
/>
</div>

Expand Down
Loading