@morphemecms/cms 0.14.0 → 0.14.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @morphemecms/cms
 
+## 0.14.1
+
+### Patch Changes
+
+- eea5442: On a phone, the back gesture in the open menu goes to the screen before and closes the menu, instead of going up one level in the menu.
+- ee45cf2: Show the release notes of the running version from the installed package, not from KV.
+
 ## 0.14.0
 
 ### Minor Changes

package/lib/releaseNotes.d.mts

@@ -38,18 +38,19 @@ export function imagePath(version: string, locale: string, id: string): string;
  */
 export function notesFor(notes: Record<string, ReleaseNote[]> | undefined, locale: string): ReleaseNote[] | undefined;
 /**
- * The kept versions an update brought, newest first. After a finished update to the running version: the versions after
- * `from` up to the running one. Else: the running version alone, when it is kept.
- * @param {{ from?: string, to: string, state: string } | null} update
- * @param {string} running
- * @param {string[]} kept versions that have notes in KV
- * @returns {string[]}
+ * The notes of every released version in the running minor line (x.y.0 up to `version`), from the files the package carries
+ * (release-notes/i18n/<locale>/<version>.json), newest first. A card gets the address of its screenshot
+ * (<locale>/<version>/<id>.webp) when that file exists. Versions of another minor, newer versions and versions without notes are left out.
+ * @param {Record<string, ReleasedNotes>} files path -> parsed notes file, e.g. '../release-notes/i18n/en-US/0.14.0.json'
+ * @param {Record<string, string>} images path -> address, e.g. '../release-notes/i18n/en-US/0.14.0/<id>.webp'
+ * @param {string} version the running version
+ * @returns {{ version: string, text: string, notes: Record<string, ReleaseNote[]> }[]}
  */
-export function installedVersions(update: {
-    from?: string;
-    to: string;
-    state: string;
-} | null, running: string, kept: string[]): string[];
+export function bundledNotes(files: Record<string, ReleasedNotes>, images: Record<string, string>, version: string): {
+    version: string;
+    text: string;
+    notes: Record<string, ReleaseNote[]>;
+}[];
 /**
  * The release notes and screenshots of `version` from an unzipped npm tar. Notes: package/release-notes/i18n/<locale>/<version>.json
  * per locale. Screenshots: one per card, at imagePath(). A missing or unreadable notes file leaves its locale out; a missing
@@ -102,6 +103,7 @@ export const MAX_IMAGE_BYTES: number;
 /** The width of a card's screenshot in pixels (375 CSS pixels at scale 2) and its greatest height (400 CSS pixels at scale 2). */
 export const IMAGE_WIDTH: 750;
 export const MAX_IMAGE_HEIGHT: 800;
