From 62dfd154817e8ec171657b9eb54d97629b668b46 Mon Sep 17 00:00:00 2001 From: Caio Ferrarezi Date: Tue, 7 Jun 2022 18:24:59 -0300 Subject: [PATCH 1/2] fix(@astrojs/sitemap): handle base/pathname correctly --- packages/integrations/sitemap/src/index.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/integrations/sitemap/src/index.ts b/packages/integrations/sitemap/src/index.ts index 1c1cf29ab078..e43b8f6d61e7 100644 --- a/packages/integrations/sitemap/src/index.ts +++ b/packages/integrations/sitemap/src/index.ts @@ -61,14 +61,22 @@ export default function createPlugin({ config = _config; }, 'astro:build:done': async ({ pages, dir }) => { - const finalSiteUrl = canonicalURL || config.site; - if (!finalSiteUrl) { + let finalSiteUrl: URL; + 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( 'The Sitemap integration requires either the `site` astro.config option or `canonicalURL` integration option. Skipping.' ); 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) { pageUrls = pageUrls.filter((page: string) => filter(page)); } From f3b6d260ada4dfd2b9c1b004caec87ac24daa6be Mon Sep 17 00:00:00 2001 From: Caio Ferrarezi Date: Tue, 7 Jun 2022 18:31:35 -0300 Subject: [PATCH 2/2] chore: add changeset --- .changeset/large-rings-invite.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/large-rings-invite.md diff --git a/.changeset/large-rings-invite.md b/.changeset/large-rings-invite.md new file mode 100644 index 000000000000..edf16f8d058e --- /dev/null +++ b/.changeset/large-rings-invite.md @@ -0,0 +1,5 @@ +--- +'@astrojs/sitemap': patch +--- + +Prevent sitemap URLs with trimmed paths