@morphemecms/cms 0.3.0 → 0.4.0-next-20261104164754

package/src/cmsView.d.mts

@@ -0,0 +1,15 @@
+export function cmsView(status: any, now?: number): {
+    running: any;
+    checkedAt: any;
+    latest: any;
+    notes: any[];
+    action: string | null;
+    npmCommand: string | null;
+    update: {
+        state: any;
+        to: any;
+        at: any;
+    } | null;
+    problems: any[];
+};
+export const DONE_SHOWN: number;

package/src/cmsView.mjs

@@ -0,0 +1,78 @@
+// Transforms CMS status into a view for the update page.
+// Exposes cmsView and DONE_SHOWN.
+// Depends on cms-version for version comparison.
+
+import { compareVersions } from '../lib/cms-version.mjs';
+
+export const DONE_SHOWN = 24 * 60 * 60 * 1000;
+
+export function cmsView(status, now = Date.now()) {
+  const running = status.running;
+  const checkedAt = status.checked?.at ?? null;
+
+  let latest = null;
+  if (status.checked?.latest) {
+    try {
+      if (compareVersions(status.checked.latest, running) === 1) {
+        latest = status.checked.latest;
+      }
+    } catch {
+      // Pre-release or invalid version, ignore
+    }
+  }
+
+  let notes = [];
+  if (latest !== null && status.notes && status.notes.length > 0) {
+    notes = [...status.notes];
+    try {
+      notes.sort((a, b) => compareVersions(b.version, a.version));
+    } catch {
+      // Keep original order if sorting fails
+    }
+  }
+
+  const busy = status.update?.state === 'waiting' || status.update?.state === 'undoing';
+
+  let action = null;
+  if (latest !== null && !busy) {
+    if (status.checked?.problem?.kind === 'major') {
+      action = 'update';
+    } else if (status.checked?.problem?.kind === 'skipped') {
+      action = 'try-again';
+    }
+  }
+
+  let npmCommand = null;
+  if (latest !== null && status.checked?.problem?.kind === 'needs-npm') {
+    npmCommand = `npm install @morphemecms/cms@${latest}`;
+  }
+
+  let update = null;
+  if (status.update) {
+    const state = status.update.state;
+    if (state === 'waiting' || state === 'undoing' || state === 'undone' || state === 'stuck') {
+      update = { state, to: status.update.to, at: status.update.at };
+    } else if (state === 'done') {
+      const at = Date.parse(status.update.at);
+      if (now - at < DONE_SHOWN) {
+        update = { state, to: status.update.to, at: status.update.at };
+      }
+    }
+  }
+
+  const problems = [];
+  if (status.token === false) {
+    problems.push('no-token');
+  }
+  if (status.checked?.problem) {
+    const kind = status.checked.problem.kind;
+    if (kind === 'unreachable' || kind === 'cannot-write' || kind === 'not-managed') {
+      problems.push(kind);
+    }
+  }
+  if (status.checked?.noChecks === true) {
+    problems.push('slow-undo');
+  }
+
+  return { running, checkedAt, latest, notes, action, npmCommand, update, problems };
+}

package/src/cmsView.test.d.mts

@@ -0,0 +1 @@
+export {};

package/src/cmsView.test.mjs

