@ossy/app 1.11.6 → 1.11.7

package/README.md

@@ -21,9 +21,9 @@ export const metadata = { path: { en: '/about', sv: '/om' } }
 export default () => <h1>About</h1>
 ```
 
-During `dev` / `build`, the tooling writes **JSON manifests** under **`build/.ossy/`**: **`pages.generated.json`** (after compile: route ids, paths, `sourceFile`, merged `metadata`, and **`module`** — a `page-modules/<id>.mjs` path used for lazy `import()` in the browser and on SSR), **`pages.bundle.json`** (compiled module index), plus the same pattern for API and tasks. Small **`*.runtime.mjs`** loaders (copied from `@ossy/app`) load the app shell; **`pages.runtime.mjs`** exports the route table from **`pages.generated.json`** only. The server exposes compiled page modules at **`/__ossy/page-modules/`** for same-origin dynamic imports.
+During `dev` / `build`, the tooling writes **JSON manifests** under **`build/.ossy/`**: **`pages.generated.json`** (after compile: route ids, paths, `sourceFile`, merged `metadata`, and **`module`** — a `page-modules/<id>.mjs` path the **Node** server `import()`s per request for SSR), **`pages.bundle.json`** (compiled module index), plus the same pattern for API and tasks. **`pages.runtime.mjs`** exports the route table from **`pages.generated.json`** only.
 
-**Client JS (per-page):** For each `*.page.jsx`, the build emits **`build/.ossy/hydrate-<pageId>.jsx`** → **`public/static/<pageId>.js`**. The HTML for a request only loads the hydrate script for the **current** route (full document navigation), so other pages’ components are not part of that entry. React and shared dependencies still go into hashed shared chunks. The inline config (`window.__INITIAL_APP_CONFIG__`) no longer includes the full `pages` list—only request-time fields (theme, `apiUrl`, etc.).
+**Client JS (per-page):** For each `*.page.jsx`, the build emits **`build/.ossy/hydrate-<pageId>.jsx`** → **`public/static/<pageId>.js`**. Rollup bundles that entry with the page source so **`react` resolves in the browser** (unlike the Node `page-modules/*.mjs` chunks, which keep `react` external). The HTML only loads the hydrate script for the **current** route. The inline config (`window.__INITIAL_APP_CONFIG__`) keeps request-time fields (theme, `apiUrl`, etc.); `pages` in config include `id`, `path`, and `module` for consistency with the manifest.
 
 Add `src/config.js` for workspace and theme:
 

package/cli/build.js

@@ -69,8 +69,6 @@ export const OSSY_TASKS_RUNTIME_BASENAME = 'tasks.runtime.mjs'
 
 export const OSSY_PAGE_MODULES_DIRNAME = 'page-modules'
 
-/** Express serves compiled page modules here for browser `import()`. Must match `server.js`. */
-export const OSSY_PAGE_MODULE_WEB_PREFIX = '/__ossy/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'
@@ -455,7 +453,7 @@ export async function compileTaskServerModules ({ taskFiles, ossyDir, nodeEnv, o
 
 /**
  * Merges compiled `metadata` + `module` into `pages.generated.json` (same order as `pageBundleList`).
- * Enables lazy `import()` in the browser and Node without putting `Component` on the route object.
+ * Writes `module` on each route for Node SSR (`import()` of `page-modules/*.mjs`); hydrate uses a separate Rollup client entry.
  */
 export async function enrichPagesGeneratedManifest ({
   ossyDir,
@@ -561,7 +559,7 @@ export function clientHydrateIdForPage (pageAbsPath, srcDir) {
   return idMatch ? idMatch[1] : derived.id
 }
 
-/** Posix path relative to `build/.ossy/` for the compiled server/browser page module. */
+/** Posix path relative to `build/.ossy/` for the compiled **Node** page module (SSR). */
 export function pageServerModuleRelPath (pageAbsPath, srcDir) {
   const pageId = clientHydrateIdForPage(pageAbsPath, srcDir)
   const safeId = String(pageId).replace(/[^a-zA-Z0-9_-]+/g, '-') || 'page'
@@ -600,35 +598,26 @@ export function writePageServerRollupEntry ({ pageAbsPath, stubPath }) {
 }
 
 /**
- * One client entry per page: `import()` the compiled page module URL, then hydrates the document.
+ * One client entry per page: Rollup bundles this stub with the page source so `react` resolves in the browser.
+ * (Do not `import()` the Node `page-modules/*.mjs` build from the client — those files use bare `react` specifiers.)
  */
 export function generatePageHydrateModule ({ pageAbsPath, stubAbsPath, srcDir }) {
-  void stubAbsPath
-  const outName = path.posix.basename(pageServerModuleRelPath(pageAbsPath, srcDir))
-  const pageImportUrl = `${OSSY_PAGE_MODULE_WEB_PREFIX}/${outName}`
-  const pageImportLiteral = JSON.stringify(pageImportUrl)
+  const rel = relToGeneratedImport(stubAbsPath, pageAbsPath)
   return [
     '// Generated by @ossy/app — do not edit',
     '',
     "import React, { createElement } from 'react'",
     "import 'react-dom'",
     "import { hydrateRoot } from 'react-dom/client'",
+    `import * as _page from './${rel}'`,
     '',
-    'async function main () {',
-    '  const initialConfig = window.__INITIAL_APP_CONFIG__ || {}',
-    `  const _page = await import(${pageImportLiteral})`,
-    '  const Page = _page?.default',
-    '  if (typeof Page !== \'function\') {',
-    '    throw new Error(`[@ossy/app] Page must export default as a function component`)',
-    '  }',
-    '  const rootTree = createElement(Page, initialConfig)',
-    '  hydrateRoot(document, rootTree)',
+    'const initialConfig = window.__INITIAL_APP_CONFIG__ || {}',
+    'const Page = _page?.default',
+    'if (typeof Page !== \'function\') {',
+    '  throw new Error(`[@ossy/app] Page must export default as a function component`)',
     '}',
-    '',
-    'main().catch((err) => {',
-    '  console.error(err)',
-    "  document.body.innerHTML = '<p style=\\'font-family:sans-serif;padding:1rem\\'>Hydration failed.</p>'",
-    '})',
+    'const rootTree = createElement(Page, initialConfig)',
+    'hydrateRoot(document, rootTree)',
     '',
   ].join('\n')
 }

package/cli/render-page.task.js

@@ -32,7 +32,7 @@ export function buildPrerenderAppConfig ({
   urlPath,
   isAuthenticated = false,
 }) {
-  /** `module` is the lazy import path segment (see `OSSY_PAGE_MODULE_WEB_PREFIX` in the server). */
+  /** `module` is the compiled page path under `.ossy/` (Node `import()` only; not loaded as raw ESM in the browser). */
   const pages = pageList.map((page) => ({
     id: page?.id,
     path: page?.path,

package/cli/server.js

@@ -38,7 +38,6 @@ const app = express();
 
 const currentDir = path.dirname(url.fileURLToPath(import.meta.url))
 const ROOT_PATH = path.resolve(currentDir, 'public')
-const OSSY_PAGE_MODULES_STATIC = path.resolve(currentDir, '.ossy', 'page-modules')
 
 const isDevReloadEnabled = process.env.OSSY_DEV_RELOAD === '1'
 const reloadClients = new Set()
@@ -122,10 +121,6 @@ const middleware = [
   ProxyInternal(),
 ]
 
-const pageModuleRouter = express.Router()
-pageModuleRouter.use(express.static(OSSY_PAGE_MODULES_STATIC))
-app.use('/__ossy/page-modules', pageModuleRouter)
-
 app.use(middleware)
 
 const apiRouter = OssyRouter.of({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.11.6",
+  "version": "1.11.7",
   "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.6",
-    "@ossy/design-system": "^1.11.6",
-    "@ossy/pages": "^1.11.6",
-    "@ossy/router": "^1.11.6",
-    "@ossy/router-react": "^1.11.6",
-    "@ossy/sdk": "^1.11.6",
-    "@ossy/sdk-react": "^1.11.6",
-    "@ossy/themes": "^1.11.6",
+    "@ossy/connected-components": "^1.11.7",
+    "@ossy/design-system": "^1.11.7",
+    "@ossy/pages": "^1.11.7",
+    "@ossy/router": "^1.11.7",
+    "@ossy/router-react": "^1.11.7",
+    "@ossy/sdk": "^1.11.7",
+    "@ossy/sdk-react": "^1.11.7",
+    "@ossy/themes": "^1.11.7",
     "@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": "f9bbe1dbd426b6ee5d07021428b900c570952ea4"
+  "gitHead": "43d1eca8557efc9586398a893ce9832b2ebf0444"
 }