@janga/norna 0.7.28 → 0.7.30

package/scripts/add-site-node.mjs

@@ -1,103 +1,32 @@
 import path from 'node:path';
 import { invocationRoot, siteDir, siteProjectRoot } from './lib/site-paths.mjs';
 import { createSiteNode, planSiteNodeCreation } from './lib/site-node-create.mjs';
-
-const usage = `
-Usage:
-  norna page:add <title> [--parent <path>] [--slug <slug>] [--order <NNN>] [--dry-run]
-
-Parent selection:
-  --parent /                 Add a top-level node
-  --parent /guides/         Add a child below the guides node
-  no --parent               Use the site root, current node directory, or site/pages/
-`.trim();
-
-const parseValueOption = (rawArgs, index, name) => {
-	const arg = rawArgs[index];
-	if (arg === name) {
-		const value = rawArgs[index + 1];
-		if (!value || value.startsWith('-')) throw new Error(`${name} requires a value.\n${usage}`);
-		return { consumed: 2, value };
-	}
-	if (arg.startsWith(`${name}=`)) {
-		const value = arg.slice(name.length + 1);
-		if (!value) throw new Error(`${name} requires a value.\n${usage}`);
-		return { consumed: 1, value };
-	}
-	return null;
-};
-
-const parseArgs = (rawArgs) => {
-	const options = {
-		dryRun: false,
-		help: false,
-		order: null,
-		parent: null,
-		slug: null,
-		titleParts: [],
-	};
-	const seen = new Set();
-
-	for (let index = 0; index < rawArgs.length;) {
-		const arg = rawArgs[index];
-		if (arg === '-h' || arg === '--help') {
-			options.help = true;
-			index += 1;
-			continue;
-		}
-		if (arg === '--dry-run') {
-			if (seen.has('dryRun')) throw new Error(`--dry-run may be specified only once.\n${usage}`);
-			seen.add('dryRun');
-			options.dryRun = true;
-			index += 1;
-			continue;
-		}
-
-		let matched = false;
-		for (const [name, key] of [['--order', 'order'], ['--parent', 'parent'], ['--slug', 'slug']]) {
-			const parsed = parseValueOption(rawArgs, index, name);
-			if (!parsed) continue;
-			if (seen.has(key)) throw new Error(`${name} may be specified only once.\n${usage}`);
-			seen.add(key);
-			options[key] = parsed.value;
-			index += parsed.consumed;
-			matched = true;
-			break;
-		}
-		if (matched) continue;
-
-		if (arg.startsWith('-')) throw new Error(`Unknown option: ${arg}\n${usage}`);
-		options.titleParts.push(arg);
-		index += 1;
-	}
-
-	return options;
-};
-
-const toDisplayPath = (filePath) => {
-	const relativePath = path.relative(siteProjectRoot, filePath);
-	return (relativePath && !relativePath.startsWith('..') && !path.isAbsolute(relativePath)
-		? relativePath
-		: filePath).split(path.sep).join('/');
-};
-
-const [kind, ...rawArgs] = process.argv.slice(2);
-if (kind !== 'page') throw new Error(usage);
-const options = parseArgs(rawArgs);
-if (options.help) {
-	console.log(usage);
-	process.exit(0);
-}
-
-const title = options.titleParts.join(' ').trim();
-if (!title || /[\r\n]/.test(title)) throw new Error(`A one-line page title is required.\n${usage}`);
-const plan = await planSiteNodeCreation({
-	siteRoot: siteDir, kind, title, slug: options.slug, order: options.order,
-	parentPath: options.parent, invocationDirectory: invocationRoot,
-});
-const { destination, pagePath } = plan;
-const action = options.dryRun ? 'Would create' : 'Created';
-if (!options.dryRun) await createSiteNode(plan);
-
-console.log(`${action} page "${title}" at ${toDisplayPath(destination)}.`);
-console.log(`URL: /${pagePath}/`);
+import { parsePlacementArguments, confirmCliRenumbering, describeRenumbering } from './lib/page-placement-cli.mjs';
+
+const usage = `Usage:
+  norna page:add <title> [--parent <path>] [--first | --last] [--slug <slug>]
+  norna page:add <title> --before <page-url> | --after <page-url>
+
+Options: --order <integer>, --dry-run, --allow-renumber
+Without a placement, append under --parent or the current page/site directory.
+Before/after infer the parent. --order cannot accompany a relative placement.`;
+const display = filename => path.relative(siteProjectRoot, filename) || filename;
+try {
+ const [kind, ...args] = process.argv.slice(2);
+ if (kind !== 'page') throw new Error(usage);
+ const options = parsePlacementArguments(args);
+ if (options.help) { console.log(usage); process.exit(0); }
+ if (options.write || options.noAliases) throw new Error('page:add uses --dry-run; --write and --no-aliases are page:move options.');
+ const title = options.positionals.join(' ').trim();
+ if (!title) throw new Error(`A one-line page title is required.\n${usage}`);
+ const plan = await planSiteNodeCreation({ siteRoot: siteDir, kind, title, slug: options.slug, order: options.order,
+  parentPath: options.parent, invocationDirectory: invocationRoot,
+  placement: options.order !== null ? null : options.placement, targetPath: options.target });
+ console.log(`Page: ${title}\nSource: ${display(plan.destination)}\nURL: ${plan.url}\nOrder: ${plan.order}`);
+ const renumbering = describeRenumbering(plan.orderChanges, display);
+ if (renumbering) console.log(renumbering);
+ if (options.dryRun) { console.log(`Would create page "${title}". Dry run only. No files changed.`); process.exit(0); }
+ if (!await confirmCliRenumbering(plan.orderChanges, options)) { console.log('Cancelled. No files changed.'); process.exit(0); }
+ const result = await createSiteNode(plan, { allowRenumber: true });
+ console.log(`Created page "${title}" at ${display(plan.destination)}. ${result.renumberedPages} existing sibling page(s) renumbered.`);
+} catch (error) { console.error(error.message); process.exitCode = 1; }

