@xingwangzhe/stalux 1.3.9 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xingwangzhe/stalux",
-    "version": "1.3.9",
+    "version": "1.4.1",
     "description": "A powerful, modern Astro blog theme \u2014 use as template or install as plugin",
     "keywords": [
         "astro",
@@ -73,8 +73,10 @@
         "prepare": "git config core.hooksPath scripts/git-hooks"
     },
     "dependencies": {
+        "@astrojs/rss": "^4.0.19",
         "@astrojs/sitemap": "^3.7.3",
         "@expressive-code/plugin-line-numbers": "^0.44.1",
+        "@lucide/astro": "^1.27.0",
         "@pagefind/component-ui": "^1.5.2",
         "@waline/client": "3.15.2",
         "@xingwangzhe/satteri-mermaid": "0.7.1",
@@ -83,15 +85,13 @@
         "animejs": "^4.5.0",
         "astro": "^7.1.3",
         "astro-expressive-code": "^0.44.1",
-        "pagefind": "^1.5.2",
-        "photoswipe": "^5.4.4",
-        "subset-font": "^2.5.0",
-        "@astrojs/rss": "^4.0.19",
         "astro-seo": "^1.1.0",
         "astro-typewriter": "^1.2.0",
-        "@lucide/astro": "^1.27.0",
         "badge-maker": "^6.0.0",
+        "pagefind": "^1.5.2",
+        "photoswipe": "^5.4.4",
         "simple-icons": "^16.27.1",
+        "subset-font": "^2.5.0",
         "temml": "^0.13.3"
     },
     "devDependencies": {

package/src/index.ts

@@ -192,14 +192,14 @@ export function stalux(options: StaluxOptions = {}): AstroIntegration {
                 // 5. 字体裁剪（在 config:setup 阶段执行，保证 dev/build 都能生成）
                 try {
                     const projectRoot = process.cwd();
-                    await runFontSubsetting(projectRoot, logger);
+                    await runFontSubsetting(projectRoot, logger, true);
                 } catch (error) {
                     logger.debug(`Font subsetting deferred: ${String(error)}`);
                 }
             },
 
             "astro:build:start": async ({ logger }) => {
-                // 6. 字体裁剪（构建时备用）
+                // 6. 字体裁剪（构建时，生成全部路由子集）
                 try {
                     const projectRoot = process.cwd();
                     await runFontSubsetting(projectRoot, logger);
@@ -209,10 +209,10 @@ export function stalux(options: StaluxOptions = {}): AstroIntegration {
             },
 
             "astro:server:setup": async ({ logger }) => {
-                // 7. 字体裁剪（开发模式备用）
+                // 7. 字体裁剪（开发模式，仅 common 子集）
                 try {
                     const projectRoot = process.cwd();
-                    await runFontSubsetting(projectRoot, logger);
+                    await runFontSubsetting(projectRoot, logger, true);
                 } catch (error) {
                     logger.debug(`Font subsetting deferred in dev: ${String(error)}`);
                 }

package/src/internal/font-subset.ts

@@ -191,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("");
 }
 
@@ -215,34 +229,39 @@ function deduplicate(routes: RouteCharSet[]): Map<string, string[]> {
 
 /**
  * Run font subsetting during build.
- * Called from astro:build:start hook.
+ * Called from integration hooks.
+ *
+ * @param projectRoot - Project root directory
+ * @param logger - Astro integration logger
+ * @param skipPerRoute - Skip per-route subsets (for dev mode, only generate common)
  */
 export async function runFontSubsetting(
-  projectRoot: string,
-  logger: AstroIntegrationLogger,
+    projectRoot: string,
+    logger: AstroIntegrationLogger,
+    skipPerRoute = false,
 ): Promise<void> {
-  logger.info("Font subsetting: scanning content...");
-
-  // 1. Locate font file (check project root first, then stalux package dir)
-  const fontPaths = [
-    resolve(projectRoot, FONT_INPUT),
-    resolve(projectRoot, "node_modules", "@xingwangzhe", "stalux", FONT_INPUT),
-    resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", FONT_INPUT),
-  ];
-
-  let fontPath: string | undefined;
-  for (const p of fontPaths) {
-    if (existsSync(p)) {
-      fontPath = p;
-      break;
+    logger.info("Font subsetting: scanning content...");
+
+    // 1. Locate font file (check project root first, then stalux package dir)
+    const fontPaths = [
+        resolve(projectRoot, FONT_INPUT),
+        resolve(projectRoot, "node_modules", "@xingwangzhe", "stalux", FONT_INPUT),
+        resolve(dirname(fileURLToPath(import.meta.url)), "..", "..", FONT_INPUT),
+    ];
+
+    let fontPath: string | undefined;
+    for (const p of fontPaths) {
+        if (existsSync(p)) {
+            fontPath = p;
+            break;
+        }
     }
-  }
 
-  if (!fontPath) {
-    logger.warn(`Font not found at ${FONT_INPUT}, skipping subsetting`);
-    return;
-  }
-  const fontBuffer = readFileSync(fontPath);
+    if (!fontPath) {
+        logger.warn(`Font not found at ${FONT_INPUT}, skipping subsetting`);
+        return;
+    }
+    const fontBuffer = readFileSync(fontPath);
 
     // 2. Scan content files
     const contentFiles = scanContent(projectRoot);
@@ -295,69 +314,71 @@ export async function runFontSubsetting(
 `;
     writeFileSync(join(outDir, "common.css"), commonCSS);
 
-    // Generate per-route subsets (deduplicated) and their CSS
     const groups = deduplicate(routeSets);
     const routeMap: Record<string, string> = {};
     const postMap: Record<string, string> = {};
 
     let subsetCount = 0;
-    // Track which subsets we've already generated CSS for
     const cssGenerated = new Set<string>();
 
-    for (const [hash, routes] of groups) {
-        const filename = `subset-${hash}.woff2`;
-        const outPath = join(outDir, filename);
-        if (!existsSync(outPath)) {
-            // Find the route chars for this hash
-            const route = routeSets.find((r) => r.hash === hash);
-            const chars = route?.chars ?? "";
-            // Only subset characters NOT in common (already covered by common.css)
-            const uniqueChars = chars
-                .split("")
-                .filter((ch) => !commonChars.includes(ch))
-                .join("");
-            if (uniqueChars.length > 0) {
-                const data = await subsetFont(fontBuffer, uniqueChars, { targetFormat: "woff2" });
-                writeFileSync(outPath, data);
-                subsetCount++;
-                logger.info(
-                    `  subset ${subsetCount}: ${(data.length / 1024).toFixed(1)} KB → ${filename}`,
-                );
+    if (!skipPerRoute) {
+        for (const [hash, routes] of groups) {
+            const filename = `subset-${hash}.woff2`;
+            const outPath = join(outDir, filename);
+            if (!existsSync(outPath)) {
+                // Find the route chars for this hash
+                const route = routeSets.find((r) => r.hash === hash);
+                const chars = route?.chars ?? "";
+                // Only subset characters NOT in common (already covered by common.css)
+                const uniqueChars = chars
+                    .split("")
+                    .filter((ch) => !commonChars.includes(ch))
+                    .join("");
+                if (uniqueChars.length > 0) {
+                    const data = await subsetFont(fontBuffer, uniqueChars, {
+                        targetFormat: "woff2",
+                    });
+                    writeFileSync(outPath, data);
+                    subsetCount++;
+                    logger.info(
+                        `  subset ${subsetCount}: ${(data.length / 1024).toFixed(1)} KB → ${filename}`,
+                    );
+                }
             }
-        }
 
-        // Generate per-route CSS (one per unique hash, references all routes with this hash)
-        if (!cssGenerated.has(hash)) {
-            cssGenerated.add(hash);
-            for (const route of routes) {
-                const cssContent = `/* Auto-generated font subset for route: ${route} */
+            // Generate per-route CSS (one per unique hash, references all routes with this hash)
+            if (!cssGenerated.has(hash)) {
+                cssGenerated.add(hash);
+                for (const route of routes) {
+                    const cssContent = `/* Auto-generated font subset for route: ${route} */
 @font-face {
     font-family: "LXGW WenKai Subset";
     src: url("/fonts/${filename}") format("woff2");
     font-display: swap;
 }
 `;
-                // Use first route's name as the CSS filename (they share the same subset)
-                const cssName = routes.length === 1 ? route.replace("/", "-") : `group-${hash}`;
-                const cssFilename = `subset-${cssName}.css`;
-                writeFileSync(join(outDir, cssFilename), cssContent);
-                routeMap[route] = cssFilename;
-
-                if (route.startsWith("posts/")) {
-                    const abbrlink = route.replace("posts/", "");
-                    postMap[abbrlink] = cssFilename;
+                    // Use first route's name as the CSS filename (they share the same subset)
+                    const cssName = routes.length === 1 ? route.replace("/", "-") : `group-${hash}`;
+                    const cssFilename = `subset-${cssName}.css`;
+                    writeFileSync(join(outDir, cssFilename), cssContent);
+                    routeMap[route] = cssFilename;
+
+                    if (route.startsWith("posts/")) {
+                        const abbrlink = route.replace("posts/", "");
+                        postMap[abbrlink] = cssFilename;
+                    }
                 }
-            }
-        } else {
-            // CSS already generated, just map
-            for (const route of routes) {
-                const cssFilename =
-                    routes.length === 1
-                        ? `subset-${route.replace("/", "-")}.css`
-                        : `subset-group-${hash}.css`;
-                routeMap[route] = cssFilename;
-                if (route.startsWith("posts/")) {
-                    postMap[route.replace("posts/", "")] = cssFilename;
+            } else {
+                // CSS already generated, just map
+                for (const route of routes) {
+                    const cssFilename =
+                        routes.length === 1
+                            ? `subset-${route.replace("/", "-")}.css`
+                            : `subset-group-${hash}.css`;
+                    routeMap[route] = cssFilename;
+                    if (route.startsWith("posts/")) {
+                        postMap[route.replace("posts/", "")] = cssFilename;
+                    }
                 }
             }
         }

package/src/layouts/Stalux.astro

@@ -28,8 +28,8 @@ const authorConfig = getAuthorData(configEntries);
 const promoteConfig = getPromoteData(configEntries);
 const htmlLang = siteConfig.lang || "zh-CN";
 
-// Resolve font subset CSS URL
-const fontSubsetUrl = props.fontSubsetId
+// Resolve font subset CSS URL (only in build mode, dev mode uses only common subset)
+const fontSubsetUrl = import.meta.env.PROD && props.fontSubsetId
   ? `/fonts/subset-${props.fontSubsetId}.css`
   : undefined;
 

package/template/astro.config.mjs

@@ -2,9 +2,9 @@ import { satteri } from "@astrojs/markdown-satteri";
 import sitemap from "@astrojs/sitemap";
 import { mermaidHast } from "@xingwangzhe/satteri-mermaid";
 import { photoswipe } from "@xingwangzhe/satteri-photoswipe";
+import stalux from "@xingwangzhe/stalux";
 import expressiveCode from "astro-expressive-code";
 import { defineConfig, fontProviders } from "astro/config";
-import stalux from "@xingwangzhe/stalux";
 
 // https://astro.build/config
 export default defineConfig({
@@ -24,12 +24,16 @@ export default defineConfig({
                     {
                         weight: "100 900",
                         style: "normal",
-                        src: ["./node_modules/@xingwangzhe/stalux/src/assets/fonts/GoogleSansCode.woff2"],
+                        src: [
+                            "./node_modules/@xingwangzhe/stalux/src/assets/fonts/GoogleSansCode.woff2",
+                        ],
                     },
                     {
                         weight: "100 900",
                         style: "italic",
-                        src: ["./node_modules/@xingwangzhe/stalux/src/assets/fonts/GoogleSansCode-Italic.woff2"],
+                        src: [
+                            "./node_modules/@xingwangzhe/stalux/src/assets/fonts/GoogleSansCode-Italic.woff2",
+                        ],
                     },
                 ],
             },