@tideworthy/tidysites-platform 0.10.0 → 0.10.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.10.2
+
+- Editor: the Revisions list starts after the newest publish, which is what is live now and has nothing to view or restore; a deep link to it opens the list. Inside the revision viewer EmDash's pill is hidden along with the bar.
+
 ## 0.9.1
 
 - Editor: one editor on the site. An article page (a post, a service area, a page with the article layout) gets the bar too, with Publish from the entry's draft state, Business details and Done, over EmDash's inline prose editing; EmDash's own pill is hidden under the bar everywhere. Inside sections and record regions this editor owns the fields and EmDash's inline editor does not mount; outside them (article prose) it keeps working.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tideworthy/tidysites-platform",
-	"version": "0.10.0",
+	"version": "0.10.2",
 	"description": "The Tidysites platform integration for EmDash sites: bootstrap, sessions, maintenance, health, and publish hooks under /_tidy/*.",
 	"license": "MIT",
 	"type": "module",

package/src/editor/revisions.ts

@@ -64,15 +64,16 @@ export function startRevisions(): void {
 	}
 
 	function renderList() {
-		const head = el("div", { class: "tidy-panel-head" }, [el("h2", { text: "Revisions" }), el("p", { text: "Every time the website was published. Open one to see this page as it was then." })]);
+		const head = el("div", { class: "tidy-panel-head" }, [el("h2", { text: "Revisions" }), el("p", { text: "Every earlier publish of the website. Open one to see this page as it was then." })]);
 		const list = el("div", { class: "tidy-add-list" });
-		revisions.forEach((rev, i) => {
-			const note = i === 0 ? "Live now" : rev.restoredFrom ? "Restored" : "";
+		// The newest revision is what is live now: nothing to view or restore, so the list starts after it.
+		revisions.slice(1).forEach((rev) => {
+			const note = rev.restoredFrom ? "Restored" : "";
 			const item = el("button", { type: "button", class: "tidy-add-item" }, [el("strong", { text: when(rev.at) }), el("span", { text: [note, rev.pages ? `${rev.pages} pages` : ""].filter(Boolean).join(" · ") })]);
-			item.addEventListener("click", () => void view(rev, i === 0));
+			item.addEventListener("click", () => void view(rev));
 			list.append(item);
 		});
-		if (revisions.length === 0) list.append(el("p", { class: "tidy-field-note", text: "Nothing published yet." }));
+		if (revisions.length < 2) list.append(el("p", { class: "tidy-field-note", text: "No earlier revisions yet." }));
 		const closeBtn = el("button", { type: "button", class: "tidy-btn", text: "Close" });
 		closeBtn.addEventListener("click", close);
 		panel.replaceChildren(head, list, el("div", { class: "tidy-panel-actions" }, [closeBtn]));
@@ -91,18 +92,22 @@ export function startRevisions(): void {
 	document.body.append(viewer);
 	backBtn.addEventListener("click", () => { viewer.hidden = true; frame.removeAttribute("srcdoc"); renderList(); });
 
-	async function view(rev: Revision, isLive: boolean) {
+	async function view(rev: Revision) {
 		panel.hidden = true;
-		viewerLabel.textContent = `${when(rev.at)}${isLive ? " · live now" : ""}`;
-		restoreBtn.hidden = isLive;
+		viewerLabel.textContent = when(rev.at);
 		const r = await fetch(`${ROUTE}?id=${encodeURIComponent(rev.id)}&path=${encodeURIComponent(here)}`, { credentials: "same-origin" });
 		if (!r.ok) {
 			const j = (await r.json().catch(() => ({}))) as { error?: string };
 			frame.srcdoc = `<p style="font:15px system-ui;margin:2rem">${j.error ?? "This revision could not be read."}</p>`;
 		} else {
-			// The stored copy links its assets by absolute path; a base tag resolves them against the live site, where they still are.
+			// The stored copy links its built assets by absolute path (/_astro/...);
+			// those are read from the revision itself, so the page shows the way it
+			// was built. Everything else (uploads, links) resolves against this site.
 			const html = await r.text();
-			frame.srcdoc = html.replace(/<head([^>]*)>/i, `<head$1><base href="${location.origin}/"><style>html.tidy-has-bar body{padding-top:0!important}#tidy-bar,.tidy-bar{display:none!important}</style>`);
+			const own = (p: string) => `${ROUTE}?id=${encodeURIComponent(rev.id)}&path=${encodeURIComponent(p)}`;
+			frame.srcdoc = html
+				.replace(/(href|src)="(\/_astro\/[^"]+)"/g, (_m, attr: string, p: string) => `${attr}="${own(p)}"`)
+				.replace(/<head([^>]*)>/i, `<head$1><base href="${location.origin}/"><style>html.tidy-has-bar body{padding-top:0!important}#tidy-bar,.tidy-bar,#emdash-toolbar{display:none!important}</style>`);
 		}
 		viewer.hidden = false;
 		restoreBtn.onclick = async () => {
@@ -144,8 +149,9 @@ export function startRevisions(): void {
 	const want = params.get("tidy-revision");
 	if (want || params.get("tidy-revisions")) {
 		void load().then((list) => {
-			const rev = want ? list.find((x) => x.id === want) : null;
-			if (rev) void view(rev, list[0]?.id === rev.id);
+			// The newest revision is live now and is not in the list, so a link to it opens the list.
+			const rev = want ? list.slice(1).find((x) => x.id === want) : null;
+			if (rev) void view(rev);
 			else renderList();
 		}).catch(() => undefined);
 	}

package/src/routes/revisions.ts

@@ -47,7 +47,11 @@ export const GET: APIRoute = async (context) => {
 		if (!/^[0-9a-f-]{36}$/i.test(id)) return json({ error: "bad revision id" }, 400);
 		const r = await c.call(`/releases/${id}/page?path=${encodeURIComponent(path)}`);
 		if (!r.ok) return json({ error: r.status === 404 ? "That page was not in this revision." : "The revision could not be read." }, r.status === 404 ? 404 : 502);
-		return new Response(await r.text(), { headers: { "content-type": "text/html; charset=utf-8", "cache-control": "no-store" } });
+		// A page comes back as HTML; a path with an extension is one of the
+		// revision's own files (its stylesheets, scripts, images), passed through
+		// with its type so the page shows the way it was built.
+		const type = r.headers.get("content-type") ?? "application/octet-stream";
+		return new Response(r.body, { headers: { "content-type": type, "cache-control": "no-store" } });
 	}
 	const r = await c.call("/releases");
 	if (!r.ok) return json({ error: "The revisions could not be read." }, 502);

package/src/version.ts

@@ -1,3 +1,3 @@
 /** Kept in step with package.json by the release checklist in MAINTAINING.md. */
-export const VERSION = "0.10.0";
+export const VERSION = "0.10.2";
 export const PLUGIN_ID = "tidy-platform";