@ossy/platform 1.38.3 → 1.38.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/platform",
-  "version": "1.38.3",
+  "version": "1.38.5",
   "description": "Ossy application server runtime",
   "repository": {
     "type": "git",
@@ -38,13 +38,13 @@
     "@aws-sdk/s3-request-presigner": "^3.1057.0",
     "@aws-sdk/util-create-request": "^3.972.26",
     "@aws-sdk/util-format-url": "^3.972.17",
-    "@ossy/event-store": "^1.7.3",
-    "@ossy/observability": "^1.7.3",
-    "@ossy/policies": "^1.12.3",
-    "@ossy/router": "^1.39.3",
-    "@ossy/sdk": "^1.39.3",
-    "@ossy/tokens": "^1.12.3",
-    "@ossy/users": "^1.12.3",
+    "@ossy/event-store": "^1.7.5",
+    "@ossy/observability": "^1.7.5",
+    "@ossy/policies": "^1.12.5",
+    "@ossy/router": "^1.39.5",
+    "@ossy/sdk": "^1.39.5",
+    "@ossy/tokens": "^1.12.5",
+    "@ossy/users": "^1.12.5",
     "cookie-parser": "^1.4.7",
     "dotenv": ">=16.0.0 <18.0.0",
     "express": ">=5.0.0 <6.0.0",
@@ -62,5 +62,5 @@
     "src",
     "Dockerfile"
   ],
-  "gitHead": "501d2273560cb04d668afd32edf448019f3312aa"
+  "gitHead": "97d02b0762f2c0461abb1e6753fc3aaad30ee93f"
 }

package/src/server.js

@@ -17,8 +17,6 @@ import { createLogger } from '@ossy/observability'
 import { ConfigService } from './config.service.js'
 import { UsersMiddleware } from './users.middleware.js'
 import { WorkspacesMiddleware } from './workspaces.middleware.js'
-import { matchesGlob } from './tasks/glob.js'
-
 const log = createLogger('@ossy/platform')
 
 const DEFAULT_PORT = 3000
@@ -111,6 +109,8 @@ export async function startServer (options = {}) {
 
   const manifest = loadManifest(buildDir)
   const config = manifest.config
+  const supportedLanguages = Array.isArray(config.supportedLanguages) ? config.supportedLanguages : []
+  const defaultLanguage = config.defaultLanguage
   for (const task of manifest.tasks ?? []) {
     try {
       const mod = await import(resolveEntryUrl(task.entry, buildDir))
@@ -179,15 +179,22 @@ export async function startServer (options = {}) {
     }
   }
 
-  // Layout loading — import each bundled layout module and store the default-
-  // exported React component in a map keyed by the layout's id. At render
-  // time we pick the first layout whose `applies` glob matches the page path.
-  const layoutModuleMap = new Map()
-  for (const layoutEntry of manifest.layouts ?? []) {
+  // Layout loading — one `*.layout.jsx` per app wraps every page render. The
+  // layout component decides route-specific chrome (auth, public flows, etc.).
+  /** @type {{ component: import('react').ComponentType, entry: string } | null} */
+  let appLayout = null
+  const layoutManifest = manifest.layouts ?? []
+  if (layoutManifest.length > 1) {
+    log.warn(
+      `Multiple layouts in manifest (${layoutManifest.length}); only the first is used. Use one *.layout.jsx per app.`,
+    )
+  }
+  const layoutEntry = layoutManifest[0]
+  if (layoutEntry) {
     try {
       const mod = await import(resolveEntryUrl(layoutEntry.entry, buildDir))
       if (typeof mod.default === 'function') {
-        layoutModuleMap.set(layoutEntry.id, { component: mod.default, applies: layoutEntry.applies ?? '*' })
+        appLayout = { component: mod.default, entry: layoutEntry.entry }
       }
     } catch (err) {
       log.warn(`Failed to load layout "${layoutEntry.id}"`, undefined, err)
@@ -214,26 +221,6 @@ export async function startServer (options = {}) {
     }
   }
 
-  function findLayoutForPage (pagePathOrPaths) {
-    if (!layoutModuleMap.size) return null
-    const paths = typeof pagePathOrPaths === 'string'
-      ? [pagePathOrPaths]
-      : Object.values(pagePathOrPaths || {})
-    // Check specific (non-wildcard) layouts first, then fall back to catch-all '*'.
-    // This lets e.g. `applies: '/'` override a global `applies: '*'` layout.
-    let catchAll = null
-    for (const [, layout] of layoutModuleMap) {
-      if (layout.applies === '*') {
-        if (!catchAll) catchAll = layout.component
-        continue
-      }
-      for (const p of paths) {
-        if (matchesGlob(layout.applies, p)) return layout.component
-      }
-    }
-    return catchAll
-  }
-
   // Register the SDK so all tasks receive it as `sdk`.
   // Priority: explicit options.sdk → SDK.of() from env vars → null (direct-DB fallback in tasks).
   const botSdk = (process.env.API_URL && process.env.OSSY_API_KEY)
@@ -247,9 +234,6 @@ export async function startServer (options = {}) {
     ChangeStream.start(process.env.DB_URL)
   }
 
-  const supportedLanguages = Array.isArray(config.supportedLanguages) ? config.supportedLanguages : []
-  const defaultLanguage = config.defaultLanguage
-
   const pageRouter = OssyRouter.of({
     pages: manifest.pages,
     supportedLanguages,
@@ -346,7 +330,8 @@ export async function startServer (options = {}) {
           res.status(503).type('text').send('SSR runtime unavailable')
           return
         }
-        const Layout = findLayoutForPage(pageEntry.path)
+        const Layout = appLayout?.component ?? null
+        const layoutEntry = appLayout?.entry ?? null
         const props = {
           ...config,
           ...(req.userAppSettings || {}),
@@ -360,7 +345,8 @@ export async function startServer (options = {}) {
           // Slot component entries are prepended so that layout-level
           // ComponentSlotsProviders (which merge on top) can override them.
           componentEntries: [...slotComponentEntries, ...manifest.components],
-          Layout: Layout ?? null,
+          Layout,
+          layoutEntry,
         }
         const html = await mod.render(props)
         res.status(200).type('html').send(html)