unchained/manoon-headless
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge dev into master
All checks were successful
Build and Deploy / build (push) Successful in 1s
Details

Browse Source 
Includes canonical URL fix and build workflow improvements
This commit is contained in:
Unchained
2026-04-06 15:42:50 +02:00
parent 2097280f20 09725c6b0d
commit 261fd36579
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/[locale]/about/page.tsx
View File

@@ -19,7 +19,7 @@ export async function generateMetadata({ params }: AboutPageProps): Promise<Meta
const metadata = getPageMetadata(validLocale as Locale); const metadata = getPageMetadata(validLocale as Locale);
const keywords = getPageKeywords(validLocale as Locale, 'about'); const keywords = getPageKeywords(validLocale as Locale, 'about');
const localePrefix = validLocale === DEFAULT_LOCALE ? "" : `/${validLocale}`; const localePrefix = `/${validLocale}`;
const canonicalUrl = `${baseUrl}${localePrefix}/about`; const canonicalUrl = `${baseUrl}${localePrefix}/about`;
return { return {

2
src/app/[locale]/contact/page.tsx
View File

@@ -16,7 +16,7 @@ export async function generateMetadata({ params }: ContactPageProps): Promise<Me
const metadata = getPageMetadata(validLocale as Locale); const metadata = getPageMetadata(validLocale as Locale);
const keywords = getPageKeywords(validLocale as Locale, 'contact'); const keywords = getPageKeywords(validLocale as Locale, 'contact');
const localePrefix = validLocale === DEFAULT_LOCALE ? "" : `/${validLocale}`; const localePrefix = `/${validLocale}`;
const canonicalUrl = `${baseUrl}${localePrefix}/contact`; const canonicalUrl = `${baseUrl}${localePrefix}/contact`;
return { return {

4
src/app/[locale]/layout.tsx
View File

@@ -21,11 +21,11 @@ export async function generateMetadata({
}): Promise<Metadata> { }): Promise<Metadata> {
const { locale } = await params; const { locale } = await params;
const validLocale = isValidLocale(locale) ? locale : DEFAULT_LOCALE; const validLocale = isValidLocale(locale) ? locale : DEFAULT_LOCALE;
const localePrefix = validLocale === DEFAULT_LOCALE ? "" : `/${locale}`; const localePrefix = `/${locale}`;
const languages: Record<string, string> = {}; const languages: Record<string, string> = {};
for (const loc of SUPPORTED_LOCALES) { for (const loc of SUPPORTED_LOCALES) {
const prefix = loc === DEFAULT_LOCALE ? "" : `/${loc}`; const prefix = `/${loc}`;
languages[loc] = `${baseUrl}${prefix}`; languages[loc] = `${baseUrl}${prefix}`;
} }

4
src/app/[locale]/page.tsx
View File

@@ -29,8 +29,8 @@ export async function generateMetadata({ params }: { params: Promise<{ locale: s
setRequestLocale(validLocale); setRequestLocale(validLocale);
// Build canonical URL // Build canonical URL
const localePrefix = validLocale === DEFAULT_LOCALE ? "" : `/${validLocale}`; const localePrefix = `/${validLocale}`;
const canonicalUrl = `${baseUrl}${localePrefix || '/'}`; const canonicalUrl = `${baseUrl}${localePrefix}`;
return { return {
title: metadata.home.title, title: metadata.home.title,

2
src/app/[locale]/products/[slug]/page.tsx
View File

@@ -57,7 +57,7 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
const secondaryKeywords = keywords.secondary.map(replaceTemplate); const secondaryKeywords = keywords.secondary.map(replaceTemplate);
// Build canonical URL // Build canonical URL
const localePrefix = validLocale === DEFAULT_LOCALE ? "" : `/${validLocale}`; const localePrefix = `/${validLocale}`;
const canonicalUrl = `${baseUrl}${localePrefix}/products/${slug}`; const canonicalUrl = `${baseUrl}${localePrefix}/products/${slug}`;
// Get product image for OpenGraph // Get product image for OpenGraph

2
src/app/[locale]/products/page.tsx
View File

@@ -24,7 +24,7 @@ export async function generateMetadata({ params }: ProductsPageProps): Promise<M
const keywords = getPageKeywords(validLocale as Locale, 'products'); const keywords = getPageKeywords(validLocale as Locale, 'products');
// Build canonical URL // Build canonical URL
const localePrefix = validLocale === DEFAULT_LOCALE ? "" : `/${validLocale}`; const localePrefix = `/${validLocale}`;
const canonicalUrl = `${baseUrl}${localePrefix}/products`; const canonicalUrl = `${baseUrl}${localePrefix}/products`;
return { return {