create-goodfellow 0.2.0 → 0.4.0

package/dist/cli.js

@@ -1,10 +1,99 @@
-import { a as TEMPLATES, d as installPackages, h as scaffold, i as ScaffoldError, l as hostsFor, o as commitAll, p as parseRepo, r as HOSTS, t as BLOCK_CHOICES, u as initGitRepository } from "./scaffold-BGxzPdN1.js";
+import { _ as parseRepo, a as HOSTS, c as commitAll, d as contentRepositoryDir, h as installPackages, i as CONTENT_REPOSITORY_DIR, m as initGitRepository, o as ScaffoldError, p as hostsFor, r as CONTENT_BUILDS, s as TEMPLATES, t as BLOCK_CHOICES, u as contentBuildsFor, y as scaffold } from "./scaffold-BzMu8DuO.js";
 import { join, relative, resolve } from "node:path";
 import { readFileSync } from "node:fs";
 import { stdin, stdout } from "node:process";
 import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
-import { parseArgs } from "node:util";
+import { parseArgs, stripVTControlCharacters } from "node:util";
+import { emitKeypressEvents } from "node:readline";
+//#region src/select.ts
+const HIDE_CURSOR = "\x1B[?25l";
+const SHOW_CURSOR = "\x1B[?25h";
+/** How many rows `lines` take up in a terminal `columns` wide, counting lines that wrap. */
+function rowsFor(lines, columns) {
+	const width = columns && columns > 0 ? columns : 80;
+	return lines.reduce((rows, line) => rows + Math.max(1, Math.ceil(stripVTControlCharacters(line).length / width)), 0);
+}
+function painter(color) {
+	const paint = (open, close) => (text) => color ? `\x1b[${open}m${text}\x1b[${close}m` : text;
+	return {
+		bold: paint(1, 22),
+		dim: paint(2, 22),
+		cyan: paint(36, 39)
+	};
+}
+/** The menu's lines, with the choice at `index` marked. */
+function menuLines(question, choices, index, color = false) {
+	const { bold, dim, cyan } = painter(color);
+	return [
+		bold(question),
+		...choices.flatMap((choice, i) => {
+			return [i === index ? cyan(`› ${choice.label}`) : `  ${choice.label}`, ...choice.note ? [dim(`    ${choice.note}`)] : []];
+		}),
+		dim("  ↑ and ↓ to move, Enter to choose")
+	];
+}
+var AbortError = class extends Error {
+	code = "ABORT_ERR";
+	constructor() {
+		super("Stopped.");
+	}
+};
+/**
+* Asks `question` with a menu of `choices` that the arrow keys move through, as
+* `create-next-app` does. Enter chooses, and the menu is replaced by the answer.
+* Ctrl+C rejects with an error whose `code` is `"ABORT_ERR"`. The input must be
+* a terminal, and nothing else may be reading it meanwhile.
+*/
+function select(question, choices, input = process.stdin, output = process.stdout) {
+	const color = output.hasColors?.() ?? false;
+	const { cyan } = painter(color);
+	let index = 0;
+	let rows = 0;
+	const draw = () => {
+		const lines = menuLines(question, choices, index, color);
+		output.write(`${rows > 0 ? `\x1b[${rows}A\r\x1b[J` : ""}${lines.join("\n")}\n`);
+		rows = rowsFor(lines, output.columns);
+	};
+	return new Promise((resolve, reject) => {
+		const wasRaw = input.isRaw ?? false;
+		const finish = (answer) => {
+			input.off("keypress", onKey);
+			input.setRawMode?.(wasRaw);
+			input.pause();
+			output.write(`\x1b[${rows}A\r\x1b[J${answer === void 0 ? "" : `${question} ${cyan(answer)}\n`}${SHOW_CURSOR}`);
+		};
+		const onKey = (text, key) => {
+			const name = key?.name;
+			if (key?.ctrl && name === "c") {
+				finish(void 0);
+				reject(new AbortError());
+				return;
+			}
+			if (name === "return" || name === "enter") {
+				const choice = choices[index];
+				finish(choice.label);
+				resolve(choice.value);
+				return;
+			}
+			const last = choices.length - 1;
+			if (name === "up" || name === "k" || name === "tab" && key?.shift) index = index === 0 ? last : index - 1;
+			else if (name === "down" || name === "j" || name === "tab") index = index === last ? 0 : index + 1;
+			else if (name === "home") index = 0;
+			else if (name === "end") index = last;
+			else if (text && /^[1-9]$/.test(text) && Number(text) <= choices.length) index = Number(text) - 1;
+			else return;
+			draw();
+		};
+		emitKeypressEvents(input);
+		input.setRawMode?.(true);
+		input.on("keypress", onKey);
+		input.resume();
+		output.write(HIDE_CURSOR);
+		draw();
+	});
+}
+//#endregion
 //#region src/cli.ts
 const HELP = `Creates a new Goodfellow site.
 
@@ -15,6 +104,10 @@ Options:
   --github <repo>     The GitHub repository the site will be stored in, such as your-name/your-site
   --gitlab <project>  The GitLab project the site will be stored in, such as your-group/your-site
   --host <host>       github-pages, gitlab-pages or vercel. Keeps only that host's setup file.
+  --content <repo>    Keeps the site's content in a repository of its own, such as
+                      your-name/your-site-content; --github or --gitlab is then the code's
+  --build <where>     With --content on Vercel: content (the default) or code, the
+                      repository Vercel builds the site from
   --blocks <choice>   recommended (the default) to add the recommended blocks, or built-in for Goodfellow's own only
   --no-install        Don't run npm install
   --no-git            Don't make the site a git repository, or commit it
@@ -27,21 +120,36 @@ const HOST_NAMES = {
 	github: "GitHub",
 	gitlab: "GitLab"
 };
-async function choose(rl, question, choices) {
-	stdout.write(`\n${question}\n`);
+/** Asks one question. Each has its own interface, since menus read the terminal themselves in between. */
+async function ask(question) {
+	const rl = createInterface({
+		input: stdin,
+		output: stdout
+	});
+	try {
+		return await rl.question(question);
+	} finally {
+		rl.close();
+	}
+}
+/** A menu the arrow keys move through, or numbered choices where the output isn't a terminal. */
+async function choose(question, choices) {
+	stdout.write("\n");
+	if (stdout.isTTY) return select(question, choices);
+	stdout.write(`${question}\n`);
 	choices.forEach((choice, index) => {
 		stdout.write(`  ${index + 1}. ${choice.label}${choice.note ? `\n     ${choice.note}` : ""}\n`);
 	});
 	for (;;) {
-		const answer = (await rl.question(`Choose 1-${choices.length} (1): `)).trim();
+		const answer = (await ask(`Choose 1-${choices.length} (1): `)).trim();
 		const choice = choices[answer === "" ? 0 : Number(answer) - 1];
 		if (choice) return choice.value;
 	}
 }
-async function askRepo(rl, host) {
+async function askRepo(host) {
 	const example = host === "github" ? "your-name/your-site" : "your-group/your-site";
 	for (;;) {
-		const answer = await rl.question(`\nThe ${HOST_NAMES[host]} ${host === "github" ? "repository" : "project"}, such as ${example} (leave empty if it doesn't exist yet): `);
+		const answer = await ask(`\nThe ${HOST_NAMES[host]} ${host === "github" ? "repository" : "project"}, such as ${example} (leave empty if it doesn't exist yet): `);
 		if (answer.trim() === "") return void 0;
 		const repo = parseRepo(host, answer);
 		if (repo) return repo;
@@ -74,6 +182,8 @@ async function main() {
 			gitlab: { type: "string" },
 			host: { type: "string" },
 			blocks: { type: "string" },
+			content: { type: "string" },
+			build: { type: "string" },
 			"no-git": { type: "boolean" },
 			"no-install": { type: "boolean" },
 			yes: {
@@ -98,52 +208,64 @@ async function main() {
 	if (host !== void 0 && !isHost(host)) throw new ScaffoldError(`--host takes ${Object.keys(HOSTS).join(", ")}.`);
 	let blocks = values.blocks;
 	if (blocks !== void 0 && !(blocks in BLOCK_CHOICES)) throw new ScaffoldError(`--blocks takes ${Object.keys(BLOCK_CHOICES).join(" or ")}.`);
+	let build = values.build;
+	if (build !== void 0 && !Object.hasOwn(CONTENT_BUILDS, build)) throw new ScaffoldError(`--build takes ${Object.keys(CONTENT_BUILDS).join(" or ")}.`);
+	let contentRepo = values.content;
 	if (stdin.isTTY && !values.yes) {
-		const rl = createInterface({
-			input: stdin,
-			output: stdout
-		});
-		try {
-			if (!folder) folder = (await rl.question("Folder for the new site (my-site): ")).trim() || "my-site";
-			template ??= await choose(rl, "Start from:", Object.entries(TEMPLATES).map(([value, { label, description }]) => ({
-				value,
-				label,
-				note: description
-			})));
-			let storage = backend?.host;
-			if (!backend) {
-				storage = await choose(rl, "Where will the site be stored? Editors sign in there, and publishing saves to it.", [
-					{
-						value: "github",
-						label: "GitHub"
-					},
-					{
-						value: "gitlab",
-						label: "GitLab"
-					},
-					{
-						value: void 0,
-						label: "Not decided yet"
-					}
-				]);
-				const repo = storage && await askRepo(rl, storage);
-				if (storage && repo) backend = {
-					host: storage,
-					repo
-				};
-			}
-			host ??= await chooseHost(rl, storage);
-			blocks ??= await choose(rl, "Which blocks should the editor offer to start with?", Object.entries(BLOCK_CHOICES).map(([value, { label, description }]) => ({
-				value,
-				label,
-				note: description
-			})));
-		} finally {
-			rl.close();
+		if (!folder) folder = (await ask("Folder for the new site (my-site): ")).trim() || "my-site";
+		template ??= await choose("Start from:", Object.entries(TEMPLATES).map(([value, { label, description }]) => ({
+			value,
+			label,
+			note: description
+		})));
+		let storage = backend?.host;
+		if (!backend) {
+			storage = await choose("Where will the site be stored? Editors sign in there, and publishing saves to it.", [
+				{
+					value: "github",
+					label: "GitHub"
+				},
+				{
+					value: "gitlab",
+					label: "GitLab"
+				},
+				{
+					value: void 0,
+					label: "Not decided yet"
+				}
+			]);
+			const repo = storage && await askRepo(storage);
+			if (storage && repo) backend = {
+				host: storage,
+				repo
+			};
+		}
+		host ??= await chooseHost(storage);
+		if (backend && host && contentRepo === void 0) {
+			if (await choose("Where should the site's content be kept?", [{
+				value: false,
+				label: "With the code",
+				note: "One repository for everything."
+			}, {
+				value: true,
+				label: "In a repository of its own",
+				note: "Editors can change the content but never the code. For organizations with a developer."
+			}])) contentRepo = await askContentRepo(backend);
 		}
+		if (contentRepo !== void 0 && host && build === void 0 && contentBuildsFor(host).length > 1) build = await choose(`Which repository should ${HOSTS[host].label} build the site from?`, contentBuildsFor(host).toReversed().map((value) => ({
+			value,
+			label: CONTENT_BUILDS[value].label,
+			note: CONTENT_BUILDS[value].description
+		})));
+		blocks ??= await choose("Which blocks should the editor offer to start with?", Object.entries(BLOCK_CHOICES).map(([value, { label, description }]) => ({
+			value,
+			label,
+			note: description
+		})));
 	}
 	if (!folder) throw new ScaffoldError("Say which folder to create the site in, such as: npm create goodfellow@latest my-site");
 	if (host && backend && !hostsFor(backend.host).includes(host)) throw new ScaffoldError(`${HOSTS[host].label} can't serve a site stored on ${HOST_NAMES[backend.host]}.`);
+	const content = contentRepo === void 0 ? void 0 : separateContent(contentRepo, build, backend, host);
 	const target = resolve(folder);
 	const versions = JSON.parse(readFileSync(join(templatesDir, "versions.json"), "utf8"));
 	await scaffold({
@@ -152,8 +274,15 @@ async function main() {
 		versions,
 		...backend && { backend },
 		...host && { host },
-		...(blocks ?? "recommended") === "recommended" && { registryDir: join(templatesDir, "registry") }
+		...(blocks ?? "recommended") === "recommended" && { registryDir: join(templatesDir, "registry") },
+		...content && { content }
 	});
+	const contentDir = contentRepositoryDir(target);
+	const contentGit = content && backend && !values["no-git"] ? initGitRepository(contentDir, {
+		host: backend.host,
+		repo: content.repo
+	}) : void 0;
+	const contentCommit = contentGit?.created ? commitAll(contentDir, "Create the site's content") : void 0;
 	const git = values["no-git"] ? void 0 : initGitRepository(target, backend);
 	let installed = false;
 	if (!values["no-install"]) {
@@ -167,6 +296,7 @@ async function main() {
 		"",
 		`Created a new site in ${where}.`,
 		...git ? gitLines(git, commit, installed) : [],
+		...content ? contentLines(content, contentGit, contentCommit) : [],
 		...!installed && !values["no-install"] ? ["npm install didn't finish, so run it again in the site's folder."] : [],
 		"",
 		"Next:",
@@ -179,6 +309,38 @@ async function main() {
 	if (!backend) lines.push("Before you do, say where the site is stored in goodfellow.config.tsx; README.md shows how.");
 	stdout.write(`${lines.join("\n")}\n`);
 }
+/** Asks for the content repository, offering the code's with `-content` after it. */
+async function askContentRepo(backend) {
+	const suggested = `${backend.repo}-content`;
+	for (;;) {
+		const answer = (await ask(`\nThe ${HOST_NAMES[backend.host]} ${backend.host === "github" ? "repository" : "project"} for the content (${suggested}): `)).trim();
+		if (answer === "") return suggested;
+		const repo = parseRepo(backend.host, answer);
+		if (repo && repo !== backend.repo) return repo;
+		stdout.write(repo ? "The content needs a repository of its own, not the code's.\n" : `That doesn't look like a ${HOST_NAMES[backend.host]} address. Type it as ${suggested}.\n`);
+	}
+}
+/** The content repository as the options or answers gave it, checked against the rest. */
+function separateContent(repo, build, backend, host) {
+	if (!backend || !host) throw new ScaffoldError("Keeping the content in a repository of its own needs the code's repository (--github or --gitlab) and a host (--host).");
+	const parsed = parseRepo(backend.host, repo);
+	if (!parsed || parsed === backend.repo) throw new ScaffoldError("--content takes a repository of its own for the content, such as your-name/your-site-content.");
+	const builds = contentBuildsFor(host);
+	const chosen = build ?? builds.at(-1);
+	if (!builds.includes(chosen)) throw new ScaffoldError(`${HOSTS[host].label} can only build the site from the content repository.`);
+	return {
+		repo: parsed,
+		build: chosen
+	};
+}
+/** Where the content went, and what's left to do with it. */
+function contentLines(content, git, commit) {
+	const lines = [`Its content is in ${CONTENT_REPOSITORY_DIR}/, which content/ and public/media/ link to: a repository of its own for ${content.repo}, which the site's repository ignores.`];
+	if (git?.created && commit === "committed") lines.push(`${CONTENT_REPOSITORY_DIR}/ has its content in its first commit.`);
+	else if (git?.created) lines.push(`Commit everything in ${CONTENT_REPOSITORY_DIR}/ as well.`);
+	lines.push("Push both repositories. README.md says what each needs to build the site.");
+	return lines;
+}
 /** What happened with git, and what's left to do. */
 function gitLines(git, commit, installed) {
 	if (!git.created) return [git.reason === "inside-repository" ? "It's inside another git repository, so it isn't one of its own." : "Git isn't installed, so it isn't a git repository yet: once it is, run git init -b main in it, then commit."];
@@ -198,10 +360,10 @@ function gitLines(git, commit, installed) {
 	];
 	return [`${repository}. Nothing is committed yet: commit everything once npm install has run.`, ...origin];
 }
-async function chooseHost(rl, storage) {
+async function chooseHost(storage) {
 	stdout.write("\nEach host's free plan has its own rules about business use. Check them if the site is for a business,");
 	stdout.write("\nsells anything, shows ads, or anyone is paid to build or look after it.\n");
-	return choose(rl, "Where will the site be hosted?", [...hostsFor(storage).map((value) => ({
+	return choose("Where will the site be hosted?", [...hostsFor(storage).map((value) => ({
 		value,
 		label: HOSTS[value].label,
 		note: HOSTS[value].note

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { BLOCK_CHOICES, BUNDLED_GITIGNORE, Backend, Backend as Backend$1, BlockChoice, HOSTS, Host, Host as Host$1, SiteFiles, TEMPLATES, TemplateName, configureBackend, hostsFor, parseRepo, sitePackageJson, withoutRepositoryNotes } from "@goodfellow-cms/core";
+import { BLOCK_CHOICES, BUNDLED_GITIGNORE, Backend, Backend as Backend$1, BlockChoice, HOSTS, Host, Host as Host$1, SeparateContent, SiteFiles, TEMPLATES, TemplateName, configureBackend, hostsFor, parseRepo, sitePackageJson, withoutRepositoryNotes } from "@goodfellow-cms/core";
 //#region src/scaffold.d.ts
 /** A problem the person creating the site can fix, described in plain words. */
 export declare class ScaffoldError extends Error {
@@ -27,8 +27,14 @@ interface ScaffoldOptions {
   host?: Host$1;
   /** The built block registry to install recommended blocks from. Without it, the site has the built-in blocks only. */
   registryDir?: string;
+  /**
+   * Keeps the content in a repository of its own, in the site's
+   * `content-repository/` folder, which `content/` and `public/media/` link to.
+   * `backend` is then the code's repository.
+   */
+  content?: SeparateContent;
 }
 /** Creates a new site in `target` from a template. */
-export declare function scaffold({ template, target, versions, backend, host, registryDir }: ScaffoldOptions): Promise<void>;
+export declare function scaffold({ template, target, versions, backend, host, registryDir, content }: ScaffoldOptions): Promise<void>;
 //#endregion
 export { BLOCK_CHOICES, BUNDLED_GITIGNORE, type Backend, type BlockChoice, HOSTS, type Host, type ScaffoldOptions, TEMPLATES, type TemplateName, configureBackend, hostsFor, parseRepo, sitePackageJson, withoutRepositoryNotes };

package/dist/index.js

@@ -1,2 +1,2 @@
-import { _ as withoutRepositoryNotes, a as TEMPLATES, c as copyTemplate, f as packageName, g as sitePackageJson, h as scaffold, i as ScaffoldError, l as hostsFor, m as readTemplate, n as BUNDLED_GITIGNORE, p as parseRepo, r as HOSTS, s as configureBackend, t as BLOCK_CHOICES } from "./scaffold-BGxzPdN1.js";
+import { _ as parseRepo, a as HOSTS, b as sitePackageJson, f as copyTemplate, g as packageName, l as configureBackend, n as BUNDLED_GITIGNORE, o as ScaffoldError, p as hostsFor, s as TEMPLATES, t as BLOCK_CHOICES, v as readTemplate, x as withoutRepositoryNotes, y as scaffold } from "./scaffold-BzMu8DuO.js";
 export { BLOCK_CHOICES, BUNDLED_GITIGNORE, HOSTS, ScaffoldError, TEMPLATES, configureBackend, copyTemplate, hostsFor, packageName, parseRepo, readTemplate, scaffold, sitePackageJson, withoutRepositoryNotes };

package/dist/{scaffold-BGxzPdN1.js → scaffold-BzMu8DuO.js}

@@ -1,7 +1,8 @@
 import { spawnSync } from "node:child_process";
 import { cp, mkdir, readFile, readdir, rename, writeFile } from "node:fs/promises";
 import { basename, dirname, join, relative, resolve, sep } from "node:path";
-import { BLOCK_CHOICES, BUNDLED_GITIGNORE, BUNDLED_GITIGNORE as BUNDLED_GITIGNORE$1, GOODFELLOW_REGISTRY, HOSTS, TEMPLATES, configureBackend, hostsFor, parseRepo, planSite, sitePackageJson, sitePackageName, withoutRepositoryNotes } from "@goodfellow-cms/core";
+import { BLOCK_CHOICES, BUNDLED_GITIGNORE, BUNDLED_GITIGNORE as BUNDLED_GITIGNORE$1, CONTENT_BUILDS, CONTENT_REPOSITORY_DIR, CONTENT_REPOSITORY_DIR as CONTENT_REPOSITORY_DIR$1, GOODFELLOW_REGISTRY, HOSTS, TEMPLATES, configureBackend, contentBuildsFor, hostsFor, parseRepo, planSite, sitePackageJson, sitePackageName, withoutRepositoryNotes } from "@goodfellow-cms/core";
+import { setUpContentRepository } from "@goodfellow-cms/core/node";
 //#region src/scaffold.ts
 /** A problem the person creating the site can fix, described in plain words. */
 var ScaffoldError = class extends Error {
@@ -130,7 +131,7 @@ function commitAll(target, message) {
 	return /user\.(name|email)|tell me who you are|identity/i.test(commit.stderr) ? "no-identity" : "failed";
 }
 /** Creates a new site in `target` from a template. */
-async function scaffold({ template, target, versions, backend, host, registryDir }) {
+async function scaffold({ template, target, versions, backend, host, registryDir, content }) {
 	if (!await isEmptyFolder(target)) throw new ScaffoldError(`The folder ${target} already has files in it. Choose a new folder for the site.`);
 	const files = await planSite({
 		template: await readTemplate(template),
@@ -138,13 +139,19 @@ async function scaffold({ template, target, versions, backend, host, registryDir
 		versions,
 		backend,
 		host,
-		registry: registryDir ? localRegistry(registryDir) : void 0
+		registry: registryDir ? localRegistry(registryDir) : void 0,
+		content
 	});
 	await mkdir(target, { recursive: true });
 	for (const [path, file] of files) {
 		await mkdir(dirname(join(target, path)), { recursive: true });
 		await writeFile(join(target, path), file);
 	}
+	if (content) await setUpContentRepository(target);
+}
+/** The content repository's folder, inside the site's. */
+function contentRepositoryDir(target) {
+	return join(target, CONTENT_REPOSITORY_DIR);
 }
 //#endregion
-export { withoutRepositoryNotes as _, TEMPLATES as a, copyTemplate as c, installPackages as d, packageName as f, sitePackageJson as g, scaffold as h, ScaffoldError as i, hostsFor as l, readTemplate as m, BUNDLED_GITIGNORE$1 as n, commitAll as o, parseRepo as p, HOSTS as r, configureBackend as s, BLOCK_CHOICES as t, initGitRepository as u };
+export { parseRepo as _, HOSTS as a, sitePackageJson as b, commitAll as c, contentRepositoryDir as d, copyTemplate as f, packageName as g, installPackages as h, CONTENT_REPOSITORY_DIR$1 as i, configureBackend as l, initGitRepository as m, BUNDLED_GITIGNORE$1 as n, ScaffoldError as o, hostsFor as p, CONTENT_BUILDS as r, TEMPLATES as s, BLOCK_CHOICES as t, contentBuildsFor as u, readTemplate as v, withoutRepositoryNotes as x, scaffold as y };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-goodfellow",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Creates a new Goodfellow site: npm create goodfellow@latest my-site",
   "keywords": [
     "goodfellow",
@@ -39,10 +39,10 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@goodfellow-cms/core": "0.2.0"
+    "@goodfellow-cms/core": "0.4.0"
   },
   "devDependencies": {
-    "@goodfellow-cms/registry": "0.2.0",
+    "@goodfellow-cms/registry": "0.4.0",
     "@goodfellow-cms/example-parish": "0.0.0",
     "@goodfellow-cms/template-starter": "0.0.0",
     "@goodfellow-cms/template-next": "0.0.0"

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

@@ -67,7 +67,7 @@ jobs:
         uses: actions/configure-pages@v5
       - run: npm ci
       # Project sites live in a subfolder (/repository-name/); user and organization sites don't.
-      - run: npx next build
+      - run: npm run build
         env:
           GOODFELLOW_BASE: ${{ steps.pages.outputs.base_path }}/
       - uses: actions/upload-pages-artifact@v4

package/templates/next/.gitlab-ci.yml

@@ -21,7 +21,7 @@ pages:
       fi
     # Pages may serve the site from a subfolder, such as https://group.gitlab.io/site/.
     - export GOODFELLOW_BASE="$(node -e 'console.log(new URL(process.env.CI_PAGES_URL).pathname)')"
-    - npx next build
+    - npm run build
   pages:
     publish: out
   rules:

package/templates/next/_gitignore

@@ -3,3 +3,6 @@ node_modules/
 out/
 next-env.d.ts
 *.tsbuildinfo
+# A full-stack site's calendar files and search index, written after each build.
+public/calendars/
+public/pagefind/

package/templates/next/app/goodfellow-site.json/route.ts

@@ -0,0 +1,5 @@
+import { site } from "@/lib/site";
+
+// What the site says about its blocks, for tools that edit its content without its code, such as the Claude connector.
+export const dynamic = "force-static";
+export const GET = site.siteDescription;

package/templates/next/app/layout.tsx

@@ -4,7 +4,8 @@ import type { ReactNode } from "react";
 export default async function RootLayout({ children }: { children: ReactNode }) {
   const { settings } = await loadSite();
   return (
-    <html lang={settings.language}>
+    // A visitor's light or dark choice is put back on <html> before React starts (see the Dark mode switch block).
+    <html lang={settings.language} suppressHydrationWarning>
       <body>{children}</body>
     </html>
   );

package/templates/next/content/site.json

@@ -17,7 +17,9 @@
     },
     "fonts": {
       "body": "Inter",
-      "heading": "Fraunces"
+      "bodyCategory": "sans-serif",
+      "heading": "Fraunces",
+      "headingCategory": "serif"
     }
   },
   "title": "My site",

package/templates/parish/content/site.json

@@ -26,7 +26,9 @@
     },
     "fonts": {
       "body": "Source Sans 3",
-      "heading": "Cormorant Garamond"
+      "bodyCategory": "sans-serif",
+      "heading": "Cormorant Garamond",
+      "headingCategory": "serif"
     },
     "radius": "0.5rem"
   },

package/templates/registry/custom-html.json

@@ -24,7 +24,7 @@
   "meta": {
     "goodfellow": {
       "category": "Advanced",
-      "version": "0.2.0"
+      "version": "0.4.0"
     }
   },
   "dependencies": []

package/templates/registry/registry.json

@@ -21,7 +21,7 @@
         "goodfellow": {
           "category": "Page sections",
           "recommended": true,
-          "version": "0.2.0"
+          "version": "0.4.0"
         }
       },
       "dependencies": []
@@ -45,7 +45,7 @@
         "goodfellow": {
           "category": "Page sections",
           "recommended": true,
-          "version": "0.2.0"
+          "version": "0.4.0"
         }
       },
       "dependencies": []
@@ -69,7 +69,7 @@
         "goodfellow": {
           "category": "Page sections",
           "recommended": true,
-          "version": "0.2.0"
+          "version": "0.4.0"
         }
       },
       "dependencies": []
@@ -92,7 +92,7 @@
         "goodfellow": {
           "category": "Page sections",
           "recommended": true,
-          "version": "0.2.0"
+          "version": "0.4.0"
         }
       },
       "dependencies": []
@@ -119,7 +119,7 @@
       "meta": {
         "goodfellow": {
           "category": "Page sections",
-          "version": "0.2.0"
+          "version": "0.4.0"
         }
       }
     },
@@ -144,7 +144,7 @@
         "goodfellow": {
           "category": "Page sections",
           "recommended": true,
-          "version": "0.2.0"
+          "version": "0.4.0"
         }
       }
     },
@@ -170,7 +170,7 @@
       "meta": {
         "goodfellow": {
           "category": "Advanced",
-          "version": "0.2.0"
+          "version": "0.4.0"
         }
       },
       "dependencies": []
@@ -197,7 +197,7 @@
         "goodfellow": {
           "category": "Interactive",
           "recommended": true,
-          "version": "0.2.0"
+          "version": "0.4.0"
         }
       },
       "dependencies": []
@@ -224,7 +224,7 @@
         "goodfellow": {
           "category": "Interactive",
           "recommended": true,
-          "version": "0.2.0"
+          "version": "0.4.0"
         }
       },
       "dependencies": []
@@ -250,7 +250,7 @@
       "meta": {
         "goodfellow": {
           "category": "Interactive",
-          "version": "0.2.0"
+          "version": "0.4.0"
         }
       },
       "dependencies": []

package/templates/registry/shadcn-call-to-action.json

@@ -19,7 +19,7 @@
     "goodfellow": {
       "category": "Page sections",
       "recommended": true,
-      "version": "0.2.0"
+      "version": "0.4.0"
     }
   },
   "dependencies": []

package/templates/registry/shadcn-cards.json

@@ -19,7 +19,7 @@
     "goodfellow": {
       "category": "Page sections",
       "recommended": true,
-      "version": "0.2.0"
+      "version": "0.4.0"
     }
   },
   "dependencies": []

package/templates/registry/shadcn-carousel.json

@@ -22,7 +22,7 @@
   "meta": {
     "goodfellow": {
       "category": "Interactive",
-      "version": "0.2.0"
+      "version": "0.4.0"
     }
   },
   "dependencies": []

package/templates/registry/shadcn-faq.json

@@ -23,7 +23,7 @@
     "goodfellow": {
       "category": "Interactive",
       "recommended": true,
-      "version": "0.2.0"
+      "version": "0.4.0"
     }
   },
   "dependencies": []

package/templates/registry/shadcn-hero.json

@@ -18,7 +18,7 @@
     "goodfellow": {
       "category": "Page sections",
       "recommended": true,
-      "version": "0.2.0"
+      "version": "0.4.0"
     }
   },
   "dependencies": []

package/templates/registry/shadcn-notice.json

@@ -21,7 +21,7 @@
     "goodfellow": {
       "category": "Page sections",
       "recommended": true,
-      "version": "0.2.0"
+      "version": "0.4.0"
     }
   }
 }

package/templates/registry/shadcn-pricing.json

@@ -22,7 +22,7 @@
   "meta": {
     "goodfellow": {
       "category": "Page sections",
-      "version": "0.2.0"
+      "version": "0.4.0"
     }
   }
 }

package/templates/registry/shadcn-tabs.json

@@ -23,7 +23,7 @@
     "goodfellow": {
       "category": "Interactive",
       "recommended": true,
-      "version": "0.2.0"
+      "version": "0.4.0"
     }
   },
   "dependencies": []

package/templates/registry/shadcn-testimonials.json

@@ -18,7 +18,7 @@
     "goodfellow": {
       "category": "Page sections",
       "recommended": true,
-      "version": "0.2.0"
+      "version": "0.4.0"
     }
   },
   "dependencies": []

package/templates/starter/content/site.json

@@ -17,7 +17,9 @@
     },
     "fonts": {
       "body": "Inter",
-      "heading": "Fraunces"
+      "bodyCategory": "sans-serif",
+      "heading": "Fraunces",
+      "headingCategory": "serif"
     }
   },
   "title": "My site",

package/templates/versions.json

@@ -1,13 +1,14 @@
 {
-  "@goodfellow-cms/admin": "0.2.0",
-  "@goodfellow-cms/ai": "0.2.0",
-  "@goodfellow-cms/blocks": "0.2.0",
-  "goodfellow": "0.2.0",
-  "@goodfellow-cms/core": "0.2.0",
-  "create-goodfellow": "0.2.0",
-  "@goodfellow-cms/github": "0.2.0",
-  "@goodfellow-cms/gitlab": "0.2.0",
-  "@goodfellow-cms/next": "0.2.0",
-  "@goodfellow-cms/react": "0.2.0",
-  "@goodfellow-cms/registry": "0.2.0"
+  "@goodfellow-cms/admin": "0.4.0",
+  "@goodfellow-cms/ai": "0.4.0",
+  "@goodfellow-cms/blocks": "0.4.0",
+  "goodfellow": "0.4.0",
+  "@goodfellow-cms/core": "0.4.0",
+  "create-goodfellow": "0.4.0",
+  "@goodfellow-cms/github": "0.4.0",
+  "@goodfellow-cms/gitlab": "0.4.0",
+  "@goodfellow-cms/mcp": "0.4.0",
+  "@goodfellow-cms/next": "0.4.0",
+  "@goodfellow-cms/react": "0.4.0",
+  "@goodfellow-cms/registry": "0.4.0"
 }