@stelstone/server 0.26.1 → 0.26.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stelstone/server",
-  "version": "0.26.1",
+  "version": "0.26.3",
   "description": "Runtime-agnostic CMS server built on the Web Fetch API, with pluggable adapters for content, media, auth, and build.",
   "license": "MIT",
   "repository": {

package/src/adapters/github-content.mjs

@@ -73,6 +73,8 @@ export function createGitHubContent({ token, owner, repo, branch, draftBranch, p
   // Lazily create the draft branch off the published branch. Checked once per
   // process; a 404 on the ref is the "first ever use" case, not an error.
   let draftBranchReady = !draftMode;
+  let indexesStaleAfterSync = false;
+  const refreshedAfterSync = new Set();
   async function ensureDraftBranch() {
     if (draftBranchReady) return;
     const ref = await apiGet(`/git/ref/heads/${draftBranch}`);
@@ -88,7 +90,13 @@ export function createGitHubContent({ token, owner, repo, branch, draftBranch, p
       // on main from code and the admin listed an empty collection. Keep the
       // draft current by merging the published branch in once per process.
       try {
-        await apiPost(`/merges`, { base: draftBranch, head: branch });
+        const merged = await apiPost(`/merges`, { base: draftBranch, head: branch });
+        // A real merge means files changed under us — the per-collection
+        // _index.json manifests may now be stale (the empty-index variant of
+        // this bit stelstone.com: an index bootstrapped before content
+        // existed served an empty list forever). Mark them suspect; the
+        // lazy strategy rebuilds on next list.
+        if (merged?.sha) indexesStaleAfterSync = true;
       } catch (err) {
         if (err?.upstreamStatus === 409) {
           // Same record edited on both branches: the draft (the editor's
@@ -226,8 +234,16 @@ export function createGitHubContent({ token, owner, repo, branch, draftBranch, p
       }
 
       // 2. strategy "index": try the pre-built manifest first (1 subrequest).
+      // After a draft-branch sync merged changes in, an existing manifest is
+      // suspect: skip it once per collection so the lazy path rebuilds it
+      // from the merged tree. ("build" sites rebuild via the CLI instead.)
+      const skipIndex =
+        indexesStaleAfterSync &&
+        listConfig.rebuild === "lazy" &&
+        !refreshedAfterSync.has(safeCollection);
       const idxPath = indexFilePath(safeCollection);
       try {
+        if (skipIndex) throw new Error("index suspect after sync");
         const data = await apiGet(`/contents/${idxPath}?ref=${workBranch}`);
         if (data && !Array.isArray(data)) {
           shaCache.set(idxPath, data.sha);
@@ -262,6 +278,7 @@ export function createGitHubContent({ token, owner, repo, branch, draftBranch, p
         // Persist for all future calls.
         try {
           await writeIndex(safeCollection, { entries: pages });
+          refreshedAfterSync.add(safeCollection);
         } catch (err) {
           console.warn(`[listPages] Could not write ${listConfig.indexFile}:`, err?.message);
         }

package/src/server.mjs

@@ -155,20 +155,44 @@ export function startScheduler(content, intervalMs = 60_000) {
   return () => clearInterval(timer);
 }
 
+const PREVIEW_THEME_PATH = "/admin/preview-theme.css";
+
+/**
+ * The per-site canvas stylesheet.
+ *
+ * Always answered, even when the site configured none: the admin SPA links it
+ * unconditionally, and every mount ends in an SPA fallback that would hand the
+ * browser index.html labelled as CSS.
+ */
+function previewThemeResponse(previewThemeCss) {
+  if (previewThemeCss && fs.existsSync(previewThemeCss)) {
+    return fileResponse(path.resolve(previewThemeCss));
+  }
+  return new Response("/* no preview-theme.css configured */", {
+    headers: { "Content-Type": "text/css" },
+  });
+}
+
+/**
+ * Connect middleware that answers the preview stylesheet and passes everything
+ * else along. Used by the Vite mount, whose own SPA fallback would otherwise
+ * swallow the path.
+ */
+export function createPreviewThemeMiddleware(previewThemeCss) {
+  return toNodeMiddleware(async (request) =>
+    new URL(request.url).pathname === PREVIEW_THEME_PATH
+      ? previewThemeResponse(previewThemeCss)
+      : null,
+  );
+}
+
 /** Serve the prebuilt admin SPA, plus the optional per-site preview stylesheet. */
 function createAdminUiHandler({ dir, previewThemeCss }) {
   const files = createStaticHandler({ root: dir, mount: "/admin", spaFallback: true });
   return function serveAdminUi(request) {
     const { pathname } = new URL(request.url);
     // Answer before the static handler so the <link> never 404s.
-    if (pathname === "/admin/preview-theme.css") {
-      if (previewThemeCss && fs.existsSync(previewThemeCss)) {
-        return fileResponse(path.resolve(previewThemeCss));
-      }
-      return new Response("/* no preview-theme.css configured */", {
-        headers: { "Content-Type": "text/css" },
-      });
-    }
+    if (pathname === PREVIEW_THEME_PATH) return previewThemeResponse(previewThemeCss);
     return files(request);
   };
 }
@@ -258,8 +282,18 @@ export async function resolveAdminUi(adminUi) {
       appType: "spa",
     });
     console.log("Admin UI: Vite dev middleware (HMR enabled)");
+
+    // Vite owns /admin here, and its SPA fallback answers every unmatched path
+    // with index.html — so the preview stylesheet arrived as HTML and the
+    // browser dropped it, leaving the canvas unstyled whenever the admin UI
+    // ran from source. Only the static mount used to answer this path; now
+    // both do, and `previewThemeCss` means the same thing in dev and in prod.
+    const viteMiddleware = mountPrefix("/admin", vite.middlewares);
+    const previewTheme = createPreviewThemeMiddleware(resolved.previewThemeCss);
+
     return {
-      nodeMiddleware: mountPrefix("/admin", vite.middlewares),
+      nodeMiddleware: (req, res, next) =>
+        previewTheme(req, res, () => viteMiddleware(req, res, next)),
       previewThemeCss: resolved.previewThemeCss,
     };
   }

package/src/version.mjs

@@ -5,4 +5,4 @@
  * require() and no import.meta.url, so reading the manifest at runtime yields
  * "unknown" there.
  */
-export const SERVER_VERSION = "0.26.1";
+export const SERVER_VERSION = "0.26.3";