@ossy/app 1.2.0 → 1.4.0

package/cli/build.js

@@ -407,18 +407,21 @@ export function clientHydrateIdForPage (pageAbsPath, srcDir) {
  * One client entry per page: imports only that page module and hydrates the document.
  * Keeps the same `toPage` shape as `generatePagesModule` so SSR and client trees match.
  */
-export function generatePageHydrateModule ({ pageAbsPath, stubAbsPath, srcDir }) {
+export function generatePageHydrateModule ({ pageAbsPath, stubAbsPath, srcDir, pagesGeneratedPath }) {
   const rel = relToGeneratedImport(stubAbsPath, pageAbsPath)
+  const pagesRel = relToGeneratedImport(stubAbsPath, pagesGeneratedPath)
   const { id, path: routePath } = filePathToRoute(pageAbsPath, srcDir)
   const pathLiteral = JSON.stringify(routePath)
   const idLiteral = JSON.stringify(id)
   return [
     '// Generated by @ossy/app — do not edit',
     '',
-    "import React, { cloneElement } from 'react'",
+    "import React, { cloneElement, createElement } from 'react'",
     "import 'react-dom'",
     "import { hydrateRoot } from 'react-dom/client'",
+    "import { App } from '@ossy/connected-components'",
     `import * as _page from './${rel}'`,
+    `import pageRoutes from './${pagesRel}'`,
     '',
     'function toPage(mod, derived) {',
     '  const meta = mod?.metadata || {}',
@@ -431,9 +434,17 @@ export function generatePageHydrateModule ({ pageAbsPath, stubAbsPath, srcDir })
     '',
     `const _route = toPage(_page, { id: ${idLiteral}, path: ${pathLiteral} })`,
     'const initialConfig = window.__INITIAL_APP_CONFIG__ || {}',
-    'const rootTree = _route?.element',
-    '  ? cloneElement(_route.element, initialConfig)',
-    "  : React.createElement('p', null, 'Not found')",
+    'const pagesForApp = pageRoutes.map((p) =>',
+    '  p.id === _route.id',
+    '    ? { ...p, element: cloneElement(p.element, initialConfig) }',
+    '    : p',
+    ')',
+    'const rootTree = createElement(App, {',
+    '  ...initialConfig,',
+    '  url: window.location.href,',
+    '  pages: pagesForApp,',
+    '  includeDocumentShell: false,',
+    '})',
     'hydrateRoot(document, rootTree)',
     '',
   ].join('\n')
@@ -441,6 +452,7 @@ export function generatePageHydrateModule ({ pageAbsPath, stubAbsPath, srcDir })
 
 /** Writes `hydrate-<id>.jsx` for each page; removes stale `hydrate-*` outputs in `ossyDir` first. */
 export function writePageHydrateStubs (pageFiles, srcDir, ossyDir) {
+  const pagesGeneratedPath = path.join(ossyDir, OSSY_GEN_PAGES_BASENAME)
   if (!fs.existsSync(ossyDir)) fs.mkdirSync(ossyDir, { recursive: true })
   for (const ent of fs.readdirSync(ossyDir, { withFileTypes: true })) {
     const full = path.join(ossyDir, ent.name)
@@ -467,7 +479,12 @@ export function writePageHydrateStubs (pageFiles, srcDir, ossyDir) {
     fs.mkdirSync(path.dirname(stubPath), { recursive: true })
     fs.writeFileSync(
       stubPath,
-      generatePageHydrateModule({ pageAbsPath: f, stubAbsPath: stubPath, srcDir })
+      generatePageHydrateModule({
+        pageAbsPath: f,
+        stubAbsPath: stubPath,
+        srcDir,
+        pagesGeneratedPath,
+      })
     )
   }
 }

package/cli/server.js

@@ -1,9 +1,10 @@
 import path from 'path';
 import url from 'url'
-import React, { cloneElement } from 'react';
+import React, { cloneElement, createElement } from 'react';
 import express from 'express'
 import morgan from 'morgan'
 import { Router as OssyRouter } from '@ossy/router'
+import { App } from '@ossy/connected-components'
 import { prerenderToNodeStream } from 'react-dom/static'
 import { ProxyInternal } from './proxy-internal.js'
 import cookieParser from 'cookie-parser'
@@ -127,7 +128,7 @@ app.all('*all', (req, res) => {
 
   const appConfig = {
     ...buildTimeConfig,
-    url: req.url,
+    url: req.originalUrl,
     theme: userAppSettings.theme || buildTimeConfig.theme || 'light',
     isAuthenticated: req.isAuthenticated || false,
     workspaceId: userAppSettings.workspaceId || buildTimeConfig.workspaceId,
@@ -141,7 +142,18 @@ app.all('*all', (req, res) => {
     return
   }
 
-  prerenderHtmlDocument(cloneElement(route.element, appConfig), appConfig, route.id)
+  const pagesForApp = pageList.map((p) =>
+    p.id === route.id
+      ? { ...p, element: cloneElement(p.element, appConfig) }
+      : p
+  )
+  const rootElement = createElement(App, {
+    ...appConfig,
+    pages: pagesForApp,
+    includeDocumentShell: false,
+  })
+
+  prerenderHtmlDocument(rootElement, appConfig, route.id)
     .then(html => { res.send(html) })
     .catch(err => { res.send(err) })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.2.0",
+  "version": "1.4.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.2.0",
-    "@ossy/design-system": "^1.2.0",
-    "@ossy/pages": "^1.2.0",
-    "@ossy/router": "^1.2.0",
-    "@ossy/router-react": "^1.2.0",
-    "@ossy/sdk": "^1.2.0",
-    "@ossy/sdk-react": "^1.2.0",
-    "@ossy/themes": "^1.2.0",
+    "@ossy/connected-components": "^1.4.0",
+    "@ossy/design-system": "^1.4.0",
+    "@ossy/pages": "^1.4.0",
+    "@ossy/router": "^1.4.0",
+    "@ossy/router-react": "^1.4.0",
+    "@ossy/sdk": "^1.4.0",
+    "@ossy/sdk-react": "^1.4.0",
+    "@ossy/themes": "^1.4.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": "81441ed4d81a8ca000dc8c4a5c4634e860bfb22b"
+  "gitHead": "69e80ed4e43a04263df106e0f504c6d2fb55e0fb"
 }