@morphemecms/cms 0.11.0 → 0.13.0-next-20261106203613

package/scripts/app-screenshots.mjs

@@ -17,6 +17,7 @@ import { chromium } from 'playwright';
 import { createServer } from 'vite';
 import { aliases, themePlugin } from '@morphemecms/cms/site/theme.mjs';
 import { appFoldersPlugin } from '@morphemecms/cms/lib/apps.mjs';
+import { appSelf } from '@morphemecms/cms/site/appSelf.mjs';
 import { binOf } from './bin.mjs';
 import { openEditor, serveBuilt } from './built-site.mjs';
 
@@ -30,13 +31,13 @@ const BLUE = { source: '#1a73e8', variant: 'tonalSpot', contrast: 'standard' };
 const ids = process.argv.length > 2 ? process.argv.slice(2) : readdirSync(APPS).filter((id) => existsSync(join(APPS, id, 'index.ts')));
 
 // The pictures each app picks, read as store-release.mjs does, in their order. `part`: its drawing under "Dele" ›
-// "Blokke" or the list's screen (`parts`: #udseende/dele/blokke, #udseende/dele/liste/<list>) by the part's name; `editor`: a screen of the editor (`at`: from the top of what is
+// "Blokke" or the list's screen (`parts`: #appearance/parts/blocks, #appearance/parts/list/<list>) by the part's name; `editor`: a screen of the editor (`at`: from the top of what is
 // there). And each app's settings as the pictures show them: those it starts with, and the made-up ones of its picture.
 const vite = await createServer({
   configFile: false,
   logLevel: 'error',
   appType: 'custom',
-  plugins: [themePlugin(), appFoldersPlugin(ROOT)],
+  plugins: [themePlugin(), appFoldersPlugin(ROOT), appSelf()],
   resolve: { alias: aliases() },
   server: { middlewareMode: true, hmr: false, ws: false },
 });
@@ -61,20 +62,20 @@ try {
       if (what === 'blok')
         shots[id].push({
           name,
-          parts: 'blokke',
+          parts: 'blocks',
           part: (await load(`/src/apps/${id}/blocks/${key}/index.tsx`)).default.label,
         });
       else if (what === 'slags') {
         const kind = app.kinds[key];
         const variant = kind.variants?.[Number(n)];
-        shots[id].push({ name, parts: `liste/${key}`, part: variant ? `${kind.label} · ${variant.label}` : kind.label });
-      } else if (what === 'liste') shots[id].push({ name, editor: `liste/${key}` });
+        shots[id].push({ name, parts: `list/${key}`, part: variant ? `${kind.label} · ${variant.label}` : kind.label });
+      } else if (what === 'liste') shots[id].push({ name, editor: `list/${key}` });
       else if (what === 'indstillinger') {
         // Where they are, as settingsRoute in AppList.tsx: on the screen or the part of "Virksomheden" with its kind.
         const home = app.category && partScreens.find((s) => s.apps?.includes(app.category));
         const company = app.category && companyParts.find((p) => p.parts && p.apps?.includes(app.category));
-        const at = home ? home.id : company ? `virksomheden/${company.id}` : `apps/${id}`;
-        shots[id].push({ name, editor: `${at}/${home || company ? id : 'indstillinger'}` });
+        const at = home ? home.id : company ? `company/${company.id}` : `apps/${id}`;
+        shots[id].push({ name, editor: `${at}/${home || company ? id : 'settings'}` });
         Object.assign(settings[id], shot.values);
       } else shots[id].push({ name, editor: `apps/${id}`, at: `[data-app-page="${id}"]` });
     }
