@rmdes/indiekit-frontend 1.0.0-beta.39 → 1.0.0-beta.41

package/components/sidebar/template.njk

@@ -1,6 +1,51 @@
 {% from "../logo/macro.njk" import logo with context %}
 {% set items = opts.navigation.items %}
 {% set renames = { "Reader": "Microsub" } %}
+
+{#
+  Section categorization for multi-site plugin loadouts.
+  Each section defines URL patterns; items whose href contains ANY pattern
+  in a section's list bucket into that section. Sections with zero items
+  collapse (no empty header). Items not matching any known pattern fall
+  into "Other".
+
+  Keep `knownPaths` in sync with the union of all section patterns —
+  it's used by the "Other" catch-all to identify unmatched items.
+#}
+{% set knownPaths = [
+  "/posts", "/files",
+  "/microsub", "/webmention", "/webmention-sender", "/comments",
+  "/blogroll", "/podroll", "/rss",
+  "/homepage", "/cv", "/site-config",
+  "/github", "/lastfm", "/funkwhale", "/youtube",
+  "/activitypub",
+  "/linkedin"
+] %}
+
+{# Reusable section macro: only renders when matched items exist (no empty headers). #}
+{% macro sidebarSection(label, items, patterns, renames) %}
+  {% set sectionItems = [] %}
+  {% for item in items %}{% if item.href and item.text %}
+    {% set isMatch = false %}
+    {% for pattern in patterns %}{% if pattern in item.href %}{% set isMatch = true %}{% endif %}{% endfor %}
+    {% if isMatch %}{% set sectionItems = sectionItems.concat([item]) %}{% endif %}
+  {% endif %}{% endfor %}
+  {% if sectionItems | length > 0 %}
+  <div class="sidebar__group">
+    <span class="sidebar__group-label">{{ label }}</span>
+    <ul class="sidebar__list" role="list">
+      {% for item in sectionItems %}
+      <li class="sidebar__list-item">
+        <a href="{{ item.href }}"{{- attributes(item.attributes) }}>
+          {%- if renames and renames[item.text] %}{{ renames[item.text] }}{% else %}{{ item.text | safe }}{% endif -%}
+        </a>
+      </li>
+      {% endfor %}
+    </ul>
+  </div>
+  {% endif %}
+{% endmacro %}
+
 <sidebar-nav class="{{ classes("sidebar", opts) }}" aria-label="Main">
   <div class="sidebar__header">
     <a class="sidebar__title u-url" href="{{ opts.url or "/" }}">
@@ -13,110 +58,19 @@
     </button>
   </div>
   <nav class="sidebar__nav">
-    {# --- PUBLISH --- #}
-    <div class="sidebar__group">
-      <span class="sidebar__group-label">Publish</span>
-      <ul class="sidebar__list" role="list">
-        {% for item in items %}{% if item.href and item.text %}
-          {% if "/posts" in item.href or "/files" in item.href %}
-          <li class="sidebar__list-item">
-            <a href="{{ item.href }}"{{- attributes(item.attributes) }}>
-              {{- item.text | safe -}}
-            </a>
-          </li>
-          {% endif %}
-        {% endif %}{% endfor %}
-      </ul>
-    </div>
-
-    {# --- READ & ENGAGE --- #}
-    <div class="sidebar__group">
-      <span class="sidebar__group-label">Read & Engage</span>
-      <ul class="sidebar__list" role="list">
-        {% for item in items %}{% if item.href and item.text %}
-          {% if "/microsub" in item.href or "/webmention" in item.href %}
-          <li class="sidebar__list-item">
-            <a href="{{ item.href }}"{{- attributes(item.attributes) }}>
-              {%- if renames[item.text] %}{{ renames[item.text] }}{% else %}{{ item.text | safe }}{% endif -%}
-            </a>
-          </li>
-          {% endif %}
-        {% endif %}{% endfor %}
-      </ul>
-    </div>
-
-    {# --- CURATE --- #}
-    <div class="sidebar__group">
-      <span class="sidebar__group-label">Curate</span>
-      <ul class="sidebar__list" role="list">
-        {% for item in items %}{% if item.href and item.text %}
-          {% if "/blogroll" in item.href or "/podroll" in item.href %}
-          <li class="sidebar__list-item">
-            <a href="{{ item.href }}"{{- attributes(item.attributes) }}>
-              {{- item.text | safe -}}
-            </a>
-          </li>
-          {% endif %}
-        {% endif %}{% endfor %}
-      </ul>
-    </div>
-
-    {# --- BUILD --- #}
-    <div class="sidebar__group">
-      <span class="sidebar__group-label">Build</span>
-      <ul class="sidebar__list" role="list">
-        {% for item in items %}{% if item.href and item.text %}
-          {% if "/homepage" in item.href or "/cv" in item.href %}
-          <li class="sidebar__list-item">
-            <a href="{{ item.href }}"{{- attributes(item.attributes) }}>
-              {{- item.text | safe -}}
-            </a>
-          </li>
-          {% endif %}
-        {% endif %}{% endfor %}
-      </ul>
-    </div>
-
-    {# --- ACTIVITY --- #}
-    <div class="sidebar__group">
-      <span class="sidebar__group-label">Activity</span>
-      <ul class="sidebar__list" role="list">
-        {% for item in items %}{% if item.href and item.text %}
-          {% if "/github" in item.href or "/lastfm" in item.href or "/funkwhale" in item.href or "/youtube" in item.href or "/rss" in item.href %}
-          <li class="sidebar__list-item">
-            <a href="{{ item.href }}"{{- attributes(item.attributes) }}>
-              {{- item.text | safe -}}
-            </a>
-          </li>
-          {% endif %}
-        {% endif %}{% endfor %}
-      </ul>
-    </div>
-
-    {# --- FEDIVERSE --- #}
-    <div class="sidebar__group">
-      <span class="sidebar__group-label">Fediverse</span>
-      <ul class="sidebar__list" role="list">
-        {% for item in items %}{% if item.href and item.text %}
-          {% if "/activitypub" in item.href %}
-          <li class="sidebar__list-item">
-            <a href="{{ item.href }}"{{- attributes(item.attributes) }}>
-              {{- item.text | safe -}}
-            </a>
-          </li>
-          {% endif %}
-        {% endif %}{% endfor %}
-      </ul>
-    </div>
+    {{ sidebarSection("Publish",       items, ["/posts", "/files"]) }}
+    {{ sidebarSection("Read & Engage", items, ["/microsub", "/webmention", "/webmention-sender", "/comments"], renames) }}
+    {{ sidebarSection("Curate",        items, ["/blogroll", "/podroll", "/rss"]) }}
+    {{ sidebarSection("Build",         items, ["/homepage", "/cv", "/site-config"]) }}
+    {{ sidebarSection("Activity",      items, ["/github", "/lastfm", "/funkwhale", "/youtube"]) }}
+    {{ sidebarSection("Fediverse",     items, ["/activitypub"]) }}
+    {{ sidebarSection("Syndication",   items, ["/linkedin"]) }}
 
-    {# --- UNCATEGORIZED (catch-all for future plugins) --- #}
-    {% set knownPaths = ["/posts", "/files", "/microsub", "/webmention", "/blogroll", "/podroll", "/homepage", "/cv", "/github", "/lastfm", "/funkwhale", "/youtube", "/rss", "/activitypub"] %}
+    {# OTHER: catch-all for items not matching any known pattern (future plugins). #}
     {% set hasOther = [] %}
     {% for item in items %}{% if item.href and item.text %}
       {% set matched = false %}
-      {% for kp in knownPaths %}
-        {% if kp in item.href %}{% set matched = true %}{% endif %}
-      {% endfor %}
+      {% for kp in knownPaths %}{% if kp in item.href %}{% set matched = true %}{% endif %}{% endfor %}
       {% if not matched %}{% set hasOther = hasOther.concat([item]) %}{% endif %}
     {% endif %}{% endfor %}
     {% if hasOther | length > 0 %}
@@ -134,7 +88,7 @@
     </div>
     {% endif %}
 
-    {# --- SYSTEM (hardcoded core pages) --- #}
+    {# SYSTEM: hardcoded core pages, always present (Indiekit installs them unconditionally). #}
     <div class="sidebar__group">
       <span class="sidebar__group-label">System</span>
       <ul class="sidebar__list" role="list">

package/lib/serviceworker.js

@@ -87,6 +87,31 @@ async function notifyClients() {
   }
 }
 
+/**
+ * Remove any cached auth/session pages from the pages cache.
+ * Called on activate to purge stale entries from before the fetch bypass was added.
+ */
+async function clearAuthSessionEntries() {
+  try {
+    const pagesCache = await caches.open(pagesCacheName);
+    const keys = await pagesCache.keys();
+
+    await Promise.all(
+      keys
+        .filter((request) => {
+          const url = new URL(request.url);
+          return (
+            url.origin === self.location.origin &&
+            /^\/(auth|session)(?:\/|$)/.test(url.pathname)
+          );
+        })
+        .map((request) => pagesCache.delete(request)),
+    );
+  } catch (error) {
+    console.error("Error clearing auth/session cache entries", error);
+  }
+}
+
 /**
  * Trim cache
  * @param {string} cacheName - Name of cache
@@ -120,6 +145,7 @@ self.addEventListener("activate", async (event) => {
   event.waitUntil(
     (async () => {
       await clearOldCaches();
+      await clearAuthSessionEntries();
       // Don't clear pages cache on activate — stale cached pages provide a
       // valuable fallback when the network is slow (e.g. right after a deploy).
       // The network-first fetch strategy naturally updates cached pages on
@@ -150,13 +176,23 @@ self.addEventListener("fetch", (event) => {
   // Cross-origin images (avatars, album covers, etc.) must be handled
   // by the browser natively — opaque responses from SW fetch are unreliable
   // and caching them wastes ~7MB each against storage quota.
+  const requestUrl = new URL(request.url);
   if (
-    new URL(request.url).origin !== self.location.origin ||
+    requestUrl.origin !== self.location.origin ||
     request.method !== "GET"
   ) {
     return;
   }
 
+  // Never cache auth/session pages — always go to network.
+  // Stale cached auth responses break login detection (admin.js probes
+  // /session/login to check if owner is logged in) and can serve
+  // authenticated pages after session expiry.
+  if (/^\/(auth|session)(?:\/|$)/.test(requestUrl.pathname)) {
+    event.respondWith(fetch(request));
+    return;
+  }
+
   // For HTML requests: network-first with conditional timeout
   // - If a cached version exists: race network against timeout, serve cache on timeout
   // - If no cached version: wait for network without timeout (avoid premature "Offline")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-frontend",
-  "version": "1.0.0-beta.39",
+  "version": "1.0.0-beta.41",
   "description": "Frontend components for Indiekit (fork with floating toolbar)",
   "keywords": [
     "express",