@django-stack/cli 0.12.0 → 0.12.2

package/dist/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as describeMove, A as activeProject, B as DEFAULT_STACK, C as CLI_VERSION, D as CAPTCHA_APP, E as generateSecret, F as projectStack, G as applies, H as NODE_FRONTENDS, I as projectUrls, J as pendingChoices, L as readLocalRun, M as composeOutput, N as findProjectDirectory, O as RUN_DOMAIN, P as parseProfiles, Q as chooseFreePorts, R as readProject, S as validateTimeZone, T as generateProjectSecrets, U as PROMPT_ORDER, V as NAMED_PRESETS, W as STACK_OPTIONS, X as stackOption, Y as resolvePreset, Z as DEV_PORTS, _ as toProjectName, at as dockerRunning, b as usesValkey, c as frontendPackageManager, ct as quoteEnvValue, d as lockFrontend, et as envPorts, f as normalizeDatabaseUrl, g as timeZones, h as setNotificationsApp, i as validateDomain, it as dockerNotRunning, j as compose, k as RUN_ENV, l as localS3, lt as setEnvValues, m as scaffold, n as postgresUrl, nt as runDoctor, o as LOCAL_S3, ot as isDockerDown, p as relativeDirectory, q as encodePreset, r as productionEnv$1, rt as checkTools, s as cacheEnv, st as parseEnv, t as missingS3, tt as portValues, u as lockBackend, v as umamiEnv, w as PACKAGE_NAME, x as validateProjectName, y as updateFrontendLock, z as runningServices } from "./production-1O8-1QUl.js";
+import { $ as describeMove, A as activeProject, B as DEFAULT_STACK, C as CLI_VERSION, D as CAPTCHA_APP, E as generateSecret, F as projectStack, G as applies, H as NODE_FRONTENDS, I as projectUrls, J as pendingChoices, L as readLocalRun, M as composeOutput, N as findProjectDirectory, O as RUN_DOMAIN, P as parseProfiles, Q as chooseFreePorts, R as readProject, S as validateTimeZone, T as generateProjectSecrets, U as PROMPT_ORDER, V as NAMED_PRESETS, W as STACK_OPTIONS, X as stackOption, Y as resolvePreset, Z as DEV_PORTS, _ as toProjectName, at as dockerRunning, b as usesValkey, c as frontendPackageManager, ct as removeLeftovers, d as lockFrontend, dt as setEnvValues, et as envPorts, f as normalizeDatabaseUrl, g as timeZones, h as setNotificationsApp, i as validateDomain, it as dockerNotRunning, j as compose, k as RUN_ENV, l as localS3, lt as parseEnv, m as scaffold, n as postgresUrl, nt as runDoctor, o as LOCAL_S3, ot as isDockerDown, p as relativeDirectory, q as encodePreset, r as productionEnv$1, rt as checkTools, s as cacheEnv, st as leftoverVolumes, t as missingS3, tt as portValues, u as lockBackend, ut as quoteEnvValue, v as umamiEnv, w as PACKAGE_NAME, x as validateProjectName, y as updateFrontendLock, z as runningServices } from "./production-lgZRSpyw.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";
@@ -1029,6 +1029,24 @@ function probeRequest(probe, failureThreshold) {
 		...check
 	};
 }
