Fix sitemap filter (#7263)

.changeset/eight-planes-drop.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/sitemap': patch
+---
+
+Fix sitemap does not filter pages

packages/integrations/sitemap/src/index.ts

@@ -118,6 +118,8 @@ const createPlugin = (options?: SitemapOptions): AstroIntegration => {
 						return urls;
 					}, []);
 
+					pageUrls = Array.from(new Set([...pageUrls, ...routeUrls, ...(customPages ?? [])]));
+
 					try {
 						if (filter) {
 							pageUrls = pageUrls.filter(filter);
@@ -127,8 +129,6 @@ const createPlugin = (options?: SitemapOptions): AstroIntegration => {
 						return;
 					}
 
-					pageUrls = Array.from(new Set([...pageUrls, ...routeUrls, ...(customPages ?? [])]));
-
 					if (pageUrls.length === 0) {
 						logger.warn(`No pages found!\n\`${OUTFILE}\` not created.`);
 						return;

packages/integrations/sitemap/test/filter.test.js

@@ -0,0 +1,46 @@
+import { loadFixture, readXML } from './test-utils.js';
+import { expect } from 'chai';
+import { sitemap } from './fixtures/static/deps.mjs';
+
+describe('Filter support', () => {
+	/** @type {import('./test-utils.js').Fixture} */
+	let fixture;
+
+	describe('Static', () => {
+		before(async () => {
+			fixture = await loadFixture({
+				root: './fixtures/static/',
+        integrations: [sitemap({
+          filter: (page) => page !== 'http://example.com/two/'
+        })],
+			});
+			await fixture.build();
+		});
+
+		it('Just one page is added', async () => {
+			const data = await readXML(fixture.readFile('/sitemap-0.xml'));
+			const urls = data.urlset.url;
+			expect(urls.length).to.equal(1);
+		});
+	});
+
+	describe('SSR', () => {
+		before(async () => {
+			fixture = await loadFixture({
+				root: './fixtures/ssr/',
+        integrations: [sitemap({
+          filter: (page) => page !== 'http://example.com/two/'
+        })],
+			});
+			await fixture.build();
+		});
+
+		it('Just one page is added', async () => {
+			const data = await readXML(fixture.readFile('/client/sitemap-0.xml'));
+			const urls = data.urlset.url;
+			expect(urls.length).to.equal(1);
+		});
+	});
+
+});
+

packages/integrations/sitemap/test/fixtures/static/deps.mjs

@@ -0,0 +1 @@
+export { default as sitemap } from '@astrojs/sitemap';