@xingwangzhe/stalux 1.3.8 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xingwangzhe/stalux",
-    "version": "1.3.8",
+    "version": "1.4.0",
     "description": "A powerful, modern Astro blog theme \u2014 use as template or install as plugin",
     "keywords": [
         "astro",

package/src/index.ts

@@ -136,7 +136,7 @@ export function stalux(options: StaluxOptions = {}): AstroIntegration {
     return {
         name: "stalux",
         hooks: {
-            "astro:config:setup": ({
+            "astro:config:setup": async ({
                 injectRoute,
                 injectScript,
                 updateConfig,
@@ -188,27 +188,35 @@ export function stalux(options: StaluxOptions = {}): AstroIntegration {
                 }
 
                 logger.info(`Stalux initialized (contentDir: ${opt.contentDir})`);
+
+                // 5. 字体裁剪（在 config:setup 阶段执行，保证 dev/build 都能生成）
+                try {
+                    const projectRoot = process.cwd();
+                    await runFontSubsetting(projectRoot, logger);
+                } catch (error) {
+                    logger.debug(`Font subsetting deferred: ${String(error)}`);
+                }
             },
 
-      "astro:build:start": async ({ logger }) => {
-        // 5. 每路由最小化字体裁剪（构建时）
-        try {
-          const projectRoot = process.cwd();
-          await runFontSubsetting(projectRoot, logger);
-        } catch (error) {
-          logger.warn(`Font subsetting skipped: ${String(error)}`);
-        }
-      },
-
-      "astro:server:setup": async ({ logger }) => {
-        // 6. 每路由最小化字体裁剪（开发模式）
-        try {
-          const projectRoot = process.cwd();
-          await runFontSubsetting(projectRoot, logger);
-        } catch (error) {
-          logger.warn(`Font subsetting skipped: ${String(error)}`);
-        }
-      },
+            "astro:build:start": async ({ logger }) => {
+                // 6. 字体裁剪（构建时备用）
+                try {
+                    const projectRoot = process.cwd();
+                    await runFontSubsetting(projectRoot, logger);
+                } catch (error) {
+                    logger.warn(`Font subsetting skipped: ${String(error)}`);
+                }
+            },
+
+            "astro:server:setup": async ({ logger }) => {
+                // 7. 字体裁剪（开发模式备用）
+                try {
+                    const projectRoot = process.cwd();
+                    await runFontSubsetting(projectRoot, logger);
+                } catch (error) {
+                    logger.debug(`Font subsetting deferred in dev: ${String(error)}`);
+                }
+            },
 
             "astro:build:done": async ({ dir, logger }) => {
                 // 6. 后处理：Pagefind 搜索索引

package/src/internal/font-subset.ts

@@ -17,7 +17,8 @@
 
 import { createHash } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, writeFileSync, readdirSync } from "node:fs";
-import { resolve, basename, extname, join } from "node:path";
+import { resolve, basename, extname, join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
 
 import type { AstroIntegrationLogger } from "astro";
 // subset-font 是 WASM 模块，需要静态导入（Vite module runner 在构建钩子中不兼容动态 import）
@@ -190,6 +191,20 @@ function collectCommonChars(projectRoot: string): string {
 
     scanDir(srcDir);
 
+    // Also scan user config YAML files for nav titles, descriptions, etc.
+    const configDir = resolve(projectRoot, CONTENT_ROOT, "config");
+    if (existsSync(configDir)) {
+        for (const f of readdirSync(configDir)) {
+            if (!f.endsWith(".yml") && !f.endsWith(".yaml")) continue;
+            try {
+                const content = readFileSync(join(configDir, f), "utf-8");
+                for (const ch of content) chars.add(ch);
+            } catch {
+                /* skip */
+            }
+        }
+    }
+
     return [...chars].sort().join("");
 }
 
@@ -223,11 +238,10 @@ export async function runFontSubsetting(
   logger.info("Font subsetting: scanning content...");
 
   // 1. Locate font file (check project root first, then stalux package dir)
-  const { fileURLToPath } = await import("node:url");
   const fontPaths = [
     resolve(projectRoot, FONT_INPUT),
     resolve(projectRoot, "node_modules", "@xingwangzhe", "stalux", FONT_INPUT),
-    resolve(fileURLToPath(new URL("..", import.meta.url)), "..", FONT_INPUT),
+    resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", FONT_INPUT),
   ];
 
   let fontPath: string | undefined;