@rmdes/indiekit-endpoint-site-config 1.0.0-beta.1 → 1.0.0-beta.3

package/index.js

@@ -7,12 +7,12 @@ import { brandingRouter   } from "./lib/controllers/branding.js";
 import { homepageRouter   } from "./lib/controllers/homepage.js";
 import { blogRouter       } from "./lib/controllers/blog.js";
 import { navigationRouter } from "./lib/controllers/navigation.js";
-import { featuresRouter   } from "./lib/controllers/features.js";
 import { apiRouter        } from "./lib/controllers/api.js";
 
 import { getSiteConfig     } from "./lib/storage/get-site-config.js";
 import { getHomepageConfig } from "./lib/storage/get-homepage-config.js";
 import { maybeSeedFromEnv  } from "./lib/storage/seed-from-env.js";
+import { maybeBackfillIdentity } from "./lib/storage/backfill-identity.js";
 
 import { writeThemeCss    } from "./lib/render/write-theme-css.js";
 import { writeCriticalCss } from "./lib/render/write-critical-css.js";
@@ -77,13 +77,13 @@ export default class SiteConfigEndpoint {
     protectedRouter.use("/homepage",   homepageRouter(Indiekit));
     protectedRouter.use("/blog",       blogRouter(Indiekit));
     protectedRouter.use("/navigation", navigationRouter(Indiekit));
-    protectedRouter.use("/features",   featuresRouter(Indiekit));
 
     this.routes = protectedRouter;
 
     // First-boot seed + initial file write
     try {
       await maybeSeedFromEnv(Indiekit);
+      await maybeBackfillIdentity(Indiekit);
       const config   = await getSiteConfig(Indiekit);
       const homepage = await getHomepageConfig(Indiekit);
       await writeThemeCss(config);

package/lib/render/write-site-json.js

@@ -47,7 +47,6 @@ export function renderSiteJson(config) {
     identity:      config.identity,
     branding:      config.branding,
     navigation:    config.navigation,
-    features:      config.features,
     updatedAt:     config.updatedAt,
   };
   const replacer = (key, value) => (PRIVATE_KEYS.has(key) ? undefined : value);

package/lib/storage/backfill-identity.js

@@ -0,0 +1,65 @@
+/**
+ * One-time backfill: copy homepageConfig.identity → siteConfig.identity
+ * when the latter is empty/stub.
+ *
+ * The legacy @rmdes/indiekit-endpoint-homepage plugin persisted identity
+ * inside the homepageConfig collection. The unified plugin reads identity
+ * from siteConfig.identity. Without a backfill, operators upgrading from
+ * homepage v1.0.24 → site-config v1.0.0-beta.2 would see an empty Identity
+ * tab even though the data is sitting one collection over.
+ *
+ * Heuristic for "empty/stub": none of name, avatar, bio populated.
+ * If those three are all empty/missing, we consider the identity stub-shaped
+ * and backfill from homepageConfig.identity if a richer version exists.
+ *
+ * Idempotent: once siteConfig.identity has data, the function no-ops.
+ *
+ * @module storage/backfill-identity
+ */
+
+import { saveSiteConfig } from "./save-site-config.js";
+
+function isStubIdentity(identity) {
+  if (!identity || typeof identity !== "object") return true;
+  // The three load-bearing h-card fields. If none populated, treat as stub.
+  const name = (identity.name || "").trim();
+  const avatar = (identity.avatar || "").trim();
+  const bio = (identity.bio || "").trim();
+  return name === "" && avatar === "" && bio === "";
+}
+
+function hasRichIdentity(identity) {
+  if (!identity || typeof identity !== "object") return false;
+  // Source must have at least one of the three load-bearing fields
+  return Boolean(
+    (identity.name || "").trim() ||
+    (identity.avatar || "").trim() ||
+    (identity.bio || "").trim()
+  );
+}
+
+/**
+ * If siteConfig.identity is stub-shaped AND homepageConfig.identity has
+ * rich data, copy the rich identity over. Idempotent.
+ *
+ * @param {object} Indiekit - Indiekit application instance
+ * @returns {Promise<boolean>} true if backfill ran, false otherwise
+ */
+export async function maybeBackfillIdentity(Indiekit) {
+  const db = Indiekit.database;
+  if (!db) return false;
+
+  const siteDoc = await db.collection("siteConfig").findOne({ _id: "primary" });
+  if (!siteDoc) return false; // seed-from-env handles greenfield install
+  if (!isStubIdentity(siteDoc.identity)) return false;
+
+  const homepageDoc = await db.collection("homepageConfig").findOne({ _id: "homepage" });
+  if (!homepageDoc || !hasRichIdentity(homepageDoc.identity)) return false;
+
+  // Copy the rich identity over. saveSiteConfig handles the deepMerge + replaceOne
+  // so we preserve any other siteConfig keys (branding, navigation).
+  await saveSiteConfig(Indiekit, { identity: homepageDoc.identity }, "backfill-from-homepage");
+
+  console.log("[site-config] backfilled identity from homepageConfig (one-time migration)");
+  return true;
+}

package/lib/storage/defaults-site.js

@@ -1,5 +1,5 @@
 /**
- * Default values for siteConfig collection (identity, branding, navigation, features).
+ * Default values for siteConfig collection (identity, branding, navigation).
  * Singleton _id: "primary".
  *
  * Schema v3 (unification):
@@ -7,7 +7,8 @@
  *   - layout subtree removed entirely (replaced by homepageConfig + navigation)
  *   - navigation.items[] added (was siteConfig.layout.navItems[])
  *   - branding subtree unchanged from v2 (Path D)
- *   - features subtree unchanged from v2
+ *   - features subtree DROPPED in v3.x (was unused; per-plugin config lives in
+ *     each plugin's own admin UI, plugin loadout lives in plugins.yaml).
  *
  * Frozen for immutability — never mutate this object directly.
  * @module storage/defaults-site
@@ -77,13 +78,6 @@ export const DEFAULTS_SITE = Object.freeze({
   navigation: Object.freeze({
     items: Object.freeze([]),
   }),
-  features: Object.freeze({
-    webmentions: true,
-    syndication: true,
-    activitypub: false,
-    search: true,
-    rss: true,
-  }),
 });
 
 // Legacy export name for any code path that hasn't been updated yet.

package/locales/en.json

@@ -7,8 +7,7 @@
       "branding": "Branding",
       "homepage": "Homepage",
       "blog": "Blog",
-      "navigation": "Navigation",
-      "features": "Feature Flags"
+      "navigation": "Navigation"
     },
     "common": {
       "save": "Save",
@@ -218,10 +217,6 @@
       "sidebarEnabled": "Sidebar enabled",
       "sidebarSide": "Sidebar side",
       "navItems": "Navigation items"
-    },
-    "features": {
-      "title": "Feature Flags",
-      "empty": "No plugins declare a feature flag yet."
     }
   }
 }

package/locales/fr.json

@@ -7,8 +7,7 @@
       "branding": "Identité visuelle",
       "homepage": "Accueil",
       "blog": "Blog",
-      "navigation": "Navigation",
-      "features": "Fonctionnalités"
+      "navigation": "Navigation"
     },
     "common": {
       "save": "Enregistrer",
@@ -218,10 +217,6 @@
       "sidebarEnabled": "Barre latérale activée",
       "sidebarSide": "Côté de la barre latérale",
       "navItems": "Éléments de navigation"
-    },
-    "features": {
-      "title": "Fonctionnalités",
-      "empty": "Aucun plugin ne déclare encore de drapeau de fonctionnalité."
     }
   }
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@rmdes/indiekit-endpoint-site-config",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.3",
   "type": "module",
-  "description": "Site identity, branding, layout, and feature flag configuration for Indiekit",
+  "description": "Site identity, branding, and navigation configuration for Indiekit",
   "main": "index.js",
   "exports": {
     ".": "./index.js"

package/views/partials/tab-strip.njk

@@ -1,5 +1,5 @@
 {# Tab navigation for site-config admin - server-rendered URL tabs #}
-{# Expects: activeTab (string, one of identity|branding|homepage|blog|navigation|features) #}
+{# Expects: activeTab (string, one of identity|branding|homepage|blog|navigation) #}
 <style>
   .sc-tab-nav {
     display: flex;
@@ -31,8 +31,7 @@
     {key: 'branding',   href: '/site-config/branding'},
     {key: 'homepage',   href: '/site-config/homepage'},
     {key: 'blog',       href: '/site-config/blog'},
-    {key: 'navigation', href: '/site-config/navigation'},
-    {key: 'features',   href: '/site-config/features'}
+    {key: 'navigation', href: '/site-config/navigation'}
   ] %}
   {% for tab in tabs %}
     <a href="{{ tab.href }}"

package/views/site-config-identity.njk

@@ -224,34 +224,34 @@
     <h2>{{ __("siteConfig.identity.profile.legend") }}</h2>
     <div class="hp-field-grid">
       <div class="field">
-        <label class="field__label" for="identity-name">{{ __("siteConfig.identity.profile.name.label") }}</label>
-        <input class="field__input" type="text" id="identity-name" name="identity-name" value="{{ config.identity.name or '' }}">
+        <label class="field__label" for="name">{{ __("siteConfig.identity.profile.name.label") }}</label>
+        <input class="field__input" type="text" id="name" name="name" value="{{ config.identity.name or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.profile.name.hint") }}</p>
       </div>
       <div class="field">
-        <label class="field__label" for="identity-title">{{ __("siteConfig.identity.profile.title.label") }}</label>
-        <input class="field__input" type="text" id="identity-title" name="identity-title" value="{{ config.identity.title or '' }}">
+        <label class="field__label" for="title">{{ __("siteConfig.identity.profile.title.label") }}</label>
+        <input class="field__input" type="text" id="title" name="title" value="{{ config.identity.title or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.profile.title.hint") }}</p>
       </div>
       <div class="field field--full">
-        <label class="field__label" for="identity-avatar">{{ __("siteConfig.identity.profile.avatar.label") }}</label>
-        <input class="field__input" type="url" id="identity-avatar" name="identity-avatar" value="{{ config.identity.avatar or '' }}">
+        <label class="field__label" for="avatar">{{ __("siteConfig.identity.profile.avatar.label") }}</label>
+        <input class="field__input" type="url" id="avatar" name="avatar" value="{{ config.identity.avatar or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.profile.avatar.hint") }}</p>
       </div>
       <div class="field">
-        <label class="field__label" for="identity-pronoun">{{ __("siteConfig.identity.profile.pronoun.label") }}</label>
-        <input class="field__input" type="text" id="identity-pronoun" name="identity-pronoun" value="{{ config.identity.pronoun or '' }}">
+        <label class="field__label" for="pronoun">{{ __("siteConfig.identity.profile.pronoun.label") }}</label>
+        <input class="field__input" type="text" id="pronoun" name="pronoun" value="{{ config.identity.pronoun or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.profile.pronoun.hint") }}</p>
       </div>
       <div class="field"></div>
       <div class="field field--full">
-        <label class="field__label" for="identity-bio">{{ __("siteConfig.identity.profile.bio.label") }}</label>
-        <textarea class="field__input" id="identity-bio" name="identity-bio" rows="3">{{ config.identity.bio or '' }}</textarea>
+        <label class="field__label" for="bio">{{ __("siteConfig.identity.profile.bio.label") }}</label>
+        <textarea class="field__input" id="bio" name="bio" rows="3">{{ config.identity.bio or '' }}</textarea>
         <p class="field__hint">{{ __("siteConfig.identity.profile.bio.hint") }}</p>
       </div>
       <div class="field field--full">
-        <label class="field__label" for="identity-description">{{ __("siteConfig.identity.profile.description.label") }}</label>
-        <textarea class="field__input" id="identity-description" name="identity-description" rows="3">{{ config.identity.description or '' }}</textarea>
+        <label class="field__label" for="description">{{ __("siteConfig.identity.profile.description.label") }}</label>
+        <textarea class="field__input" id="description" name="description" rows="3">{{ config.identity.description or '' }}</textarea>
         <p class="field__hint">{{ __("siteConfig.identity.profile.description.hint") }}</p>
       </div>
     </div>
@@ -262,17 +262,17 @@
     <h2>{{ __("siteConfig.identity.location.legend") }}</h2>
     <div class="hp-field-grid">
       <div class="field">
-        <label class="field__label" for="identity-locality">{{ __("siteConfig.identity.location.locality.label") }}</label>
-        <input class="field__input" type="text" id="identity-locality" name="identity-locality" value="{{ config.identity.locality or '' }}">
+        <label class="field__label" for="locality">{{ __("siteConfig.identity.location.locality.label") }}</label>
+        <input class="field__input" type="text" id="locality" name="locality" value="{{ config.identity.locality or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.location.locality.hint") }}</p>
       </div>
       <div class="field">
-        <label class="field__label" for="identity-country">{{ __("siteConfig.identity.location.country.label") }}</label>
-        <input class="field__input" type="text" id="identity-country" name="identity-country" value="{{ config.identity.country or '' }}">
+        <label class="field__label" for="country">{{ __("siteConfig.identity.location.country.label") }}</label>
+        <input class="field__input" type="text" id="country" name="country" value="{{ config.identity.country or '' }}">
       </div>
       <div class="field">
-        <label class="field__label" for="identity-org">{{ __("siteConfig.identity.location.org.label") }}</label>
-        <input class="field__input" type="text" id="identity-org" name="identity-org" value="{{ config.identity.org or '' }}">
+        <label class="field__label" for="org">{{ __("siteConfig.identity.location.org.label") }}</label>
+        <input class="field__input" type="text" id="org" name="org" value="{{ config.identity.org or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.location.org.hint") }}</p>
       </div>
     </div>
@@ -283,17 +283,17 @@
     <h2>{{ __("siteConfig.identity.contact.legend") }}</h2>
     <div class="hp-field-grid">
       <div class="field field--full">
-        <label class="field__label" for="identity-url">{{ __("siteConfig.identity.contact.url.label") }}</label>
-        <input class="field__input" type="url" id="identity-url" name="identity-url" value="{{ config.identity.url or '' }}">
+        <label class="field__label" for="url">{{ __("siteConfig.identity.contact.url.label") }}</label>
+        <input class="field__input" type="url" id="url" name="url" value="{{ config.identity.url or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.contact.url.hint") }}</p>
       </div>
       <div class="field">
-        <label class="field__label" for="identity-email">{{ __("siteConfig.identity.contact.email.label") }}</label>
-        <input class="field__input" type="email" id="identity-email" name="identity-email" value="{{ config.identity.email or '' }}">
+        <label class="field__label" for="email">{{ __("siteConfig.identity.contact.email.label") }}</label>
+        <input class="field__input" type="email" id="email" name="email" value="{{ config.identity.email or '' }}">
       </div>
       <div class="field">
-        <label class="field__label" for="identity-keyUrl">{{ __("siteConfig.identity.contact.keyUrl.label") }}</label>
-        <input class="field__input" type="url" id="identity-keyUrl" name="identity-keyUrl" value="{{ config.identity.keyUrl or '' }}">
+        <label class="field__label" for="keyUrl">{{ __("siteConfig.identity.contact.keyUrl.label") }}</label>
+        <input class="field__input" type="url" id="keyUrl" name="keyUrl" value="{{ config.identity.keyUrl or '' }}">
         <p class="field__hint">{{ __("siteConfig.identity.contact.keyUrl.hint") }}</p>
       </div>
     </div>
@@ -303,8 +303,8 @@
   <section class="hp-section">
     <h2>{{ __("siteConfig.identity.categories.legend") }}</h2>
     <div class="field">
-      <label class="field__label" for="identity-categories">{{ __("siteConfig.identity.categories.tags.label") }}</label>
-      <input class="field__input" type="text" id="identity-categories" name="identity-categories" value="{{ config.identity.categories | join(', ') if config.identity.categories else '' }}">
+      <label class="field__label" for="categories">{{ __("siteConfig.identity.categories.tags.label") }}</label>
+      <input class="field__input" type="text" id="categories" name="categories" value="{{ config.identity.categories | join(', ') if config.identity.categories else '' }}">
       <p class="field__hint">{{ __("siteConfig.identity.categories.tags.hint") }}</p>
     </div>
   </section>

package/lib/controllers/features.js

@@ -1,52 +0,0 @@
-import express from "express";
-import { getSiteConfig } from "../storage/get-site-config.js";
-import { saveSiteConfig } from "../storage/save-site-config.js";
-import { writeSiteJson } from "../render/write-site-json.js";
-
-/**
- * Discover feature flags from loaded plugins by reading `plugin.featureFlag`.
- * Plugins without the capability are skipped.
- */
-export function discoverFlags(Indiekit) {
-  const plugins = Indiekit.config?.plugins || [];
-  return plugins
-    .map((p) => p.featureFlag)
-    .filter(Boolean)
-    .sort((a, b) => (a.category || "").localeCompare(b.category || ""));
-}
-
-export function featuresRouter(Indiekit) {
-  const router = express.Router();
-
-  router.get("/", async (req, res, next) => {
-    try {
-      const config = await getSiteConfig(Indiekit);
-      const flags = discoverFlags(Indiekit);
-      res.render("site-config-features", {
-        config,
-        activeTab: "features",
-        flags,
-      });
-    } catch (error) {
-      next(error);
-    }
-  });
-
-  router.post("/", async (req, res, next) => {
-    try {
-      const flags = discoverFlags(Indiekit);
-      const features = {};
-      for (const flag of flags) {
-        features[flag.key] = req.body[`feature_${flag.key}`] === "on";
-      }
-      const userIdent = Indiekit.config?.publication?.me || "unknown";
-      const updated = await saveSiteConfig(Indiekit, { features }, userIdent);
-      await writeSiteJson(updated);
-      res.redirect("/site-config/features?saved=1");
-    } catch (error) {
-      next(error);
-    }
-  });
-
-  return router;
-}

package/views/site-config-features.njk

@@ -1,166 +0,0 @@
-{% extends "document.njk" %}
-
-{% block title %}{{ __('siteConfig.features.title') }}{% endblock %}
-
-{% block content %}
-<style>
-  .sc-dashboard {
-    display: flex;
-    flex-direction: column;
-    gap: var(--space-xl, 2rem);
-  }
-
-  .sc-section {
-    background: var(--color-offset, #f5f5f5);
-    border-radius: var(--border-radius-small, 0.5rem);
-    padding: var(--space-m, 1.5rem);
-  }
-
-  .sc-section h2 {
-    font: var(--font-heading, bold 1.25rem/1.4 sans-serif);
-    margin-block-end: var(--space-s, 0.75rem);
-    padding-block-end: var(--space-xs, 0.5rem);
-    border-block-end: 1px solid var(--color-outline-variant, #ddd);
-  }
-
-  .sc-section__desc {
-    color: var(--color-on-offset, #666);
-    font: var(--font-body, 0.875rem/1.5 sans-serif);
-    margin-block-end: var(--space-s, 0.75rem);
-  }
-
-  .hp-success {
-    background: var(--color-success-container, #d4edda);
-    border: 1px solid var(--color-success, #28a745);
-    border-radius: var(--border-radius-small, 0.25rem);
-    padding: var(--space-s, 0.75rem);
-    margin-block-end: var(--space-m, 1rem);
-  }
-
-  /* Empty state */
-  .sc-empty-state {
-    text-align: center;
-    padding: var(--space-xl, 2rem) var(--space-m, 1rem);
-    color: var(--color-on-offset, #888);
-    font: var(--font-body, 0.875rem/1.5 sans-serif);
-    background: var(--color-offset, #f5f5f5);
-    border: 1px dashed var(--color-outline-variant, #ddd);
-    border-radius: var(--border-radius-small, 0.5rem);
-  }
-
-  .sc-empty-state p {
-    margin: 0;
-  }
-
-  /* Flag rows */
-  .sc-flag-row {
-    display: flex;
-    align-items: flex-start;
-    gap: var(--space-s, 0.75rem);
-    padding: var(--space-s, 0.75rem) 0;
-    border-bottom: 1px solid var(--color-outline-variant, #eee);
-  }
-
-  .sc-flag-row:last-child {
-    border-bottom: none;
-    padding-bottom: 0;
-  }
-
-  .sc-flag-row:first-child {
-    padding-top: 0;
-  }
-
-  .sc-flag-label {
-    display: flex;
-    flex-direction: column;
-    gap: 0.125rem;
-    flex: 1;
-  }
-
-  .sc-flag-label strong {
-    font: var(--font-body, 0.875rem/1.5 sans-serif);
-    font-weight: 600;
-    color: var(--color-on-surface, inherit);
-  }
-
-  .sc-flag-hint {
-    font: var(--font-caption, 0.75rem/1.4 sans-serif);
-    color: var(--color-on-offset, #888);
-    margin: 0;
-  }
-
-  .sc-restart-badge {
-    display: inline-flex;
-    align-items: center;
-    font: var(--font-caption, 0.7rem/1.4 sans-serif);
-    font-weight: 600;
-    color: var(--color-warning, #856404);
-    background: color-mix(in srgb, var(--color-warning, #856404) 12%, var(--color-background, #fff));
-    border: 1px solid color-mix(in srgb, var(--color-warning, #856404) 30%, transparent);
-    border-radius: var(--border-radius-small, 0.25rem);
-    padding: 0.1rem 0.4rem;
-    white-space: nowrap;
-  }
-</style>
-
-<header class="page-header">
-  <h1 class="page-header__title">{{ __('siteConfig.title') }}</h1>
-</header>
-
-{% include "partials/tab-strip.njk" %}
-
-{% if request.query.saved %}
-<div class="hp-success">
-  <p>{{ __('siteConfig.common.saved') }}</p>
-</div>
-{% endif %}
-
-{% if flags.length == 0 %}
-
-  <div class="sc-empty-state">
-    <p>{{ __('siteConfig.features.empty') }}</p>
-  </div>
-
-{% else %}
-
-  <form method="post" action="/site-config/features" class="sc-dashboard">
-
-    {% set currentCategory = '' %}
-    {% for flag in flags %}
-
-      {% if flag.category != currentCategory %}
-        {% set currentCategory = flag.category %}
-        <section class="sc-section">
-          <h2>{{ flag.category }}</h2>
-      {% endif %}
-
-      <div class="sc-flag-row">
-        <input type="checkbox"
-               id="feature_{{ flag.key }}"
-               name="feature_{{ flag.key }}"
-               {% if config.features[flag.key] %}checked{% elif flag.default %}checked{% endif %}>
-        <label class="sc-flag-label" for="feature_{{ flag.key }}">
-          <strong>{{ flag.label }}</strong>
-          {% if flag.description %}
-            <p class="sc-flag-hint">{{ flag.description }}</p>
-          {% endif %}
-          {% if flag.requiresRestart %}
-            <span class="sc-restart-badge">Restart required</span>
-          {% endif %}
-        </label>
-      </div>
-
-      {% if loop.last or flags[loop.index].category != flag.category %}
-        </section>
-      {% endif %}
-
-    {% endfor %}
-
-    <div class="button-group">
-      <button type="submit" class="button button--primary">{{ __('siteConfig.common.save') }}</button>
-    </div>
-
-  </form>
-
-{% endif %}
-{% endblock %}