@ossy/app 1.0.9 → 1.2.0

package/cli/build.js

@@ -11,7 +11,6 @@ import nodeExternals from 'rollup-plugin-node-externals'
 import copy from 'rollup-plugin-copy';
 import replace from '@rollup/plugin-replace';
 import arg from 'arg'
-import { ensureBuildStubs } from '../scripts/ensure-build-stubs.mjs'
 
 export const PAGE_FILE_PATTERN = /\.page\.(jsx?|tsx?)$/
 export const API_FILE_PATTERN = /\.api\.(mjs|cjs|js)$/
@@ -56,6 +55,13 @@ export const OSSY_GEN_PAGES_BASENAME = 'pages.generated.jsx'
 export const OSSY_GEN_API_BASENAME = 'api.generated.js'
 export const OSSY_GEN_TASKS_BASENAME = 'tasks.generated.js'
 
+/** Bundled Node entries consumed by copied `build/server.js` / `build/worker.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-'
 const HYDRATE_STUB_SUFFIX = '.jsx'
@@ -143,65 +149,55 @@ export function writeResourceTemplatesBarrelIfPresent ({ cwd = process.cwd(), lo
 }
 
 /**
- * Shared Rollup plugins (virtual path replaces, resolve, JSX).
- * Server builds pass `nodeExternals: true` so `dependencies` stay importable from Node at runtime.
+ * Rollup plugins for Node-side bundles (pages / API / tasks): externals + Babel JSX.
  */
