Skip to content

Commit

Permalink
Fix #6618: sitemap urls generated without slash (#6658)
Browse files Browse the repository at this point in the history
  • Loading branch information
andremralves authored Apr 4, 2023
1 parent ce37bc7 commit 1ec1df1
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .changeset/chatty-parrots-compare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/sitemap': patch
---

Fix sitemap generation with a base path
2 changes: 2 additions & 0 deletions packages/integrations/sitemap/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ const createPlugin = (options?: SitemapOptions): AstroIntegration => {
}

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;
});
Expand Down
32 changes: 32 additions & 0 deletions packages/integrations/sitemap/test/trailing-slash.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,22 @@ describe('Trailing slash', () => {
const urls = data.urlset.url;
expect(urls[0].loc[0]).to.equal('http://example.com/one');
});
describe('with base path', () => {
before(async () => {
fixture = await loadFixture({
root: './fixtures/trailing-slash/',
trailingSlash: 'never',
base: '/base',
});
await fixture.build();
});

it('URLs do not end with trailing slash', 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/one');
});
});
});

describe('trailingSlash: always', () => {
Expand All @@ -75,5 +91,21 @@ describe('Trailing slash', () => {
const urls = data.urlset.url;
expect(urls[0].loc[0]).to.equal('http://example.com/one/');
});
describe('with base path', () => {
before(async () => {
fixture = await loadFixture({
root: './fixtures/trailing-slash/',
trailingSlash: 'always',
base: '/base',
});
await fixture.build();
});

it('URLs end with trailing slash', 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/one/');
});
});
});
});

0 comments on commit 1ec1df1

Please sign in to comment.