@ossy/app 1.11.2 → 1.11.3

package/cli/build.js

@@ -67,6 +67,8 @@ export const OSSY_API_RUNTIME_BASENAME = 'api.runtime.mjs'
 export const OSSY_TASKS_RUNTIME_BASENAME = 'tasks.runtime.mjs'
 
 export const OSSY_PAGE_MODULES_DIRNAME = 'page-modules'
+/** Tiny Rollup inputs that re-export `metadata` so per-page server bundles keep i18n paths. */
+export const OSSY_PAGE_SERVER_ENTRIES_DIRNAME = 'page-server-entries'
 export const OSSY_API_MODULES_DIRNAME = 'api-modules'
 export const OSSY_TASK_MODULES_DIRNAME = 'task-modules'
 
@@ -371,19 +373,24 @@ export async function compilePageServerModules ({
   onWarn,
 }) {
   const modsDir = path.join(ossyDir, OSSY_PAGE_MODULES_DIRNAME)
+  const entriesDir = path.join(ossyDir, OSSY_PAGE_SERVER_ENTRIES_DIRNAME)
   fs.rmSync(modsDir, { recursive: true, force: true })
+  fs.rmSync(entriesDir, { recursive: true, force: true })
   if (pageFiles.length === 0) {
     return []
   }
   fs.mkdirSync(modsDir, { recursive: true })
+  fs.mkdirSync(entriesDir, { recursive: true })
   const bundlePages = []
   for (const f of pageFiles) {
     const pageId = clientHydrateIdForPage(f, srcDir)
     const safeId = String(pageId).replace(/[^a-zA-Z0-9_-]+/g, '-') || 'page'
     const outName = `${safeId}.mjs`
     const outFile = path.join(modsDir, outName)
+    const stubPath = path.join(entriesDir, `${safeId}.mjs`)
+    writePageServerRollupEntry({ pageAbsPath: f, stubPath })
     await bundleOssyNodeEntry({
-      inputPath: f,
+      inputPath: stubPath,
       outputFile: outFile,
       nodeEnv,
       onWarn,
@@ -500,6 +507,37 @@ export function clientHydrateIdForPage (pageAbsPath, srcDir) {
   return idMatch ? idMatch[1] : derived.id
 }
 
+export function pageSourceExportsMetadata (pageAbsPath) {
+  try {
+    const src = fs.readFileSync(pageAbsPath, 'utf8')
+    return /\bexport\s+const\s+metadata\b/.test(src)
+  } catch {
+    return false
+  }
+}
+
+/**
+ * Rollup tree-shakes `export const metadata` when the page file is the entry and `default`
+ * never references it — breaks i18n `path` objects at runtime. Re-export from a shim entry
+ * so `metadata` stays in the module graph.
+ */
+export function writePageServerRollupEntry ({ pageAbsPath, stubPath }) {
+  const rel = relToGeneratedImport(stubPath, pageAbsPath)
+  const meta = pageSourceExportsMetadata(pageAbsPath)
+    ? ', metadata'
+    : ''
+  fs.mkdirSync(path.dirname(stubPath), { recursive: true })
+  fs.writeFileSync(
+    stubPath,
+    [
+      '// Generated by @ossy/app — do not edit',
+      `export { default${meta} } from '${rel}'`,
+      '',
+    ].join('\n'),
+    'utf8'
+  )
+}
+
 /**
  * One client entry per page: imports only that page module and hydrates the document.
  * Keeps the same `toPage` shape as `pages.runtime.mjs` + manifests so SSR and client trees match.

package/cli/server.js

@@ -17,6 +17,23 @@ const apiRouteList = ApiRoutes ?? []
 
 const sitePageList = Array.isArray(pageRoutes) ? pageRoutes : []
 
+/** When `src/config.js` is minimal, infer language list from the first multi-path page. */
+function pageRouterLanguageOptions (config, pages) {
+  let supported = config?.supportedLanguages
+  let defaultLanguage = config?.defaultLanguage
+  if ((!supported || supported.length <= 1) && pages.length > 0) {
+    const p0 = pages[0]
+    if (p0 && typeof p0.path === 'object' && p0.path != null) {
+      supported = Object.keys(p0.path)
+      defaultLanguage = defaultLanguage || supported[0]
+    }
+  }
+  return {
+    supportedLanguages: Array.isArray(supported) ? supported : [],
+    defaultLanguage,
+  }
+}
+
 const app = express();
 
 const currentDir = path.dirname(url.fileURLToPath(import.meta.url))
@@ -110,10 +127,15 @@ const apiRouter = OssyRouter.of({
   pages: apiRouteList,
 })
 
+const { supportedLanguages, defaultLanguage } = pageRouterLanguageOptions(
+  buildTimeConfig,
+  sitePageList
+)
+
 const pageRouter = OssyRouter.of({
   pages: sitePageList,
-  defaultLanguage: buildTimeConfig.defaultLanguage,
-  supportedLanguages: buildTimeConfig.supportedLanguages || [],
+  defaultLanguage,
+  supportedLanguages,
 })
 
 app.all('*all', async (req, res) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.11.2",
+  "version": "1.11.3",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -27,14 +27,14 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
-    "@ossy/connected-components": "^1.11.2",
-    "@ossy/design-system": "^1.11.2",
-    "@ossy/pages": "^1.11.2",
-    "@ossy/router": "^1.11.2",
-    "@ossy/router-react": "^1.11.2",
-    "@ossy/sdk": "^1.11.2",
-    "@ossy/sdk-react": "^1.11.2",
-    "@ossy/themes": "^1.11.2",
+    "@ossy/connected-components": "^1.11.3",
+    "@ossy/design-system": "^1.11.3",
+    "@ossy/pages": "^1.11.3",
+    "@ossy/router": "^1.11.3",
+    "@ossy/router-react": "^1.11.3",
+    "@ossy/sdk": "^1.11.3",
+    "@ossy/sdk-react": "^1.11.3",
+    "@ossy/themes": "^1.11.3",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "6.1.0",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -67,5 +67,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "3998c8b461e8b7317462c3d1d65b25b9454ba18a"
+  "gitHead": "c8b8fe48b3462ef9f7994894a1b17d844740dc11"
 }