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: filter out empty srcset (#2863) #2888

Merged
merged 4 commits into from
Apr 16, 2021
Merged

fix: filter out empty srcset (#2863) #2888

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b2e85f
fix: filter out empty srcset (#2863)
fi3ework Apr 6, 2021
063a904
fix: should allow srcset on source tag
fi3ework Apr 10, 2021
0f4098e
fix: should clean url
fi3ework Apr 10, 2021
aedabcc
fix: revert dir filter
fi3ework Apr 16, 2021
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
5 changes: 5 additions & 0 deletions packages/vite/src/node/plugins/asset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,11 @@ export async function urlToBuiltUrl(
const file = url.startsWith('/')
? path.join(config.root, url)
: path.join(path.dirname(importer), url)
const stat = await fsp.stat(cleanUrl(file))
if (stat.isDirectory()) {
return url
}

Shinigami92 marked this conversation as resolved.
Show resolved Hide resolved
return fileToBuiltUrl(
file,
config,
Expand Down
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 @@ -69,7 +69,7 @@ export function htmlInlineScriptProxyPlugin(): Plugin {
export const assetAttrsConfig: Record<string, string[]> = {
link: ['href'],
video: ['src', 'poster'],
source: ['src'],
source: ['src', 'srcset'],
img: ['src', 'srcset'],
image: ['xlink:href', 'href'],
use: ['xlink:href', 'href']
Expand Down
17 changes: 10 additions & 7 deletions packages/vite/src/node/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,13 +380,16 @@ export async function processSrcSet(
srcs: string,
replacer: (arg: ImageCandidate) => Promise<string>
): Promise<string> {
const imageCandidates: ImageCandidate[] = srcs.split(',').map((s) => {
const [url, descriptor] = s
.replace(escapedSpaceCharacters, ' ')
.trim()
.split(' ', 2)
return { url, descriptor }
})
const imageCandidates: ImageCandidate[] = srcs
.split(',')
.map((s) => {
const [url, descriptor] = s
.replace(escapedSpaceCharacters, ' ')
.trim()
.split(' ', 2)
return { url, descriptor }
})
.filter(({ url }) => !!url)

const ret = await Promise.all(
imageCandidates.map(async ({ url, descriptor }) => {
Expand Down