From c601ce59b5740e7ff48c6575a6168d6a2408f7a3 Mon Sep 17 00:00:00 2001 From: Caio Ferrarezi Date: Wed, 8 Jun 2022 12:07:12 -0300 Subject: [PATCH] Prevent sitemap URLs without pathname (#3553) * fix(@astrojs/sitemap): handle base/pathname correctly * chore: add changeset --- .changeset/large-rings-invite.md | 5 +++++ packages/integrations/sitemap/src/index.ts | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) 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 000000000..edf16f8d0 --- /dev/null +++ b/.changeset/large-rings-invite.md @@ -0,0 +1,5 @@ +--- +'@astrojs/sitemap': patch +--- + +Prevent sitemap URLs with trimmed paths diff --git a/packages/integrations/sitemap/src/index.ts b/packages/integrations/sitemap/src/index.ts index 1c1cf29ab..e43b8f6d6 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)); }