@@ -135,7 +136,7 @@ try {
     for (const [i, shot] of shots[id].entries()) {
       const options = { path: join(folder, shot.name), type: 'jpeg', quality: 80 };
       if (shot.part) {
-        await go(`udseende/dele/${shot.parts}`);
+        await go(`appearance/parts/${shot.parts}`);
         // Tall enough for the whole drawing, under the screen's top bar.
         await editor.setViewportSize({ width: phone.width, height: 1600 });
         const drawing = editor.locator(`section[data-part="${shot.part}"] > :last-child`).first();

package/scripts/check-content.mjs

@@ -5,7 +5,7 @@
 // the system's icon packs and the choice of one (iconPackProblems), and so an icon the site or the editor draws that a
 // pack has none for, and the choice of motion scheme (motionProblems), and names in a folder that differ only in case
 // (casingProblems). Says too which of the site's texts the
-// editor has no translation of (@site/texts, a block's texts.ts); that does not stop the build. The editor's
+// editor has no translation of (@site/texts, a block's texts.ts); that does not stop the build, but a standard part's text with no Danish (defaults/i18n/da-DK/) does. The editor's
 // code is TypeScript and TSX, so it is loaded with Vite, as the site's own build does. Exits early, without checking, when
 // MORPHEME_CONTENT_CHECKED names the commit being built (morpheme ci-build already ran it; already-checked.mjs).
 import { execFileSync } from 'node:child_process';
@@ -25,6 +25,7 @@ import {
   themeProblems,
 } from '@morphemecms/cms/site/theme.mjs';
 import { appFoldersPlugin, appIds, appWorkersProblems } from '@morphemecms/cms/lib/apps.mjs';
+import { appSelf } from '@morphemecms/cms/site/appSelf.mjs';
 import { caseCollisionProblems } from '@morphemecms/cms/lib/caseCollisions.mjs';
 import { codePackageProblems, declarationProblems, ownerId } from '@morphemecms/cms/lib/licenses.mjs';
 import { breakpointProblems } from '@morphemecms/cms/site/breakpoints.mjs';
@@ -70,7 +71,7 @@ const server = await createServer({
   logLevel: 'error',
   appType: 'custom',
   // As in packages/editor/astro.mjs: the editor takes the site from src/site/ as @site, and the theme in use as @theme.
-  plugins: [themePlugin(), appFoldersPlugin(process.cwd())],
+  plugins: [themePlugin(), appFoldersPlugin(process.cwd()), appSelf()],
   resolve: { alias: aliases() },
   server: { middlewareMode: true, hmr: false, ws: false },
 });
@@ -122,6 +123,15 @@ try {
 
 for (const [locale, files] of Object.entries(missing)) {
   for (const [file, texts] of Object.entries(files)) {
+    // A standard part's text with no translation stops the check; the site's own only warns.
+    if (file.startsWith('defaults/i18n/')) {
+      result.problems.push(
+        ...texts.map(
+          (text) => `${file}: standardteksten ${JSON.stringify(text)} mangler på ${locale}. Skriv den i defaults/i18n/${locale}/.`,
+        ),
+      );
+      continue;
+    }
     console.warn(`\nEditoren viser ${texts.length} af sitets tekster uoversat på ${locale}. Skriv dem i ${file}:\n`);
     for (const text of texts) console.warn(`  ${JSON.stringify(text)}`);
   }

package/scripts/check-language.mjs

@@ -13,7 +13,6 @@ const PENDING = [
   'AGENTS.md',
   'README.md',
   'astro.mjs',
-  'defaults/',
   'demo/',
   'lib/',
   'pages/',

package/scripts/check-site-types.mjs

@@ -0,0 +1,26 @@
+// Type-checks the package's whole TS source in the demo site, with the site's own tsc, as a site that has it from npm does.
+// Run by `npm run check:site-types`, after the build (.morpheme/demo/site, node_modules/@morphemecms/cms). Wiring only.
+import { execFileSync } from 'node:child_process';
+import { rmSync, writeFileSync } from 'node:fs';
+import { join, relative } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { binOf } from './bin.mjs';
+import { siteTypesConfig } from './site-types.mjs';
+
+const root = fileURLToPath(new URL('../', import.meta.url));
+const site = join(root, '.morpheme/demo/site');
+const config = join(site, 'tsconfig.package.json');
+const packageDir = relative(site, join(root, 'node_modules/@morphemecms/cms')).replaceAll('\\', '/');
+
+writeFileSync(config, JSON.stringify(siteTypesConfig(packageDir), null, 2));
+try {
+  execFileSync(process.execPath, [binOf('typescript', 'tsc', site), '--noEmit', '-p', 'tsconfig.package.json'], {
+    cwd: site,
+    stdio: 'inherit',
+  });
+} catch (error) {
+  console.error('The package source does not type-check as a site type-checks it: sites will fail the same way.');
+  process.exitCode = error.status ?? 1;
+} finally {
+  rmSync(config, { force: true });
+}

package/scripts/editor-screens.mjs

@@ -4,7 +4,7 @@
 // packages/editor/src/icon.tsx), there or on one of the built site's pages. An icon drawn from Material Symbols instead
 // of the icon pack (data-icon-fallback) is only listed, with where it is: it does not fail.
 // The screens are found as the editor's own links: from the start screen (the drawer's links are in the page also while it is
-// closed) and "Dele", #udseende/dele, "Temaer", #udseende/temaer, "Søgemaskineoptimering", #seo, "Appstore", #indstillinger/appstore, and "Apps", #apps, which the menu no longer links to), and
+// closed) and "Dele", #appearance/parts, "Temaer", #appearance/themes, "Søgemaskineoptimering", #seo, "Appstore", #settings/appstore, and "Apps", #apps, which the menu no longer links to), and
 // from each screen it opens, two steps down. GitHub is answered from the files in this repository, so it needs no login
 // and changes nothing. It runs on the built site: npm run build && npm run check:screens (or on another
 // folder with a built site, its path after the command: packages/editor/scripts/check-themes.mjs).
@@ -71,7 +71,7 @@ for (const [width, height] of [
   // From the start screen (the drawer's links), and from "Dele", "Temaer", "Søgemaskineoptimering" and "Appstore"
   // (the apps' pages and their developers'), whose screens are a step further down than the others. "Apps" (the list of
   // the apps installed) has no row in the menu, so it is a start of its own.
-  const starts = ['', 'udseende/dele', 'udseende/temaer', 'seo', 'indstillinger/appstore', 'apps'];
+  const starts = ['', 'appearance/parts', 'appearance/themes', 'seo', 'settings/appstore', 'apps'];
   const seen = new Set(starts);
   let next = starts;
   for (let depth = 0; depth <= 2 && next.length; depth++) {
@@ -117,7 +117,7 @@ for (const [state, { shows, hides }] of Object.entries(keyStates)) {
   const page = await browser.newPage({ viewport: { width: 390, height: 844 }, locale: 'da-DK' });
   page.on('pageerror', (e) => problems.push(`Appstore (${state}): ${e.message}`));
   await openEditor(page, site, {}, state);
-  await page.evaluate(() => (location.hash = 'indstillinger/appstore'));
+  await page.evaluate(() => (location.hash = 'settings/appstore'));
   await page.waitForTimeout(500);
   const text = await page.evaluate(() => document.body.innerText);
   for (const x of shows) if (!text.includes(x)) problems.push(`Appstore (${state}): "${x}" mangler`);

package/scripts/site-types.mjs

@@ -0,0 +1,14 @@
+// The tsconfig of the site-style type check (check-site-types.mjs): the demo site's own, plus the package's whole TS source.
+// Exposes siteTypesConfig(packageDir). No dependencies.
+
+const DIRS = ['src', 'site', 'lib', 'defaults', 'theme'];
+
+/**
+ * @param {string} packageDir the package's folder, relative to the site, with forward slashes
+ * @returns {{ extends: string, include: string[], exclude: string[] }}
+ */
+export const siteTypesConfig = (packageDir) => ({
+  extends: './tsconfig.json',
+  include: ['.astro/types.d.ts', '**/*', ...DIRS.flatMap((dir) => [`${packageDir}/${dir}/**/*.ts`, `${packageDir}/${dir}/**/*.tsx`])],
+  exclude: ['dist', `${packageDir}/**/*.test.*`],
+});

package/scripts/site-types.test.mjs

@@ -0,0 +1,21 @@
+// Tests siteTypesConfig (site-types.mjs): the tsconfig that type-checks the package's source as a site does.
+import assert from 'node:assert/strict';
+import { test } from 'node:test';
+import { siteTypesConfig } from './site-types.mjs';
+
+const PACKAGE = '../../../node_modules/@morphemecms/cms';
+const config = siteTypesConfig(PACKAGE);
+
+test('extends the site tsconfig', () => {
+  assert.equal(config.extends, './tsconfig.json');
+});
+
+test('includes the site first, then the package source', () => {
+  assert.deepEqual(config.include.slice(0, 2), ['.astro/types.d.ts', '**/*']);
+  assert.ok(config.include.includes(`${PACKAGE}/src/**/*.tsx`));
+  assert.ok(config.include.includes(`${PACKAGE}/lib/**/*.ts`));
+});
+
+test('excludes dist and the package tests', () => {
+  assert.deepEqual(config.exclude, ['dist', `${PACKAGE}/**/*.test.*`]);
+});

package/site/activeTheme.test.mjs

@@ -0,0 +1,52 @@
+// Tests of activeTheme and installedThemes (site/theme.mjs) with permanent theme ids.
+// Run with `node --test site/activeTheme.test.mjs`; the site's root is the working directory, set before the import.
+import { strict as assert } from 'node:assert';
+import { mkdirSync, mkdtempSync, writeFileSync } from 'node:fs';
+import { registerHooks } from 'node:module';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { test } from 'node:test';
+
+const PACKAGE = '@morphemecms/cms/';
+const pkg = new URL('../', import.meta.url);
+registerHooks({
+  resolve: (specifier, context, next) =>
+    specifier.startsWith(PACKAGE) ? next(new URL(specifier.slice(PACKAGE.length), pkg).href, context) : next(specifier, context),
+});
+
+const site = mkdtempSync(join(tmpdir(), 'site-'));
+const theme = (name) => {
+  mkdirSync(join(site, 'src/themes', name), { recursive: true });
+  writeFileSync(join(site, 'src/themes', name, 'theme.json'), '{}');
+};
+const choose = (value) => {
+  mkdirSync(join(site, 'src/data'), { recursive: true });
+  writeFileSync(join(site, 'src/data/theme.json'), JSON.stringify({ theme: value }));
+};
+theme('theme_fa395ad84690acbd');
+theme('own-theme');
+process.chdir(site);
+const { activeTheme, installedThemes } = await import('./theme.mjs');
+
+test('a permanent theme id is accepted', () => {
+  choose('theme_fa395ad84690acbd');
+  assert.equal(activeTheme(), 'theme_fa395ad84690acbd');
+});
+
+test('the standard theme and a site-own theme are accepted', () => {
+  choose('saturn');
+  assert.equal(activeTheme(), 'saturn');
+  choose('own-theme');
+  assert.equal(activeTheme(), 'own-theme');
+});
+
+test('a theme id that is not a store id stops the build', () => {
+  choose('theme_xyz');
+  assert.throws(() => activeTheme(), /theme_xyz/);
+});
+
+test('a theme folder that looks like a store id but is not one stops the build, naming the folder', () => {
+  assert.deepEqual(installedThemes(), ['saturn', 'own-theme', 'theme_fa395ad84690acbd']);
+  theme('theme_xyz');
+  assert.throws(() => installedThemes(), /src\/themes\/theme_xyz/);
+});

package/site/appSelf.d.mts

@@ -0,0 +1,2 @@
+/** @returns {import('vite').Plugin} */
+export function appSelf(): import("vite").Plugin;

package/site/appSelf.mjs

@@ -0,0 +1,23 @@
+// The Vite plugin behind `import self from '@app/self'` (app contract 3): the id of the app whose folder the importing
+// file is in. Exposes appSelf. Depends on appIdOf (lib/appId.mjs).
+import { appIdOf } from '../lib/appId.mjs';
+
+const SELF = '@app/self';
+const PREFIX = '\0app-self:';
+
+/** @returns {import('vite').Plugin} */
+export function appSelf() {
+  return {
+    name: 'app-self',
+    enforce: 'pre',
+    resolveId(source, importer) {
+      if (source !== SELF) return null;
+      const path = (importer ?? '').split('?')[0].replaceAll('\\', '/');
+      if (!/\/src\/apps\/[^/]+\//.test(path)) throw new Error(`${SELF} is only for app files: ${path}`);
+      return PREFIX + appIdOf(path);
+    },
+    load(id) {
+      return id.startsWith(PREFIX) ? `export default { id: ${JSON.stringify(id.slice(PREFIX.length)).replaceAll('"', "'")} };` : null;
+    },
+  };
+}

package/site/appSelf.test.mjs

@@ -0,0 +1,35 @@
+// Tests for the @app/self Vite plugin (site/appSelf.mjs): the id an app file gets, and the error outside apps.
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { appSelf } from './appSelf.mjs';
+
+/** The module text the plugin makes for `@app/self` imported from `importer`. */
+const moduleFor = (importer) => {
+  const plugin = appSelf();
+  const id = plugin.resolveId('@app/self', importer);
+  return plugin.load(id);
+};
+
+test('gives a store id', () => {
+  assert.equal(moduleFor('/x/src/apps/app_a030dfba69793996/link.ts'), "export default { id: 'app_a030dfba69793996' };");
+});
+
+test('gives a plain folder name', () => {
+  assert.equal(moduleFor('/x/src/apps/cookiescanner/worker.js'), "export default { id: 'cookiescanner' };");
+});
+
+test('gives the app of a nested file', () => {
+  assert.equal(moduleFor('/x/src/apps/mobilepay/blocks/mobilepay/load.ts'), "export default { id: 'mobilepay' };");
+});
+
+test('throws outside an app, with the path', () => {
+  assert.throws(() => moduleFor('/x/src/themes/saturn/a.ts'), /@app\/self is only for app files: \/x\/src\/themes\/saturn\/a\.ts/);
+});
+
+test('gives the same id for a Windows path', () => {
+  assert.equal(moduleFor(String.raw`C:\x\src\apps\app_a030dfba69793996\link.ts`), moduleFor('/x/src/apps/app_a030dfba69793996/link.ts'));
+});
+
+test('ignores other imports', () => {
+  assert.equal(appSelf().resolveId('react', '/x/src/apps/a/b.ts'), null);
+});

package/site/content.ts

@@ -1,14 +1,17 @@
+// The site's content collections (pages and blog posts): their status, paths, headings, and a page's text without its H1.
+// Exposes getPages, getPosts, pageHeading, pageHeadingHtml, withoutH1 and h1SectionColor. Depends on astro:content and lib/.
 import { getCollection, type CollectionEntry } from 'astro:content';
 import { categories, isBlogCategory } from './categories';
 import { displayTitle } from './text';
 import { isPreview } from './noindex.mjs';
 import { stateOf } from '@morphemecms/cms/lib/status.mjs';
 import { pageH1 } from '@morphemecms/cms/src/sections.mjs';
-import { withoutH1 } from '@morphemecms/cms/lib/without-h1.mjs';
+import { h1SectionColor, withoutH1 } from '@morphemecms/cms/lib/without-h1.mjs';
 
 // From text.ts, which the editor uses too (it has no content collections).
 export { displayTitle, openingText } from './text';
-export { stateOf, withoutH1 };
+// withoutH1 and h1SectionColor: a page's text without its H1 (and its marker), and the colour of the H1's section (PageLayout.astro).
+export { h1SectionColor, stateOf, withoutH1 };
 
 export type Post = CollectionEntry<'blog'>;
 // Every page has a path: its own, or /<file name>/ for pages created in the editor.

package/site/defineSite.mjs

@@ -99,10 +99,10 @@ const STANDARD = {
   menu: 'src/data/menu.json',
   /** Addresses of the site that are not pages, which a new page or post cannot have. */
   reserved: ['/editor/', '/admin/', '/oauth/', '/images/', '/filer/', '/ny/', '/404/'],
-  /** The lists the standard blocks use, by what they hold, and their ids (their addresses, #liste/<id>): the
+  /** The lists the standard blocks use, by what they hold, and their ids (their addresses, #list/<id>): the
    * testimonials, the list the block "Udtalelser" brings (src/standard/testimonials/list.ts), the tags, which a
    * testimonial's "Opret et tag" makes a new one of, and the cookies, the list the block "Cookieliste" brings. */
-  lists: { testimonials: 'udtalelser', tags: 'kategorier', cookies: 'cookies' },
+  lists: { testimonials: 'testimonials', tags: 'tags', cookies: 'cookies' },
   /** The folder of the site's cookie list, "Cookies" under "Lister" (the standard block "Cookieliste",
    * src/standard/cookies/list.ts): a file per cookie, those an app sets added when it is installed and taken out when it
    * is uninstalled (src/cookieList.ts). */

package/site/schema.ts

@@ -131,7 +131,7 @@ export function webPage({
       isPartOf: { '@id': ids.website },
       about: { '@id': ids.business },
       ...(image ? { primaryImageOfPage: abs(image) } : {}),
-      ...(trail.length ? { breadcrumb: { '@id': `${url}#broedkrummer` } } : {}),
+      ...(trail.length ? { breadcrumb: { '@id': `${url}#breadcrumbs` } } : {}),
       ...(questions.length
         ? {
             mainEntity: questions.map((q) => ({
@@ -146,7 +146,7 @@ export function webPage({
       ? [
           {
             '@type': 'BreadcrumbList',
-            '@id': `${url}#broedkrummer`,
+            '@id': `${url}#breadcrumbs`,
             itemListElement: trail.map((c, i) => ({ '@type': 'ListItem', position: i + 1, name: c.name, item: abs(c.href) })),
           },
         ]
@@ -175,7 +175,7 @@ export function blogPosting({
   const url = abs(path);
   return {
     '@type': 'BlogPosting',
-    '@id': `${url}#indlaeg`,
+    '@id': `${url}#post`,
     headline: title,
     description,
     datePublished: date.toISOString(),

package/site/siteModules.mjs

@@ -3,6 +3,7 @@
 import { createServer } from 'vite';
 import { appFoldersPlugin } from '../lib/apps.mjs';
 import { aliases, themePlugin } from './theme.mjs';
+import { appSelf } from './appSelf.mjs';
 
 /**
  * Runs `use` with a loader of the site's modules (`@site/collections`, `/src/apps/<id>/index.ts`), then closes it.
@@ -15,7 +16,7 @@ export async function withSiteModules(use) {
     configFile: false,
     logLevel: 'error',
     appType: 'custom',
-    plugins: [themePlugin(), appFoldersPlugin(`${process.cwd()}/`)],
+    plugins: [themePlugin(), appFoldersPlugin(`${process.cwd()}/`), appSelf()],
     resolve: { alias: aliases() },
     server: { middlewareMode: true, hmr: false, ws: false },
   });

package/site/theme.mjs

@@ -4,7 +4,7 @@
 // theme or the look of a block, is the standard theme's, styled by the theme in use's CSS. The site and the editor
 // reach the theme as @theme (themePlugin: the theme in use's file, else the standard theme's), and the site's own
 // parts (src/site/) as @site (aliases): for packages/editor/astro.mjs and packages/editor/scripts/check-content.mjs. Stops with what is
-// wrong, when the theme named is not installed. Also the virtual modules with all Phosphor's icons (allIconsModule) and with the theme's coverage of Material's parts
+// wrong, when the theme named is not installed or a folder in src/themes/ is a malformed store id (a store id is theme_ + 16 hex characters). Also the virtual modules with all Phosphor's icons (allIconsModule) and with the theme's coverage of Material's parts
 // (coverageModule, site/themeCoverageFiles.mjs).
 import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
 import { join, relative } from 'node:path';
@@ -16,6 +16,7 @@ import { MATERIAL_ALL, MATERIAL_SSR, materialModule, materialSsrModule } from '.
 import { ICON_PACK_FILE, ICON_PACK_LICENSE, SYSTEM_PACKS, THEME_PACKS_FOLDER, packInUse, packTheme, themePackId } from './iconPacks.mjs';
 import { MOTION_SCHEMES } from '@morphemecms/cms/lib/motion-schemes.mjs';
 import { templateProblems } from '@morphemecms/cms/lib/page-template.mjs';
+import { strayStoreId } from '@morphemecms/cms/lib/storeEntries.mjs';
 import { storeImportProblems } from './storeTheme.mjs';
 import { coverageModule } from './themeCoverageFiles.mjs';
 
@@ -52,13 +53,19 @@ export const THEME_FILES = [
   'editor/looks.mjs',
 ];
 
-/** The themes installed: the standard theme and the folders in src/themes/ with a theme.json. */
-export const installedThemes = () => [
-  STANDARD_THEME,
-  ...(existsSync(new URL('src/themes/', root)) ? readdirSync(new URL('src/themes/', root), { withFileTypes: true }) : [])
+/** The themes installed: the standard theme and the folders in src/themes/ with a theme.json. Stops on a folder that
+ * starts with `app_` or `theme_` but is not a store id of a theme. */
+export const installedThemes = () => {
+  const names = (existsSync(new URL('src/themes/', root)) ? readdirSync(new URL('src/themes/', root), { withFileTypes: true }) : [])
     .filter((e) => e.isDirectory() && existsSync(new URL(`src/themes/${e.name}/theme.json`, root)))
-    .map((e) => e.name),
-];
+    .map((e) => e.name);
+  const stray = names.find((name) => strayStoreId(name, 'theme'));
+  if (stray)
+    throw new Error(
+      `src/themes/${stray}: the folder name looks like a store id but is not one. A store theme id is theme_ and 16 lowercase hex characters; rename the folder.`,
+    );
+  return [STANDARD_THEME, ...names];
+};
 
 /** What every theme has itself. */
 export const OWN_FILES = ['theme.json', 'styles/global.css'];
@@ -455,7 +462,11 @@ export function siteFile(file) {
 /** The folder of the theme in use, under src/themes/. */
 export function activeTheme() {
   const { theme } = JSON.parse(readFileSync(new URL('src/data/theme.json', root), 'utf8'));
-  if (typeof theme !== 'string' || !/^[a-z0-9-]+$/.test(theme) || !existsSync(new URL(`${themeFolder(theme)}/theme.json`, root)))
+  if (
+    typeof theme !== 'string' ||
+    !/^([a-z0-9-]+|theme_[0-9a-f]{16})$/.test(theme) ||
+    !existsSync(new URL(`${themeFolder(theme)}/theme.json`, root))
+  )
     throw new Error(`src/data/theme.json: temaet ${JSON.stringify(theme)} er ikke installeret (src/themes/<tema>/theme.json).`);
   return theme;
 }

package/src/Advanced.tsx

@@ -1,4 +1,4 @@
-// "Avanceret" (#avanceret), under "Indstillinger": R2 caching, the copy of the site's files in Cloudflare R2 the Worker
+// "Avanceret" (#advanced), under "Indstillinger": R2 caching, the copy of the site's files in Cloudflare R2 the Worker
 // answers the editor from (packages/editor/worker/files.js), turned on and off with "Aktiveret" in the Worker's settings (r2Caching.ts),
 // saved at once in its own commit. Off, the Worker asks GitHub for everything. It can only be turned on when Cloudflare
 // has the bucket (the Worker asks, /api/r2), else a deploy would fail; under the switch, why not, and, until the site is
@@ -32,7 +32,7 @@ import { buildSettingsOf, withBuildSetting, type BuildSetting } from './buildSet
 import { BUILD_SETTINGS_PATH } from '../lib/build-settings.mjs';
 import { siteT, t } from './i18n';
 
-export const ADVANCED_ROUTE = 'avanceret';
+export const ADVANCED_ROUTE = 'advanced';
 
 // "Placering" when Cloudflare places the bucket (no jurisdiction).
 const AUTO = 'auto';