create-apollo-monorepo 0.9.3 → 0.9.5

package/index.mjs

@@ -62,7 +62,9 @@ ${COLORS.bold}Flags:${COLORS.reset}
       --backend-url <url>      Backend git URL (default: ${BACKEND_REPO_URL})
       --backend-branch <name>  Backend branch to track (default: ${BACKEND_BRANCH})
   -d, --db <url>               DATABASE_URL for backend
-  -u, --url <url>              NEXT_PUBLIC_SITE_URL (default: http://localhost:3001 single-origin / 3000 separate)
+  -u, --url <url>              NEXT_PUBLIC_SITE_URL (optional — left blank so the CMS
+                               respects the incoming request origin. Set this only when
+                               you need a fixed origin for background jobs / cron / emails.)
   -l, --locale <code>          NEXT_PUBLIC_DEFAULT_LOCALE (default: en)
       --admin-prefix <path>    Backend prefix in single-origin mode — sets Next.js
                                assetPrefix on the backend AND the path the frontend
@@ -124,6 +126,26 @@ function commandExists(cmd) {
 
 // ─── Arg Parsing ─────────────────────────────────────────────────────────────
 
+// Flag dispatch table. Each entry: aliases → either { key } (takes a value)
+// or { key, value } (boolean flag). `--asset-prefix` is a legacy alias.
+const FLAG_TABLE = {
+  "-h": { key: "help", value: true },
+  "--help": { key: "help", value: true },
+  "--skip-install": { key: "skipInstall", value: true },
+  "--skip-submodule": { key: "skipSubmodule", value: true },
+  "--frontend-name": { key: "frontendName" },
+  "--backend-url": { key: "backendUrl" },
+  "--backend-branch": { key: "backendBranch" },
+  "-d": { key: "db" },
+  "--db": { key: "db" },
+  "-u": { key: "url" },
+  "--url": { key: "url" },
+  "-l": { key: "locale" },
+  "--locale": { key: "locale" },
+  "--admin-prefix": { key: "adminPrefix" },
+  "--asset-prefix": { key: "adminPrefix" },
+};
+
 function parseArgs(argv) {
   const args = argv.slice(2);
   const flags = {
@@ -140,55 +162,16 @@ function parseArgs(argv) {
     help: false,
   };
 
-  let i = 0;
-  while (i < args.length) {
+  for (let i = 0; i < args.length; i++) {
     const arg = args[i];
-    switch (arg) {
-      case "-h":
-      case "--help":
-        flags.help = true;
-        break;
-      case "--frontend-name":
-        flags.frontendName = args[++i];
-        break;
-      case "--backend-url":
-        flags.backendUrl = args[++i];
-        break;
-      case "--backend-branch":
-        flags.backendBranch = args[++i];
-        break;
-      case "-d":
-      case "--db":
-        flags.db = args[++i];
-        break;
-      case "-u":
-      case "--url":
-        flags.url = args[++i];
-        break;
-      case "-l":
-      case "--locale":
-        flags.locale = args[++i];
-        break;
-      case "--admin-prefix":
-      case "--asset-prefix": // legacy alias
-        flags.adminPrefix = args[++i];
-        break;
-      case "--skip-install":
-        flags.skipInstall = true;
-        break;
-      case "--skip-submodule":
-        flags.skipSubmodule = true;
-        break;
-      default:
-        if (arg.startsWith("-")) {
-          fatal(`Unknown flag: ${arg}\nRun with --help for usage.`);
-        }
-        if (flags.directory) {
-          fatal(`Unexpected argument: ${arg}\nOnly one directory name is allowed.`);
-        }
-        flags.directory = arg;
+    const spec = FLAG_TABLE[arg];
+    if (spec) {
+      flags[spec.key] = "value" in spec ? spec.value : args[++i];
+      continue;
     }
-    i++;
+    if (arg.startsWith("-")) fatal(`Unknown flag: ${arg}\nRun with --help for usage.`);
+    if (flags.directory) fatal(`Unexpected argument: ${arg}\nOnly one directory name is allowed.`);
+    flags.directory = arg;
   }
 
   return flags;
@@ -243,29 +226,22 @@ function preflight(flags) {
   }
   success(`Node.js ${process.versions.node}`);
 
-  if (!commandExists("git")) {
-    fatal("git is required but not found.\n  Install: https://git-scm.com/");
-  }
-  success("git found");
-
-  if (!commandExists("pnpm")) {
-    warn("pnpm not found — install with: npm i -g pnpm  (required for workspaces)");
-  } else {
-    success("pnpm found");
-  }
-
   // 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
   // shell out to `bun`. The scaffold itself works without bun, but `pnpm dev`,
   // `pnpm backend:setup`, and `pnpm backend:upgrade` will fail without it.
-  if (!commandExists("bun")) {
-    warn(
-      "bun not found — required by apps/backend for db:push, db:seed, dev:cron,\n" +
+  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" +
         "       plugins:build, and the upgrade pipeline.\n" +
-        "       Install: curl -fsSL https://bun.sh/install | bash  (or: brew install bun)",
-    );
-  } else {
-    success("bun found");
+        "       Install: curl -fsSL https://bun.sh/install | bash  (or: brew install bun)" },
+  ];
+  for (const t of TOOLS) {
+    if (commandExists(t.cmd)) success(`${t.cmd} found`);
+    else if (t.required) fatal(t.missing);
+    else warn(t.missing);
   }
 
   const targetDir = resolve(flags.directory);
@@ -288,24 +264,21 @@ function createPrompt() {
 
 async function gatherEnv(flags, { singleOrigin }) {
   let dbUrl = flags.db;
-  // In single-origin mode the frontend is the public entry → default :3001.
-  // In separate-origins mode the backend is the public CMS URL → default :3000.
-  // Public origin = frontend in single-origin mode (frontend rewrites /admin/*,
-  // /api/*, /uploads/* to the backend), backend in separate-origins mode.
-  // For `pnpm dev:rp` switch this to http://localhost:${PROXY_PORT} in .env.local.
-  // Derived from the PORT constants so changing a default updates both the
-  // .env.local seed and the prompt's suggested value.
-  const defaultSiteUrl = singleOrigin
-    ? `http://localhost:${DEFAULT_FRONTEND_PORT}`
-    : `http://localhost:${DEFAULT_BACKEND_PORT}`;
-  let siteUrl = flags.url ?? defaultSiteUrl;
+  // NEXT_PUBLIC_SITE_URL is intentionally NOT prompted. Apollo CMS resolves
+  // the public origin in this priority order: NEXT_PUBLIC_SITE_URL >
+  // incoming request origin. Leaving it blank lets the runtime respect the
+  // actual request origin (works for localhost, preview URLs, prod domains,
+  // and reverse proxies without any reconfiguration). Override with --url
+  // only when you need a fixed origin for background jobs (cron / triggered
+  // emails) that run outside a request scope.
+  let siteUrl = flags.url ?? "";
   let locale = flags.locale ?? "en";
 
   if (flags.db && !isValidDbUrl(flags.db)) fatal("--db must start with postgresql:// or postgres://");
   if (flags.url && !isValidUrl(flags.url)) fatal("--url must start with http:// or https://");
   if (flags.locale && !isValidLocale(flags.locale)) fatal("--locale must be a 2-5 character code (e.g., en, th)");
 
-  const needsPrompt = !dbUrl || !flags.url || !flags.locale;
+  const needsPrompt = !dbUrl || !flags.locale;
   if (!needsPrompt) return { dbUrl, siteUrl, locale };
 
   const { ask, close } = createPrompt();
@@ -321,16 +294,6 @@ async function gatherEnv(flags, { singleOrigin }) {
     }
   }
 
-  if (!flags.url) {
-    const ans = await ask(
-      `\n    ${COLORS.bold}NEXT_PUBLIC_SITE_URL${COLORS.reset} ${COLORS.dim}[${siteUrl}]${COLORS.reset}\n    > `,
-    );
-    if (ans) {
-      if (isValidUrl(ans)) siteUrl = ans;
-      else warn(`Invalid URL, using default: ${siteUrl}`);
-    }
-  }
-
   if (!flags.locale) {
     const ans = await ask(
       `\n    ${COLORS.bold}Default locale${COLORS.reset} ${COLORS.dim}[${locale}]${COLORS.reset}\n    > `,
@@ -966,50 +929,49 @@ function writeRootEnv(targetDir, { dbUrl, siteUrl, locale, authSecret, cronSecre
     `DATABASE_URL=${dbUrl}`,
     `APOLLO_SECRET=${authSecret}`,
     `CRON_SECRET=${cronSecret}`,
-    "# Public origin. In dev, leave blank to auto-derive from FRONTEND_PORT",
-    "# (single-origin) or BACKEND_PORT (separate-origins) via scripts/with-env.mjs.",
-    "# In prod set to the real domain (e.g. https://cms.example.com).",
+    "# Public origin. Leave blank so the CMS respects the incoming request",
+    "# origin (works for localhost, preview URLs, and prod domains automatically).",
+    "# Set this ONLY when background jobs (cron / triggered emails) need a fixed",
+    "# origin outside a request scope — e.g. NEXT_PUBLIC_SITE_URL=https://cms.example.com",
     `NEXT_PUBLIC_SITE_URL=${siteUrl}`,
     `NEXT_PUBLIC_DEFAULT_LOCALE=${locale}`,
     "",
   ];
 
+  lines.push("# ── Backend (apps/backend) ───────────────────────────────────────");
   if (adminPrefix) {
     lines.push(
-      "# ── Backend (apps/backend) ───────────────────────────────────────",
       "# Single-origin admin/asset prefix. The frontend rewrites this path",
       "# to the backend, so backend chunks (served at <prefix>/_next/static)",
       "# and admin pages share one rewrite.",
       `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) ─────────────────────────────────────",
+    );
+  }
+  lines.push(
+    "# 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) ─────────────────────────────────────",
+  );
+  if (adminPrefix) {
+    lines.push(
       "# Where the frontend's rewrites point internally. In dev, leave blank",
       "# to auto-derive http://127.0.0.1:${BACKEND_PORT} via scripts/with-env.mjs.",
       "# In prod set to a private hostname (e.g. http://backend.internal:3000).",
       `BACKEND_INTERNAL_URL=${backendInternalUrl}`,
-      "",
     );
   } else {
     lines.push(
-      "# ── 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}`,
-      "",
+      "# Where the frontend reaches the backend in separate-origins mode.",
+      "# Defaults to the backend's dev port; override in prod to the real CMS host.",
+      `NEXT_PUBLIC_BACKEND_URL=${siteUrl || `http://localhost:${DEFAULT_BACKEND_PORT}`}`,
     );
   }
+  lines.push("");
 
   writeFileSync(resolve(targetDir, ".env.local"), lines.join("\n"));
 }
@@ -1143,7 +1105,7 @@ export default config;
       ]
     : [
         `# Public URL of the backend (used by your client code)`,
-        `NEXT_PUBLIC_BACKEND_URL=${siteUrl}`,
+        `NEXT_PUBLIC_BACKEND_URL=${siteUrl || `http://localhost:${DEFAULT_BACKEND_PORT}`}`,
         "",
       ];
   writeFileSync(resolve(dir, ".env.local.example"), envLocalLines.join("\n"));
@@ -2117,7 +2079,7 @@ async function main() {
   // BACKEND_INTERNAL_URL for the rewrites destination.
   const frontendFallback = adminPrefix
     ? [`BACKEND_INTERNAL_URL=${backendInternalUrl}`]
-    : [`NEXT_PUBLIC_BACKEND_URL=${siteUrl}`];
+    : [`NEXT_PUBLIC_BACKEND_URL=${siteUrl || `http://localhost:${DEFAULT_BACKEND_PORT}`}`];
   linkRootEnvLocal(targetDir, FRONTEND_PATH, frontendFallback);
 
   // ── Step 7: Install ──

package/package.json

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