@django-stack/cli 0.10.0 → 0.11.0

package/dist/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as envPorts, A as compose, B as NAMED_PRESETS, C as PACKAGE_NAME, D as RUN_DOMAIN, E as CAPTCHA_APP, F as projectUrls, H as PROMPT_ORDER, I as readLocalRun, J as resolvePreset, K as encodePreset, L as readProject, M as findProjectDirectory, N as parseProfiles, O as RUN_ENV, P as projectStack, Q as describeMove, R as runningServices, S as CLI_VERSION, T as generateSecret, U as STACK_OPTIONS, V as NODE_FRONTENDS, W as applies, X as DEV_PORTS, Y as stackOption, Z as chooseFreePorts, _ as umamiEnv, a as LOCAL_S3, at as isDockerDown, b as validateProjectName, c as localS3, ct as setEnvValues, et as portValues, f as relativeDirectory, g as toProjectName, h as timeZones, it as dockerRunning, j as composeOutput, k as activeProject, l as lockBackend, m as setNotificationsApp, n as productionEnv$1, nt as checkTools, o as cacheEnv, ot as parseEnv, p as scaffold, q as pendingChoices, r as validateDomain, rt as dockerNotRunning, s as frontendPackageManager, st as quoteEnvValue, t as missingS3, tt as runDoctor, u as lockFrontend, v as updateFrontendLock, w as generateProjectSecrets, x as validateTimeZone, y as usesValkey, z as DEFAULT_STACK } from "./production-Ct_qoeXk.js";
+import { $ as envPorts, A as compose, B as NAMED_PRESETS, C as PACKAGE_NAME, D as RUN_DOMAIN, E as CAPTCHA_APP, F as projectUrls, H as PROMPT_ORDER, I as readLocalRun, J as resolvePreset, K as encodePreset, L as readProject, M as findProjectDirectory, N as parseProfiles, O as RUN_ENV, P as projectStack, Q as describeMove, R as runningServices, S as CLI_VERSION, T as generateSecret, U as STACK_OPTIONS, V as NODE_FRONTENDS, W as applies, X as DEV_PORTS, Y as stackOption, Z as chooseFreePorts, _ as umamiEnv, a as LOCAL_S3, at as isDockerDown, b as validateProjectName, c as localS3, ct as setEnvValues, et as portValues, f as relativeDirectory, g as toProjectName, h as timeZones, it as dockerRunning, j as composeOutput, k as activeProject, l as lockBackend, m as setNotificationsApp, n as productionEnv$1, nt as checkTools, o as cacheEnv, ot as parseEnv, p as scaffold, q as pendingChoices, r as validateDomain, rt as dockerNotRunning, s as frontendPackageManager, st as quoteEnvValue, t as missingS3, tt as runDoctor, u as lockFrontend, v as updateFrontendLock, w as generateProjectSecrets, x as validateTimeZone, y as usesValkey, z as DEFAULT_STACK } from "./production-WThC1aS2.js";
 import { createRequire } from "node:module";
 import { chmodSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { basename, delimiter, dirname, join, posix, relative, resolve, sep } from "node:path";
@@ -3930,7 +3930,8 @@ function choices(key, stack = {}) {
 /**
 * The stack from, in order of precedence, the flags, the preset, the prompts
 * and the defaults. `askDatabase` asks for the Postgres version together with
-* the external database choice; it returns the version, or a URL.
+* the external database choice; it returns the version, and the URL for
+* production when there is one.
 */
 async function chooseStack(options, interactive, askDatabase) {
 	let preset;
@@ -3949,10 +3950,9 @@ async function chooseStack(options, interactive, askDatabase) {
 		else if (!interactive || !applies(key, stack)) continue;
 		else if (key === "postgres" && askDatabase && !options.databaseUrl) {
 			const answer = await askDatabase(stack[key]);
-			if ("databaseUrl" in answer) databaseUrl = answer.databaseUrl;
-			else stack[key] = answer.postgres;
-		} else if (key === "postgres" && options.databaseUrl) continue;
-		else {
+			if (answer.databaseUrl) databaseUrl = answer.databaseUrl;
+			stack[key] = answer.postgres;
+		} else {
 			const initialValue = key === "storage" && stack.media === "s3" ? "s3" : stack[key];
 			stack[key] = unwrap(await p.select({
 				message: option.message,
@@ -4018,19 +4018,31 @@ async function init(directoryArgument, options) {
 				label: `Bundled Postgres, ${value.label.toLowerCase()}`
 			})), {
 				value: "external",
-				label: "External Postgres",
-				hint: "a URL to your own server"
+				label: "External Postgres in production",
+				hint: "a URL to your server; development runs the bundled one"
 			}]
 		}));
 		if (choice !== "external") return { postgres: choice };
-		return { databaseUrl: unwrap(await p.text({
-			message: "Postgres URL",
+		const databaseUrl = unwrap(await p.text({
+			message: "Postgres URL for production",
 			placeholder: "postgres://user:password@host:5432/name",
 			validate: (value) => value?.startsWith("postgres") ? void 0 : "Enter a postgres:// URL."
-		})) };
+		}));
+		return {
+			postgres: unwrap(await p.select({
+				message: "Its Postgres version",
+				initialValue: initial,
+				options: choices("postgres")
+			})),
+			databaseUrl
+		};
 	});
 	const stack = chosen.stack;
 	const databaseUrl = options.databaseUrl ?? chosen.databaseUrl;
