valaxy 0.23.6 → 0.24.1

package/client/App.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-// import it in setup/main.ts for ssg
+// vite-ssg build for client
 import 'virtual:group-icons.css'
 // import { defineAsyncComponent } from 'vue'
 /**

package/client/components/AppLink.vue

@@ -1,26 +1,32 @@
 <script setup lang="ts">
 // https://router.vuejs.org/guide/advanced/extending-router-link.html#extending-routerlink
 import { computed } from 'vue'
+import { RouterLink } from 'vue-router'
+import { EXTERNAL_URL_RE } from '../../node/constants'
 
 const props = defineProps<{
   showExternalIcon?: boolean
   to?: string
   href?: string
+  target?: string
 }>()
 
 const link = computed(() => props.href || props.to || '#')
 
 const isExternalLink = computed(() => {
-  return typeof link.value === 'string' && link.value.startsWith('http')
+  return (link.value && EXTERNAL_URL_RE.test(link.value)) || props.target === '_blank'
 })
 </script>
 
 <template>
-  <a v-if="isExternalLink" v-bind="$attrs" :href="link" target="_blank">
+  <a
+    v-if="isExternalLink" class="va-link" v-bind="$attrs" :href="link"
+    :target="target ?? (isExternalLink ? '_blank' : undefined)"
+  >
     <slot />
     <div v-if="showExternalIcon" class="icon-link inline-block" i-ri-arrow-right-up-line />
   </a>
-  <RouterLink v-else v-bind="$attrs" :to="link">
+  <RouterLink v-else class="va-link" v-bind="$attrs" :to="link">
     <slot />
   </RouterLink>
 </template>

package/client/components/ValaxyCopyright.vue

@@ -31,7 +31,7 @@ const licenseHtml = computed(() => {
       <strong>
         {{ t('post.copyright.author') + t('symbol.colon') }}
       </strong>
-      <span>{{ siteConfig.author.name }}</span>
+      <span>{{ t(siteConfig.author.name) }}</span>
     </li>
     <li v-if="url" class="post-copyright-link">
       <strong>

package/client/composables/app/useValaxyApp.ts

@@ -5,9 +5,10 @@ import { useSeoMeta } from '@unhead/vue'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import { tObject } from '../../../shared/utils/i18n'
 import { useFrontmatter, useValaxyHead } from '../../composables'
-import { useTimezone } from '../../composables/global'
 
+import { useTimezone } from '../../composables/global'
 // https://github.com/vueuse/head
 // you can use this to manipulate the document head in any components,
 // they will be rendered correctly in the html results with vite-ssg
@@ -20,7 +21,7 @@ export function useValaxyApp() {
 
   const { locale } = useI18n()
 
-  const title = computed(() => fm.value[`title_${locale.value}`] || fm.value.title)
+  const title = computed(() => tObject(fm.value.title || '', locale.value))
 
   // seo
   // todo: get first image url from markdown
@@ -33,7 +34,7 @@ export function useValaxyApp() {
     ogLocale: computed(() => locale.value || fm.value.lang || siteConfig.value.lang || 'en'),
     ogLocaleAlternate: computed(() => siteConfig.value.languages.filter(l => l !== locale.value)),
     ogSiteName: computed(() => siteConfig.value.title),
-    ogTitle: computed(() => fm.value.title || siteConfig.value.title),
+    ogTitle: computed(() => tObject(fm.value.title || siteConfig.value.title, locale.value)),
     ogImage: computed(() => fm.value.ogImage || fm.value.cover || siteConfig.value.favicon),
     ogType: 'website',
     ogUrl: siteUrl,

package/client/composables/app/useValaxyHead.ts

@@ -5,15 +5,16 @@ import { useI18n } from 'vue-i18n'
 
 import { useFrontmatter } from '../../composables'
 import { useSiteConfig } from '../../config'
+import { tObject } from '../../utils'
 
 export function useValaxyHead() {
   const { locale } = useI18n()
 
   const fm = useFrontmatter()
   const siteConfig = useSiteConfig()
-  const title = computed<string>(() => fm.value[`title_${locale.value}`] || fm.value.title)
+  const $title = computed(() => tObject(fm.value.title || '', locale.value))
   useHead({
-    title,
+    title: $title,
     titleTemplate: (title) => {
       return fm.value.titleTemplate || (title ? `${title} - ${siteConfig.value.title}` : siteConfig.value.title)
     },

package/client/composables/locale.ts

@@ -1,8 +1,11 @@
+import type { Ref } from 'vue'
 import { isClient, useStorage } from '@vueuse/core'
 import dayjs from 'dayjs'
+import { computed } from 'vue'
+
 // not optimize deps all locales
 import { useI18n } from 'vue-i18n'
-
+import { tObject } from '../../shared/utils/i18n'
 import 'dayjs/locale/en'
 import 'dayjs/locale/zh-cn'
 
@@ -34,3 +37,29 @@ export function useLocale() {
     toggleLocales,
   }
 }
+
+/**
+ * get locale title
+ *
+ * ```md
+ * ---
+ * title:
+ *   zh-CN: Valaxy - Vue 驱动的静态站点生成器
+ *   en: Valaxy - Vue Powered Static Site Generator
+ * ---
+ * ```
+ *
+ * @param fm
+ */
+export function useLocaleTitle(fm: Ref<{
+  title?: string | Record<string, string>
+} | null>) {
+  const { locale } = useI18n()
+  return computed(() => {
+    if (!fm.value)
+      return ''
+
+    const lang = locale.value
+    return tObject(fm.value.title || '', lang) || ''
+  })
+}

