caracms 0.5.0 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caracms",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "A visual CMS for Astro sites, with content in git.",
   "license": "MIT",
   "type": "module",

package/src/index.ts

@@ -49,9 +49,9 @@
 import type { AstroIntegration } from 'astro';
 import { fontProviders } from 'astro/config';
 import { execFileSync } from 'node:child_process';
-import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { existsSync, readFileSync, watch, writeFileSync, type FSWatcher } from 'node:fs';
 import { createRequire } from 'node:module';
-import { isAbsolute, join, sep } from 'node:path';
+import { basename, dirname, isAbsolute, join, sep } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { resolveSite, SITE_SETTINGS_FILE, type ResolvedSite, type SiteConfig } from './config.ts';
 import { lockupCss } from './lockup-css.ts';
@@ -219,6 +219,39 @@ export function contentWatchIgnores(site: Pick<ResolvedSite, 'collections' | 'ro
 	];
 }
 
+/**
+ * The content contentWatchIgnores takes out of Vite's watch, watched apart, so the dev server
+ * learns a page was added, moved, hidden or removed. Astro's dev server caches each route's
+ * `getStaticPaths` and clears it only on its own content changes, so without this the public
+ * site kept its old list of pages until a restart (an old address even answered 500 rather
+ * than its redirect). Every collection folder that exists at start, recursively, and the
+ * Site Settings file; `onChange` once per burst of changes. Returns the stop.
+ */
+export function watchContent(site: Pick<ResolvedSite, 'collections' | 'root'>, onChange: () => void, wait = 100): () => void {
+	let timer: ReturnType<typeof setTimeout> | undefined;
+	const changed = () => {
+		clearTimeout(timer);
+		timer = setTimeout(onChange, wait);
+	};
+	const watchers: FSWatcher[] = [];
+	const add = (path: string, recursive: boolean, only?: string) => {
+		if (!existsSync(path)) return;
+		const watcher = watch(path, { recursive, persistent: false }, (_event, name) => {
+			if (!only || name === only) changed();
+		});
+		// A watched folder that's removed mustn't take the dev server down with it.
+		watcher.on('error', () => watcher.close());
+		watchers.push(watcher);
+	};
+	for (const c of Object.values(site.collections)) if (c.kind !== 'settings') add(c.dir, true);
+	const settings = join(site.root, SITE_SETTINGS_FILE);
+	add(dirname(settings), false, basename(settings));
+	return () => {
+		clearTimeout(timer);
+		for (const watcher of watchers) watcher.close();
+	};
+}
+
 /**
  * The hosts Astro may take a request's address from (`security.allowedDomains`).
  * Without them, Astro ignores the Host header and every request reads as
@@ -461,13 +494,20 @@ export default function caracms(config: SiteConfig): AstroIntegration {
 			},
 			// M8 Decision 14: a dev server (at start, and on the restart a config change makes) regenerates
 			// schemas/ from the config. Never content files: a dev run only changes what your code change derives.
-			'astro:server:setup': ({ logger }) => {
+			'astro:server:setup': ({ server, logger }) => {
 				try {
 					const changed = writeSchemaFiles(site);
 					if (changed.length) logger.info(`updated ${changed.map((c) => c.file).join(', ')}`);
 				} catch (error) {
 					logger.warn(`couldn't write schemas/: ${(error as Error).message}`);
 				}
+				// A content change re-runs every route's getStaticPaths, as Astro does for its own content
+				// collections (the same event, to the same server environments). Never a browser reload:
+				// the editor writes these files.
+				const stop = watchContent(site, () => {
+					for (const name of ['ssr', 'prerender']) server.environments[name]?.hot.send('astro:content-changed', {});
+				});
+				server.httpServer?.once('close', stop);
 			},
 			// Posts and tags, Decision 15: a production build reads each document once (read.ts). Never in dev.
 			'astro:build:start': () => shareBuildReads(true),