@@ -0,0 +1,146 @@
+// Tests for cmsView.
+// Verifies status transformation and output shape.
+// Run: node --test packages/editor/src/cmsView.test.mjs
+
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { cmsView } from './cmsView.mjs';
+
+const baseStatus = {
+  running: '0.1.1',
+  token: true,
+  kv: true,
+  checked: { at: '2026-11-04T10:00:00.000Z', latest: '0.1.1' },
+  update: null,
+  skipped: [],
+  notes: [],
+};
+
+const now = Date.parse('2026-11-04T12:00:00.000Z');
+
+function makeStatus(overrides) {
+  const result = { ...baseStatus, ...overrides };
+
+  if (!('checked' in overrides)) {
+    result.checked = baseStatus.checked;
+  } else if (overrides.checked === null) {
+    result.checked = null;
+  } else {
+    result.checked = { ...baseStatus.checked, ...overrides.checked };
+  }
+
+  if (!('update' in overrides)) {
+    result.update = baseStatus.update;
+  } else if (overrides.update === null) {
+    result.update = null;
+  } else {
+    result.update = { ...baseStatus.update, ...overrides.update };
+  }
+
+  return result;
+}
+
+test('up to date', () => {
+  const view = cmsView(baseStatus, now);
+  assert.equal(view.latest, null);
+  assert.equal(view.action, null);
+  assert.equal(view.npmCommand, null);
+  assert.equal(view.update, null);
+  assert.deepEqual(view.problems, []);
+  assert.equal(view.checkedAt, '2026-11-04T10:00:00.000Z');
+});
+
+test('not checked', () => {
+  const status = makeStatus({ checked: null });
+  const view = cmsView(status, now);
+  assert.equal(view.checkedAt, null);
+  assert.equal(view.latest, null);
+});
+
+test('patch waiting', () => {
+  const status = makeStatus({
+    checked: { latest: '0.1.2' },
+    update: { commit: 'a1', from: '0.1.1', to: '0.1.2', at: '2026-11-04T11:00:00.000Z', state: 'waiting' },
+  });
+  const view = cmsView(status, now);
+  assert.equal(view.update.state, 'waiting');
+  assert.equal(view.update.to, '0.1.2');
+  assert.equal(view.action, null);
+});
+
+test('major', () => {
+  const status = makeStatus({ checked: { latest: '1.0.0', problem: { kind: 'major' } } });
+  const view = cmsView(status, now);
+  assert.equal(view.latest, '1.0.0');
+  assert.equal(view.action, 'update');
+});
+
+test('major while undoing', () => {
+  const status = makeStatus({
+    checked: { latest: '1.0.0', problem: { kind: 'major' } },
+    update: { commit: 'a1', from: '1.0.0', to: '0.1.1', at: '2026-11-04T11:00:00.000Z', state: 'undoing' },
+  });
+  const view = cmsView(status, now);
+  assert.equal(view.action, null);
+});
+
+test('skipped', () => {
+  const status = makeStatus({ checked: { latest: '0.1.3', problem: { kind: 'skipped' } } });
+  const view = cmsView(status, now);
+  assert.equal(view.action, 'try-again');
+});
+
+test('needs npm', () => {
+  const status = makeStatus({ checked: { latest: '0.1.2', problem: { kind: 'needs-npm', detail: 'x' } } });
+  const view = cmsView(status, now);
+  assert.equal(view.npmCommand, 'npm install @morphemecms/cms@0.1.2');
+  assert.equal(view.action, null);
+});
+
+test('no token', () => {
+  const status = makeStatus({ token: false });
+  const view = cmsView(status, now);
+  assert.deepEqual(view.problems, ['no-token']);
+});
+
+test('cannot write', () => {
+  const status = makeStatus({ checked: { problem: { kind: 'cannot-write' } } });
+  const view = cmsView(status, now);
+  assert.deepEqual(view.problems, ['cannot-write']);
+});
+
+test('slow undo', () => {
+  const status = makeStatus({ checked: { noChecks: true } });
+  const view = cmsView(status, now);
+  assert.ok(view.problems.includes('slow-undo'));
+});
+
+test('done two days ago', () => {
+  const status = makeStatus({ update: { commit: 'a1', from: '0.1.1', to: '0.1.2', at: '2026-11-02T12:00:00.000Z', state: 'done' } });
+  const view = cmsView(status, now);
+  assert.equal(view.update, null);
+});
+
+test('done an hour ago', () => {
+  const status = makeStatus({ update: { commit: 'a1', from: '0.1.1', to: '0.1.2', at: '2026-11-04T11:00:00.000Z', state: 'done' } });
+  const view = cmsView(status, now);
+  assert.equal(view.update.state, 'done');
+});
+
+test('notes order', () => {
+  const status = makeStatus({
+    checked: { latest: '0.1.3' },
+    notes: [
+      { version: '0.1.2', text: 'b' },
+      { version: '0.1.3', text: 'c' },
+    ],
+  });
+  const view = cmsView(status, now);
+  assert.equal(view.notes[0].version, '0.1.3');
+});
+
+test('pre-release running', () => {
+  const status = makeStatus({ running: '0.2.0-next.1', checked: { latest: '0.2.0' } });
+  const view = cmsView(status, now);
+  assert.equal(view.latest, null);
+});

