@morphemecms/cms 0.4.0-next-20261104164754 → 0.4.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @morphemecms/cms
 
-## 0.4.0-next-20261104164754
+## 0.4.0
 
 ### Minor Changes
 
@@ -9,7 +9,9 @@
 
 ### Patch Changes
 
+- dd9ab22: Settings › Morpheme says when the site has no KV storage (PUSH), and no longer fails to open when the site runs a pre-release of Morpheme.
 - cf9f144: Keep the line breaks of a file's front matter (CRLF or LF) when the editor writes it back.
+- 6cb2c17: `check:worker` passes when the site runs a pre-release of Morpheme (as the staging site does).
 - 682da97: New sites from the starter can reach the Morpheme store on the same Cloudflare account, and Prettier skips store theme files.
 
 ## 0.3.0

package/defaults/editor.ts

@@ -158,7 +158,18 @@ export const groups: { title: string; ids: string[] }[] = [
 
 /** The settings of the whole site, not on the start screen but on "Indstillinger" (#indstillinger, Library.tsx
  * Settings), which the gear in the top bar opens (Screen.tsx SettingsLink); A–Å as a group's. */
-export const settings: string[] = ['udseende', 'apps', 'appstore', 'morpheme', 'maaling', 'promovering', 'privatliv', 'seo', 'avanceret', 'licenser'];
+export const settings: string[] = [
+  'udseende',
+  'apps',
+  'appstore',
+  'morpheme',
+  'maaling',
+  'promovering',
+  'privatliv',
+  'seo',
+  'avanceret',
+  'licenser',
+];
 
 /** The site's own short lists, on a screen of their own under "Lister" (#lister), with those the standard blocks
  * bring ("Udtalelser") and the apps (their lists.ts). */

package/icons/lucide/LICENSE-material-design-icons

@@ -1,20 +1,20 @@
-Pictogrammers Free License
---------------------------
-
-This icon collection is released as free, open source, and GPL friendly by
-the [Pictogrammers](http://pictogrammers.com/) icon group. You may use it
-for commercial projects, open source projects, or anything really.
-
-# Icons: Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
-Some of the icons are redistributed under the Apache 2.0 license. All other
-icons are either redistributed under their respective licenses or are
-distributed under the Apache 2.0 license.
-
-# Fonts: Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
-All web and desktop fonts are distributed under the Apache 2.0 license. Web
-and desktop fonts contain some icons that are redistributed under the Apache
-2.0 license. All other icons are either redistributed under their respective
-licenses or are distributed under the Apache 2.0 license.
-
-# Code: MIT (https://opensource.org/licenses/MIT)
+Pictogrammers Free License
+--------------------------
+
+This icon collection is released as free, open source, and GPL friendly by
+the [Pictogrammers](http://pictogrammers.com/) icon group. You may use it
+for commercial projects, open source projects, or anything really.
+
+# Icons: Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
+Some of the icons are redistributed under the Apache 2.0 license. All other
+icons are either redistributed under their respective licenses or are
+distributed under the Apache 2.0 license.
+
+# Fonts: Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
+All web and desktop fonts are distributed under the Apache 2.0 license. Web
+and desktop fonts contain some icons that are redistributed under the Apache
+2.0 license. All other icons are either redistributed under their respective
+licenses or are distributed under the Apache 2.0 license.
+
+# Code: MIT (https://opensource.org/licenses/MIT)
 The MIT license applies to all non-font and non-icon files.

package/icons/material-symbols/LICENSE-material-design-icons

@@ -1,20 +1,20 @@
-Pictogrammers Free License
---------------------------
-
-This icon collection is released as free, open source, and GPL friendly by
-the [Pictogrammers](http://pictogrammers.com/) icon group. You may use it
-for commercial projects, open source projects, or anything really.
-
-# Icons: Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
-Some of the icons are redistributed under the Apache 2.0 license. All other
-icons are either redistributed under their respective licenses or are
-distributed under the Apache 2.0 license.
-
-# Fonts: Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
-All web and desktop fonts are distributed under the Apache 2.0 license. Web
-and desktop fonts contain some icons that are redistributed under the Apache
-2.0 license. All other icons are either redistributed under their respective
-licenses or are distributed under the Apache 2.0 license.
-
-# Code: MIT (https://opensource.org/licenses/MIT)
+Pictogrammers Free License
+--------------------------
+
+This icon collection is released as free, open source, and GPL friendly by
+the [Pictogrammers](http://pictogrammers.com/) icon group. You may use it
+for commercial projects, open source projects, or anything really.
+
+# Icons: Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
+Some of the icons are redistributed under the Apache 2.0 license. All other
+icons are either redistributed under their respective licenses or are
+distributed under the Apache 2.0 license.
+
+# Fonts: Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
+All web and desktop fonts are distributed under the Apache 2.0 license. Web
+and desktop fonts contain some icons that are redistributed under the Apache
+2.0 license. All other icons are either redistributed under their respective
+licenses or are distributed under the Apache 2.0 license.
+
+# Code: MIT (https://opensource.org/licenses/MIT)
 The MIT license applies to all non-font and non-icon files.

package/icons/phosphor/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2023 Phosphor Icons
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) 2023 Phosphor Icons
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

package/lib/side-block.test.mjs

@@ -54,7 +54,7 @@ test('besideInSource reads export const beside = true', () => {
   assert.equal(besideInSource('export const beside = false;'), false);
   assert.equal(besideInSource('// export const beside = true;'), false);
   assert.equal(besideInSource('export const load = 1;'), false);
-}); 
+});
 
 test('sideChoices lists installed blocks with beside, by label', () => {
   const blocks = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morphemecms/cms",
-  "version": "0.4.0-next-20261104164754",
+  "version": "0.4.0",
   "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",
@@ -41,6 +41,8 @@
   "scripts": {
     "build": "node scripts/demo-build.mjs",
     "icons": "node scripts/icon-packs.mjs",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
     "release:version": "changeset version && node scripts/starter.mjs",
     "prepack": "node scripts/types.mjs write",
     "postpack": "node scripts/types.mjs clean"
@@ -118,6 +120,9 @@
     "jsdom": "^29.1.1",
     "motion": "^14.0.0",
     "playwright": "^1.64.1",
+    "prettier": "^3.9.10",
+    "prettier-plugin-astro": "^1.1.2",
+    "prettier-plugin-tailwindcss": "^0.8.1",
     "react": "^19.3.0",
     "react-dom": "^19.3.0",
     "rehype-raw": "^7.0.0",

package/scripts/check-cms-update.mjs

@@ -384,20 +384,31 @@ for (const [what, patch] of [
 
 // The page's notes: from the running version up to the newest, newest first.
 {
-  const [major, minor, patch] = RUNNING.split('-')[0].split('.').map(Number);
+  const running = RUNNING.split('-')[0];
+  const [major, minor, patch] = running.split('.').map(Number);
   const next1 = `${major}.${minor}.${patch + 1}`;
   const next2 = `${major}.${minor}.${patch + 2}`;
   const w = world();
-  for (const v of ['0.0.0', RUNNING, next1, next2, '9.9.9'])
+  for (const v of ['0.0.0', running, next1, next2, '9.9.9'])
     await w.kv.put(`cms:notes:${v}`, JSON.stringify({ version: v, text: `Notes ${v}` }));
   await w.kv.put('cms:checked', JSON.stringify({ at: new Date(T0).toISOString(), latest: next2 }));
-  const { notes } = await cmsStatus(w.env);
+  const { notes } = await cmsStatus(w.env, running);
   expect(
     notes.map((n) => n.version).join() === `${next2},${next1}`,
     `noterne var ${notes.map((n) => n.version).join()}, ikke ${next2},${next1}`,
   );
 }
 
+// A pre-release running: the status answers, with no notes.
+{
+  const w = world();
+  for (const v of ['0.1.0', '0.2.0']) await w.kv.put(`cms:notes:${v}`, JSON.stringify({ version: v, text: `Notes ${v}` }));
+  await w.kv.put('cms:checked', JSON.stringify({ at: new Date(T0).toISOString(), latest: '0.2.0' }));
+  const status = await cmsStatus(w.env, '0.2.0-next-1').catch((e) => e);
+  expect(status?.running === '0.2.0-next-1', `en forudgivelse gav ${status?.message ?? status?.running}, ikke status`);
+  expect(Array.isArray(status?.notes) && status.notes.length === 0, 'en forudgivelse gav noter');
+}
+
 if (problems.length) {
   console.error(problems.map((p) => `- ${p}`).join('\n'));
   process.exit(1);

package/site/icons.mjs

@@ -416,7 +416,9 @@ export const PACK_MAPS = { 'material-symbols': MATERIAL_SYMBOLS, lucide: LUCIDE
 /** The names of Phosphor's pack: the icons the site and the editor draw (`used`), and every name the other system
  * packs' maps name (an app's icon, which the CMS itself may not draw), sorted. */
 export const phosphorNames = (used) =>
-  [...new Set([...used, ...Object.values(PACK_MAPS).flatMap(Object.keys), ...Object.values(MATERIAL_DESIGN_ICONS).flatMap(Object.keys)])].sort();
+  [
+    ...new Set([...used, ...Object.values(PACK_MAPS).flatMap(Object.keys), ...Object.values(MATERIAL_DESIGN_ICONS).flatMap(Object.keys)]),
+  ].sort();
 
 /** The names the system's pack has an icon by in its maps (its set's and Material Design Icons'); all for Phosphor's. */
 const mapped = (pack) => (PACK_MAPS[pack] ? [...Object.keys(PACK_MAPS[pack]), ...Object.keys(MATERIAL_DESIGN_ICONS[pack] ?? {})] : null);

package/src/CmsPage.tsx

@@ -12,7 +12,7 @@ import { when } from './when';
 
 export const CMS_ROUTE = 'morpheme';
 
-type Problem = 'unreachable' | 'cannot-write' | 'no-token' | 'not-managed' | 'slow-undo';
+type Problem = 'unreachable' | 'cannot-write' | 'no-token' | 'no-kv' | 'not-managed' | 'slow-undo';
 type UpdateState = 'waiting' | 'undoing' | 'done' | 'undone' | 'stuck';
 type View = {
   running: string;
@@ -130,10 +130,11 @@ export default function CmsPage() {
   );
 }
 
-const kindText: Record<Problem, 'unreachable' | 'cannotWrite' | 'noToken' | 'notManaged' | 'slowUndo'> = {
+const kindText: Record<Problem, 'unreachable' | 'cannotWrite' | 'noToken' | 'noKv' | 'notManaged' | 'slowUndo'> = {
   unreachable: 'unreachable',
   'cannot-write': 'cannotWrite',
   'no-token': 'noToken',
+  'no-kv': 'noKv',
   'not-managed': 'notManaged',
   'slow-undo': 'slowUndo',
 };

package/src/EntryForm.tsx

@@ -134,7 +134,10 @@ const same = (a: unknown, b: unknown) => JSON.stringify(a) === JSON.stringify(b)
 // "Sidekolonne") leaves the file when it is on (booleanWrite).
 const inForm = (fields: Field[], values: Record<string, unknown>) =>
   Object.fromEntries(
-    fields.map((f) => [f.name, inUse(f, fields, values) ? (f.type === 'boolean' ? booleanWrite(values[f.name], f.missing) : values[f.name]) : '']),
+    fields.map((f) => [
+      f.name,
+      inUse(f, fields, values) ? (f.type === 'boolean' ? booleanWrite(values[f.name], f.missing) : values[f.name]) : '',
+    ]),
   );
 
 type Props = { collection: MarkdownCollection; file: RepoFile; env: Env };
@@ -642,7 +645,8 @@ function Form({
   // "Sidekolonne" only while src/data/side.json chooses a block and the page is not "Hele bredden" (sideSwitchShown).
   const sideShown = sideSwitchShown({ block: sideSettingOf(env.files) }, values);
   const field = (f: Field) =>
-    inUse(f, collection.fields, values) && (f.name !== 'side' || sideShown) && <FieldInput key={f.name} field={f} value={values[f.name]} onChange={(v) => onChange(f, v)} />;
+    inUse(f, collection.fields, values) &&
+    (f.name !== 'side' || sideShown) && <FieldInput key={f.name} field={f} value={values[f.name]} onChange={(v) => onChange(f, v)} />;
 
   return (
     <Fields.Provider value={fields}>

package/src/SideColumn.tsx

@@ -72,7 +72,12 @@ export default function SideColumn({ env, files }: { env: Env; files: RepoFile[]
   return (
     <Screen title={t.common.parts.sideColumn} wide back={back}>
       <Group>
-        <ChoiceRow selected={!chosen} onClick={() => choose(null, t.library.sideNone)} headline={t.library.sideNone} supporting={t.library.sideNoneHint} />
+        <ChoiceRow
+          selected={!chosen}
+          onClick={() => choose(null, t.library.sideNone)}
+          headline={t.library.sideNone}
+          supporting={t.library.sideNoneHint}
+        />
         {choices.map((x) => (
           <ChoiceRow key={x.type} selected={x.type === chosen} onClick={() => choose(x.type, x.label)} headline={x.label} />
         ))}

package/src/cmsView.mjs

@@ -64,6 +64,9 @@ export function cmsView(status, now = Date.now()) {
   if (status.token === false) {
     problems.push('no-token');
   }
+  if (status.kv === false) {
+    problems.push('no-kv');
+  }
   if (status.checked?.problem) {
     const kind = status.checked.problem.kind;
     if (kind === 'unreachable' || kind === 'cannot-write' || kind === 'not-managed') {

package/src/cmsView.test.mjs

@@ -103,6 +103,12 @@ test('no token', () => {
   assert.deepEqual(view.problems, ['no-token']);
 });
 
+test('no kv', () => {
+  const status = makeStatus({ kv: false });
+  const view = cmsView(status, now);
+  assert.deepEqual(view.problems, ['no-kv']);
+});
+
 test('cannot write', () => {
   const status = makeStatus({ checked: { problem: { kind: 'cannot-write' } } });
   const view = cmsView(status, now);

package/src/i18n/da-DK/cms.ts

@@ -20,6 +20,7 @@ export const cms: Messages['cms'] = {
   unreachable: 'npm eller GitHub kunne ikke nås.',
   cannotWrite: 'Sitets GitHub-nøgle kan ikke gemme. Giv den Contents: Read and write.',
   noToken: 'Sitet har ingen GitHub-nøgle (GITHUB_PUBLISH_TOKEN).',
+  noKv: 'Sitet har intet KV-lager (PUSH), så det kan ikke se efter nye versioner.',
   notManaged: 'Sitets package.json bestemmer versionen.',
   slowUndo: 'Nøglen kan ikke læse check runs, så en fejlet opdatering fortrydes først efter 20 minutter.',
   notifyDone: (v) => `Morpheme er opdateret til ${v}`,

package/src/i18n/en-US/cms.ts

@@ -23,6 +23,7 @@ export const cms = {
   unreachable: 'npm or GitHub couldn’t be reached.',
   cannotWrite: 'The site’s GitHub token can’t save. Give it Contents: Read and write.',
   noToken: 'The site has no GitHub token (GITHUB_PUBLISH_TOKEN).',
+  noKv: 'The site has no KV storage (PUSH), so it can’t look for new versions.',
   notManaged: 'The site’s package.json decides the version.',
   slowUndo: 'The token can’t read check runs, so a failed update is undone after 20 minutes.',
   /** The site's notifications (Notifications.tsx) and the commits the Worker writes, in the site's language. */

package/starter/package.json

@@ -31,7 +31,7 @@
     "@fontsource-variable/roboto": "^5.3.0",
     "@material/material-color-utilities": "^0.3.0",
     "@milkdown/kit": "^7.22.3",
-    "@morphemecms/cms": "0.3.0",
+    "@morphemecms/cms": "0.4.0",
     "@phosphor-icons/core": "^2.1.1",
     "@phosphor-icons/react": "^2.1.10",
     "@tailwindcss/typography": "^0.5.20",

package/theme/layouts/PageLayout.astro

@@ -67,7 +67,8 @@ const review = (page.data.review ?? '').trim();
 const sideType = sideBlock(page.data);
 const sideText = end ? end.html : html;
 const side =
-  sideType && (await blockLoads[sideType].load({}, { texts: blockTexts[sideType] ?? {}, index: 0, path: current, preview, html: sideText })) !== null
+  sideType &&
+  (await blockLoads[sideType].load({}, { texts: blockTexts[sideType] ?? {}, index: 0, path: current, preview, html: sideText })) !== null
     ? sideType
     : null;
 ---

package/worker/cms-update.js

@@ -200,18 +200,19 @@ export async function watchUpdate(env, deps = defaultDeps, now = Date.now()) {
   return tell(env, deps, 'notifyStuck', update.to, true);
 }
 
-/** What the page shows: the running version, the token, what npm said, the update, the skipped versions and the notes. */
-export async function cmsStatus(env) {
+/** What the page shows: the running version, the token, what npm said, the update, the skipped versions and the notes; no notes when the running version is a pre-release. */
+export async function cmsStatus(env, running = RUNNING) {
   const kv = env.PUSH;
-  const status = { running: RUNNING, token: !!env.GITHUB_PUBLISH_TOKEN, kv: !!kv, checked: null, update: null, skipped: [], notes: [] };
+  const status = { running, token: !!env.GITHUB_PUBLISH_TOKEN, kv: !!kv, checked: null, update: null, skipped: [], notes: [] };
+  const plain = /^\d+\.\d+\.\d+$/;
   if (!kv) return status;
   status.checked = await kv.get('cms:checked', 'json');
   status.update = await kv.get('cms:update', 'json');
   status.skipped = await versionsUnder(kv, 'cms:skip:');
-  const plain = /^\d+\.\d+\.\d+$/;
+  if (!plain.test(running)) return status;
   const wanted = (await versionsUnder(kv, 'cms:notes:')).filter(
     (v) =>
-      plain.test(v) && compareVersions(v, RUNNING) === 1 && (!status.checked?.latest || compareVersions(v, status.checked.latest) <= 0),
+      plain.test(v) && compareVersions(v, running) === 1 && (!status.checked?.latest || compareVersions(v, status.checked.latest) <= 0),
   );
   wanted.sort((a, b) => compareVersions(b, a));
   const notes = await Promise.all(wanted.map((v) => kv.get(`cms:notes:${v}`, 'json')));