@ossy/app 0.15.5 → 0.15.7

package/README.md

@@ -23,6 +23,8 @@ export default () => <h1>About</h1>
 
 For a single-file setup, use `src/pages.jsx` (legacy).
 
+Split pages are merged into **`build/.ossy/pages.generated.jsx`** (next to other build output) during `dev` / `build`.
+
 Add `src/config.js` for workspace and theme:
 
 ```js
@@ -47,7 +49,7 @@ Define HTTP handlers as an array of `{ id, path, handle(req, res) }` objects (sa
 
 **Legacy single file:** `src/api.js` default export is still supported. If it exists, its routes are merged **first**, then every `*.api.js`.
 
-At build/dev time this becomes `.ossy-api.generated.js` (gitignored) whenever you have `src/api.js` and/or any `*.api.js`, so the Rollup entry stays stable when you add or remove split files.
+At build/dev time this becomes **`build/.ossy/api.generated.js`** (under your `--destination` / `build` output, typically gitignored with the rest of `build/`) whenever you have `src/api.js` and/or any `*.api.js`, so the Rollup entry stays stable when you add or remove split files.
 
 **Override:** pass `--api-source ./path/to/file.js` to use a single file and skip discovery.
 
@@ -81,7 +83,7 @@ API routes are matched before the app is rendered. The router supports dynamic s
 
 ## Background worker tasks (`*.task.js`)
 
-For long-running job processors (separate from the SSR server), use **`npx @ossy/cli build --worker`** in a package that only needs the worker. It uses the same Rollup + Babel pipeline as `ossy build`, discovers **`*.task.js`** (and `.task.mjs` / `.task.cjs`) under `src/` (or `--pages <dir>`), and writes **`.ossy-tasks.generated.js`** (gitignored) when needed—same idea as `*.api.js` + `.ossy-api.generated.js`.
+For long-running job processors (separate from the SSR server), use **`npx @ossy/cli build --worker`** in a package that only needs the worker. It uses the same Rollup + Babel pipeline as `ossy build`, discovers **`*.task.js`** (and `.task.mjs` / `.task.cjs`) under `src/` (or `--pages <dir>`), and writes **`build/.ossy/tasks.generated.js`** when needed—same idea as `*.api.js` and the generated API bundle.
 
 Optional legacy aggregate: **`src/tasks.js`** default export is merged **first**, then each `*.task.js` in path order.
 

package/cli/build.js

@@ -12,7 +12,6 @@ import preserveDirectives from "rollup-plugin-preserve-directives"
 import json from "@rollup/plugin-json"
 import copy from 'rollup-plugin-copy';
 import replace from '@rollup/plugin-replace';
-import remove from 'rollup-plugin-delete';
 import arg from 'arg'
 import { ensureBuildStubs } from '../scripts/ensure-build-stubs.mjs'
 import { builtinModules, createRequire } from 'node:module'
@@ -22,6 +21,40 @@ const PAGE_FILE_PATTERN = /\.page\.(jsx?|tsx?)$/
 const API_FILE_PATTERN = /\.api\.(mjs|cjs|js)$/
 const TASK_FILE_PATTERN = /\.task\.(mjs|cjs|js)$/
 
+/** Subfolder under `--destination` / `build` for generated pages/api/task entry stubs. */
+export const OSSY_GEN_DIRNAME = '.ossy'
+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'
+
+export function ossyGeneratedDir (buildPath) {
+  return path.join(buildPath, OSSY_GEN_DIRNAME)
+}
+
+export function ensureOssyGeneratedDir (buildPath) {
+  const dir = ossyGeneratedDir(buildPath)
+  fs.mkdirSync(dir, { recursive: true })
+  return dir
+}
+
+function relToGeneratedImport (generatedAbs, targetAbs) {
+  return path.relative(path.dirname(generatedAbs), targetAbs).replace(/\\/g, '/')
+}
+
+/** Clears Rollup output dir but keeps `build/.ossy` (generated sources live there). */
+export function ossyCleanBuildDirPlugin (buildPath) {
+  return {
+    name: 'ossy-clean-build-dir',
+    buildStart () {
+      if (!fs.existsSync(buildPath)) return
+      for (const name of fs.readdirSync(buildPath)) {
+        if (name === OSSY_GEN_DIRNAME) continue
+        fs.rmSync(path.join(buildPath, name), { recursive: true, force: true })
+      }
+    },
+  }
+}
+
 export function discoverApiFiles(srcDir) {
   const dir = path.resolve(srcDir)
   if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
@@ -62,18 +95,18 @@ export function discoverTaskFiles(srcDir) {
  * Merges `src/api.js` (optional) and every `*.api.js` under the pages tree into one default export array
  * for the Ossy API router ({ id, path, handle }).
  */
-export function generateApiModule({ cwd, apiFiles, legacyPath }) {
+export function generateApiModule ({ generatedPath, apiFiles, legacyPath }) {
   const lines = [
     '// Generated by @ossy/app — do not edit',
     '',
   ]
   const hasLegacy = legacyPath && fs.existsSync(legacyPath)
   if (hasLegacy) {
-    const rel = path.relative(cwd, legacyPath).replace(/\\/g, '/')
+    const rel = relToGeneratedImport(generatedPath, legacyPath)
     lines.push(`import _legacyApi from './${rel}'`)
   }
   apiFiles.forEach((f, i) => {
-    const rel = path.relative(cwd, f).replace(/\\/g, '/')
+    const rel = relToGeneratedImport(generatedPath, f)
     lines.push(`import * as _api${i} from './${rel}'`)
   })
   lines.push(
@@ -102,11 +135,13 @@ export function generateApiModule({ cwd, apiFiles, legacyPath }) {
 /**
  * Resolves the Rollup entry for @ossy/api/source-file and which files to scan for the build overview.
  */
-export function resolveApiSource({ cwd, pagesOpt, scriptDir, explicitApiSource }) {
+export function resolveApiSource ({ cwd, pagesOpt, scriptDir, explicitApiSource, buildPath }) {
   const srcDir = path.resolve(cwd, pagesOpt)
   const legacyPath = path.resolve(cwd, 'src/api.js')
   const defaultStub = path.resolve(scriptDir, 'api.js')
-  const generatedPath = path.join(cwd, '.ossy-api.generated.js')
+  const bp = path.resolve(buildPath ?? path.join(cwd, 'build'))
+  ensureOssyGeneratedDir(bp)
+  const generatedPath = path.join(ossyGeneratedDir(bp), OSSY_GEN_API_BASENAME)
 
   if (explicitApiSource) {
     const p = path.isAbsolute(explicitApiSource)
@@ -120,13 +155,13 @@ export function resolveApiSource({ cwd, pagesOpt, scriptDir, explicitApiSource }
 
   const apiFiles = discoverApiFiles(srcDir)
   const hasLegacy = fs.existsSync(legacyPath)
-  // Always feed Rollup the same entry (`.ossy-api.generated.js`) when there is any API surface,
+  // Always feed Rollup the same generated entry when there is any API surface,
   // so adding/removing `*.api.js` does not require changing the replace target mid-dev.
   if (apiFiles.length > 0 || hasLegacy) {
     fs.writeFileSync(
       generatedPath,
       generateApiModule({
-        cwd,
+        generatedPath,
         apiFiles,
         legacyPath: hasLegacy ? legacyPath : null,
       })
@@ -142,18 +177,18 @@ export function resolveApiSource({ cwd, pagesOpt, scriptDir, explicitApiSource }
  * Merges `src/tasks.js` (optional) and every `*.task.js` under `src/` into one default export array
  * of job handlers `{ type, handler }` for the Ossy worker.
  */
-export function generateTaskModule({ cwd, taskFiles, legacyPath }) {
+export function generateTaskModule ({ generatedPath, taskFiles, legacyPath }) {
   const lines = [
     '// Generated by @ossy/app — do not edit',
     '',
   ]
   const hasLegacy = legacyPath && fs.existsSync(legacyPath)
   if (hasLegacy) {
-    const rel = path.relative(cwd, legacyPath).replace(/\\/g, '/')
+    const rel = relToGeneratedImport(generatedPath, legacyPath)
     lines.push(`import _legacyTasks from './${rel}'`)
   }
   taskFiles.forEach((f, i) => {
-    const rel = path.relative(cwd, f).replace(/\\/g, '/')
+    const rel = relToGeneratedImport(generatedPath, f)
     lines.push(`import * as _task${i} from './${rel}'`)
   })
   lines.push(
@@ -182,11 +217,13 @@ export function generateTaskModule({ cwd, taskFiles, legacyPath }) {
 /**
  * Resolves the Rollup entry for @ossy/tasks/source-file and which files to list in the worker build overview.
  */
-export function resolveTaskSource({ cwd, pagesOpt, scriptDir, explicitTaskSource }) {
+export function resolveTaskSource ({ cwd, pagesOpt, scriptDir, explicitTaskSource, buildPath }) {
   const srcDir = path.resolve(cwd, pagesOpt)
   const legacyPath = path.resolve(cwd, 'src/tasks.js')
   const defaultStub = path.resolve(scriptDir, 'tasks.js')
-  const generatedPath = path.join(cwd, '.ossy-tasks.generated.js')
+  const bp = path.resolve(buildPath ?? path.join(cwd, 'build'))
+  ensureOssyGeneratedDir(bp)
+  const generatedPath = path.join(ossyGeneratedDir(bp), OSSY_GEN_TASKS_BASENAME)
 
   if (explicitTaskSource) {
     const p = path.isAbsolute(explicitTaskSource)
@@ -204,7 +241,7 @@ export function resolveTaskSource({ cwd, pagesOpt, scriptDir, explicitTaskSource
     fs.writeFileSync(
       generatedPath,
       generateTaskModule({
-        cwd,
+        generatedPath,
         taskFiles,
         legacyPath: hasLegacy ? legacyPath : null,
       })
@@ -243,12 +280,12 @@ export function filePathToRoute(filePath, srcDir) {
   return { id, path: routePath }
 }
 
-export function generatePagesModule(pageFiles, cwd, srcDir = 'src') {
+export function generatePagesModule (pageFiles, cwd, srcDir, generatedPath) {
   const resolvedSrc = path.resolve(cwd, srcDir)
   const lines = [
     "import React from 'react'",
     ...pageFiles.map((f, i) => {
-      const rel = path.relative(cwd, f).replace(/\\/g, '/')
+      const rel = relToGeneratedImport(generatedPath, f)
       return `import * as _page${i} from './${rel}'`
     }),
     '',
@@ -441,7 +478,7 @@ function isWorkerExternal(id) {
 }
 
 /**
- * Worker-only bundle: discovers `*.task.js` (and optional `src/tasks.js`), writes `.ossy-tasks.generated.js`
+ * Worker-only bundle: discovers `*.task.js` (and optional `src/tasks.js`), writes `build/.ossy/tasks.generated.js`
  * when needed, and emits `build/worker.js`. Invoke via `npx @ossy/cli build --worker`.
  */
 export async function buildWorker(cliArgs) {
@@ -468,6 +505,7 @@ export async function buildWorker(cliArgs) {
     pagesOpt,
     scriptDir,
     explicitTaskSource: options['--task-source'],
+    buildPath,
   })
 
   const workerEntryPath = path.resolve(scriptDir, 'worker-entry.js')
@@ -490,7 +528,7 @@ export async function buildWorker(cliArgs) {
     input: workerEntryPath,
     external: isWorkerExternal,
     plugins: [
-      remove({ targets: buildPath }),
+      ossyCleanBuildDirPlugin(buildPath),
       replace({
         preventAssignment: true,
         delimiters: ['%%', '%%'],
@@ -546,6 +584,8 @@ export const build = async (cliArgs) => {
     const scriptDir = path.dirname(url.fileURLToPath(import.meta.url))
     const cwd = process.cwd()
     const pagesOpt = options['--pages'] || 'src'
+    const buildPath = path.resolve(options['--destination'] || 'build')
+    ensureOssyGeneratedDir(buildPath)
     const srcDir = path.resolve(pagesOpt)
     const configPath = path.resolve(options['--config'] || 'src/config.js');
     const pageFiles = discoverPageFiles(srcDir)
@@ -556,9 +596,12 @@ export const build = async (cliArgs) => {
     let effectivePagesSource
     let isPageFiles = false
     if (pageFiles.length > 0 || modulePageFiles.length > 0) {
-      const generatedPath = path.join(cwd, '.ossy-pages.generated.jsx')
-      fs.writeFileSync(generatedPath, generatePagesModule([...pageFiles, ...modulePageFiles], cwd, pagesOpt))
-      effectivePagesSource = generatedPath
+      const pagesGeneratedPath = path.join(ossyGeneratedDir(buildPath), OSSY_GEN_PAGES_BASENAME)
+      fs.writeFileSync(
+        pagesGeneratedPath,
+        generatePagesModule([...pageFiles, ...modulePageFiles], cwd, pagesOpt, pagesGeneratedPath)
+      )
+      effectivePagesSource = pagesGeneratedPath
       isPageFiles = true
     } else if (hasPagesJsx) {
       effectivePagesSource = pagesJsxPath
@@ -574,10 +617,10 @@ export const build = async (cliArgs) => {
       pagesOpt,
       scriptDir,
       explicitApiSource: options['--api-source'],
+      buildPath,
     })
     let apiSourcePath = resolvedApi
     let middlewareSourcePath = path.resolve(options['--middleware-source'] || 'src/middleware.js');
-    const buildPath = path.resolve(options['--destination'] || 'build');
     const publicDir = path.resolve('public')
 
     const inputClient = path.resolve(scriptDir, 'client.js')
@@ -610,7 +653,7 @@ export const build = async (cliArgs) => {
     const inputOptions = {
         input: inputFiles,
         plugins: [
-          remove({ targets: buildPath }),
+          ossyCleanBuildDirPlugin(buildPath),
           // inject({ 'React': 'react' }),
           replace({
             preventAssignment: true,

package/cli/dev.js

@@ -7,6 +7,11 @@ import {
   generatePagesModule,
   discoverModulePageFiles,
   resolveApiSource,
+  ossyCleanBuildDirPlugin,
+  ensureOssyGeneratedDir,
+  ossyGeneratedDir,
+  OSSY_GEN_PAGES_BASENAME,
+  OSSY_GEN_API_BASENAME,
 } from './build.js';
 import { watch } from 'rollup';
 import babel from '@rollup/plugin-babel';
@@ -15,7 +20,6 @@ import resolveCommonJsDependencies from '@rollup/plugin-commonjs'
 import json from "@rollup/plugin-json"
 import copy from 'rollup-plugin-copy';
 import replace from '@rollup/plugin-replace';
-import remove from 'rollup-plugin-delete';
 import arg from 'arg'
 import { spawn } from 'node:child_process'
 // import inject from '@rollup/plugin-inject'
@@ -40,6 +44,8 @@ export const dev = async (cliArgs) => {
     const scriptDir = path.dirname(url.fileURLToPath(import.meta.url))
     const cwd = process.cwd()
     const pagesOpt = options['--pages'] || 'src'
+    const buildPath = path.resolve(options['--destination'] || 'build')
+    ensureOssyGeneratedDir(buildPath)
     const srcDir = path.resolve(pagesOpt)
     const configPath = path.resolve(options['--config'] || 'src/config.js');
     const pageFiles = discoverPageFiles(srcDir)
@@ -50,9 +56,12 @@ export const dev = async (cliArgs) => {
     let effectivePagesSource
     let isPageFiles = false
     if (pageFiles.length > 0 || modulePageFiles.length > 0) {
-      const generatedPath = path.join(cwd, '.ossy-pages.generated.jsx')
-      fs.writeFileSync(generatedPath, generatePagesModule([...pageFiles, ...modulePageFiles], cwd, pagesOpt))
-      effectivePagesSource = generatedPath
+      const pagesGeneratedPath = path.join(ossyGeneratedDir(buildPath), OSSY_GEN_PAGES_BASENAME)
+      fs.writeFileSync(
+        pagesGeneratedPath,
+        generatePagesModule([...pageFiles, ...modulePageFiles], cwd, pagesOpt, pagesGeneratedPath)
+      )
+      effectivePagesSource = pagesGeneratedPath
       isPageFiles = true
     } else if (hasPagesJsx) {
       effectivePagesSource = pagesJsxPath
@@ -68,10 +77,10 @@ export const dev = async (cliArgs) => {
       pagesOpt,
       scriptDir,
       explicitApiSource: options['--api-source'],
+      buildPath,
     })
     let apiSourcePath = resolvedApi
     let middlewareSourcePath = path.resolve(options['--middleware-source'] || 'src/middleware.js');
-    const buildPath = path.resolve(options['--destination'] || 'build');
     const publicDir = path.resolve('public')
 
     const inputClient = path.resolve(scriptDir, 'client.js')
@@ -103,7 +112,7 @@ export const dev = async (cliArgs) => {
     const inputOptions = {
         input: inputFiles,
         plugins: [
-          remove({ targets: buildPath }),
+          ossyCleanBuildDirPlugin(buildPath),
           // inject({ 'React': 'react' }),
           replace({
             preventAssignment: true,
@@ -230,8 +239,9 @@ export const dev = async (cliArgs) => {
         pagesOpt,
         scriptDir,
         explicitApiSource: undefined,
+        buildPath,
       })
-      const gen = path.resolve(cwd, '.ossy-api.generated.js')
+      const gen = path.join(ossyGeneratedDir(buildPath), OSSY_GEN_API_BASENAME)
       if (fs.existsSync(gen) && typeof watcher?.invalidate === 'function') {
         watcher.invalidate(gen)
       }
@@ -243,8 +253,11 @@ export const dev = async (cliArgs) => {
         if (!isPageFiles) return
         const files = discoverPageFiles(srcDir)
         if (files.length > 0) {
-          const generatedPath = path.join(cwd, '.ossy-pages.generated.jsx')
-          fs.writeFileSync(generatedPath, generatePagesModule(files, cwd, pagesOpt))
+          const pagesGeneratedPath = path.join(ossyGeneratedDir(buildPath), OSSY_GEN_PAGES_BASENAME)
+          fs.writeFileSync(
+            pagesGeneratedPath,
+            generatePagesModule(files, cwd, pagesOpt, pagesGeneratedPath)
+          )
         }
       }
       if (/\.api\.(mjs|cjs|js)$/.test(filename) || /(^|\/)api\.js$/.test(filename.replace(/\\/g, '/'))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "0.15.5",
+  "version": "0.15.7",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -66,5 +66,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "60384d10d4ae86cfe0bbbace31726d600e8febcd"
+  "gitHead": "9d5c6036a317fb18db45d65ff6ce237554ffd3af"
 }