@koehler8/cms 1.0.0-beta.36 → 1.0.0-beta.37

package/package.json

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

package/src/main.js

@@ -135,6 +135,21 @@ export function createCmsApp() {
       };
 
       const extractCurrentRoute = () => {
+        // During SSG, vite-ssg passes the route being pre-rendered as a string
+        // on `ctx.routePath` and only pushes the router AFTER this setup fn runs
+        // — so `router.currentRoute` is still vue-router's START_LOCATION ('/')
+        // here, identically on every page. Resolve `routePath` through the router
+        // (a pure match, no navigation) to recover the real path + `params.locale`.
+        // Without this, `resolveCurrentPageId` sees '/' for every route, so the
+        // payload trim targets the wrong page — or, when '/' is ambiguous, none.
+        const routePath = ctx?.routePath;
+        if (typeof routePath === 'string' && routePath) {
+          try {
+            return router.resolve(routePath);
+          } catch {
+            return { path: routePath, params: {} };
+          }
+        }
         if (ctx?.route) {
           return ctx.route;
         }

package/src/utils/loadConfig.js

@@ -70,8 +70,24 @@ export function resolvePageIdForRoute(config, routePath, localeParam) {
         (typeof p === 'string' ? p : '/').replace(/\/+/g, '/').replace(/\/+$/, '') || '/';
     target = normalize(target);
     const pages = (config && config.pages) || {};
-    const matches = Object.entries(pages).filter(([, data]) => {
-        const pagePath = data && typeof data.path === 'string' && data.path.trim() ? data.path : '/';
+
+    // The SSG pre-renders `/404` from a site's custom `pages/404.json` (mirrors
+    // usePageConfig.selectPage's `/404` → `404` mapping). That page is
+    // conventionally path-less, so it can't be matched by `path` below — map the
+    // route to it directly. It is also deliberately NOT treated as living at `/`
+    // (see the id === '404' guard in the matcher) so it never collides with
+    // `home` there — the collision that otherwise makes `/` ambiguous on any
+    // site shipping a custom 404 page, suppressing the home-page trim.
+    const notFound = pages['404'];
+    const notFoundPathless = notFound && !(typeof notFound.path === 'string' && notFound.path.trim());
+    if (target === '/404' && notFoundPathless) return '404';
+
+    const matches = Object.entries(pages).filter(([id, data]) => {
+        const hasPath = data && typeof data.path === 'string' && data.path.trim();
+        // A page with no explicit `path` conventionally lives at `/` (home). The
+        // SSG-only `404` page is the exception: it is served at `/404`, never `/`.
+        const pagePath = hasPath ? data.path : (id === '404' ? null : '/');
+        if (pagePath === null) return false;
         return normalize(pagePath) === target;
     });
     return matches.length === 1 ? matches[0][0] : null;