fix: fix sitemap trailing slash (with tests)

Author: stevenle

.changeset/wise-panthers-clap.md

@@ -0,0 +1,5 @@
+---
+'@blinkk/root': patch
+---
+
+fix: fix sitemap trailing slash (with tests)

packages/root/src/render/router.ts

@@ -105,6 +105,8 @@ export class Router {
       return [];
     }
 
+    const trailingSlash = this.rootConfig.server?.trailingSlash;
+
     const urlPaths: Array<{urlPath: string; params: Record<string, string>}> =
       [];
     if (routeModule.getStaticPaths) {
@@ -124,7 +126,7 @@ export class Router {
               );
             } else {
               urlPaths.push({
-                urlPath: normalizeUrlPath(urlPath),
+                urlPath: normalizeUrlPath(urlPath, {trailingSlash}),
                 params: pathParams.params || {},
               });
             }

packages/root/test/asset-url-format.test.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import {beforeEach, test, expect, afterEach} from 'vitest';
-import {listFilesRecursive} from '../src/utils/fsutils';
-import {Fixture, loadFixture} from './testutils';
+import {listFilesRecursive} from '../src/utils/fsutils.js';
+import {Fixture, loadFixture} from './testutils.js';
 
 let fixture: Fixture;
 

packages/root/test/css-topsort.test.ts

@@ -1,11 +1,8 @@
 import {promises as fs} from 'node:fs';
 import path from 'node:path';
-
 import {assert, beforeEach, test, expect, afterEach} from 'vitest';
-
-import {fileExists} from '../src/utils/fsutils';
-
-import {Fixture, loadFixture} from './testutils';
+import {fileExists} from '../src/utils/fsutils.js';
+import {Fixture, loadFixture} from './testutils.js';
 
 let fixture: Fixture;
 

packages/root/test/elements.test.ts

@@ -1,11 +1,8 @@
 import {promises as fs} from 'node:fs';
 import path from 'node:path';
-
 import {assert, beforeEach, test, expect, afterEach} from 'vitest';
-
-import {fileExists} from '../src/utils/fsutils';
-
-import {Fixture, loadFixture} from './testutils';
+import {fileExists} from '../src/utils/fsutils.js';
+import {Fixture, loadFixture} from './testutils.js';
 
 let fixture: Fixture;
 

packages/root/test/fixtures/sitemap/root.config.ts

@@ -0,0 +1,11 @@
+export default {
+  sitemap: true,
+  domain: 'https://www.example.com',
+  i18n: {
+    urlPath: '/intl/[path]',
+    locales: ['en', 'de', 'fr'],
+  },
+  server: {
+    trailingSlash: true,
+  },
+};

packages/root/test/fixtures/sitemap/routes/404.tsx

@@ -0,0 +1,13 @@
+export default function Page(props: {slug: string}) {
+  return <h1>Hello, {props.slug}!!</h1>;
+}
+
+export async function getStaticPaths() {
+  return {
+    paths: [{params: {page: 'bar'}}, {params: {page: 'baz'}}],
+  };
+}
+
+export async function getStaticProps(ctx) {
+  return {props: {slug: ctx.params.page}};
+}

packages/root/test/fixtures/sitemap/routes/[...page].tsx

@@ -0,0 +1,3 @@
+export default function Page() {
+  return <h1>Hello, foo!</h1>;
+}

packages/root/test/fixtures/sitemap/routes/foo.tsx

@@ -0,0 +1,3 @@
+export default function Page() {
+  return <h1>Hello, index!</h1>;
+}