Merge dc0ee1a49a into b1fd2af72c

Fixes: #951
Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>

assets/js/versions.js

@@ -1,78 +0,0 @@
-/*
-Copyright 2025 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-function appendVersion(parent, name, url) {
-    // The list item
-    const li = document.createElement("li");
-    parent.appendChild(li);
-
-    // The link
-    const a = document.createElement("a");
-    a.classList.add("dropdown-item")
-    a.setAttribute("href", url);
-    li.appendChild(a);
-
-    // Handle clicks manually to preserve the current path / fragment
-    a.addEventListener("click", (ev) => {
-        // If the URL is a relative link (i.e. the historical versions changelog), just
-        // let the browser load it
-        if (url.startsWith("/")) {
-            return;
-        }
-
-        // Stop further event handling
-        ev.preventDefault();
-        ev.stopPropagation();
-
-        // Try to find the current version segment
-        const href = window.location.href;
-        const matches = href.match(/\/unstable\/|\/latest\/|\/v\d+.\d+\//g);
-        if (!matches) {
-            window.location.href = url;
-            return;
-        }
-
-        // Replace the segment
-        window.location.href = href.replace(matches[0], `/${name}/`);
-    });
-
-    // The link text
-    const text = document.createTextNode(name);
-    a.appendChild(text);
-}
-
-// TODO: Load /latest/versions.json
-fetch("/versions.json")
-    .then(r => r.json())
-    .then(versions => {
-        // Find the surrounding list element
-        const ul = document.querySelector("ul#version-selector");
-        if (!ul) {
-            console.error("Cannot populate version selector: ul element not found");
-            return;
-        }
-
-        // Add an entry for the unstable version
-        appendVersion(ul, "unstable", "https://spec.matrix.org/unstable");
-
-        // Add an entry for each proper version
-        for (const version of versions) {
-            appendVersion(ul, version.name, `https://spec.matrix.org/${version.name}`);
-        }
-
-        // For historical versions, simply link to the changelog
-        appendVersion(ul, "historical", "/changelog/historical/");
-    });

layouts/_partials/hooks/body-end.html

@@ -8,5 +8,3 @@
 */}}
 {{ $toc := resources.Get "js/toc.js" -}}
 <script defer src="{{ $toc.RelPermalink }}"></script>
-{{ $versions := resources.Get "js/versions.js" -}}
-<script defer src="{{ $versions.RelPermalink }}"></script>

layouts/_partials/navbar-version-selector.html

@@ -1,7 +1,8 @@
 {{- /*
 
   A version of the navbar-version-selector.html partial in Docsy,
-  modified to read the versions from /versions.json.
+  modified to read the versions from changelog child pages so that
+  we don't have to maintain the menu separately in hugo.toml.
 
 */ -}}
 
@@ -12,7 +13,16 @@
     <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         All Versions
     </a>
-    <ul class="dropdown-menu" id="version-selector">
+    <ul class="dropdown-menu">
-        {{- /* The menu is built by version.js */ -}}
+        {{- /* Prepend a link to the unstable spec version  */ -}}
+        <li><a class="dropdown-item" href="https://spec.matrix.org/unstable">Unstable</a></li>
+        {{- /* Add a link for each vX.X version  */ -}}
+        {{ range $pages }}
+            {{ if findRE `^v[0-9]+\.[0-9]+$` .Params.linkTitle }}
+                <li><a class="dropdown-item" href="https://spec.matrix.org/{{ .Params.linkTitle }}">{{ .Params.linkTitle }}</a></li>
+            {{ end }}
+        {{ end }}
+        {{- /* Append a link to historical spec versions in the changelog  */ -}}
+        <li><a class="dropdown-item" href="/changelog/historical/">Historical</a></li>
     </ul>
 </div>

layouts/docs/baseof.html

@@ -5,25 +5,6 @@
 
 */}}
 
-{{/* Generate a static file versions.json that can be used to populate the version picker */}}
-{{ if .IsHome }}
-  {{- /* Load all changelog subpages, sorted by release date */ -}}
-  {{ $changelog := site.GetPage "changelog" }}
-  {{ $pages := $changelog.RegularPages.ByDate.Reverse }}
-
-  {{- /* Collect proper versions and build metadata dicts */ -}}
-  {{ $versions := slice }}
-  {{ range $pages }}
-    {{ if findRE `^v[0-9]+\.[0-9]+$` .Params.linkTitle }}
-      {{ $versions = $versions | append (dict "name" .Params.linkTitle "date" .Params.date ) }}
-    {{ end }}
-  {{ end }}
-
-  {{- /* Generate the JSON */ -}}
-  {{ $json := jsonify $versions }}
-  {{ $noop := (resources.FromString "/versions.json" $json).Permalink }}
-{{ end }}
-
 <!doctype html>
 <html itemscope itemtype="http://schema.org/WebPage"
     {{- with .Site.Language.LanguageDirection }} dir="{{ . }}" {{- end -}}