michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: make Picture generate valid dev URLs (#7500)

Browse source
This commit is contained in:
Wooseop Kim 2023-07-03 17:09:40 +09:00 committed by GitHub
parent 3df71fd34f
commit e644b34659
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/few-ants-brake.md Normal file
View file

@ -0,0 +1,5 @@
---
"@astrojs/image": patch
---
fix: make `Picture` generate valid dev URLs

2
packages/integrations/image/src/lib/get-picture.ts
View file

@ -85,7 +85,7 @@ export async function getPicture(params: GetPictureParams): Promise<GetPictureRe
image = img;
}
return `${encodeURI(img.src ?? '')} ${width}w`;
return `${img.src?.replaceAll(' ', encodeURI)} ${width}w`;
})
);

10
packages/integrations/image/test/picture-ssg.test.js
View file

@ -195,6 +195,16 @@ describe('SSG pictures with subpath - dev', function () {
const src = image.attr('src');
const [route, params] = src.split('?');
for (const srcset of picture.children('source').map((_, source) => source.attribs['srcset'])) {
for (const pictureSrc of srcset.split(',')) {
const pictureParams = pictureSrc.split('?')[1];
const expected = new URLSearchParams(params).get('href');
const actual = new URLSearchParams(pictureParams).get('href').replace(/\s+\d+w$/, '');
expect(expected).to.equal(actual);
}
}
expect(route).to.equal(url);
const searchParams = new URLSearchParams(params);

10
packages/integrations/image/test/picture-ssr-build.test.js
View file

@ -223,6 +223,16 @@ describe('SSR pictures with subpath - build', function () {
const src = image.attr('src');
const [route, params] = src.split('?');
for (const srcset of picture.children('source').map((_, source) => source.attribs['srcset'])) {
for (const pictureSrc of srcset.split(',')) {
const pictureParams = pictureSrc.split('?')[1];
const expected = new URLSearchParams(params).get('href');
const actual = new URLSearchParams(pictureParams).get('href').replace(/\s+\d+w$/, '');
expect(expected).to.equal(actual);
}
}
expect(route).to.equal(url);
const searchParams = new URLSearchParams(params);

10
packages/integrations/image/test/picture-ssr-dev.test.js
View file

@ -127,6 +127,16 @@ describe('SSR pictures - dev', function () {
const src = image.attr('src');
const [route, params] = src.split('?');
for (const srcset of picture.children('source').map((_, source) => source.attribs['srcset'])) {
for (const pictureSrc of srcset.split(',')) {
const pictureParams = pictureSrc.split('?')[1];
const expected = new URLSearchParams(params).get('href');
const actual = new URLSearchParams(pictureParams).get('href').replace(/\s+\d+w$/, '');
expect(expected).to.equal(actual);
}
}
expect(route).to.equal(url);
const searchParams = new URLSearchParams(params);