package/scripts/dev-local.mjs

@@ -1,3 +1,5 @@
+import { randomUUID } from 'node:crypto';
+import { readDevServerIdentity, verifyDevServer } from './lib/dev-server-identity.mjs';
 import { execFile } from 'node:child_process';
 import { mkdir, readFile, rm, writeFile } from 'node:fs/promises';
 import net from 'node:net';
@@ -10,11 +12,14 @@ import {
 	engineRoot,
 	siteProjectRoot,
 	siteStateDir,
+	siteDir,
 } from './lib/site-paths.mjs';
 
 const execFileAsync = promisify(execFile);
 
-const port = Number.parseInt(process.env.NORNA_DEV_PORT ?? '4321', 10);
+const portValue = process.env.NORNA_DEV_PORT ?? '4321';
+const port = /^\d+$/.test(portValue) ? Number(portValue) : NaN;
+const serverToken = process.env.NORNA_DEV_START_TOKEN || randomUUID();
 if (!Number.isInteger(port) || port < 1 || port > 65_535) {
 	throw new Error('NORNA_DEV_PORT must be an integer from 1 through 65535.');
 }
@@ -107,6 +112,8 @@ const writeState = async (host) => {
 	await writeFile(statePath, `${JSON.stringify({
 		port,
 		pid,
+		token: serverToken,
+		siteRoot: siteDir,
 		host,
 		mode: host === '0.0.0.0' ? 'lan' : 'local',
 		url: localUrl,
@@ -367,6 +374,12 @@ const openBrowser = async () => {
 
 const stopServer = async ({ quiet = false } = {}) => {
 	const state = await readState();
+	if (process.env.NORNA_DEV_EXPECT_TOKEN) {
+		if (state?.token !== process.env.NORNA_DEV_EXPECT_TOKEN || state.port !== port || !(await verifyDevServer(state, siteDir))) throw new Error('Cannot verify this site’s server. No process was stopped.');
+		if (!(await terminateTrackedProcess(state, state.host ?? localHost))) throw new Error('The verified preview server did not stop. Try Stop Preview Server again.');
+		await removeState();
+		return;
+	}
 	let astroError;
 	let astroOutput = '';
 	try {
@@ -397,7 +410,7 @@ const stopServer = async ({ quiet = false } = {}) => {
 };
 
 const startServer = async ({ host = localHost, open = true, killBlockingPort = false } = {}) => {
-	await stopServer({ quiet: true });
+	if (process.env.NORNA_DEV_NO_RESTART !== '1') await stopServer({ quiet: true });
 
 	if (!(await isPortFree(host))) {
 		if (!killBlockingPort) {
@@ -432,8 +445,24 @@ const startServer = async ({ host = localHost, open = true, killBlockingPort = f
 	}
 	const previousLog = await readDevLog();
 	try {
-		await runAstroInherit(['dev', '--background', '--host', host, '--port', String(port)]);
+		await runAstroInherit(['dev', '--background', '--host', host, '--port', String(port)], { env: { ...process.env, NORNA_DEV_TOKEN: serverToken } });
+		// Record the process before probing rendered pages, so failed readiness
+		// checks can clean up only the server started by this request.
+		await writeState(host);
+		await waitForServer();
 	} catch (error) {
+		let cleanupHint = '';
+		const identity = await readDevServerIdentity({ port, token: serverToken }, siteDir);
+		if (identity) {
+			const candidate = { port, ...identity };
+			try {
+				if (!(await terminateTrackedProcess(candidate, host))) throw new Error('The process did not stop.');
+				const recorded = await readState();
+				if (recorded?.token === serverToken) await removeState();
+			} catch (cleanup) {
+				cleanupHint = `Cleanup failed: ${cleanup.message} Use the site's dev:stop command after inspecting the log.`;
+			}
+		}
 		const currentLog = await readDevLog();
 		const newLog = currentLog.startsWith(previousLog)
 			? currentLog.slice(previousLog.length)
