Merge pull request #101 from posthtml/fix-srcset

posthtml · Jul 20, 2024 · 034f2bc · 034f2bc
2 parents dc92475 + c49e05d
commit 034f2bc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -132,7 +132,13 @@ const plugin = (options = {}) => tree => {
 
             parsed.map(p => {
               if (!isUrl(p.url)) {
-                p.url = typeof value === 'boolean' ? options.url + p.url : value + p.url
+                p.url = typeof value === 'boolean'
+                  ? isUrl(options.url)
+                    ? options.url + p.url
+                    : path.join(options.url, p.url)
+                  : isUrl(value)
+                    ? value + p.url
+                    : path.join(value, p.url)
               }
 
               return p

diff --git a/test/expected/srcset.html b/test/expected/srcset.html
@@ -1,9 +1,7 @@
-<img src="https://example.com/image1.jpg" srcset="https://example.com/image1-HD.jpg 2x, https://example.com/image1-phone.jpg 100w">
-
+<img src="images/image1.jpg" srcset="images/image1-HD.jpg 2x, images/image1-phone.jpg 100w">
 <img src="https://example.com/image2.jpg" srcset="https://example.com/image2-HD.jpg 2x, https://example.com/image2-phone.jpg 100w">
-
 <picture>
-  <source media="(max-width: 799px)" srcset="https://example.com/elva-480w-close-portrait.jpg">
-  <source media="(min-width: 800px)" srcset="https://example.com/elva-800w.jpg">
-  <img src="https://example.com/elva-800w.jpg" alt="...">
+  <source media="(max-width: 799px)" srcset="images/elva-480w-close-portrait.jpg">
+  <source media="(min-width: 800px)" srcset="images/elva-800w.jpg">
+  <img src="images/elva-800w.jpg" alt="...">
 </picture>
diff --git a/test/fixtures/srcset.html b/test/fixtures/srcset.html
@@ -1,7 +1,5 @@
 <img src="image1.jpg" srcset="image1-HD.jpg 2x,image1-phone.jpg 100w">
-
 <img src="https://example.com/image2.jpg" srcset="https://example.com/image2-HD.jpg 2x, https://example.com/image2-phone.jpg 100w">
-
 <picture>
   <source media="(max-width: 799px)" srcset="elva-480w-close-portrait.jpg">
   <source media="(min-width: 800px)" srcset="elva-800w.jpg">

diff --git a/test/test.js b/test/test.js
@@ -49,7 +49,7 @@ test('src attribute', t => {
 
 test('srcset attribute', t => {
   return process(t, 'srcset', {
-    url: 'https://example.com/',
+    url: 'images',
     allTags: true,
   })
 })