create-apollo-monorepo 0.9.2 → 0.9.3

package/index.mjs

@@ -16,7 +16,7 @@
 
 import { execSync } from "node:child_process";
 import { randomBytes } from "node:crypto";
-import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, writeFileSync, symlinkSync, rmSync } from "node:fs";
 import { resolve, basename } from "node:path";
 import { createInterface } from "node:readline";
 
@@ -27,7 +27,7 @@ const BACKEND_BRANCH = "main";
 const BACKEND_PATH = "apps/backend";
 const FRONTEND_PATH = "apps/frontend";
 const PROXY_PATH = "apps/proxy";
-const MIN_NODE_MAJOR = 20;
+const MIN_NODE_MAJOR = 22;
 
 // Default dev ports. Kept in sync with scripts/with-env.mjs and the proxy
 // template. .env.local is the runtime source of truth — these are the
@@ -435,33 +435,7 @@ function writeRootPackageJson(targetDir, dirName) {
     devDependencies: {
       concurrently: "^9.0.0",
     },
-    engines: { node: ">=20", pnpm: ">=9" },
-    pnpm: {
-      // apollo-cms transitively pulls multiple esbuild versions (0.18, 0.25, 0.27).
-      // pnpm's binary symlink can pick the wrong platform binary for esbuild's
-      // postinstall version check, failing with "Expected X.Y.Z but got A.B.C".
-      // Allow listed packages to run their build/postinstall scripts; the rest
-      // are skipped (pnpm 10 default is empty allow-list).
-      onlyBuiltDependencies: [
-        "@parcel/watcher",
-        "@rolldown/binding-darwin-arm64",
-        "@rolldown/binding-linux-arm64-gnu",
-        "@rolldown/binding-linux-x64-gnu",
-        "@sentry/cli",
-        "@swc/core",
-        "@swc/core-darwin-arm64",
-        "@swc/core-darwin-x64",
-        "@swc/core-linux-arm64-gnu",
-        "@swc/core-linux-x64-gnu",
-        "better-sqlite3",
-        "core-js",
-        "core-js-pure",
-        "esbuild",
-        "msw",
-        "sharp",
-        "unrs-resolver",
-      ],
-    },
+    engines: { node: ">=22", pnpm: ">=10" },
   };
   writeFileSync(resolve(targetDir, "package.json"), JSON.stringify(pkg, null, 2) + "\n");
 
@@ -475,17 +449,77 @@ function writeRootPackageJson(targetDir, dirName) {
       "strict-peer-dependencies=false",
       "public-hoist-pattern[]=*esbuild*",
       "public-hoist-pattern[]=*types*",
+      // Next.js 16's instrumentation hook (used by Sentry / OpenTelemetry
+      // shipped via apollo-cms) loads require-in-the-middle / import-in-the-middle
+      // at runtime via a bare require. Under pnpm's strict node_modules these
+      // sit deep inside .pnpm/ and the resolver can't see them — Next then
+      // crashes on boot with "Failed to load external module require-in-the-middle".
+      // Hoisting them (plus their `shimmer` dep) to the root node_modules fixes it.
+      "public-hoist-pattern[]=*require-in-the-middle*",
+      "public-hoist-pattern[]=*import-in-the-middle*",
+      "public-hoist-pattern[]=*shimmer*",
       "shell-emulator=true",
       "",
     ].join("\n"),
   );
 }
 