-export function createOssyRollupPlugins ({
-  pagesGeneratedPath,
-  apiSourcePath,
-  middlewareSourcePath,
-  configSourcePath,
-  nodeEnv,
-  preferBuiltins = true,
-  copyPublicFrom,
-  buildPath,
-}) {
-  const plugins = [
-    replace({
-      preventAssignment: true,
-      delimiters: ['%%', '%%'],
-      '@ossy/pages/source-file': pagesGeneratedPath,
-    }),
+export function createOssyAppBundlePlugins ({ nodeEnv }) {
+  return [
     replace({
       preventAssignment: true,
-      delimiters: ['%%', '%%'],
-      '@ossy/api/source-file': apiSourcePath,
+      'process.env.NODE_ENV': JSON.stringify(nodeEnv),
     }),
-    replace({
-      preventAssignment: true,
-      delimiters: ['%%', '%%'],
-      '@ossy/middleware/source-file': middlewareSourcePath,
+    json(),
+    nodeExternals({
+      deps: true,
+      devDeps: false,
+      peerDeps: true,
+      packagePath: path.join(process.cwd(), 'package.json'),
     }),
-    replace({
-      preventAssignment: true,
-      delimiters: ['%%', '%%'],
-      '@ossy/config/source-file': configSourcePath,
+    resolveCommonJsDependencies(),
+    resolveDependencies({ preferBuiltins: true }),
+    babel({
+      babelHelpers: 'bundled',
+      extensions: ['.jsx', '.tsx'],
+      presets: ['@babel/preset-react'],
     }),
+  ]
+}
+
+/**
+ * Rollup plugins for browser hydrate bundles.
+ */
+export function createOssyClientRollupPlugins ({ nodeEnv, copyPublicFrom, buildPath }) {
+  const plugins = [
     replace({
       preventAssignment: true,
       'process.env.NODE_ENV': JSON.stringify(nodeEnv),
     }),
     json(),
-  ]
-
-  plugins.push(
     nodeExternals({
       deps: true,
       devDeps: false,
       peerDeps: true,
       packagePath: path.join(process.cwd(), 'package.json'),
-    })
-  )
-
-  plugins.push(
+    }),
     resolveCommonJsDependencies(),
-    resolveDependencies({ preferBuiltins }),
+    resolveDependencies({ preferBuiltins: false }),
     babel({
       babelHelpers: 'bundled',
       extensions: ['.jsx', '.tsx'],
       presets: ['@babel/preset-react'],
-    })
-  )
+    }),
+  ]
   if (copyPublicFrom && fs.existsSync(copyPublicFrom)) {
     plugins.push(
       copy({
@@ -212,6 +208,49 @@ export function createOssyRollupPlugins ({
   return plugins
 }
 
+/** Bundles a single Node ESM file (inline dynamic imports) for SSR / API / tasks. */
+export async function bundleOssyNodeEntry ({ inputPath, outputFile, nodeEnv }) {
+  const bundle = await rollup({
+    input: inputPath,
+    plugins: createOssyAppBundlePlugins({ nodeEnv }),
+  })
+  await bundle.write({
+    file: outputFile,
+    format: 'esm',
+    inlineDynamicImports: true,
+  })
+  await bundle.close()
+}
+
+/**
+ * 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 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(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'))
+}
+
 /**
  * Recursively lists files under `srcDir` whose basename matches `filePattern` (e.g. `/\.api\.js$/`).
  */
@@ -320,26 +359,20 @@ export function generateTaskModule ({ generatedPath, taskFiles }) {
 }
 
 /**
- * Resolves the Rollup entry for @ossy/tasks/source-file and which files to list in the worker build overview.
+ * Writes `build/.ossy/tasks.generated.js` and returns its path (stable Rollup input; empty when no task files).
  */
-export function resolveTaskSource ({ srcDir, scriptDir, buildPath }) {
-  const defaultStub = path.resolve(scriptDir, 'tasks.js')
+export function resolveTaskSource ({ srcDir, buildPath }) {
   ensureOssyGeneratedDir(buildPath)
   const generatedPath = path.join(ossyGeneratedDir(buildPath), OSSY_GEN_TASKS_BASENAME)
-
   const taskFiles = discoverFilesByPattern(srcDir, TASK_FILE_PATTERN)
-  if (taskFiles.length > 0) {
-    fs.writeFileSync(
+  fs.writeFileSync(
+    generatedPath,
+    generateTaskModule({
       generatedPath,
-      generateTaskModule({
-        generatedPath,
-        taskFiles,
-      })
-    )
-    return { taskSourcePath: generatedPath, taskOverviewFiles: taskFiles, usedGenerated: true }
-  }
-
-  return { taskSourcePath: defaultStub, taskOverviewFiles: [], usedGenerated: false }
+      taskFiles,
+    })
+  )
+  return { taskSourcePath: generatedPath, taskOverviewFiles: taskFiles }
 }
 
 export function filePathToRoute(filePath, srcDir) {
@@ -600,8 +633,6 @@ export const build = async (cliArgs) => {
     let middlewareSourcePath = path.resolve('src/middleware.js');
     const publicDir = path.resolve('public')
 
-    const inputServer = path.resolve(scriptDir, 'server.js')
-
     printBuildOverview({
       pagesSourcePath: pagesGeneratedPath,
       apiSourcePath,
@@ -618,40 +649,38 @@ export const build = async (cliArgs) => {
       ? configPath
       : path.resolve(scriptDir, 'default-config.js')
 
-    const sharedPluginOpts = {
-      pagesGeneratedPath,
-      apiSourcePath,
-      middlewareSourcePath,
-      configSourcePath,
-      nodeEnv: 'production',
-      buildPath,
-    }
+    const pagesBundlePath = path.join(ossyDir, OSSY_PAGES_SERVER_BUNDLE)
+    const apiBundlePath = path.join(ossyDir, OSSY_API_SERVER_BUNDLE)
+    const tasksBundlePath = path.join(ossyDir, OSSY_TASKS_SERVER_BUNDLE)
 
-    const serverPlugins = createOssyRollupPlugins({
-      ...sharedPluginOpts,
-      preferBuiltins: true,
-      copyPublicFrom: publicDir,
+    await bundleOssyNodeEntry({
+      inputPath: pagesGeneratedPath,
+      outputFile: pagesBundlePath,
+      nodeEnv: 'production',
     })
-
-    const serverBundle = await rollup({
-      input: { server: inputServer },
-      plugins: serverPlugins,
+    await bundleOssyNodeEntry({
+      inputPath: apiSourcePath,
+      outputFile: apiBundlePath,
+      nodeEnv: 'production',
     })
-    await serverBundle.write({
-      dir: buildPath,
-      format: 'esm',
-      preserveModules: true,
-      preserveModulesRoot: path.dirname(inputServer),
-      entryFileNames ({ name }) {
-        return name === 'server' ? 'server.js' : '[name].js'
-      },
-      assetFileNames: '[name][extname]',
+    const { taskSourcePath } = resolveTaskSource({ srcDir, buildPath })
+    await bundleOssyNodeEntry({
+      inputPath: taskSourcePath,
+      outputFile: tasksBundlePath,
+      nodeEnv: 'production',
     })
-    await serverBundle.close()
 
-    const clientPlugins = createOssyRollupPlugins({
-      ...sharedPluginOpts,
-      preferBuiltins: false,
+    writeAppRuntimeShims({
+      configSourcePath,
+      middlewareSourcePath,
+      ossyDir,
+    })
+    copyOssyAppRuntime({ scriptDir, buildPath })
+
+    const clientPlugins = createOssyClientRollupPlugins({
+      nodeEnv: 'production',
+      copyPublicFrom: publicDir,
+      buildPath,
     })
 
     if (Object.keys(clientHydrateInput).length > 0) {
@@ -675,7 +704,5 @@ export const build = async (cliArgs) => {
       await clientBundle.close()
     }
 
-    ensureBuildStubs(buildPath)
-
     console.log('[@ossy/app][build] Finished');
 };

package/cli/dev.js

@@ -7,14 +7,23 @@ import {
   PAGE_FILE_PATTERN,
   generatePagesModule,
   resolveApiSource,
+  resolveTaskSource,
   resetOssyBuildDir,
-  createOssyRollupPlugins,
+  bundleOssyNodeEntry,
+  copyOssyAppRuntime,
+  writeAppRuntimeShims,
+  createOssyAppBundlePlugins,
+  createOssyClientRollupPlugins,
   writePageHydrateStubs,
   buildClientHydrateInput,
   clientHydrateIdForPage,
   ossyGeneratedDir,
   OSSY_GEN_PAGES_BASENAME,
   OSSY_GEN_API_BASENAME,
+  OSSY_GEN_TASKS_BASENAME,
+  OSSY_PAGES_SERVER_BUNDLE,
+  OSSY_API_SERVER_BUNDLE,
+  OSSY_TASKS_SERVER_BUNDLE,
   writeResourceTemplatesBarrelIfPresent,
   resourceTemplatesDir,
   OSSY_RESOURCE_TEMPLATES_OUT,
@@ -48,7 +57,6 @@ export const dev = async (cliArgs) => {
       pagesGeneratedPath,
       generatePagesModule(pageFiles, srcDir, pagesGeneratedPath)
     )
-    const effectivePagesSource = pagesGeneratedPath
     const ossyDir = ossyGeneratedDir(buildPath)
     writePageHydrateStubs(pageFiles, srcDir, ossyDir)
     const clientHydrateInput = buildClientHydrateInput(pageFiles, srcDir, ossyDir)
@@ -61,13 +69,12 @@ export const dev = async (cliArgs) => {
       buildPath,
     })
     let apiSourcePath = resolvedApi
+    resolveTaskSource({ srcDir, buildPath })
     let middlewareSourcePath = path.resolve(options['--middleware-source'] || 'src/middleware.js');
     const publicDir = path.resolve('public')
 
-    const inputServer = path.resolve(scriptDir, 'server.js')
-
     printBuildOverview({
-      pagesSourcePath: effectivePagesSource,
+      pagesSourcePath: pagesGeneratedPath,
       apiSourcePath,
       apiOverviewFiles,
       configPath,
@@ -82,37 +89,43 @@ export const dev = async (cliArgs) => {
       ? configPath
       : path.resolve(scriptDir, 'default-config.js')
 
-    const sharedPluginOpts = {
-      pagesGeneratedPath: effectivePagesSource,
-      apiSourcePath,
-      middlewareSourcePath,
-      configSourcePath,
-      nodeEnv: 'development',
-      buildPath,
+    const pagesBundlePath = path.join(ossyDir, OSSY_PAGES_SERVER_BUNDLE)
+    const apiBundlePath = path.join(ossyDir, OSSY_API_SERVER_BUNDLE)
+    const tasksBundlePath = path.join(ossyDir, OSSY_TASKS_SERVER_BUNDLE)
+    const tasksGeneratedPath = path.join(ossyDir, OSSY_GEN_TASKS_BASENAME)
+
+    const runNodeBundles = async () => {
+      await bundleOssyNodeEntry({
+        inputPath: pagesGeneratedPath,
+        outputFile: pagesBundlePath,
+        nodeEnv: 'development',
+      })
+      await bundleOssyNodeEntry({
+        inputPath: apiSourcePath,
+        outputFile: apiBundlePath,
+        nodeEnv: 'development',
+      })
+      await bundleOssyNodeEntry({
+        inputPath: tasksGeneratedPath,
+        outputFile: tasksBundlePath,
+        nodeEnv: 'development',
+      })
+      writeAppRuntimeShims({
+        configSourcePath,
+        middlewareSourcePath,
+        ossyDir,
+      })
+      copyOssyAppRuntime({ scriptDir, buildPath })
     }
 
-    const serverPlugins = createOssyRollupPlugins({
-      ...sharedPluginOpts,
-      preferBuiltins: true,
-      copyPublicFrom: publicDir,
-    })
+    await runNodeBundles()
 
-    const clientPlugins = createOssyRollupPlugins({
-      ...sharedPluginOpts,
-      preferBuiltins: false,
+    const clientPlugins = createOssyClientRollupPlugins({
+      nodeEnv: 'development',
+      copyPublicFrom: publicDir,
+      buildPath,
     })
 
-    const serverOutput = {
-      dir: buildPath,
-      format: 'esm',
-      preserveModules: true,
-      preserveModulesRoot: path.dirname(inputServer),
-      entryFileNames ({ name }) {
-        return name === 'server' ? 'server.js' : '[name].js'
-      },
-      assetFileNames: '[name][extname]',
-    }
-
     const clientOutput = {
       dir: buildPath,
       format: 'esm',
@@ -167,12 +180,37 @@ export const dev = async (cliArgs) => {
       }
     }
 
+    const nodeWatchOpts = { watch: { clearScreen: false } }
     const watchConfigs = [
       {
-        input: { server: inputServer },
-        output: serverOutput,
-        plugins: serverPlugins,
-        watch: { clearScreen: false },
+        input: pagesGeneratedPath,
+        output: {
+          file: pagesBundlePath,
+          format: 'esm',
+          inlineDynamicImports: true,
+        },
+        plugins: createOssyAppBundlePlugins({ nodeEnv: 'development' }),
+        ...nodeWatchOpts,
+      },
+      {
+        input: apiSourcePath,
+        output: {
+          file: apiBundlePath,
+          format: 'esm',
+          inlineDynamicImports: true,
+        },
+        plugins: createOssyAppBundlePlugins({ nodeEnv: 'development' }),
+        ...nodeWatchOpts,
+      },
+      {
+        input: tasksGeneratedPath,
+        output: {
+          file: tasksBundlePath,
+          format: 'esm',
+          inlineDynamicImports: true,
+        },
+        plugins: createOssyAppBundlePlugins({ nodeEnv: 'development' }),
+        ...nodeWatchOpts,
       },
     ]
     if (Object.keys(clientHydrateInput).length > 0) {
@@ -196,11 +234,17 @@ export const dev = async (cliArgs) => {
         console.log(`[@ossy/app][dev] Built in ${event.duration}ms`)
       }
       if (event.code === 'END') {
+        writeAppRuntimeShims({
+          configSourcePath,
+          middlewareSourcePath,
+          ossyDir,
+        })
+        copyOssyAppRuntime({ scriptDir, buildPath })
         scheduleRestart()
       }
     })
 
-    const regenApiBundle = () => {
+    const regenApiGenerated = () => {
       if (options['--api-source']) return
       resolveApiSource({
         srcDir,
@@ -212,6 +256,13 @@ export const dev = async (cliArgs) => {
       }
     }
 
+    const regenTasksGenerated = () => {
+      resolveTaskSource({ srcDir, buildPath })
+      if (fs.existsSync(tasksGeneratedPath) && typeof watcher?.invalidate === 'function') {
+        watcher.invalidate(tasksGeneratedPath)
+      }
+    }
+
     fs.watch(srcDir, { recursive: true }, (eventType, filename) => {
       if (!filename) return
       if (/\.page\.(jsx?|tsx?)$/.test(filename)) {
@@ -228,7 +279,10 @@ export const dev = async (cliArgs) => {
         }
       }
       if (/\.api\.(mjs|cjs|js)$/.test(filename)) {
-        regenApiBundle()
+        regenApiGenerated()
+      }
+      if (/\.task\.(mjs|cjs|js)$/.test(filename)) {
+        regenTasksGenerated()
       }
       const norm = filename.replace(/\\/g, '/')
       if (/\.resource\.js$/.test(norm) && norm.includes('resource-templates/')) {

package/cli/server.js

@@ -8,14 +8,14 @@ import { prerenderToNodeStream } from 'react-dom/static'
 import { ProxyInternal } from './proxy-internal.js'
 import cookieParser from 'cookie-parser'
 
-import pages from '%%@ossy/pages/source-file%%'
-import ApiRoutes from '%%@ossy/api/source-file%%'
-import Middleware from '%%@ossy/middleware/source-file%%'
-import configModule from '%%@ossy/config/source-file%%'
+import pages from './.ossy/pages.bundle.js'
+import ApiRoutes from './.ossy/api.bundle.js'
+import Middleware from './.ossy/middleware.runtime.js'
+import configModule from './.ossy/config.runtime.js'
 
 const buildTimeConfig = configModule?.default ?? configModule ?? {}
 
-/** `api.generated.js` is always present; default may still be empty. */
+/** API bundle default may be an empty array. */
 const apiRouteList = ApiRoutes ?? []
 const pageList = pages ?? []
 

package/cli/worker-entry.js

@@ -1,5 +1,5 @@
 import 'dotenv/config'
-import taskHandlers from '%%@ossy/tasks/source-file%%'
+import taskHandlers from './.ossy/tasks.bundle.js'
 import { runWorkerScheduler } from './worker-runtime.js'
 
 runWorkerScheduler(taskHandlers)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "1.0.9",
+  "version": "1.2.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.0.9",
-    "@ossy/design-system": "^1.0.9",
-    "@ossy/pages": "^1.0.9",
-    "@ossy/router": "^1.0.9",
-    "@ossy/router-react": "^1.0.9",
-    "@ossy/sdk": "^1.0.9",
-    "@ossy/sdk-react": "^1.0.9",
-    "@ossy/themes": "^1.0.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",
     "@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": "c9da4864730c693fe18339f0920a0802ce9c8ebf"
+  "gitHead": "81441ed4d81a8ca000dc8c4a5c4634e860bfb22b"
 }