package/src/frontmatter.mjs

@@ -28,7 +28,10 @@ export function writeFields(yaml, changes) {
     if (value !== '' && value != null) doc.set(key, toNode(doc, key, value));
     else if (doc.has(key)) doc.delete(key);
   }
-  return doc.contents?.items?.length ? doc.toString(STRINGIFY).replace(/\n$/, '') : '';
+  if (!doc.contents?.items?.length) return '';
+  const text = doc.toString(STRINGIFY).replace(/\n$/, '');
+  // The yaml package writes \n; a file with \r\n keeps its line breaks (a checkout on Windows).
+  return yaml.includes('\r\n') ? text.replace(/\n/g, '\r\n') : text;
 }
 
 function toNode(doc, key, value) {

package/src/frontmatter.test.mjs

@@ -25,3 +25,9 @@ test('a switch without a missing value is written as it is', () => {
   assert.equal(booleanWrite(true, undefined), true);
   assert.equal(booleanWrite(false, undefined), false);
 });
+
+test('front matter with CRLF line breaks is written back unchanged, and added fields use CRLF too', () => {
+  const crlf = 'title: "Om os"\r\nwide: false';
+  assert.equal(writeFields(crlf, {}), crlf);
+  assert.equal(writeFields(crlf, { side: false }), `${crlf}\r\nside: false`);
+});

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

@@ -0,0 +1,30 @@
+import type { Messages } from '../en-US';
+
+export const cms: Messages['cms'] = {
+  running: (v) => `Version ${v}`,
+  checked: (when) => `Tjekket ${when}`,
+  notChecked: 'Ikke tjekket endnu',
+  upToDate: 'Opdateret',
+  available: (v) => `Version ${v} er klar`,
+  whatsNew: 'Nyheder',
+  major: 'En ny hovedversion installeres ikke af sig selv.',
+  skipped: (v) => `${v} blev fortrudt, fordi siden ikke kunne bygges.`,
+  needsNpm: 'Den kræver npm. Kør dette i sitets repo:',
+  update: 'Opdater',
+  tryAgain: 'Prøv igen',
+  waiting: (v) => `Opdaterer til ${v}. Venter på, at siden bygges.`,
+  undoing: (v) => `Fortryder opdateringen til ${v}.`,
+  done: (v) => `Opdateret til ${v}`,
+  undone: (v) => `Opdateringen til ${v} blev fortrudt, fordi siden ikke kunne bygges.`,
+  stuck: (v) => `Hverken opdateringen til ${v} eller fortrydelsen kunne bygges. Siden skal rettes i hånden.`,
+  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).',
+  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}`,
+  notifyUndone: (v) => `Opdateringen af Morpheme til ${v} er fortrudt, fordi siden ikke kunne bygges`,
+  notifyStuck: (v) => `Morpheme ${v} kunne ikke bygges, og det kunne fortrydelsen heller ikke. Ret siden i hånden.`,
+  commitUpdate: (v) => `Opdater Morpheme til ${v}`,
+  commitUndo: (v) => `Fortryd opdateringen af Morpheme til ${v}`,
+};

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

@@ -110,6 +110,7 @@ export const common: Messages['common'] = {
     settings: 'Indstillinger',
     advanced: 'Avanceret',
     licenses: 'Licenser',
+    morpheme: 'Morpheme',
   },
   saved: (change) => `${change}. Du får besked, når hjemmesiden er opdateret.`,
   today: 'i dag',

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

@@ -6,6 +6,7 @@ import { apps } from './apps';
 import { blocks } from './blocks';
 import { blockSettings } from './blockSettings';
 import { check } from './check';
+import { cms } from './cms';
 import { colors } from './colors';
 import { common } from './common';
 import { company } from './company';
@@ -41,6 +42,7 @@ export const daDK: Messages = {
   seo,
   keywords,
   licenses,
+  cms,
   parts,
   history,
   preview,

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

@@ -0,0 +1,34 @@
+// "Morpheme" under "Indstillinger" (the CMS's update page, #morpheme): the running version, a new one and its notes,
+// and an update's progress; also the Worker's notifications and commit messages (worker/cms-update.js).
+
+export const cms = {
+  running: (v: string) => `Version ${v}`,
+  /** When the Worker last asked npm, as when.ts writes it. */
+  checked: (when: string) => `Checked ${when}`,
+  notChecked: 'Not checked yet',
+  upToDate: 'Up to date',
+  available: (v: string) => `Version ${v} is available`,
+  whatsNew: 'What’s new',
+  major: 'A new major version isn’t installed by itself.',
+  skipped: (v: string) => `${v} was undone because the site couldn’t be built.`,
+  /** Followed by the command, in a code block. */
+  needsNpm: 'It needs npm. Run this in the site’s repository:',
+  update: 'Update',
+  tryAgain: 'Try again',
+  waiting: (v: string) => `Updating to ${v}. Waiting for the site to be built.`,
+  undoing: (v: string) => `Undoing the update to ${v}.`,
+  done: (v: string) => `Updated to ${v}`,
+  undone: (v: string) => `The update to ${v} was undone because the site couldn’t be built.`,
+  stuck: (v: string) => `The update to ${v} and its undo couldn’t be built. The site must be fixed by hand.`,
+  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).',
+  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. */
+  notifyDone: (v: string) => `Morpheme was updated to ${v}`,
+  notifyUndone: (v: string) => `The update of Morpheme to ${v} was undone because the site couldn’t be built`,
+  notifyStuck: (v: string) => `Morpheme ${v} couldn’t be built, and neither could its undo. Fix the site by hand.`,
+  commitUpdate: (v: string) => `Update Morpheme to ${v}`,
+  commitUndo: (v: string) => `Undo the update of Morpheme to ${v}`,
+};

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

@@ -134,6 +134,8 @@ export const common = {
     advanced: 'Advanced',
     /** Under Indstillinger: the licences of what the site and the editor are made with (#licenser, Licenses.tsx). */
     licenses: 'Licenses',
+    /** Under Indstillinger: the CMS's version and its updates (#morpheme). */
+    morpheme: 'Morpheme',
   },
   /** Right after a save, with what it changed (savedText in deploy.ts); the site is rebuilt in 1-2 minutes. */
   saved: (change: string) => `${change}. You’ll get a message when the website is updated.`,

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

@@ -6,6 +6,7 @@ import { apps } from './apps';
 import { blocks } from './blocks';
 import { blockSettings } from './blockSettings';
 import { check } from './check';
+import { cms } from './cms';
 import { colors } from './colors';
 import { common } from './common';
 import { company } from './company';
@@ -41,6 +42,7 @@ export const enUS = {
   seo,
   keywords,
   licenses,
+  cms,
   parts,
   history,
   preview,

package/src/registry.tsx

@@ -9,8 +9,8 @@
 // and its look is the theme's (packages/editor/theme/blocks/<type>/, or the theme in use's): View.tsx, which draws its
 // view in the editor (blockViews, from standard/themeBlocks.ts) and on the site. A new folder is a new block, in the editor and on
 // the site; nothing else lists them. The apps (src/apps/<app>/, apps.ts) add blocks the same way, in their folder's
-// blocks/, each with its own View.tsx; they are offered once the app is installed. A theme has no blocks of its own,
-// only the look of the standard ones.
+// blocks/, each with its own View.tsx and viewOf.ts for view.ts (it would differ from View.tsx only in case); they
+// are offered once the app is installed. A theme has no blocks of its own, only the look of the standard ones.
 import type { ReactNode } from 'react';
 import { appIdOf, installedApps } from './apps';
 import { htmlBlock, type BlockData, type BlockDefinition, type BlockProps, type DrawBlock, type SiteBlock } from './blocks';
@@ -60,7 +60,7 @@ export const siteBlocks: SiteBlock[] = [
   ...Object.entries(fromApps).map(([path, m]) =>
     localSiteBlock({
       ...m.default,
-      draw: drawn(appViews[beside(path, 'View.tsx')]?.default, appViewOfs[beside(path, 'view.ts')]?.viewOf),
+      draw: drawn(appViews[beside(path, 'View.tsx')]?.default, appViewOfs[beside(path, 'viewOf.ts')]?.viewOf),
       type: typeOf(path),
       app: appIdOf(path),
     }),

package/src/schema.ts

@@ -264,7 +264,7 @@ export const entryName = (collection: FolderCollection, data: Record<string, unk
 
 /** An app's part of an entry of its kind, drawn in the list's own drawing (a Mailchimp signup in a pop-up's box), on the
  * site and in the editor alike: its drawing (`View`, given its view and the entry's own button to show where it wants)
- * and what makes its view in the editor (`viewOf`, as a block's view.ts). */
+ * and what makes its view in the editor (`viewOf`, in its viewOf.ts, as an app's block). */
 export type KindPart = {
   View: ComponentType<{ view: any; button: ReactNode }>;
   viewOf: (values: Record<string, any>, data: BlockData) => unknown;

package/starter/.prettierignore

@@ -8,4 +8,5 @@ package-lock.json
 src/content
 src/data/**/*.json
 src/apps/*/store.json
+src/themes
 *.md

package/starter/README.md

@@ -9,6 +9,7 @@ Editoren, standardtemaet *Material* og sitets Worker er pakken [`@morphemecms/cm
 
 - `src/site/config.ts`: sitets navn, domæne, sprog og GitHub-repo; resten er pakkens standard (`defineSite`).
 - `src/site/worker.js`: det, Workeren har fra sitet.
