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

vitejs · Apr 16, 2021 · 0d4f803 · 0d4f803
1 parent e472d29
commit 0d4f803
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts
@@ -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']

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
@@ -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 }) => {