@goodfellow-cms/next 0.7.0 → 0.9.0

package/dist/export.d.ts

@@ -1,12 +1,7 @@
-import { PluginTaskRequest, SelfHostedResult, SiteProblem, TaskResultFile } from "@goodfellow-cms/core";
-import { SiteFile } from "@goodfellow-cms/core/node";
+import { GoodfellowConfig, PluginTaskRequest, SelfHostedResult, SiteProblem, TaskResultFile } from "@goodfellow-cms/core";
+import { ImageSizesResult, SiteFile } from "@goodfellow-cms/core/node";
 import { PageRender } from "@goodfellow-cms/core/shadcn";
 //#region src/site-files.d.ts
-/**
- * The Next.js starter's files that `goodfellow-next update` keeps up to date
- * where nobody has changed them, as the starter now has them. A test checks
- * they match `templates/next`.
- */
 export declare const NEXT_SITE_FILES: readonly SiteFile[];
 //#endregion
 //#region src/export.d.ts
@@ -35,6 +30,15 @@ export declare function writeContentApi(outDir: string, root?: string): Promise<
  * code, such as `es/feeds/`.
  */
 export declare function buildFileFolders(root?: string): Promise<string[]>;
+/** The folder `next build` wrote into, as `withGoodfellow()` recorded it: the config's `distDir`, or `.next`. */
+export declare function nextDistDir(root?: string): Promise<string>;
+/**
+ * Whether the export's pages end their addresses with `/`, as Next.js's
+ * `trailingSlash` says, which Next.js records in
+ * `.next/required-server-files.json`. `true` where it can't be read, as
+ * `withGoodfellow()` sets it.
+ */
+export declare function exportTrailingSlash(root?: string): Promise<boolean>;
 /** What `writePluginFiles()` wrote and ran. */
 export interface PluginFilesWritten {
   /** The plugins whose admin frames were written. */
@@ -84,6 +88,19 @@ export interface RedirectsWritten {
  * has a page at keeps it.
  */
 export declare function writeRedirectFiles(outDir: string, root?: string): Promise<RedirectsWritten>;
+/**
+ * Writes the smaller copies of the media library's photos that the export's
+ * pages list in their `srcset` (`writeImageSizes()`), with sharp, where
+ * `next build` said they list them (`IMAGE_SIZES_MARK`): a static export
+ * whose images Next.js doesn't optimize. `undefined` where they don't.
+ */
+export declare function writeImageFiles(outDir: string, root?: string): Promise<ImageSizesResult | undefined>;
+/**
+ * Adds Cloudflare Pages' header rules for every site to the export's
+ * `_headers`, as `goodfellow build` does (`writeSiteHeaders()`), from the
+ * admin address and broker the exported `goodfellow-site.json` names.
+ */
+export declare function writeExportHeaders(outDir: string, root?: string): Promise<void>;
 /**
  * For a site with an admin address (its config's `admin`, which the exported
  * `goodfellow-site.json` carries), puts the guard first in every page of the
@@ -143,12 +160,18 @@ export declare function exportedPages(outDir: string): Promise<BuiltPage[]>;
  */
 export declare function checkPages(pages: readonly BuiltPage[], root?: string): Promise<SiteProblem[]>;
 /**
- * Runs one of a plugin's tasks for the admin panel, as `goodfellow task`
- * does for other sites, with the site's config loaded in Node, and writes its
- * answer sealed to the request's key, even when the task fails. Secrets are
- * taken out of the environment before the config loads.
+ * Runs one of a plugin's tasks for the admin panel in one job, as
+ * `goodfellow task` does for other sites, with the site's config loaded in
+ * Node, and writes its answer sealed to the request's key, even when the task
+ * fails: for sites' task setups from before 0.9. The config loads in a process
+ * of its own, without the job's secrets in its environment, but where it can
+ * read its parent's, so the starters now write the task down with
+ * `goodfellow-next task --describe` in a job with no secrets and run it with
+ * `@goodfellow-cms/core`'s `goodfellow-task`.
  */
 export declare function writeTaskResult(root: string, request: PluginTaskRequest, out?: string): Promise<TaskResultFile>;
+/** The site's config, loaded in Node, for `writeTaskResult()`'s process that loads it apart from the job's secrets. */
+export declare function loadTaskConfig(root: string): Promise<GoodfellowConfig>;
 /**
  * Renders a page with a block from its own file as well as the site's config's,
  * for `goodfellow-next blocks add`'s check that a block it made renders: both

package/dist/export.js

@@ -1,7 +1,8 @@
-import { a as loadSiteModule, i as loadSiteConfig, n as buildPluginFrames, r as configHasPlugins } from "./plugins-K5i8XztM.js";
-import { r as NEXT_SITE_FILES } from "./site-files-BeLnLxCl.js";
+import { a as loadSiteModule, i as loadSiteConfig, n as buildPluginFrames, r as configHasPlugins } from "./plugins-UKkfu0Uj.js";
+import { t as DIST_DIR_RECORD } from "./image-sizes-mark-BOE7ObB9.js";
+import { r as NEXT_SITE_FILES } from "./site-files-Cmu3ovIs.js";
 import { CALENDARS_DIR, CLOUDFLARE_REDIRECTS_PATH, EDITOR_PRELUDE, FEEDS_DIR, SITE_DESCRIPTION_PATH, TASK_RESULT_FILE, absoluteUrl, allPages, calendarFiles, cloudflareRedirects, editorPolicy, feedFiles, hasLanguages, loadSiteContent, parseSiteDescription, pathLanguage, pluginId, redirectFiles, rootRobotsUrl, sealTaskAnswer, shownContent, siteLanguages, sitePages, taskRequestProblem, todayIn } from "@goodfellow-cms/core";
-import { BUILD_DATES_DIR, builtSiteSource, guardBuiltSite, reportedDate, runPluginBuildSteps, runPluginTask, selfHostFonts, taskSecretsFrom, writeBuildRecord } from "@goodfellow-cms/core/node";
+import { BUILD_DATES_DIR, builtSiteSource, guardBuiltSite, reportedDate, runPluginBuildSteps, runPluginTask, selfHostFonts, sitePluginsApart, taskSecretsFrom, writeBuildRecord, writeImageSizes, writeSiteHeaders } from "@goodfellow-cms/core/node";
 import { access, mkdir, readFile, readdir, rename, rm, writeFile } from "node:fs/promises";
 import { dirname, join, relative, resolve } from "node:path";
 import { createHash } from "node:crypto";
@@ -70,16 +71,34 @@ async function buildFileFolders(root = process.cwd()) {
 	const { settings } = await loadSiteContent(builtSiteSource(resolve(root)));
 	return siteLanguages(settings).flatMap((language) => [CALENDARS_DIR, FEEDS_DIR].map((dir) => `${language.prefix.slice(1)}${language.prefix ? "/" : ""}${dir}`));
 }
+/** The folder `next build` wrote into, as `withGoodfellow()` recorded it: the config's `distDir`, or `.next`. */
+async function nextDistDir(root = process.cwd()) {
+	const recorded = await readFile(join(root, DIST_DIR_RECORD), "utf8").catch(() => "");
+	return join(root, recorded.trim() || ".next");
+}
 /** The `basePath` the export was built with, which Next.js records in `.next/routes-manifest.json`. */
 async function exportBasePath(root) {
 	try {
-		const manifest = JSON.parse(await readFile(join(root, ".next/routes-manifest.json"), "utf8"));
+		const manifest = JSON.parse(await readFile(join(await nextDistDir(root), "routes-manifest.json"), "utf8"));
 		return typeof manifest.basePath === "string" ? manifest.basePath : "";
 	} catch {
 		return "";
 	}
 }
 /**
+* Whether the export's pages end their addresses with `/`, as Next.js's
+* `trailingSlash` says, which Next.js records in
+* `.next/required-server-files.json`. `true` where it can't be read, as
+* `withGoodfellow()` sets it.
+*/
+async function exportTrailingSlash(root = ".") {
+	try {
+		return JSON.parse(await readFile(join(await nextDistDir(root), "required-server-files.json"), "utf8")).config?.trailingSlash !== false;
+	} catch {
+		return true;
+	}
+}
+/**
 * Plugins' parts that builds make: each plugin's admin frame, beside the
 * editor's frames at `admin/plugins/<id>/`, and its build steps, each in a
 * process of its own held to what the plugin declared. Into a static export
@@ -137,7 +156,7 @@ async function writeFontFiles(outDir, root = process.cwd()) {
 async function writeBuildRecordFile(outDir, root = process.cwd()) {
 	const dir = resolve(root);
 	const content = await loadSiteContent(builtSiteSource(dir));
-	const date = await reportedDate(join(dir, ".next", BUILD_DATES_DIR));
+	const date = await reportedDate(join(await nextDistDir(dir), BUILD_DATES_DIR));
 	return (await writeBuildRecord(outDir, {
 		root: dir,
 		content,
@@ -168,7 +187,7 @@ async function writeRedirectFiles(outDir, root = process.cwd()) {
 		await writeFile(target, file.content);
 		written.push(file);
 	}
-	const cloudflare = cloudflareRedirects(written, base);
+	const cloudflare = cloudflareRedirects(written, base, content.settings.trailingSlash !== false);
 	const redirects = join(outDir, CLOUDFLARE_REDIRECTS_PATH.slice(1));
 	if (cloudflare.file && !await exists(redirects)) await writeFile(redirects, cloudflare.file.content);
 	return {
@@ -177,6 +196,41 @@ async function writeRedirectFiles(outDir, root = process.cwd()) {
 	};
 }
 /**
+* Writes the smaller copies of the media library's photos that the export's
+* pages list in their `srcset` (`writeImageSizes()`), with sharp, where
+* `next build` said they list them (`IMAGE_SIZES_MARK`): a static export
+* whose images Next.js doesn't optimize. `undefined` where they don't.
+*/
+async function writeImageFiles(outDir, root = process.cwd()) {
+	const dir = resolve(root);
+	if (!await exists(join(await nextDistDir(dir), "goodfellow-image-sizes"))) return void 0;
+	return writeImageSizes(dir, outDir, { resize: await sharpResizer() });
+}
+/** Makes the copies with sharp, as WebP, turned as each photo's details say and without them, unless it can't load here. */
+async function sharpResizer() {
+	try {
+		const { default: sharp } = await import("sharp");
+		return async (image, width) => new Uint8Array(await sharp(image).rotate().resize({ width }).webp({ quality: 80 }).toBuffer());
+	} catch {
+		return;
+	}
+}
+/**
+* Adds Cloudflare Pages' header rules for every site to the export's
+* `_headers`, as `goodfellow build` does (`writeSiteHeaders()`), from the
+* admin address and broker the exported `goodfellow-site.json` names.
+*/
+async function writeExportHeaders(outDir, root = process.cwd()) {
+	const text = await readFile(join(outDir, SITE_DESCRIPTION_PATH), "utf8").catch(() => void 0);
+	const parsed = text === void 0 ? void 0 : parseSiteDescription(text);
+	const description = parsed?.ok ? parsed.description : void 0;
+	await writeSiteHeaders(outDir, {
+		base: `${await exportBasePath(resolve(root))}/`,
+		...description?.admin && { admin: description.admin },
+		...description?.broker && { broker: description.broker }
+	});
+}
+/**
 * For a site with an admin address (its config's `admin`, which the exported
 * `goodfellow-site.json` carries), puts the guard first in every page of the
 * export and adds Cloudflare Pages' header rules, as `goodfellow build` does.
@@ -275,7 +329,7 @@ async function writePageLanguages(outDir, root = process.cwd()) {
 	const dir = resolve(root);
 	const { settings } = await loadSiteContent(builtSiteSource(dir));
 	if (!hasLanguages(settings)) return 0;
-	const base = outDir ?? join(dir, ".next/server/app");
+	const base = outDir ?? join(await nextDistDir(dir), "server/app");
 	const files = (await readdir(base, { recursive: true })).map((file) => file.split("\\").join("/")).filter((file) => file.endsWith(".html") && !/^(admin|_next|pagefind)\//.test(file));
 	let changed = 0;
 	for (const file of files) {
@@ -295,7 +349,7 @@ async function writePageLanguages(outDir, root = process.cwd()) {
 * and keeps their HTML in `.next/server/app/`. The admin panel and Next.js's own pages are left out.
 */
 async function builtPages(root = process.cwd()) {
-	const next = join(resolve(root), ".next");
+	const next = await nextDistDir(resolve(root));
 	const manifest = JSON.parse(await readFile(join(next, "prerender-manifest.json"), "utf8"));
 	const trailingSlash = JSON.parse(await readFile(join(next, "required-server-files.json"), "utf8")).config?.trailingSlash === true;
 	const pages = [];
@@ -353,10 +407,14 @@ async function checkPages(pages, root = process.cwd()) {
 	}));
 }
 /**
-* Runs one of a plugin's tasks for the admin panel, as `goodfellow task`
-* does for other sites, with the site's config loaded in Node, and writes its
-* answer sealed to the request's key, even when the task fails. Secrets are
-* taken out of the environment before the config loads.
+* Runs one of a plugin's tasks for the admin panel in one job, as
+* `goodfellow task` does for other sites, with the site's config loaded in
+* Node, and writes its answer sealed to the request's key, even when the task
+* fails: for sites' task setups from before 0.9. The config loads in a process
+* of its own, without the job's secrets in its environment, but where it can
+* read its parent's, so the starters now write the task down with
+* `goodfellow-next task --describe` in a job with no secrets and run it with
+* `@goodfellow-cms/core`'s `goodfellow-task`.
 */
 async function writeTaskResult(root, request, out = TASK_RESULT_FILE) {
 	const secrets = taskSecretsFrom(process.env);
@@ -364,7 +422,10 @@ async function writeTaskResult(root, request, out = TASK_RESULT_FILE) {
 	if (problem) throw new Error(problem);
 	let answer;
 	try {
-		const plugin = ((await loadSiteConfig(resolve(root))).plugins ?? []).find((candidate) => pluginId(candidate.name) === request.plugin);
+		const plugin = (await sitePluginsApart(resolve(root), {
+			module: import.meta.url,
+			export: "loadTaskConfig"
+		})).find((candidate) => pluginId(candidate.name) === request.plugin);
 		answer = plugin ? await runPluginTask({
 			root: resolve(root),
 			plugin,
@@ -385,6 +446,10 @@ async function writeTaskResult(root, request, out = TASK_RESULT_FILE) {
 	await writeFile(resolve(root, out), `${JSON.stringify(sealed)}\n`);
 	return sealed;
 }
+/** The site's config, loaded in Node, for `writeTaskResult()`'s process that loads it apart from the job's secrets. */
+function loadTaskConfig(root) {
+	return loadSiteConfig(root);
+}
 /**
 * Renders a page with a block from its own file as well as the site's config's,
 * for `goodfellow-next blocks add`'s check that a block it made renders: both
@@ -410,4 +475,4 @@ function blockPageRender(root) {
 	};
 }
 //#endregion
-export { EDITOR_PAGES, NEXT_SITE_FILES, blockPageRender, buildFileFolders, builtPages, checkPages, exportedPages, fixSegmentFiles, guardExport, writeBuildRecordFile, writeCalendarFiles, writeContentApi, writeEditorPolicy, writeFeedFiles, writeFontFiles, writePageLanguages, writePluginFiles, writeRedirectFiles, writeTaskResult };
+export { EDITOR_PAGES, NEXT_SITE_FILES, blockPageRender, buildFileFolders, builtPages, checkPages, exportTrailingSlash, exportedPages, fixSegmentFiles, guardExport, loadTaskConfig, nextDistDir, writeBuildRecordFile, writeCalendarFiles, writeContentApi, writeEditorPolicy, writeExportHeaders, writeFeedFiles, writeFontFiles, writeImageFiles, writePageLanguages, writePluginFiles, writeRedirectFiles, writeTaskResult };

package/dist/image-sizes-mark-BOE7ObB9.js

@@ -0,0 +1,17 @@
+//#region src/image-sizes-mark.ts
+/**
+* Set while `next build` renders a static export whose images Next.js doesn't
+* optimize, so pages list the smaller copies of the media library's photos
+* (`imageWidths`) that `goodfellow-next finish` writes.
+*/
+const IMAGE_SIZES_ENV = "GOODFELLOW_IMAGE_SIZES";
+/** The file in `.next/` that tells `goodfellow-next finish` the pages list them. */
+const IMAGE_SIZES_MARK = "goodfellow-image-sizes";
+/**
+* Where `withGoodfellow()` records the folder `next build` writes into (the
+* config's `distDir`, `.next` unless it says otherwise), relative to the site,
+* for `goodfellow-next finish`, which runs after it in a process of its own.
+*/
+const DIST_DIR_RECORD = "node_modules/.goodfellow/next-dist-dir";
+//#endregion
+export { IMAGE_SIZES_ENV as n, IMAGE_SIZES_MARK as r, DIST_DIR_RECORD as t };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AdminSite, GoodfellowConfig, Page, SiteContent } from "@goodfellow-cms/core";
+import { AdminSite, GoodfellowConfig, ImageSize, Page, SiteContent } from "@goodfellow-cms/core";
 import { ReactNode } from "react";
 import { Metadata, MetadataRoute } from "next";
 //#region src/index.d.ts
@@ -24,8 +24,11 @@ export interface PageProps {
  * content edits show on reload in development.
  */
 export declare const loadSite: (root?: string) => Promise<SiteContent>;
-/** A page's title, description and link previews, as Next.js metadata. */
-export declare function pageMetadata(content: SiteContent, page: Page, basePath?: string): Metadata;
+/**
+ * A page's title, description, search engine settings and link previews, as
+ * Next.js metadata, with the shared picture's size where `media` has it.
+ */
+export declare function pageMetadata(content: SiteContent, page: Page, basePath?: string, media?: Readonly<Record<string, ImageSize>>): Metadata;
 /**
  * Renders the site's pages in a Next.js App Router site, as Server Components.
  * Blocks' links to the site's pages use `next/link`, and their images
@@ -75,7 +78,10 @@ export declare function goodfellowPages(config: GoodfellowConfig, options?: Good
    * edit its content without its code, such as the Claude connector.
    */
   siteDescription(): Response;
-  /** For `app/robots.ts`: lets search engines in, and points them at the sitemap once the site's address is set. */
+  /**
+   * For `app/robots.ts`: lets search engines in, asks AI training's crawlers to stay out where Site Settings
+   * says so, and points them at the sitemap once the site's address is set (`robotsRules()`).
+   */
   robots(): Promise<MetadataRoute.Robots>;
 };
 //#endregion

package/dist/index.js

@@ -1,7 +1,8 @@
-import { ByLanguage, CurrentMenuLinks, NextImage, NextLink, PageLanguage } from "./components.js";
-import { absoluteUrl, adminSiteForCopy, colorSchemeMeta, colorSchemeScript, contentForPage, demoContent, describedForCopy, feedLinks, findRedirect, fontPreloads, googleFontsUrl, hasLanguages, languageMap, loadSiteContent, normalizePagePath, pageHead, shownContent, siteCopyFrom, siteLanguages, sitePages, sitemapPages, storedMediaSizes, themeToCss, todayIn, withBase } from "@goodfellow-cms/core";
+import { ByLanguage, CurrentMenuLinks, GoatCounterNavigation, NextImage, NextLink, PageLanguage, SearchResultLinks } from "./components.js";
+import "./image-sizes-mark-BOE7ObB9.js";
+import { BLOCK_SCRIPTS, DARK_MODE_ATTRIBUTE, IMAGE_WIDTHS, TRAILING_SLASH_VARIABLE, absoluteUrl, adminSiteForCopy, colorSchemeMeta, colorSchemeScript, consentScript, contentForPage, customFontPreloads, demoContent, describedForCopy, feedLinks, findRedirect, fontPreloads, googleFontsUrl, hasLanguages, heldCode, heldStats, languageMap, loadSiteContent, normalizePagePath, pageHead, robotsRules, shownContent, siteCopyFrom, siteLanguages, sitePages, sitemapPages, storedMediaSizes, themeToCss, todayIn, withBase, withSelfHostedFonts } from "@goodfellow-cms/core";
 import { BUILD_DATES_ENV, builtSiteSource, fileSystemSource, fontStandIns, readMediaSizes, readStylesheet, reportDatesTo } from "@goodfellow-cms/core/node";
-import { BodyCode, HeadCode, PageBody, PageContent, PageFooter, PageHeader, adminSite, applyPageEntry, createPuckConfigs, describeSite, prepareLayout, preparePage } from "@goodfellow-cms/react";
+import { BodyCode, HeadCode, PageBody, PageContent, PageFooter, PageHeader, StatsCode, adminSite, applyPageEntry, createPuckConfigs, describeSite, prepareLayout, preparePage } from "@goodfellow-cms/react";
 import { notFound, redirect } from "next/navigation";
 import { cache } from "react";
 import { preload } from "react-dom";
@@ -19,12 +20,31 @@ function configuredBasePath() {
 	return process.env.GOODFELLOW_BASE_PATH ?? "";
 }
 /**
+* Where a full-stack site's build copied its Google Fonts (`hostFonts()`), for
+* the stylesheet at `source`. `withGoodfellow()` puts them in the env, which
+* Next.js writes into this code by its name, so pages it renders later have
+* them too. Static exports have none: `goodfellow-next finish` copies theirs.
+*/
+function hostedFonts(source) {
+	const value = process.env.GOODFELLOW_FONTS;
+	if (!value) return void 0;
+	try {
+		const fonts = JSON.parse(value);
+		return fonts.source === source ? fonts : void 0;
+	} catch {
+		return;
+	}
+}
+/**
 * Reads the site's content from disk, as visitors see it now: without pages
 * and items scheduled for later, or hidden again (`shownContent()`). Cached
 * for the length of one request, so a page and its metadata read it once, and
 * content edits show on reload in development.
 */
-const loadSite = cache(async (root = process.cwd()) => shownContent(await loadSiteContent(builtSiteSource(root))));
+const loadSite = cache(async (root = process.cwd()) => shownContent(await loadSiteContent(builtSiteSource(root, {
+	...process.env,
+	[TRAILING_SLASH_VARIABLE]: process.env.GOODFELLOW_TRAILING_SLASH
+}))));
 function pathOf(segments) {
 	try {
 		return normalizePagePath(`/${(segments ?? []).map((segment) => decodeURIComponent(segment)).join("/")}`);
@@ -39,20 +59,49 @@ function exportedPages(content, blocks) {
 function findPage(content, blocks, path) {
 	return exportedPages(content, blocks).find((page) => page.path === path);
 }
+/** Whether the site asks visitors before loading other sites' content. */
+function asks(content) {
+	return content.settings.consent !== void 0;
+}
+/** The consent script, after the footer's notice, on a site that asks. */
+function ConsentAsk({ content }) {
+	if (!asks(content)) return null;
+	return /* @__PURE__ */ jsx("script", { dangerouslySetInnerHTML: { __html: consentScript() } });
+}
+/**
+* What the built-in blocks need in the browser (copying code, the Dark mode
+* switch, search), each a small script that works on what navigations add.
+* `goodfellow build` adds each only to pages that use it; a layout can't know
+* the page, so it has them all, but the Dark mode switch's only where the
+* site has dark mode, since it shows nothing otherwise.
+*/
+function BlockScripts({ content }) {
+	const scripts = BLOCK_SCRIPTS.filter(({ attribute }) => attribute !== DARK_MODE_ATTRIBUTE || content.settings.theme.darkMode);
+	return /* @__PURE__ */ jsx(Fragment, { children: scripts.map(({ attribute, script }) => /* @__PURE__ */ jsx("script", { dangerouslySetInnerHTML: { __html: script() } }, attribute)) });
+}
 function toAbsolute(siteUrl, url) {
 	if (!url || !siteUrl || !url.startsWith("/") || url.startsWith("//")) return url;
 	return absoluteUrl(siteUrl, url);
 }
-/** A page's title, description and link previews, as Next.js metadata. */
-function pageMetadata(content, page, basePath = configuredBasePath()) {
+/**
+* A page's title, description, search engine settings and link previews, as
+* Next.js metadata, with the shared picture's size where `media` has it.
+*/
+function pageMetadata(content, page, basePath = configuredBasePath(), media = {}) {
 	const head = pageHead(content, page);
 	const socialImage = toAbsolute(content.settings.url, head.socialImage);
+	const socialSize = head.socialImage ? media[head.socialImage] : void 0;
 	const feeds = feedLinks(contentForPage(content, page));
 	return {
 		...content.settings.url && { metadataBase: new URL(content.settings.url) },
 		title: { absolute: head.title },
 		...head.description && { description: head.description },
-		...head.noIndex && { robots: { index: false } },
+		robots: {
+			...head.noIndex && { index: false },
+			...head.noFollow && { follow: false },
+			...!head.noIndex && head.noSnippet && { nosnippet: true },
+			...!head.noIndex && { "max-image-preview": "large" }
+		},
 		...(head.canonicalUrl || feeds.length > 0) && { alternates: {
 			...head.canonicalUrl && { canonical: head.canonicalUrl },
 			...head.alternates && { languages: Object.fromEntries(head.alternates.map(({ language, href }) => [language, href])) },
@@ -63,12 +112,25 @@ function pageMetadata(content, page, basePath = configuredBasePath()) {
 		} },
 		...head.favicon && { icons: { icon: withBase(head.favicon, basePath) } },
 		openGraph: {
-			type: "website",
+			...head.type === "article" ? {
+				type: "article",
+				...head.publishedTime && { publishedTime: head.publishedTime }
+			} : { type: "website" },
+			siteName: head.siteName,
+			locale: head.locale,
 			title: head.title,
 			...head.description && { description: head.description },
 			...head.canonicalUrl && { url: head.canonicalUrl },
-			...socialImage && /^https?:\/\//.test(socialImage) && { images: [socialImage] }
-		}
+			...socialImage && /^https?:\/\//.test(socialImage) && { images: [{
+				url: socialImage,
+				...socialSize && {
+					width: socialSize.width,
+					height: socialSize.height
+				},
+				...head.socialImageAlt && { alt: head.socialImageAlt }
+			}] }
+		},
+		twitter: { card: head.card }
 	};
 }
 /**
@@ -90,17 +152,29 @@ function goodfellowPages(config, options = {}) {
 		media: {
 			...await readMediaSizes(root),
 			...storedMediaSizes((await site()).mediaStorage)
-		}
+		},
+		...process.env["GOODFELLOW_IMAGE_SIZES"] && { imageWidths: IMAGE_WIDTHS }
 	});
 	/** The site's theme and fonts, which React moves into the document's head. themeToCss escapes its output. */
 	async function Theme({ content }) {
-		const fontsUrl = googleFontsUrl(content.settings.theme);
-		const [fontFiles, standIns] = await Promise.all([fontPreloads(content.settings.theme, readStylesheet), fontStandIns(content.settings.theme)]);
-		for (const href of fontFiles) preload(href, {
+		const googleUrl = googleFontsUrl(content.settings.theme);
+		const hosted = googleUrl ? hostedFonts(googleUrl) : void 0;
+		const fontsUrl = googleUrl && hosted ? withSelfHostedFonts(googleUrl, hosted, basePath()) : googleUrl;
+		const [fontFiles, standIns] = await Promise.all([fontPreloads(content.settings.theme, readStylesheet), fontStandIns(content.settings.theme, { root })]);
+		for (const file of customFontPreloads(content.settings.theme)) preload(withBase(file, basePath()), {
 			as: "font",
 			type: "font/woff2",
 			crossOrigin: ""
 		});
+		for (const file of fontFiles) {
+			const href = hosted ? withSelfHostedFonts(file, hosted, basePath()) : file;
+			if (hosted && href === file) continue;
+			preload(href, {
+				as: "font",
+				type: "font/woff2",
+				crossOrigin: ""
+			});
+		}
 		const colorScheme = colorSchemeMeta(content.settings.theme);
 		const schemeScript = colorSchemeScript(content.settings.theme);
 		return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -112,7 +186,7 @@ function goodfellowPages(config, options = {}) {
 			/* @__PURE__ */ jsx("style", {
 				href: "goodfellow-theme",
 				precedence: "default",
-				children: themeToCss(content.settings.theme, standIns)
+				children: themeToCss(content.settings.theme, standIns, { base: basePath() })
 			}),
 			fontsUrl && /* @__PURE__ */ jsx("link", {
 				rel: "stylesheet",
@@ -129,7 +203,8 @@ function goodfellowPages(config, options = {}) {
 		async generateMetadata({ params }) {
 			const content = await site();
 			const page = findPage(content, config.blocks, pathOf((await params).path));
-			return page ? pageMetadata(content, applyPageEntry(configs, content, page), basePath()) : {};
+			if (!page) return {};
+			return pageMetadata(content, applyPageEntry(configs, content, page), basePath(), (await renderOptions()).media);
 		},
 		/**
 		* For `app/admin/page.tsx`: what the admin panel's page knows about the
@@ -197,12 +272,27 @@ function goodfellowPages(config, options = {}) {
 			}
 			return /* @__PURE__ */ jsxs(Fragment, { children: [
 				/* @__PURE__ */ jsx(Theme, { content }),
-				/* @__PURE__ */ jsx(HeadCode, { code: content.code?.head }),
+				/* @__PURE__ */ jsx(HeadCode, {
+					code: content.code?.head,
+					held: heldCode(content.settings.consent, "head"),
+					siteUrl: content.settings.url
+				}),
+				/* @__PURE__ */ jsx(StatsCode, {
+					stats: content.settings.stats,
+					held: heldStats(content.settings.consent, content.settings.stats)
+				}),
 				header,
 				children,
 				footer,
 				/* @__PURE__ */ jsx(CurrentMenuLinks, { basePath: basePath() }),
-				/* @__PURE__ */ jsx(BodyCode, { code: content.code?.body })
+				content.settings.stats?.service === "goatcounter" && process.env.NODE_ENV !== "development" && /* @__PURE__ */ jsx(GoatCounterNavigation, {}),
+				/* @__PURE__ */ jsx(SearchResultLinks, { basePath: basePath() }),
+				/* @__PURE__ */ jsx(BodyCode, {
+					code: content.code?.body,
+					held: heldCode(content.settings.consent, "body")
+				}),
+				/* @__PURE__ */ jsx(ConsentAsk, { content }),
+				/* @__PURE__ */ jsx(BlockScripts, { content })
 			] });
 		},
 		/** The page at the route's address, inside `Layout`'s header and footer. */
@@ -237,7 +327,11 @@ function goodfellowPages(config, options = {}) {
 			return /* @__PURE__ */ jsxs(Fragment, { children: [
 				/* @__PURE__ */ jsx("title", { children: pageHead(content, page).title }),
 				/* @__PURE__ */ jsx(Theme, { content }),
-				/* @__PURE__ */ jsx(HeadCode, { code: content.code?.head }),
+				/* @__PURE__ */ jsx(HeadCode, {
+					code: content.code?.head,
+					held: heldCode(content.settings.consent, "head"),
+					siteUrl: content.settings.url
+				}),
 				/* @__PURE__ */ jsx(PageBody, {
 					site: prepared.site,
 					pageConfig: prepared.pageConfig,
@@ -246,7 +340,13 @@ function goodfellowPages(config, options = {}) {
 					header: prepared.header,
 					footer: prepared.footer
 				}),
-				/* @__PURE__ */ jsx(BodyCode, { code: content.code?.body })
+				/* @__PURE__ */ jsx(BodyCode, {
+					code: content.code?.body,
+					held: heldCode(content.settings.consent, "body")
+				}),
+				/* @__PURE__ */ jsx(ConsentAsk, { content }),
+				/* @__PURE__ */ jsx(BlockScripts, { content }),
+				/* @__PURE__ */ jsx(SearchResultLinks, { basePath: basePath() })
 			] });
 		},
 		/** For `app/sitemap.ts`: every page but "Page not found" and pages hidden from search engines, once the site's address is set. */
@@ -273,15 +373,15 @@ function goodfellowPages(config, options = {}) {
 		siteDescription() {
 			return Response.json(describedForCopy(describeSite(config), siteCopyFrom(process.env)));
 		},
-		/** For `app/robots.ts`: lets search engines in, and points them at the sitemap once the site's address is set. */
+		/**
+		* For `app/robots.ts`: lets search engines in, asks AI training's crawlers to stay out where Site Settings
+		* says so, and points them at the sitemap once the site's address is set (`robotsRules()`).
+		*/
 		async robots() {
-			const url = (await site()).settings.url;
+			const { settings } = await site();
 			return {
-				rules: {
-					userAgent: "*",
-					allow: "/"
-				},
-				...url && { sitemap: absoluteUrl(url, "/sitemap.xml") }
+				rules: robotsRules(settings),
+				...settings.url && { sitemap: absoluteUrl(settings.url, "/sitemap.xml") }
 			};
 		}
 	};

package/dist/{plugins-K5i8XztM.js → plugins-UKkfu0Uj.js}

@@ -1,5 +1,5 @@
 import { EDITOR_PRELUDE, INSTALLED_PLUGINS_INDEX, PLUGINS_PATH, framedPlugins, pluginFrameEntry, pluginFramePage, pluginId } from "@goodfellow-cms/core";
-import { LICENSES_FILE, licensesPlugin } from "@goodfellow-cms/core/node";
+import { LICENSES_FILE, licensesPlugin, mediaStorageOrigins } from "@goodfellow-cms/core/node";
 import { existsSync } from "node:fs";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { isAbsolute, join, resolve } from "node:path";
@@ -125,7 +125,8 @@ async function buildPluginFrame(plugin, { root, dir, watch }) {
 			scripts: ["plugin.js"],
 			stylesheets: ["plugin.css"],
 			licenses: LICENSES_FILE,
-			editor: Boolean(plugin.editor)
+			editor: Boolean(plugin.editor),
+			...plugin.editor && { media: await mediaStorageOrigins(root) }
 		}));
 	};
 	const options = {

package/dist/server.d.ts

@@ -38,6 +38,13 @@ export interface GoodfellowApiOptions {
    * `plugins/<id>/…`, and runs with everything the server has.
    */
   plugins?: AppApiOptions["plugins"];
+  /**
+   * Whether owners' changes to the site's code, such as adding blocks on the
+   * Blocks screen, go to a developer for review (`"review"`, the default),
+   * since this server runs that code with its token and keys, or are published
+   * (`"publish"`).
+   */
+  codeChanges?: AppApiOptions["codeChanges"];
 }
 /** The route parameters of a catch-all route named `[...path]`. */
 interface RouteContext {

package/dist/server.js

@@ -1,3 +1,4 @@
+import { ownersOnlyFields } from "@goodfellow-cms/core";
 import { appApi } from "@goodfellow-cms/core/node";
 import { aiServer } from "@goodfellow-cms/ai";
 //#region src/server.ts
@@ -32,7 +33,9 @@ function goodfellowApi(options) {
 			...options.signOut && { signOut: options.signOut },
 			...ai && ai.services.length > 0 && { ai },
 			...options.onError && { onError: options.onError },
-			...options.plugins && { plugins: options.plugins }
+			...options.plugins && { plugins: options.plugins },
+			...options.codeChanges && { codeChanges: options.codeChanges },
+			ownersOnly: ownersOnlyFields(options.config.blocks ?? {})
 		});
 		return api;
 	}