create-apollo-monorepo 0.9.786 → 0.9.787

package/README.md

@@ -45,7 +45,7 @@ collide:
 | ------------------------------------ | -------------------- |
 | `/`, your custom routes              | `apps/frontend`      |
 | `/admin/*`                           | `apps/backend` (admin pages **and** their JS chunks) |
-| `/api/auth/*`, `/api/v1/*`, `/api/admin/*`, `/api/email/*`, `/api/cron`, `/api/health`, `/api/mcp`, `/api/editing-presence/*` | `apps/backend` |
+| `/api/auth/*`, `/api/v1/*`, `/api/admin/*`, `/api/email/*`, `/api/health`, `/api/mcp`, `/api/editing-presence/*` | `apps/backend` |
 | `/uploads/*`                         | `apps/backend` (media) |
 
 Apollo CMS reads `APOLLO_ASSET_PREFIX` (default `/admin`) and serves its built

package/index.mjs

@@ -227,14 +227,14 @@ function preflight(flags) {
   success(`Node.js ${process.versions.node}`);
 
   // bun is required at runtime by apps/backend (apollo-cms): db:push, db:seed,
-  // dev:cron, plugins:build, the upgrade pipeline, and pre-commit hooks all
+  // plugins:build, the upgrade pipeline, and pre-commit hooks all
   // shell out to `bun`. The scaffold itself works without bun, but `pnpm dev`,
   // `pnpm backend:setup`, and `pnpm backend:upgrade` will fail without it.
   const TOOLS = [
     { cmd: "git",  required: true,  missing: "git is required but not found.\n  Install: https://git-scm.com/" },
     { cmd: "pnpm", required: false, missing: "pnpm not found — install with: npm i -g pnpm  (required for workspaces)" },
     { cmd: "bun",  required: false, missing:
-        "bun not found — required by apps/backend for db:push, db:seed, dev:cron,\n" +
+        "bun not found — required by apps/backend for db:push, db:seed,\n" +
         "       plugins:build, and the upgrade pipeline.\n" +
         "       Install: curl -fsSL https://bun.sh/install | bash  (or: brew install bun)" },
   ];
@@ -318,12 +318,11 @@ function writeRootPackageJson(targetDir, dirName) {
     description: `${dirName} monorepo (frontend + apollo-cms backend submodule)`,
     scripts: {
       // We bypass apollo-cms's own `dev` script ("bun install && bun run
-      // plugins:build && next dev & bun run scripts/dev-cron.ts") because the
-      // bash-`&`-then-foreground pattern exits with SIGHUP (129) under pnpm's
-      // parallel runner. Instead we explicitly run plugins:build (both ours
-      // and apollo-cms's) and `next dev` directly. Cron is optional in dev —
-      // run `pnpm dev:cron` in a separate terminal if you need scheduled jobs
-      // (production uses Vercel Cron via apps/backend/vercel.json).
+      // plugins:build && next dev") because the bash-`&`-then-foreground
+      // pattern exits with SIGHUP (129) under pnpm's parallel runner. Instead
+      // we explicitly run plugins:build (both ours and apollo-cms's) and
+      // `next dev` directly. Nothing extra to start for scheduled jobs — the
+      // backend drives its scheduler queue in-process (dev and production).
       "predev:setup":
         "pnpm cms-plugins:build && pnpm --filter ./apps/backend exec bun run plugins:build",
       // `pnpm dev` runs FE + BE Next.js dev servers (which watch their own
@@ -343,7 +342,6 @@ function writeRootPackageJson(targetDir, dirName) {
         "node scripts/with-env.mjs --port=FRONTEND_PORT pnpm --filter ./apps/frontend exec next dev",
       "dev:backend":
         "pnpm predev:setup && node scripts/with-env.mjs --port=BACKEND_PORT pnpm --filter ./apps/backend exec next dev",
-      "dev:cron": "pnpm --filter ./apps/backend exec bun scripts/dev-cron.ts",
       // Build pipeline: cms-plugins → apollo-cms's own plugins → backend → frontend.
       // `prebuild` runs first (npm/pnpm convention) and fails fast if the
       // backend's required env vars are missing.
@@ -366,12 +364,6 @@ function writeRootPackageJson(targetDir, dirName) {
         "node scripts/with-env.mjs --port=FRONTEND_PORT pnpm --filter ./apps/frontend exec next start",
       "start:backend":
         "node scripts/with-env.mjs --port=BACKEND_PORT pnpm --filter ./apps/backend exec next start",
-      // Self-hosted scheduler fallback. Vercel deploys use Vercel Cron via
-      // apps/backend/vercel.json — skip this on Vercel. For Docker / VPS
-      // you can either run \`pnpm start:cron\` alongside \`pnpm start\` (PM2
-      // handles this via ecosystem.config.cjs), or use system cron / k8s
-      // CronJob to hit /api/cron with CRON_SECRET.
-      "start:cron": "pnpm --filter ./apps/backend exec bun scripts/dev-cron.ts",
       "cms-plugins:build":
         "pnpm --filter './apps/cms-plugins/*' --parallel --if-present build",
       "cms-plugins:dev":
@@ -522,7 +514,7 @@ server {
     # Backend APIs (mirror the list in apps/frontend/next.config.ts).
     # \`editing-presence\` is included so the bare path also routes to backend;
     # streaming sub-paths still match the \`^~\` block above first.
-    location ~ ^/api/(auth|v1|cron|email|health|mcp|admin|editing-presence)(/|$) {
+    location ~ ^/api/(auth|v1|email|health|mcp|admin|editing-presence)(/|$) {
         proxy_pass http://apollo_backend;
     }
 
@@ -546,7 +538,7 @@ function writeProxyApp(targetDir, dirName, adminPrefix) {
 // Routes (in order):
 //   ${prefix}, ${prefix}/*, /uploads/*                       → backend
 //   /api/editing-presence/*                                  → backend (SSE)
-//   /api/{auth,v1,cron,email,health,mcp,admin,...}/*         → backend
+//   /api/{auth,v1,email,health,mcp,admin,...}/*              → backend
 //   /__proxy/health                                          → 200 OK (proxy itself)
 //   everything else                                          → frontend
 //
@@ -597,7 +589,7 @@ const ADMIN_PREFIX = process.env.ADMIN_PREFIX ?? "${prefix}";
 // Pipe-separated list of /api/<segment> paths that route to the backend.
 const BACKEND_API_SEGMENTS = (
   process.env.BACKEND_API_PATHS ??
-  "auth|v1|cron|email|health|mcp|admin|editing-presence"
+  "auth|v1|email|health|mcp|admin|editing-presence"
 ).trim();
 const BACKEND_API = new RegExp(\`^/api/(\${BACKEND_API_SEGMENTS})(/|$)\`);
 
@@ -840,7 +832,7 @@ single-origin URL.
 | \`BACKEND\`             | \`http://127.0.0.1:3000\`           | apps/backend dev server                                        |
 | \`FRONTEND\`            | \`http://127.0.0.1:3001\`           | apps/frontend dev server                                       |
 | \`ADMIN_PREFIX\`        | \`${prefix}\`                          | Backend admin path prefix                                      |
-| \`BACKEND_API_PATHS\`   | \`auth\\|v1\\|cron\\|email\\|health\\|mcp\\|admin\\|editing-presence\` | Pipe-separated /api/* segments routed to backend |
+| \`BACKEND_API_PATHS\`   | \`auth\\|v1\\|email\\|health\\|mcp\\|admin\\|editing-presence\` | Pipe-separated /api/* segments routed to backend |
 | \`MAX_BODY_BYTES\`      | \`52428800\` (50MB)                 | Reject larger bodies. \`0\` = unlimited                          |
 | \`UPSTREAM_TIMEOUT_MS\` | \`60000\`                           | Request timeout to upstream                                    |
 | \`TRUST_PROXY\`         | \`1\`                               | Honors inbound X-Forwarded-* from upstream TLS terminator (nginx/Caddy/CF/LB). Set \`0\` if proxy is directly internet-facing |
@@ -1065,10 +1057,9 @@ const config: NextConfig = {
     return [
       // Apollo CMS admin UI (and its chunks when APOLLO_ASSET_PREFIX is /admin)
       { source: "/admin/:path*", destination: \`\${BACKEND}/admin/:path*\` },
-      // Apollo CMS APIs (REST + auth + cron + email + health + mcp + …)
+      // Apollo CMS APIs (REST + auth + email + health + mcp + …)
       { source: "/api/auth/:path*", destination: \`\${BACKEND}/api/auth/:path*\` },
       { source: "/api/v1/:path*",   destination: \`\${BACKEND}/api/v1/:path*\` },
-      { source: "/api/cron",        destination: \`\${BACKEND}/api/cron\` },
       { source: "/api/email/:path*", destination: \`\${BACKEND}/api/email/:path*\` },
       { source: "/api/health",      destination: \`\${BACKEND}/api/health\` },
       { source: "/api/mcp",         destination: \`\${BACKEND}/api/mcp\` },
@@ -1123,20 +1114,6 @@ export default config;
     // .env.local is intentionally committed — it only contains dev port hints.
     ["node_modules", ".next", "dist", ""].join("\n"),
   );
-
-  // Vercel project config for the frontend. Skip cron + region pinning is
-  // optional; configure Root Directory + "Include all submodules" in the
-  // Vercel UI when linking the project.
-  const vercelJson = {
-    $schema: "https://openapi.vercel.sh/vercel.json",
-    regions: ["sin1"],
-  };
-  writeFileSync(resolve(dir, "vercel.json"), JSON.stringify(vercelJson, null, 2) + "\n");
-
-  writeFileSync(
-    resolve(dir, ".vercelignore"),
-    ["node_modules", ".next", ".env.local", ""].join("\n"),
-  );
 }
 
 // ─── Custom plugins scaffold ─────────────────────────────────────────────────
@@ -1233,7 +1210,7 @@ if (watch) {
 // → dist/server.mjs (built by \`pnpm cms-plugins:build\`).
 //
 // In dev under Bun the loader can also import index.ts directly (with a
-// warning); in production (Vercel / next start) the dist file is required.
+// warning); in production (next start) the dist file is required.
 
 import type { PluginDefinition } from "@/lib/plugins/types";
 
@@ -1441,7 +1418,7 @@ function writeCheckEnvScript(targetDir) {
 // Pre-build sanity check. Reads apps/backend/.env.local and verifies that
 // required vars are present and non-empty. Skipped when SKIP_ENV_CHECK=1.
 //
-// In CI/Vercel where envs come from the platform (not files), set
+// In CI where envs come from the platform (not files), set
 // SKIP_ENV_CHECK=1 and rely on the platform's own validation.
 
 import { existsSync, readFileSync } from "node:fs";
@@ -1486,7 +1463,7 @@ console.log("✓ env check passed");
 }
 
 // PM2 ecosystem config — production process supervision for self-hosted deploys.
-// Includes FE, BE, optional proxy, and optional cron in fork mode (no clustering
+// Includes FE, BE, and optional proxy in fork mode (no clustering
 // since Next.js handles that internally and the proxy is single-threaded by design).
 function writePm2Config(targetDir, dirName, adminPrefix) {
   const singleOrigin = !!adminPrefix;
@@ -1510,9 +1487,8 @@ function writePm2Config(targetDir, dirName, adminPrefix) {
 //   pnpm install
 //   pnpm backend:upgrade
 //   pnpm build
-//   pm2 start ecosystem.config.cjs                    # FE + BE + proxy + cron
+//   pm2 start ecosystem.config.cjs                    # FE + BE + proxy
 //   pm2 start ecosystem.config.cjs --only proxy       # only the reverse proxy
-//   pm2 start ecosystem.config.cjs --only cron        # self-hosted cron fallback
 //   pm2 stop  \${PM2_NAMESPACE}                         # stop everything in this project
 //   pm2 save && pm2 startup                           # persist across reboots
 
@@ -1538,9 +1514,9 @@ const FRONTEND_PORT = Number(process.env.FRONTEND_PORT) || 3001;
 const BACKEND_PORT  = Number(process.env.BACKEND_PORT)  || 3002;
 const PROXY_PORT    = Number(process.env.PROXY_PORT)    || 3030;
 
-// Backend's internal URL (loopback). Cron MUST target this, never the proxy or
-// frontend — going through the FE just adds a failure mode (HTML error → JSON
-// parse blowup in dev-cron.ts).
+// Backend's internal URL (loopback). Server-to-server callers MUST target
+// this, never the proxy or frontend — going through the FE just adds a failure
+// mode (an HTML error page where JSON was expected).
 const BACKEND_INTERNAL_URL = process.env.BACKEND_INTERNAL_URL || \`http://127.0.0.1:\${BACKEND_PORT}\`;
 
 module.exports = {
@@ -1582,21 +1558,6 @@ ${proxyEnv}
       max_memory_restart: '256M',
       autorestart: true,
     },
-    {
-      name: 'cron',
-      namespace: NAMESPACE,
-      cwd: './apps/backend',
-      script: 'scripts/dev-cron.ts',
-      interpreter: 'bun',
-      env: {
-        NODE_ENV: 'production',
-        // dev-cron.ts derives its target from NEXT_PUBLIC_SITE_URL. Override
-        // it to the backend loopback so cron skips the FE/proxy entirely.
-        NEXT_PUBLIC_SITE_URL: BACKEND_INTERNAL_URL,
-        CRON_SECRET: process.env.CRON_SECRET,
-      },
-      autorestart: true,
-    },
   ],
 };
 `;
@@ -1612,7 +1573,7 @@ function writeClaudeMd(targetDir, adminPrefix) {
 Frontend is the public entry point. It rewrites these paths to the backend (do **not** create matching routes in the frontend):
 
 - \`/admin/*\`, \`/uploads/*\`
-- \`/api/auth/*\`, \`/api/v1/*\`, \`/api/email/*\`, \`/api/cron\`, \`/api/health\`, \`/api/mcp\`, \`/api/admin/*\`, \`/api/editing-presence/*\`
+- \`/api/auth/*\`, \`/api/v1/*\`, \`/api/email/*\`, \`/api/health\`, \`/api/mcp\`, \`/api/admin/*\`, \`/api/editing-presence/*\`
 - \`/_next/static\` under \`APOLLO_ASSET_PREFIX=${prefix}\` (backend chunks)
 
 Custom frontend APIs must be namespaced (e.g. \`/api/internal/*\`).
@@ -1687,7 +1648,6 @@ Proxy reads \`PORT\`, \`BACKEND\`, \`FRONTEND\`, \`ADMIN_PREFIX\` from env. When
 ## Deploy
 
 - Self-hosted: build on a runner, rsync to the server, then \`pm2 startOrReload ecosystem.config.cjs --update-env\`. If the backend submodule is private, the deploy runner needs a token with read access.
-- Vercel: two projects per repo (\`apps/backend\` and \`apps/frontend\` root dirs). Backend's Build Command must copy \`apps/cms-plugins/*/dist\` into \`apps/backend/plugins/\` before \`next build\` because Turbopack rejects \`outputFileTracingIncludes\` globs above the project root. "Include all submodules" must be ON in both projects.
 
 ## Submodule discipline
 
@@ -1710,7 +1670,7 @@ paths to the backend so /_next/* doesn't collide:
 | --------------------------- | ------------------ |
 | \`/\` and other frontend routes | \`apps/frontend\`     |
 | \`/admin/*\`                  | \`apps/backend\`      |
-| \`/api/auth/*\`, \`/api/v1/*\`, \`/api/email/*\`, \`/api/cron\`, \`/api/health\`, \`/api/mcp\`, \`/api/admin/*\`, \`/api/editing-presence/*\` | \`apps/backend\` |
+| \`/api/auth/*\`, \`/api/v1/*\`, \`/api/email/*\`, \`/api/health\`, \`/api/mcp\`, \`/api/admin/*\`, \`/api/editing-presence/*\` | \`apps/backend\` |
 | \`/uploads/*\`                | \`apps/backend\` (media) |
 | \`${adminPrefix}/*\`              | \`apps/backend\` (chunks via \`APOLLO_ASSET_PREFIX\`) |
 
@@ -1727,7 +1687,7 @@ Two options ship out of the box:
   deploys. Configure via \`PORT\`, \`BACKEND\`, \`FRONTEND\`, \`ADMIN_PREFIX\`.
 - **\`nginx.conf.sample\`** (production) — same routing baked in (frontend on
   :3001, backend on :3000). Use it when fronting both apps behind a single
-  TLS-terminating proxy outside Vercel — drop in your domain and SSL certs.
+  TLS-terminating proxy — drop in your domain and SSL certs.
 
 To **disable** single-origin and run the backend on its own subdomain,
 delete \`APOLLO_ASSET_PREFIX\` from \`apps/backend/.env.local\` and remove the
@@ -1865,14 +1825,13 @@ processes without re-running \`drizzle-kit push\` every time. Always run
 | \`pnpm start\`        | FE + BE (parallel \`next start\`)                                     |
 | \`pnpm start:rp\`     | FE + BE + reverse proxy on :3030                                    |
 | \`pnpm start:proxy\`  | Reverse proxy alone (already running FE/BE separately)              |
-| \`pnpm start:cron\`   | Self-hosted cron fallback — only if not using Vercel Cron / k8s     |
 
 ### PM2 (recommended for VPS)
 
 The installer scaffolds \`ecosystem.config.cjs\`. To supervise everything:
 
 \`\`\`bash
-pm2 start ecosystem.config.cjs                  # FE + BE + proxy + cron (all four)
+pm2 start ecosystem.config.cjs                  # FE + BE + proxy (all three)
 pm2 start ecosystem.config.cjs --only proxy     # only the reverse proxy
 pm2 save && pm2 startup                         # persist across reboots
 pm2 logs \${PM2_NAMESPACE:-${dirName}}             # tail just this project's logs
@@ -1880,13 +1839,14 @@ pm2 reload \${PM2_NAMESPACE:-${dirName}}            # zero-downtime restart (nam
 pm2 stop   \${PM2_NAMESPACE:-${dirName}}            # stop only this project
 \`\`\`
 
-All four processes are grouped under the \`PM2_NAMESPACE\` set in \`.env.local\`
+All three processes are grouped under the \`PM2_NAMESPACE\` set in \`.env.local\`
 (defaults to \`${dirName}\`), so namespace commands target only this project
 even when other PM2 apps share the host. Process names embed the bound port
 (\`frontend:3001\`, \`backend:3002\`, \`proxy:3030\`) for quick \`pm2 ls\` triage.
 
-The proxy and cron processes can be omitted with \`--only\` if you front the
-apps with nginx/Caddy or use platform cron (system cron, k8s CronJob).
+The proxy process can be omitted with \`--only\` if you front the apps with
+nginx/Caddy. Scheduled jobs need no extra process — the backend drives its
+scheduler queue in-process.
 
 ### Docker / k8s
 
@@ -1894,74 +1854,7 @@ For containerized deploys:
 - Bake the build into the image (\`pnpm install && pnpm build\`)
 - Set entrypoint to \`pnpm start\` or \`pnpm start:rp\`
 - Run \`pnpm backend:upgrade\` as a separate init container / Job before app pods start
-- Use platform-native cron (k8s CronJob hitting \`/api/cron\` with \`CRON_SECRET\`) instead of \`pnpm start:cron\`
-
-## Deploy on Vercel
-
-Two Vercel projects, one repo. Each project picks up its own Root Directory.
-
-### 1) Backend project
-
-- **Import** this repo into Vercel as a new project.
-- **Root Directory**: \`apps/backend\`
-- **Build Command**: \`cd ../.. && pnpm install --frozen-lockfile && pnpm cms-plugins:build && cp -r ../cms-plugins/* apps/backend/plugins/ 2>/dev/null || true && pnpm --filter ./apps/backend build\`
-- **Install Command**: leave empty (handled in build)
-- **Settings → Git → Include all submodules: ON** (Vercel checks out an empty \`apps/backend\` otherwise)
-- **Environment variables**:
-  \`\`\`
-  DATABASE_URL=postgresql://…
-  APOLLO_SECRET=<openssl rand -hex 32>
-  NEXT_PUBLIC_SITE_URL=https://yourdomain.com   # the PUBLIC origin
-  NEXT_PUBLIC_DEFAULT_LOCALE=en
-  ${singleOrigin ? `APOLLO_ASSET_PREFIX=${adminPrefix}` : "# APOLLO_ASSET_PREFIX=/admin   # only when single-origin"}
-  CRON_SECRET=<random>                          # protects /api/cron
-  APOLLO_EXTRA_PLUGINS_DIR=./plugins             # picks up copied cms-plugins (see Build Command)
-  # Storage on Vercel cannot use local FS — pick one:
-  # Vercel Blob:        BLOB_READ_WRITE_TOKEN=…
-  # S3 / R2 / Spaces:   S3_ACCESS_KEY_ID, S3_SECRET_ACCESS_KEY, S3_BUCKET, S3_REGION, S3_ENDPOINT
-  APOLLO_DISABLE_LOCAL_STORAGE=1
-  \`\`\`
-- **Cron**: \`apps/backend/vercel.json\` declares \`/api/cron\` on a 5-minute schedule (from apollo-cms upstream).
-- **About the \`cp\` step**: Turbopack rejects \`outputFileTracingIncludes\` globs that walk above the project root, so the Build Command copies built \`apps/cms-plugins/*/dist\` into \`apps/backend/plugins/\` before \`next build\`. NFT then traces them normally as if they were built-in plugins. Locally this isn't needed because \`APOLLO_EXTRA_PLUGINS_DIR=../cms-plugins\` reads them directly.
-
-### 2) Frontend project
-
-- **Import the same repo** as a separate Vercel project.
-- **Root Directory**: \`apps/frontend\`
-- **Build Command**: \`cd ../.. && pnpm install --frozen-lockfile && pnpm --filter ./apps/frontend build\`
-- **Install Command**: leave empty
-- **Settings → Git → Include all submodules: ON**
-- **Environment variables**:
-  \`\`\`
-  NEXT_PUBLIC_SITE_URL=https://yourdomain.com
-${singleOrigin
-  ? `  BACKEND_INTERNAL_URL=https://<your-backend>.vercel.app`
-  : `  NEXT_PUBLIC_BACKEND_URL=https://<your-backend>.vercel.app`
-}
-  \`\`\`
-
-### 3) Custom domain
-
-Attach \`yourdomain.com\` to the **frontend** project${singleOrigin ? " (in single-origin mode it's the public entry point)" : ""}. The backend stays on its \`*.vercel.app\` URL${singleOrigin ? " — that's what the rewrite proxies to" : ""}.
-
-### 4) Skip duplicate builds (optional)
-
-Each push triggers both projects to rebuild. Add an **Ignored Build Step** in
-each project's Settings → Git:
-
-- **Backend**: \`git diff HEAD^ HEAD --quiet -- apps/backend\` (exits 0 → skip build)
-- **Frontend**: \`git diff HEAD^ HEAD --quiet -- apps/frontend\`
-
-### Gotchas
-
-- **Submodule must be initialized** on Vercel — the "Include all submodules"
-  toggle is the most common reason builds fail with a missing \`apps/backend\`.
-- **OAuth callbacks** for email providers must use the public domain:
-  \`https://yourdomain.com/api/email/oauth/callback\`.${singleOrigin ? " The frontend rewrite forwards it to the backend." : ""}
-- **Cron** runs on the backend project only. Vercel sends \`Authorization:
-  Bearer $CRON_SECRET\` automatically when \`CRON_SECRET\` is set.${singleOrigin ? `
-- **Better Auth** uses \`trustedProxyHeaders: true\` so the rewrite proxy's
-  \`x-forwarded-host\` lands cookies at the public origin without extra config.` : ""}
+- No cron sidecar needed — the backend drives its scheduler queue in-process
 `;
   writeFileSync(resolve(targetDir, "README.md"), readme);
 }
@@ -1993,8 +1886,8 @@ async function main() {
   const adminPrefix =normalizeAdminPrefix(flags.adminPrefix);
   const { dbUrl, siteUrl, locale } = await gatherEnv(flags);
   const authSecret = randomBytes(48).toString("base64");
-  // Required by apollo-cms's /api/cron route and scripts/dev-cron.ts in dev.
-  // Without it the dev cron loop hits 403 "CRON_SECRET not configured".
+  // Authenticates trusted callers of apollo-cms's /api/health?check=ready.
+  // Without it that readiness check answers 403 "CRON_SECRET not configured".
   const cronSecret = randomBytes(24).toString("hex");
   const backendInternalUrl = `http://localhost:${DEFAULT_BACKEND_PORT}`;
   success(`Frontend pkg name: ${frontendName}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-apollo-monorepo",
-  "version": "0.9.786",
+  "version": "0.9.787",
   "description": "Scaffold a monorepo with a frontend app and Apollo CMS as a git submodule backend (single-origin via Next.js rewrites + assetPrefix)",
   "bin": {
     "create-apollo-monorepo": "index.mjs"