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

Prevent sitemap URLs without pathname (#3553)

Browse source 
* fix(@astrojs/sitemap): handle base/pathname correctly

* chore: add changeset
This commit is contained in:
Caio Ferrarezi 2022-06-08 12:07:12 -03:00 committed by GitHub
parent 16cf649e0a
commit c601ce59b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/large-rings-invite.md Normal file
View file

@ -0,0 +1,5 @@
---
'@astrojs/sitemap': patch
---
Prevent sitemap URLs with trimmed paths

14
packages/integrations/sitemap/src/index.ts
View file

@ -61,14 +61,22 @@ export default function createPlugin({
config = _config; config = _config;
}, },
'astro:build:done': async ({ pages, dir }) => { 'astro:build:done': async ({ pages, dir }) => {
const finalSiteUrl = canonicalURL || config.site; let finalSiteUrl: URL;
if (!finalSiteUrl) { if (canonicalURL) {
finalSiteUrl = new URL(canonicalURL);
finalSiteUrl.pathname += finalSiteUrl.pathname.endsWith('/') ? '' : '/'; // normalizes the final url since it's provided by user
} else if (config.site) {
finalSiteUrl = new URL(config.base, config.site);
} else {
console.warn( console.warn(
'The Sitemap integration requires either the `site` astro.config option or `canonicalURL` integration option. Skipping.' 'The Sitemap integration requires either the `site` astro.config option or `canonicalURL` integration option. Skipping.'
); );
return; return;
} }
let pageUrls = pages.map((p) => new URL(p.pathname, finalSiteUrl).href); let pageUrls = pages.map((p) => {
const path = finalSiteUrl.pathname + p.pathname
return new URL(path, finalSiteUrl).href
});
if (filter) { if (filter) {
pageUrls = pageUrls.filter((page: string) => filter(page)); pageUrls = pageUrls.filter((page: string) => filter(page));
} }