@ossy/app 1.5.0 → 1.6.0

package/cli/render-page.task.js

@@ -1,6 +1,15 @@
 import React, { cloneElement } from 'react'
 import { prerenderToNodeStream } from 'react-dom/static'
 
+/** Strips non-JSON content (e.g. React elements on `pages`) for the bootstrap script. */
+export function appConfigForBootstrap (appConfig) {
+  if (!appConfig || typeof appConfig !== 'object') return appConfig
+  const pages = Array.isArray(appConfig.pages)
+    ? appConfig.pages.map(({ id, path }) => ({ id, path }))
+    : appConfig.pages
+  return { ...appConfig, pages }
+}
+
 export const BuildPage = {
   async handle ({ route, appConfig, isDevReloadEnabled }) {
     const rootElement = cloneElement(route.element, appConfig)
@@ -10,7 +19,7 @@ export const BuildPage = {
 
     const hydrateUrl = `/static/hydrate-${route.id}.js`
     const { prelude } = await prerenderToNodeStream(rootElement, {
-      bootstrapScriptContent: `window.__INITIAL_APP_CONFIG__ = ${JSON.stringify(appConfig)};${devReloadScript}`,
+      bootstrapScriptContent: `window.__INITIAL_APP_CONFIG__ = ${JSON.stringify(appConfigForBootstrap(appConfig))};${devReloadScript}`,
       bootstrapModules: [hydrateUrl],
     })
 

package/cli/server.js

@@ -111,12 +111,18 @@ const Router = OssyRouter.of({
   pages: [...apiRouteList, ...pageList]
 })
 
-function resolveAppConfig ({ req, buildTimeConfig }) {
+function resolveAppConfig ({ req, buildTimeConfig, activeRouteId }) {
   const userAppSettings = req.userAppSettings || {}
-  const pages = pageList.map((page) => ({
-    id: page?.id,
-    path: page?.path,
-  }))
+  const pages = pageList.map((page) => {
+    const entry = {
+      id: page?.id,
+      path: page?.path,
+    }
+    if (activeRouteId != null && page?.id === activeRouteId) {
+      entry.element = page?.element
+    }
+    return entry
+  })
   return {
     ...buildTimeConfig,
     url: req.originalUrl,
@@ -141,13 +147,17 @@ app.all('*all', (req, res) => {
     return
   }
 
-  const appConfig = resolveAppConfig({ req, buildTimeConfig })
-
   if (!route?.element) {
     res.status(404).send('Not found')
     return
   }
 
+  const appConfig = resolveAppConfig({
+    req,
+    buildTimeConfig,
+    activeRouteId: route.id,
+  })
+
   BuildPage.handle({ route, appConfig, isDevReloadEnabled })
     .then(html => { res.send(html) })
     .catch(err => { res.send(err) })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "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.5.0",
-    "@ossy/design-system": "^1.5.0",
-    "@ossy/pages": "^1.5.0",
-    "@ossy/router": "^1.5.0",
-    "@ossy/router-react": "^1.5.0",
-    "@ossy/sdk": "^1.5.0",
-    "@ossy/sdk-react": "^1.5.0",
-    "@ossy/themes": "^1.5.0",
+    "@ossy/connected-components": "^1.6.0",
+    "@ossy/design-system": "^1.6.0",
+    "@ossy/pages": "^1.6.0",
+    "@ossy/router": "^1.6.0",
+    "@ossy/router-react": "^1.6.0",
+    "@ossy/sdk": "^1.6.0",
+    "@ossy/sdk-react": "^1.6.0",
+    "@ossy/themes": "^1.6.0",
     "@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": "b1a36350ae22ae6776163952e3bf03b2a6cb6498"
+  "gitHead": "a1c29650f72ec23bd397d3c9e1c42387461acf8e"
 }