@stati/core 1.13.0 → 1.14.0

package/dist/core/build.js

@@ -9,7 +9,7 @@ import { loadCacheManifest, saveCacheManifest, shouldRebuildPage, createCacheEnt
 import { generateSitemap, generateRobotsTxtFromConfig, autoInjectSEO, } from '../seo/index.js';
 import { generateRSSFeeds, validateRSSConfig } from '../rss/index.js';
 import { getEnv } from '../env.js';
-import { DEFAULT_TS_OUT_DIR } from '../constants.js';
+import { DEFAULT_TS_OUT_DIR, DEFAULT_OUT_DIR } from '../constants.js';
 /**
  * Recursively calculates the total size of a directory in bytes.
  * Used for build statistics.
@@ -244,23 +244,12 @@ async function processPagesWithCache(pages, manifest, config, outDir, md, eta, n
         // Cache miss - need to rebuild
         cacheMisses++;
         const startTime = Date.now();
-        // Add rendering substeps to tree
-        const markdownId = `${pageId}-markdown`;
-        const templateId = `${pageId}-template`;
-        if (logger.addTreeNode) {
-            logger.addTreeNode(pageId, markdownId, 'Processing Markdown', 'running');
-            logger.addTreeNode(pageId, templateId, 'Applying Template', 'pending');
-        }
         // Run beforeRender hook
         if (config.hooks?.beforeRender) {
             await config.hooks.beforeRender({ page, config });
         }
         // Render markdown to HTML
         const htmlContent = renderMarkdown(page.content, md);
-        if (logger.updateTreeNode) {
-            logger.updateTreeNode(markdownId, 'completed');
-            logger.updateTreeNode(templateId, 'running');
-        }
         // Render with template
         let finalHtml = await renderPage(page, htmlContent, config, eta, navigation, pages, assets);
         // Auto-inject SEO tags if enabled
@@ -282,7 +271,6 @@ async function processPagesWithCache(pages, manifest, config, outDir, md, eta, n
         }
         const renderTime = Date.now() - startTime;
         if (logger.updateTreeNode) {
-            logger.updateTreeNode(templateId, 'completed');
             logger.updateTreeNode(pageId, 'completed', {
                 timing: renderTime,
                 url: page.url,
@@ -407,7 +395,7 @@ async function buildInternal(options = {}) {
         tsResult = await compileTypeScript({
             projectRoot: process.cwd(),
             config: config.typescript,
-            outDir: config.outDir || 'dist',
+            outDir: config.outDir || DEFAULT_OUT_DIR,
             mode: getEnv() === 'production' ? 'production' : 'development',
             logger,
         });
@@ -432,6 +420,7 @@ async function buildInternal(options = {}) {
         const inventorySize = getInventorySize();
         if (inventorySize > 0) {
             await writeTailwindClassInventory(cacheDir);
+            logger.info('');
             logger.info(`📝 Generated Tailwind class inventory (${inventorySize} classes tracked)`);
         }
         // Disable inventory tracking after build

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

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/core/dev.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAsB7D,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;AA4SD,wBAAsB,eAAe,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,CAwaxF"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/core/dev.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,mBAAmB,CAAC;AA2B7D,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;AA4SD,wBAAsB,eAAe,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,CAwaxF"}

package/dist/core/dev.js

@@ -11,7 +11,7 @@ import { loadContent } from './content.js';
 import { buildNavigation } from './navigation.js';
 import { resolveDevPaths, resolveCacheDir, resolvePrettyUrl, createErrorOverlay, parseErrorDetails, TemplateError, createFallbackLogger, mergeServerOptions, createTypeScriptWatcher, } from './utils/index.js';
 import { setEnv, getEnv } from '../env.js';
-import { DEFAULT_DEV_PORT, DEFAULT_DEV_HOST, TEMPLATE_EXTENSION } from '../constants.js';
+import { DEFAULT_DEV_PORT, DEFAULT_DEV_HOST, TEMPLATE_EXTENSION, DEFAULT_OUT_DIR, } from '../constants.js';
 /**
  * Loads and validates configuration for the dev server.
  */
@@ -527,11 +527,11 @@ export async function createDevServer(options = {}) {
                     tsWatcher = await createTypeScriptWatcher({
                         projectRoot: process.cwd(),
                         config: config.typescript,
-                        outDir: config.outDir || 'dist',
+                        outDir: config.outDir || DEFAULT_OUT_DIR,
                         mode: 'development',
                         logger,
-                        onRebuild: () => {
-                            logger.info?.('TypeScript recompiled, triggering reload...');
+                        onRebuild: (bundlePath, compileTimeMs) => {
+                            logger.info?.(`⚡ ${bundlePath} recompiled in ${compileTimeMs}ms`);
                             // Broadcast reload to WebSocket clients
                             if (wsServer) {
                                 wsServer.clients.forEach((client) => {

package/dist/core/utils/typescript.utils.d.ts

@@ -31,9 +31,19 @@ export interface CompileResult {
 /**
  * Options for TypeScript file watcher.
  */
-export interface WatchOptions extends CompileOptions {
-    /** Callback invoked when files are recompiled */
-    onRebuild: () => void;
+export interface WatchOptions {
+    /** Project root directory */
+    projectRoot: string;
+    /** TypeScript configuration */
+    config: TypeScriptConfig;
+    /** Output directory for the build */
+    outDir?: string;
+    /** Build mode */
+    mode: 'development' | 'production';
+    /** Logger instance */
+    logger: Logger;
+    /** Callback when rebuild completes, receives bundle path and compile time in ms */
+    onRebuild: (bundlePath: string, compileTimeMs: number) => void;
 }
 /**
  * Compile TypeScript files using esbuild.

package/dist/core/utils/typescript.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typescript.utils.d.ts","sourceRoot":"","sources":["../../../src/core/utils/typescript.utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAInC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAQrD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,oCAAoC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,+BAA+B;IAC/B,MAAM,EAAE,gBAAgB,CAAC;IACzB,4CAA4C;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uBAAuB;IACvB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,iCAAiC;IACjC,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,0GAA0G;IAC1G,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,YAAa,SAAQ,cAAc;IAClD,iDAAiD;IACjD,SAAS,EAAE,MAAM,IAAI,CAAC;CACvB;AAiCD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CA8CvF;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAiD/B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAgB5E;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM/E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAgCzE"}
+{"version":3,"file":"typescript.utils.d.ts","sourceRoot":"","sources":["../../../src/core/utils/typescript.utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAInC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AASrD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,oCAAoC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,+BAA+B;IAC/B,MAAM,EAAE,gBAAgB,CAAC;IACzB,4CAA4C;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uBAAuB;IACvB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,iCAAiC;IACjC,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,0GAA0G;IAC1G,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,6BAA6B;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,+BAA+B;IAC/B,MAAM,EAAE,gBAAgB,CAAC;IACzB,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB;IACjB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,mFAAmF;IACnF,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;CAChE;AAiCD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CA+CvF;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAsD/B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAgB5E;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM/E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAsCzE"}

package/dist/core/utils/typescript.utils.js

@@ -7,7 +7,7 @@ import * as esbuild from 'esbuild';
 import * as path from 'node:path';
 import * as fs from 'node:fs/promises';
 import { pathExists } from './fs.utils.js';
-import { DEFAULT_TS_SRC_DIR, DEFAULT_TS_OUT_DIR, DEFAULT_TS_ENTRY_POINT, DEFAULT_TS_BUNDLE_NAME, } from '../../constants.js';
+import { DEFAULT_TS_SRC_DIR, DEFAULT_TS_OUT_DIR, DEFAULT_TS_ENTRY_POINT, DEFAULT_TS_BUNDLE_NAME, DEFAULT_OUT_DIR, } from '../../constants.js';
 function resolveConfig(config, mode) {
     const isProduction = mode === 'production';
     return {
@@ -46,13 +46,14 @@ export async function compileTypeScript(options) {
     const resolved = resolveConfig(config, mode);
     const entryPath = path.join(projectRoot, resolved.srcDir, resolved.entryPoint);
     // Output to configured build output directory (default: dist)
-    const outDir = path.join(projectRoot, globalOutDir || 'dist', resolved.outDir);
+    const outDir = path.join(projectRoot, globalOutDir || DEFAULT_OUT_DIR, resolved.outDir);
     // Validate entry point exists
     if (!(await pathExists(entryPath))) {
         logger.warning(`TypeScript entry point not found: ${entryPath}`);
         logger.warning('Skipping TypeScript compilation.');
         return {};
     }
+    logger.info(''); // Add empty line before TypeScript compilation
     logger.info('Compiling TypeScript...');
     try {
         const result = await esbuild.build({
@@ -108,7 +109,7 @@ export async function createTypeScriptWatcher(options) {
     const resolved = resolveConfig(config, mode);
     const entryPath = path.join(projectRoot, resolved.srcDir, resolved.entryPoint);
     // Output to configured build output directory (default: dist)
-    const outDir = path.join(projectRoot, globalOutDir || 'dist', resolved.outDir);
+    const outDir = path.join(projectRoot, globalOutDir || DEFAULT_OUT_DIR, resolved.outDir);
     // Validate entry point exists
     if (!(await pathExists(entryPath))) {
         logger.warning(`TypeScript entry point not found: ${entryPath}`);
@@ -129,15 +130,20 @@ export async function createTypeScriptWatcher(options) {
             {
                 name: 'stati-rebuild-notify',
                 setup(build) {
+                    let startTime;
+                    build.onStart(() => {
+                        startTime = Date.now();
+                    });
                     build.onEnd((result) => {
+                        const compileTime = Date.now() - startTime;
                         if (result.errors.length > 0) {
                             result.errors.forEach((err) => {
                                 logger.error(`TypeScript error: ${err.text}`);
                             });
                         }
                         else {
-                            logger.info('TypeScript recompiled.');
-                            onRebuild();
+                            const bundlePath = `${globalOutDir || DEFAULT_OUT_DIR}/${resolved.outDir}/${resolved.bundleName}.js`;
+                            onRebuild(bundlePath, compileTime);
                         }
                     });
                 },
@@ -219,8 +225,11 @@ export function autoInjectBundle(html, bundlePath) {
         // Invalid path format, skip injection to prevent potential XSS
         return html;
     }
-    // Check if the bundle is already included (avoid duplicate injection)
-    if (html.includes(bundlePath)) {
+    // Check if the bundle script tag is already included (avoid duplicate injection)
+    // Must check for actual script tag, not just any occurrence of the path
+    // (e.g., modulepreload links should not prevent script injection)
+    const scriptTagPattern = new RegExp(`<script[^>]*\\ssrc=["']${bundlePath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}["'][^>]*>`, 'i');
+    if (scriptTagPattern.test(html)) {
         return html;
     }
     // Find </body> tag (case-insensitive)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stati/core",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",