+// Link an app's .env.local to the monorepo root .env.local so the root file
+// stays the single source of truth. Next.js only reads .env.local from its
+// own CWD, so this symlink lets `cd apps/<app> && next dev|build` see the
+// shared config. Falls back to a regular copy (with a warning) on platforms
+// where symlink creation requires elevation (Windows non-admin).
+function linkRootEnvLocal(targetDir, appRelPath, fallbackLines) {
+  const envPath = resolve(targetDir, appRelPath, ".env.local");
+  // appRelPath is `apps/<name>` (2 segments deep) → `../../.env.local`.
+  const depth = appRelPath.split("/").filter(Boolean).length;
+  const linkTarget = "../".repeat(depth) + ".env.local";
+  if (existsSync(envPath)) rmSync(envPath);
+  try {
+    symlinkSync(linkTarget, envPath);
+    success(`${appRelPath}/.env.local → ${linkTarget} (symlink)`);
+  } catch {
+    writeFileSync(envPath, [...fallbackLines, ""].join("\n"));
+    warn(
+      `symlink failed — wrote a copy at ${appRelPath}/.env.local (keep it in sync with the root file manually).`,
+    );
+  }
+}
+
 function writePnpmWorkspace(targetDir) {
-  writeFileSync(
-    resolve(targetDir, "pnpm-workspace.yaml"),
-    "packages:\n  - 'apps/*'\n  - 'apps/cms-plugins/*'\n",
-  );
+  // pnpm 10 reads `onlyBuiltDependencies` from pnpm-workspace.yaml (the
+  // package.json#pnpm location is deprecated for workspaces). apollo-cms
+  // transitively pulls multiple esbuild versions (0.18, 0.25, 0.27); pnpm's
+  // binary symlink can pick the wrong platform binary for esbuild's
+  // postinstall version check, failing with "Expected X.Y.Z but got A.B.C".
+  // Allow listed packages to run their build/postinstall scripts; the rest
+  // are skipped (pnpm 10 default is empty allow-list).
+  const yaml = [
+    "packages:",
+    "  - 'apps/*'",
+    "  - 'apps/cms-plugins/*'",
+    "",
+    "onlyBuiltDependencies:",
+    "  - '@parcel/watcher'",
+    "  - '@rolldown/binding-darwin-arm64'",
+    "  - '@rolldown/binding-linux-arm64-gnu'",
+    "  - '@rolldown/binding-linux-x64-gnu'",
+    "  - '@sentry/cli'",
+    "  - '@swc/core'",
+    "  - '@swc/core-darwin-arm64'",
+    "  - '@swc/core-darwin-x64'",
+    "  - '@swc/core-linux-arm64-gnu'",
+    "  - '@swc/core-linux-x64-gnu'",
+    "  - 'better-sqlite3'",
+    "  - 'core-js'",
+    "  - 'core-js-pure'",
+    "  - 'esbuild'",
+    "  - 'msw'",
+    "  - 'sharp'",
+    "  - 'unrs-resolver'",
+    "",
+  ].join("\n");
+  writeFileSync(resolve(targetDir, "pnpm-workspace.yaml"), yaml);
 }
 
 // Single-origin nginx reference. Only emitted when adminPrefix is set, since
@@ -812,7 +846,7 @@ function parseTarget(input) {
     scripts: {
       start: "node server.mjs",
     },
-    engines: { node: ">=20" },
+    engines: { node: ">=22" },
   };
   writeFileSync(resolve(dir, "package.json"), JSON.stringify(pkg, null, 2) + "\n");
 
@@ -899,7 +933,7 @@ function writeRootGitignore(targetDir) {
   writeFileSync(resolve(targetDir, ".gitignore"), ignore);
 }
 
