valaxy 0.26.8 → 0.26.9

package/dist/node/cli/index.mjs

@@ -1,13 +1,15 @@
 import 'node:process';
 import 'yargs';
 import 'yargs/helpers';
-export { c as cli, d as registerDevCommand, r as run, a as startValaxyDev } from '../../shared/valaxy.DHoKJedg.mjs';
+export { c as cli, d as registerDevCommand, r as run, a as startValaxyDev } from '../../shared/valaxy.B5JLGXpW.mjs';
+import 'node:os';
 import 'node:path';
 import 'consola';
 import 'consola/utils';
 import 'fast-glob';
 import 'fs-extra';
 import 'gray-matter';
+import 'js-yaml';
 import '@antfu/utils';
 import 'debug';
 import 'pathe';
@@ -20,7 +22,6 @@ import 'ora';
 import 'cross-spawn';
 import 'mlly';
 import 'resolve-global';
-import 'js-yaml';
 import 'node:fs/promises';
 import 'dayjs';
 import 'feed';
@@ -56,7 +57,6 @@ import 'pascalcase';
 import 'lru-cache';
 import 'html-to-text';
 import 'unplugin-vue-router/vite';
-import 'node:os';
 import '@clack/prompts';
 import 'node:net';
 import 'node:child_process';

package/dist/node/index.mjs

@@ -1,4 +1,4 @@
-export { C as ALL_ROUTE, E as EXCERPT_SEPARATOR, G as GLOBAL_STATE, P as PATHNAME_PROTOCOL_RE, V as ViteValaxyPlugins, b as build, c as cli, N as createServer, L as createValaxyPlugin, D as customElements, j as defaultSiteConfig, w as defaultValaxyConfig, F as defaultViteConfig, h as defineAddon, y as defineConfig, k as defineSiteConfig, u as defineTheme, f as defineValaxyAddon, x as defineValaxyConfig, t as defineValaxyTheme, O as encryptContent, g as generateClientRedirects, Q as getGitTimestamp, e as getIndexHtml, M as getServerInfoText, R as isExternal, U as isInstalledGlobally, S as isPath, v as loadConfigFromFile, A as mergeValaxyConfig, m as mergeViteConfigs, p as postProcessForSSG, I as processValaxyOptions, d as registerDevCommand, i as resolveAddonsConfig, Y as resolveImportPath, W as resolveImportUrl, J as resolveOptions, n as resolveSiteConfig, l as resolveSiteConfigFromRoot, o as resolveThemeConfigFromRoot, K as resolveThemeValaxyConfig, q as resolveUserThemeConfig, B as resolveValaxyConfig, z as resolveValaxyConfigFromRoot, r as run, s as ssgBuild, a as startValaxyDev, X as toAtFS, T as transformObject, H as version } from '../shared/valaxy.DHoKJedg.mjs';
+export { C as ALL_ROUTE, E as EXCERPT_SEPARATOR, G as GLOBAL_STATE, P as PATHNAME_PROTOCOL_RE, V as ViteValaxyPlugins, b as build, c as cli, N as createServer, L as createValaxyPlugin, D as customElements, j as defaultSiteConfig, w as defaultValaxyConfig, F as defaultViteConfig, h as defineAddon, y as defineConfig, k as defineSiteConfig, u as defineTheme, f as defineValaxyAddon, x as defineValaxyConfig, t as defineValaxyTheme, O as encryptContent, g as generateClientRedirects, Q as getGitTimestamp, e as getIndexHtml, M as getServerInfoText, R as isExternal, U as isInstalledGlobally, S as isPath, v as loadConfigFromFile, A as mergeValaxyConfig, m as mergeViteConfigs, p as postProcessForSSG, I as processValaxyOptions, d as registerDevCommand, i as resolveAddonsConfig, Y as resolveImportPath, W as resolveImportUrl, J as resolveOptions, n as resolveSiteConfig, l as resolveSiteConfigFromRoot, o as resolveThemeConfigFromRoot, K as resolveThemeValaxyConfig, q as resolveUserThemeConfig, B as resolveValaxyConfig, z as resolveValaxyConfigFromRoot, r as run, s as ssgBuild, a as startValaxyDev, X as toAtFS, T as transformObject, H as version } from '../shared/valaxy.B5JLGXpW.mjs';
 import 'node:path';
 import 'fs-extra';
 import 'consola/utils';
