feat: handle docs URL edge cases

fleek-platform · Oct 16, 2024 · 461c2d2 · 461c2d2
1 parent b790467
commit 461c2d2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/layouts/DocsHtml.astro b/src/layouts/DocsHtml.astro
@@ -109,7 +109,7 @@ const canonicalUrl = generateCanonicalUrl(baseUrl, docsPageSlug);
     <!-- PostHog -->
     <PostHog />
   </head>
-<body
+  <body
     class="relative flex flex-col bg-black font-sans text-gray-dark-11 selection:bg-yellow-dark-9 selection:text-black"
   >
     <!-- Google Tag Manager (noscript version) -->

diff --git a/src/utils/generateCanonicalUrl.ts b/src/utils/generateCanonicalUrl.ts
@@ -1,5 +1,13 @@
 export function generateCanonicalUrl(baseUrl: string, slug?: string) {
-  if (!slug) return `${baseUrl}/`;
+  const cleanBaseUrl = baseUrl.replace(/\/$/, '');
 
-  return `${baseUrl}/${slug.replace(/^\/|\/$/g, '')}/`;
+  if (!slug) return `${cleanBaseUrl}/`;
+
+  const sanitizedSlug = slug
+    .replace(/^\/|\/$/g, '')
+    .split('/')
+    .map((segment) => encodeURIComponent(segment))
+    .join('/');
+
+  return `${cleanBaseUrl}/${sanitizedSlug}/`;
 }