package/client/composables/post/index.ts

@@ -3,7 +3,7 @@ import type { ComputedRef } from 'vue'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRouterStore } from '../../stores'
-import { sortByDate } from '../../utils'
+import { sortByDate, tObject } from '../../utils'
 
 export * from './usePagination'
 export * from './usePrevNext'
@@ -11,8 +11,7 @@ export * from './usePrevNext'
 export function usePostTitle(post: ComputedRef<Post>) {
   const { locale } = useI18n()
   return computed(() => {
-    const lang = locale.value === 'zh-CN' ? 'zh' : locale.value
-    return post.value[`title_${lang}`] || post.value.title
+    return tObject(post.value.title || '', locale.value)
   })
 }
 

package/client/modules/valaxy.ts

@@ -48,6 +48,8 @@ export const i18n = createI18n({
   legacy: false,
   locale: '',
   messages: valaxyMessages,
+  // use key
+  missingWarn: false,
 })
 
 export async function install({ app, router }: ViteSSGContext, config: ComputedRef<ValaxyConfig<DefaultTheme.Config>>) {

package/client/utils/index.ts

@@ -1,3 +1,4 @@
+export * from '../../shared'
 export * from './cdn'
 export * from './code'
 export * from './content'
@@ -5,4 +6,5 @@ export * from './helper'
 export * from './router'
 export * from './time'
 export * from './types'
+
 export * from './wrap'

package/dist/{chunk-SBITNE3A.js → chunk-CY4NJH2Z.js}

@@ -4,7 +4,7 @@ import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // package.json
-var version = "0.23.6";
+var version = "0.24.1";
 
 // node/modules/fuse.ts
 import path4 from "path";
@@ -120,6 +120,9 @@ function getRollupOptions(options) {
         if (id.includes("plugin-vue:export-helper")) {
           return "framework";
         }
+        if (id.includes("virtual:group-icons.css")) {
+          return "group-icons";
+        }
         const libs = [
           "@vueuse/motion",
           "dayjs",
@@ -514,7 +517,7 @@ function getGitTimestamp(file, type = "updated") {
 
 // node/constants/index.ts
 var EXCERPT_SEPARATOR = "<!-- more -->";
-var EXTERNAL_URL_RE = /^https?:/i;
+var EXTERNAL_URL_RE = /^(?:[a-z]+:|\/\/)/i;
 var PATHNAME_PROTOCOL_RE = /^pathname:\/\//;
 var ALL_ROUTE = "/:all(.*)*";
 var customElements = /* @__PURE__ */ new Set([
@@ -973,12 +976,20 @@ import { consola as consola10 } from "consola";
 import { colors as colors8 } from "consola/utils";
 import dayjs from "dayjs";
 import fg3 from "fast-glob";
+import { Feed } from "feed";
 import fs9 from "fs-extra";
 import matter2 from "gray-matter";
 import MarkdownIt from "markdown-it";
 import ora3 from "ora";
 import { getBorderCharacters, table } from "table";
-import { createFeed, generateAtom1, generateJson1, generateRss2 } from "zfeed";
+
+// shared/utils/i18n.ts
+function tObject(data, lang) {
+  if (typeof data === "object") {
+    return data[lang] || Object.values(data)[0] || "";
+  }
+  return data;
+}
 
 // node/utils/date.ts
 import fs8 from "fs-extra";
@@ -999,6 +1010,7 @@ async function build(options) {
   const s = ora3("RSS Generating ...").start();
   const { config } = options;
   const siteConfig = config.siteConfig;
+  const lang = siteConfig.lang || "en";
   if (!siteConfig.url || siteConfig.url === "/") {
     consola10.error("You must set `url` (like `https://example.com`) in `site.config.ts` to generate rss.");
     return;
@@ -1015,15 +1027,19 @@ async function build(options) {
     json: `${siteConfig.feed?.name || "feed"}.json`,
     rss: `${siteConfig.feed?.name || "feed"}.xml`
   };
+  const feedLinks = {};
+  Object.keys(feedNameMap).forEach((key) => {
+    feedLinks[key] = `${siteUrl}${feedNameMap[key]}`;
+  });
+  const title = tObject(siteConfig.title, lang);
+  const description = tObject(siteConfig.description, lang);
   const feedOptions = {
-    title: siteConfig.title || "Valaxy Blog",
-    description: siteConfig.description,
+    title: title || "Valaxy Blog",
+    description,
     id: siteUrl || "valaxy",
     link: siteUrl,
     copyright: `CC ${siteConfig.license?.type?.toUpperCase()} ${ccVersion} ${(/* @__PURE__ */ new Date()).getFullYear()} \xA9 ${siteConfig.author?.name}`,
-    feed: Object.fromEntries(
-      Object.entries(feedNameMap).map(([key, value]) => [key, `${siteUrl}${value}`])
-    )
+    feedLinks
   };
   const DOMAIN = siteConfig.url.slice(0, -1);
   const files = await fg3(`${options.userRoot}/pages/posts/**/*.md`);
@@ -1082,23 +1098,23 @@ async function getPosts(params, options) {
     const link = DOMAIN + path17.replace(`${options.userRoot}/pages`, "").replace(/\.md$/, "");
     const tip = `<br/><p>${lang === "zh-CN" ? `\u8BBF\u95EE <a href="${link}" target="_blank">${link}</a> ${fullText ? "\u67E5\u770B\u539F\u6587" : "\u9605\u8BFB\u5168\u6587"}\u3002` : `Visit <a href="${link}" target="_blank">${link}</a> to ${fullText ? "view original article" : "read more"}.`}</p>`;
     posts.push({
-      title: data.title,
-      updatedAt: new Date(data.date),
-      publishedAt: new Date(data.updated || data.date),
+      ...data,
+      title: tObject(data.title, lang),
+      description: tObject(data.description, lang),
+      date: new Date(data.date),
+      published: new Date(data.updated || data.date),
       content: html + tip,
-      author,
+      author: [author],
       id: data.id || link,
       link
     });
   }
-  posts.sort((a, b) => +(b.publishedAt || b.updatedAt) - +(a.publishedAt || a.updatedAt));
+  posts.sort((a, b) => +(b.published || b.date) - +(a.published || a.date));
   return posts;
 }
 async function writeFeed(feedOptions, posts, options, feedNameMap) {
-  const feed = createFeed({
-    ...feedOptions,
-    items: posts
-  });
+  const feed = new Feed(feedOptions);
+  posts.forEach((item) => feed.addItem(item));
   await fs9.ensureDir(dirname3(`./dist/${feedNameMap.atom}`));
   const path17 = resolve5(options.userRoot, "./dist");
   const publicFolder = resolve5(options.userRoot, "public");
@@ -1115,11 +1131,11 @@ async function writeFeed(feedOptions, posts, options, feedNameMap) {
     let data = "";
     const distFeedPath = `${path17}/${feedNameMap[type]}`;
     if (type === "rss")
-      data = generateRss2(feed);
+      data = feed.rss2();
     else if (type === "atom")
-      data = generateAtom1(feed);
+      data = feed.atom1();
     else if (type === "json")
-      data = generateJson1(feed);
+      data = feed.json1();
     await fs9.writeFile(distFeedPath, data, "utf-8");
     consola10.debug(`[${colors8.cyan(type)}] dist: ${colors8.dim(distFeedPath)}`);
     tableData.push([colors8.cyan(type), colors8.yellow("dist"), colors8.dim(distFeedPath)]);
@@ -1208,6 +1224,7 @@ import { consola as consola13 } from "consola";
 import { resolve as resolve12 } from "pathe";
 import Components from "unplugin-vue-components/vite";
 import Layouts from "vite-plugin-vue-layouts";
+import { groupIconVitePlugin } from "vitepress-plugin-group-icons";
 
 // node/plugins/extendConfig.ts
 import { dirname as dirname4, join as join3, resolve as resolve6 } from "path";
@@ -1459,11 +1476,6 @@ import { colors as colors9 } from "consola/utils";
 
 // ../../node_modules/.pnpm/nanoid@5.1.5/node_modules/nanoid/index.js
 import { webcrypto as crypto } from "crypto";
-
-// ../../node_modules/.pnpm/nanoid@5.1.5/node_modules/nanoid/url-alphabet/index.js
-var urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
-
-// ../../node_modules/.pnpm/nanoid@5.1.5/node_modules/nanoid/index.js
 var POOL_SIZE_MULTIPLIER = 128;
 var pool;
 var poolOffset;
@@ -1500,14 +1512,6 @@ function customRandom(alphabet, defaultSize, getRandom) {
 function customAlphabet(alphabet, size = 21) {
   return customRandom(alphabet, size, random);
 }
-function nanoid(size = 21) {
-  fillPool(size |= 0);
-  let id = "";
-  for (let i = poolOffset - size; i < poolOffset; i++) {
-    id += urlAlphabet[pool[i] & 63];
-  }
-  return id;
-}
 
 // node/plugins/markdown/plugins/highlight.ts
 import {
@@ -1515,7 +1519,7 @@ import {
   createHighlighter,
   isSpecialLang
 } from "shiki";
-var nanoid2 = customAlphabet("abcdefghijklmnopqrstuvwxyz", 10);
+var nanoid = customAlphabet("abcdefghijklmnopqrstuvwxyz", 10);
 function attrsToLines(attrs) {
   attrs = attrs.replace(/^(?:\[.*?\])?.*?([\d,-]+).*/, "$1").trim();
   const result = [];
@@ -1602,7 +1606,7 @@ The language '${lang}' is not loaded, falling back to '${defaultLang}' for synta
         return s.replace(mustacheRE, (match) => {
           let marker = mustaches.get(match);
           if (!marker) {
-            marker = nanoid2();
+            marker = nanoid();
             mustaches.set(match, marker);
           }
           return marker;
@@ -1947,6 +1951,7 @@ import { full as emojiPlugin } from "markdown-it-emoji";
 import footnotePlugin from "markdown-it-footnote";
 import imageFigures from "markdown-it-image-figures";
 import TaskLists from "markdown-it-task-lists";
+import { groupIconMdPlugin } from "vitepress-plugin-group-icons";
 
 // node/plugins/markdown/plugins/link.ts
 import { URL as URL2 } from "url";
@@ -2014,9 +2019,6 @@ import container from "markdown-it-container";
 function extractLang(info) {
   return info.trim().replace(/=(\d*)/, "").replace(/:(no-)?line-numbers(\{| |$|=\d*).*/, "").replace(/(-vue|\{| ).*$/, "").replace(/^vue-html$/, "template").replace(/^ansi$/, "");
 }
-function getAdaptiveThemeMarker(options) {
-  return options.hasSingleTheme ? "" : " vp-adaptive-theme";
-}
 function extractTitle(info, html = false) {
   if (html) {
     return info.replace(/<!--[\s\S]*?-->/g, "").match(/data-title="(.*?)"/)?.[1] || "";
@@ -2027,7 +2029,7 @@ function getCodeHeightLimitStyle(options, env) {
   const codeHeightLimit = env.frontmatter?.codeHeightLimit || options?.siteConfig?.codeHeightLimit;
   if (codeHeightLimit === void 0 || codeHeightLimit <= 0)
     return "";
-  return `style="max-height: ${codeHeightLimit}px;"`;
+  return ` max-h-${codeHeightLimit}px`;
 }
 function preWrapperPlugin(md3, options) {
   const fence = md3.renderer.rules.fence;
@@ -2035,40 +2037,42 @@ function preWrapperPlugin(md3, options) {
     const [tokens, idx, _, env] = args;
     const token = tokens[idx];
     token.info = token.info.replace(/\[.*\]/, "");
+    const active = / active( |$)/.test(token.info) ? " active" : "";
+    token.info = token.info.replace(/ active$/, "").replace(/ active /, " ");
     const lang = extractLang(token.info);
     const rawCode = fence(...args);
-    return `
-    <div ${getCodeHeightLimitStyle(options, env)} class="language-${lang}${getAdaptiveThemeMarker(options)}${// eslint-disable-next-line regexp/no-unused-capturing-group
-    / active( |$)/.test(token.info) ? " active" : ""}">
-      <button title="Copy Code" class="copy"></button><span class="lang">${lang}</span>${rawCode}<button class="collapse"></button>
-    </div>`;
+    const codeHeightLimitClass = getCodeHeightLimitStyle(options, env);
+    return `<div class="language-${lang}${active}${codeHeightLimitClass}"><button title="${options.codeCopyButtonTitle}" class="copy"></button><span class="lang">${lang}</span>${rawCode}<button class="collapse"></button></div>`;
   };
 }
 
 // node/plugins/markdown/plugins/markdown-it/container.ts
-function createContainer(classes, { icon, color, text: defaultTitle, langs } = {}) {
+function createContainer(classes, { icon, color, text: defaultTitle, langs } = {}, md3) {
   return [
     container,
     classes,
     {
       render(tokens, idx) {
         const token = tokens[idx];
-        const info = token.info.trim().slice(classes.length).trim();
         if (token.nesting === 1) {
-          if (classes === "details") {
-            return `<details class="${classes} custom-block">${`<summary>${info}</summary>`}
-`;
-          }
+          token.attrJoin("class", `${classes} custom-block`);
+          const attrs = md3.renderer.renderAttrs(token);
+          const info = token.info.trim().slice(classes.length).trim();
           let iconTag = "";
           if (icon)
             iconTag = `<i class="icon ${icon}" ${color ? `style="color: ${color}"` : ""}></i>`;
-          let title = `<span lang="en">${info || defaultTitle}</span>`;
+          let titleWithLang = `<span lang="en">${info || defaultTitle}</span>`;
           if (langs) {
             Object.keys(langs).forEach((lang) => {
-              title += `<span lang="${lang}">${info || langs[lang]}</span>`;
+              titleWithLang += `<span lang="${lang}">${info || langs[lang]}</span>`;
             });
           }
-          return `<div class="${classes} custom-block"><p class="custom-block-title">${iconTag}${title}</p>
+          const title = md3.renderInline(titleWithLang, {});
+          const titleClass = `custom-block-title${info ? "" : " custom-block-title-default"}`;
+          if (classes === "details")
+            return `<details ${attrs}><summary>${title}</summary>
+`;
+          return `<div ${attrs}><p class="${titleClass}">${iconTag}${title}</p>
 `;
         } else {
           return classes === "details" ? "</details>\n" : "</div>\n";
@@ -2109,16 +2113,25 @@ var defaultBlocksOptions = {
     }
   }
 };
-function containerPlugin(md3, options, containerOptions = {}) {
-  const blockKeys = Object.keys(Object.assign(defaultBlocksOptions, containerOptions));
+function containerPlugin(md3, containerOptions = {}) {
+  const blockKeys = new Set(Object.keys(Object.assign(defaultBlocksOptions, containerOptions)));
   blockKeys.forEach((optionKey) => {
     const option = {
       ...defaultBlocksOptions[optionKey],
       ...containerOptions[optionKey] || {}
     };
-    md3.use(...createContainer(optionKey, option));
+    md3.use(...createContainer(optionKey, option, md3));
+  });
+  md3.use(container, "v-pre", {
+    render: (tokens, idx) => tokens[idx].nesting === 1 ? `<div v-pre>
+` : `</div>
+`
+  });
+  md3.use(container, "raw", {
+    render: (tokens, idx) => tokens[idx].nesting === 1 ? `<div class="vp-raw">
+` : `</div>
+`
   });
-  md3.use(...createCodeGroup(options));
   const languages = ["zh-CN", "en"];
   languages.forEach((lang) => {
     md3.use(container, lang, {
@@ -2126,17 +2139,17 @@ function containerPlugin(md3, options, containerOptions = {}) {
 ` : "</div>\n"
     });
   });
+  md3.use(...createCodeGroup(md3));
 }
-function createCodeGroup(options) {
+function createCodeGroup(md3) {
   return [
     container,
     "code-group",
     {
       render(tokens, idx) {
         if (tokens[idx].nesting === 1) {
-          const name = nanoid(5);
           let tabs = "";
-          let checked = 'checked="checked"';
+          let checked = "checked";
           for (let i = idx + 1; !(tokens[i].nesting === -1 && tokens[i].type === "container_code-group_close"); ++i) {
             const isHtml = tokens[i].type === "html_block";
             if (tokens[i].type === "fence" && tokens[i].tag === "code" || isHtml) {
@@ -2145,17 +2158,15 @@ function createCodeGroup(options) {
                 isHtml
               );
               if (title) {
-                const id = nanoid(7);
-                tabs += `<input type="radio" name="group-${name}" id="tab-${id}" ${checked}><label for="tab-${id}">${title}</label>`;
+                tabs += `<input type="radio" name="group-${idx}" id="tab-${i}" ${checked}/>`;
+                tabs += `<label data-title="${md3.utils.escapeHtml(title)}" for="tab-${i}">${title}</label>`;
                 if (checked && !isHtml)
                   tokens[i].info += " active";
                 checked = "";
               }
             }
           }
-          return `<div class="vp-code-group${getAdaptiveThemeMarker(
-            options
-          )}"><div class="tabs">${tabs}</div><div class="blocks">
+          return `<div class="vp-code-group"><div class="tabs">${tabs}</div><div class="blocks">
 `;
         }
         return `</div></div>
@@ -2533,13 +2544,10 @@ var defaultCodeTheme = { light: "github-light", dark: "github-dark" };
 async function setupMarkdownPlugins(md3, options, base = "/") {
   const mdOptions = options?.config.markdown || {};
   const theme = mdOptions.theme ?? defaultCodeTheme;
-  const hasSingleTheme = typeof theme === "string" || "name" in theme;
   const siteConfig = options?.config.siteConfig || {};
   if (mdOptions.preConfig)
     mdOptions.preConfig(md3);
   md3.use(highlightLinePlugin).use(preWrapperPlugin, { theme, siteConfig }).use(snippetPlugin, options?.userRoot).use(containerPlugin, {
-    hasSingleTheme
-  }, {
     ...mdOptions.blocks,
     ...mdOptions?.container
   }).use(cssI18nContainer, {
@@ -2559,6 +2567,9 @@ async function setupMarkdownPlugins(md3, options, base = "/") {
   md3.use(emojiPlugin).use(footnotePlugin).use(footnoteTooltipPlugin);
   md3.use(anchorPlugin, {
     slugify,
+    getTokensText: (tokens) => {
+      return tokens.filter((t) => !["html_inline", "emoji"].includes(t.type)).map((t) => t.content).join("");
+    },
     permalink: anchorPlugin.permalink.linkInsideHeader({
       symbol: "&ZeroWidthSpace;",
       renderAttrs: (slug, state) => {
@@ -2576,11 +2587,13 @@ async function setupMarkdownPlugins(md3, options, base = "/") {
     ...mdOptions.anchor
   });
   md3.use(headersPlugin, {
+    level: [2, 3, 4, 5, 6],
     slugify,
     ...typeof mdOptions.headers === "boolean" ? void 0 : mdOptions.headers
   }).use(sfcPlugin, {
     ...mdOptions.sfc
   }).use(titlePlugin).use(tocPlugin, {
+    slugify,
     ...mdOptions.toc
   });
   md3.use(math_plugin, mdOptions.katex);
@@ -2602,12 +2615,9 @@ async function setupMarkdownPlugins(md3, options, base = "/") {
     ...mdOptions.imageFigures
   });
   md3.use(TaskLists);
-  if (options?.config.groupIcons) {
-    const { groupIconMdPlugin } = await import("vitepress-plugin-group-icons");
-    md3.use(groupIconMdPlugin, {
-      titleBar: { includeSnippet: true }
-    });
-  }
+  md3.use(groupIconMdPlugin, {
+    titleBar: { includeSnippet: true }
+  });
   if (mdOptions.config)
     mdOptions.config(md3);
   return md3;
@@ -4027,38 +4037,6 @@ async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
     }),
     createFixPlugins(options)
   ];
-  if (valaxyConfig.groupIcons) {
-    const { groupIconVitePlugin } = await import("vitepress-plugin-group-icons");
-    plugins.push(
-      groupIconVitePlugin({
-        customIcon: {
-          nodejs: "vscode-icons:file-type-node",
-          playwright: "vscode-icons:file-type-playwright",
-          typedoc: "vscode-icons:file-type-typedoc",
-          eslint: "vscode-icons:file-type-eslint"
-        },
-        ...valaxyConfig.groupIcons
-      })
-    );
-  } else {
-    const virtualCssId = "virtual:group-icons.css";
-    const resolvedVirtualCssId = `\0${virtualCssId}`;
-    plugins.push({
-      name: "valaxy:virtual:group-icons.css",
-      resolveId(id) {
-        if (id === virtualCssId) {
-          return resolvedVirtualCssId;
-        }
-        return void 0;
-      },
-      async load(id) {
-        if (id === resolvedVirtualCssId) {
-          return "";
-        }
-        return void 0;
-      }
-    });
-  }
   if (valaxyConfig.visualizer) {
     try {
       const visualizer = (await import("rollup-plugin-visualizer")).visualizer;
@@ -4078,6 +4056,22 @@ async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
       console.log();
     }
   }
+  const customIcon = {
+    nodejs: "vscode-icons:file-type-node",
+    playwright: "vscode-icons:file-type-playwright",
+    typedoc: "vscode-icons:file-type-typedoc",
+    eslint: "vscode-icons:file-type-eslint"
+  };
+  plugins.push(
+    groupIconVitePlugin({
+      customIcon,
+      ...valaxyConfig.groupIcons,
+      defaultLabels: [
+        ...valaxyConfig.groupIcons?.defaultLabels || [],
+        ...Object.keys(valaxyConfig.groupIcons?.customIcon || {})
+      ]
+    })
+  );
   return plugins;
 }
 
@@ -4383,24 +4377,11 @@ import path14 from "path";
 import process10 from "process";
 import { consola as consola17 } from "consola";
 import fs22 from "fs-extra";
-
-// node/cli/utils/fs.ts
-import { access } from "fs/promises";
-async function exists(path17) {
-  try {
-    await access(path17);
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-// node/cli/clean.ts
 async function cleanDist() {
   const distDir = path14.join(process10.cwd(), "dist");
   const cacheDir = path14.join(process10.cwd(), ".valaxy");
   consola17.box("\u{1F9F9} Starting clean...");
-  if (await exists(distDir)) {
+  if (await fs22.exists(distDir)) {
     consola17.info("dist directory exists, removing...");
     try {
       await fs22.rm(distDir, { recursive: true, force: true });
@@ -4412,7 +4393,7 @@ async function cleanDist() {
   } else {
     consola17.info("No dist directory found, nothing to clean.");
   }
-  if (await exists(cacheDir)) {
+  if (await fs22.exists(cacheDir)) {
     consola17.info(".valaxy cache directory exists, removing...");
     try {
       await fs22.rm(cacheDir, { recursive: true, force: true });
@@ -4681,13 +4662,12 @@ function registerDevCommand(cli2) {
 }
 
 // node/cli/utils/post.ts
-import { writeFile as writeFile2 } from "fs/promises";
-import { join as join9, resolve as resolve14 } from "path";
-import { ensureSuffix as ensureSuffix2 } from "@antfu/utils";
+import { dirname as dirname5, join as join9, resolve as resolve14 } from "path";
 import { consola as consola19 } from "consola";
 import { colors as colors17 } from "consola/utils";
 import dayjs2 from "dayjs";
 import { render } from "ejs";
+import fs24 from "fs-extra";
 
 // node/cli/utils/constants.ts
 import process14 from "process";
@@ -4702,42 +4682,38 @@ date: <%=date%>
 // node/cli/utils/scaffold.ts
 import { readFile as readFile2 } from "fs/promises";
 import path16 from "path";
+import fs23 from "fs-extra";
 async function getTemplate(layout) {
   const { clientRoot, themeRoot } = await resolveOptions({ userRoot });
   const roots = [userRoot, themeRoot, clientRoot];
   for (const root of roots) {
     const scaffoldPath = path16.resolve(root, "scaffolds", `${layout}.md`);
-    if (await exists(scaffoldPath))
+    if (await fs23.exists(scaffoldPath))
       return readFile2(scaffoldPath, "utf-8");
   }
   return false;
 }
 
 // node/cli/utils/post.ts
-async function create(data) {
-  const pagesPath = resolve14(userRoot, "pages");
-  const {
-    path: path17,
-    title
-  } = data;
-  const postPath = path17 || join9("posts", title);
+async function create(params) {
+  const pagesPath = resolve14(userRoot, params.path || "pages");
   let counter = 0;
   while (true) {
-    let destinationPath = resolve14(pagesPath, postPath);
-    if (counter)
-      destinationPath = `${destinationPath}-${counter}`;
-    destinationPath = ensureSuffix2(".md", destinationPath);
-    if (!await exists(destinationPath)) {
-      const content = await genLayoutTemplate(data);
+    const postFileName = `${params.title}${counter ? `-${counter}` : ""}`;
+    const postFilePath = params.folder ? join9(postFileName, "index.md") : `${postFileName}.md`;
+    const targetPath = resolve14(pagesPath, "posts", postFilePath);
+    if (!await fs24.exists(targetPath)) {
+      await fs24.ensureDir(dirname5(targetPath));
+      const content = await genLayoutTemplate(params);
       try {
-        await writeFile2(destinationPath, content, "utf-8");
-        consola19.success(`[valaxy new]: successfully generated file ${colors17.magenta(destinationPath)}`);
+        await fs24.writeFile(targetPath, content, "utf-8");
+        consola19.success(`[valaxy new]: successfully generated file ${colors17.magenta(targetPath)}`);
       } catch (e) {
         console.log(e);
-        consola19.error(`[valaxy new]: failed to write file ${destinationPath}`);
+        consola19.error(`[valaxy new]: failed to write file ${targetPath}`);
         consola19.warn(`You should run ${colors17.green("valaxy new")} in your valaxy project root directory.`);
       }
-      return destinationPath;
+      return targetPath;
     }
     counter++;
   }
@@ -4763,6 +4739,11 @@ function registerNewCommand(cli2) {
       args.usage("$0 <title> -p [path] -l [layout]").positional("title", {
         describe: "The title of the new post",
         required: true
+      }).option("folder", {
+        alias: "f",
+        type: "boolean",
+        default: false,
+        describe: "Generate a new post in a folder"
       }).option("path", {
         alias: "p",
         type: "string",
@@ -4778,12 +4759,13 @@ function registerNewCommand(cli2) {
         describe: "Generate post with the current date"
       }).strict().help();
     },
-    async ({ title, path: path17, date, layout }) => {
+    async ({ title, folder, path: path17, date, layout }) => {
       await create({
         title,
         date,
         layout,
-        path: path17
+        path: path17,
+        folder
       });
     }
   );

package/dist/{config-D40juN_m.d.ts → config-DHcACRUt.d.ts}

@@ -103,8 +103,22 @@ interface PageFrontMatter extends Record<string, any> {
     /**
      * Title
      * @description 文章标题
-     */
-    title: string;
+     *
+     * ```md
+     * ---
+     * title: Post Title
+     * ---
+     * ```
+     *
+     * ```md
+     * ---
+     * title:
+     *   en: Post Title
+     *   zh-CN: 文章标题
+     * ---
+     * ```
+     */
+    title: string | Record<string, string>;
     date: string | number | Date;
     /**
      * Updated Time
@@ -338,7 +352,7 @@ interface PostFrontMatter extends PageFrontMatter {
 }
 
 interface FuseListItem extends Record<string, any> {
-    title: string;
+    title: string | Record<string, string>;
     excerpt?: string;
     author: string;
     tags: string[];

package/dist/node/cli/index.js

@@ -3,7 +3,7 @@ import {
   registerDevCommand,
   run,
   startValaxyDev
-} from "../../chunk-SBITNE3A.js";
+} from "../../chunk-CY4NJH2Z.js";
 export {
   cli,
   registerDevCommand,

package/dist/node/index.d.ts

@@ -2,7 +2,7 @@ import { ViteSSGOptions } from 'vite-ssg';
 import * as vite from 'vite';
 import { UserConfig, InlineConfig, PluginOption, Plugin } from 'vite';
 import { MarkdownEnv } from 'unplugin-vue-markdown/types';
-import { S as SiteConfig, D as DefaultTheme, V as ValaxyConfig, a as ValaxyAddon, P as PartialDeep, R as RuntimeConfig, b as RedirectItem, U as UserSiteConfig } from '../config-D40juN_m.js';
+import { S as SiteConfig, D as DefaultTheme, V as ValaxyConfig, a as ValaxyAddon, P as PartialDeep, R as RuntimeConfig, b as RedirectItem, U as UserSiteConfig } from '../config-DHcACRUt.js';
 import Vue from '@vitejs/plugin-vue';
 import { Options as Options$3 } from 'beasties';
 import { Hookable } from 'hookable';
@@ -47,7 +47,7 @@ declare module 'vite' {
 declare function createValaxyNode(options: ResolvedValaxyOptions): ValaxyNode;
 
 interface Options {
-    hasSingleTheme: boolean;
+    codeCopyButtonTitle: string;
     theme: ThemeOptions;
     siteConfig?: SiteConfig;
 }
@@ -310,6 +310,9 @@ interface ValaxyExtendConfig {
      * @see https://github.com/btd/rollup-plugin-visualizer
      */
     visualizer?: PluginVisualizerOptions;
+    /**
+     * @see https://github.com/yuyinws/vitepress-plugin-group-icons
+     */
     groupIcons?: Partial<Options$2>;
     /**
      * unocss presets

package/dist/node/index.js

@@ -50,7 +50,7 @@ import {
   startValaxyDev,
   toAtFS,
   transformObject
-} from "../chunk-SBITNE3A.js";
+} from "../chunk-CY4NJH2Z.js";
 export {
   ALL_ROUTE,
   EXCERPT_SEPARATOR,

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
-import { c as PostFrontMatter, d as PageFrontMatter } from '../config-D40juN_m.js';
-export { A as Album, D as DefaultTheme, E as ExcerptType, F as FuseListItem, P as PartialDeep, i as Photo, g as Pkg, b as RedirectItem, f as RedirectRule, R as RuntimeConfig, S as SiteConfig, e as SocialLink, U as UserSiteConfig, h as UserValaxyConfig, a as ValaxyAddon, V as ValaxyConfig } from '../config-D40juN_m.js';
+import { c as PostFrontMatter, d as PageFrontMatter } from '../config-DHcACRUt.js';
+export { A as Album, D as DefaultTheme, E as ExcerptType, F as FuseListItem, P as PartialDeep, i as Photo, g as Pkg, b as RedirectItem, f as RedirectRule, R as RuntimeConfig, S as SiteConfig, e as SocialLink, U as UserSiteConfig, h as UserValaxyConfig, a as ValaxyAddon, V as ValaxyConfig } from '../config-DHcACRUt.js';
 import { Header } from '@valaxyjs/utils';
 import '@vueuse/integrations/useFuse';
 import 'medium-zoom';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valaxy",
   "type": "module",
-  "version": "0.23.6",
+  "version": "0.24.1",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -45,6 +45,7 @@
     "client",
     "dist",
     "index.d.ts",
+    "shared",
     "shims.d.ts",
     "types"
   ],
@@ -59,14 +60,14 @@
     "@intlify/unplugin-vue-i18n": "^6.0.8",
     "@shikijs/transformers": "^3.7.0",
     "@types/katex": "^0.16.7",
-    "@unhead/addons": "^2.0.11",
-    "@unhead/schema-org": "^2.0.11",
-    "@unhead/vue": "^2.0.11",
+    "@unhead/addons": "^2.0.12",
+    "@unhead/schema-org": "^2.0.12",
+    "@unhead/vue": "^2.0.12",
     "@vitejs/plugin-vue": "^6.0.0",
     "@vue/devtools-api": "7.7.2",
-    "@vueuse/core": "^13.4.0",
-    "@vueuse/integrations": "^13.4.0",
-    "beasties": "^0.3.4",
+    "@vueuse/core": "^13.5.0",
+    "@vueuse/integrations": "^13.5.0",
+    "beasties": "^0.3.5",
     "birpc": "^2.4.0",
     "consola": "^3.4.2",
     "cross-spawn": "^7.0.6",
@@ -77,6 +78,7 @@
     "ejs": "^3.1.10",
     "escape-html": "^1.0.3",
     "fast-glob": "^3.3.3",
+    "feed": "^5.1.0",
     "floating-vue": "^5.2.2",
     "fs-extra": "^11.3.0",
     "fuse.js": "^7.1.0",
@@ -99,7 +101,7 @@
     "markdown-it-table-of-contents": "^0.9.0",
     "markdown-it-task-lists": "^2.1.1",
     "medium-zoom": "^1.1.0",
-    "mermaid": "^11.7.0",
+    "mermaid": "^11.8.1",
     "mlly": "^1.7.4",
     "nprogress": "^0.2.0",
     "open": "10.1.0",
@@ -113,26 +115,25 @@
     "shiki": "^3.7.0",
     "star-markdown-css": "^0.5.3",
     "table": "^6.9.0",
-    "unhead": "^2.0.11",
-    "unocss": "^66.3.2",
+    "unhead": "^2.0.12",
+    "unocss": "^66.3.3",
     "unplugin-vue-components": "28.0.0",
-    "unplugin-vue-markdown": "^29.0.0",
-    "unplugin-vue-router": "^0.13.0",
+    "unplugin-vue-markdown": "^29.1.0",
+    "unplugin-vue-router": "^0.14.0",
     "vanilla-lazyload": "^19.1.3",
-    "vite": "^7.0.0",
+    "vite": "^7.0.4",
     "vite-dev-rpc": "^1.1.0",
     "vite-plugin-vue-devtools": "^7.7.7",
     "vite-plugin-vue-layouts": "^0.11.0",
     "vite-ssg": "^28.0.0",
     "vite-ssg-sitemap": "^0.9.0",
-    "vitepress-plugin-group-icons": "^1.6.0",
+    "vitepress-plugin-group-icons": "^1.6.1",
     "vue": "^3.5.17",
-    "vue-i18n": "^11.1.7",
+    "vue-i18n": "^11.1.9",
     "vue-router": "^4.5.1",
     "yargs": "^18.0.0",
-    "zfeed": "^0.2.3",
-    "@valaxyjs/devtools": "0.23.6",
-    "@valaxyjs/utils": "0.23.6"
+    "@valaxyjs/devtools": "0.24.1",
+    "@valaxyjs/utils": "0.24.1"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^2.1.4",
@@ -160,7 +161,7 @@
     "rollup-plugin-visualizer": "^6.0.3"
   },
   "resolutions": {
-    "vite": "catalog:"
+    "vite": "catalog:build"
   },
   "scripts": {
     "clean": "rimraf dist",

package/shared/index.ts

@@ -0,0 +1 @@
+export * from './utils'

package/shared/utils/i18n.ts

@@ -0,0 +1,17 @@
+/**
+ * translate object
+ *
+ * { 'en': 'English', 'zh-CN': '中文' }
+ *
+ * ```ts
+ * tObject({ 'en': 'English', 'zh-CN': '中文' }, 'zh-CN') // 中文
+ * tObject({ 'en': 'English', 'zh-CN': '中文' }, 'en') // English
+ * tObject({ 'en': 'English', 'zh-CN': '中文' }, 'fr') // English
+ * ```
+ */
+export function tObject(data: string | Record<string, string>, lang: string): string {
+  if (typeof data === 'object') {
+    return data[lang] || Object.values(data)[0] || ''
+  }
+  return data
+}

package/shared/utils/index.ts

@@ -0,0 +1 @@
+export * from './i18n'

package/types/frontmatter/page.ts

@@ -44,8 +44,22 @@ export interface PageFrontMatter extends Record<string, any> {
   /**
    * Title
    * @description 文章标题
-   */
-  title: string
+   *
+   * ```md
+   * ---
+   * title: Post Title
+   * ---
+   * ```
+   *
+   * ```md
+   * ---
+   * title:
+   *   en: Post Title
+   *   zh-CN: 文章标题
+   * ---
+   * ```
+   */
+  title: string | Record<string, string>
   date: string | number | Date
   /**
    * Updated Time

package/types/node.ts

@@ -1,5 +1,5 @@
 export interface FuseListItem extends Record<string, any> {
-  title: string
+  title: string | Record<string, string>
   excerpt?: string
   author: string
   tags: string[]