@@ -6,9 +6,11 @@ import 'node:process';
 import 'define-config-ts';
 import 'yargs';
 import 'yargs/helpers';
+import 'node:os';
 import 'consola';
 import 'fast-glob';
 import 'gray-matter';
+import 'js-yaml';
 import '@antfu/utils';
 import 'debug';
 import 'pathe';
@@ -20,7 +22,6 @@ import 'ora';
 import 'cross-spawn';
 import 'mlly';
 import 'resolve-global';
-import 'js-yaml';
 import 'node:fs/promises';
 import 'dayjs';
 import 'feed';
@@ -56,7 +57,6 @@ import 'pascalcase';
 import 'lru-cache';
 import 'html-to-text';
 import 'unplugin-vue-router/vite';
-import 'node:os';
 import '@clack/prompts';
 import 'node:net';
 import 'node:child_process';

package/dist/shared/{valaxy.DHoKJedg.mjs → valaxy.B5JLGXpW.mjs}

@@ -1,12 +1,14 @@
 import process from 'node:process';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
+import os from 'node:os';
 import path$1, { join, dirname, resolve } from 'node:path';
 import { consola } from 'consola';
 import { colors } from 'consola/utils';
 import fg from 'fast-glob';
 import fs from 'fs-extra';
 import matter from 'gray-matter';
+import yaml, { CORE_SCHEMA } from 'js-yaml';
 import { ensurePrefix, slash, uniq, objectEntries, isObject, isFunction, ensureSuffix } from '@antfu/utils';
 import _debug from 'debug';
 import path, { resolve as resolve$1, join as join$1, relative } from 'pathe';
@@ -19,7 +21,6 @@ import ora from 'ora';
 import { spawn } from 'cross-spawn';
 import { resolvePath } from 'mlly';
 import { resolveGlobal } from 'resolve-global';
-import yaml, { CORE_SCHEMA } from 'js-yaml';
 import { readFile } from 'node:fs/promises';
 import dayjs from 'dayjs';
 import { Feed } from 'feed';
@@ -55,7 +56,6 @@ import pascalCase from 'pascalcase';
 import { LRUCache } from 'lru-cache';
 import { convert } from 'html-to-text';
 import VueRouter from 'unplugin-vue-router/vite';
-import os from 'node:os';
 import { intro, confirm, select, outro } from '@clack/prompts';
 import net from 'node:net';
 import { exec } from 'node:child_process';
@@ -162,6 +162,7 @@ function getGitTimestamp(file, type = "updated") {
 }
 
 const EXTERNAL_URL_RE = /^(?:[a-z]+:|\/\/)/i;
