edgepress 2026.10.1 → 2026.10.13

package/src/generators.js

@@ -1,7 +1,11 @@
+import {renderPostServices,hasServiceBlock} from './service-block.js';
+import {generateRssRoute} from './rss.js';
+import {renderRevisionCards} from './revision-cards.js';
+import { authorForPost, readingMinutes, filterPostsByCategory, categorySlug, normalizeCategory } from './post-details.js';
 import { plainText, renderMarkdownExcerpt } from './markdown.js';
 import { renderBlocks } from './page-blocks.js';
 import { renderLayout } from './theme.js';
-import { localizedUrl, translate } from './i18n.js';
+import { localizedContentUrl, localizedUrl, translate } from './i18n.js';
 import { postsForLocale, slugify, sortPostsNewest } from './content.js';
 import { mapLimit } from './concurrency.js';
 import { renderIcon } from './icons.js';
@@ -23,13 +27,8 @@ function urlFor(path) {
   return '/' + parts.join('/') + (String(path).endsWith('/') && parts.length ? '/' : '');
 }
 
-function tagSlug(tag) {
-  if (/[^\x00-\x7F]/.test(tag)) return 'tag-' + Array.from(tag).map((char) => char.codePointAt(0).toString(16)).join('-');
-  return slugify(tag);
-}
-
-function dateLabel(date, language) {
-  return new Intl.DateTimeFormat(language, { dateStyle: 'long', timeZone: 'UTC' }).format(date);
+function dateLabel(date, language, timeZone = 'UTC', dateOnly = true) {
+  return new Intl.DateTimeFormat(language, dateOnly?{dateStyle:'long',timeZone}:{year:'numeric',month:'long',day:'numeric',hour:'2-digit',minute:'2-digit',timeZoneName:'short',timeZone}).format(date);
 }
 
 function fileRoute(path, body, contentType = 'text/html; charset=utf-8') {
@@ -87,7 +86,7 @@ function addPostContents(html, locale, config) {
 function renderPostVideo(video, locale) {
   if (!video) return '';
   const videoTitle = escapeHtml(video.title);
-  return '<figure class="post-video"><video controls playsinline preload="metadata" poster="' + escapeHtml(video.poster) + '" aria-label="' +
+  return '<figure class="post-video"><video data-edgepress-video controls playsinline preload="none" poster="' + escapeHtml(video.poster) + '" aria-label="' +
     escapeHtml(video.alt) + '"><source src="' + escapeHtml(video.src) + '" type="video/mp4"><track kind="captions" src="' +
     escapeHtml(video.captions) + '" srclang="' + escapeHtml(video.captionLanguage) + '" label="' + escapeHtml(video.captionLabel) + '" default>' +
     '<a href="' + escapeHtml(video.src) + '">' + (locale.toLowerCase().startsWith('zh') ? '下载 MP4 视频' : 'Download the MP4 video') +
@@ -128,16 +127,50 @@ function renderPostAuthor(post, locale, config) {
 }
 
 async function renderPostCard(post, locale, config, showLanguage = false) {
-  const summary = await renderMarkdownExcerpt(post.description || post.markdown, config.markdown);
+  const summary = await renderMarkdownExcerpt(post.description || post.markdown, {...config.markdown,linkResolver:value=>localizedContentUrl(config,post.locale,value)});
+  const postLanguage = showLanguage && post.locale !== locale ? translate(config, post.locale, 'languageName') : '';
   return '<article class="post-card" lang="' + escapeHtml(post.locale) + '"><h2><a href="' + escapeHtml(urlFor(post.path)) + '">' + escapeHtml(post.title) + '</a></h2>' +
-    '<p class="meta"><time datetime="' + post.date.toISOString() + '">' + escapeHtml(dateLabel(post.date, post.locale)) + '</time>' +
-    (showLanguage ? ' · <span class="post-language" lang="' + escapeHtml(post.locale) + '">' + escapeHtml(post.locale) + '</span>' : '') +
-    (post.author ? ' · ' + renderPostAuthor(post, locale, config) : '') + '</p><div class="post-excerpt" lang="' + escapeHtml(post.locale) + '">' +
+    '<p class="meta"><time data-local-time data-time-locale="' + escapeHtml(post.locale || locale) + '" data-date-only="' + (post.dateOnly === true) + '" datetime="' + (post.dateOnly ? post.date.toISOString().slice(0,10) : post.date.toISOString()) + '">' + escapeHtml(dateLabel(post.date, post.locale || locale, post.dateOnly ? 'UTC' : config.site.timeZone, post.dateOnly)) + '</time>' +
+    (postLanguage ? ' <span class="post-language" lang="' + escapeHtml(post.locale) + '">' + escapeHtml(postLanguage) + '</span>' : '') +
+    (post.author ? ' ' + renderPostAuthor(post, locale, config) : '') + '</p><div class="post-excerpt" lang="' + escapeHtml(post.locale) + '">' +
     summary + '</div></article>';
 }
 
+function paginationPageNumbers(currentPage, totalPages) {
+  const visible = new Set([1, totalPages]);
+  for (let page = Math.max(1, currentPage - 2); page <= Math.min(totalPages, currentPage + 2); page += 1) visible.add(page);
+  const pages = [...visible].sort((left, right) => left - right);
+  const entries = [];
+  for (let index = 0; index < pages.length; index += 1) {
+    const page = pages[index];
+    const previous = pages[index - 1];
+    if (previous !== undefined && page - previous > 1) {
+      if (page - previous === 2) entries.push(previous + 1);
+      else entries.push(null);
+    }
+    entries.push(page);
+  }
+  return entries;
+}
+
+function renderPagination(locale, currentPage, totalPages, config, pageUrl) {
+  const label = (key) => translate(config, locale, key);
+  const pageLinks = paginationPageNumbers(currentPage, totalPages).map((page) => {
+    if (page === null) return '<li class="pagination-ellipsis" aria-hidden="true">…</li>';
+    if (page === currentPage) return '<li><span class="pagination-current" aria-current="page">' + page + '</span></li>';
+    const pageLabel = label('pageNumber').replace('{page}', String(page));
+    return '<li><a href="' + escapeHtml(pageUrl(page)) + '" aria-label="' + escapeHtml(pageLabel) + '">' + page + '</a></li>';
+  }).join('');
+  const previous = currentPage > 1
+    ? '<a rel="prev" href="' + escapeHtml(pageUrl(currentPage - 1)) + '">' + escapeHtml(label('newer')) + '</a>' : '';
+  const next = currentPage < totalPages
+    ? '<a rel="next" href="' + escapeHtml(pageUrl(currentPage + 1)) + '">' + escapeHtml(label('older')) + '</a>' : '';
+  return '<nav class="pagination" aria-label="' + escapeHtml(label('pagination')) + '">' + previous +
+    '<ol class="pagination-pages">' + pageLinks + '</ol>' + next + '</nav>';
+}
+
 async function pageBodyForDocument(page, site, config, locale, isHomepage = false, renderContext = {}) {
-  const content = await renderBlocks(page.blocks, { config, locale, site, isHomepage, ...renderContext });
+  const content = await renderBlocks(page.blocks, { config, locale, site, document: page, isHomepage, ...renderContext });
   const firstElement = page.blocks[0]?.cells?.[0]?.[0];
   const needsTitle = !isHomepage || firstElement?.type !== 'hero';
   const title = needsTitle ? '<header class="page-title"><h1>' + escapeHtml(page.title) + '</h1></header>' : '';
@@ -179,7 +212,8 @@ export async function generateBuiltinRoutes(site, config, extensions) {
   const allPosts = sortPostsNewest(site.posts);
   for (const locale of config.i18n.locales) {
     const posts = allPosts.filter((post) => post.locale === locale);
-    const archivePosts = postsForLocale(allPosts, locale, defaultLocale);
+    const localizedPosts = postsForLocale(allPosts, locale, defaultLocale);
+    const archivePosts = filterPostsByCategory(localizedPosts, config.site.archive?.categories);
     const pages = site.pages.filter((page) => page.locale === locale && !page.homepage);
     const homePage = homepageDocument(site.pages, locale, defaultLocale);
     const latestPostsPageSize = paginatedLatestPostsSize(homePage);
@@ -220,12 +254,11 @@ export async function generateBuiltinRoutes(site, config, extensions) {
         const cards = await Promise.all(subset.map((post) => renderPostCard(post, locale, config, true)));
         const body = '<section class="intro"><h1>' + escapeHtml(config.site.title) + '</h1><p>' + escapeHtml(config.site.description) +
           '</p></section><section class="post-list" aria-label="' + escapeHtml(label('latestPosts')) + '">' +
-          (cards.length ? cards.join('') : '<p>' + escapeHtml(label('noPosts')) + '</p>') +
+          (cards.length ? '<div class="post-list archive-post-list">' + cards.join('') + '</div>' : '<p>' + escapeHtml(label('noPosts')) + '</p>') +
           '</section>' + (pageNumber === 1 && pages.length ? '<section class="page-links"><h2>' + escapeHtml(label('pages')) + '</h2><ul>' +
             pages.map((page) => '<li><a href="' + escapeHtml(urlFor(page.path)) + '">' + escapeHtml(page.title) + '</a></li>').join('') + '</ul></section>' : '') +
-          (totalPages > 1 ? '<nav class="pagination" aria-label="' + escapeHtml(label('pagination')) + '">' +
-            (pageNumber > 1 ? '<a href="' + escapeHtml(pageNumber === 2 ? localizedUrl(config, locale, '') : localizedUrl(config, locale, 'page/' + (pageNumber - 1) + '/')) + '">' + escapeHtml(label('newer')) + '</a>' : '') +
-            (pageNumber < totalPages ? '<a href="' + escapeHtml(localizedUrl(config, locale, 'page/' + (pageNumber + 1) + '/')) + '">' + escapeHtml(label('older')) + '</a>' : '') + '</nav>' : '');
+          (totalPages > 1 ? renderPagination(locale, pageNumber, totalPages, config, (page) =>
+            localizedUrl(config, locale, page === 1 ? '' : 'page/' + page + '/')) : '');
         const routePath = pageNumber === 1 ? prefix + 'index.html' : prefix + 'page/' + pageNumber + '/index.html';
         routes.push(await pageRoute(routePath, pageNumber === 1 ? config.site.title : 'Page ' + pageNumber,
           config.site.description, body, locale, config, extensions));
@@ -235,12 +268,18 @@ export async function generateBuiltinRoutes(site, config, extensions) {
     for (const post of posts) allPagePaths.add(urlFor(post.path));
     const postRoutes = await mapLimit(posts, config.concurrency, async (post) => {
       const renderedMarkdown = addPostContents(post.html, locale, config);
-      const body = '<article class="post"><header><h1>' + escapeHtml(post.title) + '</h1><p class="meta"><time datetime="' + post.date.toISOString() + '">' +
-        escapeHtml(dateLabel(post.date, locale)) + '</time>' + (post.author ? ' · ' + renderPostAuthor(post, locale, config) : '') +
-        '</p></header>' + renderPostVideo(post.video, locale) + renderedMarkdown.toc + '<div class="post-content">' + renderedMarkdown.html + '</div>' +
-        (post.tags.length ? '<nav class="post-tags" aria-label="' + escapeHtml(label('tags')) + '"><span class="post-tags-label">' + escapeHtml(label('tags')) + ':</span><ul>' +
-          post.tags.map((tag) => '<li><a rel="tag" href="' + escapeHtml(localizedUrl(config, locale, 'tags/' + tagSlug(tag) + '/')) + '">' + escapeHtml(tag) + '</a></li>').join('') +
-          '</ul></nav>' : '') + '</article>';
+      const author = authorForPost(post, config);
+      const minutes = post.readingMinutes || readingMinutes(post.markdown);
+      const authorHtml = author.name ? '<span class="post-author">' +
+        (author.avatar ? '<img class="author-avatar" src="' + escapeHtml(author.avatar) + '" width="40" height="40" alt="" decoding="async">' : '') +
+        escapeHtml(label('postAuthor').replace('{author}', author.name)) + '</span>' : '';
+      const tagsHtml = post.tags.length ? '<div class="post-tags" role="group" aria-label="' + escapeHtml(label('tags')) + '"><span class="post-tags-label">' +
+        escapeHtml(label('tags')) + ':</span>' + post.tags.map(tag => '<span class="post-tag">' + escapeHtml(tag) + '</span>').join('') + '</div>' : '';
+      const body = '<article class="post"><header><h1>' + escapeHtml(post.title) + '</h1><div class="meta post-byline">' + authorHtml +
+        '<time data-local-time data-time-locale="' + escapeHtml(post.locale || locale) + '" data-date-only="' + (post.dateOnly === true) + '" datetime="' + (post.dateOnly ? post.date.toISOString().slice(0,10) : post.date.toISOString()) + '">' + escapeHtml(dateLabel(post.date, post.locale || locale, post.dateOnly ? 'UTC' : config.site.timeZone, post.dateOnly)) + '</time>' +
+        '<span class="post-reading-time" data-reading-minutes="' + minutes + '">' + escapeHtml(label('postReadingTime').replace('{minutes}', minutes)) + '</span>' +
+        (post.updated ? '<span class="post-updated">' + escapeHtml(label('postUpdated')) + ' <time data-local-time data-time-locale="' + escapeHtml(locale) + '" datetime="' + post.updated.toISOString() + '">' + escapeHtml(dateLabel(post.updated, locale, config.site.timeZone, false)) + '</time></span>' : '') +
+        '</div>' + tagsHtml + '</header>' + (post.showChanges && post.changes ? await renderRevisionCards(post.changes,label,post.revisionImages,{linkResolver:value=>localizedContentUrl(config,locale,value)}) : '') + renderPostVideo(post.video, locale) + renderedMarkdown.toc + '<div class="post-content">' + renderedMarkdown.html + '</div></article>' + renderPostServices(post, locale, config);
       const canonicalPath = urlFor(post.path);
       return pageRoute(post.path + 'index.html', post.title, post.description || plainText(post.markdown).slice(0, 160), body,
         locale, config, extensions, {
@@ -248,8 +287,8 @@ export async function generateBuiltinRoutes(site, config, extensions) {
           structuredData: {
             '@context': 'https://schema.org', '@type': 'BlogPosting', headline: post.title,
             description: post.description || plainText(post.markdown).slice(0, 160),
-            datePublished: post.date.toISOString(), dateModified: post.date.toISOString(),
-            author: { '@type': 'Person', name: post.author || config.site.seo.author || config.site.title },
+            datePublished: post.dateOnly ? post.date.toISOString().slice(0,10) : post.date.toISOString(), dateModified: post.updated ? post.updated.toISOString() : post.dateOnly ? post.date.toISOString().slice(0,10) : post.date.toISOString(),
+            author: { '@type': 'Person', name: author.name || config.site.title },
             mainEntityOfPage: config.site.url ? config.site.url + canonicalPath : undefined,
             inLanguage: locale
           }
@@ -275,36 +314,41 @@ export async function generateBuiltinRoutes(site, config, extensions) {
       const cards = await Promise.all(subset.map((post) => renderPostCard(post, locale, config, true)));
       const archiveUrl = pageNumber === 1 ? 'archives/' : 'archives/page/' + pageNumber + '/';
       const pagination = archivePageCount > 1
-        ? '<nav class="pagination" aria-label="' + escapeHtml(label('pagination')) + '">' +
-          (pageNumber > 1 ? '<a rel="prev" href="' + escapeHtml(pageNumber === 2 ? localizedUrl(config, locale, 'archives/') :
-            localizedUrl(config, locale, 'archives/page/' + (pageNumber - 1) + '/')) + '">' + escapeHtml(label('newer')) + '</a>' : '') +
-          (pageNumber < archivePageCount ? '<a rel="next" href="' + escapeHtml(localizedUrl(config, locale, 'archives/page/' + (pageNumber + 1) + '/')) + '">' +
-            escapeHtml(label('older')) + '</a>' : '') + '</nav>' : '';
+        ? renderPagination(locale, pageNumber, archivePageCount, config, (page) => localizedUrl(config, locale,
+          page === 1 ? 'archives/' : 'archives/page/' + page + '/')) : '';
       const archiveBody = '<section><h1>' + escapeHtml(label('archives')) + '</h1>' +
-        (cards.length ? cards.join('') : '<p>' + escapeHtml(label('noPosts')) + '</p>') + pagination + '</section>';
+        (cards.length ? '<div class="post-list archive-post-list">' + cards.join('') + '</div>' : '<p>' + escapeHtml(label('noPosts')) + '</p>') + pagination + '</section>';
       routes.push(await pageRoute(prefix + (pageNumber === 1 ? 'archives/index.html' : 'archives/page/' + pageNumber + '/index.html'),
-        pageNumber === 1 ? label('archives') : label('archives') + ' · ' + pageNumber, label('allPosts'), archiveBody, locale, config, extensions,
+        pageNumber === 1 ? label('archives') : label('archives') + ' ' + pageNumber, label('allPosts'), archiveBody, locale, config, extensions,
         { urlPath: localizedUrl(config, locale, archiveUrl) }));
       allPagePaths.add(localizedUrl(config, locale, archiveUrl));
     }
 
-    const tags = new Map();
-    for (const post of posts) for (const tag of post.tags) {
-      const slug = tagSlug(tag);
-      if (!tags.has(slug)) tags.set(slug, { label: tag, posts: [] });
-      tags.get(slug).posts.push(post);
+    const categories = new Map();
+    for (const post of localizedPosts) {
+      const category = normalizeCategory(post.category);
+      if (!categories.has(category)) categories.set(category, []);
+      categories.get(category).push(post);
+    }
+    for (const [category, categoryPosts] of categories) {
+      const slug = categorySlug(category);
+      const title = category === 'blog' ? label('categoryBlog') : category === 'uncategorized' ? label('categoryUncategorized') : category;
+      const totalPages = Math.ceil(categoryPosts.length / config.pagination.perPage);
+      const categoryPath = number => 'categories/' + slug + '/' + (number === 1 ? '' : 'page/' + number + '/');
+      for (let number = 1; number <= totalPages; number += 1) {
+        const cards = await Promise.all(categoryPosts.slice((number - 1) * config.pagination.perPage, number * config.pagination.perPage)
+          .map(post => renderPostCard(post, locale, config, true)));
+        const pagination = totalPages > 1 ? renderPagination(locale, number, totalPages, config,
+          page => localizedUrl(config, locale, categoryPath(page))) : '';
+        const body = '<section><h1>' + escapeHtml(title) + '</h1><div class="post-list archive-post-list">' + cards.join('') + '</div>' + pagination + '</section>';
+        const urlPath = localizedUrl(config, locale, categoryPath(number));
+        allPagePaths.add(urlPath);
+        routes.push(await pageRoute(prefix + categoryPath(number) + 'index.html', title, title, body, locale, config, extensions, { urlPath }));
+      }
     }
-    const tagRoutes = await mapLimit([...tags.entries()], config.concurrency, async ([slug, value]) => {
-      const cards = await Promise.all(value.posts.map((post) => renderPostCard(post, locale, config)));
-      const body = '<section><h1>' + escapeHtml(label('tag')) + ': ' + escapeHtml(value.label) + '</h1>' +
-        cards.join('') + '</section>';
-      return pageRoute(prefix + 'tags/' + slug + '/index.html', label('tag') + ': ' + value.label,
-        label('tag') + ' ' + value.label, body, locale, config, extensions);
-    });
-    routes.push(...tagRoutes);
 
     const searchable = [
-      ...posts.map((post) => ({ title: post.title, author: post.author, date: post.date.toISOString(), url: urlFor(post.path), summary: plainText(post.description || post.markdown).slice(0, 220), content: plainText(post.markdown), type: 'post' })),
+      ...posts.map((post) => ({ title: post.title, author: post.author, date: post.dateOnly ? post.date.toISOString().slice(0,10) : post.date.toISOString(), dateOnly: post.dateOnly, url: urlFor(post.path), summary: plainText(post.description || post.markdown).slice(0, 220), content: plainText(post.markdown), type: 'post' })),
       ...pages.map((page) => ({ title: page.title, url: urlFor(page.path), summary: page.description || plainText(page.markdown).slice(0, 220), type: 'page' }))
     ];
     routes.push(fileRoute(prefix + 'search.json', JSON.stringify(searchable), 'application/json; charset=utf-8'));
@@ -313,21 +357,14 @@ export async function generateBuiltinRoutes(site, config, extensions) {
       '<p>' + escapeHtml(label('searchIntro')) + '</p><form class="local-search-form" data-edgepress-search data-index="' +
       escapeHtml(localizedUrl(config, locale, 'search.json')) + '"><label for="edgepress-search-query">' + escapeHtml(label('searchLabel')) +
       '</label><div class="local-search-controls"><input id="edgepress-search-query" name="q" type="search" autocomplete="off" ' +
-      'aria-describedby="edgepress-search-hint"><button type="submit">' + escapeHtml(label('searchButton')) + '</button></div>' +
-      '<p id="edgepress-search-hint">' + escapeHtml(label('searchHint')) + '</p></form><p id="edgepress-search-status" role="status" aria-live="polite">' +
-      escapeHtml(label('searchPrompt')) + '</p><ol id="edgepress-search-results" class="local-search-results"></ol>' +
+      '><button type="submit">' + escapeHtml(label('searchButton')) + '</button></div>' +
+      '</form><p id="edgepress-search-status" role="status" aria-live="polite">' +
+      '' + '</p><ol id="edgepress-search-results" class="local-search-results"></ol>' +
       '<noscript><p>' + escapeHtml(label('searchNeedsJavaScript')) + '</p></noscript></section>';
     routes.push(await pageRoute(prefix + 'search/index.html', label('searchPosts'), label('searchIntro'), searchBody,
       locale, config, extensions));
 
-    const base = config.site.url;
-    const entries = posts.slice(0, 20).map((post) => '<entry><title>' + escapeXml(post.title) + '</title>' +
-      (post.author ? '<author><name>' + escapeXml(post.author) + '</name></author>' : '') + '<link href="' +
-      escapeXml(base + urlFor(post.path)) + '"/><id>' + escapeXml(base + urlFor(post.path)) + '</id><updated>' + post.date.toISOString() +
-      '</updated><summary>' + escapeXml(plainText(post.description || post.markdown).slice(0, 220)) + '</summary></entry>').join('');
-    routes.push(fileRoute(prefix + 'feed.xml', '<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"><title>' +
-      escapeXml(config.site.title) + '</title><id>' + escapeXml(base || 'urn:edgepress:site') + '</id><updated>' +
-      (posts[0]?.date.toISOString() || new Date(0).toISOString()) + '</updated>' + entries + '</feed>', 'application/atom+xml; charset=utf-8'));
+    routes.push(await generateRssRoute(posts, config, locale));
   }
 
   const base = config.site.url;
@@ -368,5 +405,10 @@ export async function generateBuiltinRoutes(site, config, extensions) {
       escapeHtml(translate(config, locale, 'returnHome')) + '</a></p></section>';
     routes.push(await pageRoute(prefix + '403.html', forbiddenTitle, forbiddenText, forbiddenBody, locale, config, extensions, { robots: 'noindex,nofollow' }));
   }
+  const discussions = config.browserPlugins.services.some(service => service.enabled !== false && service.provider === 'external-widget') ? [
+    ...site.posts.filter(post => !post.draft).map(post => ({thread:post.bundlePath,title:post.title})),
+    ...site.pages.filter(page => !page.draft && hasServiceBlock(page.blocks)).map(page => ({thread:'page:' + page.bundlePath,title:page.title}))
+  ] : [];
+  routes.push(fileRoute('edgepress/service-contexts.json', JSON.stringify([...new Map(discussions.map(item => [item.thread,item])).values()]), 'application/json; charset=utf-8'));
   return routes;
 }

package/src/i18n.js

@@ -1,4 +1,5 @@
-import { readFile, realpath } from 'node:fs/promises';
+import { readFile, realpath, stat } from 'node:fs/promises';
+import {fileURLToPath} from 'node:url';
 import { isAbsolute, relative, resolve, sep } from 'node:path';
 
 const MAX_LANGUAGE_FILE_BYTES = 64 * 1024;
@@ -39,9 +40,16 @@ async function loadDictionary(root, directory, locale, label) {
 export async function loadLanguagePacks(config) {
   const baseLocale = config.i18n.defaultLocale;
   const translationsByLocale = Object.create(null);
-  translationsByLocale[baseLocale] = await loadDictionary(config.root, 'languages/base', baseLocale, 'Base');
+  const builtinRoot=fileURLToPath(new URL('../',import.meta.url)),english=await loadDictionary(builtinRoot,'languages/base','en','Built-in');
+  async function defaults(locale){
+    if(locale==='en')return english;
+    const file=resolve(builtinRoot,'languages/packs',locale+'.json');
+    const exists=await stat(file).then(()=>true,error=>{if(error.code==='ENOENT')return false;throw error;});
+    return exists?{...english,...await loadDictionary(builtinRoot,'languages/packs',locale,'Built-in')}:english;
+  }
+  translationsByLocale[baseLocale] = {...await defaults(baseLocale),...await loadDictionary(config.root, 'languages/base', baseLocale, 'Base')};
   for (const locale of config.i18n.languagePacks) {
-    translationsByLocale[locale] = await loadDictionary(config.root, 'languages/packs', locale, 'Language pack');
+    translationsByLocale[locale] = {...await defaults(locale),...await loadDictionary(config.root, 'languages/packs', locale, 'Language pack')};
   }
   config.i18n.translationsByLocale = translationsByLocale;
   return translationsByLocale;
@@ -68,3 +76,11 @@ export function localizedUrl(config, locale, path) {
   const suffix = String(path ?? '').replace(/^\/+/, '');
   return prefix + '/' + suffix;
 }
+
+
+export function localizedContentUrl(config, locale, value, label = 'Content URL') {
+  const url=String(value),token=/^\/(?:\[launge\]|%5blaunge%5d)(?=\/|$)/i;
+  if(!url.startsWith('/'))return url;
+  if(/\[launge\]|%5blaunge%5d/i.test(url)&&!token.test(url))throw new Error(label+' may use [launge] only as the first site-path segment');
+  return token.test(url)?localePrefix(config,locale)+(url.replace(token,'')||'/'):url;
+}

package/src/icons.js

@@ -1,7 +1,7 @@
 const iconNames = new Set([
   'home', 'book-open', 'rocket', 'newspaper', 'search', 'shield-check', 'rss', 'file-text',
   'layers', 'code', 'puzzle', 'plug', 'cloud', 'palette', 'globe', 'help-circle', 'arrow-up-right',
-  'check-circle', 'layout-grid', 'terminal', 'settings', 'sparkles'
+  'check-circle', 'layout-grid', 'terminal', 'settings', 'sparkles', 'cpu', 'mail', 'github', 'check', 'x', 'arrow-right'
 ]);
 
 export function isIconName(name) {
@@ -10,7 +10,8 @@ export function isIconName(name) {
 
 export function renderIcon(name, className = 'icon') {
   if (!isIconName(name)) throw new Error('Unsupported EdgePress icon: ' + String(name));
-  if (!/^[a-z][a-z0-9-]*$/.test(className)) throw new Error('Icon class must be a simple CSS identifier');
-  return '<svg class="' + className + '" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><use href="/edgepress/icons.svg#' +
-    name + '"></use></svg>';
+  if (typeof className !== 'string' || !/^[a-zA-Z_][a-zA-Z0-9_-]*(?: [a-zA-Z_][a-zA-Z0-9_-]*)*$/.test(className)) {
+    throw new Error('Icon class must contain space-separated CSS identifiers');
+  }
+  return '<img class="' + className + ' icon-library" src="/edgepress/icons/' + name + '.svg" width="24" height="24" alt="" aria-hidden="true" decoding="async">';
 }

package/src/image-dimensions.js

@@ -0,0 +1,17 @@
+import {readFile} from 'node:fs/promises';
+import {imageSize} from 'image-size';
+import {mapLimit} from './concurrency.js';
+export async function collectImageDimensions(assets){
+ const result=new Map();await mapLimit(assets.filter(item=>/\.(?:png|jpe?g|gif|webp|avif|svg)$/i.test(item.path)),8,async item=>{
+  try{let {width,height,orientation}=imageSize(item.content??await readFile(item.source));if([5,6,7,8].includes(orientation))[width,height]=[height,width];if(width>0&&height>0)result.set('/'+item.path,{width,height});}catch{}
+ });return result;
+}
+export function reserveImageDimensions(html,dimensions,path,origin){
+ return html.replace(/<img\b[^>]*>/gi,tag=>{
+  const value=name=>tag.match(new RegExp('\\s'+name+'\\s*=\\s*["\']([^"\']+)["\']','i'))?.[1],src=value('src');if(!src)return tag;
+  let url,key;try{url=new URL(src,new URL('/'+path,origin));key=decodeURI(url.pathname);}catch{return tag;}
+  if(url.origin!==new URL(origin).origin)return tag;const size=dimensions.get(key);if(!size)return tag;
+  const w=Number(value('width')),h=Number(value('height'));if(w>0&&h>0)return tag;
+  return tag.replace(/\s*\/?>$/,end=>(value('width')?'':' width="'+Math.max(1,Math.round(h>0?h*size.width/size.height:size.width))+'"')+(value('height')?'':' height="'+Math.max(1,Math.round(w>0?w*size.height/size.width:size.height))+'"')+end);
+ });
+}

package/src/local-tool.js

@@ -0,0 +1,29 @@
+// Local tool modules are trusted site source, like theme scripts. External
+// providers belong to consent-controlled services, never this element.
+const escape = value => String(value).replace(/[&<>"']/g, c => ({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[c]));
+
+export function renderLocalTool(block, context) {
+  for (const key of Object.keys(block)) if (!['type','id','title','text','script','stylesheet','data','fallback'].includes(key)) throw new Error('Unsupported local-tool option: ' + key);
+  if (typeof block.id !== 'string' || !/^[a-z][a-z0-9-]{0,79}$/.test(block.id)) throw new Error('local-tool.id must be a lowercase HTML identifier');
+  if (context.localToolIds?.has(block.id)) throw new Error('Duplicate local-tool.id: ' + block.id);
+  context.localToolIds?.add(block.id);
+  const string = (key, required = false) => {
+    const value = block[key];
+    if (value === undefined && !required) return '';
+    if (typeof value !== 'string' || !value.trim() || value.length > 2000) throw new Error('local-tool.' + key + ' must be a non-empty string of at most 2000 characters');
+    return escape(value);
+  };
+  const asset = (key, extension, required = false) => {
+    if (block[key] === undefined && !required) return '';
+    const value = block[key];
+    if (typeof value !== 'string' || !/^\/(?!\/)[a-zA-Z0-9_./-]+$/.test(value) || value.split('/').some(p => p==='.' || p==='..') || !extension.test(value)) throw new Error('local-tool.' + key + ' must be a same-origin local asset path');
+    if (!context.config.assetManifest?.[value]) throw new Error('local-tool.' + key + ' asset does not exist: ' + value);
+    return escape(value);
+  };
+  const script = asset('script', /\.m?js$/, true);
+  const stylesheet = asset('stylesheet', /\.css$/);
+  const data = asset('data', /\.json$/);
+  const title = string('title', true), description = string('text'), fallback = string('fallback', true);
+  const heading = block.id + '-title';
+  return '<section class="local-tool" id="' + block.id + '" data-edgepress-local-tool' + (data ? ' data-tool-data="' + data + '"' : '') + ' aria-labelledby="' + heading + '"><h2 id="' + heading + '">' + title + '</h2>' + (description ? '<p class="local-tool-description">' + description + '</p>' : '') + '<div data-tool-mount></div><noscript><p>' + fallback + '</p></noscript></section>' + (stylesheet ? '<link rel="stylesheet" href="' + stylesheet + '">' : '') + '<script type="module" src="' + script + '"></script>';
+}

package/src/maintenance.js

@@ -1,5 +1,5 @@
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
-import { resolve } from 'node:path';
+import { mkdir, readFile, realpath, writeFile } from 'node:fs/promises';
+import { isAbsolute, relative, resolve, sep } from 'node:path';
 
 async function readJson(file) {
   return JSON.parse(await readFile(file, 'utf8'));
@@ -34,16 +34,33 @@ export async function checkCompatibility(config) {
   } else if (workerDate < manifest.requirements.minimumWorkersDate) {
     issues.push({ severity: 'error', message: 'Workers compatibility_date is older than the supported minimum.' });
   }
-  if (!wrangler.assets || !wrangler.assets.directory || wrangler.assets.binding !== 'ASSETS') {
+  if (!wrangler.assets || !wrangler.assets.directory) {
     issues.push({ severity: 'error', message: 'Configure the ASSETS binding and static assets directory in Wrangler.' });
   }
-  const workerSource = await readFile(resolve(root, 'src/worker.js'), 'utf8');
-  if (/from\s+['"]node:|require\s*\(\s*['"]node:/i.test(workerSource)) {
-    issues.push({ severity: 'error', message: 'The Worker entry imports a Node.js built-in; keep build-only APIs out of src/worker.js.' });
+  const entry = wrangler.main;
+  if (entry !== undefined && (typeof entry !== 'string' || !entry.trim())) {
+    issues.push({severity:'error',message:'The optional Worker entry must be a non-empty string.'});
+  } else if (entry !== undefined) {
+    try {
+      const realRoot = await realpath(root);
+      const workerFile = await realpath(resolve(root, entry));
+      const rel = relative(realRoot, workerFile);
+      if (rel === '..' || rel.startsWith('..' + sep) || isAbsolute(rel)) {
+        issues.push({ severity: 'error', message: 'The configured Worker entry must stay inside the project root.' });
+      } else {
+        const workerSource = await readFile(workerFile, 'utf8');
+        if (/from\s+['"]node:|require\s*\(\s*['"]node:/i.test(workerSource)) {
+          issues.push({ severity: 'error', message: 'The configured Worker entry imports a Node.js built-in; keep build-only APIs out of the Worker.' });
+        }
+      }
+    } catch (error) {
+      if (!['ENOENT', 'EISDIR', 'EACCES', 'EPERM'].includes(error.code)) throw error;
+      issues.push({ severity: 'error', message: 'Cannot read the configured Worker entry: ' + entry + ' (' + error.code + ').' });
+    }
   }
   const first = wrangler.assets?.run_worker_first;
-  if (!Array.isArray(first) || !first.includes('/api/*')) {
-    issues.push({ severity: 'warning', message: 'Keep Worker-first routing limited to API paths so static pages bypass script execution.' });
+  if (first === true || (Array.isArray(first) && first.length)) {
+    issues.push({ severity: 'warning', message: 'Static websites should use assets-only hosting; deploy backend services separately.' });
   }
 
   const report = {

package/src/markdown-fixture.js

@@ -0,0 +1,20 @@
+// Renderer verification only: never added to a site's content or generated routes.
+export const markdownFixture = [
+  '## Heading two', '### Heading three', '#### Heading four', '##### Heading five', '###### Heading six', '',
+  'Setext heading level two', '------------------------', '',
+  'A paragraph with a hard break.  ', 'The next line.', '',
+  '---', '', '***', '', '___', '',
+  '*Emphasis* and **strong emphasis** with ~~strikethrough~~.', '',
+  'Inline `code`.', '', '```js', 'console.log("fixture");', '```', '',
+  '~~~text', 'Plain fenced code.', '~~~', '', '    const indented = true;', '',
+  '`` ` ``', '', '\\*escaped punctuation\\* < &', '',
+  '[Inline](/quick-start/) and [reference][guide].', '', '[guide]: /quick-start/', '',
+  'https://www.markdownguide.org/', '', '<https://commonmark.org> www.example.com <team@example.com>', '',
+  '![An illustrated Markdown guide](/edgepress-markdown-guide.png)', '',
+  '![A kite crossing a field](https://media.example.org/field-recording.mp4 "Wind test")', '',
+  '- **Formatted** item', '    1. Nested ordered item', '',
+  '- [x] Completed task', '- [ ] Pending task', '',
+  '> - A list in a quotation', '>   - Another item', '', '> Outer quotation', '>', '> > Nested quotation', '',
+  '| Heading | Value |', '| --- | --- |', '| *Emphasis* | Detail |', '',
+  'Use <kbd>Ctrl</kbd>.', '', '<script>alert("unsafe")</script>'
+].join('\n');