feat: update canonical URLs in metadata generation for various pages

Author: weijunext

app/[locale]/about/page.tsx

@@ -52,6 +52,7 @@ export async function generateMetadata({
  description: t("description"),
  locale: locale as Locale,
  path: `/about`,
+ canonicalUrl: `/about`,
  });
 }
 

app/[locale]/blogs/[slug]/page.tsx

@@ -31,6 +31,7 @@ export async function generateMetadata({
  noIndex: true,
  locale: locale as Locale,
  path: `/blogs/${slug}`,
+ canonicalUrl: `/blogs/${slug}`,
  });
  }
 
@@ -41,7 +42,7 @@ export async function generateMetadata({
  images: post.image ? [post.image] : [],
  locale: locale as Locale,
  path: `/blogs/${slug}`,
- // canonicalUrl: `/blogs/${slug}`,
+ canonicalUrl: `/blogs/${slug}`,
  });
 }
 

app/[locale]/blogs/page.tsx

@@ -23,6 +23,7 @@ export async function generateMetadata({
  description: t("description"),
  locale: locale as Locale,
  path: `/blogs`,
+ canonicalUrl: `/blogs`,
  });
 }
 

app/[locale]/layout.tsx

@@ -35,7 +35,7 @@ export async function generateMetadata({
  description: t("description"),
  locale: locale as Locale,
  path: `/`,
- // canonicalUrl: `/blogs/${slug}`,
+ canonicalUrl: `/`,
  });
 }
 

app/[locale]/privacy-policy/page.tsx

@@ -52,6 +52,7 @@ export async function generateMetadata({
  description: t("description"),
  locale: locale as Locale,
  path: `/privacy-policy`,
+ canonicalUrl: `/privacy-policy`,
  });
 }
 

app/[locale]/terms-of-service/page.tsx

@@ -52,6 +52,7 @@ export async function generateMetadata({
  description: t("description"),
  locale: locale as Locale,
  path: `/terms-of-service`,
+ canonicalUrl: `/terms-of-service`,
  });
 }
 

app/[locale]/unsubscribe/page.tsx

@@ -1,4 +1,4 @@
-import { unsubscribeFromNewsletter } from "@/app/actions/newsletter";
+import { unsubscribeFromNewsletter } from "@/actions/newsletter";
 
 type SearchParams = Promise<{ [key: string]: string | string[] | undefined }>;
 

lib/metadata.ts

@@ -53,9 +53,10 @@ export async function constructMetadata({
  // build alternate language links
  const alternateLanguages = Object.keys(LOCALE_NAMES).reduce((acc, lang) => {
  const path = canonicalUrl
- ? `/${lang === DEFAULT_LOCALE ? '' : lang}${canonicalUrl}`
- : `/${lang === DEFAULT_LOCALE ? '' : lang}`
- acc[lang] = `${siteConfig.url}/${path}`
+ ? `${lang === DEFAULT_LOCALE ? '' : `/${lang}`}${canonicalUrl}`
+ : `${lang === DEFAULT_LOCALE ? '' : `/${lang}`}`
+ acc[lang] = `${siteConfig.url}${path}`
+
  return acc
  }, {} as Record<string, string>)
 
@@ -67,7 +68,7 @@ export async function constructMetadata({
  creator: siteConfig.creator,
  metadataBase: new URL(siteConfig.url),
  alternates: {
- canonical: canonicalUrl ? `${siteConfig.url}/${canonicalUrl}` : undefined,
+ canonical: canonicalUrl ? `${siteConfig.url}${locale === DEFAULT_LOCALE ? '' : `/${locale}`}${canonicalUrl}` : undefined,
  languages: alternateLanguages,
  },
  openGraph: {