fix: issue where canonical was missing trailing slash

10up · Jul 24, 2023 · cc5fd8e · cc5fd8e
1 parent 1494a33
commit cc5fd8e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/packages/next/src/components/Yoast.tsx b/packages/next/src/components/Yoast.tsx
@@ -12,8 +12,11 @@ import {
 import { useSettings } from '@headstartwp/core/react';
 import Head from 'next/head';
 
-function convertUrl(url: string, hostUrl: string, sourceUrl: string) {
-	return `${hostUrl}${removeSourceUrl({ link: url, backendUrl: sourceUrl })}`;
+export function convertUrl(url: string, hostUrl: string, sourceUrl: string) {
+	return `${hostUrl}${removeSourceUrl({
+		link: url.replace(/\/?$/, '/'),
+		backendUrl: sourceUrl,
+	})}`;
 }
 
 type Props = {

diff --git a/packages/next/src/components/__tests__/Yoast.tsx b/packages/next/src/components/__tests__/Yoast.tsx
@@ -0,0 +1,15 @@
+import { convertUrl } from '../Yoast';
+
+describe('convertUrl', () => {
+	it('root works without trailing slash', () => {
+		expect(
+			convertUrl('https://test.com/test', 'https://test.test.com', 'https://test.com/test'),
+		).toBe('https://test.test.com/');
+	});
+
+	it('root works with trailing slash', () => {
+		expect(
+			convertUrl('https://test.com/test/', 'https://test.test.com', 'https://test.com/test'),
+		).toBe('https://test.test.com/');
+	});
+});