@koehler8/cms 1.0.0-beta.32 → 1.0.0-beta.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koehler8/cms",
-  "version": "1.0.0-beta.32",
+  "version": "1.0.0-beta.34",
   "description": "Vertex CMS — lightweight, config-driven Vue 3 framework with theming, extensions, and SSG support",
   "license": "MIT",
   "type": "module",

package/src/components/Header.vue

@@ -130,12 +130,26 @@ const isHeaderCompact = ref(false);
 const currentLocale = ref('');
 const availableLocales = computed(() => siteLocales.map((code) => code.trim()).filter(Boolean));
 
-// The base locale is served at the unprefixed root path (`/`) — clicking
-// the dropdown item for it should NOT navigate to `/{baseLocale}` because
-// that URL doesn't pre-render and would 404. Build the link path
-// accordingly: base → `/`, others → `/{locale}`.
+// Switching language keeps the visitor on the SAME page rather than bouncing
+// them to the locale's home. Slugs are shared across locales, so take the
+// current path, strip any leading non-base locale segment, and re-prefix with
+// the target locale. The base locale is served unprefixed (`/path`); others at
+// `/{locale}/path`. (`/{baseLocale}/path` doesn't pre-render and would 404,
+// hence the base stays unprefixed.)
 const localeHref = (locale) => {
-  return locale === siteBaseLocale ? '/' : `/${locale}`;
+  const segments = (route.path || '/').split('/').filter(Boolean);
+  if (segments.length) {
+    const first = segments[0].toLowerCase();
+    if (first !== siteBaseLocale && availableLocales.value.includes(first)) {
+      segments.shift();
+    }
+  }
+  const rest = segments.join('/');
+  const slash = injectedSiteData.value?.site?.trailingSlash === true ? '/' : '';
+  if (locale === siteBaseLocale) {
+    return rest ? `/${rest}${slash}` : '/';
+  }
+  return rest ? `/${locale}/${rest}${slash}` : `/${locale}${slash}`;
 };
 const localeLabels = {
   en: 'English',

package/src/composables/usePageMeta.js

@@ -56,6 +56,7 @@ export function usePageMeta({ siteData, currentPage, locale }) {
   const siteTitle = computed(() => siteData.value?.site?.title || '');
   const siteDescription = computed(() => siteData.value?.site?.description || '');
   const siteUrl = computed(() => siteData.value?.site?.url || '');
+  const trailingSlash = computed(() => siteData.value?.site?.trailingSlash === true);
   const localeValue = computed(() => {
     if (typeof locale === 'function') return locale() || '';
     if (typeof locale === 'string') return locale;
@@ -116,6 +117,7 @@ export function usePageMeta({ siteData, currentPage, locale }) {
       locale: localeValue.value,
       baseLocale: configBaseLocale,
       path: currentPage.value?.path || '/',
+      trailingSlash: trailingSlash.value,
     });
   });
 
@@ -135,6 +137,7 @@ export function usePageMeta({ siteData, currentPage, locale }) {
         locale: code,
         baseLocale: configBaseLocale,
         path,
+        trailingSlash: trailingSlash.value,
       });
       if (href) {
         links.push({ rel: 'alternate', hreflang: code, href, key: `hreflang-${code}` });
@@ -145,6 +148,7 @@ export function usePageMeta({ siteData, currentPage, locale }) {
       locale: configBaseLocale,
       baseLocale: configBaseLocale,
       path,
+      trailingSlash: trailingSlash.value,
     });
     if (defaultHref) {
       links.push({ rel: 'alternate', hreflang: 'x-default', href: defaultHref, key: 'hreflang-x-default' });
@@ -216,6 +220,7 @@ export function usePageMeta({ siteData, currentPage, locale }) {
       pages: siteData.value?.pages,
       baseLocale: configBaseLocale,
       locale: localeValue.value,
+      trailingSlash: trailingSlash.value,
     });
     if (breadcrumb && !isDraft.value && !isNotFound.value) {
       script.push({
@@ -226,6 +231,11 @@ export function usePageMeta({ siteData, currentPage, locale }) {
     }
 
     return {
+      // Reflect the page's locale on <html lang> during SSR/prerender so the
+      // on-disk HTML for /{locale}/... ships the right language (the router
+      // guard only sets this client-side, after hydration). Base-locale pages
+      // fall back to the configured base locale.
+      htmlAttrs: { lang: localeValue.value || configBaseLocale || 'en' },
       title: pageMetaTitle.value,
       meta,
       link,

package/src/utils/breadcrumbs.js

@@ -63,6 +63,7 @@ export function buildBreadcrumbList({
   pages,
   baseLocale,
   locale,
+  trailingSlash = false,
 } = {}) {
   if (!currentPage || typeof currentPage !== 'object') return null;
   if (currentPage.isNotFound) return null;
@@ -83,6 +84,7 @@ export function buildBreadcrumbList({
     locale,
     baseLocale,
     path: '/',
+    trailingSlash,
   });
 
   const items = [
@@ -101,6 +103,7 @@ export function buildBreadcrumbList({
       locale,
       baseLocale,
       path: prefixPath,
+      trailingSlash,
     });
     items.push({
       '@type': 'ListItem',

package/src/utils/canonicalUrl.js

@@ -9,6 +9,14 @@
  *   - Base locale → ${siteUrl}${path}     e.g. https://example.com/about
  *   - Non-base    → ${siteUrl}/${locale}${path}   e.g. https://example.com/de/about
  *
+ * When `trailingSlash` is true, every non-root URL gets a trailing slash
+ * (`/about/`, `/de/`, `/de/about/`) — the root (`/`) is unchanged. This aligns
+ * the canonical with how a static host serving nested `dirStyle` output
+ * (`/about/index.html`) actually serves the page (`/about/`, with `/about`
+ * 301-redirecting to it), so the canonical names the URL that returns 200
+ * instead of one that redirects. Opt in per-site via `site.trailingSlash`;
+ * default (false) is byte-identical to the no-slash scheme.
+ *
  * Returns '' when siteUrl is missing — sitemaps require absolute URLs and
  * canonical links without a host are useless. Callers treat '' as "skip".
  */
@@ -28,17 +36,18 @@ function normalizeLocale(value) {
   return trimmed;
 }
 
-export function buildCanonicalUrl({ siteUrl, locale, baseLocale, path } = {}) {
+export function buildCanonicalUrl({ siteUrl, locale, baseLocale, path, trailingSlash = false } = {}) {
   const host = typeof siteUrl === 'string' ? siteUrl.trim().replace(/\/+$/, '') : '';
   if (!host) return '';
 
   const normalizedPath = normalizePath(path);
   const loc = normalizeLocale(locale);
   const base = normalizeLocale(baseLocale);
+  const slash = trailingSlash ? '/' : '';
 
   if (!loc || loc === base) {
-    return normalizedPath === '/' ? `${host}/` : `${host}${normalizedPath}`;
+    return normalizedPath === '/' ? `${host}/` : `${host}${normalizedPath}${slash}`;
   }
 
-  return normalizedPath === '/' ? `${host}/${loc}` : `${host}/${loc}${normalizedPath}`;
+  return normalizedPath === '/' ? `${host}/${loc}${slash}` : `${host}/${loc}${normalizedPath}${slash}`;
 }

package/src/utils/sitemapGenerator.js

@@ -27,6 +27,7 @@ function escapeXml(value) {
 export function buildSitemap(siteConfig, options = {}) {
   const siteUrl = (siteConfig?.site?.url || '').trim().replace(/\/+$/, '');
   if (!siteUrl) return '';
+  const trailingSlash = siteConfig?.site?.trailingSlash === true;
 
   // Whole-site draft → no sitemap. robots.txt emits "Disallow: /" in this
   // state, and listing URLs in the sitemap that the same robots blocks
@@ -52,13 +53,13 @@ export function buildSitemap(siteConfig, options = {}) {
     if (seenPaths.has(pagePath)) continue;
     seenPaths.add(pagePath);
 
-    const baseUrl = buildCanonicalUrl({ siteUrl, baseLocale, locale: baseLocale, path: pagePath });
+    const baseUrl = buildCanonicalUrl({ siteUrl, baseLocale, locale: baseLocale, path: pagePath, trailingSlash });
     if (!baseUrl) continue;
 
     const alternates = isMultiLocale
       ? availableLocales.map((loc) => ({
           hreflang: loc,
-          href: buildCanonicalUrl({ siteUrl, baseLocale, locale: loc, path: pagePath }),
+          href: buildCanonicalUrl({ siteUrl, baseLocale, locale: loc, path: pagePath, trailingSlash }),
         }))
       : [];
     if (isMultiLocale) {