From 9b556ffe6c0c0528697e15f7f4f35107de212ce1 Mon Sep 17 00:00:00 2001
From: Joe Mou <dev@mou.fo>
Date: Wed, 15 Jul 2026 02:08:17 -0400
Subject: Add Cloudflare Workers deployment target

Split routes into a shared createApp() (src/app.ts) used by both the
Node entry (src/index.ts) and a new Workers entry (src/worker.ts).
Workers disallow runtime code generation, so scripts/compile-views.ts
precompiles the Eta templates into src/views.generated.ts and rendering
switches from renderAsync to the sync render. Static files move to
public/static so Workers Static Assets can serve them; the Node build
and serveStatic root are updated to match.

Deploy with pnpm run deploy:cf, local dev with pnpm run dev:cf.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 cgithub/scripts/compile-views.ts | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 cgithub/scripts/compile-views.ts

(limited to 'cgithub/scripts')

diff --git a/cgithub/scripts/compile-views.ts b/cgithub/scripts/compile-views.ts
new file mode 100644
index 0000000..785efc1
--- /dev/null
+++ b/cgithub/scripts/compile-views.ts
@@ -0,0 +1,29 @@
+// Precompiles views/*.eta into plain functions for the Cloudflare Workers
+// build (src/views.generated.ts). Workers disallow runtime code generation
+// (`new Function`), so Eta cannot compile templates there at request time.
+import { Eta } from "eta";
+import fs from "node:fs";
+import path from "node:path";
+
+const root = path.join(import.meta.dirname, "..");
+const viewsDir = path.join(root, "views");
+const eta = new Eta({ views: viewsDir });
+
+const names = fs
+  .readdirSync(viewsDir)
+  .filter((name) => name.endsWith(".eta"))
+  .sort();
+
+let out = `// @ts-nocheck
+// Generated by scripts/compile-views.ts -- do not edit.
+export const views = {
+`;
+for (const name of names) {
+  const source = fs.readFileSync(path.join(viewsDir, name), "utf8");
+  const body = eta.compileToString(source);
+  out += `  ${JSON.stringify(name)}: function (it, options) {\n${body}\n  },\n`;
+}
+out += "};\n";
+
+fs.writeFileSync(path.join(root, "src", "views.generated.ts"), out);
+console.log(`Compiled ${names.length} templates to src/views.generated.ts`);
-- 
cgit v1.3.1


From ab52f48e50d0dd242ad5b0cfbee9c458946cd427 Mon Sep 17 00:00:00 2001
From: Joe Mou <dev@mou.fo>
Date: Tue, 11 Aug 2026 08:37:25 -0400
Subject: Show the build's commit in the page footer

Workers can't shell out at request time, so the commit has to be baked
in before wrangler bundles the sources. compile-views.ts grows a second
job and becomes scripts/build.ts: alongside the precompiled views it
writes src/commit.generated.ts with `git describe --tags --always
--dirty`, which yields a bare short hash until the repo is tagged and
marks builds made from an unclean working copy.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 cgithub/.gitignore               |  1 +
 cgithub/CLAUDE.md                |  2 +-
 cgithub/package.json             |  4 ++--
 cgithub/scripts/build.ts         | 52 ++++++++++++++++++++++++++++++++++++++++
 cgithub/scripts/compile-views.ts | 29 ----------------------
 cgithub/src/app.ts               |  3 ++-
 cgithub/src/worker.ts            |  2 +-
 cgithub/views/layout.eta         |  2 +-
 8 files changed, 60 insertions(+), 35 deletions(-)
 create mode 100644 cgithub/scripts/build.ts
 delete mode 100644 cgithub/scripts/compile-views.ts

(limited to 'cgithub/scripts')

diff --git a/cgithub/.gitignore b/cgithub/.gitignore
index 5a5e404..b8fc600 100644
--- a/cgithub/.gitignore
+++ b/cgithub/.gitignore
@@ -1,3 +1,4 @@
 /node_modules/
 /.wrangler/
+/src/commit.generated.ts
 /src/views.generated.ts
diff --git a/cgithub/CLAUDE.md b/cgithub/CLAUDE.md
index 37774cc..0ef4b47 100644
--- a/cgithub/CLAUDE.md
+++ b/cgithub/CLAUDE.md
@@ -24,7 +24,7 @@ pnpm test
 - `src/worker.ts` - Cloudflare Workers entry (config in `wrangler.jsonc`)
 - `src/scraper.ts` - GitHub HTML fetching and JSON extraction logic
 
-**Templates:** `views/*.eta` - Eta templates with layout inheritance (`layout.eta` as base). On Workers, runtime code generation is disallowed, so `scripts/compile-views.ts` precompiles templates to `src/views.generated.ts` (gitignored, regenerated by the `dev`/`deploy` scripts).
+**Templates:** `views/*.eta` - Eta templates with layout inheritance (`layout.eta` as base). On Workers, runtime code generation is disallowed, so `scripts/build.ts` precompiles templates to `src/views.generated.ts`. The same script records the build's `git describe` output in `src/commit.generated.ts` for the page footer. Both are gitignored and regenerated by the `dev`/`deploy` scripts.
 
 **Static files:** `public/static/*`, served by Workers Static Assets.
 
