Fix generation for routes defined using getStaticPaths (#7029)

* Fix static site dynamic routes for sitemap integration * Add changeset * Update pnpm-lock * Remove console.log
withastro · May 8, 2023 · 1b90a7a · 1b90a7a
1 parent e54dcd5
commit 1b90a7a
Show file tree

Hide file tree

Showing 8 changed files with 356 additions and 5 deletions.
diff --git a/.changeset/hungry-spies-kick.md b/.changeset/hungry-spies-kick.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/sitemap': patch
+---
+
+Fix generation for static dynamic routes
diff --git a/packages/integrations/cloudflare/test/fixtures/basics/functions/[[path]].js b/packages/integrations/cloudflare/test/fixtures/basics/functions/[[path]].js
diff --git a/packages/integrations/sitemap/src/index.ts b/packages/integrations/sitemap/src/index.ts
@@ -61,7 +61,7 @@ const createPlugin = (options?: SitemapOptions): AstroIntegration => {
 				config = cfg;
 			},
 
-			'astro:build:done': async ({ dir, routes }) => {
+			'astro:build:done': async ({ dir, routes, pages }) => {
 				try {
 					if (!config.site) {
 						logger.warn(
@@ -85,7 +85,14 @@ const createPlugin = (options?: SitemapOptions): AstroIntegration => {
 						return;
 					}
 
-					let pageUrls = routes.reduce<string[]>((urls, r) => {
+					let pageUrls = pages.map((p) => {
+						if (p.pathname !== '' && !finalSiteUrl.pathname.endsWith('/'))
+							finalSiteUrl.pathname += '/';
+						const path = finalSiteUrl.pathname + p.pathname;
+						return new URL(path, finalSiteUrl).href;
+					});
+
+					let routeUrls = routes.reduce<string[]>((urls, r) => {
 						/**
 						 * Dynamic URLs have entries with `undefined` pathnames
 						 */
@@ -119,9 +126,7 @@ const createPlugin = (options?: SitemapOptions): AstroIntegration => {
 						return;
 					}
 
-					if (customPages) {
-						pageUrls = Array.from(new Set([...pageUrls, ...customPages]));
-					}
+					pageUrls = Array.from(new Set([...pageUrls, ...routeUrls, ...(customPages ?? [])]));
 
 					if (pageUrls.length === 0) {
 						logger.warn(`No pages found!\n\`${OUTFILE}\` not created.`);

diff --git a/packages/integrations/sitemap/test/fixtures/static/astro.config.mjs b/packages/integrations/sitemap/test/fixtures/static/astro.config.mjs
@@ -0,0 +1,7 @@
+import { defineConfig } from 'astro/config';
+import sitemap from '@astrojs/sitemap';
+
+export default defineConfig({
+  integrations: [sitemap()],
+	site: 'http://example.com',
+})
diff --git a/packages/integrations/sitemap/test/fixtures/static/package.json b/packages/integrations/sitemap/test/fixtures/static/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/sitemap-static",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*",
+    "@astrojs/sitemap": "workspace:*"
+  }
+}
diff --git a/packages/integrations/sitemap/test/fixtures/static/src/pages/[slug].astro b/packages/integrations/sitemap/test/fixtures/static/src/pages/[slug].astro
@@ -0,0 +1,17 @@
+---
+export function getStaticPaths() {
+  return [
+    { params: { slug: 'one' }, props: { title: 'One' } },
+    { params: { slug: 'two' }, props: { title: 'Two' } },
+  ]
+}
+---
+
+<html>
+	<head>
+		<title>{Astro.props.title}</title>
+	</head>
+	<body>
+		<h1>{Astro.props.title}</h1>
+	</body>
+</html>
diff --git a/packages/integrations/sitemap/test/staticPaths.test.js b/packages/integrations/sitemap/test/staticPaths.test.js
@@ -0,0 +1,22 @@
+import { loadFixture, readXML } from './test-utils.js';
+import { expect } from 'chai';
+
+describe('getStaticPaths support', () => {
+	/** @type {import('./test-utils.js').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/static/',
+		});
+		await fixture.build();
+	});
+
+	it('getStaticPath pages require zero config', 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/one/');
+		expect(urls[1].loc[0]).to.equal('http://example.com/two/');
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml