@stati/core 1.29.2 → 2.0.1

package/README.md

@@ -260,12 +260,9 @@ export default defineConfig({
     },
   },
 
-  // Eta template engine
-  eta: {
-    filters: {
-      formatDate: (date) => new Date(date).toLocaleDateString('en-US'),
-      slugify: (text) => text.toLowerCase().replace(/\s+/g, '-'),
-    },
+  // Template helpers, called as stati.helpers.formatDate()
+  helpers: {
+    formatDate: (date) => new Date(date).toLocaleDateString('en-US'),
   },
 
   // Incremental Static Generation (enabled by default)
@@ -588,7 +585,7 @@ import type { TemplateContext, CacheManifest } from '@stati/core/types';
 Stati supports rich Markdown features out of the box:
 
 - **Front-matter** - YAML (default) or JSON (`---json`) metadata
-- **Plugins** - Full markdown-it ecosystem compatibility
+- **Plugins** - Any markdown-it plugin that supports markdown-it 15
 - **Syntax highlighting** - Code blocks get `language-*` classes; add a plugin such as `markdown-it-prism` to highlight them
 - **Custom rendering** - Configure parser behavior
 - **Draft mode** - Mark pages as `draft: true`
@@ -611,10 +608,10 @@ export default defineConfig({
 
 Powered by [Eta](https://eta.js.org) for fast, flexible templates:
 
-- **Layouts** - Template inheritance via `layout` property
-- **Partials** - Reusable components
-- **Custom filters** - Transform data in templates
-- **Type-safe helpers** - Access page data with autocomplete
+- **Layouts** - Chosen by folder or front matter, sharing one page shell through `stati.layout()`
+- **Includes** - Reusable templates with props and content through `stati.include()`
+- **Helpers** - Your own functions, called as `stati.helpers.name()`
+- **Typed context** - The `TemplateContext` type describes everything templates can read
 - **Live reload** - The browser reloads when a template changes
 
 **Template structure:**
@@ -627,11 +624,11 @@ Powered by [Eta](https://eta.js.org) for fast, flexible templates:
     <title><%= stati.page.title %> - <%= stati.site.title %></title>
   </head>
   <body>
-    <%~ stati.partials.header %>
+    <%~ stati.include('partials/header') %>
     <main>
       <%~ stati.content %>
     </main>
-    <%~ stati.partials.footer %>
+    <%~ stati.include('partials/footer') %>
   </body>
 </html>
 ```

package/dist/config/loader.d.ts

@@ -3,6 +3,15 @@ import type { StatiConfig } from '../types/index.js';
  * Clear the config cache. Useful when config file changes are detected.
  */
 export declare function clearConfigCache(): void;
+/**
+ * Checks the top-level options: each must be one Stati knows, and `helpers` must map names to
+ * functions.
+ *
+ * @param userConfig - The configuration as the config file exports it
+ * @throws {ConfigValidationError} For an unknown option, naming similar ones, or `helpers` that
+ *   are not an object of functions
+ */
+export declare function validateConfigOptions(userConfig: Record<string, unknown>): void;
 /**
  * Builds config file paths for a given directory.
  * @param cwd - Directory to search for config files

package/dist/config/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA+BrD;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC;AAqBD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAExD;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,UAAU,CAAC,GAAG,GAAE,MAAsB,GAAG,OAAO,CAAC,WAAW,CAAC,CA8HlF"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAmCrD;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC;AAqDD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CA6B/E;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAExD;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,UAAU,CAAC,GAAG,GAAE,MAAsB,GAAG,OAAO,CAAC,WAAW,CAAC,CA6IlF"}

package/dist/config/loader.js

@@ -4,7 +4,7 @@ import { pathToFileURL } from 'node:url';
 import { validateISGConfig, ISGConfigurationError } from '../core/isg/validation.js';
 import { validateImagesConfig } from '../images/config.js';
 import { ConfigValidationError } from './errors.js';
-import { compileStatiConfig, cleanupCompiledConfig } from '../core/utils/index.js';
+import { compileStatiConfig, cleanupCompiledConfig, findSimilarNames, } from '../core/utils/index.js';
 import { DEFAULT_SRC_DIR, DEFAULT_OUT_DIR, DEFAULT_STATIC_DIR, DEFAULT_SITE_TITLE, DEFAULT_DEV_BASE_URL, DEFAULT_TTL_SECONDS, DEFAULT_MAX_AGE_CAP_DAYS, CONFIG_FILE_PATTERNS, } from '../constants.js';
 /**
  * Config cache to prevent repeated dynamic imports during dev server rebuilds.
@@ -35,6 +35,70 @@ const DEFAULT_CONFIG = {
         maxAgeCapDays: DEFAULT_MAX_AGE_CAP_DAYS,
     },
 };
+/**
+ * Every top-level `StatiConfig` option. Typed as a Record so a new option fails to compile
+ * until it is added.
+ */
+const CONFIG_KEYS = {
+    srcDir: true,
+    outDir: true,
+    staticDir: true,
+    site: true,
+    markdown: true,
+    helpers: true,
+    isg: true,
+    collections: true,
+    seo: true,
+    sitemap: true,
+    robots: true,
+    rss: true,
+    search: true,
+    typescript: true,
+    images: true,
+    dev: true,
+    preview: true,
+    hooks: true,
+};
+function describeConfigValue(value) {
+    if (value === null || value === undefined)
+        return String(value);
+    if (Array.isArray(value))
+        return 'an array';
+    if (typeof value === 'object')
+        return 'an object';
+    return typeof value === 'string' ? `string '${value}'` : `${typeof value} ${String(value)}`;
+}
+/**
+ * Checks the top-level options: each must be one Stati knows, and `helpers` must map names to
+ * functions.
+ *
+ * @param userConfig - The configuration as the config file exports it
+ * @throws {ConfigValidationError} For an unknown option, naming similar ones, or `helpers` that
+ *   are not an object of functions
+ */
+export function validateConfigOptions(userConfig) {
+    const known = Object.keys(CONFIG_KEYS);
+    for (const key of Object.keys(userConfig)) {
+        if (!Object.hasOwn(CONFIG_KEYS, key)) {
+            const similar = findSimilarNames(key, known);
+            throw new ConfigValidationError(similar.length > 0
+                ? `Unknown option ${key}. Did you mean ${similar.join(' or ')}?`
+                : `Unknown option ${key}. Allowed options: ${known.join(', ')}.`);
+        }
+    }
+    const helpers = userConfig.helpers;
+    if (helpers === undefined) {
+        return;
+    }
+    if (typeof helpers !== 'object' || helpers === null || Array.isArray(helpers)) {
+        throw new ConfigValidationError(`helpers must be an object of functions, such as helpers: { formatDate: (date) => ... } (got ${describeConfigValue(helpers)}).`);
+    }
+    for (const [name, helper] of Object.entries(helpers)) {
+        if (typeof helper !== 'function') {
+            throw new ConfigValidationError(`helpers.${name} must be a function that templates call as stati.helpers.${name}() (got ${describeConfigValue(helper)}).`);
+        }
+    }
+}
 /**
  * Builds config file paths for a given directory.
  * @param cwd - Directory to search for config files
@@ -151,6 +215,18 @@ export async function loadConfig(cwd = process.cwd()) {
             }
             throw error;
         }
+        // Unknown options and helpers
+        try {
+            validateConfigOptions(userConfig);
+        }
+        catch (error) {
+            if (error instanceof ConfigValidationError) {
+                throw new ConfigValidationError(`Invalid configuration in ${configPath}:\n${error.message}`, {
+                    cause: error,
+                });
+            }
+            throw error;
+        }
         // Cache the loaded config with its modification time
         try {
             const mtime = statSync(resolvedConfigPath).mtimeMs;

package/dist/core/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/core/build.ts"],"names":[],"mappings":"AAyEA,OAAO,KAAK,EAEV,UAAU,EACV,MAAM,EAQP,MAAM,mBAAmB,CAAC;AAK3B,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGxE;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,gCAAgC;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,sCAAsC;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,YAAY;IAC3B,iDAAiD;IACjD,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,iDAAiD;IACjD,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,uCAAuC;IACvC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,8BAA8B;IAC9B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,+BAA+B;IAC/B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,iCAAiC;IACjC,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,uEAAuE;IACvE,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,sGAAsG;IACtG,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,mFAAmF;IACnF,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,UAAU;IAC7C,wDAAwD;IACxD,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAkGD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAsB,KAAK,CAAC,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAsB5E"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/core/build.ts"],"names":[],"mappings":"AA0EA,OAAO,KAAK,EAEV,UAAU,EACV,MAAM,EAQP,MAAM,mBAAmB,CAAC;AAK3B,OAAO,KAAK,EAAkB,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGxE;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,gCAAgC;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,sCAAsC;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,YAAY;IAC3B,iDAAiD;IACjD,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,iDAAiD;IACjD,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,0CAA0C;IAC1C,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,uCAAuC;IACvC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,8BAA8B;IAC9B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,+BAA+B;IAC/B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,iCAAiC;IACjC,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,uEAAuE;IACvE,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,sGAAsG;IACtG,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,mFAAmF;IACnF,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,UAAU;IAC7C,wDAAwD;IACxD,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAkGD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAsB,KAAK,CAAC,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAqB5E"}

package/dist/core/build.js

@@ -1,4 +1,4 @@
-import { ensureDir, writeFile, remove, pathExists, stat, readdir, copyFile, resolveOutDir, resolveStaticDir, resolveCacheDir, enableInventoryTracking, disableInventoryTracking, clearInventory, writeTailwindClassInventory, getInventorySize, isTailwindUsed, loadPreviousInventory, compileTypeScript, detectExistingBundles, removeStaleBundleFiles, autoInjectBundles, getBundlePathsForPage, formatBytes, isVirtualPage, getPageOutputFile, } from './utils/index.js';
+import { ensureDir, writeFile, remove, pathExists, stat, readdir, copyFile, resolveOutDir, resolveStaticDir, resolveCacheDir, enableInventoryTracking, disableInventoryTracking, clearInventory, writeTailwindClassInventory, getInventorySize, isTailwindUsed, loadPreviousInventory, compileTypeScript, detectExistingBundles, removeStaleBundleFiles, autoInjectBundles, getBundlePathsForPage, formatBytes, isVirtualPage, getPageOutputFile, resolveSrcDir, } from './utils/index.js';
 import { join, dirname, relative, posix } from 'node:path';
 import { performance } from 'node:perf_hooks';
 import { loadConfig } from '../config/loader.js';
@@ -7,8 +7,9 @@ import { expandPages } from './expand.js';
 import { createSummaryHasher, resolveCollectionPath, resolveSummaryFields, } from './collections.js';
 import { createMarkdownProcessor, renderMarkdown, extractToc } from './markdown.js';
 import { createTemplateEngine, renderPage } from './templates.js';
+import { loadTemplateIndex } from './template-index.js';
 import { buildNavigation } from './navigation.js';
-import { loadCacheManifest, saveCacheManifest, shouldRebuildPage, createCacheEntry, updateCacheEntry, hasRecordedReads, pruneOrphanedPages, withBuildLock, computeNavigationHash, computeContentHash, clearFileHashCache, clearTemplatePathCache, } from './isg/index.js';
+import { loadCacheManifest, saveCacheManifest, shouldRebuildPage, createCacheEntry, updateCacheEntry, hasRecordedReads, pruneOrphanedPages, withBuildLock, computeNavigationHash, computeContentHash, clearFileHashCache, } from './isg/index.js';
 import { generateSitemap, generateRobotsTxtFromConfig, autoInjectSEO, } from '../seo/index.js';
 import { generateRSSFeeds, validateRSSConfig } from '../rss/index.js';
 import { computeSearchIndexFilename, generateSearchIndex, writeSearchIndex, removeStaleSearchIndexes, autoInjectSearchMeta, isGeneratedPageExcludedFromSearch, } from '../search/index.js';
@@ -139,7 +140,6 @@ export async function build(options = {}) {
     // Clear per-build caches at the start of each build
     // This prevents stale data from previous builds and ensures consistent state
     clearFileHashCache();
-    clearTemplatePathCache();
     // Ensure cache directory exists before acquiring build lock
     await ensureDir(cacheDir);
     // In dev mode, bypass file-based build lock (dev server handles concurrency via isBuildingRef
@@ -229,8 +229,7 @@ async function writeSearchIndexBeforeRendering(pages, config, md, outDir, logger
     const isDevMode = isDevelopment();
     const endSearchIndexSpan = recorder.startSpan('searchIndexGenerationMs');
     // TOC entries and markdown content, the same data a render produces, without rendering.
-    // Sorted by URL: content discovery returns files in a different order on each run, which
-    // would change the index content, and with it the name, on every build.
+    // Sorted by URL, so the index content, and with it the name, changes only when pages do.
     const tocEnabled = config.markdown?.toc !== false;
     const byUrl = (a, b) => a.url.localeCompare(b.url) || a.sourcePath.localeCompare(b.sourcePath);
     const searchablePages = pages
@@ -290,9 +289,11 @@ function hashableData(value) {
 /**
  * Processes pages with ISG caching logic.
  */
-async function processPagesWithCache(pages, manifest, config, outDir, md, eta, navigation, buildTime, options, logger, compiledBundles, recorder = noopMetricRecorder, imageRuntime = null, navigationHash = computeNavigationHash(navigation)) {
+async function processPagesWithCache(pages, manifest, config, outDir, md, eta, navigation, buildTime, options, logger, compiledBundles, recorder = noopMetricRecorder, imageRuntime = null, navigationHash = computeNavigationHash(navigation), templateIndex) {
     let cacheHits = 0;
     let cacheMisses = 0;
+    // Every .eta file under the source directory, read once for all pages
+    const index = templateIndex ?? (await loadTemplateIndex(resolveSrcDir(config)));
     // Build context
     const buildContext = { config, pages };
     // Run beforeAll hook
@@ -326,7 +327,9 @@ async function processPagesWithCache(pages, manifest, config, outDir, md, eta, n
     }
     // Track timing for shouldRebuildPage
     let totalShouldRebuildTime = 0;
+    let totalMarkdownTime = 0;
     let totalRenderTime = 0;
+    let totalPostRenderTime = 0;
     let totalFileWriteTime = 0;
     let totalCacheEntryTime = 0;
     // Batch pending writes for parallel execution (dev mode optimization)
@@ -402,7 +405,7 @@ async function processPagesWithCache(pages, manifest, config, outDir, md, eta, n
             (existingEntry !== undefined && !readsKnown) ||
             // A cached page whose generated images are gone is rebuilt to regenerate them
             (imageRuntime !== null && !imageRuntime.outputsExist(existingEntry?.images)) ||
-            (await shouldRebuildPage(page, existingEntry, config, pages, buildTime, renderInputsHash));
+            (await shouldRebuildPage(page, existingEntry, config, pages, buildTime, renderInputsHash, index));
         const shouldRebuildTime = performance.now() - shouldRebuildStart;
         totalShouldRebuildTime += shouldRebuildTime;
         if (!shouldRebuild) {
@@ -427,18 +430,23 @@ async function processPagesWithCache(pages, manifest, config, outDir, md, eta, n
         // Image state for this page: markup, dependencies and generated files
         const pageImages = imageRuntime?.createPageContext(page);
         // Render markdown to HTML with TOC extraction
+        const markdownStart = performance.now();
         const tocEnabled = config.markdown?.toc !== false;
         const { html: htmlContent, toc } = renderMarkdown(page.content, md, tocEnabled, {
             images: pageImages,
         });
+        totalMarkdownTime += performance.now() - markdownStart;
         // Render with template
         const renderPageStart = performance.now();
-        const renderResult = await renderPage(page, htmlContent, config, eta, navigation, pages, assets, toc, logger, { images: pageImages });
+        const renderResult = await renderPage(page, htmlContent, config, eta, navigation, pages, assets, toc, logger, { images: pageImages, templateIndex: index });
         const renderPageTime = performance.now() - renderPageStart;
         totalRenderTime += renderPageTime;
+        const postRenderStart = performance.now();
         let finalHtml = renderResult.html;
-        // Record templates loaded for this page
+        // Record the templates this page used and how often templates rendered
         recorder.increment('templatesLoaded', renderResult.templatesLoaded);
+        recorder.increment('templateRenders', renderResult.templateRenders);
+        recorder.increment('includeCacheHits', renderResult.includeCacheHits);
         // Auto-inject SEO tags if enabled
         if (config.seo?.autoInject !== false) {
             const injectOptions = {
@@ -474,13 +482,16 @@ async function processPagesWithCache(pages, manifest, config, outDir, md, eta, n
             assetDeps: committedImages?.assetDeps ?? [],
             images: committedImages?.images ?? [],
             reads: renderResult.reads,
+            templates: renderResult.templates,
+            templateLookups: renderResult.templateLookups,
         };
         const renderedInputsHash = renderInputsHashFor(renderResult.reads);
-        const renderTime = Math.round(performance.now() - startTime);
+        totalPostRenderTime += performance.now() - postRenderStart;
+        const renderTime = performance.now() - startTime;
         // Record page timing for rendered pages (includes template count)
-        recorder.recordPageTiming(page.url, renderTime, false, renderResult.templatesLoaded);
+        recorder.recordPageTiming(page.url, renderTime, false, renderResult.templatesLoaded, renderResult.templateRenders);
         if (logger.updateProgress) {
-            logger.updateProgress('rendered', page.url, renderTime);
+            logger.updateProgress('rendered', page.url, Math.round(renderTime));
         }
         // In dev mode, batch writes for parallel execution to avoid Windows filesystem slowdown
         if (isDevMode) {
@@ -502,12 +513,9 @@ async function processPagesWithCache(pages, manifest, config, outDir, md, eta, n
             // Update cache manifest
             if (!options.skipCacheUpdate) {
                 const cacheEntryStart = performance.now();
-                if (existingEntry) {
-                    manifest.entries[cacheKey] = await updateCacheEntry(existingEntry, page, config, pages, buildTime, false, renderedInputsHash, renderedAssets);
-                }
-                else {
-                    manifest.entries[cacheKey] = await createCacheEntry(page, config, pages, buildTime, renderedInputsHash, renderedAssets);
-                }
+                manifest.entries[cacheKey] = existingEntry
+                    ? await updateCacheEntry(existingEntry, page, config, buildTime, renderedInputsHash, renderedAssets)
+                    : await createCacheEntry(page, config, buildTime, renderedInputsHash, renderedAssets);
                 totalCacheEntryTime += performance.now() - cacheEntryStart;
             }
         }
@@ -527,26 +535,22 @@ async function processPagesWithCache(pages, manifest, config, outDir, md, eta, n
         // Write all files in parallel
         await Promise.all(pendingWrites.map((w) => writeFile(w.outputPath, w.content, 'utf-8')));
         totalFileWriteTime = performance.now() - fileWriteStart;
-        // Update cache entries SEQUENTIALLY with fast update (reuse existing deps)
-        // This avoids expensive template dependency tracking on each incremental rebuild
+        // Update cache entries sequentially, from the templates each render recorded
         if (!options.skipCacheUpdate) {
             const cacheEntryStart = performance.now();
             for (const { cacheKey, page, existingEntry, renderInputsHash, renderedAssets, } of pendingCacheUpdates) {
-                if (existingEntry) {
-                    // Fast update: reuse existing deps, just update hashes and timestamp
-                    manifest.entries[cacheKey] = await updateCacheEntry(existingEntry, page, config, pages, buildTime, true, // fastUpdate = true in dev mode
-                    renderInputsHash, renderedAssets);
-                }
-                else {
-                    manifest.entries[cacheKey] = await createCacheEntry(page, config, pages, buildTime, renderInputsHash, renderedAssets);
-                }
+                manifest.entries[cacheKey] = existingEntry
+                    ? await updateCacheEntry(existingEntry, page, config, buildTime, renderInputsHash, renderedAssets)
+                    : await createCacheEntry(page, config, buildTime, renderInputsHash, renderedAssets);
             }
             totalCacheEntryTime = performance.now() - cacheEntryStart;
         }
     }
     // Record detailed phase timings in metrics
     recorder.recordPhase('shouldRebuildTotalMs', totalShouldRebuildTime);
+    recorder.recordPhase('markdownRenderTotalMs', totalMarkdownTime);
     recorder.recordPhase('renderPageTotalMs', totalRenderTime);
+    recorder.recordPhase('postRenderTotalMs', totalPostRenderTime);
     recorder.recordPhase('fileWriteTotalMs', totalFileWriteTime);
     recorder.recordPhase('cacheEntryTotalMs', totalCacheEntryTime);
     // Display final progress summary
@@ -732,9 +736,15 @@ async function buildInternal(options = {}) {
     if (logger.step) {
         console.log(); // Add spacing before page processing
     }
+    // Every template under the source directory, read once per build; a dev server session
+    // keeps one between rebuilds and updates it as templates are added and deleted
+    const endTemplateIndexSpan = recorder.startSpan('templateIndexMs');
+    const templateIndex = await loadTemplateIndex(resolveSrcDir(config));
+    endTemplateIndexSpan();
+    recorder.increment('templatesIndexed', templateIndex.size);
     const endPageRenderSpan = recorder.startSpan('pageRenderingMs');
     const buildTime = new Date();
-    const pageProcessingResult = await processPagesWithCache(pages, manifest, config, outDir, md, eta, navigation, buildTime, options, logger, compiledBundles, recorder, imageRuntime, navigationHash);
+    const pageProcessingResult = await processPagesWithCache(pages, manifest, config, outDir, md, eta, navigation, buildTime, options, logger, compiledBundles, recorder, imageRuntime, navigationHash, templateIndex);
     endPageRenderSpan();
     const { cacheHits, cacheMisses, searchIndexFilename } = pageProcessingResult;
     // Remove the output of pages that no longer exist, such as a deleted post or a tag no post

package/dist/core/content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content.d.ts","sourceRoot":"","sources":["../../src/core/content.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhE;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,WAAW,EACnB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,SAAS,EAAE,CAAC,CAiDtB"}
+{"version":3,"file":"content.d.ts","sourceRoot":"","sources":["../../src/core/content.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhE;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,WAAW,EACnB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,SAAS,EAAE,CAAC,CAsDtB"}

package/dist/core/content.js

@@ -1,6 +1,5 @@
-import glob from 'fast-glob';
-import { readFile, resolveSrcDir, getFrontMatterDate } from './utils/index.js';
-import matter from 'gray-matter';
+import { glob } from 'tinyglobby';
+import { readFile, resolveSrcDir, getFrontMatterDate, parseFrontMatter } from './utils/index.js';
 import { relative, dirname, basename } from 'node:path';
 import { MARKDOWN_EXTENSION } from '../constants.js';
 /**
@@ -21,12 +20,15 @@ import { MARKDOWN_EXTENSION } from '../constants.js';
  */
 export async function loadContent(config, includeDrafts) {
     const contentDir = resolveSrcDir(config);
-    // Exclude folders starting with underscore from content discovery
-    const files = await glob('**/*.md', {
+    // Exclude folders starting with underscore from content discovery. Sorted, because the
+    // file system lists files in no fixed order, and pages that sort equally in listings and
+    // feeds keep the order they were found in.
+    const files = (await glob('**/*.md', {
         cwd: contentDir,
         absolute: true,
         ignore: ['**/_*/**', '_*/**'],
-    });
+        expandDirectories: false,
+    })).sort();
     const pages = [];
     for (const file of files) {
         const content = await readFile(file, 'utf-8');
@@ -34,7 +36,7 @@ export async function loadContent(config, includeDrafts) {
             console.warn(`Skipping file ${file}: could not read content`);
             continue;
         }
-        const { data: frontMatter, content: markdown } = matter(content);
+        const { data: frontMatter, content: markdown } = parseFrontMatter(content, file);
         // Skip drafts unless explicitly included
         if (frontMatter.draft && !includeDrafts) {
             continue;

package/dist/core/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/core/dev.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAoC7D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;CACb;AAmZD,wBAAsB,eAAe,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,CAmhBxF"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/core/dev.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,mBAAmB,CAAC;AA4C7D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;CACb;AAyaD,wBAAsB,eAAe,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,CAwdxF"}