@morphemecms/cms 0.13.0 → 0.14.0-next-20261107093528

package/src/googleResult.d.mts

@@ -28,5 +28,16 @@ export function searchedAs({ title, front, seoTitle, seoDescription, description
     title: string;
     description: string;
 };
-/** The address line of a Google result: the domain and the path's parts, joined by " › ". */
+/** The address line of a Google result: "https://" and the domain, then the path's parts, joined by " › ". */
 export function searchCrumbs(domain: any, path: any): string;
+/**
+ * Splits `value` into parts so that each occurrence of `keyword` (case-insensitive, literal) is a bold part, as Google
+ * bolds the searched words in a description. The original case is kept. A blank keyword gives one plain part.
+ * @param {string} value
+ * @param {string} [keyword]
+ * @returns {{ text: string; bold: boolean }[]}
+ */
+export function boldParts(value: string, keyword?: string): {
+    text: string;
+    bold: boolean;
+}[];

package/src/googleResult.mjs

@@ -30,10 +30,27 @@ export function searchedAs({ title, front = false, seoTitle, seoDescription, des
   return { title: resultTitle, description: resultDescription };
 }
 
-/** The address line of a Google result: the domain and the path's parts, joined by " › ". */
+/** The address line of a Google result: "https://" and the domain, then the path's parts, joined by " › ". */
 export function searchCrumbs(domain, path) {
   const parts = String(path ?? '')
     .split('/')
     .filter((part) => part !== '');
-  return [domain, ...parts].join(SEPARATOR);
+  return [`https://${domain}`, ...parts].join(SEPARATOR);
+}
+
+/**
+ * Splits `value` into parts so that each occurrence of `keyword` (case-insensitive, literal) is a bold part, as Google
+ * bolds the searched words in a description. The original case is kept. A blank keyword gives one plain part.
+ * @param {string} value
+ * @param {string} [keyword]
+ * @returns {{ text: string; bold: boolean }[]}
+ */
+export function boldParts(value, keyword) {
+  const word = text(keyword);
+  if (!word) return [{ text: value, bold: false }];
+  const pattern = new RegExp(`(${word.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')})`, 'gi');
+  return value
+    .split(pattern)
+    .map((part, i) => ({ text: part, bold: i % 2 === 1 }))
+    .filter((part) => part.text !== '');
 }

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

@@ -3,6 +3,8 @@ import type { Messages } from '../en-US';
 export const apps: Messages['apps'] = {
   installed: 'Installeret',
   notInstalled: 'Ikke installeret',
+  enabled: 'Aktiveret',
+  deactivated: 'Deaktiveret',
   publisher: (name) => `Udvikler: ${name}`,
   screenshots: 'Skærmbilleder',
   about: 'Om appen',
@@ -46,7 +48,7 @@ export const apps: Messages['apps'] = {
   notUsed: 'Bruges ingen steder',
   stuck: 'Appen bruges og kan ikke afinstalleres. Fjern den fra stederne ovenfor først.',
   blocks: 'Blokke',
-  lists: 'Lister',
+  lists: 'Dynamiske lister',
   tabSettings: 'Indstillinger',
   tabInfo: 'Information',
   tabs: 'Appens dele',
@@ -94,6 +96,8 @@ export const apps: Messages['apps'] = {
   commit: {
     install: (app) => `Editor: installer appen ${app}`,
     uninstall: (app) => `Editor: afinstaller appen ${app}`,
+    turnOn: (app) => `Editor: slå appen ${app} til`,
+    turnOff: (app) => `Editor: slå appen ${app} fra`,
     update: (app, version) => `Editor: opdater appen ${app} til ${version}`,
   },
 };

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

@@ -7,6 +7,9 @@ export const cms: Messages['cms'] = {
   upToDate: 'Opdateret',
   available: (v) => `Version ${v} er klar`,
   whatsNew: 'Nyheder',
+  newInYourVersion: 'Nyt i din version',
+  alsoInThisVersion: 'Også i denne version',
+  storeConnection: 'Forbindelse til Appstore',
   major: 'En ny hovedversion installeres ikke af sig selv.',
   skipped: (v) => `Version ${v} blev fortrudt, fordi hjemmesiden ikke kunne opdateres med den.`,
   needsNpm: 'Opdatering kræver npm. Kør dette i hjemmesidens repo:',

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

@@ -91,7 +91,7 @@ export const common: Messages['common'] = {
     company: 'Virksomheden',
     header: 'Header',
     footer: 'Footer',
-    lists: 'Lister',
+    lists: 'Dynamiske lister',
     blocks: 'Blokskabeloner',
     media: 'Filer',
     appearance: 'Udseende',
@@ -110,7 +110,8 @@ export const common: Messages['common'] = {
     redirects: 'Videresendelser',
     account: 'Konto',
     settings: 'Indstillinger',
-    advanced: 'Avanceret',
+    developer: 'Udvikler',
+    caching: 'Caching og builds',
     licenses: 'Licenser',
     morpheme: 'Morpheme',
   },

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

@@ -0,0 +1,26 @@
+// What the editor's footer and its "System status" screen say (EditorFooter.tsx, ServiceStatus.tsx).
+import type { Messages } from '../en-US';
+
+export const footer: Messages['footer'] = {
+  support: 'Support',
+  status: 'Driftsstatus',
+  terms: 'Vilkår',
+  security: 'Rapportér sikkerhedsfejl',
+  privacy: 'Privatlivspolitik',
+  openStatusPage: 'Åbn statusside',
+  loading: 'Tjekker status…',
+  state: {
+    ok: 'Alle systemer virker',
+    minor: 'Nogle systemer er langsomme',
+    major: 'Nogle systemer er nede',
+    unknown: 'Kan ikke tjekke status',
+  },
+  component: {
+    operational: 'Virker',
+    degraded_performance: 'Langsom',
+    under_maintenance: 'Vedligeholdes',
+    partial_outage: 'Delvist nede',
+    major_outage: 'Nede',
+    unknown: 'Kan ikke tjekkes',
+  },
+};

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

@@ -12,6 +12,7 @@ import { common } from './common';
 import { company } from './company';
 import { consents } from './consents';
 import { forms } from './forms';
+import { footer } from './footer';
 import { history } from './history';
 import { keywords } from './keywords';
 import { licenses } from './licenses';
@@ -39,6 +40,7 @@ export const daDK: Messages = {
   colors,
   redirects,
   consents,
+  footer,
   seo,
   keywords,
   licenses,

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

@@ -635,6 +635,11 @@ export const parts: Messages['parts'] = {
       number: 'Antal',
       many: 'Mere end 999',
       onIconButton: 'På en ikonknap',
+      statusTones: 'Statustoner',
+      toneOk: 'Virker',
+      toneMinor: 'Langsom',
+      toneMajor: 'Delvist nede',
+      toneUnknown: 'Kan ikke tjekkes',
       new: 'Nyt',
       count: (n) => `${n} nye`,
       messages: 'Beskeder',

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

@@ -1,4 +1,4 @@
-// "Avanceret" under "Indstillinger" (Advanced.tsx): the faster editor (a copy of the website's files in Cloudflare R2,
+// "Caching and builds" under Developer (Advanced.tsx): the faster editor (a copy of the website's files in Cloudflare R2,
 // r2Caching.ts), and the switches for updating the website (buildSettings.ts).
 export const advanced = {
   r2Caching: 'Faster editor',

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

@@ -5,6 +5,9 @@ import type { AppHook } from '../../../lib/hooks';
 export const apps = {
   installed: 'Installed',
   notInstalled: 'Not installed',
+  /** The switch at the top of an installed app's Settings tab, and its status under its name while it is off. */
+  enabled: 'Enabled',
+  deactivated: 'Deactivated',
   /** Under its name on its page: who made it. */
   publisher: (name: string) => `Developer: ${name}`,
   /** On its page: its pictures (each opening it whole), what it does more fully, what it needs of the site
@@ -70,7 +73,7 @@ export const apps = {
   /** Over the blocks it adds, and the lists it brings ("Priser"); its kinds of the site's lists (a Mailchimp popup)
    * are under the list's name. */
   blocks: 'Blocks',
-  lists: 'Lists',
+  lists: 'Dynamic lists',
   /** The tabs of an installed app's page, in the top bar: its settings, and what it says about itself. */
   tabSettings: 'Settings',
   tabInfo: 'Information',
@@ -140,6 +143,8 @@ export const apps = {
   commit: {
     install: (app: string) => `Editor: install the app ${app}`,
     uninstall: (app: string) => `Editor: uninstall the app ${app}`,
+    turnOn: (app: string) => `Editor: turn on the app ${app}`,
+    turnOff: (app: string) => `Editor: turn off the app ${app}`,
     update: (app: string, version: string) => `Editor: update the app ${app} to ${version}`,
   },
 };

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

@@ -1,5 +1,5 @@
-// "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 notifications and commit messages (worker/cms-update.js).
+// "Morpheme" under "Indstillinger" (the CMS's update page, #morpheme): the running version, the notes of the update just
+// installed, a new one and its notes, and an update's progress; also the notifications and commit messages (worker/cms-update.js).
 
 export const cms = {
   running: (v: string) => `Version ${v}`,
@@ -9,6 +9,9 @@ export const cms = {
   upToDate: 'Up to date',
   available: (v: string) => `Version ${v} is available`,
   whatsNew: 'What’s new',
+  newInYourVersion: 'New in your version',
+  alsoInThisVersion: 'Also in this version',
+  storeConnection: 'Store connection',
   major: 'A new major version isn’t installed by itself.',
   skipped: (v: string) => `Version ${v} was undone because the website couldn’t be updated with it.`,
   /** Followed by the command, in a code block. */

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

@@ -104,7 +104,7 @@ export const common = {
     company: 'Business',
     header: 'Header',
     footer: 'Footer',
-    lists: 'Lists',
+    lists: 'Dynamic lists',
     blocks: 'Block templates',
     media: 'Files',
     /** How the site looks (#appearance, Library.tsx Theme): the theme, the colours, the logo and icon, and the site's own
@@ -125,7 +125,7 @@ export const common = {
     blockSettings: 'Block settings',
     /** The apps that come with the site (AppList.tsx, #apps). */
     apps: 'Apps',
-    /** The parts the editor and the site are built of (#appearance/parts: Parts.tsx, BlockParts.tsx). */
+    /** The parts the editor and the site are built of (#developer/parts: Parts.tsx, BlockParts.tsx). */
     editorParts: 'Parts',
     /** Under Indstillinger: the redirects and the site's own parts (#seo, Library.tsx Seo). */
     seo: 'Search engine optimization',
@@ -133,8 +133,10 @@ export const common = {
     account: 'Account',
     /** The last section of the main drawer, and the first part of the path to a setting (placeOf in site.ts). */
     settings: 'Settings',
-    /** Under Indstillinger: the faster editor (#advanced, Advanced.tsx). */
-    advanced: 'Advanced',
+    /** Under Settings: the developer screens, the parts and the caching (#developer, Library.tsx Developer). */
+    developer: 'Developer',
+    /** Under Developer: the faster editor and the build settings (#developer/caching, Advanced.tsx). */
+    caching: 'Caching and builds',
     /** Under Indstillinger: the licences of what the site and the editor are made with (#licenses, Licenses.tsx). */
     licenses: 'Licenses',
     /** Under Indstillinger: the CMS's version and its updates (#morpheme). */

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

@@ -0,0 +1,24 @@
+// What the editor's footer and its "System status" screen say (EditorFooter.tsx, ServiceStatus.tsx).
+export const footer = {
+  support: 'Support',
+  status: 'System status',
+  terms: 'Terms of use',
+  security: 'Report security issues',
+  privacy: 'Privacy policy',
+  openStatusPage: 'Open status page',
+  loading: 'Checking the status…',
+  state: {
+    ok: 'All systems work',
+    minor: 'Some systems are slow',
+    major: 'Some systems are down',
+    unknown: 'Can’t check the status',
+  },
+  component: {
+    operational: 'Working',
+    degraded_performance: 'Slow',
+    under_maintenance: 'Under maintenance',
+    partial_outage: 'Partly down',
+    major_outage: 'Down',
+    unknown: 'Can’t check',
+  },
+};

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

@@ -12,6 +12,7 @@ import { common } from './common';
 import { company } from './company';
 import { consents } from './consents';
 import { forms } from './forms';
+import { footer } from './footer';
 import { history } from './history';
 import { keywords } from './keywords';
 import { licenses } from './licenses';
@@ -39,6 +40,7 @@ export const enUS = {
   colors,
   redirects,
   consents,
+  footer,
   seo,
   keywords,
   licenses,

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

@@ -1,4 +1,4 @@
-// "Dele" (#appearance/parts): the editor's parts (Parts.tsx), what each is for and the texts in the examples, and the standard
+// "Parts" (#developer/parts): the editor's parts (Parts.tsx), what each is for and the texts in the examples, and the standard
 // blocks and the apps' (BlockParts.tsx), all with the made-up site of examples.ts.
 export const parts = {
   intro: (file: string) =>
@@ -253,7 +253,7 @@ export const parts = {
     /** What a kind of entry an app adds (a pop-up) is drawn with. */
     entry: { name: 'An example', heading: 'A heading', text: 'A short text that tells a little more.' },
   },
-  /** "Dele" › "Værdier" (#appearance/parts/values, Tokens.tsx): the theme's design tokens, each with what it is used for. */
+  /** "Parts" › "Værdier" (#developer/parts/values, Tokens.tsx): the theme's design tokens, each with what it is used for. */
   tokens: {
     intro: 'The theme’s values for corners, shadows, typography, and colors, as the theme sets them.',
     groups: { shape: 'Corners', elevation: 'Shadows', type: 'Typography', color: 'Colors' },
@@ -355,7 +355,7 @@ export const parts = {
     /** A token the theme does not set, with the one it gets instead. */
     from: (token: string, value: string, from: string) => `${token}: ${value} (as ${from})`,
   },
-  /** "Dele" (#appearance/parts) and its screens: the editor's parts, the theme's UI components, the blocks (the standard
+  /** "Parts" (#developer/parts) and its screens: the editor's parts, the theme's UI components, the blocks (the standard
    * ones and the apps') and the lists of kinds ("Promotion"). */
   screens: {
     editor: 'Editor',
@@ -659,6 +659,11 @@ export const parts = {
       number: 'Number',
       many: 'More than 999',
       onIconButton: 'On an icon button',
+      statusTones: 'Status tones',
+      toneOk: 'Working',
+      toneMinor: 'Slow',
+      toneMajor: 'Partly down',
+      toneUnknown: "Can't check",
       new: 'New',
       count: (n: number) => `${n} new`,
       messages: 'Messages',

package/src/menuChildren.ts

@@ -1,27 +1,19 @@
-// The second level of the main menu (MainMenu.tsx, lib/menu.mjs menuTree): the lists under Lists,
-// the parts under Business, the apps installed under Apps and the two lists under Redirects. Exposes childrenOf.
-// Uses site.ts (collections, apps, companyParts), Library.tsx (hrefOf, listsShown) and Redirects.tsx (TAB_ROUTES).
-import { installedApps } from './apps';
+// The second level of the main menu (MainMenu.tsx, lib/menu.mjs menuTree): the parts under Business,
+// the active apps (installed, not turned off) under Apps and the two lists under Redirects. Exposes childrenOf.
+// Uses site.ts (apps, companyParts), apps.ts (activeApps) and Redirects.tsx (TAB_ROUTES).
+import { activeApps } from './apps';
 import { t } from './i18n';
-import { hrefOf } from './Library';
 import { TAB_ROUTES } from './Redirects';
 import type { RepoFile } from './github';
-import { apps, collections, companyParts, listsShown } from './site';
+import { apps, companyParts } from './site';
 
 export type MenuChild = { id: string; label: string; href: string };
 
-const listOf = (ids: string[]): MenuChild[] =>
-  ids.flatMap((id) => {
-    const c = collections.find((x) => x.id === id);
-    return c ? [{ id, label: c.label, href: hrefOf(c) }] : [];
-  });
-
 /** The sub-items of a menu item, in their order: none for most. */
 export function childrenOf(id: string, files: RepoFile[]): MenuChild[] {
-  if (id === 'lists') return listOf(listsShown(files));
   if (id === 'company') return companyParts.map((p) => ({ id: p.id, label: p.label, href: `#company/${p.id}` }));
   if (id === 'apps') {
-    const installed = installedApps(files);
+    const installed = activeApps(files);
     return apps.filter((a) => installed.includes(a.id)).map((a) => ({ id: a.id, label: a.label, href: `#apps/${a.id}` }));
   }
   if (id === 'redirects') {

package/src/movedRoutes.mjs

@@ -6,12 +6,14 @@ export const MOVED = /** @type {Record<string, string>} */ ({
   farver: 'appearance/colors',
   'virksomheden/logo': 'company/logo',
   'tema/blokvalg': 'block-settings',
-  dele: 'appearance/parts',
+  dele: 'developer/parts',
   tema: 'appearance',
   'tema/farver': 'appearance/colors',
   'tema/logo': 'company/logo',
-  'tema/dele': 'appearance/parts',
-  'tema/dele/editor': 'appearance/parts/editor',
+  'tema/dele': 'developer/parts',
+  'tema/dele/editor': 'developer/parts/editor',
+  // "Advanced" is "Caching and builds" under "Developer" now.
+  advanced: 'developer/caching',
   'virksomheden/bank': 'company/payment/bank',
   videresendelser: 'seo/redirects',
   'videresendelser/alle': 'seo/redirects/all',
@@ -50,10 +52,12 @@ export const RENAMED = /** @type {Record<string, string>} */ ({
   'udseende/sidekolonne': 'appearance/side-column',
   'udseende/farver': 'appearance/colors',
   'udseende/farver/reservefarver': 'appearance/colors/fallback-colors',
-  'udseende/dele': 'appearance/parts',
-  'udseende/dele/blokke': 'appearance/parts/blocks',
-  'udseende/dele/liste': 'appearance/parts/list',
-  'udseende/dele/vaerdier': 'appearance/parts/values',
+  // "Parts" moved from Appearance to Developer, with all its screens.
+  'appearance/parts': 'developer/parts',
+  'udseende/dele': 'developer/parts',
+  'udseende/dele/blokke': 'developer/parts/blocks',
+  'udseende/dele/liste': 'developer/parts/list',
+  'udseende/dele/vaerdier': 'developer/parts/values',
   'udseende/standardsider': 'appearance/default-pages',
   maaling: 'analytics',
   privatliv: 'privacy',
@@ -85,7 +89,7 @@ export const RENAMED = /** @type {Record<string, string>} */ ({
   'seo/interne-links': 'seo/internal-links',
   'seo/vurdering': 'seo/rating',
   blokvalg: 'block-settings',
-  avanceret: 'advanced',
+  avanceret: 'developer/caching',
   licenser: 'licenses',
   konto: 'account',
   notifikationer: 'notifications',

package/src/movedRoutes.test.mjs

@@ -31,9 +31,9 @@ test('the extra moves come first', () => {
 });
 
 test('only the old prefix of an address is renamed, the rest stays', () => {
-  const renamed = { indstillinger: 'settings', 'udseende/dele': 'appearance/parts', liste: 'list' };
+  const renamed = { indstillinger: 'settings', 'udseende/dele': 'developer/parts', liste: 'list' };
   assert.equal(movedRoute('indstillinger/appstore', {}, renamed), 'settings/appstore');
-  assert.equal(movedRoute('udseende/dele/liste/kontakt', {}, renamed), 'appearance/parts/liste/kontakt');
+  assert.equal(movedRoute('udseende/dele/liste/kontakt', {}, renamed), 'developer/parts/liste/kontakt');
 });
 
 test('a key segment * matches any one segment and keeps it', () => {
@@ -51,7 +51,7 @@ test('data inside an address is not renamed', () => {
 test('old prefixes are renamed, the data after them stays', () => {
   assert.equal(movedRoute('filer/filer/doc.pdf'), 'files/filer/doc.pdf');
   assert.equal(movedRoute('liste/temaer'), 'list/temaer');
-  assert.equal(movedRoute('udseende/dele/liste/kontakt'), 'appearance/parts/list/kontakt');
+  assert.equal(movedRoute('udseende/dele/liste/kontakt'), 'developer/parts/list/kontakt');
   assert.equal(movedRoute('indstillinger/appstore'), 'settings/appstore');
   assert.equal(movedRoute('udseende/farver'), 'appearance/colors');
 });
@@ -71,10 +71,13 @@ test('every old route prefix opens the screen where it is now', () => {
     'udseende/bevaegelse': 'appearance/motion',
     'udseende/sidekolonne': 'appearance/side-column',
     'udseende/farver/reservefarver': 'appearance/colors/fallback-colors',
-    'udseende/dele': 'appearance/parts',
-    'udseende/dele/editor': 'appearance/parts/editor',
-    'udseende/dele/blokke': 'appearance/parts/blocks',
-    'udseende/dele/vaerdier': 'appearance/parts/values',
+    'udseende/dele': 'developer/parts',
+    'udseende/dele/editor': 'developer/parts/editor',
+    'udseende/dele/blokke': 'developer/parts/blocks',
+    'udseende/dele/vaerdier': 'developer/parts/values',
+    'appearance/parts': 'developer/parts',
+    'appearance/parts/list/x': 'developer/parts/list/x',
+    advanced: 'developer/caching',
     'udseende/standardsider': 'appearance/default-pages',
     'udseende/logo': 'company/logo',
     maaling: 'analytics',
@@ -112,7 +115,7 @@ test('every old route prefix opens the screen where it is now', () => {
     'seo/interne-links': 'seo/internal-links',
     'seo/vurdering': 'seo/rating',
     blokvalg: 'block-settings',
-    avanceret: 'advanced',
+    avanceret: 'developer/caching',
     licenser: 'licenses',
     konto: 'account',
     notifikationer: 'notifications',
@@ -139,12 +142,12 @@ test('the old colours route opens the colours screen under Appearance', () => {
 });
 
 test('an old parts route keeps a list id and opens at its English route', () => {
-  assert.equal(movedRoute('udseende/dele/liste/kontakt'), 'appearance/parts/list/kontakt');
+  assert.equal(movedRoute('udseende/dele/liste/kontakt'), 'developer/parts/list/kontakt');
 });
 
 test('the old theme routes open the screens under Appearance', () => {
   assert.equal(movedRoute('tema'), 'appearance');
-  assert.equal(movedRoute('tema/dele/editor'), 'appearance/parts/editor');
+  assert.equal(movedRoute('tema/dele/editor'), 'developer/parts/editor');
 });
 
 test('the old booking and newsletter settings open the apps by their permanent ids', () => {

package/src/r2Caching.ts

@@ -1,6 +1,6 @@
 // Also here: planStatus, whether the account has Workers Paid (/api/plan, packages/editor/worker/plan-status.js), asked for "Betalt bygning".
 // R2 caching: the Worker's copy of the site's files in R2 (packages/editor/worker/files.js), turned on and off under "Indstillinger" ›
-// "Avanceret" (Advanced.tsx). It is the line of its bucket (`"r2_buckets": …`, the binding FILES) in the Worker's settings
+// "Caching and builds" (Advanced.tsx). It is the line of its bucket (`"r2_buckets": …`, the binding FILES) in the Worker's settings
 // (config.wrangler): there when it is on, there as a comment ("// …") when it is off, so a deploy never asks for a bucket
 // Cloudflare does not have. Changed as text, so the file's comments stay. It can only be turned on when the Worker says
 // Cloudflare has the bucket (/api/r2, packages/editor/worker/r2-status.js). Where the bucket is kept ("Placering"): placed by Cloudflare,

package/src/registry.tsx

@@ -12,7 +12,7 @@
 // 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 { activeApps, appIdOf } from './apps';
 import { htmlBlock, type BlockData, type BlockDefinition, type BlockProps, type DrawBlock, type SiteBlock } from './blocks';
 import { check, templateProblems } from './check';
 import { slugOf, type Field, type Lead, type Template } from './schema';
@@ -82,7 +82,7 @@ export function offBlocks(files: { path: string; text: string }[]): string[] {
 /** The blocks not offered to put in, and that a new page does not start with: those turned off, and
  * those of the apps not installed (AppList.tsx). */
 export function notOffered(files: { path: string; text: string }[]): string[] {
-  const installed = installedApps(files);
+  const installed = activeApps(files);
   return [...offBlocks(files), ...siteBlocks.filter((b) => b.app && !installed.includes(b.app)).map((b) => b.type)];
 }
 

package/src/schema.ts

@@ -285,7 +285,7 @@ export type KindPart = {
 /** A list a standard block or an app brings ("Udtalelser", "Priser"), as the site's own, with its icon under "Lister". */
 export type OwnedList = FolderCollection & {
   icon: Icon;
-  /** Made-up rows, as the files have them, for the parts under "Dele" and an app's pictures for the store (examples.ts). */
+  /** Made-up rows, as the files have them, for the parts under "Parts" and an app's pictures for the store (examples.ts). */
   examples?: Record<string, unknown>[];
 };
 

package/src/site.ts

@@ -5,7 +5,7 @@
 // collection, a file, a part or a block as the site wrote it.
 import * as site from '@site/editor';
 import type { ColorPair } from '../lib/colors';
-import { appIdOf, installedApps, withKinds, type AppDefinition, type AppList, type SiteApp } from './apps';
+import { activeApps, appIdOf, withKinds, type AppDefinition, type AppList, type SiteApp } from './apps';
 import { appBlocks, appFiles, appFolders, appPictures, appShared, appStores } from './appFiles';
 import type { BlockDefinition, SiteBlock } from './blocks';
 import type { ListRows } from './fields';
@@ -345,7 +345,7 @@ export const lists = [...site.lists, ...ownedLists.map((l) => l.id)];
 /** The lists under "Lister" now: the site's, the standard blocks' and those of the apps installed, without the cookie
  * list, which is a row under "Privatliv" (privacy.ts). */
 export const listsShown = (files: { path: string; text: string }[]) => {
-  const installed = installedApps(files);
+  const installed = activeApps(files);
   return [...site.lists, ...[...standardLists, ...listsOf(writtenApps.filter((a) => installed.includes(a.id)))].map((l) => l.id)].filter(
     (id) => id !== site.config.lists.cookies,
   );

package/src/statusReport.ts

@@ -0,0 +1,24 @@
+// The status of GitHub and Cloudflare, as the Worker says (/api/status, worker/service-status.js): what the editor's footer
+// and its "System status" screen (ServiceStatus.tsx) show. Exposes serviceStatus. The types are in lib/serviceStatus.mjs.
+// The last finished report is kept for a minute (a value, never a pending promise), so a navigation does not ask again.
+import type { StatusReport } from '../lib/serviceStatus.mjs';
+
+const KEEP_MS = 60_000;
+// A slow Worker must not hold the dot or the status screen: after this the report is null (unknown).
+const TIMEOUT_MS = 5000;
+let kept: { report: StatusReport; at: number } | null = null;
+
+/** The report, or null when it can't be fetched (no session, not JSON, offline, no answer in 5 seconds). A report less than a minute old is
+ * reused unless `fresh`; a failure or a timeout is not kept. */
+export async function serviceStatus({ fresh = false }: { fresh?: boolean } = {}): Promise<StatusReport | null> {
+  if (!fresh && kept && Date.now() - kept.at < KEEP_MS) return kept.report;
+  try {
+    const res = await fetch('/api/status', { cache: 'no-store', signal: AbortSignal.timeout(TIMEOUT_MS) });
+    if (!res.ok || !res.headers.get('content-type')?.includes('application/json')) return null;
+    const report = (await res.json()) as StatusReport;
+    kept = { report, at: Date.now() };
+    return report;
+  } catch {
+    return null;
+  }
+}

package/src/store.ts

@@ -29,6 +29,7 @@ import type { StoreLicenses } from './licenseData';
 import { APP_API, THEME_API } from '../lib/contracts.mjs';
 import { RECORD, STANDARD, isText, validApp, validTheme } from '../lib/storeEntries.mjs';
 import { timedFetch } from './storeFetch';
+import { appChanges as appChangesIn } from '../lib/appChanges.mjs';
 import { folderChanges } from '../lib/folderChanges.mjs';
 
 // The contracts this editor runs (lib/contracts.mjs, also read by the site's Worker).
@@ -425,20 +426,15 @@ export function themeChanges(
 }
 
 /** The changes that make an app's folder in the site (`current`, its files now) the store's version, with the note of
- * where it came from, or remove it (`next` null: uninstalling); and the site's file of apps with it among those
- * installed or not (`installed`: their ids now, `file`: the file). In one commit. */
+ * where it came from, or remove it (`next` null: uninstalling); and the site's file of apps (`file`) with it among those
+ * installed or not, an update keeping it turned off (lib/appChanges.mjs). In one commit. */
 export function appChanges(
   id: string,
   current: RepoFile[],
   next: { files: { path: string; content: string | Uint8Array }[]; record: StoreRecord } | null,
-  installed: string[],
   file: RepoFile | undefined,
 ): Change[] {
-  const changes = folderChanges(appFolder(id), current, next);
-  const ids = [...new Set(installed.filter((x) => x !== id).concat(next ? [id] : []))].sort();
-  const text = `${JSON.stringify({ installed: ids }, null, 2)}\n`;
-  if (text !== file?.text) changes.push({ path: config.apps.installed, content: text, oid: file?.oid || null });
-  return changes;
+  return appChangesIn(appFolder(id), config.apps.installed, id, current, next, file);
 }
 
 /** The note in an app's (or a theme's) folder of where it came from (store.json), from its files now (`current`). */