-function writeRootEnv(targetDir, { dbUrl, siteUrl, locale, authSecret, cronSecret, adminPrefix, backendInternalUrl }) {
+function writeRootEnv(targetDir, { dbUrl, siteUrl, locale, authSecret, cronSecret, adminPrefix, backendInternalUrl, pm2Namespace }) {
   const header = adminPrefix
     ? [
         "# Single-origin monorepo dev env",
@@ -949,6 +983,10 @@ function writeRootEnv(targetDir, { dbUrl, siteUrl, locale, authSecret, cronSecre
       `APOLLO_ASSET_PREFIX=${adminPrefix}`,
       "# Project-specific plugins — keeps the apollo-cms submodule clean.",
       `APOLLO_EXTRA_PLUGINS_DIR=../cms-plugins`,
+      "# PM2 namespace — groups this project's processes so you can",
+      "# `pm2 stop <namespace>` / `pm2 restart <namespace>` independently of",
+      "# other projects on the same host. Consumed by ecosystem.config.cjs.",
+      `PM2_NAMESPACE=${pm2Namespace}`,
       "",
       "# ── Frontend (apps/frontend) ─────────────────────────────────────",
       "# Where the frontend's rewrites point internally. In dev, leave blank",
@@ -962,6 +1000,10 @@ function writeRootEnv(targetDir, { dbUrl, siteUrl, locale, authSecret, cronSecre
       "# ── Backend (apps/backend) ───────────────────────────────────────",
       "# Project-specific plugins — keeps the apollo-cms submodule clean.",
       `APOLLO_EXTRA_PLUGINS_DIR=../cms-plugins`,
+      "# PM2 namespace — groups this project's processes so you can",
+      "# `pm2 stop <namespace>` / `pm2 restart <namespace>` independently of",
+      "# other projects on the same host. Consumed by ecosystem.config.cjs.",
+      `PM2_NAMESPACE=${pm2Namespace}`,
       "",
       "# ── Frontend (apps/frontend) ─────────────────────────────────────",
       `NEXT_PUBLIC_BACKEND_URL=${siteUrl}`,
@@ -1488,55 +1530,111 @@ console.log("✓ env check passed");
 // since Next.js handles that internally and the proxy is single-threaded by design).
 function writePm2Config(targetDir, dirName, adminPrefix) {
   const singleOrigin = !!adminPrefix;
+  // The proxy `env` block conditionally includes ADMIN_PREFIX in single-origin
+  // mode. Built outside the template so we don't emit a stray comma or blank line.
+  const proxyEnv = [
+    "NODE_ENV: 'production',",
+    "PROXY_PORT,",
+    "FRONTEND_PORT,",
+    "BACKEND_PORT,",
+    ...(singleOrigin ? [`ADMIN_PREFIX: '${adminPrefix}',`] : []),
+  ].map((l) => "        " + l).join("\n");
+
   const config = `// PM2 ecosystem config for ${dirName}.
+//
+// Loads .env.local at the top so PM2 picks up PROXY_PORT / FRONTEND_PORT /
+// BACKEND_PORT / PM2_NAMESPACE without a shell wrapper. The .env.local file
+// is the single source of truth — edit ports there, not here.
+//
 // Usage:
 //   pnpm install
 //   pnpm backend:upgrade
 //   pnpm build
-//   pm2 start ecosystem.config.cjs                    # FE + BE
-//   pm2 start ecosystem.config.cjs --only proxy       # add reverse proxy
+//   pm2 start ecosystem.config.cjs                    # FE + BE + proxy + cron
+//   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
 
+const fs = require('fs');
+const path = require('path');
+
+// Inline .env.local parser. Kept tiny (no dotenv dep) so the ecosystem file
+// stays runnable before \`pnpm install\` finishes.
+const envPath = path.resolve(__dirname, '.env.local');
+if (fs.existsSync(envPath)) {
+  for (const line of fs.readFileSync(envPath, 'utf8').split('\\n')) {
+    const m = line.match(/^\\s*([A-Z0-9_]+)\\s*=\\s*(.*?)\\s*$/i);
+    if (!m) continue;
+    const k = m[1];
+    let v = m[2];
+    if ((v.startsWith('"') && v.endsWith('"')) || (v.startsWith("'") && v.endsWith("'"))) v = v.slice(1, -1);
+    if (process.env[k] === undefined) process.env[k] = v;
+  }
+}
+
+const NAMESPACE     = process.env.PM2_NAMESPACE || '${dirName}';
+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).
+const BACKEND_INTERNAL_URL = process.env.BACKEND_INTERNAL_URL || \`http://127.0.0.1:\${BACKEND_PORT}\`;
+
 module.exports = {
   apps: [
     {
-      name: "frontend",
-      cwd: "./apps/frontend",
-      script: "node_modules/next/dist/bin/next",
-      args: "start",
-      env: { NODE_ENV: "production", PORT: Number(process.env.FRONTEND_PORT) || 3001 },
-      max_memory_restart: "1G",
+      name: \`frontend:\${FRONTEND_PORT}\`,
+      namespace: NAMESPACE,
+      cwd: './apps/frontend',
+      script: 'node_modules/next/dist/bin/next',
+      args: 'start',
+      env: {
+        NODE_ENV: 'production',
+        PORT: FRONTEND_PORT,
+        // Next.js rewrites read this at request time. Without it the FE
+        // falls back to http://localhost:3000 and every /admin, /api, and
+        // /uploads request returns ECONNREFUSED.
+        BACKEND_INTERNAL_URL,
+      },
+      max_memory_restart: '1G',
       autorestart: true,
     },
     {
-      name: "backend",
-      cwd: "./apps/backend",
-      script: "node_modules/next/dist/bin/next",
-      args: "start",
-      env: { NODE_ENV: "production", PORT: Number(process.env.BACKEND_PORT) || 3002 },
-      max_memory_restart: "1G",
+      name: \`backend:\${BACKEND_PORT}\`,
+      namespace: NAMESPACE,
+      cwd: './apps/backend',
+      script: 'node_modules/next/dist/bin/next',
+      args: 'start',
+      env: { NODE_ENV: 'production', PORT: BACKEND_PORT },
+      max_memory_restart: '1G',
       autorestart: true,
     },
     {
-      name: "proxy",
-      script: "./apps/proxy/server.mjs",
+      name: \`proxy:\${PROXY_PORT}\`,
+      namespace: NAMESPACE,
+      script: './apps/proxy/server.mjs',
       env: {
-        NODE_ENV: "production",
-        PROXY_PORT: Number(process.env.PROXY_PORT) || 3030,
-        FRONTEND_PORT: Number(process.env.FRONTEND_PORT) || 3001,
-        BACKEND_PORT: Number(process.env.BACKEND_PORT) || 3002,
-        ${singleOrigin ? `ADMIN_PREFIX: "${adminPrefix}",` : ""}
+${proxyEnv}
       },
-      max_memory_restart: "256M",
+      max_memory_restart: '256M',
       autorestart: true,
     },
     {
-      name: "cron",
-      cwd: "./apps/backend",
-      script: "scripts/dev-cron.ts",
-      interpreter: "bun",
-      env: { NODE_ENV: "production" },
+      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,
     },
   ],
@@ -1815,12 +1913,18 @@ 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 --only frontend,backend   # just the two apps
+pm2 start ecosystem.config.cjs --only proxy     # only the reverse proxy
 pm2 save && pm2 startup                         # persist across reboots
-pm2 logs                                        # tail all processes
-pm2 reload all                                  # zero-downtime restart
+pm2 logs \${PM2_NAMESPACE:-${dirName}}             # tail just this project's logs
+pm2 reload \${PM2_NAMESPACE:-${dirName}}            # zero-downtime restart (namespace-scoped)
+pm2 stop   \${PM2_NAMESPACE:-${dirName}}            # stop only this project
 \`\`\`
 
+All four 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).
 
@@ -1944,7 +2048,7 @@ async function main() {
   writeRootPackageJson(targetDir, dirName);
   writePnpmWorkspace(targetDir);
   writeRootGitignore(targetDir);
-  writeRootEnv(targetDir, { dbUrl, siteUrl, locale, authSecret, cronSecret, adminPrefix, backendInternalUrl });
+  writeRootEnv(targetDir, { dbUrl, siteUrl, locale, authSecret, cronSecret, adminPrefix, backendInternalUrl, pm2Namespace: dirName });
   writeReadme(targetDir, dirName, frontendName, adminPrefix);
   writeClaudeMd(targetDir, adminPrefix);
   if (adminPrefix) writeNginxSample(targetDir, adminPrefix);
@@ -1995,23 +2099,27 @@ async function main() {
       );
     }
 
-    // Mirror env to backend
-    const backendEnvLines = [
+    const backendFallback = [
       `DATABASE_URL=${dbUrl}`,
       `APOLLO_SECRET=${authSecret}`,
       `CRON_SECRET=${cronSecret}`,
       `NEXT_PUBLIC_SITE_URL=${siteUrl}`,
       `NEXT_PUBLIC_DEFAULT_LOCALE=${locale}`,
       `APOLLO_EXTRA_PLUGINS_DIR=../cms-plugins`,
+      `PM2_NAMESPACE=${dirName}`,
     ];
-    if (adminPrefix) {
-      backendEnvLines.push(`APOLLO_ASSET_PREFIX=${adminPrefix}`);
-    }
-    backendEnvLines.push("");
-    writeFileSync(resolve(targetDir, BACKEND_PATH, ".env.local"), backendEnvLines.join("\n"));
-    success("apps/backend/.env.local");
+    if (adminPrefix) backendFallback.push(`APOLLO_ASSET_PREFIX=${adminPrefix}`);
+    linkRootEnvLocal(targetDir, BACKEND_PATH, backendFallback);
   }
 
+  // Frontend gets the same treatment — Next.js running in apps/frontend
+  // can't see the root file otherwise, and next.config.ts references
+  // BACKEND_INTERNAL_URL for the rewrites destination.
+  const frontendFallback = adminPrefix
+    ? [`BACKEND_INTERNAL_URL=${backendInternalUrl}`]
+    : [`NEXT_PUBLIC_BACKEND_URL=${siteUrl}`];
+  linkRootEnvLocal(targetDir, FRONTEND_PATH, frontendFallback);
+
   // ── Step 7: Install ──
   if (flags.skipInstall) {
     step(7, "Skipping dependency installation (--skip-install)");

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "create-apollo-monorepo",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "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"
   },
   "type": "module",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "keywords": [
     "apollo",