+export function staleImageDirs(dirs: string[], version: string): string[];
 export function imageKey(version: string, locale: string, id: string): string;
 export type ReleaseNote = {
     id: string;

package/lib/releaseNotes.mjs

@@ -1,7 +1,7 @@
 // Pure helpers for release notes: checks pending notes (cards with a screenshot of the right type and size, lines), groups them per version and locale,
-// picks a locale's notes, lists the versions an update brought and reads a version's notes and screenshots from its tar.
+// picks a locale's notes, builds the notes of the running minor line from the package files and reads a version's notes and screenshots from its tar.
 // Also builds the Worker's screenshot address and KV key, parses the address and adds the address to a version's cards.
-// Exposes MAX_IMAGE_BYTES, IMAGE_WIDTH, MAX_IMAGE_HEIGHT, webpSize, problemsOf, released, imagePath, notesFor, installedVersions, notesFromTar, imageUrl, imageKey,
+// Exposes MAX_IMAGE_BYTES, IMAGE_WIDTH, MAX_IMAGE_HEIGHT, webpSize, problemsOf, released, imagePath, notesFor, bundledNotes, staleImageDirs, notesFromTar, imageUrl, imageKey,
 // parseImagePath and withImageUrls. Depends on ./cms-version.mjs and ./changelog.mjs; no node: imports.
 import { compareVersions } from './cms-version.mjs';
 import { bytesFromTar, fileFromTar } from './changelog.mjs';
@@ -154,22 +154,46 @@ export function notesFor(notes, locale) {
   return notes?.[locale] ?? notes?.['en-US'];
 }
 
+const PLAIN = /^\d+\.\d+\.\d+$/;
+const sameMinor = (a, b) => a.split('.').slice(0, 2).join('.') === b.split('.').slice(0, 2).join('.');
+
 /**
- * The kept versions an update brought, newest first. After a finished update to the running version: the versions after
- * `from` up to the running one. Else: the running version alone, when it is kept.
- * @param {{ from?: string, to: string, state: string } | null} update
- * @param {string} running
- * @param {string[]} kept versions that have notes in KV
- * @returns {string[]}
+ * The notes of every released version in the running minor line (x.y.0 up to `version`), from the files the package carries
+ * (release-notes/i18n/<locale>/<version>.json), newest first. A card gets the address of its screenshot
+ * (<locale>/<version>/<id>.webp) when that file exists. Versions of another minor, newer versions and versions without notes are left out.
+ * @param {Record<string, ReleasedNotes>} files path -> parsed notes file, e.g. '../release-notes/i18n/en-US/0.14.0.json'
+ * @param {Record<string, string>} images path -> address, e.g. '../release-notes/i18n/en-US/0.14.0/<id>.webp'
+ * @param {string} version the running version
+ * @returns {{ version: string, text: string, notes: Record<string, ReleaseNote[]> }[]}
  */
-export function installedVersions(update, running, kept) {
-  const finished = update?.state === 'done' && update.to === running && typeof update.from === 'string';
-  const versions = finished
-    ? kept.filter((version) => compareVersions(version, update.from) === 1 && compareVersions(version, running) <= 0)
-    : kept.filter((version) => version === running);
-  return versions.sort((a, b) => compareVersions(b, a));
+export function bundledNotes(files, images, version) {
+  const byVersion = {};
+  for (const [path, file] of Object.entries(files)) {
+    const match = /\/i18n\/([^/]+)\/([^/]+)\.json$/.exec(path);
+    if (!match || !Array.isArray(file?.notes)) continue;
+    const [, locale, v] = match;
+    if (!PLAIN.test(v) || !sameMinor(v, version) || compareVersions(v, version) === 1) continue;
+    byVersion[v] ??= {};
+    byVersion[v][locale] = file.notes.map((note) => {
+      if (note?.kind !== 'card') return note;
+      const image = Object.entries(images).find(([imagePath]) => imagePath.endsWith(`/i18n/${locale}/${v}/${note.id}.webp`));
+      return image ? { ...note, image: image[1] } : note;
+    });
+  }
+  return Object.keys(byVersion)
+    .sort((a, b) => compareVersions(b, a))
+    .map((v) => ({ version: v, text: '', notes: byVersion[v] }));
 }
 
+/**
+ * The screenshot folders of older minor lines: each x.y.z name whose major and minor differ from `version`'s. Never
+ * `pending` or any other name.
+ * @param {string[]} dirs names of the folders under release-notes/i18n/<locale>/
+ * @param {string} version the running version
+ * @returns {string[]}
+ */
+export const staleImageDirs = (dirs, version) => dirs.filter((name) => PLAIN.test(name) && !sameMinor(name, version));
+
 /**
  * The release notes and screenshots of `version` from an unzipped npm tar. Notes: package/release-notes/i18n/<locale>/<version>.json
  * per locale. Screenshots: one per card, at imagePath(). A missing or unreadable notes file leaves its locale out; a missing

package/lib/releaseNotes.test.mjs

@@ -1,5 +1,5 @@
-// Tests for lib/releaseNotes.mjs: checks pending cards and lines, groups them per version, picks a locale's notes, lists
-// installed versions and reads notes and screenshots from a tar.
+// Tests for lib/releaseNotes.mjs: checks pending cards and lines, groups them per version, picks a locale's notes, builds
+// the running version's notes from the package files and reads notes and screenshots from a tar.
 // Run: node --test lib/releaseNotes.test.mjs
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
@@ -11,7 +11,8 @@ import {
   released,
   imagePath,
   notesFor,
-  installedVersions,
+  bundledNotes,
+  staleImageDirs,
   notesFromTar,
   imageUrl,
   imageKey,
@@ -163,16 +164,81 @@ test('notesFor falls back to the en-US notes', () => {
 });
 test('notesFor gives undefined without notes', () => assert.equal(notesFor(undefined, 'da-DK'), undefined));
 
-test('installedVersions gives the finished update range, newest first', () => {
-  const update = { from: '0.13.0', to: '0.14.1', state: 'done' };
-  assert.deepEqual(installedVersions(update, '0.14.1', ['0.14.0', '0.14.1', '0.15.0']), ['0.14.1', '0.14.0']);
+const file = (version, notes) => ({ version, notes });
+const dir = '../release-notes/i18n';
+
+const en = (v, notes) => ({ [`${dir}/en-US/${v}.json`]: file(v, notes) });
+
+test('bundledNotes gives the notes of both locales', () => {
+  const files = {
+    [`${dir}/en-US/0.14.0.json`]: file('0.14.0', [line('a')]),
+    [`${dir}/da-DK/0.14.0.json`]: file('0.14.0', [line('a', { text: 'Tekst' })]),
+  };
+  assert.deepEqual(bundledNotes(files, {}, '0.14.0'), [
+    { version: '0.14.0', text: '', notes: { 'en-US': [line('a')], 'da-DK': [line('a', { text: 'Tekst' })] } },
+  ]);
 });
-test('installedVersions gives only the running version when the update went to another version', () => {
-  assert.deepEqual(installedVersions({ to: '0.14.0', state: 'done' }, '0.14.1', ['0.14.1']), ['0.14.1']);
+test('bundledNotes gives the one locale that has notes', () => {
+  assert.deepEqual(bundledNotes(en('0.14.0', [line('a')]), {}, '0.14.0')[0].notes, { 'en-US': [line('a')] });
+});
+test('bundledNotes gives the whole minor line, newest first', () => {
+  const files = { ...en('0.14.0', [line('a')]), ...en('0.14.1', [line('b')]), ...en('0.14.10', [line('c')]) };
+  assert.deepEqual(
+    bundledNotes(files, {}, '0.14.1').map((e) => e.version),
+    ['0.14.1', '0.14.0'],
+  );
+  assert.deepEqual(
+    bundledNotes(files, {}, '0.14.10').map((e) => e.version),
+    ['0.14.10', '0.14.1', '0.14.0'],
+  );
+});
+test('bundledNotes ignores another minor', () => {
+  const files = { ...en('0.13.0', [line('a')]), ...en('0.13.5', [line('b')]), ...en('0.15.0', [line('c')]), ...en('0.14.0', [line('d')]) };
+  assert.deepEqual(
+    bundledNotes(files, {}, '0.14.0').map((e) => e.version),
+    ['0.14.0'],
+  );
+});
+test('bundledNotes ignores a newer version', () => {
+  const files = { ...en('0.14.0', [line('a')]), ...en('0.14.2', [line('b')]) };
+  assert.deepEqual(
+    bundledNotes(files, {}, '0.14.1').map((e) => e.version),
+    ['0.14.0'],
+  );
+});
+test('bundledNotes gives an empty list without a file for the line', () => {
+  assert.deepEqual(bundledNotes(en('0.13.0', [line('a')]), {}, '0.14.0'), []);
+  assert.deepEqual(bundledNotes({}, {}, '0.14.0'), []);
+});
+test('bundledNotes sets the screenshot address of each version on its cards', () => {
+  const files = { ...en('0.14.0', [card('a')]), ...en('0.14.1', [card('b')]) };
+  const images = {
+    [`${dir}/en-US/0.14.0/a.webp`]: '/assets/a-hash.webp',
+    [`${dir}/en-US/0.14.1/b.webp`]: '/assets/b-hash.webp',
+    [`${dir}/da-DK/0.14.0/a.webp`]: '/assets/other.webp',
+  };
+  const result = bundledNotes(files, images, '0.14.1');
+  assert.deepEqual(result[0].notes['en-US'], [card('b', { image: '/assets/b-hash.webp' })]);
+  assert.deepEqual(result[1].notes['en-US'], [card('a', { image: '/assets/a-hash.webp' })]);
+});
+test('bundledNotes leaves a card without a screenshot file as it is', () => {
+  assert.deepEqual(bundledNotes(en('0.14.0', [card('a')]), {}, '0.14.0')[0].notes['en-US'], [card('a')]);
+});
+test('bundledNotes leaves a line as it is', () => {
+  const images = { [`${dir}/en-US/0.14.0/a.webp`]: '/assets/a.webp' };
+  assert.deepEqual(bundledNotes(en('0.14.0', [line('a')]), images, '0.14.0')[0].notes['en-US'], [line('a')]);
+});
+
+test('staleImageDirs keeps the folders of the same minor', () => {
+  assert.deepEqual(staleImageDirs(['0.14.0', '0.14.1'], '0.14.1'), []);
 });
-test('installedVersions gives only the running version, and only when it is kept', () => {
-  assert.deepEqual(installedVersions(null, '0.14.1', ['0.14.0']), []);
+test('staleImageDirs gives the older minors and another major', () => {
+  assert.deepEqual(staleImageDirs(['0.13.0', '0.14.0', '0.14.1', '1.14.0'], '0.15.0'), ['0.13.0', '0.14.0', '0.14.1', '1.14.0']);
+  assert.deepEqual(staleImageDirs(['0.13.2', '0.14.0', '1.14.0'], '0.14.1'), ['0.13.2', '1.14.0']);
 });
+test('staleImageDirs keeps pending', () => assert.deepEqual(staleImageDirs(['pending', '0.13.0'], '0.14.0'), ['0.13.0']));
+test('staleImageDirs keeps a name that is not a version', () => assert.deepEqual(staleImageDirs(['notes', '0.13'], '0.14.0'), []));
+test('staleImageDirs gives nothing for an empty list', () => assert.deepEqual(staleImageDirs([], '0.14.0'), []));
 
 /** One tar entry: a 512-byte header, then the data padded to a multiple of 512. */
 function tarEntry(name, content) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morphemecms/cms",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "Morpheme CMS: the editor for a site built with Astro, its screens, its blocks and the rules a site gives it. See README.md.",
   "license": "MIT",
   "author": "Lars Adolfsen",

package/release-notes/i18n/da-DK/0.14.1.json

@@ -0,0 +1,15 @@
+{
+  "version": "0.14.1",
+  "notes": [
+    {
+      "id": "drawer-back-changes-screen",
+      "kind": "line",
+      "text": "På en telefon fører et swipe tilbage med menuen åben dig nu til skærmen før og lukker menuen."
+    },
+    {
+      "id": "notes-from-package",
+      "kind": "line",
+      "text": "Noterne til din version vises nu lige efter en opdatering."
+    }
+  ]
+}

package/release-notes/i18n/en-US/0.14.1.json

@@ -0,0 +1,15 @@
+{
+  "version": "0.14.1",
+  "notes": [
+    {
+      "id": "drawer-back-changes-screen",
+      "kind": "line",
+      "text": "On a phone, swiping back with the menu open now takes you to the screen before and closes the menu."
+    },
+    {
+      "id": "notes-from-package",
+      "kind": "line",
+      "text": "The notes for your version now show right after an update."
+    }
+  ]
+}

package/scripts/release-notes.mjs

@@ -1,9 +1,10 @@
 // Release step: moves the pending release notes into release-notes/i18n/<locale>/<version>.json, their screenshots into
-// <version>/<id>.webp, the version from package.json. Run by release:version after changeset version.
+// <version>/<id>.webp, the version from package.json,
+// and deletes the screenshot folders of older minor lines (the package carries the running minor line's). Run by release:version after changeset version.
 // Usage: node scripts/release-notes.mjs [root]; exits 1 on a problem or an existing file.
-import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
-import { imagePath, problemsOf, released } from '../lib/releaseNotes.mjs';
+import { imagePath, problemsOf, released, staleImageDirs } from '../lib/releaseNotes.mjs';
 import { readPending, repoRoot } from './release-notes-pending.mjs';
 
 const root = repoRoot(process.argv[2]);
@@ -36,4 +37,14 @@ for (const [locale, { file, images }] of Object.entries(result)) {
     rmSync(join(localeDir, 'pending', `${id}.json`));
   }
 }
+// The package carries the screenshots of the running minor line only; the notes files stay.
+const i18n = join(root, 'release-notes', 'i18n');
+for (const locale of readdirSync(i18n, { withFileTypes: true }).filter((e) => e.isDirectory())) {
+  const dirs = readdirSync(join(i18n, locale.name), { withFileTypes: true }).filter((e) => e.isDirectory());
+  for (const name of staleImageDirs(
+    dirs.map((e) => e.name),
+    version,
+  ))
+    rmSync(join(i18n, locale.name, name), { recursive: true });
+}
 console.log(`Release notes for ${version}: ${Object.keys(result).join(', ') || 'none'}.`);

package/src/CmsPage.tsx

@@ -1,6 +1,6 @@
-// "Morpheme" (#morpheme), under "Indstillinger": the CMS version the site runs, the notes of the update just installed,
-// a newer one with its notes, why it is not taken by itself, and an update's progress, and the site's connection to the
-// Morpheme store (MorphemeConnection) as its last group. Exposes CMS_ROUTE and the page. Depends on cmsView.mjs,
+// "Morpheme" (#morpheme), under "Indstillinger": the CMS version the site runs, the notes of its minor line (from the
+// package itself, bundledNotes.ts), a newer one with its notes, why it is not taken by itself, and an update's progress, and the site's connection to the
+// Morpheme store (MorphemeConnection) as its last group. Exposes CMS_ROUTE and the page. Depends on cmsView.mjs, bundledNotes.ts,
 // ReleaseNotes (the notes as cards), MorphemeConnection and the Worker's /api/cms.
 import { useCallback, useEffect, useState } from 'react';
 import { CheckCircle, Clock, Info, Sparkle, WarningCircle } from '@phosphor-icons/react';
@@ -10,6 +10,7 @@ import { ReleaseNotes, type VersionNotes } from './ReleaseNotes';
 import { Button, EmptyNote, Group, ListItem, ProblemNote } from './ui';
 import { backFrom } from './site';
 import { cmsView } from './cmsView.mjs';
+import { runningNotes } from './bundledNotes';
 import { snackbar } from '../lib/snackbar';
 import { t } from './i18n';
 import { when } from './when';
@@ -23,7 +24,6 @@ type View = {
   checkedAt: string | null;
   latest: string | null;
   notes: VersionNotes[];
-  installed: VersionNotes[];
   action: 'update' | 'try-again' | null;
   npmCommand: string | null;
   update: { state: UpdateState; to: string; at: string } | null;
@@ -107,7 +107,7 @@ export default function CmsPage() {
       {!view && !problem && <EmptyNote busy>{t.app.loading}</EmptyNote>}
       {view && (
         <>
-          {view.installed.length > 0 && <ReleaseNotes title={t.cms.newInYourVersion} entries={view.installed} />}
+          {runningNotes.length > 0 && <ReleaseNotes title={t.cms.newInYourVersion} entries={runningNotes} />}
           <Group>
             <ListItem icon={Info} headline={t.cms.running(view.running)} supporting={view.latest ? undefined : t.cms.upToDate} />
             <ListItem icon={Clock} headline={view.checkedAt ? t.cms.checked(when(new Date(view.checkedAt))) : t.cms.notChecked} />

package/src/MainMenu.tsx

@@ -2,8 +2,8 @@
 // sections; a section opens its list, under a back row, with the open screen marked and its fold-out folded out. Apps lists
 // Appstore and a row per app installed. From medium and wider the first level is also the collapsed navigation rail
 // (MainRailItem), whose sections open the drawer at their list. The drawer's header is the signed-in user (AccountRow), a link
-// to the account. In the modal drawer a section's list is a step in the history (levelStep.mjs): the phone's back gesture
-// goes from it to the first level. Exposes MainMenu. The tree and the open place are lib/menu.mjs
+// to the account. The levels are not steps in the history: in the modal drawer the phone's back gesture goes to the screen
+// before, as everywhere else, and closes the drawer. Exposes MainMenu. The tree and the open place are lib/menu.mjs
 // (menuTree, currentPlace); it only wires them to the drawer.
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { config, header } from '@site/editor';
@@ -16,7 +16,6 @@ import { AccountRow } from './AccountRow';
 import { childrenOf } from './menuChildren';
 import { t } from './i18n';
 import { useMenuOpen } from './menuOpen';
-import { levelStep } from './levelStep.mjs';
 import {
   MainDrawer,
   MainDrawerBack,
@@ -79,19 +78,15 @@ export function MainMenu({ route, files, user }: { route: string; files: RepoFil
     setShown(null);
     return true;
   }, []);
-  // A section's list in the modal drawer: the back gesture goes to the first level (levelStep.mjs), not to the screen before.
+  // The modal drawer closes when the screen changes another way than by a link in it (the phone's back gesture), so the
+  // screen before is not left under it.
   const modal = useMenuLayout().expanded !== 'standard';
-  const step = useRef<ReturnType<typeof levelStep> | null>(null);
   useEffect(() => {
-    step.current = levelStep(window);
-    return () => step.current?.stop();
-  }, []);
-  useEffect(() => {
-    step.current?.set(modal && open && shown !== null, () => {
-      setFocus('top');
-      setShown(null);
-    });
-  }, [modal, open, shown]);
+    if (!modal || !open) return;
+    const close = () => setOpen(false);
+    window.addEventListener('hashchange', close);
+    return () => window.removeEventListener('hashchange', close);
+  }, [modal, open, setOpen]);
   // Every level stays in the page (the screen check finds the screens from the links); the ones not shown are `hidden`.
   const sections = tree.filter((entry) => entry.href === undefined);
   return (

package/src/bundledNotes.ts

@@ -0,0 +1,11 @@
+// The release notes of the minor line this package is in (x.y.0 up to its version): read at build time from the package's own release-notes/ files.
+// Exposes runningNotes (the entries the Morpheme page shows, newest first; empty when the line has none).
+// Depends on lib/releaseNotes.mjs (bundledNotes) and package.json's version. The globs are relative, so they work here and in a site's node_modules.
+import { bundledNotes } from '../lib/releaseNotes.mjs';
+import { version } from '../package.json';
+import type { ReleasedNotes } from '../lib/releaseNotes.mjs';
+
+const files = import.meta.glob<ReleasedNotes>('../release-notes/i18n/*/*.json', { eager: true, import: 'default' });
+const images = import.meta.glob<string>('../release-notes/i18n/*/*/*.webp', { eager: true, query: '?url', import: 'default' });
+
+export const runningNotes = bundledNotes(files, images, version);

package/src/cmsView.d.mts

@@ -3,7 +3,6 @@ export function cmsView(status: any, now?: number): {
     checkedAt: any;
     latest: any;
     notes: any[];
-    installed: any;
     action: string | null;
     npmCommand: string | null;
     update: {

package/src/cmsView.mjs

@@ -1,5 +1,5 @@
 // Transforms CMS status into a view for the update page.
-// Exposes cmsView and DONE_SHOWN. `installed` passes the notes of the update just installed on as the Worker gives them.
+// Exposes cmsView and DONE_SHOWN.
 // Depends on cms-version for version comparison.
 
 import { compareVersions } from '../lib/cms-version.mjs';
@@ -77,7 +77,5 @@ export function cmsView(status, now = Date.now()) {
     problems.push('slow-undo');
   }
 
-  const installed = Array.isArray(status.installed) ? status.installed : [];
-
-  return { running, checkedAt, latest, notes, installed, action, npmCommand, update, problems };
+  return { running, checkedAt, latest, notes, action, npmCommand, update, problems };
 }

package/src/cmsView.test.mjs

@@ -150,9 +150,3 @@ test('pre-release running', () => {
   const view = cmsView(status, now);
   assert.equal(view.latest, null);
 });
-
-test('passes the installed notes on, or an empty list', () => {
-  const installed = [{ version: '0.1.1', text: 'Fixes', notes: { 'en-US': [] } }];
-  assert.deepEqual(cmsView(makeStatus({ installed }), now).installed, installed);
-  assert.deepEqual(cmsView(makeStatus({}), now).installed, []);
-});

package/starter/package.json

@@ -32,7 +32,7 @@
     "@material-symbols/svg-400": "0.48.2",
     "@material/material-color-utilities": "^0.3.0",
     "@milkdown/kit": "^7.22.3",
-    "@morphemecms/cms": "0.14.0",
+    "@morphemecms/cms": "0.14.1",
     "@phosphor-icons/core": "^2.1.1",
     "@phosphor-icons/react": "^2.1.10",
     "@tailwindcss/typography": "^0.5.20",

package/worker/cms-update.js

@@ -3,7 +3,7 @@
 // Exposes RUNNING, checkForUpdate, startUpdate, watchUpdate, cmsStatus and handleCms (/api/cms, and GET /api/cms/note-image/<version>/<locale>/<id>,
 // behind the same login check). Needs GITHUB_PUBLISH_TOKEN and the KV binding PUSH. Keeps each new version's changelog text and release
 // notes (en-US, da-DK) as cms:notes:<version> and each card screenshot as cms:note-image:<version>:<locale>:<id>; cmsStatus returns
-// the notes to come and the installed ones, with the screenshot address on each card. Depends on github.js, session.js, push.js and lib/{lockfile,cms-version,changelog,releaseNotes}.mjs;
+// the notes to come, with the screenshot address on each card. Depends on github.js, session.js, push.js and lib/{lockfile,cms-version,changelog,releaseNotes}.mjs;
 // I/O is injected (`deps`).
 import { config } from '@site/config';
 import { cms as cmsEn } from '../src/i18n/en-US/cms';
@@ -11,7 +11,7 @@ import { cms as cmsDa } from '../src/i18n/da-DK/cms';
 import { addToLock, NeedsNpm } from '../lib/lockfile.mjs';
 import { compareVersions, managedVersion, nextVersion, PACKAGE, watchStep } from '../lib/cms-version.mjs';
 import { fileFromTar, gunzip, sectionsBetween } from '../lib/changelog.mjs';
-import { imageKey, installedVersions, notesFromTar, parseImagePath, withImageUrls } from '../lib/releaseNotes.mjs';
+import { imageKey, notesFromTar, parseImagePath, withImageUrls } from '../lib/releaseNotes.mjs';
 import pkg from '../package.json';
 import { GitHubError } from './files.js';
 import { commitFiles, readFiles } from './github.js';
@@ -211,8 +211,8 @@ export async function watchUpdate(env, deps = defaultDeps, now = Date.now()) {
 
 /**
  * What the page shows: the running version, the token, what npm said, the update, the skipped versions, the notes of the
- * versions still to come (`notes`) and those of the versions installed (`installed`, see installedVersions). Each entry is
- * `{ version, text, notes? }`; `notes` maps a locale to its release notes. Both lists stay empty when the running version is a pre-release.
+ * versions still to come (`notes`). Each entry is `{ version, text, notes? }`; `notes` maps a locale to its release notes. The list stays
+ * empty when the running version is a pre-release. The running version's own notes are not here: the editor reads them from the package (src/bundledNotes.ts).
  */
 export async function cmsStatus(env, running = RUNNING) {
   const kv = env.PUSH;
@@ -224,7 +224,6 @@ export async function cmsStatus(env, running = RUNNING) {
     update: null,
     skipped: [],
     notes: [],
-    installed: [],
   };
   const plain = /^\d+\.\d+\.\d+$/;
   if (!kv) return status;
@@ -241,8 +240,6 @@ export async function cmsStatus(env, running = RUNNING) {
   );
   wanted.sort((a, b) => compareVersions(b, a));
   status.notes = entries(await Promise.all(wanted.map((v) => kv.get(`cms:notes:${v}`, 'json'))));
-  const installed = installedVersions(status.update, running, kept);
-  status.installed = entries(await Promise.all(installed.map((v) => kv.get(`cms:notes:${v}`, 'json'))));
   return status;
 }
 

package/src/levelStep.d.mts

@@ -1,10 +0,0 @@
-/**
- * Watches the window's history for the level's step. `set(active, toFirst)`: whether the level is shown (a step is added
- * while it is), and what the back gesture does on it (shows the first level). `stop()` takes the step out and stops.
- * @param {Pick<Window, 'history' | 'location' | 'addEventListener' | 'removeEventListener' | 'document'>} win
- */
-export function levelStep(win: Pick<Window, "history" | "location" | "addEventListener" | "removeEventListener" | "document">): {
-    /** @param {boolean} active @param {() => void} back */
-    set(active: boolean, back: () => void): void;
-    stop(): void;
-};

package/src/levelStep.mjs

@@ -1,66 +0,0 @@
-// The second level of the editor's modal main menu (MainMenu.tsx) as a step in the browser's history: while a section's
-// list is shown in the modal drawer, the phone's back gesture (and the browser's back button) goes to the first level
-// instead of to the screen before. The step has the same address and the same place as the screen's (history.state,
-// nav.ts), so going back from it fires no hashchange and nav.ts never sees it. Leaving the level another way (the back
-// row, Escape, the drawer closed) takes the step out again; a link in the drawer is followed once the step is out, so the
-// history never keeps an empty step. Exposes levelStep. A window (the browser's; a fake one in the tests).
-
-/**
- * Watches the window's history for the level's step. `set(active, toFirst)`: whether the level is shown (a step is added
- * while it is), and what the back gesture does on it (shows the first level). `stop()` takes the step out and stops.
- * @param {Pick<Window, 'history' | 'location' | 'addEventListener' | 'removeEventListener' | 'document'>} win
- */
-export function levelStep(win) {
-  let pushed = false;
-  /** @type {string | null} A link's address, followed once the step is out. */
-  let pending = null;
-  let toFirst = () => {};
-
-  const leave = () => {
-    if (!pushed) return;
-    pushed = false;
-    win.history.back();
-  };
-  const onPop = () => {
-    // Back from the step: the first level, on the same screen.
-    if (pushed) {
-      pushed = false;
-      toFirst();
-      return;
-    }
-    // The step taken out for a link: now the link.
-    if (pending !== null) {
-      const href = pending;
-      pending = null;
-      win.location.hash = href;
-    }
-  };
-  /** @param {MouseEvent} e */
-  const onClick = (e) => {
-    if (!pushed || e.defaultPrevented || e.button !== 0 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return;
-    const target = /** @type {Element | null} */ (e.target);
-    const a = target?.closest?.('a[href^="#"]');
-    if (!a || a.getAttribute('target')) return;
-    e.preventDefault();
-    pending = a.getAttribute('href');
-    leave();
-  };
-  win.addEventListener('popstate', onPop);
-  win.document.addEventListener('click', onClick, true);
-
-  return {
-    /** @param {boolean} active @param {() => void} back */
-    set(active, back) {
-      toFirst = back;
-      if (active && !pushed) {
-        win.history.pushState({ ...(win.history.state ?? {}), level: true }, '');
-        pushed = true;
-      } else if (!active) leave();
-    },
-    stop() {
-      leave();
-      win.removeEventListener('popstate', onPop);
-      win.document.removeEventListener('click', onClick, true);
-    },
-  };
-}

package/src/levelStep.test.mjs

@@ -1,119 +0,0 @@
-// Tests levelStep.mjs: the modal main menu's second level as a step in the history, with a fake window whose history
-// fires popstate as the browser's does (a step back on the same address: no hashchange).
-// Run: node --test src/levelStep.test.mjs
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { levelStep } from './levelStep.mjs';
-
-function fakeWindow(hash = '#list/pages') {
-  const listeners = { popstate: new Set(), click: new Set() };
-  const entries = [{ state: { at: 3, prev: '' }, hash }];
-  let index = 0;
-  const win = {
-    location: {
-      get hash() {
-        return entries[index].hash;
-      },
-      set hash(next) {
-        entries.splice(index + 1);
-        entries.push({ state: null, hash: next });
-        index += 1;
-      },
-    },
-    history: {
-      get state() {
-        return entries[index].state;
-      },
-      pushState(state) {
-        entries.splice(index + 1);
-        entries.push({ state, hash: entries[index].hash });
-        index += 1;
-      },
-      back() {
-        index -= 1;
-        for (const l of listeners.popstate) l();
-      },
-    },
-    addEventListener: (type, l) => listeners[type].add(l),
-    removeEventListener: (type, l) => listeners[type].delete(l),
-    document: {
-      addEventListener: (type, l) => listeners[type].add(l),
-      removeEventListener: (type, l) => listeners[type].delete(l),
-    },
-  };
-  const click = (href, extra = {}) => {
-    const a = { getAttribute: (name) => (name === 'href' ? href : (extra[name] ?? null)) };
-    const e = {
-      button: 0,
-      defaultPrevented: false,
-      target: { closest: () => a },
-      preventDefault() {
-        this.defaultPrevented = true;
-      },
-    };
-    for (const l of listeners.click) l(e);
-    return e;
-  };
-  return { win, entries: () => entries.slice(0, index + 1), click, listeners };
-}
-
-test('the level shown adds a step with the same address and place', () => {
-  const { win, entries } = fakeWindow();
-  levelStep(win).set(true, () => {});
-  assert.equal(entries().length, 2);
-  assert.equal(entries()[1].hash, '#list/pages');
-  assert.deepEqual(entries()[1].state, { at: 3, prev: '', level: true });
-});
-
-test('the back gesture on the level shows the first level and stays on the screen', () => {
-  const { win, entries } = fakeWindow();
-  let first = 0;
-  levelStep(win).set(true, () => (first += 1));
-  win.history.back();
-  assert.equal(first, 1);
-  assert.equal(entries().length, 1);
-  assert.equal(win.location.hash, '#list/pages');
-});
-
-test('leaving the level another way takes the step out, without the first level called again', () => {
-  const { win, entries } = fakeWindow();
-  let first = 0;
-  const step = levelStep(win);
-  step.set(true, () => (first += 1));
-  step.set(false, () => (first += 1));
-  assert.equal(entries().length, 1);
-  assert.equal(first, 0);
-});
-
-test('a link on the level is followed after the step is out: no empty step', () => {
-  const { win, entries, click } = fakeWindow();
-  const step = levelStep(win);
-  step.set(true, () => {});
-  const e = click('#list/posts');
-  assert.equal(e.defaultPrevented, true);
-  assert.deepEqual(
-    entries().map((s) => s.hash),
-    ['#list/pages', '#list/posts'],
-  );
-  // The drawer closes on the link: nothing more to take out.
-  step.set(false, () => {});
-  assert.equal(entries().length, 2);
-});
-
-test('links are left alone at the first level and in a new tab', () => {
-  const { win, click } = fakeWindow();
-  const step = levelStep(win);
-  assert.equal(click('#list/posts').defaultPrevented, false);
-  step.set(true, () => {});
-  assert.equal(click('#list/posts', { target: '_blank' }).defaultPrevented, false);
-});
-
-test('stop takes the step out and stops listening', () => {
-  const { win, entries, listeners } = fakeWindow();
-  const step = levelStep(win);
-  step.set(true, () => {});
-  step.stop();
-  assert.equal(entries().length, 1);
-  assert.equal(listeners.popstate.size, 0);
-  assert.equal(listeners.click.size, 0);
-});