+- Hemmeligheden `GITHUB_PUBLISH_TOKEN` (`npx wrangler secret put GITHUB_PUBLISH_TOKEN`) lader Workeren skrive til sitets GitHub-repo, også når den opdaterer CMS'et. Tokenet skal have **Contents: Read and write** og **Checks: Read**.
 - Hemmeligheden `MORPHEME_STORE_KEY` (`npx wrangler secret put MORPHEME_STORE_KEY`) forbinder sitet til Morpheme-butikken; uden den har *Appstore* kun sitets egne apps og temaer.
 - `src/content/`: siderne og indlæggene, `src/data/`: sitets indstillinger, `public/`: billeder, logo og ikoner.
 - `src/themes/` og `src/apps/`: temaer og apps fra appbutikken, når der er installeret nogen.

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.1.0",
+    "@morphemecms/cms": "0.3.0",
     "@phosphor-icons/core": "^2.1.1",
     "@phosphor-icons/react": "^2.1.10",
     "@tailwindcss/typography": "^0.5.20",

package/starter/wrangler.jsonc

@@ -5,7 +5,7 @@
   "$schema": "node_modules/wrangler/config-schema.json",
   "name": "morpheme-site",
   "compatibility_date": "2026-09-01",
-  "compatibility_flags": ["nodejs_compat"],
+  "compatibility_flags": ["nodejs_compat", "global_fetch_strictly_public"], // public fetch: the store is on this account
   "main": "node_modules/@morphemecms/cms/worker/index.js",
   // What the Worker has from this site: its settings and src/site/worker.js (its redirects, apps and contact).
   "alias": { "@site/config": "./src/site/config.ts", "@site/worker": "./src/site/worker.js" },