@ossy/app 1.9.0 → 1.10.0

package/cli/build.js

@@ -11,7 +11,7 @@ import nodeExternals from 'rollup-plugin-node-externals'
 import copy from 'rollup-plugin-copy';
 import replace from '@rollup/plugin-replace';
 import arg from 'arg'
-import { writePrerenderedPages } from './prerender-pages.js'
+import prerenderReactTask from './prerender-react.task.js'
 
 export const PAGE_FILE_PATTERN = /\.page\.(jsx?|tsx?)$/
 export const API_FILE_PATTERN = /\.api\.(mjs|cjs|js)$/
@@ -24,7 +24,7 @@ export const OSSY_RESOURCE_TEMPLATES_OUT = '.ossy-system-templates.generated.js'
 /** Rollup output paths for JS served to the browser (see `entryFileNames` / `chunkFileNames`). */
 const BROWSER_STATIC_PREFIX = 'public/static/'
 
-function minifyBrowserStaticChunks () {
+export function minifyBrowserStaticChunks () {
   return {
     name: 'minify-browser-static-chunks',
     async renderChunk (code, chunk, outputOptions) {
@@ -677,38 +677,18 @@ export const build = async (cliArgs) => {
     })
     copyOssyAppRuntime({ scriptDir, buildPath })
 
-    const clientPlugins = createOssyClientRollupPlugins({
-      nodeEnv: 'production',
-      copyPublicFrom: publicDir,
-      buildPath,
-    })
-
     if (Object.keys(clientHydrateInput).length > 0) {
-      const clientBundle = await rollup({
-        input: clientHydrateInput,
-        plugins: clientPlugins,
-      })
-      await clientBundle.write({
-        dir: buildPath,
-        format: 'esm',
-        entryFileNames ({ name }) {
-          if (name.startsWith('hydrate__')) {
-            const pageId = name.slice('hydrate__'.length)
-            return `public/static/hydrate-${pageId}.js`
-          }
-          return 'public/static/[name].js'
-        },
-        chunkFileNames: 'public/static/[name]-[hash].js',
-        plugins: [minifyBrowserStaticChunks()],
-      })
-      await clientBundle.close()
-    }
-
-    if (pageFiles.length > 0) {
-      await writePrerenderedPages({
+      await prerenderReactTask.handler({
+        op: 'runProduction',
+        clientHydrateInput,
+        pageFilesLength: pageFiles.length,
+        copyPublicFrom: publicDir,
+        buildPath,
+        nodeEnv: 'production',
         pagesBundlePath,
         configSourcePath,
-        publicDir: path.join(buildPath, 'public'),
+        createClientRollupPlugins: createOssyClientRollupPlugins,
+        minifyBrowserStaticChunks,
       })
     }
 

package/cli/dev.js

@@ -28,7 +28,7 @@ import {
   resourceTemplatesDir,
   OSSY_RESOURCE_TEMPLATES_OUT,
 } from './build.js';
-import { writePrerenderedPages } from './prerender-pages.js'
+import prerenderReactTask from './prerender-react.task.js'
 import { watch } from 'rollup';
 import arg from 'arg'
 import { spawn } from 'node:child_process'
@@ -241,7 +241,8 @@ export const dev = async (cliArgs) => {
         copyOssyAppRuntime({ scriptDir, buildPath })
         if (pageFiles.length > 0) {
           try {
-            await writePrerenderedPages({
+            await prerenderReactTask.handler({
+              op: 'prerenderPagesParallel',
               pagesBundlePath,
               configSourcePath,
               publicDir: path.join(buildPath, 'public'),

package/cli/prerender-react.task.js

@@ -0,0 +1,270 @@
+import path from 'path'
+import url from 'url'
+import fs from 'fs'
+import { rollup } from 'rollup'
+import { BuildPage } from './render-page.task.js'
+
+/**
+ * Maps an app route path to the file path express.static will serve for that URL
+ * (`/` → `public/index.html`, `/a/b` → `public/a/b/index.html`).
+ */
+export function staticHtmlPathForRoute (routePath, publicDir) {
+  const p = typeof routePath === 'string' ? routePath : '/'
+  if (p === '/' || p === '') {
+    return path.join(publicDir, 'index.html')
+  }
+  const segments = p.replace(/^\//, '').split('/').filter(Boolean)
+  return path.join(publicDir, ...segments, 'index.html')
+}
+
+function pathIsPrerenderable (routePath) {
+  if (typeof routePath !== 'string') return false
+  if (!routePath.startsWith('/') || routePath.includes(':')) return false
+  return true
+}
+
+/** Mirrors server-era app shell config with static defaults (no cookies / session). */
+export function buildPrerenderAppConfig ({
+  buildTimeConfig,
+  pageList,
+  activeRouteId,
+  urlPath,
+}) {
+  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: urlPath,
+    theme: buildTimeConfig.theme || 'light',
+    isAuthenticated: false,
+    workspaceId: buildTimeConfig.workspaceId,
+    apiUrl: buildTimeConfig.apiUrl,
+    pages,
+    sidebarPrimaryCollapsed: false,
+  }
+}
+
+function copyPublicToBuild ({ copyPublicFrom, buildPath }) {
+  if (!copyPublicFrom || !fs.existsSync(copyPublicFrom)) return
+  const dest = path.join(buildPath, 'public')
+  fs.mkdirSync(dest, { recursive: true })
+  fs.cpSync(copyPublicFrom, dest, { recursive: true })
+}
+
+function countSettledFailures (results) {
+  return results.filter((r) => r.status === 'rejected').length
+}
+
+async function bundleOneHydratePage ({
+  entryName,
+  stubPath,
+  buildPath,
+  plugins,
+  minifyPlugin,
+}) {
+  const bundle = await rollup({
+    input: { [entryName]: stubPath },
+    plugins,
+  })
+  try {
+    await bundle.write({
+      dir: buildPath,
+      format: 'esm',
+      inlineDynamicImports: true,
+      entryFileNames (chunkInfo) {
+        const n = chunkInfo.name
+        if (n.startsWith('hydrate__')) {
+          const pageId = n.slice('hydrate__'.length)
+          return `public/static/hydrate-${pageId}.js`
+        }
+        return 'public/static/[name].js'
+      },
+      chunkFileNames: 'public/static/[name]-[hash].js',
+      plugins: minifyPlugin ? [minifyPlugin] : [],
+    })
+  } finally {
+    await bundle.close()
+  }
+}
+
+async function bundleHydratePagesParallel ({
+  clientHydrateInput,
+  buildPath,
+  copyPublicFrom,
+  nodeEnv,
+  buildPathForPlugins,
+  createClientRollupPlugins,
+  minifyBrowserStaticChunks,
+}) {
+  copyPublicToBuild({ copyPublicFrom, buildPath })
+  fs.mkdirSync(path.join(buildPath, 'public', 'static'), { recursive: true })
+
+  const entries = Object.entries(clientHydrateInput)
+
+  const results = await Promise.allSettled(
+    entries.map(([entryName, stubPath]) => {
+      const plugins = createClientRollupPlugins({
+        nodeEnv,
+        copyPublicFrom: undefined,
+        buildPath: buildPathForPlugins,
+      })
+      return bundleOneHydratePage({
+        entryName,
+        stubPath,
+        buildPath,
+        plugins,
+        minifyPlugin: minifyBrowserStaticChunks(),
+      })
+    })
+  )
+
+  const failures = countSettledFailures(results)
+  results.forEach((r, i) => {
+    if (r.status === 'rejected') {
+      const [entryName] = entries[i]
+      console.error(`[@ossy/app][client-bundle] ${entryName} failed:`, r.reason)
+    }
+  })
+
+  return { results, failures }
+}
+
+async function prerenderOnePage ({
+  route,
+  buildTimeConfig,
+  pageList,
+  publicDir,
+}) {
+  const appConfig = buildPrerenderAppConfig({
+    buildTimeConfig,
+    pageList,
+    activeRouteId: route.id,
+    urlPath: route.path,
+  })
+  const html = await BuildPage.handle({
+    route,
+    appConfig,
+    isDevReloadEnabled: false,
+  })
+  const outPath = staticHtmlPathForRoute(route.path, publicDir)
+  fs.mkdirSync(path.dirname(outPath), { recursive: true })
+  fs.writeFileSync(outPath, html, 'utf8')
+  console.log(
+    `[@ossy/app][prerender] ${route.path} → ${path.relative(process.cwd(), outPath)}`
+  )
+}
+
+async function prerenderPagesParallel ({
+  pagesBundlePath,
+  configSourcePath,
+  publicDir,
+}) {
+  const cfgHref = url.pathToFileURL(path.resolve(configSourcePath)).href
+  const pagesHref = url.pathToFileURL(path.resolve(pagesBundlePath)).href
+
+  const configModule = await import(cfgHref)
+  const pagesModule = await import(pagesHref)
+
+  const buildTimeConfig = configModule?.default ?? configModule ?? {}
+  const pageList = pagesModule?.default ?? []
+
+  const routesToRender = []
+  for (const route of pageList) {
+    if (!route?.element) continue
+    if (!pathIsPrerenderable(route.path)) {
+      console.warn(
+        `[@ossy/app][prerender] Skipping "${route.id}" (path not prerenderable: ${JSON.stringify(route.path)})`
+      )
+      continue
+    }
+    routesToRender.push(route)
+  }
+
+  const results = await Promise.allSettled(
+    routesToRender.map((route) =>
+      prerenderOnePage({
+        route,
+        buildTimeConfig,
+        pageList,
+        publicDir,
+      })
+    )
+  )
+  const failures = countSettledFailures(results)
+  results.forEach((r, i) => {
+    if (r.status === 'rejected') {
+      const route = routesToRender[i]
+      console.error(
+        `[@ossy/app][prerender] "${route?.id}" (${route?.path}) failed:`,
+        r.reason
+      )
+    }
+  })
+
+  return { results, failures }
+}
+
+async function runProduction ({
+  clientHydrateInput,
+  pageFilesLength,
+  copyPublicFrom,
+  buildPath,
+  nodeEnv,
+  pagesBundlePath,
+  configSourcePath,
+  createClientRollupPlugins,
+  minifyBrowserStaticChunks,
+}) {
+  if (pageFilesLength === 0 || Object.keys(clientHydrateInput).length === 0) {
+    return { bundleFailures: 0, prerenderFailures: 0 }
+  }
+
+  const { failures: bundleFailures } = await bundleHydratePagesParallel({
+    clientHydrateInput,
+    buildPath,
+    copyPublicFrom,
+    nodeEnv,
+    buildPathForPlugins: buildPath,
+    createClientRollupPlugins,
+    minifyBrowserStaticChunks,
+  })
+
+  const { failures: prerenderFailures } = await prerenderPagesParallel({
+    pagesBundlePath,
+    configSourcePath,
+    publicDir: path.join(buildPath, 'public'),
+  })
+
+  if (bundleFailures + prerenderFailures > 0) {
+    console.warn(
+      `[@ossy/app][build] Finished with ${bundleFailures} client bundle error(s) and ${prerenderFailures} prerender error(s)`
+    )
+  }
+
+  return { bundleFailures, prerenderFailures }
+}
+
+export default {
+  type: '@ossy/app/prerender-react',
+  /** `input.op`: `runProduction` | `prerenderPagesParallel` (see callers in `build.js` / `dev.js`). */
+  async handler (input) {
+    const op = input?.op
+    if (op === 'runProduction') {
+      return runProduction(input)
+    }
+    if (op === 'prerenderPagesParallel') {
+      return prerenderPagesParallel(input)
+    }
+    throw new Error(
+      `[@ossy/app][prerender-react] Unknown op: ${String(op)} (expected runProduction | prerenderPagesParallel)`
+    )
+  },
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.9.0",
+  "version": "1.10.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.9.0",
-    "@ossy/design-system": "^1.9.0",
-    "@ossy/pages": "^1.9.0",
-    "@ossy/router": "^1.9.0",
-    "@ossy/router-react": "^1.9.0",
-    "@ossy/sdk": "^1.9.0",
-    "@ossy/sdk-react": "^1.9.0",
-    "@ossy/themes": "^1.9.0",
+    "@ossy/connected-components": "^1.10.0",
+    "@ossy/design-system": "^1.10.0",
+    "@ossy/pages": "^1.10.0",
+    "@ossy/router": "^1.10.0",
+    "@ossy/router-react": "^1.10.0",
+    "@ossy/sdk": "^1.10.0",
+    "@ossy/sdk-react": "^1.10.0",
+    "@ossy/themes": "^1.10.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": "9be5f444e4cd530e29be0193fc0e7fd8da0bc995"
+  "gitHead": "bd9dfaf87661392562fbe2cdfd3ca6d645147f24"
 }

package/cli/prerender-pages.js

@@ -1,101 +0,0 @@
-import path from 'path'
-import url from 'url'
-import fs from 'fs'
-import { BuildPage } from './render-page.task.js'
-
-/**
- * Maps an app route path to the file path express.static will serve for that URL
- * (`/` → `public/index.html`, `/a/b` → `public/a/b/index.html`).
- */
-export function staticHtmlPathForRoute (routePath, publicDir) {
-  const p = typeof routePath === 'string' ? routePath : '/'
-  if (p === '/' || p === '') {
-    return path.join(publicDir, 'index.html')
-  }
-  const segments = p.replace(/^\//, '').split('/').filter(Boolean)
-  return path.join(publicDir, ...segments, 'index.html')
-}
-
-function pathIsPrerenderable (routePath) {
-  if (typeof routePath !== 'string') return false
-  if (!routePath.startsWith('/') || routePath.includes(':')) return false
-  return true
-}
-
-/** Mirrors server `resolveAppConfig` with static defaults (no cookies / session). */
-export function buildPrerenderAppConfig ({
-  buildTimeConfig,
-  pageList,
-  activeRouteId,
-  urlPath,
-}) {
-  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: urlPath,
-    theme: buildTimeConfig.theme || 'light',
-    isAuthenticated: false,
-    workspaceId: buildTimeConfig.workspaceId,
-    apiUrl: buildTimeConfig.apiUrl,
-    pages,
-    sidebarPrimaryCollapsed: false,
-  }
-}
-
-/**
- * After client bundles and `public/` exist, writes one HTML file per static page
- * so express.static can serve them without runtime React rendering.
- */
-export async function writePrerenderedPages ({
-  pagesBundlePath,
-  configSourcePath,
-  publicDir,
-}) {
-  const cfgHref = url.pathToFileURL(path.resolve(configSourcePath)).href
-  const pagesHref = url.pathToFileURL(path.resolve(pagesBundlePath)).href
-
-  const configModule = await import(cfgHref)
-  const pagesModule = await import(pagesHref)
-
-  const buildTimeConfig = configModule?.default ?? configModule ?? {}
-  const pageList = pagesModule?.default ?? []
-
-  for (const route of pageList) {
-    if (!route?.element) continue
-    if (!pathIsPrerenderable(route.path)) {
-      console.warn(
-        `[@ossy/app][prerender] Skipping "${route.id}" (path not prerenderable: ${JSON.stringify(route.path)})`
-      )
-      continue
-    }
-
-    const appConfig = buildPrerenderAppConfig({
-      buildTimeConfig,
-      pageList,
-      activeRouteId: route.id,
-      urlPath: route.path,
-    })
-
-    const html = await BuildPage.handle({
-      route,
-      appConfig,
-      isDevReloadEnabled: false,
-    })
-
-    const outPath = staticHtmlPathForRoute(route.path, publicDir)
-    fs.mkdirSync(path.dirname(outPath), { recursive: true })
-    fs.writeFileSync(outPath, html, 'utf8')
-    console.log(
-      `[@ossy/app][prerender] ${route.path} → ${path.relative(process.cwd(), outPath)}`
-    )
-  }
-}