create-apollo-monorepo 0.5.0 → 0.5.2

package/README.md

@@ -44,19 +44,29 @@ collide:
 | Browser path                         | Goes to              |
 | ------------------------------------ | -------------------- |
 | `/`, your custom routes              | `apps/frontend`      |
-| `/admin/*`                           | `apps/backend`       |
+| `/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` |
 | `/uploads/*`                         | `apps/backend` (media) |
-| `/cms-assets/*`                      | `apps/backend` chunks (via `APOLLO_ASSET_PREFIX`) |
 | `/monitoring`                        | `apps/backend` (Sentry tunnel, no-op without DSN) |
 
-Apollo CMS picks up `APOLLO_ASSET_PREFIX=/cms-assets` and serves its built JS
-under that namespace, sidestepping the `/_next/*` collision. The frontend
-**must not** define routes at `/admin`, `/api/auth`, `/api/v1`, etc.
+Apollo CMS reads `APOLLO_ASSET_PREFIX` (default `/admin`) and serves its built
+JS under `<prefix>/_next/static/`. Because the prefix coincides with the admin
+path, a single `/admin/:path*` rewrite covers both pages and chunks — no
+separate asset rewrite is emitted. The frontend **must not** define routes at
+`/admin`, `/api/auth`, `/api/v1`, etc.
+
+You can override the prefix:
+
+```bash
+npx create-apollo-monorepo my-app --admin-prefix /cms
+```
+
+When the prefix is anything other than `/admin`, the scaffold also emits a
+matching `<prefix>/:path*` rewrite for backend chunks.
 
 ### Separate origins (fallback)
 
-Pass `--asset-prefix none` (or `off`/`false`/`disabled`) to skip the rewrite
+Pass `--admin-prefix none` (or `off`/`false`/`disabled`) to skip the rewrite
 wiring. The backend runs at `http://localhost:3000` and the frontend at
 `http://localhost:3001`. Useful when you'd rather deploy them on separate
 subdomains (e.g. `cms.example.com` + `example.com`).
@@ -71,7 +81,7 @@ subdomains (e.g. `cms.example.com` + `example.com`).
 | `-d, --db <url>`           | _(prompted)_                            | `DATABASE_URL` for backend           |
 | `-u, --url <url>`          | `:3001` single-origin / `:3000` separate | `NEXT_PUBLIC_SITE_URL`               |
 | `-l, --locale <code>`      | `en`                                    | `NEXT_PUBLIC_DEFAULT_LOCALE`         |
-| `--asset-prefix <path>`    | `/cms-assets`                           | Single-origin asset namespace; `none` to disable |
+| `--admin-prefix <path>`    | `/admin`                                | Single-origin admin/asset namespace; `none` to disable. Alias: `--asset-prefix` |
 | `--skip-install`           | off                                     | Don't run `pnpm install`             |
 | `--skip-submodule`         | off                                     | Don't add the git submodule          |
 | `-h, --help`               | —                                       | Show help                            |

package/index.mjs

@@ -57,7 +57,7 @@ ${COLORS.bold}Flags:${COLORS.reset}
   -u, --url <url>              NEXT_PUBLIC_SITE_URL (default: http://localhost:3001 single-origin / 3000 separate)
   -l, --locale <code>          NEXT_PUBLIC_DEFAULT_LOCALE (default: en)
       --admin-prefix <path>    Backend prefix in single-origin mode — sets Next.js
-                               adminPrefix on the backend AND the path the frontend
+                               assetPrefix on the backend AND the path the frontend
                                rewrites to it. Defaults to /admin so backend chunks
                                sit alongside admin pages under one rewrite.
                                Pass "none" to disable single-origin (separate origins).
@@ -69,10 +69,9 @@ ${COLORS.bold}Flags:${COLORS.reset}
 ${COLORS.bold}Single-origin model:${COLORS.reset}
   The frontend is the public entry point. It rewrites these paths to the
   backend so both apps live under one domain without /_next/* collisions:
-    /admin/*           → backend
+    /admin/*           → backend (admin pages + chunks via APOLLO_ASSET_PREFIX=/admin)
     /api/*             → backend (REST API + auth)
     /uploads/*         → backend (media)
-    <asset-prefix>/*   → backend (Next.js chunks via APOLLO_ASSET_PREFIX)
   Frontend MUST NOT define routes at /admin or /api/auth or /api/v1.
 `;
 
@@ -326,14 +325,24 @@ function writeRootPackageJson(targetDir, dirName) {
     private: true,
     description: `${dirName} monorepo (frontend + apollo-cms backend submodule)`,
     scripts: {
-      dev: "pnpm cms-plugins:build && pnpm -r --parallel dev",
+      // 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).
+      "predev:setup":
+        "pnpm cms-plugins:build && pnpm --filter ./apps/backend exec bun run plugins:build",
+      dev:
+        "pnpm predev:setup && concurrently -k -n FE,BE -c blue,magenta \"pnpm --filter ./apps/frontend dev\" \"pnpm --filter ./apps/backend exec next dev\"",
       "dev:frontend": "pnpm --filter ./apps/frontend dev",
-      "dev:backend": "pnpm cms-plugins:build && pnpm --filter ./apps/backend dev",
-      // cms-plugins must compile to dist/ before the backend boots, otherwise
-      // the loader falls back to index.ts which only works under Bun and
-      // emits a warning. Build them sequentially: cms-plugins → backend → frontend.
+      "dev:backend":
+        "pnpm predev:setup && 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.
       build:
-        "pnpm cms-plugins:build && pnpm --filter ./apps/backend build && pnpm --filter ./apps/frontend build",
+        "pnpm cms-plugins:build && pnpm --filter ./apps/backend exec bun run plugins:build && pnpm --filter ./apps/backend build && pnpm --filter ./apps/frontend build",
       "cms-plugins:build":
         "pnpm --filter './apps/cms-plugins/*' --parallel --if-present build",
       "cms-plugin:new": "node scripts/new-cms-plugin.mjs",
@@ -342,6 +351,9 @@ function writeRootPackageJson(targetDir, dirName) {
       "backend:update": "git submodule update --remote --merge apps/backend",
       "backend:setup": "pnpm --filter ./apps/backend setup",
     },
+    devDependencies: {
+      concurrently: "^9.0.0",
+    },
     engines: { node: ">=20", pnpm: ">=9" },
     pnpm: {
       // apollo-cms transitively pulls multiple esbuild versions (0.18, 0.25, 0.27).
@@ -950,7 +962,7 @@ Two Vercel projects, one repo. Each project picks up its own Root Directory.
 
 - **Import** this repo into Vercel as a new project.
 - **Root Directory**: \`apps/backend\`
-- **Build Command**: \`cd ../.. && pnpm install --frozen-lockfile && pnpm --filter ./apps/backend build\`
+- **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**:
@@ -959,14 +971,16 @@ Two Vercel projects, one repo. Each project picks up its own Root Directory.
   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=/cms-assets   # only when single-origin"}
+  ${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
 
@@ -1043,7 +1057,7 @@ async function main() {
   const cronSecret = randomBytes(24).toString("hex");
   const backendInternalUrl = "http://localhost:3000";
   success(`Frontend pkg name: ${frontendName}`);
-  success(`Asset prefix: ${adminPrefix || "(disabled — separate origins)"}`);
+  success(`Admin prefix: ${adminPrefix || "(disabled — separate origins)"}`);
 
   // ── Step 3: Scaffold root ──
   step(3, "Scaffolding monorepo root");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-apollo-monorepo",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "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"