From b325fada567892b63ecae87c1ff845c8514457ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Alves?=
 <71379045+andremralves@users.noreply.github.com>
Date: Wed, 17 Jan 2024 10:33:23 -0300
Subject: [PATCH] @astrojs/sitemap: Fixes generated URLs when using a `base`
 with a SSR adapter (#9704)

* Fix base path formatting for ssr adapters

* Update .changeset/curly-seals-count.md

Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>

---------

Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
---
 .changeset/curly-seals-count.md               |  5 +++
 packages/integrations/sitemap/src/index.ts    | 11 +++---
 .../sitemap/test/base-path.test.js            | 39 +++++++++++++++++++
 3 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/curly-seals-count.md
 create mode 100644 packages/integrations/sitemap/test/base-path.test.js

diff --git a/.changeset/curly-seals-count.md b/.changeset/curly-seals-count.md
new file mode 100644
index 000000000000..f88178b8cea7
--- /dev/null
+++ b/.changeset/curly-seals-count.md
@@ -0,0 +1,5 @@
+---
+"@astrojs/sitemap": patch
+---
+
+Fixes generated URLs when using a `base` with a SSR adapter
diff --git a/packages/integrations/sitemap/src/index.ts b/packages/integrations/sitemap/src/index.ts
index 79f6f9dfcb07..c254fb662bcf 100644
--- a/packages/integrations/sitemap/src/index.ts
+++ b/packages/integrations/sitemap/src/index.ts
@@ -107,11 +107,12 @@ const createPlugin = (options?: SitemapOptions): AstroIntegration => {
 						 */
 						if (r.pathname) {
 							if (isStatusCodePage(r.pathname ?? r.route)) return urls;
-							/**
-							 * remove the initial slash from relative pathname
-							 * because `finalSiteUrl` always has trailing slash
-							 */
-							const fullPath = finalSiteUrl.pathname + r.generate(r.pathname).substring(1);
+
+							// `finalSiteUrl` may end with a trailing slash
+							// or not because of base paths.
+							let fullPath = finalSiteUrl.pathname;
+							if (fullPath.endsWith('/')) fullPath += r.generate(r.pathname).substring(1);
+							else fullPath += r.generate(r.pathname);
 
 							let newUrl = new URL(fullPath, finalSiteUrl).href;
 
diff --git a/packages/integrations/sitemap/test/base-path.test.js b/packages/integrations/sitemap/test/base-path.test.js
new file mode 100644
index 000000000000..a90f28c30275
--- /dev/null
+++ b/packages/integrations/sitemap/test/base-path.test.js
@@ -0,0 +1,39 @@
+import { loadFixture, readXML } from './test-utils.js';
+import { expect } from 'chai';
+
+describe('URLs with base path', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	describe('using node adapter', () => {
+		before(async () => {
+			fixture = await loadFixture({
+				root: './fixtures/ssr/',
+				base: '/base',
+			});
+			await fixture.build();
+		});
+
+		it('Base path is concatenated correctly', async () => {
+			const data = await readXML(fixture.readFile('/client/sitemap-0.xml'));
+			const urls = data.urlset.url;
+			expect(urls[0].loc[0]).to.equal('http://example.com/base/one/');
+		});
+	});
+
+	describe('static', () => {
+		before(async () => {
+			fixture = await loadFixture({
+				root: './fixtures/static/',
+				base: '/base',
+			});
+			await fixture.build();
+		});
+
+		it('Base path is concatenated correctly', async () => {
+			const data = await readXML(fixture.readFile('/sitemap-0.xml'));
+			const urls = data.urlset.url;
+			expect(urls[0].loc[0]).to.equal('http://example.com/base/123/');
+		});
+	});
+});