ferst-core 0.9.6 → 0.9.7

package/bin/cms-config.mjs

@@ -60,53 +60,10 @@ export function repoSlug() {
   return '';
 }
 
-export const PROD_GIT_BASE = 'https://signin.ferst.co.uk';
-export const DEV_GIT_BASE = 'https://signin-dev.ferst.co.uk';
-
-/**
- * The platform git-proxy origin (CMS `base_url` / `api_root`) for THIS build:
- *   1. `FERST_GIT_BASE` env — explicit override, always wins.
- *   2. committed `ferst-site.json` `gitBase` — an explicit per-site pin (e.g. a
- *      custom proxy); a BYO/seeded site can hard-bind its origin this way.
- *   3. otherwise DERIVE from the deploy environment: the production branch talks to
- *      the prod git-proxy, every other (preview/dev) branch talks to the dev
- *      git-proxy. So a templated repo self-configures per environment on deploy — a
- *      dev-branch build points its CMS at the dev worker and main at prod — with NO
- *      per-client config. (The production branch defaults to `main`; override via
- *      `FERST_PROD_BRANCH` env or `ferst-site.json` `productionBranch`.)
- * This restores the "site respects the environment it's deployed in" binding the old
- * per-branch site config gave, without a per-client file to maintain.
- */
-export function resolveGitBase(cwd = process.cwd(), branch = deploymentBranch()) {
-  const fromEnv = env('FERST_GIT_BASE');
-  if (fromEnv) return fromEnv;
-  let prodBranch = env('FERST_PROD_BRANCH') || 'main';
-  try {
-    const site = JSON.parse(readFileSync(resolve(cwd, 'ferst-site.json'), 'utf8'));
-    if (site && typeof site.gitBase === 'string' && site.gitBase.trim()) return site.gitBase.trim();
-    if (!env('FERST_PROD_BRANCH') && site && typeof site.productionBranch === 'string' && site.productionBranch.trim()) {
-      prodBranch = site.productionBranch.trim();
-    }
-  } catch {
-    /* no ferst-site.json (e.g. the template repo itself) — derive from the branch */
-  }
-  return branch === prodBranch ? PROD_GIT_BASE : DEV_GIT_BASE;
-}
-
-/** The deployment branch: CF Pages env → current git branch → main. */
-export function deploymentBranch() {
-  const cf = env('CF_PAGES_BRANCH');
-  if (cf) return cf;
-  try {
-    const git = execSync('git rev-parse --abbrev-ref HEAD', {
-      stdio: ['ignore', 'pipe', 'ignore'],
-    }).toString().trim();
-    if (git && git !== 'HEAD') return git;
-  } catch {
-    /* not a git checkout — fall through */
-  }
-  return 'main';
-}
+// The git-proxy origin lives in lib/git-base.mjs, which components can import: this file is a
+// build-time script whose module scope needs a real filesystem (TEMPLATE_PATH).
+export { PROD_GIT_BASE, DEV_GIT_BASE, resolveGitBase, deploymentBranch } from '../lib/git-base.mjs';
+import { resolveGitBase, deploymentBranch } from '../lib/git-base.mjs';
 
 /** Ferst's managed GitHub org: its sites are on the Basic plan. */
 const MANAGED_OWNER = 'myai4webdev';

package/bin/ferst-modules.mjs

@@ -12,7 +12,7 @@
 import { readFileSync, realpathSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { resolveGitBase } from './cms-config.mjs';
+import { resolveGitBase } from '../lib/git-base.mjs';
 
 /**
  * True when THIS file is run as a CLI (not imported). Each bin needs its own copy:

package/components/recipes/Form.astro

@@ -7,7 +7,7 @@
  */
 import ContactForm from './ContactForm.astro';
 import { loadFormDefinition } from '../../lib/forms';
-import { resolveGitBase } from '../../bin/cms-config.mjs';
+import { resolveGitBase } from '../../lib/git-base.mjs';
 
 interface Props {
   form: string;

package/lib/git-base.mjs

@@ -0,0 +1,62 @@
+/**
+ * The platform git-proxy origin for this build (the CMS `base_url`, and where the Form block
+ * reads a form's fields). Kept apart from bin/cms-config.mjs so components can import it: that
+ * file is a build-time script whose module scope needs a real filesystem, which an on-request
+ * renderer (Cloudflare Workers) doesn't have. Nothing here runs at import time.
+ */
+import { readFileSync } from 'node:fs';
+import { execSync } from 'node:child_process';
+import { resolve } from 'node:path';
+
+function env(name) {
+  const v = typeof process !== 'undefined' ? process.env?.[name] : undefined;
+  return v && v.trim() ? v.trim() : '';
+}
+
+export const PROD_GIT_BASE = 'https://signin.ferst.co.uk';
+export const DEV_GIT_BASE = 'https://signin-dev.ferst.co.uk';
+
+/**
+ * The platform git-proxy origin (CMS `base_url` / `api_root`) for THIS build:
+ *   1. `FERST_GIT_BASE` env — explicit override, always wins.
+ *   2. committed `ferst-site.json` `gitBase` — an explicit per-site pin (e.g. a
+ *      custom proxy); a BYO/seeded site can hard-bind its origin this way.
+ *   3. otherwise DERIVE from the deploy environment: the production branch talks to
+ *      the prod git-proxy, every other (preview/dev) branch talks to the dev
+ *      git-proxy. So a templated repo self-configures per environment on deploy — a
+ *      dev-branch build points its CMS at the dev worker and main at prod — with NO
+ *      per-client config. (The production branch defaults to `main`; override via
+ *      `FERST_PROD_BRANCH` env or `ferst-site.json` `productionBranch`.)
+ * This restores the "site respects the environment it's deployed in" binding the old
+ * per-branch site config gave, without a per-client file to maintain.
+ */
+export function resolveGitBase(cwd = process.cwd(), branch = deploymentBranch()) {
+  const fromEnv = env('FERST_GIT_BASE');
+  if (fromEnv) return fromEnv;
+  let prodBranch = env('FERST_PROD_BRANCH') || 'main';
+  try {
+    const site = JSON.parse(readFileSync(resolve(cwd, 'ferst-site.json'), 'utf8'));
+    if (site && typeof site.gitBase === 'string' && site.gitBase.trim()) return site.gitBase.trim();
+    if (!env('FERST_PROD_BRANCH') && site && typeof site.productionBranch === 'string' && site.productionBranch.trim()) {
+      prodBranch = site.productionBranch.trim();
+    }
+  } catch {
+    /* no ferst-site.json (e.g. the template repo itself) — derive from the branch */
+  }
+  return branch === prodBranch ? PROD_GIT_BASE : DEV_GIT_BASE;
+}
+
+/** The deployment branch: CF Pages env → current git branch → main. */
+export function deploymentBranch() {
+  const cf = env('CF_PAGES_BRANCH');
+  if (cf) return cf;
+  try {
+    const git = execSync('git rev-parse --abbrev-ref HEAD', {
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).toString().trim();
+    if (git && git !== 'HEAD') return git;
+  } catch {
+    /* not a git checkout — fall through */
+  }
+  return 'main';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ferst-core",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "type": "module",
   "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",