@janga/norna 0.7.22 → 0.7.23

package/scripts/lib/page-aliases.mjs

@@ -0,0 +1,164 @@
+import { getSiteNodePathname } from './site-page-urls.mjs';
+import { sitemapFilename } from './sitemap.mjs';
+
+export const generatedSiteRoutes = Object.freeze([
+	Object.freeze({
+		kind: 'generated-route',
+		label: `Norna generated ${sitemapFilename}`,
+		pathname: `/${sitemapFilename}`,
+	}),
+]);
+
+const getPagePathname = (page) => page.pathname ?? getSiteNodePathname(page.contentFile ?? page);
+const getPageLabel = (page) => page.contentLabel ?? page.contentFile?.contentLabel ?? page.entry?.id ?? getPagePathname(page);
+const getPageAliases = (page) => page.aliases ?? page.data?.page?.aliases ?? [];
+
+const createIdentity = ({ kind, label, pathname, source }) => ({
+	kind,
+	label,
+	pathname,
+	source,
+});
+
+const getPublicFileIdentities = (file) => {
+	const identities = [createIdentity({
+		kind: 'public-file',
+		label: file.label,
+		pathname: file.pathname,
+		source: file,
+	})];
+
+	if (file.pathname === '/index.html') {
+		identities.push(createIdentity({
+			kind: 'public-file',
+			label: file.label,
+			pathname: '/',
+			source: file,
+		}));
+	} else if (file.pathname.endsWith('/index.html')) {
+		identities.push(createIdentity({
+			kind: 'public-file',
+			label: file.label,
+			pathname: file.pathname.slice(0, -'index.html'.length),
+			source: file,
+		}));
+	}
+
+	return identities;
+};
+
+const describeIdentity = (identity) => {
+	if (identity.kind === 'page') return `page URL from ${identity.label}`;
+	if (identity.kind === 'category') return `navigation category path from ${identity.label}`;
+	if (identity.kind === 'public-file') return `public file ${identity.label}`;
+	if (identity.kind === 'generated-route') return `generated route ${identity.label}`;
+	if (identity.kind === 'page-alias') return `page alias declared in ${identity.label}`;
+	return `${identity.kind} from ${identity.label}`;
+};
+
+const compareAliases = (left, right) => (
+	left.pathname.localeCompare(right.pathname, 'en')
+	|| left.targetPathname.localeCompare(right.targetPathname, 'en')
+	|| left.contentLabel.localeCompare(right.contentLabel, 'en')
+);
+
+export const createPageAliasModel = ({
+	pages,
+	categories = [],
+	publicFiles = [],
+	generatedRoutes = generatedSiteRoutes,
+}) => {
+	const identitiesByPathname = new Map();
+	const aliases = [];
+	const aliasesByPathname = new Map();
+	const diagnostics = [];
+
+	const addIdentity = (identity) => {
+		if (!identitiesByPathname.has(identity.pathname)) {
+			identitiesByPathname.set(identity.pathname, identity);
+		}
+	};
+
+	for (const page of pages) {
+		addIdentity(createIdentity({
+			kind: 'page',
+			label: getPageLabel(page),
+			pathname: getPagePathname(page),
+			source: page,
+		}));
+	}
+	for (const category of categories) {
+		addIdentity(createIdentity({
+			kind: 'category',
+			label: category.categorySourceLabel ?? category.nodeLabel ?? getSiteNodePathname(category),
+			pathname: getSiteNodePathname(category),
+			source: category,
+		}));
+	}
+	for (const file of publicFiles) {
+		for (const identity of getPublicFileIdentities(file)) addIdentity(identity);
+	}
+	for (const route of generatedRoutes) {
+		addIdentity(createIdentity({ ...route, source: route }));
+	}
+
+	for (const page of pages) {
+		const contentFile = page.contentFile ?? page;
+		const contentLabel = getPageLabel(page);
+		const targetPathname = getPagePathname(page);
+
+		for (const pathname of getPageAliases(page)) {
+			const alias = {
+				contentFile,
+				contentLabel,
+				page,
+				pathname,
+				targetPathname,
+			};
+			const conflict = identitiesByPathname.get(pathname);
+			if (conflict) {
+				diagnostics.push({
+					alias,
+					code: 'page-alias-collision',
+					contentFile,
+					fix: conflict.kind === 'page-alias'
+						? 'Keep the old URL on exactly one current page.'
+						: 'Remove or change the alias. A public URL can identify only one site resource.',
+					message: `Page alias "${pathname}" in ${contentLabel} conflicts with ${describeIdentity(conflict)}.`,
+					severity: 'error',
+				});
+				continue;
+			}
+
+			aliases.push(alias);
+			aliasesByPathname.set(pathname, alias);
+			addIdentity(createIdentity({
+				kind: 'page-alias',
+				label: contentLabel,
+				pathname,
+				source: alias,
+			}));
+		}
+	}
+
+	aliases.sort(compareAliases);
+
+	return {
+		aliases,
+		aliasesByPathname,
+		diagnostics,
+		identitiesByPathname,
+	};
+};
+
+export const assertPageAliasModel = (model) => {
+	if (model.diagnostics.length === 0) return model;
+
+	throw new Error([
+		'Page alias validation failed.',
+		...model.diagnostics.flatMap((diagnostic) => [
+			`- ${diagnostic.message}`,
+			`  Fix: ${diagnostic.fix}`,
+		]),
+	].join('\n'));
+};