+const LOCALE_PREFIX = "$locale:";
 
 function tObject(data, lang) {
   if (data && typeof data === "object") {
@@ -1466,21 +1467,6 @@ function snippetPlugin(md, srcDir) {
   md.block.ruler.before("fence", "snippet", parser);
 }
 
-const globalTitleCollector = /* @__PURE__ */ new Set();
-function getGlobalTitleCollector() {
-  return globalTitleCollector;
-}
-function titleCollectorPlugin(md) {
-  const fence = md.renderer.rules.fence;
-  md.renderer.rules.fence = (...args) => {
-    const [tokens, idx] = args;
-    const token = tokens[idx];
-    const title = extractTitle(token.info);
-    globalTitleCollector.add(title);
-    return fence(...args);
-  };
-}
-
 const defaultCodeTheme = { light: "github-light", dark: "github-dark" };
 async function setupMarkdownPlugins(md, options, base = "/") {
   const mdOptions = options?.config.markdown || {};
@@ -1488,7 +1474,7 @@ async function setupMarkdownPlugins(md, options, base = "/") {
   const siteConfig = options?.config.siteConfig || {};
   if (mdOptions.preConfig)
     mdOptions.preConfig(md);
-  md.use(highlightLinePlugin).use(preWrapperPlugin, { theme, siteConfig }).use(snippetPlugin, options?.userRoot).use(titleCollectorPlugin).use(containerPlugin, {
+  md.use(highlightLinePlugin).use(preWrapperPlugin, { theme, siteConfig }).use(snippetPlugin, options?.userRoot).use(containerPlugin, {
     languages: siteConfig.languages,
     ...mdOptions?.container,
     blocks: {
@@ -1568,7 +1554,7 @@ async function setupMarkdownPlugins(md, options, base = "/") {
   return md;
 }
 
-const version = "0.26.8";
+const version = "0.26.9";
 
 const GLOBAL_STATE = {
   valaxyApp: void 0,
@@ -3513,65 +3499,18 @@ async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
     typedoc: "vscode-icons:file-type-typedoc",
     eslint: "vscode-icons:file-type-eslint"
   };
-  let cachedGroupIconsCSS = null;
-  const generateGroupIconsCSS = (id) => {
-    const codeBlockTitles = getGlobalTitleCollector();
-    const originalPlugin = groupIconVitePlugin({
-      customIcon: {
-        ...builtinCustomIcon,
-        ...valaxyConfig.groupIcons?.customIcon
-      },
-      defaultLabels: [
-        ...valaxyConfig.groupIcons?.defaultLabels || [],
-        ...Object.keys(builtinCustomIcon),
-        ...Object.keys(valaxyConfig.groupIcons?.customIcon || {}),
-        ...Array.from(codeBlockTitles)
-      ]
-    });
-    if (originalPlugin && typeof originalPlugin === "object" && "load" in originalPlugin) {
-      return originalPlugin.load(id);
-    }
-    return "";
-  };
-  const dynamicGroupIconPlugin = {
-    name: "post-process-add-group-icons",
-    enforce: "post",
-    configureServer(server) {
-      const markdownGlobs = roots.map((root) => `${root}/**/*.md`);
-      server.watcher.add(markdownGlobs);
-      server.watcher.on("change", (file) => {
-        if (file.endsWith(".md")) {
-          cachedGroupIconsCSS = null;
-          const module = server.moduleGraph.getModuleById("\0virtual:group-icons.css");
-          if (module) {
-            server.reloadModule(module);
-          }
-        }
-      });
-    },
-    resolveId(id) {
-      if (id === "virtual:group-icons.css") {
-        return "\0virtual:group-icons.css";
-      }
-      return void 0;
-    },
-    async load(id) {
-      if (id === "\0virtual:group-icons.css") {
-        if (cachedGroupIconsCSS !== null) {
-          return cachedGroupIconsCSS;
-        }
-        return generateGroupIconsCSS(id);
-      }
-      return void 0;
+  const groupIconPlugin = groupIconVitePlugin({
+    customIcon: {
+      ...builtinCustomIcon,
+      ...valaxyConfig.groupIcons?.customIcon
     },
-    // In build mode, regenerate the CSS after all markdown files have been processed
-    generateBundle() {
-      if (this.meta.rollupVersion) {
-        cachedGroupIconsCSS = generateGroupIconsCSS("\0virtual:group-icons.css");
-      }
-    }
-  };
-  plugins.push(dynamicGroupIconPlugin);
+    defaultLabels: [
+      ...valaxyConfig.groupIcons?.defaultLabels || [],
+      ...Object.keys(builtinCustomIcon),
+      ...Object.keys(valaxyConfig.groupIcons?.customIcon || {})
+    ]
+  });
+  plugins.push(groupIconPlugin);
   return plugins;
 }
 
@@ -3667,6 +3606,48 @@ function setupModules(node, modules) {
   });
 }
 
+const NODE_I18N = {
+  /**
+   * node 读取的 locales 数据
+   */
+  locales: {}
+};
+function loadLocalesYml(localesPath) {
+  const locales = {};
+  if (fs.existsSync(localesPath)) {
+    const files = fs.readdirSync(localesPath);
+    files.forEach((file) => {
+      if (file.endsWith(".yml") || file.endsWith(".yaml")) {
+        const lang = file.replace(/\.ya?ml$/, "");
+        const filePath = `${localesPath}/${file}`;
+        try {
+          const content = fs.readFileSync(filePath, "utf-8");
+          const data = yaml.load(content);
+          locales[lang] = data || {};
+        } catch (e) {
+          console.error(`Error loading locale file: ${filePath}`, e);
+        }
+      }
+    });
+  }
+  NODE_I18N.locales = locales;
+  return locales;
+}
+function nodeT(key, lang) {
+  if (key.startsWith(LOCALE_PREFIX)) {
+    key = key.slice(LOCALE_PREFIX.length);
+  }
+  const data = NODE_I18N.locales[lang] || {};
+  const keys = key.split(".");
+  let result = data;
+  for (const k of keys) {
+    result = result?.[k];
+    if (result === void 0)
+      return "";
+  }
+  return result || "";
+}
+
 function commonOptions(args) {
   return args.positional("root", {
     default: ".",
@@ -3675,15 +3656,19 @@ function commonOptions(args) {
   });
 }
 
+const isWindows = os.platform() === "win32";
 async function generateFuseList(options) {
   consola.start(`Generate List for Fuse Search by (${colors.cyan("fuse.js")}) ...`);
   const pattern = path$1.resolve(options.userRoot, options.config.siteConfig.fuse.pattern || "pages/**/*.md");
-  const files = await fg(fg.convertPathToPattern(pattern));
+  const finalPattern = isWindows ? fg.convertPathToPattern(pattern) : pattern;
+  const files = await fg(finalPattern);
   if (files.length > 0) {
     consola.success(`Found ${colors.dim(files.length.toString())} markdown files for fuse search.`);
   } else {
-    consola.warn(`No markdown files found for fuse search. Please check your fuse pattern: ${colors.dim(pattern)}`);
+    consola.warn(`No markdown files found for fuse search. Please check your fuse pattern: ${colors.dim(finalPattern)}`);
   }
+  loadLocalesYml(path$1.resolve(options.userRoot, "locales"));
+  const globalAuthor = nodeT(options.config.siteConfig.author.name, options.config.siteConfig.lang || "en");
   const posts = [];
   for await (const i of files) {
     const raw = fs.readFileSync(i, "utf-8");
@@ -3698,15 +3683,15 @@ async function generateFuseList(options) {
     if (fmData.password)
       continue;
     const extendKeys = options.config.fuse?.extendKeys || [];
-    const relativeLink = path$1.resolve(options.config.vite?.base || "/", path$1.relative(path$1.resolve(options.userRoot, "pages"), i));
+    const relativeLink = path$1.join(options.config.vite?.base || "/", path$1.relative(path$1.resolve(options.userRoot, "pages"), i)).replace(/\\/g, "/");
     const link = i.endsWith("index.md") ? relativeLink.replace(/\/index\.md$/, "") : relativeLink.replace(/\.md$/, "");
     const fuseListItem = {
       title: fmData.title || "",
       tags: (typeof fmData.tags === "string" ? [fmData.tags] : fmData.tags) || [],
       categories: (typeof fmData.categories === "string" ? [fmData.categories] : fmData.categories) || [],
-      author: options.config.siteConfig.author.name,
+      author: fmData.author || globalAuthor,
       excerpt: excerpt || content.slice(0, 100),
-      // encode for chinese url
+      // encode for chinese url, replace for windows path
       link: encodeURI(link)
     };
     if (options.config.siteConfig.fuse.options.keys?.includes("content")) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valaxy",
   "type": "module",
-  "version": "0.26.8",
+  "version": "0.26.9",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -65,7 +65,7 @@
     "@clack/prompts": "^0.11.0",
     "@iconify-json/ri": "^1.2.6",
     "@intlify/unplugin-vue-i18n": "^11.0.1",
-    "@shikijs/transformers": "^3.14.0",
+    "@shikijs/transformers": "^3.15.0",
     "@types/katex": "^0.16.7",
     "@unhead/addons": "^2.0.19",
     "@unhead/schema-org": "^2.0.19",
@@ -115,11 +115,11 @@
     "ora": "^9.0.0",
     "pascalcase": "^2.0.0",
     "pathe": "^2.0.3",
-    "pinia": "^3.0.3",
+    "pinia": "^3.0.4",
     "qrcode": "^1.5.4",
     "resolve-global": "^2.0.0",
     "sass": "^1.93.3",
-    "shiki": "^3.14.0",
+    "shiki": "^3.15.0",
     "star-markdown-css": "^0.5.3",
     "table": "^6.9.0",
     "unhead": "^2.0.19",
@@ -128,19 +128,19 @@
     "unplugin-vue-markdown": "^29.2.0",
     "unplugin-vue-router": "^0.16.1",
     "vanilla-lazyload": "^19.1.3",
-    "vite": "^7.1.12",
+    "vite": "^7.2.1",
     "vite-dev-rpc": "^1.1.0",
     "vite-plugin-vue-devtools": "^8.0.3",
     "vite-plugin-vue-layouts": "^0.11.0",
     "vite-ssg": "^28.2.2",
     "vite-ssg-sitemap": "^0.10.0",
     "vitepress-plugin-group-icons": "^1.6.5",
-    "vue": "^3.5.22",
+    "vue": "^3.5.23",
     "vue-i18n": "^11.1.12",
     "vue-router": "^4.6.3",
     "yargs": "^18.0.0",
-    "@valaxyjs/utils": "0.26.8",
-    "@valaxyjs/devtools": "0.26.8"
+    "@valaxyjs/devtools": "0.26.9",
+    "@valaxyjs/utils": "0.26.9"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^3.0.2",

package/shared/node/i18n.ts

@@ -0,0 +1,65 @@
+import fs from 'fs-extra'
+import yaml from 'js-yaml'
+import { LOCALE_PREFIX } from '../constants'
+
+export const NODE_I18N: {
+  locales: Record<string, any>
+} = {
+  /**
+   * node 读取的 locales 数据
+   */
+  locales: {},
+}
+
+/**
+ * 读取翻译 yml 文件
+ */
+export function loadLocalesYml(localesPath: string): Record<string, any> {
+  /**
+   * read locales dir *.yml
+   */
+  const locales: Record<string, any> = {}
+  if (fs.existsSync(localesPath)) {
+    const files = fs.readdirSync(localesPath)
+    files.forEach((file) => {
+      if (file.endsWith('.yml') || file.endsWith('.yaml')) {
+        const lang = file.replace(/\.ya?ml$/, '')
+        const filePath = `${localesPath}/${file}`
+        try {
+          const content = fs.readFileSync(filePath, 'utf-8')
+          const data = yaml.load(content)
+          locales[lang] = data || {}
+        }
+        catch (e) {
+          console.error(`Error loading locale file: ${filePath}`, e)
+        }
+      }
+    })
+  }
+
+  // cache
+  NODE_I18N.locales = locales
+  return locales
+}
+
+/**
+ * node translate function
+ *
+ * ```ts
+ * nodeT('greeting.hello', 'en') // 'Hello'
+ * ```
+ */
+export function nodeT(key: string, lang: string): string {
+  if (key.startsWith(LOCALE_PREFIX)) {
+    key = key.slice(LOCALE_PREFIX.length)
+  }
+  const data = NODE_I18N.locales[lang] || {}
+  const keys = key.split('.')
+  let result: any = data
+  for (const k of keys) {
+    result = result?.[k]
+    if (result === undefined)
+      return ''
+  }
+  return result || ''
+}