ferst-core 0.7.11 → 0.7.13

package/bin/ferst-update.mjs

@@ -11,8 +11,9 @@
 //   npx --no-install ferst-update --dry-run  # fetch + show what WOULD change; no writes
 //   npx --no-install ferst-update --no-core  # scaffold sync only; skip the npm bump
 //
-// The template-owned paths and the git upstream come from the repo's own
-// `ferst-template.json` (the ownership manifest). Client paths are NEVER touched —
+// The git upstream comes from the repo's own `ferst-template.json` (the ownership
+// manifest); the paths to sync come from the TEMPLATE's manifest at its latest version, so
+// a path it newly owns arrives in the same run (falling back to the repo's list). Client paths are NEVER touched —
 // the scaffold sync is a per-path OVERWRITE from upstream, conflict-free by
 // construction (see docs/CLIENT-TEMPLATE-ARCHITECTURE.md, Workstream D). It never
 // merges/rebases (the CMS bot commits to client repos continuously; a history merge
@@ -87,6 +88,35 @@ export function resolveOwnedPaths(manifest) {
   return owned;
 }
 
+/**
+ * The paths to sync: the TEMPLATE's own list at its latest version, so a path it newly
+ * owns arrives in the same run. Falls back to the site's list when the template's
+ * manifest can't be read or declares none (an older template, a fetch problem).
+ */
+export function ownedPathsToSync(localOwned, upstreamManifestRaw) {
+  try {
+    return resolveOwnedPaths(parseManifest(upstreamManifestRaw));
+  } catch {
+    return localOwned;
+  }
+}
+
+/**
+ * The manifest text to build on after the sync. The manifest is itself template-owned, so
+ * the sync has just replaced it: build on that, or the site's old ownedPaths would be
+ * written back over the template's new ones. Falls back to the pre-sync text when the file
+ * is missing or unreadable.
+ */
+export function manifestAfterSync(preSyncRaw, postSyncRaw) {
+  if (typeof postSyncRaw !== 'string') return preSyncRaw;
+  try {
+    parseManifest(postSyncRaw);
+    return postSyncRaw;
+  } catch {
+    return preSyncRaw;
+  }
+}
+
 /**
  * The template git URL to sync the scaffold from. Uses the manifest's `upstream`
  * when present; otherwise falls back to the canonical template repo and flags it so
@@ -280,11 +310,27 @@ function readSiteMeta(cwd) {
   }
 }
 
-/** Ensure an `upstream` remote points at `url` (add, or set-url if it already exists). */
-function ensureUpstream(url, cwd) {
+/**
+ * The git remote the template is fetched through. Never `upstream`, `github` or `origin`:
+ * `gh` takes the first of those it finds for "this repository", so a template remote named
+ * `upstream` made `gh` act on the public template instead of the site.
+ */
+export const TEMPLATE_REMOTE = 'ferst-template';
+
+/** Is this an older run's `upstream` remote that points at the template (safe to drop)? */
+export function isLeftoverTemplateRemote(name, remoteUrl, templateUrl) {
+  const norm = (u) => String(u ?? '').trim().replace(/\/+$/, '').replace(/\.git$/, '').toLowerCase();
+  return name === 'upstream' && norm(remoteUrl) !== '' && norm(remoteUrl) === norm(templateUrl);
+}
+
+/** Ensure TEMPLATE_REMOTE points at `url`, and drop an older run's `upstream` template remote. */
+function ensureTemplateRemote(url, cwd) {
   const remotes = (tryGit('remote', cwd) || '').split(/\r?\n/).map((s) => s.trim());
-  if (remotes.includes('upstream')) git(`remote set-url upstream ${q(url)}`, cwd);
-  else git(`remote add upstream ${q(url)}`, cwd);
+  if (remotes.includes('upstream') && isLeftoverTemplateRemote('upstream', tryGit('remote get-url upstream', cwd), url)) {
+    git('remote remove upstream', cwd);
+  }
+  if (remotes.includes(TEMPLATE_REMOTE)) git(`remote set-url ${TEMPLATE_REMOTE} ${q(url)}`, cwd);
+  else git(`remote add ${TEMPLATE_REMOTE} ${q(url)}`, cwd);
 }
 
 function printHelp() {
@@ -330,23 +376,26 @@ function main() {
   // 2. Git scaffold sync — overwrite the template-owned paths from upstream's default
   //    branch. Never a merge/rebase; path-checkout works across unrelated histories.
   try {
-    ensureUpstream(upstream.url, cwd);
+    ensureTemplateRemote(upstream.url, cwd);
     console.log(`ferst-update: fetching ${upstream.url} ...`);
-    git('fetch upstream', cwd);
+    git(`fetch ${TEMPLATE_REMOTE}`, cwd);
   } catch (e) {
     console.error(`ferst-update: git fetch failed — ${tail(e.stderr || e.message, 10)}`);
     process.exit(1);
   }
-  const branch = parseDefaultBranch(tryGit('ls-remote --symref upstream HEAD', cwd)) || 'main';
+  const branch = parseDefaultBranch(tryGit(`ls-remote --symref ${TEMPLATE_REMOTE} HEAD`, cwd)) || 'main';
   console.log(`ferst-update: upstream default branch = ${branch}`);
   // The exact template commit this run syncs from (for the provenance stamp / #18 ledger).
-  const templateCommit = (tryGit(`rev-parse upstream/${branch}`, cwd) || '').trim() || null;
+  const templateCommit = (tryGit(`rev-parse ${TEMPLATE_REMOTE}/${branch}`, cwd) || '').trim() || null;
+  // The template's own manifest decides what it owns now (see ownedPathsToSync).
+  const upstreamManifestRaw = tryGit(`show ${TEMPLATE_REMOTE}/${branch}:${MANIFEST}`, cwd) || '';
+  const syncPaths = ownedPathsToSync(ownedPaths, upstreamManifestRaw);
 
   let templateVersion = null; // the template version this sync brought (for the manifest + stamp)
   let scaffoldCount = 0; // files the scaffold sync touched (counted BEFORE the npm churn)
   if (dryRun) {
-    const spec = ownedPaths.map(q).join(' ');
-    const diff = (tryGit(`diff --stat upstream/${branch} -- ${spec}`, cwd) || '').trim();
+    const spec = syncPaths.map(q).join(' ');
+    const diff = (tryGit(`diff --stat ${TEMPLATE_REMOTE}/${branch} -- ${spec}`, cwd) || '').trim();
     console.log('ferst-update: --dry-run — scaffold changes that WOULD apply:');
     console.log(diff ? diff : '  (no scaffold changes)');
   } else {
@@ -354,10 +403,10 @@ function main() {
     const pkgPath = resolve(cwd, 'package.json');
     let clientPkg = null;
     try { clientPkg = readFileSync(pkgPath, 'utf8'); } catch { /* none yet */ }
-    for (const p of ownedPaths) {
+    for (const p of syncPaths) {
       // Per-path so one path that upstream no longer ships (pathspec no-match) can't
       // abort the whole sync — warn and continue.
-      if (tryGit(`checkout upstream/${branch} -- ${q(p)}`, cwd) === null) {
+      if (tryGit(`checkout ${TEMPLATE_REMOTE}/${branch} -- ${q(p)}`, cwd) === null) {
         console.warn(`ferst-update: could not sync "${p}" (not present upstream?) — skipped.`);
       }
     }
@@ -371,9 +420,15 @@ function main() {
         }
       } catch { /* package.json not synced — nothing to restore */ }
     }
-    // The manifest isn't a synced path (it holds the client's own settings), so carry the
-    // template's version across explicitly; `raw` is what the coreRange step builds on.
-    const upstreamVersion = readTemplateVersion(tryGit(`show upstream/${branch}:${MANIFEST}`, cwd) || '');
+    // The manifest is itself template-owned and was just synced: build on that text (see
+    // manifestAfterSync), so the coreRange step and the stamp see the template's manifest.
+    let syncedManifest = null;
+    try { syncedManifest = readFileSync(manifestPath, 'utf8'); } catch { /* not synced */ }
+    raw = manifestAfterSync(raw, syncedManifest);
+    manifest = parseManifest(raw);
+    // Carry the template's version across explicitly too, for a site whose manifest isn't
+    // among the synced paths; `raw` is what the coreRange step builds on.
+    const upstreamVersion = readTemplateVersion(upstreamManifestRaw);
     if (upstreamVersion) {
       const bumped = replaceTemplateVersion(raw, upstreamVersion);
       if (bumped && bumped !== raw) {

package/components/recipes/Hero.astro

@@ -46,7 +46,10 @@ const provider = bgLink ? videoEmbed(bgLink)?.provider : undefined;
 const watchLabel = media?.linkLabel || (provider ? `Watch the full video on ${provider}` : 'Watch the full video');
 // The still: the image (no motion), or an embed's poster until the player may load.
 const stillSrc = embed ? media?.poster ?? still : !media?.video && !slides.length ? still : undefined;
-const bgImage = isMedia && stillSrc ? `--hero-image: url('${stillSrc}')` : '';
+// Drawn as a real <img>, never a CSS background: a picture set through a CSS variable is
+// found late (never by the preload scanner), so the hero sat grey until it arrived, and
+// some browsers kept it grey. A real image, loaded first, is found early and painted.
+const heroImg = isMedia && stillSrc ? stillSrc : undefined;
 ---
 
 <section
@@ -58,10 +61,11 @@ const bgImage = isMedia && stillSrc ? `--hero-image: url('${stillSrc}')` : '';
   data-linked={bgLink ? 'true' : undefined}
   data-parallax={isMedia && parallax ? 'true' : undefined}
   data-full-bleed={isMedia && fullBleed ? 'true' : undefined}
-  style={isMedia ? `--hero-overlay: ${overlay}; ${bgImage}${focus ? `; --hero-focus: ${focus}` : ''}` : undefined}
+  style={isMedia ? `--hero-overlay: ${overlay}${focus ? `; --hero-focus: ${focus}` : ''}` : undefined}
 >
   {isMedia && (
     <div class="b-hero__bg" aria-hidden="true">
+      {heroImg && <img class="b-hero__img" src={heroImg} alt="" loading="eager" fetchpriority="high" decoding="async" />}
       {embed && <div class="b-hero__embed" data-embed-url={embed.embedUrl} data-provider={embed.provider}></div>}
       {media?.video && !embed ? (
         <video autoplay muted loop playsinline poster={media.poster} preload="metadata">
@@ -69,7 +73,7 @@ const bgImage = isMedia && stillSrc ? `--hero-image: url('${stillSrc}')` : '';
         </video>
       ) : null}
       {slides.map((src, i) => (
-        <span class:list={['b-hero__slide', { 'is-on': i === 0 }]} style={`background-image: url('${src}')`}></span>
+        <img class:list={['b-hero__slide', { 'is-on': i === 0 }]} src={src} alt="" loading={i === 0 ? 'eager' : 'lazy'} fetchpriority={i === 0 ? 'high' : undefined} decoding="async" />
       ))}
       <span class="b-hero__scrim"></span>
     </div>
@@ -346,11 +350,20 @@ const bgImage = isMedia && stillSrc ? `--hero-image: url('${stillSrc}')` : '';
     position: absolute;
     inset: 0;
     z-index: -1;
-    background-image: var(--hero-image, none);
-    background-size: cover;
-    background-position: var(--hero-focus, center);
     background-color: var(--bg-section);
   }
+  /* The picture (and each rotating slide) covers the band, framed by `focus`. */
+  .b-hero__img,
+  .b-hero__slide {
+    position: absolute;
+    inset: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    object-position: var(--hero-focus, center);
+    display: block;
+    max-width: none;
+  }
   /* Parallax: give the background room to drift without uncovering an edge. */
   .b-hero.is-parallax .b-hero__bg {
     inset: 0 0 -35% 0;
@@ -390,10 +403,6 @@ const bgImage = isMedia && stillSrc ? `--hero-image: url('${stillSrc}')` : '';
     display: none;
   }
   .b-hero__slide {
-    position: absolute;
-    inset: 0;
-    background-size: cover;
-    background-position: var(--hero-focus, center);
     opacity: 0;
     transition: opacity 1.6s ease-in-out;
   }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "ferst-core",
-  "version": "0.7.11",
+  "version": "0.7.13",
   "type": "module",
-  "description": "Ferst Core \u2014 the shared, brand-agnostic client-site system: Astro components, layouts, content schemas, the layered config resolver, and a neutral styling architecture that every client overrides.",
+  "description": "Ferst Core — the shared, brand-agnostic client-site system: Astro components, layouts, content schemas, the layered config resolver, and a neutral styling architecture that every client overrides.",
   "license": "BUSL-1.1",
   "author": "MyAI4 Ltd (https://ferst.co.uk)",
   "homepage": "https://ferst.co.uk",