package/scripts/lib/page-markdown.mjs

@@ -2,6 +2,10 @@ import {
 	getHeadingIdentifierIssues,
 	getMarkdownHeadings,
 } from './heading-ids.mjs';
+import {
+	extractMarkdownLinks,
+	extractNornaBlockLinks,
+} from './markdown-links.mjs';
 import {
 	extractInlineNoteDiagnostics,
 	extractMarkdownImageReferences,
@@ -9,7 +13,28 @@ import {
 	getNornaBlockImageReferences,
 } from './norna-markdown-blocks.mjs';
 
-const normalizeMarkdown = (source) => source.replace(/\r\n?/g, '\n');
+const normalizeMarkdownWithOffsets = (source) => {
+	const input = String(source);
+	let normalized = '';
+	const originalOffsets = [0];
+
+	for (let index = 0; index < input.length;) {
+		if (input[index] === '\r') {
+			index += input[index + 1] === '\n' ? 2 : 1;
+			normalized += '\n';
+			originalOffsets.push(index);
+			continue;
+		}
+
+		normalized += input[index];
+		index += 1;
+		originalOffsets.push(index);
+	}
+
+	return { normalized, originalOffsets };
+};
+
+const normalizeMarkdown = (source) => normalizeMarkdownWithOffsets(source).normalized;
 
 const hasContent = (source) => source.trim().length > 0;
 
@@ -194,7 +219,7 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 	const source = normalizeMarkdown(markdown);
 	const label = options.label ?? 'Markdown';
 	const lineOffset = options.lineOffset ?? 0;
-	const { headings } = await getMarkdownHeadings(source);
+	const { headings, tree } = await getMarkdownHeadings(source);
 	const structuralHeadings = headings.filter((heading) => heading.depth <= 2);
 	const prelude = structuralHeadings.length > 0
 		? source.slice(0, structuralHeadings[0].index)
@@ -225,6 +250,14 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 		regionId: region.id,
 		severity: 'error',
 	})));
