From: Evan You <yyx990803@gmail.com>
Date: Mon, 29 Mar 2021 22:56:24 +0000 (-0400)
Subject: perf(compiler-sfc): skip srcset transform if all candidates are external
X-Git-Tag: v3.0.10~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b39208cf06a56b115016be18d5ee368a8f9dff74;p=thirdparty%2Fvuejs%2Fcore.git

perf(compiler-sfc): skip srcset transform if all candidates are external
---

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/templateTransformSrcset.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/templateTransformSrcset.spec.ts.snap
index 52e8140c7f..a4cc85003a 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/templateTransformSrcset.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/templateTransformSrcset.spec.ts.snap
@@ -139,9 +139,7 @@ const _hoisted_5 = _imports_0 + ' 2x, ' + _imports_0
 const _hoisted_6 = _imports_0 + ' 2x, ' + _imports_0 + ' 3x'
 const _hoisted_7 = _imports_0 + ', ' + _imports_0 + ' 2x, ' + _imports_0 + ' 3x'
 const _hoisted_8 = _imports_1 + ', ' + _imports_1 + ' 2x'
-const _hoisted_9 = \\"https://example.com/logo.png\\" + ', ' + \\"https://example.com/logo.png\\" + ' 2x'
-const _hoisted_10 = _imports_1 + ', ' + _imports_0 + ' 2x'
-const _hoisted_11 = \\"data:image/png;base64,i\\" + ' 1x, ' + \\"data:image/png;base64,i\\" + ' 2x'
+const _hoisted_9 = _imports_1 + ', ' + _imports_0 + ' 2x'
 
 export function render(_ctx, _cache) {
   return (_openBlock(), _createBlock(_Fragment, null, [
@@ -183,15 +181,15 @@ export function render(_ctx, _cache) {
     }),
     _createVNode(\\"img\\", {
       src: \\"https://example.com/logo.png\\",
-      srcset: _hoisted_9
+      srcset: \\"https://example.com/logo.png, https://example.com/logo.png 2x\\"
     }),
     _createVNode(\\"img\\", {
       src: \\"/logo.png\\",
-      srcset: _hoisted_10
+      srcset: _hoisted_9
     }),
     _createVNode(\\"img\\", {
       src: \\"data:image/png;base64,i\\",
-      srcset: _hoisted_11
+      srcset: \\"data:image/png;base64,i 1x, data:image/png;base64,i 2x\\"
     })
   ], 64 /* STABLE_FRAGMENT */))
 }"
diff --git a/packages/compiler-sfc/src/templateTransformSrcset.ts b/packages/compiler-sfc/src/templateTransformSrcset.ts
index 91b5e4767f..02cda03abc 100644
--- a/packages/compiler-sfc/src/templateTransformSrcset.ts
+++ b/packages/compiler-sfc/src/templateTransformSrcset.ts
@@ -57,20 +57,26 @@ export const transformSrcset: NodeTransform = (
             return { url, descriptor }
           })
 
-          // for data url need recheck url
+          // data urls contains comma after the ecoding so we need to re-merge
+          // them
           for (let i = 0; i < imageCandidates.length; i++) {
-            if (imageCandidates[i].url.trim().startsWith('data:')) {
+            const { url } = imageCandidates[i]
+            if (isDataUrl(url)) {
               imageCandidates[i + 1].url =
-                imageCandidates[i].url + ',' + imageCandidates[i + 1].url
+                url + ',' + imageCandidates[i + 1].url
               imageCandidates.splice(i, 1)
             }
           }
 
-          // When srcset does not contain any relative URLs, skip transforming
-          if (
-            !options.includeAbsolute &&
-            !imageCandidates.some(({ url }) => isRelativeUrl(url))
-          ) {
+          const hasQualifiedUrl = imageCandidates.some(({ url }) => {
+            return (
+              !isExternalUrl(url) &&
+              !isDataUrl(url) &&
+              (options.includeAbsolute || isRelativeUrl(url))
+            )
+          })
+          // When srcset does not contain any qualified URLs, skip transforming
+          if (!hasQualifiedUrl) {
             return
           }