@saastemly/voidcommerce 0.4.0 → 0.6.0

package/src/manifest.ts

@@ -30,9 +30,10 @@ export const MANIFEST_FILE = "voidcommerce.json";
  *   strict    EXPERIMENTAL. A monorepo turned inside out. The REPOSITORY
  *             ROOT is the storefront — its package.json, its pages, yours to
  *             edit — and the worker is generated underneath it at .vc/app
- *             from the manifest, gitignored, never hand-edited. Hosted the
- *             way a monorepo is: the worker on api.<domain>, the storefront
- *             on <domain>.
+ *             from the manifest, gitignored, never hand-edited. ONE worker
+ *             serves both at <domain>: the storefront's prerendered tree is
+ *             folded into the worker's assets at build time, so there is one
+ *             origin, one deploy, and one certificate Cloudflare issues.
  *
  * The first question, because it decides where `void init` runs and what
  * the domain means. It cannot change after init: moving files is not a
@@ -54,7 +55,7 @@ export const LAYOUTS: Array<{ id: Layout; label: string; hint: string }> = [
 	{
 		id: "strict",
 		label: "Strict (experimental)",
-		hint: "the root IS the storefront, sharing one package.json; the worker is generated under .vc/app from the manifest and never hand-edited",
+		hint: "the root IS the storefront, sharing one package.json; the worker is generated under .vc/app and serves the storefront from its own assets — one origin, one deploy",
 	},
 ];
 
@@ -68,9 +69,28 @@ export const LAYOUTS: Array<{ id: Layout; label: string; hint: string }> = [
  */
 export const isSingleApp = (layout: Layout): boolean => layout === "app";
 
-/** Does this layout carry a storefront of its own, and so a second origin to trust? */
+/** Does this layout carry a storefront of its own, in the repository? */
 export const hasFrontend = (layout: Layout): boolean => layout !== "app";
 
+/**
+ * Does ONE worker serve both the storefront and the API?
+ *
+ * `app` always did — it generates its storefront into the worker. `strict`
+ * now does too: the root's prerendered tree is merged into the worker's own
+ * assets directory at build time, so there is one origin, one hostname, one
+ * deploy, and one certificate that Cloudflare issues itself.
+ *
+ * That deletes the whole GitHub Pages half — the A/AAAA records, the CNAME
+ * file, the base-path rewriting — and with it a trap worth naming: GitHub
+ * treats any Cloudflare IP as ineligible for a certificate, so a proxied
+ * record silently stops issuance AND renewal about ninety days later, while
+ * GitHub's own health check still reports green.
+ *
+ * `monorepo` keeps the split, because there the frontend is a separate app
+ * that a person may well want hosted separately.
+ */
+export const oneOrigin = (layout: Layout): boolean => layout !== "monorepo";
+
 /**
  * Public suffixes whose second label is not a registrable name, so
  * `shop.example.co.uk` is a subdomain of `example.co.uk`, not of `co.uk`.
@@ -100,7 +120,9 @@ export function isApex(manifest: Manifest): boolean {
 /** Every hostname the worker answers on — the wrangler routes, in order. */
 export function workerHosts(manifest: Manifest): string[] {
 	const { domain } = manifest.shop;
-	if (!isSingleApp(manifest.layout)) return [`api.${domain}`];
+	// Only a monorepo puts the worker on its own hostname; everything else
+	// serves the shop and its API from one origin.
+	if (!oneOrigin(manifest.layout)) return [`api.${domain}`];
 	return isApex(manifest) ? [domain, `www.${domain}`] : [domain];
 }
 
@@ -145,7 +167,10 @@ export interface Manifest {
 		 * default that is safe to assume.
 		 */
 		taxRegistered?: boolean | undefined;
-		/** `saastemly.github.io` — the monorepo's frontend lives on GitHub Pages; the www record points here. */
+		/**
+		 * `saastemly.github.io` — only a MONOREPO has a storefront on GitHub
+		 * Pages. In `app` and `strict` the worker serves it, so this is unused.
+		 */
 		pagesHost?: string | undefined;
 	};
 	/** Chosen ids from each group, keyed by group id. */
@@ -296,7 +321,7 @@ export function validate(manifest: Manifest): string[] {
 			`DNS at Simply.com cannot host ${workerHosts(manifest)[0]} — a Worker custom domain is created by Cloudflare, in a zone on Cloudflare`,
 		);
 	}
-	if (hasFrontend(manifest.layout) && manifest.shop.pagesHost && !/^[a-z0-9-]+\.github\.io$/i.test(manifest.shop.pagesHost)) {
+	if (!oneOrigin(manifest.layout) && manifest.shop.pagesHost && !/^[a-z0-9-]+\.github\.io$/i.test(manifest.shop.pagesHost)) {
 		problems.push(`Pages host "${manifest.shop.pagesHost}" should be <owner>.github.io`);
 	}
 	return problems;

package/src/regenerate.ts

@@ -30,6 +30,7 @@ export async function generateCommand(): Promise<number> {
 		[
 			...result.written.map((file) => `${color.green("+")} ${file}`),
 			...result.kept.map((file) => `${color.dim("=")} ${file} ${color.dim("(kept)")}`),
+			...result.retired.map((file) => `${color.red("-")} ${file} ${color.dim("(retired — no longer generated)")}`),
 		].join("\n"),
 	);
 	return project.manifest.layout === "strict" ? finishStrict(project.root) : 0;

package/src/wizard.ts

@@ -1,7 +1,7 @@
 import * as p from "@clack/prompts";
 import color from "picocolors";
 import { GROUPS, type Group } from "./catalog";
-import { LAYOUTS, type Layout, type Manifest, zoneOf } from "./manifest";
+import { LAYOUTS, type Layout, type Manifest, zoneOf , oneOrigin} from "./manifest";
 
 /**
  * The forms.
@@ -98,6 +98,10 @@ async function askGroup(group: Group, previous: string[] | undefined, alsoRequir
 export async function runWizard(existing: Manifest | null, layout: Layout): Promise<Manifest> {
 	const monorepo = layout === "monorepo";
 	const frontend = layout !== "app";
+	// Only a monorepo publishes its storefront to GitHub Pages. In `strict`
+	// the worker serves it from its own assets, so there is no Pages host to
+	// ask for — and asking would imply a second origin that does not exist.
+	const onPages = !oneOrigin(layout);
 
 	const shop = unwrap(
 		await p.group(
@@ -171,7 +175,7 @@ export async function runWizard(existing: Manifest | null, layout: Layout): Prom
 						initialValue: existing?.shop.locale ?? "",
 						validate: (value) => (/^[a-z]{2}(-[A-Z]{2})?$/.test(value.trim()) ? undefined : "like da, or en-GB."),
 					}),
-				...(frontend
+				...(onPages
 					? {
 							pagesHost: () =>
 								p.text({
@@ -211,7 +215,7 @@ export async function runWizard(existing: Manifest | null, layout: Layout): Prom
 			locale: shop.locale.trim(),
 			taxRegistered: (shop as { taxRegistered?: string }).taxRegistered === "yes",
 			zone: (shop as { zone?: string }).zone?.trim().toLowerCase() || undefined,
-			pagesHost: frontend ? (shop as { pagesHost?: string }).pagesHost?.trim().toLowerCase() || undefined : undefined,
+			pagesHost: onPages ? (shop as { pagesHost?: string }).pagesHost?.trim().toLowerCase() || undefined : undefined,
 		},
 		chosen,
 	};