+	const blocks = regions.flatMap((region) => region.blocks);
+	const links = [
+		...extractMarkdownLinks({ source, tree, lineOffset }),
+		...extractNornaBlockLinks({ source, blocks, lineOffset }),
+	].sort((left, right) => (
+		left.line - right.line
+		|| (left.range?.start ?? 0) - (right.range?.start ?? 0)
+	));
 	const navigationHeadings = [];
 	let parentId = null;
 	for (const heading of headings) {
@@ -240,7 +273,7 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 	}
 
 	return {
-		blocks: regions.flatMap((region) => region.blocks),
+		blocks,
 		diagnostics: [
 			...structureDiagnostics,
 			...headingDiagnostics,
@@ -252,6 +285,7 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 		intro: regions.find((region) => region.kind === 'page-intro') ?? null,
 		label,
 		lineOffset,
+		links,
 		managedImages: regions.flatMap((region) => region.managedImages),
 		markdownImages: regions.flatMap((region) => region.markdownImages),
 		navigationHeadings,
@@ -266,17 +300,33 @@ export const parsePageMarkdown = async (markdown, options = {}) => {
 };
 
 export const parsePageMarkdownSource = async (source, options = {}) => {
-	const split = splitPageMarkdownSource(source);
+	const normalization = normalizeMarkdownWithOffsets(source);
+	const split = splitPageMarkdownSource(normalization.normalized);
 	const model = await parsePageMarkdown(split.body, {
 		...options,
 		lineOffset: (options.lineOffset ?? 0) + split.lineOffset,
 	});
 
+	const toOriginalRange = (range) => {
+		if (!range) return null;
+		const normalizedStart = split.bodyOffset + range.start;
+		const normalizedEnd = split.bodyOffset + range.end;
+		return {
+			start: normalization.originalOffsets[normalizedStart] ?? normalizedStart,
+			end: normalization.originalOffsets[normalizedEnd] ?? normalizedEnd,
+		};
+	};
+
 	return {
 		...model,
-		bodyOffset: split.bodyOffset,
+		bodyOffset: normalization.originalOffsets[split.bodyOffset] ?? split.bodyOffset,
 		frontmatter: split.frontmatter,
 		frontmatterUnclosed: split.frontmatterUnclosed,
-		fullSource: normalizeMarkdown(source),
+		fullSource: String(source),
+		links: model.links.map((link) => ({
+			...link,
+			range: toOriginalRange(link.range),
+			targetRange: toOriginalRange(link.targetRange),
+		})),
 	};
 };

package/scripts/lib/presentation.mjs

@@ -12,7 +12,7 @@ import { presentationPaletteNames } from './presentation-palette-metadata.mjs';
 import { resolveThemeConfig } from './theme-presets.mjs';
 
 export { presentationPaletteNames };
-export const colorModeNames = ['system', 'light', 'dark'];
+export const appearanceNames = ['system', 'light', 'dark'];
 const sectionBackgroundPatterns = Object.freeze({
 	uniform: ['base'],
 	alternating: ['base', 'soft'],
@@ -44,7 +44,7 @@ const createPaletteMode = ({ appearance, page, surfaces, frame, css }) => {
 
 const presentationPalettes = Object.freeze({
 	'near-monochrome': Object.freeze({
-		defaultMode: 'dark',
+		defaultAppearance: 'dark',
 		modes: Object.freeze({
 			light: createPaletteMode({
 				appearance: 'light',
@@ -61,7 +61,6 @@ const presentationPalettes = Object.freeze({
 					soft: '#d8d8d3',
 					accent: '#4b4b46',
 					border: 'rgb(23 23 23 / 16%)',
-					navBackground: 'rgb(247 247 245 / 92%)',
 					navSeparator: 'rgb(23 23 23 / 24%)',
 				},
 			}),
@@ -80,14 +79,13 @@ const presentationPalettes = Object.freeze({
 					soft: '#302f2c',
 					accent: '#d8d2c8',
 					border: 'rgb(255 255 255 / 14%)',
-					navBackground: 'rgb(0 0 0 / 90%)',
 					navSeparator: 'rgb(255 255 255 / 28%)',
 				},
 			}),
 		}),
 	}),
 	'arctic-blue': Object.freeze({
-		defaultMode: 'light',
+		defaultAppearance: 'light',
 		modes: Object.freeze({
 			light: createPaletteMode({
 				appearance: 'light',
@@ -104,7 +102,6 @@ const presentationPalettes = Object.freeze({
 					soft: '#d5dfe7',
 					accent: '#2a5877',
 					border: 'rgb(32 41 50 / 16%)',
-					navBackground: 'rgb(243 246 248 / 92%)',
 					navSeparator: 'rgb(32 41 50 / 24%)',
 				},
 			}),
@@ -123,14 +120,13 @@ const presentationPalettes = Object.freeze({
 					soft: '#354655',
 					accent: '#9bc5de',
 					border: 'rgb(237 243 247 / 16%)',
-					navBackground: 'rgb(23 32 42 / 92%)',
 					navSeparator: 'rgb(237 243 247 / 28%)',
 				},
 			}),
 		}),
 	}),
 	'mineral-teal': Object.freeze({
-		defaultMode: 'light',
+		defaultAppearance: 'light',
 		modes: Object.freeze({
 			light: createPaletteMode({
 				appearance: 'light',
@@ -147,7 +143,6 @@ const presentationPalettes = Object.freeze({
 					soft: '#cfdfd9',
 					accent: '#155f5a',
 					border: 'rgb(32 54 49 / 17%)',
-					navBackground: 'rgb(238 244 241 / 92%)',
 					navSeparator: 'rgb(32 54 49 / 24%)',
 				},
 			}),
@@ -166,14 +161,13 @@ const presentationPalettes = Object.freeze({
 					soft: '#2c554f',
 					accent: '#8bd5ca',
 					border: 'rgb(237 245 241 / 16%)',
-					navBackground: 'rgb(16 45 44 / 92%)',
 					navSeparator: 'rgb(237 245 241 / 28%)',
 				},
 			}),
 		}),
 	}),
 	'soft-lavender': Object.freeze({
-		defaultMode: 'light',
+		defaultAppearance: 'light',
 		modes: Object.freeze({
 			light: createPaletteMode({
 				appearance: 'light',
@@ -190,7 +184,6 @@ const presentationPalettes = Object.freeze({
 					soft: '#ded5e7',
 					accent: '#604678',
 					border: 'rgb(46 39 54 / 16%)',
-					navBackground: 'rgb(247 243 250 / 92%)',
 					navSeparator: 'rgb(46 39 54 / 24%)',
 				},
 			}),
@@ -209,14 +202,13 @@ const presentationPalettes = Object.freeze({
 					soft: '#4b3d57',
 					accent: '#d4b7e3',
 					border: 'rgb(244 237 248 / 16%)',
-					navBackground: 'rgb(37 31 46 / 92%)',
 					navSeparator: 'rgb(244 237 248 / 28%)',
 				},
 			}),
 		}),
 	}),
 	'warm-paper': Object.freeze({
-		defaultMode: 'light',
+		defaultAppearance: 'light',
 		modes: Object.freeze({
 			light: createPaletteMode({
 				appearance: 'light',
@@ -233,7 +225,6 @@ const presentationPalettes = Object.freeze({
 					soft: '#d8d0c4',
 					accent: '#5f513c',
 					border: 'rgb(39 37 34 / 18%)',
-					navBackground: 'rgb(248 245 238 / 92%)',
 					navSeparator: 'rgb(39 37 34 / 24%)',
 				},
 			}),
@@ -252,14 +243,13 @@ const presentationPalettes = Object.freeze({
 					soft: '#3b342b',
 					accent: '#d5bea0',
 					border: 'rgb(243 237 226 / 16%)',
-					navBackground: 'rgb(27 25 22 / 92%)',
 					navSeparator: 'rgb(243 237 226 / 26%)',
 				},
 			}),
 		}),
 	}),
 	'retro-earth': Object.freeze({
-		defaultMode: 'light',
+		defaultAppearance: 'light',
 		modes: Object.freeze({
 			light: createPaletteMode({
 				appearance: 'light',
@@ -276,7 +266,6 @@ const presentationPalettes = Object.freeze({
 					soft: '#deca9c',
 					accent: '#5e4514',
 					border: 'rgb(52 41 28 / 18%)',
-					navBackground: 'rgb(247 239 217 / 92%)',
 					navSeparator: 'rgb(52 41 28 / 25%)',
 				},
 			}),
@@ -295,14 +284,13 @@ const presentationPalettes = Object.freeze({
 					soft: '#54422a',
 					accent: '#e5c36c',
 					border: 'rgb(245 232 201 / 16%)',
-					navBackground: 'rgb(40 33 23 / 92%)',
 					navSeparator: 'rgb(245 232 201 / 28%)',
 				},
 			}),
 		}),
 	}),
 	'clay-rose': Object.freeze({
-		defaultMode: 'light',
+		defaultAppearance: 'light',
 		modes: Object.freeze({
 			light: createPaletteMode({
 				appearance: 'light',
@@ -319,7 +307,6 @@ const presentationPalettes = Object.freeze({
 					soft: '#e2cfca',
 					accent: '#71313d',
 					border: 'rgb(60 41 41 / 17%)',
-					navBackground: 'rgb(247 239 237 / 92%)',
 					navSeparator: 'rgb(60 41 41 / 25%)',
 				},
 			}),
@@ -338,14 +325,13 @@ const presentationPalettes = Object.freeze({
 					soft: '#58404a',
 					accent: '#e6a7b0',
 					border: 'rgb(247 235 235 / 16%)',
-					navBackground: 'rgb(45 30 34 / 92%)',
 					navSeparator: 'rgb(247 235 235 / 28%)',
 				},
 			}),
 		}),
 	}),
 	'forest-moss': Object.freeze({
-		defaultMode: 'light',
+		defaultAppearance: 'light',
 		modes: Object.freeze({
 			light: createPaletteMode({
 				appearance: 'light',
@@ -362,7 +348,6 @@ const presentationPalettes = Object.freeze({
 					soft: '#d5ddc5',
 					accent: '#324e25',
 					border: 'rgb(38 50 37 / 17%)',
-					navBackground: 'rgb(241 243 232 / 92%)',
 					navSeparator: 'rgb(38 50 37 / 24%)',
 				},
 			}),
@@ -381,14 +366,13 @@ const presentationPalettes = Object.freeze({
 					soft: '#394c37',
 					accent: '#add493',
 					border: 'rgb(238 242 230 / 16%)',
-					navBackground: 'rgb(23 34 24 / 92%)',
 					navSeparator: 'rgb(238 242 230 / 28%)',
 				},
 			}),
 		}),
 	}),
 	'vivid-night': Object.freeze({
-		defaultMode: 'dark',
+		defaultAppearance: 'dark',
 		modes: Object.freeze({
 			light: createPaletteMode({
 				appearance: 'light',
@@ -405,7 +389,6 @@ const presentationPalettes = Object.freeze({
 					soft: '#d5daec',
 					accent: '#3b568f',
 					border: 'rgb(37 36 58 / 16%)',
-					navBackground: 'rgb(242 244 251 / 92%)',
 					navSeparator: 'rgb(37 36 58 / 24%)',
 				},
 			}),
@@ -424,7 +407,6 @@ const presentationPalettes = Object.freeze({
 					soft: '#403a58',
 					accent: '#9fe4e8',
 					border: 'rgb(244 241 255 / 16%)',
-					navBackground: 'rgb(29 27 45 / 92%)',
 					navSeparator: 'rgb(244 241 255 / 28%)',
 				},
 			}),
@@ -493,11 +475,11 @@ export const resolveThemePresentation = (theme, sourceLabel = 'theme.yaml') => {
 	const normalizedTheme = resolveThemeConfig(theme, sourceLabel);
 	const paletteName = normalizedTheme.palette ?? 'near-monochrome';
 	const palette = getPresentationPalette(paletteName);
-	const colorMode = normalizedTheme.colorMode ?? {};
+	const appearance = normalizedTheme.appearance ?? {};
 	const readerControls = normalizedTheme.readerControls ?? {};
-	const defaultColorMode = colorMode.default ?? palette.defaultMode;
-	if (!colorModeNames.includes(defaultColorMode)) {
-		throw new Error(`colorMode.default must be one of ${colorModeNames.join(', ')} in ${sourceLabel}.`);
+	const defaultAppearance = appearance.default ?? palette.defaultAppearance;
+	if (!appearanceNames.includes(defaultAppearance)) {
+		throw new Error(`appearance.default must be one of ${appearanceNames.join(', ')} in ${sourceLabel}.`);
 	}
 	const typography = resolveTypographyConfig(normalizedTheme.typography ?? defaultTypography, sourceLabel);
 	const textWidth = normalizedTheme.layout?.textWidth;
@@ -508,19 +490,19 @@ export const resolveThemePresentation = (theme, sourceLabel = 'theme.yaml') => {
 
 	return {
 		paletteName,
-		palette: palette.modes[defaultColorMode === 'dark' ? 'dark' : 'light'],
+		palette: palette.modes[defaultAppearance === 'dark' ? 'dark' : 'light'],
 		paletteModes: palette.modes,
-		colorMode: {
-			default: defaultColorMode,
+		appearance: {
+			default: defaultAppearance,
 		},
 		readerPreferences: {
 			controls: {
-				appearance: readerControls.colorMode === true,
+				appearance: readerControls.appearance === true,
 				readingWidth: true,
 				focusReading: readerControls.focusReading === true,
 			},
 			defaults: {
-				appearance: defaultColorMode,
+				appearance: defaultAppearance,
 				readingWidth: textWidth === 'narrow' ? 'narrow' : textWidth === 'wide' ? 'wide' : 'standard',
 				focusReading: 'off',
 			},

package/scripts/lib/project-config.mjs

@@ -2,6 +2,7 @@ import { readFile } from 'node:fs/promises';
 import {
 	validateConfigYamlStructure,
 } from './site-content.mjs';
+import { defaultImagePresentation, imagePresentationNames } from './image-presentation.mjs';
 import { navigationModeNames } from './navigation-model.mjs';
 import {
 	siteConfigLabel,
@@ -51,16 +52,6 @@ const readEnum = (object, key, path, allowedValues, fallback, sourceLabel = site
 	return value;
 };
 
-const readBoolean = (object, key, path, fallback, sourceLabel = siteConfigLabel) => {
-	const value = object[key] ?? fallback;
-
-	if (typeof value !== 'boolean') {
-		throw new Error(`${path}.${key} must be true or false in ${sourceLabel}.`);
-	}
-
-	return value;
-};
-
 const readFontFamily = (object, key, path, fallback, sourceLabel = siteConfigLabel) => {
 	const value = object[key] ?? fallback;
 
@@ -194,10 +185,13 @@ const readSiteUrl = (config) => {
 const localeLabels = Object.freeze({
 	en: Object.freeze({
 		breadcrumb: 'Breadcrumb',
-		colorMode: 'Color mode',
-		colorModeDark: 'Dark',
-		colorModeLight: 'Light',
-		colorModeSystem: 'System',
+		appearance: 'Appearance',
+		appearanceDark: 'Dark',
+		appearanceLight: 'Light',
+		appearanceSystem: 'System',
+		codeCopied: 'Copied',
+		codeCopyFailed: 'Could not copy code',
+		copyCode: 'Copy code',
 		displaySettings: 'Display',
 		focusReading: 'Focus reading',
 		readingWidth: 'Reading width',
@@ -213,6 +207,8 @@ const localeLabels = Object.freeze({
 		navigationMenu: 'Menu',
 		nextImage: 'Next image',
 		note: 'Note',
+		pageMoved: 'Page moved',
+		pageMovedText: 'This address now identifies',
 		pageNavigation: 'Page contents',
 		previousImage: 'Previous image',
 		siteBanners: 'Site notices',
@@ -221,10 +217,13 @@ const localeLabels = Object.freeze({
 	}),
 	sv: Object.freeze({
 		breadcrumb: 'Brödsmulor',
-		colorMode: 'Färgläge',
-		colorModeDark: 'Mörkt',
-		colorModeLight: 'Ljust',
-		colorModeSystem: 'System',
+		appearance: 'Utseende',
+		appearanceDark: 'Mörkt',
+		appearanceLight: 'Ljust',
+		appearanceSystem: 'System',
+		codeCopied: 'Kopierat',
+		codeCopyFailed: 'Kunde inte kopiera koden',
+		copyCode: 'Kopiera kod',
 		displaySettings: 'Visning',
 		focusReading: 'Fokuserad läsning',
 		readingWidth: 'Textbredd',
@@ -240,6 +239,8 @@ const localeLabels = Object.freeze({
 		navigationMenu: 'Meny',
 		nextImage: 'Nästa bild',
 		note: 'Not',
+		pageMoved: 'Sidan har flyttats',
+		pageMovedText: 'Den här adressen identifierar nu',
 		pageNavigation: 'Sidinnehåll',
 		previousImage: 'Föregående bild',
 		siteBanners: 'Meddelanden',
@@ -365,6 +366,21 @@ export const resolveThemeVisualConfig = (theme, sourceLabel = siteThemeLabel) =>
 	const resolvedContentSpacing = readEnum(rawLayoutConfig, 'contentSpacing', 'layout', contentSpacingNames, 'normal', sourceLabel);
 	const resolvedLayoutSpacingDefaults = contentSpacingProfiles[resolvedContentSpacing];
 	const corners = readEnum(rawThemeConfig, 'corners', 'theme', ['square', 'rounded'], 'rounded', sourceLabel);
+	const imagePresentation = readEnum(
+		rawImagesConfig,
+		'presentation',
+		'images',
+		imagePresentationNames,
+		defaultImagePresentation,
+		sourceLabel,
+	);
+	if (imagePresentation === 'prose-aligned' && rawImagesConfig.maxAvailableHeightPercent !== undefined) {
+		throw new Error([
+			`images.maxAvailableHeightPercent cannot be used with images.presentation "prose-aligned" in ${sourceLabel}.`,
+			'Prose-aligned images follow available horizontal space instead of a viewport-height limit.',
+			'Remove images.maxAvailableHeightPercent or set images.presentation to "centered-fit".',
+		].join('\n'));
+	}
 
 	return Object.freeze({
 		layout: Object.freeze({
@@ -392,10 +408,15 @@ export const resolveThemeVisualConfig = (theme, sourceLabel = siteThemeLabel) =>
 			}),
 		}),
 		images: Object.freeze({
-			maxAvailableHeightPercent: readResponsivePercent(rawImagesConfig, 'maxAvailableHeightPercent', 'images', Object.freeze({
-				desktop: 74,
-				mobile: 68,
-			}), sourceLabel),
+			presentation: imagePresentation,
+			...(imagePresentation === 'centered-fit'
+				? {
+					maxAvailableHeightPercent: readResponsivePercent(rawImagesConfig, 'maxAvailableHeightPercent', 'images', Object.freeze({
+						desktop: 74,
+						mobile: 68,
+					}), sourceLabel),
+				}
+				: {}),
 			maxAvailableWidthPercent: readResponsivePercent(rawImagesConfig, 'maxAvailableWidthPercent', 'images', Object.freeze({
 				desktop: 100,
 				mobile: 100,
@@ -416,6 +437,13 @@ export const resolveThemeVisualConfig = (theme, sourceLabel = siteThemeLabel) =>
 
 export const resolveNavigationConfig = (config, sourceLabel = siteConfigLabel) => {
 	const rawNavigation = assertObject(config.navigation ?? {}, 'navigation', sourceLabel);
+	if (Object.hasOwn(rawNavigation, 'sectionTracking')) {
+		throw new Error([
+			`navigation.sectionTracking is no longer supported in ${sourceLabel}.`,
+			'Section tracking is automatic on pages with a contents rail.',
+			'Remove navigation.sectionTracking.',
+		].join('\n'));
+	}
 
 	return Object.freeze({
 		mode: readEnum(
@@ -426,13 +454,6 @@ export const resolveNavigationConfig = (config, sourceLabel = siteConfigLabel) =
 			'automatic',
 			sourceLabel,
 		),
-		sectionTracking: readBoolean(
-			rawNavigation,
-			'sectionTracking',
-			'navigation',
-			false,
-			sourceLabel,
-		),
 	});
 };