diff --git a/cgithub/package.json b/cgithub/package.json
index 337fabc..7673612 100644
--- a/cgithub/package.json
+++ b/cgithub/package.json
@@ -5,8 +5,8 @@
   "license": "MIT",
   "type": "module",
   "scripts": {
-    "dev": "node scripts/compile-views.ts && wrangler dev",
-    "deploy": "node scripts/compile-views.ts && wrangler deploy",
+    "dev": "node scripts/build.ts && wrangler dev",
+    "deploy": "node scripts/build.ts && wrangler deploy",
     "test": "node --test --test-concurrency=4 src/scraper.test.ts"
   },
   "dependencies": {
diff --git a/cgithub/scripts/build.ts b/cgithub/scripts/build.ts
new file mode 100644
index 0000000..766e5e8
--- /dev/null
+++ b/cgithub/scripts/build.ts
@@ -0,0 +1,52 @@
+// Generates the sources that can't exist at runtime on Workers:
+//
+//   src/views.generated.ts  - views/*.eta precompiled into plain functions.
+//     Workers disallow runtime code generation (`new Function`), so Eta cannot
+//     compile templates there at request time.
+//   src/commit.generated.ts - the commit this build was made from, for the
+//     page footer. Workers can't shell out to git at request time either.
+import { execFileSync } from "node:child_process";
+import { Eta } from "eta";
+import fs from "node:fs";
+import path from "node:path";
+
+const root = path.join(import.meta.dirname, "..");
+const viewsDir = path.join(root, "views");
+const eta = new Eta({ views: viewsDir });
+
+const names = fs
+  .readdirSync(viewsDir)
+  .filter((name) => name.endsWith(".eta"))
+  .sort();
+
+let out = `// @ts-nocheck
+// Generated by scripts/build.ts -- do not edit.
+export const views = {
+`;
+for (const name of names) {
+  const source = fs.readFileSync(path.join(viewsDir, name), "utf8");
+  const body = eta.compileToString(source);
+  out += `  ${JSON.stringify(name)}: function (it, options) {\n${body}\n  },\n`;
+}
+out += "};\n";
+
+fs.writeFileSync(path.join(root, "src", "views.generated.ts"), out);
+console.log(`Compiled ${names.length} templates to src/views.generated.ts`);
+
+// Untagged repositories describe as a bare short hash; --dirty marks a build
+// made from an unclean working copy.
+let commit = "unknown";
+try {
+  commit = execFileSync("git", ["describe", "--tags", "--always", "--dirty"], {
+    cwd: root,
+    encoding: "utf8",
+  }).trim();
+} catch {
+  // Building from a source copy without git history.
+}
+
+fs.writeFileSync(
+  path.join(root, "src", "commit.generated.ts"),
+  `// Generated by scripts/build.ts -- do not edit.\nexport const commit = ${JSON.stringify(commit)};\n`,
+);
+console.log(`Wrote commit ${commit} to src/commit.generated.ts`);
diff --git a/cgithub/scripts/compile-views.ts b/cgithub/scripts/compile-views.ts
deleted file mode 100644
index 785efc1..0000000
--- a/cgithub/scripts/compile-views.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Precompiles views/*.eta into plain functions for the Cloudflare Workers
-// build (src/views.generated.ts). Workers disallow runtime code generation
-// (`new Function`), so Eta cannot compile templates there at request time.
-import { Eta } from "eta";
-import fs from "node:fs";
-import path from "node:path";
-
-const root = path.join(import.meta.dirname, "..");
-const viewsDir = path.join(root, "views");
-const eta = new Eta({ views: viewsDir });
-
-const names = fs
-  .readdirSync(viewsDir)
-  .filter((name) => name.endsWith(".eta"))
-  .sort();
-
-let out = `// @ts-nocheck
-// Generated by scripts/compile-views.ts -- do not edit.
-export const views = {
-`;
-for (const name of names) {
-  const source = fs.readFileSync(path.join(viewsDir, name), "utf8");
-  const body = eta.compileToString(source);
-  out += `  ${JSON.stringify(name)}: function (it, options) {\n${body}\n  },\n`;
-}
-out += "};\n";
-
-fs.writeFileSync(path.join(root, "src", "views.generated.ts"), out);
-console.log(`Compiled ${names.length} templates to src/views.generated.ts`);
diff --git a/cgithub/src/app.ts b/cgithub/src/app.ts
index 5bed45d..0218918 100644
--- a/cgithub/src/app.ts
+++ b/cgithub/src/app.ts
@@ -1,6 +1,7 @@
 import type { Eta } from "eta";
 import { type Context, Hono } from "hono";
 import type { StatusCode } from "hono/utils/http-status";
+import { commit } from "./commit.generated.ts";
 import {
   getGitHubBlob,
   getGitHubCommits,
@@ -47,7 +48,7 @@ export function createApp(eta: Eta) {
     // Our URLs mirror GitHub's, so the page we scraped is the same path there.
     const { pathname, search } = new URL(c.req.url);
     const githubUrl = `https://github.com${pathname}${search}`;
-    return c.html(eta.render(template, { ...data, githubUrl }));
+    return c.html(eta.render(template, { ...data, githubUrl, commit }));
   }
 
   // For fragments fetched asynchronously by client-side JS (see public/static/refs.js):
diff --git a/cgithub/src/worker.ts b/cgithub/src/worker.ts
index 024b01a..7bf9100 100644
--- a/cgithub/src/worker.ts
+++ b/cgithub/src/worker.ts
@@ -5,7 +5,7 @@ import { createApp } from "./app.ts";
 import { views } from "./views.generated.ts";
 
 // Workers disallow runtime code generation, so templates are precompiled by
-// scripts/compile-views.ts and preloaded into Eta's cache here. With
+// scripts/build.ts and preloaded into Eta's cache here. With
 // cache: true, Eta serves them from the cache and never compiles.
 const eta = new Eta({ cache: true });
 
diff --git a/cgithub/views/layout.eta b/cgithub/views/layout.eta
index f803caf..ca6fff2 100644
--- a/cgithub/views/layout.eta
+++ b/cgithub/views/layout.eta
@@ -34,7 +34,7 @@ git clone git@github.com:<%= it.repo.owner %>/<%= it.repo.name %>.git</code></pr
 
   <%~ it.body %>
 
-  <footer>Generated by cgithub · <a href="<%= it.githubUrl %>" rel="noreferrer">View original</a></footer>
+  <footer>Generated by cgithub commit <code><%= it.commit %></code> · <a href="<%= it.githubUrl %>" rel="noreferrer">View original</a></footer>
 
   <script>
     document.addEventListener("keydown", function(e) {
-- 
cgit v1.3.1


From 439f783c9e3b18519505d1ad6b8533bea081cca0 Mon Sep 17 00:00:00 2001
From: Joe Mou <dev@mou.fo>
Date: Thu, 3 Sep 2026 15:07:25 -0400
Subject: Clean up renderer, redirects, and build commit

---
 cgithub/.gitignore       |  2 +-
 cgithub/CLAUDE.md        |  2 +-
 cgithub/scripts/build.ts | 12 ++++-----
 cgithub/src/app.test.ts  |  8 ++++--
 cgithub/src/app.ts       | 63 ++++++++++++++++++++++++++++++------------------
 cgithub/views/layout.eta |  2 +-
 6 files changed, 54 insertions(+), 35 deletions(-)

(limited to 'cgithub/scripts')

diff --git a/cgithub/.gitignore b/cgithub/.gitignore
index b8fc600..55b5412 100644
--- a/cgithub/.gitignore
+++ b/cgithub/.gitignore
@@ -1,4 +1,4 @@
 /node_modules/
 /.wrangler/
-/src/commit.generated.ts
+/src/build.generated.ts
 /src/views.generated.ts
diff --git a/cgithub/CLAUDE.md b/cgithub/CLAUDE.md
index 3f0cd61..edb33f5 100644
--- a/cgithub/CLAUDE.md
+++ b/cgithub/CLAUDE.md
@@ -24,7 +24,7 @@ pnpm test
 - `src/worker.ts` - Cloudflare Workers entry (config in `wrangler.jsonc`)
 - `src/scraper.ts` - GitHub HTML fetching and JSON extraction logic
 
-**Templates:** `views/*.eta` - Eta templates with layout inheritance (`layout.eta` as base). On Workers, runtime code generation is disallowed, so `scripts/build.ts` precompiles templates to `src/views.generated.ts`. The same script records the build's `git describe` output in `src/commit.generated.ts` for the page footer. Both are gitignored and regenerated by the `dev`/`deploy` scripts.
+**Templates:** `views/*.eta` - Eta templates with layout inheritance (`layout.eta` as base). On Workers, runtime code generation is disallowed, so `scripts/build.ts` precompiles templates to `src/views.generated.ts`. The same script records the build's `git describe` output in `src/build.generated.ts` for the page footer. Both are gitignored and regenerated by the `dev`/`deploy` scripts.
 
 **Static files:** `public/static/*`, served by Workers Static Assets.
 
diff --git a/cgithub/scripts/build.ts b/cgithub/scripts/build.ts
index 766e5e8..76d88a0 100644
--- a/cgithub/scripts/build.ts
+++ b/cgithub/scripts/build.ts
@@ -3,7 +3,7 @@
 //   src/views.generated.ts  - views/*.eta precompiled into plain functions.
 //     Workers disallow runtime code generation (`new Function`), so Eta cannot
 //     compile templates there at request time.
-//   src/commit.generated.ts - the commit this build was made from, for the
+//   src/build.generated.ts  - the commit this build was made from, for the
 //     page footer. Workers can't shell out to git at request time either.
 import { execFileSync } from "node:child_process";
 import { Eta } from "eta";
@@ -35,9 +35,9 @@ console.log(`Compiled ${names.length} templates to src/views.generated.ts`);
 
 // Untagged repositories describe as a bare short hash; --dirty marks a build
 // made from an unclean working copy.
-let commit = "unknown";
+let buildCommit = "unknown";
 try {
-  commit = execFileSync("git", ["describe", "--tags", "--always", "--dirty"], {
+  buildCommit = execFileSync("git", ["describe", "--tags", "--always", "--dirty"], {
     cwd: root,
     encoding: "utf8",
   }).trim();
@@ -46,7 +46,7 @@ try {
 }
 
 fs.writeFileSync(
-  path.join(root, "src", "commit.generated.ts"),
-  `// Generated by scripts/build.ts -- do not edit.\nexport const commit = ${JSON.stringify(commit)};\n`,
+  path.join(root, "src", "build.generated.ts"),
+  `// Generated by scripts/build.ts -- do not edit.\nexport const buildCommit = ${JSON.stringify(buildCommit)};\n`,
 );
-console.log(`Wrote commit ${commit} to src/commit.generated.ts`);
+console.log(`Wrote commit ${buildCommit} to src/build.generated.ts`);
diff --git a/cgithub/src/app.test.ts b/cgithub/src/app.test.ts
index 8519d91..274b2d5 100644
--- a/cgithub/src/app.test.ts
+++ b/cgithub/src/app.test.ts
@@ -195,7 +195,10 @@ describe("commit history", () => {
 
     assert.match(html, /href="\/actions\/deploy-pages\/commits\/main">\(top\)</);
     assert.match(html, /href="\/actions\/deploy-pages\/commits\/main\/src">src</);
-    assert.match(html, /href="\/actions\/deploy-pages\/commits\/main\/src\/lib">lib<\/a>\/index\.js/);
+    assert.match(
+      html,
+      /href="\/actions\/deploy-pages\/commits\/main\/src\/lib">lib<\/a>\/index\.js/,
+    );
   });
 
   it("should say so when a path has no history", () => {
@@ -363,9 +366,9 @@ describe("redirects to GitHub", () => {
 
     assert.strictEqual(res.status, 200);
     assert.strictEqual(res.headers.get("location"), null);
-    assert.strictEqual(res.headers.get("Referrer-Policy"), "no-referrer");
 
     const body = await res.text();
+    assert.match(body, /<meta name="referrer" content="no-referrer">/);
     assert.match(
       body,
       /<meta http-equiv="refresh" content="1; url=https:\/\/github.com\/a\/b\/c\?x=1">/,
@@ -382,6 +385,7 @@ describe("redirects to GitHub", () => {
 
     assert.strictEqual(res.status, 302);
     assert.strictEqual(res.headers.get("location"), "https://github.com/a/b/c?x=1");
+    assert.strictEqual(res.headers.get("Referrer-Policy"), "no-referrer");
   });
 
   it("should use a meta refresh when the referer is another site", async () => {
diff --git a/cgithub/src/app.ts b/cgithub/src/app.ts
index 956a8cb..bbe07fc 100644
--- a/cgithub/src/app.ts
+++ b/cgithub/src/app.ts
@@ -1,7 +1,7 @@
 import type { Eta } from "eta";
 import { type Context, Hono } from "hono";
 import type { StatusCode } from "hono/utils/http-status";
-import { commit } from "./commit.generated.ts";
+import { buildCommit } from "./build.generated.ts";
 import {
   getGitHubBlob,
   getGitHubCommits,
@@ -22,7 +22,12 @@ import {
   RedirectError,
 } from "./scraper.ts";
 
-// Our URLs mirror GitHub's, so the same path there is the page we scraped.
+declare module "hono" {
+  interface ContextRenderer {
+    (template: string, data?: object): Response;
+  }
+}
+
 function githubUrlFor(c: Context) {
   const { pathname, search } = new URL(c.req.url);
   return `https://github.com${pathname}${search}`;
@@ -31,23 +36,36 @@ function githubUrlFor(c: Context) {
 export function createApp(eta: Eta) {
   const app = new Hono();
 
-  // Use a meta refresh to avoid redirect loops in certain situations; we become
-  // the initiator origin even if we are the target of a redirection. Requests
-  // coming from one of our own pages are already past that hazard, and are
-  // often subresources (an <img> in a rendered README) that can't do anything
-  // with an HTML page, so those get a real HTTP redirect.
-  function redirectToGitHub(c: Context, location: string) {
+  app.use(async (c, next) => {
+    // Include render data for layout.eta.
+    c.setRenderer((template, data) =>
+      c.html(eta.render(template, { ...data, githubUrl: githubUrlFor(c), buildCommit })),
+    );
+    await next();
+  });
+
+  // Redirect off-domain.
+  function redirectTo(c: Context, location: string) {
     const referer = c.req.header("Referer");
+    // If we are the referer, redirect directly so we can hotlink resources
+    // (e.g., <img> in README).
     if (referer && URL.parse(referer)?.origin === new URL(c.req.url).origin) {
+      c.header("Referrer-Policy", "no-referrer");
       return c.redirect(location);
     }
 
-    c.header("Referrer-Policy", "no-referrer");
-    return c.html(eta.render("redirect.eta", { location }));
+    // Otherwise use a meta refresh to make ourself the initiator. This will
+    // avoid redirect loops if we are part of excludedInitiatorDomains in a
+    // declarativeNetRequest.
+    return c.render("redirect.eta", { location });
+  }
+
+  function redirectToGitHub(c: Context) {
+    return redirectTo(c, githubUrlFor(c));
   }
 
   app.get("/", async (c) => {
-    return c.html(eta.render("home.eta", {}));
+    return c.render("home.eta");
   });
 
   async function tryRender<T extends object>(c: Context, template: string, promise: Promise<T>) {
@@ -57,19 +75,19 @@ export function createApp(eta: Eta) {
     } catch (e) {
       if (e instanceof RedirectError) {
         if (e.location.startsWith("https://")) {
-          return redirectToGitHub(c, e.location);
+          return redirectTo(c, e.location);
         }
         return c.redirect(e.location);
       } else if (e instanceof GitHubHTTPError) {
         c.status(e.status as StatusCode);
         const message = `GitHub responded with HTTP ${e.status} ${e.message}`;
-        return c.html(eta.render("error.eta", { title: e.message, message }));
+        return c.render("error.eta", { title: e.message, message });
       } else {
         c.status(500);
-        return c.html(eta.render("error.eta", { message: "" + e }));
+        return c.render("error.eta", { message: "" + e });
       }
     }
-    return c.html(eta.render(template, { ...data, githubUrl: githubUrlFor(c), commit }));
+    return c.render(template, data);
   }
 
   // For fragments fetched asynchronously by client-side JS (see public/static/refs.js):
@@ -92,7 +110,7 @@ export function createApp(eta: Eta) {
       c.status(status);
       return c.body(null);
     }
-    return c.html(eta.render(template, data));
+    return c.render(template, data);
   }
 
   app.get("/:owner", async (c) => {
@@ -117,10 +135,7 @@ export function createApp(eta: Eta) {
 
   app.get("/:owner/:repo/raw/:branch/:path{.*}", async (c) => {
     const { owner, repo, branch, path } = c.req.param();
-    return redirectToGitHub(
-      c,
-      `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${path}`,
-    );
+    return redirectTo(c, `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${path}`);
   });
 
   // This is not a native GitHub route, but instead it lets us render blob
@@ -165,7 +180,7 @@ export function createApp(eta: Eta) {
   app.get("/:owner/:repo/wiki/:page/:oid", async (c) => {
     const { owner, repo, page, oid } = c.req.param();
     if (page.startsWith("_") || !/^[0-9a-f]{40}$/.test(oid)) {
-      return redirectToGitHub(c, githubUrlFor(c));
+      return redirectToGitHub(c);
     }
     return tryRender(c, "wiki.eta", getGitHubWiki(owner, repo, page, oid));
   });
@@ -173,7 +188,7 @@ export function createApp(eta: Eta) {
   app.get("/:owner/:repo/wiki/:page", async (c) => {
     const { owner, repo, page } = c.req.param();
     if (page.startsWith("_")) {
-      return redirectToGitHub(c, githubUrlFor(c));
+      return redirectToGitHub(c);
     }
     return tryRender(c, "wiki.eta", getGitHubWiki(owner, repo, page));
   });
@@ -209,7 +224,7 @@ export function createApp(eta: Eta) {
     }
 
     // Redirect unhandled search types (like code, which requires sign in anyway).
-    return redirectToGitHub(c, githubUrlFor(c));
+    return redirectToGitHub(c);
   });
 
   app.get("/:owner/:repo/commits/:branch/:path{.*}?", async (c) => {
@@ -260,7 +275,7 @@ export function createApp(eta: Eta) {
   });
 
   app.all("*", async (c) => {
-    return redirectToGitHub(c, githubUrlFor(c));
+    return redirectToGitHub(c);
   });
 
   return app;
diff --git a/cgithub/views/layout.eta b/cgithub/views/layout.eta
index 1ac82cc..37289dd 100644
--- a/cgithub/views/layout.eta
+++ b/cgithub/views/layout.eta
@@ -35,7 +35,7 @@ git clone git@github.com:<%= it.repo.owner %>/<%= it.repo.name %>.git</code></pr
 
   <%~ it.body %>
 
-  <footer>Generated by cgithub commit <code><%= it.commit %></code> · <a href="<%= it.githubUrl %>" rel="noreferrer">View original</a></footer>
+  <footer>Generated by cgithub commit <code><%= it.buildCommit %></code> · <a href="<%= it.githubUrl %>" rel="noreferrer">View original</a></footer>
 
   <script>
     document.addEventListener("keydown", function(e) {
-- 
cgit v1.3.1


From 53ac3bc511a45e4e2e3f234a8b8dcf853b0c38d9 Mon Sep 17 00:00:00 2001
From: Joe Mou <dev@mou.fo>
Date: Fri, 4 Sep 2026 21:26:21 -0400
Subject: Split the page shell out of the repository layout

layout.eta was two things at once: the HTML shell every page needs and
the repository chrome around it. owner.eta, being the one page that is
not about a repository, could use neither and carried its own copy of
the shell, which had drifted -- its footer named no build commit and
did not link to the original page on GitHub.

The shell moves to views/layouts/base.eta, taking its title and any
deferred scripts as layout data, and the chrome to views/layouts/repo.eta,
a layout over it that adds the clone commands, nav, search box, and the
"/" shortcut that focuses it. Repository pages point at repo.eta and
render as before; owner.eta uses base.eta directly and so gains the
footer it was missing.

Templates now live in more than one directory, so scripts/build.ts walks
views/ recursively and keys each template by its path underneath it.
Names crossing a directory are written from the views root
("/layouts/base.eta"), the one form both Eta's filesystem resolver and
the precompiled resolver in worker.ts agree on; siblings stay relative.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Ba5p88cWtCq42vf3uweweL
---
 cgithub/CLAUDE.md              |   2 +-
 cgithub/scripts/build.ts       |  20 ++++++--
 cgithub/src/app.ts             |   2 +-
 cgithub/src/worker.ts          |   5 +-
 cgithub/views/blob.eta         |   2 +-
 cgithub/views/commits.eta      |   2 +-
 cgithub/views/issues.eta       |   2 +-
 cgithub/views/layout.eta       |  66 -------------------------
 cgithub/views/layouts/base.eta |  17 +++++++
 cgithub/views/layouts/repo.eta |  59 +++++++++++++++++++++++
 cgithub/views/owner.eta        | 107 ++++++++++++++++++-----------------------
 cgithub/views/pulls.eta        |   2 +-
 cgithub/views/release.eta      |   2 +-
 cgithub/views/releases.eta     |   2 +-
 cgithub/views/repo.eta         |   2 +-
 cgithub/views/tree.eta         |   2 +-
 cgithub/views/wiki.eta         |   2 +-
 cgithub/views/wikiPages.eta    |   2 +-
 18 files changed, 156 insertions(+), 142 deletions(-)
 delete mode 100644 cgithub/views/layout.eta
 create mode 100644 cgithub/views/layouts/base.eta
 create mode 100644 cgithub/views/layouts/repo.eta

(limited to 'cgithub/scripts')

diff --git a/cgithub/CLAUDE.md b/cgithub/CLAUDE.md
index edb33f5..6c6dc60 100644
--- a/cgithub/CLAUDE.md
+++ b/cgithub/CLAUDE.md
@@ -24,7 +24,7 @@ pnpm test
 - `src/worker.ts` - Cloudflare Workers entry (config in `wrangler.jsonc`)
 - `src/scraper.ts` - GitHub HTML fetching and JSON extraction logic
 
-**Templates:** `views/*.eta` - Eta templates with layout inheritance (`layout.eta` as base). On Workers, runtime code generation is disallowed, so `scripts/build.ts` precompiles templates to `src/views.generated.ts`. The same script records the build's `git describe` output in `src/build.generated.ts` for the page footer. Both are gitignored and regenerated by the `dev`/`deploy` scripts.
+**Templates:** `views/*.eta` - Eta templates with layout inheritance. `views/layouts/base.eta` is the HTML shell every page uses; `views/layouts/repo.eta` wraps it with the repository header, nav, and search box. Templates address each other from the views root (`/layouts/base.eta`) or as siblings (`./_tree`). On Workers, runtime code generation is disallowed, so `scripts/build.ts` precompiles templates to `src/views.generated.ts`. The same script records the build's `git describe` output in `src/build.generated.ts` for the page footer. Both are gitignored and regenerated by the `dev`/`deploy` scripts.
 
 **Static files:** `public/static/*`, served by Workers Static Assets.
 
diff --git a/cgithub/scripts/build.ts b/cgithub/scripts/build.ts
index 76d88a0..4908532 100644
--- a/cgithub/scripts/build.ts
+++ b/cgithub/scripts/build.ts
@@ -14,10 +14,22 @@ const root = path.join(import.meta.dirname, "..");
 const viewsDir = path.join(root, "views");
 const eta = new Eta({ views: viewsDir });
 
-const names = fs
-  .readdirSync(viewsDir)
-  .filter((name) => name.endsWith(".eta"))
-  .sort();
+// Names are the templates' paths under views/, e.g. "layouts/base.eta", which
+// is how the templates address each other (see src/worker.ts).
+function templateNames(dir: string, prefix = ""): string[] {
+  const names: string[] = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const name = prefix + entry.name;
+    if (entry.isDirectory()) {
+      names.push(...templateNames(path.join(dir, entry.name), `${name}/`));
+    } else if (entry.name.endsWith(".eta")) {
+      names.push(name);
+    }
+  }
+  return names.sort();
+}
+
+const names = templateNames(viewsDir);
 
 let out = `// @ts-nocheck
 // Generated by scripts/build.ts -- do not edit.
diff --git a/cgithub/src/app.ts b/cgithub/src/app.ts
index 2fa5832..a040aaa 100644
--- a/cgithub/src/app.ts
+++ b/cgithub/src/app.ts
@@ -39,7 +39,7 @@ export function createApp(eta: Eta) {
   const app = new Hono();
 
   app.use(async (c, next) => {
-    // Include render data for layout.eta.
+    // Include render data for views/layouts/base.eta.
     c.setRenderer((template, data) =>
       c.html(eta.render(template, { ...data, githubUrl: githubUrlFor(c), buildCommit })),
     );
diff --git a/cgithub/src/worker.ts b/cgithub/src/worker.ts
index 7bf9100..e59c690 100644
--- a/cgithub/src/worker.ts
+++ b/cgithub/src/worker.ts
@@ -9,8 +9,11 @@ import { views } from "./views.generated.ts";
 // cache: true, Eta serves them from the cache and never compiles.
 const eta = new Eta({ cache: true });
 
+// Templates name each other as siblings ("./_tree") or from the views root
+// ("/layouts/base.eta"); either way the name is the path under views/ that
+// scripts/build.ts keyed the template by.
 eta.resolvePath = (templatePath: string) => {
-  let name = templatePath.replace(/^\.\//, "");
+  let name = templatePath.replace(/^\.?\//, "");
   if (!name.endsWith(".eta")) name += ".eta";
   return name;
 };
diff --git a/cgithub/views/blob.eta b/cgithub/views/blob.eta
index 2014b14..9f6706e 100644
--- a/cgithub/views/blob.eta
+++ b/cgithub/views/blob.eta
@@ -1,4 +1,4 @@
-<% layout("./layout.eta"); it.searchType = "code" %>
+<% layout("/layouts/repo.eta"); it.searchType = "code" %>
 
 <%~ include("./_nav.eta", {...it, view: "blob"}) %>
 
diff --git a/cgithub/views/commits.eta b/cgithub/views/commits.eta
index c29693d..a80ef07 100644
--- a/cgithub/views/commits.eta
+++ b/cgithub/views/commits.eta
@@ -1,4 +1,4 @@
-<% layout("./layout.eta") %>
+<% layout("/layouts/repo.eta") %>
 
 <%~ include("./_nav.eta", {...it, view: "commits"}) %>
 
diff --git a/cgithub/views/issues.eta b/cgithub/views/issues.eta
index 646da46..754afb8 100644
--- a/cgithub/views/issues.eta
+++ b/cgithub/views/issues.eta
@@ -1,4 +1,4 @@
-<% layout("./layout"); it.searchType = "issues" %>
+<% layout("/layouts/repo.eta"); it.searchType = "issues" %>
 
 <table>
   <% for (const issue of it.issues) { %>
diff --git a/cgithub/views/layout.eta b/cgithub/views/layout.eta
deleted file mode 100644
index 37289dd..0000000
--- a/cgithub/views/layout.eta
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title><%= it.repo.owner %>/<%= it.repo.name %> - <%= it.path || '/' %></title>
-  <link rel="stylesheet" href="/static/style.css">
-  <script src="/static/refs.js" defer></script>
-</head>
-<body>
-  <div class="box">
-    <div class="repo"><a href="/<%= it.repo.owner %>"><%= it.repo.owner %></a>/<a href="/<%= it.repo.owner %>/<%= it.repo.name %>"><%= it.repo.name %></a></div>
-    <pre><code>git clone https://github.com/<%= it.repo.owner %>/<%= it.repo.name %>.git
-git clone git@github.com:<%= it.repo.owner %>/<%= it.repo.name %>.git</code></pre>
-    <nav>
-      <a href="/<%= it.repo.owner %>/<%= it.repo.name %>">Code</a>
-      <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/issues">Issues</a>
-      <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/pulls">Pull requests</a>
-      <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/releases">Releases</a>
-      <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/wiki">Wiki</a>
-      <% if (it.branch) { %>
-        <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/commits/<%= it.branch %><%= it.path && it.path !== '/' ? '/' + it.path : '' %>">Commits</a>
-      <% } %>
-    </nav>
-    <form action="/<%= it.repo.owner %>/<%= it.repo.name %>/search" method="get">
-      <input id="search-input" type="text" name="q" placeholder="Search…" value="<%= it.q ?? "" %>">
-      <select name="type">
-        <option value="issues" <%= it.searchType === "issues" ? "selected" : "" %>>Issues</option>
-        <option value="pullrequests" <%= it.searchType === "pullrequests" ? "selected" : "" %>>Pull requests</option>
-        <option value="code" <%= it.searchType === "code" || it.searchType == null ? "selected" : "" %>>Code</option>
-      </select>
-      <button type="submit">Search</button>
-    </form>
-  </div>
-
-  <%~ it.body %>
-
-  <footer>Generated by cgithub commit <code><%= it.buildCommit %></code> · <a href="<%= it.githubUrl %>" rel="noreferrer">View original</a></footer>
-
-  <script>
-    document.addEventListener("keydown", function(e) {
-      let shortcut = "";
-      if (e.ctrlKey || e.metaKey) shortcut += "C-";
-      if (e.altKey) shortcut += "A-";
-      if (e.shiftKey) shortcut += "S-";
-      shortcut += e.key;
-
-      if (shortcut === "Escape") {
-        document.activeElement.blur();
-        return;
-      }
-
-      if (["INPUT", "TEXTAREA", "SELECT"].includes(document.activeElement.tagName)) {
-        return;
-      }
-
-      if (shortcut === "/") {
-        e.preventDefault();
-        const input = document.getElementById('search-input');
-        input.select();
-        input.scrollIntoView({ block: "nearest" });
-      }
-    });
-  </script>
-</body>
-</html>
diff --git a/cgithub/views/layouts/base.eta b/cgithub/views/layouts/base.eta
new file mode 100644
index 0000000..fb644f5
--- /dev/null
+++ b/cgithub/views/layouts/base.eta
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title><%= it.title %></title>
+  <link rel="stylesheet" href="/static/style.css">
+  <% for (const src of it.scripts ?? []) { %>
+    <script src="<%= src %>" defer></script>
+  <% } %>
+</head>
+<body>
+  <%~ it.body %>
+
+  <footer>Generated by cgithub commit <code><%= it.buildCommit %></code> · <a href="<%= it.githubUrl %>" rel="noreferrer">View original</a></footer>
+</body>
+</html>
diff --git a/cgithub/views/layouts/repo.eta b/cgithub/views/layouts/repo.eta
new file mode 100644
index 0000000..e4f7880
--- /dev/null
+++ b/cgithub/views/layouts/repo.eta
@@ -0,0 +1,59 @@
+<%
+layout("/layouts/base.eta", {
+  title: `${it.repo.owner}/${it.repo.name} - ${it.path || "/"}`,
+  scripts: ["/static/refs.js"],
+})
+%>
+
+<div class="box">
+  <div class="repo"><a href="/<%= it.repo.owner %>"><%= it.repo.owner %></a>/<a href="/<%= it.repo.owner %>/<%= it.repo.name %>"><%= it.repo.name %></a></div>
+  <pre><code>git clone https://github.com/<%= it.repo.owner %>/<%= it.repo.name %>.git
+git clone git@github.com:<%= it.repo.owner %>/<%= it.repo.name %>.git</code></pre>
+  <nav>
+    <a href="/<%= it.repo.owner %>/<%= it.repo.name %>">Code</a>
+    <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/issues">Issues</a>
+    <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/pulls">Pull requests</a>
+    <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/releases">Releases</a>
+    <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/wiki">Wiki</a>
+    <% if (it.branch) { %>
+      <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/commits/<%= it.branch %><%= it.path && it.path !== '/' ? '/' + it.path : '' %>">Commits</a>
+    <% } %>
+  </nav>
+  <form action="/<%= it.repo.owner %>/<%= it.repo.name %>/search" method="get">
+    <input id="search-input" type="text" name="q" placeholder="Search…" value="<%= it.q ?? "" %>">
+    <select name="type">
+      <option value="issues" <%= it.searchType === "issues" ? "selected" : "" %>>Issues</option>
+      <option value="pullrequests" <%= it.searchType === "pullrequests" ? "selected" : "" %>>Pull requests</option>
+      <option value="code" <%= it.searchType === "code" || it.searchType == null ? "selected" : "" %>>Code</option>
+    </select>
+    <button type="submit">Search</button>
+  </form>
+</div>
+
+<%~ it.body %>
+
+<script>
+  document.addEventListener("keydown", function(e) {
+    let shortcut = "";
+    if (e.ctrlKey || e.metaKey) shortcut += "C-";
+    if (e.altKey) shortcut += "A-";
+    if (e.shiftKey) shortcut += "S-";
+    shortcut += e.key;
+
+    if (shortcut === "Escape") {
+      document.activeElement.blur();
+      return;
+    }
+
+    if (["INPUT", "TEXTAREA", "SELECT"].includes(document.activeElement.tagName)) {
+      return;
+    }
+
+    if (shortcut === "/") {
+      e.preventDefault();
+      const input = document.getElementById('search-input');
+      input.select();
+      input.scrollIntoView({ block: "nearest" });
+    }
+  });
+</script>
diff --git a/cgithub/views/owner.eta b/cgithub/views/owner.eta
index e5667fb..b3304fb 100644
--- a/cgithub/views/owner.eta
+++ b/cgithub/views/owner.eta
@@ -1,65 +1,54 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title><%= it.name ? `${it.name} (${it.login})` : it.login %></title>
-  <link rel="stylesheet" href="/static/style.css">
-</head>
-<body>
-  <div class="box">
-    <% if (it.avatarUrl) { %>
-      <img class="avatar" src="<%= it.avatarUrl %>" alt="" width="64" height="64">
-    <% } %>
-    <div class="repo"><%= it.name || it.login %></div>
-    <div><%= it.login %><%= it.type === "organization" ? " (organization)" : "" %></div>
-    <% if (it.location) { %>
-      <div><%= it.location %></div>
-    <% } %>
-    <% if (it.nav.length > 0) { %>
-      <nav>
-        <% for (const item of it.nav) { %>
-          <a href="<%= item.href %>"><%= item.text %></a>
-        <% } %>
-      </nav>
-    <% } %>
-  </div>
+<% layout("/layouts/base.eta", { title: it.name ? `${it.name} (${it.login})` : it.login }) %>
 
-  <% if (it.bio || it.links.length > 0 || it.followers || it.company) { %>
-    <div class="box repo-info">
-      <% if (it.bio) { %>
-        <div class="description"><%= it.bio %></div>
-      <% } %>
-      <% for (const link of it.links) { %>
-        <div class="detail"><img src="/static/icons/link.svg" alt="" class="icon"> <a href="<%= link.href %>" rel="noopener noreferrer"><%= link.text %></a></div>
-      <% } %>
-      <% if (it.followers) { %>
-        <div class="detail"><img src="/static/icons/eye.svg" alt="" class="icon"> <%= it.followers %> followers<%= it.following ? ` · ${it.following} following` : "" %></div>
-      <% } %>
-      <% if (it.company) { %>
-        <div class="detail"><%= it.company %></div>
-      <% } %>
-    </div>
+<div class="box">
+  <% if (it.avatarUrl) { %>
+    <img class="avatar" src="<%= it.avatarUrl %>" alt="" width="64" height="64">
   <% } %>
-
-  <% if (it.pinned.length > 0) { %>
-    <section>
-      <h2>Pinned</h2>
-      <% for (const repo of it.pinned) { %>
-        <%~ include("./_ownerRepo", { repo, login: it.login }) %>
-      <% } %>
-    </section>
+  <div class="repo"><%= it.name || it.login %></div>
+  <div><%= it.login %><%= it.type === "organization" ? " (organization)" : "" %></div>
+  <% if (it.location) { %>
+    <div><%= it.location %></div>
   <% } %>
-
-  <% if (it.repos.length > 0) { %>
-    <section>
-      <h2>Repositories</h2>
-      <% for (const repo of it.repos) { %>
-        <%~ include("./_ownerRepo", { repo, login: it.login }) %>
+  <% if (it.nav.length > 0) { %>
+    <nav>
+      <% for (const item of it.nav) { %>
+        <a href="<%= item.href %>"><%= item.text %></a>
       <% } %>
-    </section>
+    </nav>
   <% } %>
+</div>
+
+<% if (it.bio || it.links.length > 0 || it.followers || it.company) { %>
+  <div class="box repo-info">
+    <% if (it.bio) { %>
+      <div class="description"><%= it.bio %></div>
+    <% } %>
+    <% for (const link of it.links) { %>
+      <div class="detail"><img src="/static/icons/link.svg" alt="" class="icon"> <a href="<%= link.href %>" rel="noopener noreferrer"><%= link.text %></a></div>
+    <% } %>
+    <% if (it.followers) { %>
+      <div class="detail"><img src="/static/icons/eye.svg" alt="" class="icon"> <%= it.followers %> followers<%= it.following ? ` · ${it.following} following` : "" %></div>
+    <% } %>
+    <% if (it.company) { %>
+      <div class="detail"><%= it.company %></div>
+    <% } %>
+  </div>
+<% } %>
 
-  <footer>Generated by cgithub</footer>
-</body>
-</html>
+<% if (it.pinned.length > 0) { %>
+  <section>
+    <h2>Pinned</h2>
+    <% for (const repo of it.pinned) { %>
+      <%~ include("./_ownerRepo", { repo, login: it.login }) %>
+    <% } %>
+  </section>
+<% } %>
+
+<% if (it.repos.length > 0) { %>
+  <section>
+    <h2>Repositories</h2>
+    <% for (const repo of it.repos) { %>
+      <%~ include("./_ownerRepo", { repo, login: it.login }) %>
+    <% } %>
+  </section>
+<% } %>
diff --git a/cgithub/views/pulls.eta b/cgithub/views/pulls.eta
index 9ec5ca1..697f6b1 100644
--- a/cgithub/views/pulls.eta
+++ b/cgithub/views/pulls.eta
@@ -1,4 +1,4 @@
-<% layout("./layout"); it.searchType = "pullrequests" %>
+<% layout("/layouts/repo.eta"); it.searchType = "pullrequests" %>
 
 <table>
   <% for (const pull of it.pulls) { %>
diff --git a/cgithub/views/release.eta b/cgithub/views/release.eta
index 46dd5db..64cca35 100644
--- a/cgithub/views/release.eta
+++ b/cgithub/views/release.eta
@@ -1,3 +1,3 @@
-<% layout("./layout.eta") %>
+<% layout("/layouts/repo.eta") %>
 
 <%~ include("./_release.eta", { repo: it.repo, release: it.release, linkToDetail: false }) %>
diff --git a/cgithub/views/releases.eta b/cgithub/views/releases.eta
index 840908c..4ede28b 100644
--- a/cgithub/views/releases.eta
+++ b/cgithub/views/releases.eta
@@ -1,4 +1,4 @@
-<% layout("./layout.eta") %>
+<% layout("/layouts/repo.eta") %>
 
 <% for (const release of it.releases) { %>
   <%~ include("./_release.eta", { repo: it.repo, release, linkToDetail: true }) %>
diff --git a/cgithub/views/repo.eta b/cgithub/views/repo.eta
index 5dc6beb..60746df 100644
--- a/cgithub/views/repo.eta
+++ b/cgithub/views/repo.eta
@@ -1,4 +1,4 @@
-<% layout("./layout.eta") %>
+<% layout("/layouts/repo.eta") %>
 
 <% if (it.info) { %>
   <div class="box repo-info">
diff --git a/cgithub/views/tree.eta b/cgithub/views/tree.eta
index 41ded06..fabf5b9 100644
--- a/cgithub/views/tree.eta
+++ b/cgithub/views/tree.eta
@@ -1,3 +1,3 @@
-<% layout("./layout.eta"); it.searchType = "code" %>
+<% layout("/layouts/repo.eta"); it.searchType = "code" %>
 
 <%~ include("./_tree.eta", it) %>
diff --git a/cgithub/views/wiki.eta b/cgithub/views/wiki.eta
index d6047e1..781caff 100644
--- a/cgithub/views/wiki.eta
+++ b/cgithub/views/wiki.eta
@@ -1,4 +1,4 @@
-<% layout("./layout.eta"); it.path = "wiki/" + it.title %>
+<% layout("/layouts/repo.eta"); it.path = "wiki/" + it.title %>
 
 <%~ include("./_wikiNav.eta", it) %>
 
diff --git a/cgithub/views/wikiPages.eta b/cgithub/views/wikiPages.eta
index 58d6d21..eb90781 100644
--- a/cgithub/views/wikiPages.eta
+++ b/cgithub/views/wikiPages.eta
@@ -1,4 +1,4 @@
-<% layout("./layout.eta"); it.path = "wiki/_pages" %>
+<% layout("/layouts/repo.eta"); it.path = "wiki/_pages" %>
 
 <%~ include("./_wikiNav.eta", it) %>
 
-- 
cgit v1.3.1