@ossy/app 1.1.0 → 1.3.0

package/cli/build.js

@@ -59,6 +59,8 @@ export const OSSY_GEN_TASKS_BASENAME = 'tasks.generated.js'
 export const OSSY_PAGES_SERVER_BUNDLE = 'pages.bundle.js'
 export const OSSY_API_SERVER_BUNDLE = 'api.bundle.js'
 export const OSSY_TASKS_SERVER_BUNDLE = 'tasks.bundle.js'
+export const OSSY_CONFIG_RUNTIME_BASENAME = 'config.runtime.js'
+export const OSSY_MIDDLEWARE_RUNTIME_BASENAME = 'middleware.runtime.js'
 
 /** Per-page client entries: `hydrate-<pageId>.jsx` under `.ossy/` */
 const HYDRATE_STUB_PREFIX = 'hydrate-'
@@ -221,20 +223,30 @@ export async function bundleOssyNodeEntry ({ inputPath, outputFile, nodeEnv }) {
 }
 
 /**
- * Copies framework runtime into `build/`: server, worker entry, middleware & config snapshots.
- * `build/server.js` imports `./middleware.js`, `./config.js`, `./.ossy/*.bundle.js` next to it.
+ * Re-exports the resolved config and middleware via `file:` URLs so `src/config.js` can keep
+ * relative imports (copying those files into `build/` would break them).
  */
-export function copyOssyAppRuntime ({
-  scriptDir,
-  buildPath,
-  middlewareSourcePath,
-  configSourcePath,
-}) {
+export function writeAppRuntimeShims ({ configSourcePath, middlewareSourcePath, ossyDir }) {
+  const cfgHref = url.pathToFileURL(path.resolve(configSourcePath)).href
+  const mwHref = url.pathToFileURL(path.resolve(middlewareSourcePath)).href
+  fs.writeFileSync(
+    path.join(ossyDir, OSSY_CONFIG_RUNTIME_BASENAME),
+    `// Generated by @ossy/app — do not edit\nexport { default } from '${cfgHref}'\n`
+  )
+  fs.writeFileSync(
+    path.join(ossyDir, OSSY_MIDDLEWARE_RUNTIME_BASENAME),
+    `// Generated by @ossy/app — do not edit\nexport { default } from '${mwHref}'\n`
+  )
+}
+
+/**
+ * Copies framework runtime into `build/`: server, worker entry, proxy.
+ * Config/middleware load via `./.ossy/config.runtime.js` and `middleware.runtime.js`.
+ */
+export function copyOssyAppRuntime ({ scriptDir, buildPath }) {
   for (const name of ['server.js', 'proxy-internal.js']) {
     fs.copyFileSync(path.join(scriptDir, name), path.join(buildPath, name))
   }
-  fs.copyFileSync(middlewareSourcePath, path.join(buildPath, 'middleware.js'))
-  fs.copyFileSync(configSourcePath, path.join(buildPath, 'config.js'))
   fs.copyFileSync(path.join(scriptDir, 'worker-entry.js'), path.join(buildPath, 'worker.js'))
   fs.copyFileSync(path.join(scriptDir, 'worker-runtime.js'), path.join(buildPath, 'worker-runtime.js'))
 }
@@ -403,10 +415,12 @@ export function generatePageHydrateModule ({ pageAbsPath, stubAbsPath, srcDir })
   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 './${OSSY_GEN_PAGES_BASENAME}'`,
     '',
     'function toPage(mod, derived) {',
     '  const meta = mod?.metadata || {}',
@@ -419,9 +433,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')
@@ -658,12 +680,12 @@ export const build = async (cliArgs) => {
       nodeEnv: 'production',
     })
 
-    copyOssyAppRuntime({
-      scriptDir,
-      buildPath,
-      middlewareSourcePath,
+    writeAppRuntimeShims({
       configSourcePath,
+      middlewareSourcePath,
+      ossyDir,
     })
+    copyOssyAppRuntime({ scriptDir, buildPath })
 
     const clientPlugins = createOssyClientRollupPlugins({
       nodeEnv: 'production',

package/cli/dev.js

@@ -11,6 +11,7 @@ import {
   resetOssyBuildDir,
   bundleOssyNodeEntry,
   copyOssyAppRuntime,
+  writeAppRuntimeShims,
   createOssyAppBundlePlugins,
   createOssyClientRollupPlugins,
   writePageHydrateStubs,
@@ -109,12 +110,12 @@ export const dev = async (cliArgs) => {
         outputFile: tasksBundlePath,
         nodeEnv: 'development',
       })
-      copyOssyAppRuntime({
-        scriptDir,
-        buildPath,
-        middlewareSourcePath,
+      writeAppRuntimeShims({
         configSourcePath,
+        middlewareSourcePath,
+        ossyDir,
       })
+      copyOssyAppRuntime({ scriptDir, buildPath })
     }
 
     await runNodeBundles()
@@ -233,12 +234,12 @@ export const dev = async (cliArgs) => {
         console.log(`[@ossy/app][dev] Built in ${event.duration}ms`)
       }
       if (event.code === 'END') {
-        copyOssyAppRuntime({
-          scriptDir,
-          buildPath,
-          middlewareSourcePath,
+        writeAppRuntimeShims({
           configSourcePath,
+          middlewareSourcePath,
+          ossyDir,
         })
+        copyOssyAppRuntime({ scriptDir, buildPath })
         scheduleRestart()
       }
     })

package/cli/server.js

@@ -1,17 +1,18 @@
 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'
 
 import pages from './.ossy/pages.bundle.js'
 import ApiRoutes from './.ossy/api.bundle.js'
-import Middleware from './middleware.js'
-import configModule from './config.js'
+import Middleware from './.ossy/middleware.runtime.js'
+import configModule from './.ossy/config.runtime.js'
 
 const buildTimeConfig = configModule?.default ?? configModule ?? {}
 
@@ -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.1.0",
+  "version": "1.3.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.1.0",
-    "@ossy/design-system": "^1.1.0",
-    "@ossy/pages": "^1.1.0",
-    "@ossy/router": "^1.1.0",
-    "@ossy/router-react": "^1.1.0",
-    "@ossy/sdk": "^1.1.0",
-    "@ossy/sdk-react": "^1.1.0",
-    "@ossy/themes": "^1.1.0",
+    "@ossy/connected-components": "^1.3.0",
+    "@ossy/design-system": "^1.3.0",
+    "@ossy/pages": "^1.3.0",
+    "@ossy/router": "^1.3.0",
+    "@ossy/router-react": "^1.3.0",
+    "@ossy/sdk": "^1.3.0",
+    "@ossy/sdk-react": "^1.3.0",
+    "@ossy/themes": "^1.3.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": "5977a77f97776131077a848081098ab6ec4cf837"
+  "gitHead": "15e5a4ab14895064b6281eec4daf1cea3340806e"
 }