+	if (!applies("analytics", stack) && stack.analytics !== "off") {
+		if (options.fromCli("analytics")) fail("--analytics umami needs a frontend: a headless project has no pages to count.");
+		stack.analytics = "off";
+	}
 	const pending = pendingChoices(stack);
 	const unavailable = pending.filter((item) => !item.isDefault);
 	if (unavailable.length) fail(`${unavailable.map((item) => item.choice).join(", ")} ${unavailable.length > 1 ? "are" : "is"} not available yet. Leave ${unavailable.length > 1 ? "them" : "it"} at the default.`);
@@ -4066,6 +4078,7 @@ async function init(directoryArgument, options) {
 			frontend: stack.frontend,
 			demoContent,
 			databaseUrl,
+			postgres: stack.postgres,
 			localS3: stack.storage === "s3",
 			analytics: stack.analytics === "umami",
 			cache: stack.cache,
@@ -4127,7 +4140,7 @@ async function init(directoryArgument, options) {
 		command(`cd ${relativeDirectory(target)}`),
 		command(startCommand),
 		"",
-		`${pc.bold("Site")}    ${url(`http://localhost:${ports.ports.SITE_PORT}`)}`,
+		stack.frontend === "headless" ? `${pc.bold("API")}     ${url(`http://localhost:${ports.ports.SITE_PORT}/api/`)}` : `${pc.bold("Site")}    ${url(`http://localhost:${ports.ports.SITE_PORT}`)}`,
 		`${pc.bold("Admin")}   ${url(`http://localhost:${ports.ports.SITE_PORT}/admin/`)}`,
 		`${pc.bold("Mail")}    ${url(`http://localhost:${ports.ports.MAIL_PORT}`)}`,
 		"",
@@ -4541,6 +4554,7 @@ function applyStack(envText, env, from, to) {
 		if (from[key] === to[key]) continue;
 		const value = option.values.find((candidate) => candidate.value === to[key]);
 		if (!value) throw new Error(`${JSON.stringify(to[key])} is not a ${option.key}.`);
+		if (key === "postgres") throw new Error("--postgres can't change on an existing project: a new major version needs a backup and a restore. See the docs on backups.");
 		if (!SWITCHABLE.includes(key) || !value.generated) throw new Error(`${option.flag} ${to[key]} can't be set on an existing project in this version yet.`);
 		if (key === "storage") {
 			if (profiles.includes("prod")) throw new Error("--storage only changes development; this .env runs the prod profile.");
@@ -4639,7 +4653,8 @@ function ensureRunEnv(project) {
 	if (!existsSync(path)) {
 		const result = productionEnv$1(readFileSync(join(project.directory, ".env"), "utf8"), {
 			domain: RUN_DOMAIN,
-			emailUrl: "console://"
+			emailUrl: "console://",
+			bundledDatabase: true
 		});
 		writeFileSync(path, result.text, { mode: 384 });
 		p.log.success(`Wrote ${pc.bold(RUN_ENV)}: the prod profile at ${url(`https://${RUN_DOMAIN}`)}, with its own secrets and data.`);
@@ -4695,7 +4710,8 @@ async function dev(options) {
 	intro("Develop");
 	project = await freeDevPorts(project);
 	urlsNote(project, "Starting");
-	p.log.message(pc.dim("Changes in backend/ and frontend/ reload. Press Ctrl+C to stop."));
+	const reloads = project.services.frontend ? "backend/ and frontend/" : "backend/";
+	p.log.message(pc.dim(`Changes in ${reloads} reload. Press Ctrl+C to stop.`));
 	exitWith(compose(project, ["up", ...options.build ? ["--build"] : []]));
 }
 /** `dstack stop`: stop the containers of the project and of its local run; volumes and data stay. */
@@ -4844,6 +4860,10 @@ async function types(options) {
 		"--file",
 		"openapi.json"
 	], false)) !== 0) fail("The backend could not write its schema.");
+	if (!project.services.frontend) {
+		p.outro(`Wrote ${pc.bold("backend/openapi.json")}`);
+		return;
+	}
 	const generate = [
 		"npx",
 		"headless",
@@ -4931,7 +4951,7 @@ function checkSteps(project, tests) {
 		],
 		devOnly: true
 	});
-	return steps.filter((step) => !(step.devOnly && project.prod));
+	return steps.filter((step) => !(step.devOnly && project.prod) && (step.service !== "frontend" || project.services.frontend));
 }
 /** `dstack check`: the doctor's checks, Django's checks, the linters and, with --tests, the tests. */
 async function check(options) {
@@ -5029,8 +5049,8 @@ async function update(options) {
 		];
 		if (compose(target, build) !== 0) fail("Building the images failed.");
 	}
-	const volume = project.prod ? void 0 : nodeModulesVolume(project);
-	if (volume) {
+	const volume = project.prod || !project.services.frontend ? void 0 : nodeModulesVolume(project);
+	if (volume && project.services.frontend) {
 		compose(project, [
 			"rm",
 			"--stop",
@@ -5313,7 +5333,7 @@ function createProgram() {
 		styleArgumentText: (text) => pc.yellow(text),
 		styleDescriptionText: (text) => text
 	}).configureOutput({ outputError: (text, write) => write(pc.red(text)) });
-	const initCommand = program.command("init").alias("create").description("Create a project").argument("[directory]", "Where to create the project").option("--name <name>", "The project name (default: from the directory)").option("--preset <preset>", `A preset code from a previous init, or ${Object.keys(NAMED_PRESETS).join(", ")}`).option("--database-url <url>", "Use an external Postgres instead of the bundled one").option("--time-zone <zone>", "The time zone of the backend, such as Europe/Amsterdam (default: UTC)").addOption(new Option("--local-s3", "Same as --storage s3").hideHelp()).option("--no-demo-content", "Start with an empty site").option("--no-git", "Don't create a git repository").option("--start", "Run `docker compose up` when done").option("-y, --yes", "Accept the defaults without asking").addOption(new Option("--link <repository>", "Take the packages from a DjangoStack checkout").hideHelp()).action((directory, options, cmd) => init(directory, {
+	const initCommand = program.command("init").alias("create").description("Create a project").argument("[directory]", "Where to create the project").option("--name <name>", "The project name (default: from the directory)").option("--preset <preset>", `A preset code from a previous init, or ${Object.keys(NAMED_PRESETS).join(", ")}`).option("--database-url <url>", "An external Postgres for production; development runs the bundled one").option("--time-zone <zone>", "The time zone of the backend, such as Europe/Amsterdam (default: UTC)").addOption(new Option("--local-s3", "Same as --storage s3").hideHelp()).option("--no-demo-content", "Start with an empty site").option("--no-git", "Don't create a git repository").option("--start", "Run `docker compose up` when done").option("-y, --yes", "Accept the defaults without asking").addOption(new Option("--link <repository>", "Take the packages from a DjangoStack checkout").hideHelp()).action((directory, options, cmd) => init(directory, {
 		...options,
 		installPrompt: program.opts().installPrompt,
 		fromCli: (option) => cmd.getOptionValueSource(option) === "cli"

package/dist/index.d.ts

@@ -20,6 +20,8 @@ interface ProductionOptions {
   emailUrl?: string;
   /** Where uploads go: `s3` asks for the S3 settings (the `media` stack option). */
   media?: string;
+  /** Keep the bundled database even with PRODUCTION_DATABASE_URL: the local run on this machine. */
+  bundledDatabase?: boolean;
 }
 interface ProductionEnv {
   text: string;
@@ -54,12 +56,12 @@ export declare const STACK_OPTIONS: readonly [{
     readonly value: "headless";
     readonly label: "Headless";
     readonly hint: "just the API and the admin";
-    readonly generated: false;
+    readonly generated: true;
   }, {
     readonly value: "templates";
     readonly label: "Django templates";
     readonly hint: "no Node, Django renders the site";
-    readonly generated: false;
+    readonly generated: true;
   }, {
     readonly value: "nuxt";
     readonly label: "Nuxt";
@@ -86,7 +88,7 @@ export declare const STACK_OPTIONS: readonly [{
     readonly value: "latest";
     readonly label: "Latest";
     readonly hint: "Postgres 18";
-    readonly generated: false;
+    readonly generated: true;
   }];
 }, {
   readonly key: "analytics";
@@ -290,8 +292,13 @@ interface ScaffoldOptions {
   frontend: Frontend;
   /** Demo pages and posts on the first start. */
   demoContent: boolean;
-  /** An external Postgres URL; the bundled Postgres when not set. */
+  /**
+   * An external Postgres URL for production, saved as PRODUCTION_DATABASE_URL;
+   * development runs the bundled Postgres either way.
+   */
   databaseUrl?: string;
+  /** The bundled Postgres's version, and the backend's Postgres client; stable by default. */
+  postgres?: Stack["postgres"];
   /** Store uploads in the local S3 service in development, like S3 in production. */
   localS3?: boolean;
   /** Page analytics with the bundled Umami (the `analytics` profile). */

package/dist/index.js

@@ -1 +1 @@
-export { z as DEFAULT_STACK, i as FRONTENDS, B as NAMED_PRESETS, U as STACK_OPTIONS, S as VERSION, o as cacheEnv, G as decodePreset, K as encodePreset, w as generateProjectSecrets, T as generateSecret, d as normalizeDatabaseUrl, ot as parseEnv, q as pendingChoices, n as productionEnv, J as resolvePreset, tt as runDoctor, p as scaffold, ct as setEnvValues, m as setNotificationsApp, g as toProjectName, y as usesValkey, r as validateDomain, b as validateProjectName } from "./production-Ct_qoeXk.js";
+export { z as DEFAULT_STACK, i as FRONTENDS, B as NAMED_PRESETS, U as STACK_OPTIONS, S as VERSION, o as cacheEnv, G as decodePreset, K as encodePreset, w as generateProjectSecrets, T as generateSecret, d as normalizeDatabaseUrl, ot as parseEnv, q as pendingChoices, n as productionEnv, J as resolvePreset, tt as runDoctor, p as scaffold, ct as setEnvValues, m as setNotificationsApp, g as toProjectName, y as usesValkey, r as validateDomain, b as validateProjectName } from "./production-WThC1aS2.js";

package/dist/{production-Ct_qoeXk.js → production-WThC1aS2.js}

@@ -258,9 +258,10 @@ async function runDoctor(directory) {
 	const services = running ? running.split("\n").filter(Boolean) : [];
 	const backendService = prod ? "backend-prod" : "backend";
 	const frontendService = prod ? "frontend-prod" : "frontend";
+	const frontend = existsSync(join(directory, "frontend", "package.json"));
 	checks.push({
 		name: "Services are running",
-		ok: services.includes(backendService) && services.includes(frontendService),
+		ok: services.includes(backendService) && (!frontend || services.includes(frontendService)),
 		warning: services.length === 0,
 		detail: services.length ? services.join(", ") : `Nothing is running. Start the project with \`docker compose up${prod ? " -d" : ""}\`.`
 	});
@@ -278,11 +279,12 @@ async function runDoctor(directory) {
 		detail: health ? `The ${backendService} container is ${health}` : `See \`docker compose logs ${backendService}\`.`
 	});
 	const site = (env.SITE_URL ?? "http://localhost:3000").replace(/\/$/, "");
-	const frontend = await fetchStatus(site);
+	const status = await fetchStatus(site);
+	const logs = prod ? "proxy" : frontend ? frontendService : backendService;
 	checks.push({
 		name: "The site answers",
-		ok: frontend !== void 0 && frontend < 500,
-		detail: frontend ? `${site} answered ${frontend}` : `No answer on ${site}. See \`docker compose logs ${prod ? "proxy" : frontendService}\`.`
+		ok: status !== void 0 && status < 500,
+		detail: status ? `${site} answered ${status}` : `No answer on ${site}. See \`docker compose logs ${logs}\`.`
 	});
 	const api = await fetchStatus(`${site}/api/content.sitesettings`, { "X-Secret-Key": env.API_READ_KEY ?? "" });
 	checks.push({
@@ -461,13 +463,13 @@ const STACK_OPTIONS = [
 				value: "headless",
 				label: "Headless",
 				hint: "just the API and the admin",
-				generated: false
+				generated: true
 			},
 			{
 				value: "templates",
 				label: "Django templates",
 				hint: "no Node, Django renders the site",
-				generated: false
+				generated: true
 			},
 			{
 				value: "nuxt",
@@ -498,7 +500,7 @@ const STACK_OPTIONS = [
 			value: "latest",
 			label: "Latest",
 			hint: "Postgres 18",
-			generated: false
+			generated: true
 		}]
 	},
 	{
@@ -726,9 +728,13 @@ const NODE_FRONTENDS = [
 	"nuxt",
 	"sveltekit"
 ];
-/** Whether an option applies to a stack: the package manager only with a Node frontend. */
+/**
+* Whether an option applies to a stack: the package manager only with a Node
+* frontend, page analytics only with a frontend for its tracker.
+*/
 function applies(key, stack) {
 	if (key === "packageManager") return stack.frontend === void 0 || NODE_FRONTENDS.includes(stack.frontend);
+	if (key === "analytics") return stack.frontend !== "headless";
 	return true;
 }
 const DIGITS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -916,6 +922,10 @@ function projectName(directory) {
 	} catch {}
 	return basename(directory).toLowerCase();
 }
+/** Whether the project has a frontend: a headless one has no `frontend/`. */
+function hasFrontend(directory) {
+	return existsSync(join(directory, "frontend", "package.json"));
+}
 function fromEnv(directory, name, envFile, localRun) {
 	const env = parseEnv(readFileSync(join(directory, envFile), "utf8"));
 	const profiles = parseProfiles(env.COMPOSE_PROFILES);
@@ -930,7 +940,7 @@ function fromEnv(directory, name, envFile, localRun) {
 		localRun,
 		services: {
 			backend: `backend${suffix}`,
-			frontend: `frontend${suffix}`,
+			...hasFrontend(directory) ? { frontend: `frontend${suffix}` } : {},
 			worker: `worker${suffix}`
 		},
 		composeArgs: localRun ? [
@@ -1161,6 +1171,23 @@ const PACKAGE_NAME = "@django-stack/cli";
 // src/scaffold.ts
 /** The frontends this version of the CLI generates. */
 const FRONTENDS = stackOption("frontend").values.filter((value) => value.generated).map((value) => value.value);
+/** The Postgres major version of each `--postgres` value. */
+const POSTGRES_VERSIONS = {
+	stable: "17",
+	latest: "18"
+};
+/**
+* The template values of a Postgres version. From 18 the image keeps its data
+* in a versioned directory under /var/lib/postgresql, so the volume is
+* mounted there; before 18 at /var/lib/postgresql/data.
+*/
+function postgresValues(postgres) {
+	const version = POSTGRES_VERSIONS[postgres];
+	return {
+		postgres_version: version,
+		postgres_data: Number(version) >= 18 ? "/var/lib/postgresql" : "/var/lib/postgresql/data"
+	};
+}
 /** The pnpm and Bun versions the frontend image installs with. */
 const PNPM_VERSION = "12.18.0";
 const BUN_VERSION = "1.4.4";
@@ -1289,7 +1316,7 @@ function localS3(port = 8333) {
 	};
 }
 const LOCAL_S3 = localS3();
-const TEXT_EXTENSIONS = /\.(py|ts|tsx|mjs|js|jsx|json|astro|vue|svelte|css|md|yaml|yml|toml|txt|html|sh|svg)$|Dockerfile$|gitignore$|\.dockerignore$|env\.example$/;
+const TEXT_EXTENSIONS = /\.(py|ts|tsx|mjs|js|jsx|json|astro|vue|svelte|css|md|yaml|yml|toml|txt|html|sh|svg)$|Dockerfile$|Caddyfile$|gitignore$|\.dockerignore$|env\.example$/;
 function defaultTemplatesDir() {
 	return fileURLToPath(new URL("../templates", import.meta.url));
 }
@@ -1323,6 +1350,35 @@ function walk(directory) {
 		return statSync(path).isDirectory() ? walk(path) : [path];
 	});
 }
+const BLOCK_START = /^\s*(?:#|<!--)\s*@if\s+(!?)([a-z]+)\s*(?:-->)?\s*$/;
+const BLOCK_END = /^\s*(?:#|<!--)\s*@end\s*(?:-->)?\s*$/;
+/**
+* Keeps or drops the template's conditional blocks: the lines between a
+* comment line `# @if frontend` (or `<!-- @if !frontend -->`) and `# @end`
+* stay when the flag is on (off with `!`). The marker lines always go.
+*/
+function selectBlocks(text, flags) {
+	if (!/@(if|end)\b/.test(text)) return text;
+	const kept = [];
+	const open = [];
+	for (const line of text.split("\n")) {
+		const start = line.match(BLOCK_START);
+		if (start) {
+			const flag = flags[start[2]];
+			if (flag === void 0) throw new Error(`Unknown template flag ${start[2]}.`);
+			open.push(start[1] ? !flag : flag);
+			continue;
+		}
+		if (BLOCK_END.test(line)) {
+			if (!open.length) throw new Error("@end without @if.");
+			open.pop();
+			continue;
+		}
+		if (open.every(Boolean)) kept.push(line);
+	}
+	if (open.length) throw new Error("@if without @end.");
+	return kept.join("\n");
+}
 function render(text, values) {
 	return text.replace(/\{\{([a-z_]+)\}\}/g, (match, key) => values[key] ?? match);
 }
@@ -1334,6 +1390,16 @@ function validateTimeZone(value) {
 	if (timeZones().includes(value)) return void 0;
 	return `${JSON.stringify(value)} is not a time zone. Use a name such as Europe/Amsterdam or UTC.`;
 }
+/** The root package.json of a headless project: the scripts without the frontend's steps. */
+function headlessScripts(text) {
+	const manifest = JSON.parse(text);
+	const scripts = manifest.scripts;
+	scripts.test = "docker compose exec backend pytest";
+	scripts.lint = "docker compose exec backend ruff check .";
+	scripts["generate:types"] = (scripts["generate:types"] ?? "").split(" && ")[0] ?? "";
+	manifest.description = manifest.description.replace(", Content Studio and Headless,", " and Content Studio,");
+	return `${JSON.stringify(manifest, null, 2)}\n`;
+}
 function scaffold(options) {
 	const templates = options.templatesDir ?? defaultTemplatesDir();
 	const target = options.directory;
@@ -1344,17 +1410,28 @@ function scaffold(options) {
 		const zoneError = validateTimeZone(options.timeZone);
 		if (zoneError) throw new Error(zoneError);
 	}
+	const headless = options.frontend === "headless";
+	const djangoTemplates = options.frontend === "templates";
+	const jsFrontend = !headless && !djangoTemplates;
 	const frontendTemplate = join(templates, `frontend-${options.frontend}`);
-	if (!existsSync(frontendTemplate)) throw new Error(`This version of the CLI has no ${options.frontend} frontend.`);
+	if (!headless && !existsSync(frontendTemplate)) throw new Error(`This version of the CLI has no ${options.frontend} frontend.`);
 	mkdirSync(target, { recursive: true });
 	cpSync(join(templates, "base"), target, { recursive: true });
 	cpSync(join(templates, "backend"), join(target, "backend"), { recursive: true });
-	cpSync(frontendTemplate, join(target, "frontend"), { recursive: true });
+	const frontendDir = join(target, djangoTemplates ? "backend" : "frontend");
+	if (!headless) cpSync(frontendTemplate, frontendDir, { recursive: true });
 	renameSync(join(target, "gitignore"), join(target, ".gitignore"));
 	makeExecutable(target);
-	const about = join(target, "frontend", "template.json");
-	const frontend = JSON.parse(readFileSync(about, "utf8"));
-	rmSync(about);
+	let frontend = {
+		label: "Headless",
+		url: "",
+		security: ""
+	};
+	if (!headless) {
+		const about = join(frontendDir, "template.json");
+		frontend = JSON.parse(readFileSync(about, "utf8"));
+		rmSync(about);
+	}
 	const packageManager = options.packageManager ?? "pnpm";
 	const values = {
 		project_name: options.name,
@@ -1366,17 +1443,24 @@ function scaffold(options) {
 		preset: options.preset ?? encodePreset(DEFAULT_STACK),
 		site_port: String(options.ports?.SITE_PORT ?? 3e3),
 		mail_port: String(options.ports?.MAIL_PORT ?? 8025),
-		...packageManagerValues(packageManager)
+		...packageManagerValues(packageManager),
+		...postgresValues(options.postgres ?? DEFAULT_STACK.postgres)
 	};
 	const files = walk(target);
 	for (const file of files) {
 		if (!TEXT_EXTENSIONS.test(file)) continue;
 		const text = readFileSync(file, "utf8");
-		const rendered = render(text, values);
+		const rendered = render(selectBlocks(text, {
+			frontend: jsFrontend,
+			headless,
+			templates: djangoTemplates,
+			site: !headless
+		}), values);
 		if (rendered !== text) writeFileSync(file, rendered);
 	}
+	if (!jsFrontend) writeFileSync(join(target, "package.json"), headlessScripts(readFileSync(join(target, "package.json"), "utf8")));
 	if (packageManager !== "pnpm") rmSync(join(target, "frontend", "pnpm-workspace.yaml"), { force: true });
-	if (packageManager !== "npm") {
+	if (jsFrontend && packageManager !== "npm") {
 		const packageJson = join(target, "frontend", "package.json");
 		const manifest = JSON.parse(readFileSync(packageJson, "utf8"));
 		const version = packageManager === "pnpm" ? PNPM_VERSION : BUN_VERSION;
@@ -1398,14 +1482,13 @@ function scaffold(options) {
 	const secrets = generateProjectSecrets();
 	let env = template.replace(/\{\{secret:([a-z_]+)\}\}/g, (match, key) => secrets[key] ?? match);
 	const envExample = template.replace(/\{\{secret:[a-z_]+\}\}/g, "");
-	const profiles = ["dev"];
-	if (options.databaseUrl) env = setEnvValues(env, { DATABASE_URL: normalizeDatabaseUrl(options.databaseUrl) });
-	else profiles.push("db");
+	const profiles = ["dev", "db"];
+	if (options.databaseUrl) env = setEnvValues(env, { PRODUCTION_DATABASE_URL: normalizeDatabaseUrl(options.databaseUrl) });
 	if (options.localS3) {
 		profiles.push("s3");
 		env = setEnvValues(env, LOCAL_S3);
 	}
-	if (options.analytics) {
+	if (options.analytics && !headless) {
 		profiles.push("analytics");
 		env = setEnvValues(env, umamiEnv(parseEnv(env).DATABASE_URL ?? "", secrets));
 	}
@@ -1456,6 +1539,10 @@ function linkPackages(target, monorepo) {
 	const pyproject = join(target, "backend", "pyproject.toml");
 	writeFileSync(pyproject, `${readFileSync(pyproject, "utf8").trimEnd()}\n\n[tool.uv.sources]\ndjango-stack = { path = "vendor/${wheel}" }\n`);
 	const packageJson = join(target, "frontend", "package.json");
+	if (!existsSync(packageJson)) {
+		rmSync(frontendVendor, { recursive: true });
+		return;
+	}
 	const manifest = JSON.parse(readFileSync(packageJson, "utf8"));
 	const packages = Object.keys(manifest.dependencies ?? {}).filter((name) => name.startsWith("@django-stack/"));
 	for (const name of packages) {
@@ -1607,7 +1694,12 @@ function productionEnv(devEnv, options) {
 		ADMIN_PASSWORD: secrets.admin ?? "",
 		DEFAULT_FROM_EMAIL: `${current.PROJECT_NAME ?? "site"} <noreply@${options.domain.toLowerCase()}>`
 	};
-	if (profiles.includes("db")) {
+	const external = options.bundledDatabase ? "" : current.PRODUCTION_DATABASE_URL ?? "";
+	if (external) {
+		values.DATABASE_URL = external;
+		values.POSTGRES_PASSWORD = "";
+		values.COMPOSE_PROFILES = [...new Set(profiles.filter((profile) => profile !== "db"))].join(",");
+	} else if (profiles.includes("db")) {
 		const user = current.POSTGRES_USER || "app";
 		const name = current.POSTGRES_DB || "app";
 		values.POSTGRES_PASSWORD = secrets.postgres ?? "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@django-stack/cli",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "The production-ready Django, batteries included stack. Create and manage DjangoStack projects: a Django backend, a frontend, Postgres and Docker Compose in one command.",
   "license": "MIT",
   "author": "Leon van der Grient",

package/templates/backend/Dockerfile

@@ -10,9 +10,14 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
     UV_PROJECT_ENVIRONMENT=/venv \
     PATH="/venv/bin:$PATH"
 COPY --from=ghcr.io/astral-sh/uv:0.11 /uv /bin/uv
-# The Postgres client, for the backups (pg_dump and pg_restore).
+# The Postgres client, for the backups (pg_dump and pg_restore), from the
+# PostgreSQL apt repository: its major version must match the server's, as
+# pg_dump refuses a newer server. Change it with the database.
+ARG POSTGRES_VERSION={{postgres_version}}
 RUN apt-get update \
-    && apt-get install --yes --no-install-recommends postgresql-client \
+    && apt-get install --yes --no-install-recommends postgresql-common \
+    && /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y \
+    && apt-get install --yes --no-install-recommends "postgresql-client-${POSTGRES_VERSION}" \
     && rm -rf /var/lib/apt/lists/*
 RUN groupadd --system app && useradd --system --gid app --home-dir /app app
 WORKDIR /app

package/templates/backend/config/settings.py

@@ -42,6 +42,10 @@ INSTALLED_APPS = [
     "django_stack",
     "django_stack.contrib.captcha",  # the captcha of the contact form (CAPTCHA=off turns it off)
     "content",
+    # @if templates
+    "django_stack.contrib.site",  # preview, the page cache, redirects and the template tags of the site
+    "website",  # the site's pages
+    # @end
     # Last: builds the API routes once every model is exposed.
     "headless.rest",
 ]
@@ -56,6 +60,10 @@ MIDDLEWARE = [
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    # @if templates
+    # The redirects editors manage in the admin, for paths that do not exist.
+    "django_stack.contrib.site.middleware.RedirectMiddleware",
+    # @end
 ]
 
 ROOT_URLCONF = "config.urls"
@@ -72,6 +80,10 @@ TEMPLATES = [
                 "django.template.context_processors.request",
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
+                # @if templates
+                "django_stack.contrib.site.context_processors.site",  # preview, analytics_website_id
+                "website.context_processors.site",  # site, main_menu, footer_menu
+                # @end
             ],
         },
     },

package/templates/backend/config/urls.py

@@ -6,4 +6,15 @@ urlpatterns = [
     path("api/", include("headless.rest.urls")),
     path("", include("django_stack.urls")),  # /healthz and /readyz
     *media_urlpatterns(),  # uploaded files, in development only
+    # @if headless
+    path("", include("django_stack.start")),  # a start page with links to the admin and the API schema
+    # @end
+    # @if templates
+    path("", include("website.urls")),  # the site's pages, last: they include a catch-all for page paths
+    # @end
 ]
+# @if templates
+
+# The site's 404 page, with its layout (when DJANGO_DEBUG is off).
+handler404 = "website.views.not_found"
+# @end

package/templates/backend/content/admin.py

@@ -7,6 +7,7 @@ from content_studio import register
 from content_studio.admin import ModelStudio
 from content_studio.analytics import Analytics
 from content_studio.form import ActivityLog, Field, FormSet
+from django_stack.analytics import UmamiProvider
 from django_stack.studio import PreviewButton
 
 from .models import Author, Category, FormSubmission, Menu, Page, Post, Redirect, SiteSettings, Tag
@@ -17,9 +18,17 @@ POST_PREVIEW = PreviewButton(component_id="8d0f6a52-3c51-4a8e-9a2b-6f1f0c8f2a02"
 PAGE_ACTIVITY = ActivityLog(component_id="8d0f6a52-3c51-4a8e-9a2b-6f1f0c8f2a03")
 POST_ACTIVITY = ActivityLog(component_id="8d0f6a52-3c51-4a8e-9a2b-6f1f0c8f2a04")
 # The visitors of the page or post, from the analytics (see config/studio.py).
-# Hidden while analytics are off.
-PAGE_ANALYTICS = Analytics(path_field="path", component_id="8d0f6a52-3c51-4a8e-9a2b-6f1f0c8f2a05")
-POST_ANALYTICS = Analytics(path_field="slug", path_prefix="/blog/", component_id="8d0f6a52-3c51-4a8e-9a2b-6f1f0c8f2a06")
+# Only with analytics on: Content Studio refuses them without its
+# AnalyticsExtension.
+ANALYTICS = UmamiProvider.is_configured()
+PAGE_ANALYTICS = (
+    [Analytics(path_field="path", component_id="8d0f6a52-3c51-4a8e-9a2b-6f1f0c8f2a05")] if ANALYTICS else []
+)
+POST_ANALYTICS = (
+    [Analytics(path_field="slug", path_prefix="/blog/", component_id="8d0f6a52-3c51-4a8e-9a2b-6f1f0c8f2a06")]
+    if ANALYTICS
+    else []
+)
 SEO = FormSet(
     title="Search and sharing",
     description="Leave empty to use the title and the site settings.",
@@ -42,7 +51,7 @@ class PageStudio(ModelStudio):
         FormSet(title="Body", fields=["body"]),
         SEO,
     ]
-    edit_sidebar = ["status", "published_at", PAGE_PREVIEW, "order", PAGE_ANALYTICS, PAGE_ACTIVITY]
+    edit_sidebar = ["status", "published_at", PAGE_PREVIEW, "order", *PAGE_ANALYTICS, PAGE_ACTIVITY]
 
 
 @register(Post)
@@ -67,7 +76,7 @@ class PostStudio(ModelStudio):
         "author",
         "categories",
         "tags",
-        POST_ANALYTICS,
+        *POST_ANALYTICS,
         POST_ACTIVITY,
     ]
 

package/templates/backend/pyproject.toml

@@ -5,7 +5,7 @@ description = "The Django backend of {{project_name}}."
 requires-python = ">=3.12"
 dependencies = [
     "Django>=6.1,<6.2",
-    "django-stack[server,s3]>=0.10.0",
+    "django-stack[server,s3]>=0.11.0",
     "django-headless[schema]>=1.1.1",
     "django-content-studio[images,huey]>=1.11.0",
 ]

package/templates/base/.github/workflows/deploy.yml

@@ -24,7 +24,9 @@ permissions:
 
 env:
   BACKEND_IMAGE: ghcr.io/${{ github.repository }}-backend:${{ github.sha }}
+  # @if frontend
   FRONTEND_IMAGE: ghcr.io/${{ github.repository }}-frontend:${{ github.sha }}
+  # @end
 
 jobs:
   deploy:
@@ -38,9 +40,11 @@ jobs:
       - name: Build and push the images
         run: |
           docker build --target prod --tag "${BACKEND_IMAGE,,}" backend
-          docker build --target prod --tag "${FRONTEND_IMAGE,,}" frontend
           docker push "${BACKEND_IMAGE,,}"
+          # @if frontend
+          docker build --target prod --tag "${FRONTEND_IMAGE,,}" frontend
           docker push "${FRONTEND_IMAGE,,}"
+          # @end
 
       - name: Set up SSH
         run: |
@@ -63,7 +67,12 @@ jobs:
             set -e
             cd '$DEPLOY_PATH'
             echo '$REGISTRY_TOKEN' | docker login ghcr.io --username '${{ github.actor }}' --password-stdin
+            # @if frontend
             export BACKEND_IMAGE='${BACKEND_IMAGE,,}' FRONTEND_IMAGE='${FRONTEND_IMAGE,,}'
+            # @end
+            # @if !frontend
+            export BACKEND_IMAGE='${BACKEND_IMAGE,,}'
+            # @end
             docker compose pull --quiet --ignore-buildable
             docker compose up -d --no-build --remove-orphans
             docker logout ghcr.io