@@ -443,11 +472,9 @@ const startServer = async ({ host = localHost, open = true, killBlockingPort = f
 			`Could not start the dev server at ${localUrl}.`,
 			excerpt ? `Astro reported:\n${excerpt}` : 'Astro did not write a detailed startup error.',
 			`Full log: ${logPath}`,
-		].join('\n\n'), { cause: error });
+			cleanupHint,
+		].filter(Boolean).join('\n\n'), { cause: error });
 	}
-	await waitForServer();
-
-	await writeState(host);
 	if (open) {
 		await openBrowser();
 	} else {

package/scripts/generate-images.mjs

@@ -1,13 +1,10 @@
 import { getPageImageSourceKey } from './lib/site-conventions.mjs';
-import { execFile } from 'node:child_process';
 import { createHash } from 'node:crypto';
-import { copyFile, mkdir, readdir, readFile, rm, stat, writeFile } from 'node:fs/promises';
+import { copyFile, mkdir, readdir, readFile, rm, stat, lstat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
-import { promisify } from 'node:util';
 import {
 	getContentFiles,
 	readSiteFile,
-	rasterImageExtensions,
 	staticImageExtensions,
 	supportedImageExtensions,
 	toPosixPath,
@@ -22,61 +19,16 @@ import {
 	siteDir,
 } from './lib/site-paths.mjs';
 
-const execFileAsync = promisify(execFile);
-
-const imageOutputVersion = 2;
+// Bump only when the raster recipe changes, not on ordinary engine releases.
+const rasterOutputVersion = 4;
+const staticOutputVersion = 3;
 const sourceHashSlugLength = 8;
 const widths = [480, 768, 1080, 1440, 1920];
 
-const run = async (command, args) => {
-	const { stdout } = await execFileAsync(command, args, { maxBuffer: 1024 * 1024 * 10 });
-	return stdout.trim();
-};
-
-const canRun = async (command, args = ['-version']) => {
-	try {
-		await run(command, args);
-		return true;
-	} catch {
-		return false;
-	}
-};
-
-const getImageMagick = async () => {
-	if (await canRun('magick')) {
-		return {
-			identify: (sourcePath) => run('magick', ['identify', '-format', '%w %h', sourcePath]),
-			convert: (sourcePath, outputPath, width) => run('magick', [
-				sourcePath,
-				'-auto-orient',
-				'-resize',
-				`${width}x`,
-				'-strip',
-				'-quality',
-				'82',
-				outputPath,
-			]),
-		};
-	}
-
-	if (await canRun('identify') && await canRun('convert')) {
-		return {
-			identify: (sourcePath) => run('identify', ['-format', '%w %h', sourcePath]),
-			convert: (sourcePath, outputPath, width) => run('convert', [
-				sourcePath,
-				'-auto-orient',
-				'-resize',
-				`${width}x`,
-				'-strip',
-				'-quality',
-				'82',
-				outputPath,
-			]),
-		};
-	}
-
-	throw new Error('ImageMagick is missing. Install either the "magick" command or both "identify" and "convert".');
-};
+let sharpPromise;
+const getSharp = () => sharpPromise ??= import('sharp').then(({ default: sharp }) => sharp).catch(() => {
+	throw new Error('Norna could not load Sharp for image processing. Run npm install --include=optional in the project to install the native image dependencies for this computer.');
+});
 
 const toPublicPath = (filePath) => filePath.split(path.sep).join('/');
 const getPublicPath = (filePath) => `/${toPublicPath(path.relative(astroPublicDir, filePath))}`;
@@ -86,7 +38,7 @@ const getSourceHashSlug = (sourceHash) => sourceHash.slice(0, sourceHashSlugLeng
 
 const getGeneratedPath = (sourceKey, sourceHash, width) => {
 	const parsed = path.parse(sourceKey.replace(/^root\//, ''));
-	return path.join(generatedImagesDir, parsed.dir, `${parsed.name}-${getSourceHashSlug(sourceHash)}-${width}.webp`);
+	return path.join(generatedImagesDir, parsed.dir, `${parsed.base}-${getSourceHashSlug(sourceHash)}-v${rasterOutputVersion}-${width}.webp`);
 };
 
 const getOriginalPath = (sourceKey, sourceHash) => {
@@ -103,6 +55,8 @@ const getImageSourceKey = (contentFile, image) => getPageImageSourceKey(contentF
 const getReferencedImages = async (contentFile) => {
 	const { body } = await readSiteFile(contentFile.contentPath, contentFile.contentLabel);
 	const page = await parsePageMarkdown(body, { label: contentFile.contentLabel });
+	const imageError = page.diagnostics.find((issue) => issue.code === 'invalid-markdown-image');
+	if (imageError) throw new Error(imageError.message + ' ' + imageError.fix);
 	const references = [];
 
 	for (const region of page.regions) {
@@ -138,6 +92,7 @@ const getContentSourcePath = ({ image, sourceKey }) => {
 const getReferencedSources = async () => {
 	const contentFiles = await getContentFiles();
 	const seen = new Set();
+	const normalizedSources = new Map();
 	const sources = [];
 
 	for (const contentFile of contentFiles) {
@@ -152,7 +107,9 @@ const getReferencedSources = async () => {
 				continue;
 			}
 
-			const fileStat = await stat(sourcePath).catch(() => null);
+			const fileStat = await lstat(sourcePath).catch(() => null);
+			const directoryStat = await lstat(contentFile.imagesDir).catch(() => null);
+			if (fileStat?.isSymbolicLink() || directoryStat?.isSymbolicLink()) fail(`Image ${sourcePath} must belong to a regular images/ directory; symbolic links are not supported.`);
 			if (!fileStat?.isFile()) {
 				fail(`Image file does not exist: ${contentFile.imagesLabel}/${siteImagePath}`);
 			}
@@ -161,6 +118,10 @@ const getReferencedSources = async () => {
 				fail(`Image "${imageName}" is used in ${reference.sectionLabel} but is not stored directly in ${contentFile.imagesLabel}/. Run norna content:sync, or npm run norna:sync in starter-style repositories, to move it.`);
 			}
 
+			const normalizedKey = reference.sourceKey.normalize('NFC').toLowerCase();
+			const previous = normalizedSources.get(normalizedKey);
+			if (previous) fail(`Image sources ${previous} and ${sourcePath} conflict after case/Unicode normalization. Rename one image.`);
+			normalizedSources.set(normalizedKey, sourcePath);
 			seen.add(reference.sourceKey);
 			sources.push({ sourcePath, sourceKey: reference.sourceKey, reference });
 		}
@@ -203,15 +164,18 @@ const validateCarouselOrientations = async (manifest) => {
 	}
 };
 
-const identify = async (sourcePath) => {
-	const output = await imageMagick.identify(sourcePath);
-	const [width, height] = output.split(' ').map(Number);
-	return { width, height };
+const identify = async (sourcePath, sharp) => {
+	const { autoOrient: dimensions } = await sharp(sourcePath).metadata();
+	if (!dimensions || !Number.isSafeInteger(dimensions.width) || !Number.isSafeInteger(dimensions.height)
+		|| dimensions.width <= 0 || dimensions.height <= 0) throw new Error('The image has no usable dimensions.');
+	return dimensions;
 };
 
-const convert = async (sourcePath, outputPath, width) => {
+const convert = async (sourcePath, outputPath, width, sharp) => {
 	await mkdir(path.dirname(outputPath), { recursive: true });
-	await imageMagick.convert(sourcePath, outputPath, width);
+	// Sharp converts to sRGB and strips metadata by default.
+	await sharp(sourcePath).autoOrient().resize({ width, withoutEnlargement: true })
+		.webp({ quality: 82 }).toFile(outputPath);
 };
 
 const getHash = (value) => createHash('sha256').update(value).digest('hex');
@@ -266,7 +230,7 @@ const hasGeneratedVariants = async (variants) => {
 const getReusableEntry = async (sourceKey, previousEntry, sourceHash) => {
 	if (
 		previousEntry?.sourceHash !== sourceHash
-		|| previousEntry?.outputVersion !== imageOutputVersion
+		|| previousEntry?.outputVersion !== rasterOutputVersion
 		|| !Number.isFinite(previousEntry?.width)
 		|| !Number.isFinite(previousEntry?.height)
 	) {
@@ -280,7 +244,7 @@ const getReusableEntry = async (sourceKey, previousEntry, sourceHash) => {
 	}
 
 	return {
-		outputVersion: imageOutputVersion,
+		outputVersion: rasterOutputVersion,
 		sourceHash,
 		width: previousEntry.width,
 		height: previousEntry.height,
@@ -288,12 +252,12 @@ const getReusableEntry = async (sourceKey, previousEntry, sourceHash) => {
 	};
 };
 
-const getReusableStaticEntry = async (previousEntry, sourceHash) => {
+const getReusableStaticEntry = async (previousEntry, sourceHash, sourceKey) => {
 	if (
 		previousEntry?.kind !== 'static'
 		|| previousEntry?.sourceHash !== sourceHash
-		|| previousEntry?.outputVersion !== imageOutputVersion
-		|| typeof previousEntry?.src !== 'string'
+		|| previousEntry?.outputVersion !== staticOutputVersion
+		|| previousEntry?.src !== getPublicPath(getOriginalPath(sourceKey, sourceHash))
 		|| !(await fileExists(getFilePathFromPublicPath(previousEntry.src)))
 	) {
 		return null;
@@ -349,80 +313,86 @@ const removeUnreferencedGeneratedFiles = async (manifest) => {
 	}
 };
 
-await mkdir(generatedImagesDir, { recursive: true });
+const main = async () => {
+	await mkdir(generatedImagesDir, { recursive: true });
 
-const previousManifest = await readManifest();
-const sources = await getReferencedSources();
-const manifest = {};
-const isStaticSource = (sourcePath) => staticImageExtensions.has(path.extname(sourcePath).toLowerCase());
-const isRasterSource = (sourcePath) => rasterImageExtensions.has(path.extname(sourcePath).toLowerCase());
+	const previousManifest = await readManifest();
+	const sources = await getReferencedSources();
+	const manifest = {};
+	const isStaticSource = (sourcePath) => staticImageExtensions.has(path.extname(sourcePath).toLowerCase());
 
-if (sources.length === 0) {
-	await removeUnreferencedGeneratedFiles(manifest);
-	await mkdir(path.dirname(generatedImagesManifestPath), { recursive: true });
-	await writeFile(generatedImagesManifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
-	process.exit(0);
-}
+	if (sources.length === 0) {
+		await removeUnreferencedGeneratedFiles(manifest);
+		await mkdir(path.dirname(generatedImagesManifestPath), { recursive: true });
+		await writeFile(generatedImagesManifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
+		return;
+	}
 
-const imageMagick = sources.some(({ sourcePath }) => isRasterSource(sourcePath))
-	? await getImageMagick()
-	: null;
+	for (const { sourcePath, sourceKey } of sources) {
+		const sourceHash = await getSourceHash(sourcePath);
 
-for (const { sourcePath, sourceKey } of sources) {
-	const sourceHash = await getSourceHash(sourcePath);
+		if (isStaticSource(sourcePath)) {
+			const reusableEntry = await getReusableStaticEntry(previousManifest[sourceKey], sourceHash, sourceKey);
 
-	if (isStaticSource(sourcePath)) {
-		const reusableEntry = await getReusableStaticEntry(previousManifest[sourceKey], sourceHash);
+			if (reusableEntry) {
+				manifest[sourceKey] = reusableEntry;
+				continue;
+			}
+
+			const outputPath = getOriginalPath(sourceKey, sourceHash);
+			await mkdir(path.dirname(outputPath), { recursive: true });
+			await copyFile(sourcePath, outputPath);
+
+			const dimensions = await readImageDimensions(sourcePath).catch(() => null);
+			manifest[sourceKey] = {
+				kind: 'static',
+				outputVersion: staticOutputVersion,
+				sourceHash,
+				src: getPublicPath(outputPath),
+				...(dimensions ? { width: dimensions.width, height: dimensions.height } : {}),
+			};
+			continue;
+		}
+
+		const reusableEntry = await getReusableEntry(sourceKey, previousManifest[sourceKey], sourceHash);
 
 		if (reusableEntry) {
 			manifest[sourceKey] = reusableEntry;
 			continue;
 		}
 
-		const outputPath = getOriginalPath(sourceKey, sourceHash);
-		await mkdir(path.dirname(outputPath), { recursive: true });
-		await copyFile(sourcePath, outputPath);
+		const sharp = await getSharp();
+		let dimensions;
+		let variants;
+		try {
+			dimensions = await identify(sourcePath, sharp);
+			const variantWidths = getVariantWidths(dimensions);
+			variants = getVariants(sourceKey, sourceHash, variantWidths);
+			for (const width of variantWidths) {
+				await convert(sourcePath, getGeneratedPath(sourceKey, sourceHash, width), width, sharp);
+			}
+		} catch (error) {
+			throw new Error(`Cannot process image ${sourcePath}: ${error.message}`);
+		}
 
-		const dimensions = await readImageDimensions(sourcePath).catch(() => null);
 		manifest[sourceKey] = {
-			kind: 'static',
-			outputVersion: imageOutputVersion,
+			outputVersion: rasterOutputVersion,
 			sourceHash,
-			src: getPublicPath(outputPath),
-			...(dimensions ? { width: dimensions.width, height: dimensions.height } : {}),
+			width: dimensions.width,
+			height: dimensions.height,
+			variants,
 		};
-		continue;
-	}
-
-	const reusableEntry = await getReusableEntry(sourceKey, previousManifest[sourceKey], sourceHash);
-
-	if (reusableEntry) {
-		manifest[sourceKey] = reusableEntry;
-		continue;
-	}
-
-	if (!imageMagick) {
-		throw new Error(`ImageMagick is missing for raster image: ${sourcePath}`);
 	}
 
-	const dimensions = await identify(sourcePath);
-	const variantWidths = getVariantWidths(dimensions);
-	const variants = getVariants(sourceKey, sourceHash, variantWidths);
-	for (const width of variantWidths) {
-		const outputPath = getGeneratedPath(sourceKey, sourceHash, width);
-		await convert(sourcePath, outputPath, width);
-	}
+	await validateCarouselOrientations(manifest);
+	await removeUnreferencedGeneratedFiles(manifest);
+	await mkdir(path.dirname(generatedImagesManifestPath), { recursive: true });
+	await writeFile(generatedImagesManifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
+};
 
-	manifest[sourceKey] = {
-		outputVersion: imageOutputVersion,
-		sourceHash,
-		width: dimensions.width,
-		height: dimensions.height,
-		variants,
-	};
+try {
+	await main();
+} catch (error) {
+	console.error(error.message);
+	process.exitCode = 1;
 }
-
-await validateCarouselOrientations(manifest);
-await removeUnreferencedGeneratedFiles(manifest);
-await mkdir(path.dirname(generatedImagesManifestPath), { recursive: true });
-await writeFile(generatedImagesManifestPath, `${JSON.stringify(manifest, null, 2)}\n`);

package/scripts/generate-search-index.mjs

@@ -1,3 +1,4 @@
+import { searchOutputDirectory } from './lib/publication-paths.mjs';
 import { cp, mkdir, readdir, rm } from 'node:fs/promises';
 import path from 'node:path';
 import * as pagefind from 'pagefind';
@@ -7,7 +8,7 @@ import {
 	astroPublicDir,
 } from './lib/site-paths.mjs';
 
-const searchDirectoryName = 'pagefind';
+const searchDirectoryName = searchOutputDirectory;
 const distSearchDirectory = path.join(astroDistDir, searchDirectoryName);
 const localSearchDirectory = path.join(astroPublicDir, searchDirectoryName);
 
@@ -44,7 +45,7 @@ if (!projectConfig.search.enabled) {
 		}
 
 		await rm(localSearchDirectory, { force: true, recursive: true });
-		await mkdir(astroPublicDir, { recursive: true });
+		await mkdir(path.dirname(localSearchDirectory), { recursive: true });
 		await cp(distSearchDirectory, localSearchDirectory, { recursive: true });
 
 		console.log(`Generated static search index for ${indexedPageCount} page${indexedPageCount === 1 ? '' : 's'}.`);

package/scripts/lib/attachment-render.mjs

@@ -0,0 +1,23 @@
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { getSourcePageLocation } from './source-files.mjs';
+import { parsePageMarkdownSource } from './page-markdown.mjs';
+import { readPageAttachments, resolveAttachment, attachmentHref } from './page-attachments.mjs';
+
+export const rewriteAttachmentLinks = async (source, fileURL, siteRoot) => {
+	if (!fileURL) return source;
+	const contentPath = fileURLToPath(fileURL);
+	const location = getSourcePageLocation(siteRoot, path.dirname(contentPath));
+	if (!location || path.basename(contentPath) !== 'content.md') return source;
+	const { files } = await readPageAttachments({ ...location, contentPath });
+	if (!files.length) return source;
+	const document = await parsePageMarkdownSource(source);
+	const edits = new Map();
+	for (const link of document.links) {
+		const file = resolveAttachment(link.target, location.isHome ? '/' : `/${location.pagePath}/`, files);
+		if (!file || !link.targetRange) continue;
+		const href = attachmentHref(file, link.target);
+		edits.set(link.targetRange.start, { ...link.targetRange, text: link.yamlScalar ? JSON.stringify(href) : href });
+	}
+	return [...edits.values()].sort((a,b) => b.start-a.start).reduce((text, edit) => text.slice(0, edit.start) + edit.text + text.slice(edit.end), source);
+};

package/scripts/lib/dev-server-identity.mjs

@@ -0,0 +1,30 @@
+import { realpath } from 'node:fs/promises';
+
+export const identityPath = '/.well-known/norna-dev';
+export const readDevServerIdentity = async (state, siteRoot) => {
+	if (!state?.token || !Number.isInteger(state.port) || state.port < 1 || state.port > 65535) return null;
+	try {
+		const response = await fetch(`http://127.0.0.1:${state.port}${identityPath}`, { signal: AbortSignal.timeout(1500), redirect: 'error' });
+		if (!response.ok) return null;
+		const identity = await response.json();
+		return identity.token === state.token && Number.isInteger(identity.pid) && identity.pid > 0 && identity.siteRoot === await realpath(siteRoot) ? identity : null;
+	} catch { return null; }
+};
+export const verifyDevServer = async (state, siteRoot) => Number.isInteger(state?.pid) && state.pid > 0
+	&& (await readDevServerIdentity(state, siteRoot))?.pid === state.pid;
+
+export const devServerIdentityPlugin = siteRoot => ({
+	name: 'norna-dev-server-identity',
+	async configureServer(server) {
+		const canonicalRoot = await realpath(siteRoot);
+		return () => {
+			server.middlewares.stack.unshift({ route: '', handle(request, response, next) {
+				if (request.url !== identityPath || request.method !== 'GET' || !process.env.NORNA_DEV_TOKEN) return next();
+				if (!['127.0.0.1', '::1', '::ffff:127.0.0.1'].includes(request.socket.remoteAddress)) return next();
+				response.setHeader('Content-Type', 'application/json');
+				response.setHeader('Cache-Control', 'no-store');
+				response.end(JSON.stringify({ siteRoot: canonicalRoot, token: process.env.NORNA_DEV_TOKEN, pid: process.pid }));
+			} });
+		};
+	},
+});