Merge pull request #1130 from ludovic111/fix/website-semver-tags

🤖 Agent: merged. Website only; verify passes and the website tests pass (2/2). The site shows nothing about 0.2 until a 0.2 release exists.
This commit is contained in:
Ludovic Marie
2026-10-22 03:02:53 +02:00
committed by GitHub
6 changed files with 105 additions and 21 deletions
+9 -8
View File
@@ -12,6 +12,7 @@ import { join, dirname } from "node:path";
import { fileURLToPath } from "node:url";
import { markdown, inline, section, escape } from "./src/markdown.js";
import { releasesHtml } from "./src/releases.js";
import { isGame, isLauncher, launcherVersion, newestFirst } from "./src/versions.js";
import { contributorsFrom, contributorsHtml } from "./src/contributors.js";
const site = dirname(fileURLToPath(import.meta.url));
@@ -46,7 +47,7 @@ try {
if (res.ok) releases = (await res.json()).filter((r) => !r.draft);
else console.warn(`releases: ${res.status} from GitHub; the page will load them itself`);
// A day of betas can push the stable release out of the newest 100: it is GitHub's "latest" (betas never are).
if (res.ok && !releases.some((r) => /^v\d{4}\./.test(r.tag_name) && !r.prerelease)) {
if (res.ok && !releases.some((r) => isGame(r.tag_name) && !r.prerelease)) {
const latest = await fetch(`https://api.github.com/repos/${REPO}/releases/latest`, { headers: githubHeaders, signal: AbortSignal.timeout(15000) });
if (latest.ok) releases.push(await latest.json());
}
@@ -111,11 +112,11 @@ const parityHeadline = matching === body.length ? "Every subsystem matches vanil
// --- The latest notes -------------------------------------------------
const isGame = (tag) => /^v\d{4}\.\d{1,2}\.\d{1,2}/.test(tag);
const isLauncher = (tag) => tag.startsWith("launcher-v");
// Stable releases only: betas become stable 6 hours later (docs/release-flow.md, "Channels").
const game = releases.filter((r) => isGame(r.tag_name) && !r.prerelease).slice(0, 3);
const launcher = releases.find((r) => isLauncher(r.tag_name) && !r.prerelease);
// Stable releases only: betas become stable 6 hours later (docs/release-flow.md, "Channels"). Newest first by
// tag: every 0.2 tag is newer than the dated ones (src/versions.js).
const byTag = (a, b) => newestFirst(a.tag_name, b.tag_name);
const game = releases.filter((r) => isGame(r.tag_name) && !r.prerelease).sort(byTag).slice(0, 3);
const launcher = releases.filter((r) => isLauncher(r.tag_name) && !r.prerelease).sort(byTag)[0];
// --- The page --------------------------------------------------------------------------
@@ -151,7 +152,7 @@ await writeFile(join(dist, "favicon.ico"), Buffer.concat([ico, png32]));
// The page's modules, fingerprinted; each import of a shared module is rewritten to its name.
const names = {};
const rewrite = (code) => code.replace(/"\.\/(\w+\.js)"/g, (all, file) => (names[file] ? `"./${names[file]}"` : all));
for (const file of ["markdown.js", "releases.js", "contributors.js", "main.js"]) {
for (const file of ["markdown.js", "releases.js", "contributors.js", "versions.js", "main.js"]) {
const code = rewrite(await readFile(join(site, "src", file), "utf8"));
names[file] = `${file.replace(".js", "")}.${fingerprint(code)}.js`;
await writeFile(join(dist, "assets", names[file]), code);
@@ -195,7 +196,7 @@ const values = {
PARITY_HEADLINE: parityHeadline,
SUBSYSTEMS: String(body.length),
NOTES: notesHtml,
LAUNCHER_META: `${launcher ? `Launcher ${escape(launcher.tag_name.replace("launcher-v", ""))} for` : "For"} Linux x86-64, macOS on Apple Silicon and Windows x64.`,
LAUNCHER_META: `${launcher ? `Launcher ${escape(launcherVersion(launcher.tag_name))} for` : "For"} Linux x86-64, macOS on Apple Silicon and Windows x64.`,
DISCORD: escape(links.discord || DEFAULT_LINKS.discord),
SPONSOR: escape(links.sponsor || DEFAULT_LINKS.sponsor),
CONTRIBUTORS: contributorsHtml(contributors),
+2 -1
View File
@@ -8,7 +8,8 @@
"start": "node serve.mjs",
"dev": "node build.mjs && node serve.mjs",
"assets": "node scripts/assets.mjs",
"shots": "node scripts/shots.mjs"
"shots": "node scripts/shots.mjs",
"test": "node --test src/"
},
"devDependencies": {
"sharp": "^0.34.4",
+13 -11
View File
@@ -4,9 +4,10 @@
import { escape } from "./markdown.js";
import { releasesHtml } from "./releases.js";
import { contributorsFrom, contributorsHtml } from "./contributors.js";
import { isGame, isLauncher as isLauncherTag, launcherVersion, newestFirst } from "./versions.js";
const REPO = "ludovic111/horizon";
const RELEASES_PAGE = `https://github.com/${REPO}/releases?q=launcher-v&expanded=true`;
const RELEASES_PAGE = `https://github.com/${REPO}/releases?q=launcher&expanded=true`;
const baked = JSON.parse(document.getElementById("baked").textContent);
const reducedMotion = matchMedia("(prefers-reduced-motion: reduce)").matches;
@@ -39,15 +40,12 @@ const slim = (r) => ({
body: r.body || "",
assets: r.assets.map((a) => ({ name: a.name, browser_download_url: a.browser_download_url, size: a.size })),
});
const isGame = (tag) => /^v\d{4}\.\d{1,2}\.\d{1,2}/.test(tag);
const isLauncher = (r) => r.tag_name.startsWith("launcher-v") && !r.prerelease;
const versionKey = (tag) => tag.replace("launcher-v", "").split(".").map(Number);
const newer = (a, b) => versionKey(b).reduce((d, n, i) => d || n - (versionKey(a)[i] || 0), 0);
const isLauncher = (r) => isLauncherTag(r.tag_name) && !r.prerelease;
// The newest 100 releases (GitHub's most per page). Game betas come out several times a day, so the stable game
// release and the newest launcher release can both be older than all of them. The stable game release is then
// GitHub's "latest" (betas and launcher releases are never marked latest); the launcher release is looked up by its
// tag (the newest launcher-v tag with a published release).
// tag (the newest launcher@ tag with a published release, or launcher-v before 0.2: docs/versioning.md).
async function loadReleases() {
const list = (await get(`https://api.github.com/repos/${REPO}/releases?per_page=100`)).filter((r) => !r.draft).map(slim);
if (!list.some((r) => isGame(r.tag_name) && !r.prerelease)) {
@@ -55,8 +53,12 @@ async function loadReleases() {
if (latest && !latest.draft) list.push(slim(latest));
}
if (list.some(isLauncher)) return list;
const refs = await get(`https://api.github.com/repos/${REPO}/git/matching-refs/tags/launcher-v`).catch(() => []);
const tags = refs.map((r) => r.ref.replace("refs/tags/", "")).filter((t) => /^launcher-v\d+\.\d+\.\d+$/.test(t)).sort(newer);
let tags = [];
for (const prefix of ["launcher@", "launcher-v"]) {
if (tags.length) break;
const refs = await get(`https://api.github.com/repos/${REPO}/git/matching-refs/tags/${prefix}`).catch(() => []);
tags = refs.map((r) => r.ref.replace("refs/tags/", "")).filter(isLauncherTag).sort(newestFirst);
}
for (const tag of tags.slice(0, 3)) {
const release = await get(`https://api.github.com/repos/${REPO}/releases/tags/${tag}`).catch(() => null);
if (release && !release.draft) return [...list, slim(release)];
@@ -91,9 +93,9 @@ function platform() {
async function setUpDownload() {
const os = platform();
const list = await releases;
const launcher = list.find((r) => r.tag_name.startsWith("launcher-v") && !r.prerelease);
const launcher = list.filter(isLauncher).sort((a, b) => newestFirst(a.tag_name, b.tag_name))[0];
if (!launcher) return;
const version = launcher.tag_name.replace("launcher-v", "");
const version = launcherVersion(launcher.tag_name);
const asset = os && launcher.assets.find((a) => a.name.includes(os.key));
const others = `<a href="${escape(launcher.html_url)}">Other platforms</a>`;
document.querySelectorAll("[data-download]").forEach((a) => (a.href = asset ? asset.browser_download_url : launcher.html_url || RELEASES_PAGE));
@@ -107,7 +109,7 @@ async function setUpDownload() {
// --- Patch notes and the links from main ---------------------------------
async function setUpNotes() {
const list = (await releases).filter((r) => isGame(r.tag_name) && !r.prerelease);
const list = (await releases).filter((r) => isGame(r.tag_name) && !r.prerelease).sort((a, b) => newestFirst(a.tag_name, b.tag_name));
if (list.length) document.getElementById("releases").innerHTML = releasesHtml(list.slice(0, 3));
}
+1 -1
View File
@@ -4,7 +4,7 @@ import { markdown, escape } from "./markdown.js";
const REPO = "ludovic111/horizon";
// "Horizon 2026.10.13: 100% of harnessed vanilla parity" reads as the version and its line.
// "Horizon 0.2.3: Cave culling, weather" (before 0.2, "Horizon 2026.10.13: …") reads as the version and its line.
function parts(r) {
const version = r.tag_name.replace(/^v/, "");
const name = r.name || "";
+59
View File
@@ -0,0 +1,59 @@
// Horizon's release tags (docs/versioning.md). From 0.2 the game is vX.Y.Z and the launcher launcher@X.Y.Z;
// before, vYYYY.MM.DD[.N] and launcher-vX.Y.Z. Every 0.2 tag is newer than every tag from before. Shared by
// build.mjs and main.js, and the same order as the launcher's and tools/release_train.py's.
const SEMVER = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$/;
// Semver's majors stay below this; a date tag's first number is a year.
const FIRST_YEAR = 1000;
const semver = (version) => {
const m = SEMVER.exec(version);
return m && Number(m[1]) < FIRST_YEAR ? m : null;
};
export const isGame = (tag) => /^v\d{4}\.\d{1,2}\.\d{1,2}(\.\d+)?$/.test(tag) || (tag.startsWith("v") && !!semver(tag.slice(1)));
// The version in a launcher tag (launcher@0.2.0, launcher-v0.16.0), or null.
export function launcherVersion(tag) {
if (tag.startsWith("launcher@") && semver(tag.slice(9))) return tag.slice(9);
const old = /^launcher-v(\d+\.\d+\.\d+)$/.exec(tag);
return old ? old[1] : null;
}
export const isLauncher = (tag) => launcherVersion(tag) !== null;
// [line, numbers, pre-release]: tags from before 0.2 by their numbers, then 0.2 tags in semver's order.
function key(tag) {
const version = tag.startsWith("launcher@") ? tag.slice(9) : tag.startsWith("v") ? tag.slice(1) : null;
const m = version !== null && semver(version);
if (!m) return [0, (tag.match(/\d+/g) || []).map(Number), []];
const pre = m[4] ? m[4].split(".").map((id) => (/^\d+$/.test(id) ? [0, Number(id)] : [1, id])) : null;
return [1, [m[1], m[2], m[3]].map(Number), pre];
}
const cmpList = (a, b, cmp) => {
for (let i = 0; i < Math.min(a.length, b.length); i++) {
const d = cmp(a[i], b[i]);
if (d) return d;
}
return a.length - b.length;
};
const cmpNumbers = (a, b) => {
const strip = (l) => { const c = [...l]; while (c.length && c[c.length - 1] === 0) c.pop(); return c; };
return cmpList(strip(a), strip(b), (x, y) => x - y);
};
const cmpId = ([ka, va], [kb, vb]) => ka - kb || (ka ? (va < vb ? -1 : va > vb ? 1 : 0) : va - vb);
// Negative when tag a is older than tag b.
export function compareTags(a, b) {
const [la, na, pa] = key(a);
const [lb, nb, pb] = key(b);
if (la !== lb) return la - lb;
const d = cmpNumbers(na, nb);
if (d || !la) return d;
// A release follows its pre-releases.
if (!pa || !pb) return (pa ? -1 : 0) - (pb ? -1 : 0);
return cmpList(pa, pb, cmpId);
}
export const newestFirst = (a, b) => compareTags(b, a);
+21
View File
@@ -0,0 +1,21 @@
// node --test website/src/ (npm test in website/)
import { test } from "node:test";
import assert from "node:assert/strict";
import { compareTags, isGame, isLauncher, launcherVersion, newestFirst } from "./versions.js";
test("0.2 tags follow every tag from before", () => {
const order = ["v2026.10.19.15", "v2026.10.21", "v0.2.0-beta.1", "v0.2.0", "v0.2.1-beta", "v0.2.1-beta.2",
"v0.2.1-beta.11", "v0.2.1-rc.1", "v0.2.1", "v0.2.9", "v0.2.10", "v0.3.0-1", "v0.3.0-alpha", "v0.3.0", "v1.0.0"];
assert.deepEqual([...order].reverse().sort(compareTags), order);
assert.deepEqual(["launcher-v0.16.0", "launcher@0.2.0", "launcher-v0.17.0", "launcher@0.2.1"].sort(newestFirst),
["launcher@0.2.1", "launcher@0.2.0", "launcher-v0.17.0", "launcher-v0.16.0"]);
assert.equal(compareTags("v2026.10.19", "v2026.10.19.0"), 0);
});
test("game and launcher tags never mix", () => {
for (const tag of ["v0.2.0", "v0.3.0-rc.1", "v2026.10.21", "v2026.10.19.15"]) assert.ok(isGame(tag), tag);
for (const tag of ["launcher@0.2.0", "launcher-v0.16.0", "v0.2", "vnext", "v2026.10.21-x"]) assert.ok(!isGame(tag), tag);
assert.equal(launcherVersion("launcher@0.2.0"), "0.2.0");
assert.equal(launcherVersion("launcher-v0.16.0"), "0.16.0");
assert.ok(!isLauncher("v0.2.0") && !isLauncher("launcher-vnext"));
});