+/**
+* Which registry a Magic Containers registry is. Bunny returns no type, so
+* this goes by the host name, and by the display name or a type field when
+* there is no host name. Public Docker Hub and GitHub are built in.
+*/
+function registryKind(item) {
+	const host = (text(item.hostName) ?? text(item.host) ?? text(item.url) ?? "").toLowerCase();
+	const label = `${text(item.type) ?? ""} ${text(item.displayName) ?? ""}`.toLowerCase().replace(/[\s_-]/g, "");
+	if (host) {
+		if (/(^|\.|\/)(docker\.io|docker\.com)(\/|$)/.test(host)) return "dockerHub";
+		if (/(^|\.|\/)ghcr\.io(\/|$)/.test(host)) return "gitHub";
+		if (/(^|\.|\/)bunny\.net(\/|$)/.test(host)) return "bunny";
+		return;
+	}
+	if (label.includes("dockerhub")) return "dockerHub";
+	if (label.includes("github") || label.includes("ghcr")) return "gitHub";
+	if (label.includes("bunny")) return "bunny";
+}
 /** The image fields of a container. */
 function imageFields(container, options) {
 	const { image } = container;
@@ -1310,25 +1328,29 @@ var BunnyClient = class {
 		const list = listOf(await this.api.mc("GET", "/registries"));
 		const registries = {};
 		let namespace;
-		for (const item of list) {
-			const type = (text(item.type) ?? "").toLowerCase();
+		const listed = [];
+		const ordered = [...list].sort((a, b) => Number(b.isPublic === true) - Number(a.isPublic === true));
+		for (const item of ordered) {
 			const id = text(item.id);
 			if (!id) continue;
-			if (type === "dockerhub" && !registries.dockerHub) registries.dockerHub = id;
-			else if (type === "github" && !registries.gitHub) registries.gitHub = id;
-			else if ((type === "bunnyregistry" || type === "bunny") && !registries.bunny) {
+			const kind = registryKind(item);
+			listed.push(text(item.displayName) ?? text(item.hostName) ?? id);
+			if (kind === "dockerHub" && !registries.dockerHub) registries.dockerHub = id;
+			else if (kind === "gitHub" && !registries.gitHub) registries.gitHub = id;
+			else if (kind === "bunny" && !registries.bunny) {
 				registries.bunny = id;
 				namespace = text(item.namespace ?? item.accountId ?? item.userName ?? item.username);
 			}
 		}
 		return {
 			registries,
-			namespace
+			namespace,
+			listed
 		};
 	}
 	async ensureRegistries() {
 		const found = await this.registries();
-		if (!found.registries.dockerHub) throw new Error("Bunny lists no public Docker Hub registry for this account. Check Magic Containers › Image Registries.");
+		if (!found.registries.dockerHub) throw new Error(`Could not find the public Docker Hub registry among the registries Bunny returned (${found.listed.join(", ") || "none"}). Please report this at https://github.com/dwarsbit/django-stack/issues.`);
 		if (!found.registries.bunny) {
 			const created = await this.api.mc("POST", "/registries", {
 				displayName: "Bunny Container Registry",
@@ -3978,6 +4000,24 @@ function checkComputer(checks = checkTools()) {
 	});
 	return !checks.some((check) => !check.ok && !check.warning);
 }
+/**
+* Docker keeps the volumes of a deleted project. A new project with the same
+* name would start on the old database, whose password is not the new one in
+* .env: "password authentication failed for user app". Offers to remove them.
+*/
+async function handleLeftovers(name, interactive) {
+	const volumes = leftoverVolumes(name);
+	if (!volumes.length) return;
+	const removeCommand = command("docker compose down --volumes");
+	p.log.warn(`Docker still has the data of an earlier project named ${pc.bold(name)} (${volumes.join(", ")}). The new project gets a new database password, so it cannot start on that database.`);
+	if (interactive && unwrap(await p.confirm({
+		message: `Remove the data of the earlier ${name}? Its database and uploads are deleted for good.`,
+		initialValue: false
+	}))) {
+		if (removeLeftovers(name, volumes)) p.log.success(`Removed the data of the earlier ${name}.`);
+		else fail("Could not remove it. Stop what uses it, or choose another --name.");
+	} else p.log.warn(`Run ${removeCommand} in the new project before you start it, or choose another --name.`);
+}
 async function init(directoryArgument, options) {
 	const interactive = isInteractive(options.yes);
 	intro("Create a project");
@@ -3999,6 +4039,7 @@ async function init(directoryArgument, options) {
 			validate: (value) => validateProjectName(value ?? "")
 		}));
 	}
+	if (dockerReady) await handleLeftovers(name, interactive);
 	const stack = await chooseStack(options, interactive);
 	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.");
@@ -5066,6 +5107,12 @@ function nodeModulesVolume(project) {
 		return;
 	}
 }
+/** The backend packages `dstack update` upgrades without `--all`. */
+const BACKEND_PACKAGES = [
+	"django-stack",
+	"django-headless",
+	"django-content-studio"
+];
 /** `dstack update`: newer images, newer DjangoStack packages, and a restart of what was running. */
 async function update(options) {
 	const project = open(options);
@@ -5074,16 +5121,12 @@ async function update(options) {
 	const running = targets.filter((target) => runningServices(target).length > 0);
 	const lock = join(project.directory, "backend", "uv.lock");
 	if (existsSync(lock) && has("uv")) {
-		const args = options.all ? ["lock", "--upgrade"] : [
-			"lock",
-			"--upgrade-package",
-			"django-stack"
-		];
+		const args = options.all ? ["lock", "--upgrade"] : ["lock", ...BACKEND_PACKAGES.flatMap((name) => ["--upgrade-package", name])];
 		if (spawnSync("uv", args, {
 			cwd: join(project.directory, "backend"),
 			stdio: "inherit"
 		}).status !== 0) fail("uv could not update backend/uv.lock.");
-		p.log.success(options.all ? "Updated backend/uv.lock" : "Updated django-stack in backend/uv.lock");
+		p.log.success(options.all ? "Updated backend/uv.lock" : `Updated ${BACKEND_PACKAGES.join(", ")} in backend/uv.lock`);
 	} else if (existsSync(lock)) p.log.warn("uv is not installed, so backend/uv.lock stays as it is: https://docs.astral.sh/uv/");
 	if (frontendPackageManager(project.directory)) {
 		const lockfile = updateFrontendLock(project.directory, options.all);

package/dist/index.js

@@ -1 +1 @@
-export { B as DEFAULT_STACK, a as FRONTENDS, V as NAMED_PRESETS, W as STACK_OPTIONS, C as VERSION, s as cacheEnv, K as decodePreset, q as encodePreset, T as generateProjectSecrets, E as generateSecret, f as normalizeDatabaseUrl, st as parseEnv, J as pendingChoices, r as productionEnv, Y as resolvePreset, nt as runDoctor, m as scaffold, lt as setEnvValues, h as setNotificationsApp, _ as toProjectName, b as usesValkey, i as validateDomain, x as validateProjectName } from "./production-1O8-1QUl.js";
+export { B as DEFAULT_STACK, a as FRONTENDS, V as NAMED_PRESETS, W as STACK_OPTIONS, C as VERSION, s as cacheEnv, K as decodePreset, q as encodePreset, T as generateProjectSecrets, E as generateSecret, f as normalizeDatabaseUrl, lt as parseEnv, J as pendingChoices, r as productionEnv, Y as resolvePreset, nt as runDoctor, m as scaffold, dt as setEnvValues, h as setNotificationsApp, _ as toProjectName, b as usesValkey, i as validateDomain, x as validateProjectName } from "./production-lgZRSpyw.js";

package/dist/{production-1O8-1QUl.js → production-lgZRSpyw.js}

@@ -117,6 +117,40 @@ function dockerRunning(runCommand = run) {
 		"{{.Server.Version}}"
 	]));
 }
+/**
+* The Docker volumes of an earlier Compose project with this name, such as
+* `<name>_pgdata`. A new project with the same name would reuse them, and
+* Postgres keeps the password of the data it was created with.
+*/
+function leftoverVolumes(name, runCommand = run) {
+	return (runCommand("docker", [
+		"volume",
+		"ls",
+		"--quiet",
+		"--filter",
+		`label=com.docker.compose.project=${name}`
+	]) ?? "").split("\n").filter(Boolean);
+}
+/** Removes the containers and volumes of the Compose project with this name. Returns whether it worked. */
+function removeLeftovers(name, volumes, runCommand = run) {
+	const containers = (runCommand("docker", [
+		"ps",
+		"--all",
+		"--quiet",
+		"--filter",
+		`label=com.docker.compose.project=${name}`
+	]) ?? "").split("\n").filter(Boolean);
+	if (containers.length && runCommand("docker", [
+		"rm",
+		"--force",
+		...containers
+	]) === void 0) return false;
+	return runCommand("docker", [
+		"volume",
+		"rm",
+		...volumes
+	]) !== void 0;
+}
 /** Docker and Docker Compose, which run the project. */
 function checkDocker({ run: runCommand = run, platform = process.platform } = {}) {
 	const client = parseVersion(runCommand("docker", ["--version"]));
@@ -1746,4 +1780,4 @@ function productionEnv(devEnv, options) {
 		todo
 	};
 }
-export { describeMove as $, activeProject as A, DEFAULT_STACK as B, CLI_VERSION as C, CAPTCHA_APP as D, generateSecret as E, projectStack as F, applies as G, NODE_FRONTENDS as H, projectUrls as I, pendingChoices as J, decodePreset as K, readLocalRun as L, composeOutput as M, findProjectDirectory as N, RUN_DOMAIN as O, parseProfiles as P, chooseFreePorts as Q, readProject as R, validateTimeZone as S, generateProjectSecrets as T, PROMPT_ORDER as U, NAMED_PRESETS as V, STACK_OPTIONS as W, stackOption as X, resolvePreset as Y, DEV_PORTS as Z, toProjectName as _, FRONTENDS as a, dockerRunning as at, usesValkey as b, frontendPackageManager as c, quoteEnvValue as ct, lockFrontend as d, envPorts as et, normalizeDatabaseUrl as f, timeZones as g, setNotificationsApp as h, validateDomain as i, dockerNotRunning as it, compose as j, RUN_ENV as k, localS3 as l, setEnvValues as lt, scaffold as m, postgresUrl as n, runDoctor as nt, LOCAL_S3 as o, isDockerDown as ot, relativeDirectory as p, encodePreset as q, productionEnv as r, checkTools as rt, cacheEnv as s, parseEnv as st, missingS3 as t, portValues as tt, lockBackend as u, umamiEnv as v, PACKAGE_NAME as w, validateProjectName as x, updateFrontendLock as y, runningServices as z };
+export { describeMove as $, activeProject as A, DEFAULT_STACK as B, CLI_VERSION as C, CAPTCHA_APP as D, generateSecret as E, projectStack as F, applies as G, NODE_FRONTENDS as H, projectUrls as I, pendingChoices as J, decodePreset as K, readLocalRun as L, composeOutput as M, findProjectDirectory as N, RUN_DOMAIN as O, parseProfiles as P, chooseFreePorts as Q, readProject as R, validateTimeZone as S, generateProjectSecrets as T, PROMPT_ORDER as U, NAMED_PRESETS as V, STACK_OPTIONS as W, stackOption as X, resolvePreset as Y, DEV_PORTS as Z, toProjectName as _, FRONTENDS as a, dockerRunning as at, usesValkey as b, frontendPackageManager as c, removeLeftovers as ct, lockFrontend as d, setEnvValues as dt, envPorts as et, normalizeDatabaseUrl as f, timeZones as g, setNotificationsApp as h, validateDomain as i, dockerNotRunning as it, compose as j, RUN_ENV as k, localS3 as l, parseEnv as lt, scaffold as m, postgresUrl as n, runDoctor as nt, LOCAL_S3 as o, isDockerDown as ot, relativeDirectory as p, encodePreset as q, productionEnv as r, checkTools as rt, cacheEnv as s, leftoverVolumes as st, missingS3 as t, portValues as tt, lockBackend as u, quoteEnvValue as ut, umamiEnv as v, PACKAGE_NAME as w, validateProjectName as x, updateFrontendLock as y, runningServices as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@django-stack/cli",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "The production-ready batteries included Django 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/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.12.0",
+    "django-stack[server,s3]>=0.12.2",
     "django-headless[schema]>=1.1.1",
     "django-content-studio[images,huey]>=1.11.0",
 ]

package/templates/base/AGENTS.md

@@ -19,6 +19,28 @@ There is no Node and no frontend service: the pages read the content with
 the ORM.
 <!-- @end -->
 
+## Skills
+
+Django Headless and Django Content Studio each publish an agent skill. Read the skill before you change what it
+covers, and use the options it shows instead of writing your own
+serializers, views or admin code:
+
+- Django Headless, for the API (`@expose()`, permissions, filters, the
+  TypeScript client):
+  https://raw.githubusercontent.com/dwarsbit/django-headless/main/skills/django-headless/SKILL.md
+- Django Content Studio, for the admin (`ModelStudio`, the edit page,
+  widgets, the dashboard, the media library):
+  https://djangocontentstudio.org/skills/django-content-studio/SKILL.md
+
+Their full documentation is available as Markdown at
+https://djangoheadless.org/llms.txt and
+https://djangocontentstudio.org/llms.txt. If a skill is installed in your
+skills folder, such as `.claude/skills/`, it takes the place of the link.
+
+The skills follow the latest release; `backend/uv.lock` pins the installed
+one. When a skill shows an option the project does not have, upgrade both
+packages with `npx @django-stack/cli update` instead of working around it.
+
 ## Layout
 
 ```

package/templates/frontend-astro/package.json

@@ -16,7 +16,7 @@
     "@astrojs/node": "^11.1.9",
     "@astrojs/rss": "^4.0.19",
     "@django-headless/client": "^1.1.1",
-    "@django-stack/utils": "^0.12.0",
+    "@django-stack/utils": "^0.12.2",
     "astro": "^7.4.5"
   },
   "devDependencies": {

package/templates/frontend-next/package.json

@@ -13,9 +13,9 @@
   },
   "dependencies": {
     "@django-headless/client": "^1.1.1",
-    "@django-stack/next": "^0.12.0",
-    "@django-stack/react": "^0.12.0",
-    "@django-stack/utils": "^0.12.0",
+    "@django-stack/next": "^0.12.2",
+    "@django-stack/react": "^0.12.2",
+    "@django-stack/utils": "^0.12.2",
     "next": "^16.4.4",
     "react": "^19.3.1",
     "react-dom": "^19.3.1",

package/templates/frontend-nuxt/package.json

@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@django-headless/client": "^1.1.1",
-    "@django-stack/utils": "^0.12.0",
-    "@django-stack/vue": "^0.12.0",
+    "@django-stack/utils": "^0.12.2",
+    "@django-stack/vue": "^0.12.2",
     "nuxt": "^4.6.3",
     "nuxt-security": "^2.7.0",
     "vue": "^3.5.44",

package/templates/frontend-sveltekit/package.json

@@ -19,8 +19,8 @@
   },
   "dependencies": {
     "@django-headless/client": "^1.1.1",
-    "@django-stack/svelte": "^0.12.0",
-    "@django-stack/utils": "^0.12.0"
+    "@django-stack/svelte": "^0.12.2",
+    "@django-stack/utils": "^0.12.2"
   },
   "devDependencies": {
     "@sveltejs/adapter-node": "^6.0.1",