valaxy 0.25.0 → 0.25.1

package/client/components/ValaxyContainerBlockTitle.vue

@@ -0,0 +1,16 @@
+<script setup lang="ts">
+// import { useValaxyI18n } from 'valaxy'
+import { useI18n } from 'vue-i18n'
+
+defineProps<{
+  title: string
+}>()
+
+const { t } = useI18n()
+</script>
+
+<template>
+  <span>
+    {{ t(title) }}
+  </span>
+</template>

package/client/components/ValaxyCopyright.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
+import { useValaxyI18n } from 'valaxy'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useValaxyI18n } from '../composables'
 import { useSiteConfig } from '../config'
 
 withDefaults(defineProps<{

package/client/composables/app/useValaxyApp.ts

@@ -5,7 +5,6 @@ import { useSeoMeta } from '@unhead/vue'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { tObject } from '../../../shared/utils/i18n'
 import { useFrontmatter, useValaxyHead, useValaxyI18n } from '../../composables'
 
 import { useTimezone } from '../../composables/global'
@@ -20,9 +19,9 @@ export function useValaxyApp() {
   const fm = useFrontmatter()
 
   const { locale } = useI18n()
-  const { $t } = useValaxyI18n()
+  const { $t, $tO } = useValaxyI18n()
 
-  const title = computed(() => tObject(fm.value.title || '', locale.value))
+  const title = computed(() => $tO(fm.value.title))
 
   // seo
   // todo: get first image url from markdown
@@ -35,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(() => tObject(fm.value.title || siteConfig.value.title, locale.value)),
+    ogTitle: computed(() => $tO(fm.value.title || siteConfig.value.title)),
     ogImage: computed(() => fm.value.ogImage || fm.value.cover || siteConfig.value.favicon),
     ogType: 'website',
     ogUrl: siteUrl,

package/client/composables/app/useValaxyHead.ts

@@ -1,19 +1,16 @@
 import { useHead } from '@unhead/vue'
 import pkg from 'valaxy/package.json'
 import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
 
 import { useFrontmatter, useValaxyI18n } from '../../composables'
 import { useSiteConfig } from '../../config'
-import { tObject } from '../../utils'
 
 export function useValaxyHead() {
-  const { locale } = useI18n()
-  const { $t } = useValaxyI18n()
+  const { $t, $tO } = useValaxyI18n()
 
   const fm = useFrontmatter()
   const siteConfig = useSiteConfig()
-  const $title = computed(() => tObject(fm.value.title || '', locale.value))
+  const $title = computed(() => $tO(fm.value.title))
 
   useHead({
     title: $title,

package/client/composables/locale.ts

@@ -73,14 +73,35 @@ export function useLocaleTitle(fm: Ref<{
 export function useValaxyI18n() {
   const { t, locale } = useI18n()
 
+  /**
+   * translate `$locale:key`
+   * @param key
+   */
+  const $t = (key: string) => {
+    if (key.startsWith(LOCALE_PREFIX)) {
+      return t(key.slice(LOCALE_PREFIX.length))
+    }
+    return key
+  }
+
+  /**
+   * translate object
+   *
+   * {
+   *   "zh-CN": "你好",
+   *   "en": "Hello"
+   * }
+   */
+  const $tO = (data?: string | Record<string, string>) => {
+    return tObject(data || '', locale.value)
+  }
+
   return {
     locale,
-
-    $t: (key: string) => {
-      if (key.startsWith(LOCALE_PREFIX)) {
-        return t(key.slice(LOCALE_PREFIX.length))
-      }
-      return key
-    },
+    /**
+     * vue-i18n t function
+     */
+    $t,
+    $tO,
   }
 }

package/client/locales/en.yml

@@ -25,6 +25,7 @@ menu:
   archives: Archives
   categories: Categories
   tags: Tags
+  posts: Posts
   about: About
   search: Search
 
@@ -110,3 +111,10 @@ time:
 
 tooltip:
   last_updated: Last updated
+
+blocks:
+  tip: TIP
+  warning: WARNING
+  danger: DANGER
+  info: INFO
+  details: DETAILS

package/client/locales/zh-CN.yml

@@ -25,6 +25,7 @@ menu:
   archives: 归档
   categories: 分类
   tags: 标签
+  posts: 博客文章
   about: 关于
   search: 搜索
 
@@ -109,3 +110,10 @@ time:
 
 tooltip:
   last_updated: 最后更新于
+
+blocks:
+  tip: 提示
+  warning: 注意
+  danger: 警告
+  info: 信息
+  details: 详情

package/client/styles/components/custom-block.scss

@@ -1,6 +1,5 @@
-/* stylelint-disable no-descending-specificity */
 .custom-block-title {
-  margin-bottom: -0.4rem;
+  margin-bottom: 0.4rem !important;
   font-weight: 600;
   display: flex;
   align-items: center;

package/dist/{chunk-VNLGPNVS.js → chunk-JXEHOFBR.js}

@@ -4,7 +4,7 @@ import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // package.json
-var version = "0.25.0";
+var version = "0.25.1";
 
 // node/modules/fuse.ts
 import path4 from "path";
@@ -2055,12 +2055,13 @@ function preWrapperPlugin(md3, options) {
     const lang = extractLang(token.info);
     const rawCode = fence(...args);
     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>`;
+    return `<div class="language-${lang}${active}${codeHeightLimitClass}"><button title="${options.codeCopyButtonTitle || "Copy code"}" 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 } = {}, md3) {
+function createContainer(key, block = {}, md3) {
+  const classes = key;
   return [
     container,
     classes,
@@ -2072,15 +2073,9 @@ function createContainer(classes, { icon, color, text: defaultTitle, langs } = {
           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 titleWithLang = `<span lang="en">${info || defaultTitle}</span>`;
-          if (langs) {
-            Object.keys(langs).forEach((lang) => {
-              titleWithLang += `<span lang="${lang}">${info || langs[lang]}</span>`;
-            });
-          }
-          const title = md3.renderInline(titleWithLang, {});
+          if (block.icon)
+            iconTag = `<i class="icon ${block.icon}" ${block.color ? `style="color: ${block.color}"` : ""}></i>`;
+          const title = `<ValaxyContainerBlockTitle title="blocks.${key}" />`;
           const titleClass = `custom-block-title${info ? "" : " custom-block-title-default"}`;
           if (classes === "details")
             return `<details ${attrs}><summary>${title}</summary>
@@ -2096,43 +2091,27 @@ function createContainer(classes, { icon, color, text: defaultTitle, langs } = {
 }
 var defaultBlocksOptions = {
   tip: {
-    text: "TIP",
-    langs: {
-      "zh-CN": "\u63D0\u793A"
-    }
+    text: "TIP"
   },
   warning: {
-    text: "WARNING",
-    langs: {
-      "zh-CN": "\u6CE8\u610F"
-    }
+    text: "WARNING"
   },
   danger: {
-    text: "DANGER",
-    langs: {
-      "zh-CN": "\u8B66\u544A"
-    }
+    text: "DANGER"
   },
   info: {
-    text: "INFO",
-    langs: {
-      "zh-CN": "\u4FE1\u606F"
-    }
+    text: "INFO"
   },
   details: {
-    text: "Details",
-    langs: {
-      "zh-CN": "\u8BE6\u60C5"
-    }
+    text: "Details"
   }
 };
 function containerPlugin(md3, containerOptions = {}) {
-  const blockKeys = new Set(Object.keys(Object.assign(defaultBlocksOptions, containerOptions)));
+  const blockKeys = new Set(Object.keys(Object.assign({}, defaultBlocksOptions, containerOptions.blocks)));
   blockKeys.forEach((optionKey) => {
-    const option = {
-      ...defaultBlocksOptions[optionKey],
-      ...containerOptions[optionKey] || {}
-    };
+    const key = optionKey;
+    const userOption = containerOptions.blocks?.[key] || {};
+    const option = Object.assign({}, defaultBlocksOptions[key], userOption);
     md3.use(...createContainer(optionKey, option, md3));
   });
   md3.use(container, "v-pre", {
@@ -2145,7 +2124,7 @@ function containerPlugin(md3, containerOptions = {}) {
 ` : `</div>
 `
   });
-  const languages = containerOptions.siteConfig?.languages || ["zh-CN", "en"];
+  const languages = containerOptions.languages || ["zh-CN", "en"];
   languages.forEach((lang) => {
     md3.use(container, lang, {
       render: (tokens, idx) => tokens[idx].nesting === 1 ? `<div lang="${lang}">
@@ -2561,9 +2540,12 @@ async function setupMarkdownPlugins(md3, options, base = "/") {
   if (mdOptions.preConfig)
     mdOptions.preConfig(md3);
   md3.use(highlightLinePlugin).use(preWrapperPlugin, { theme, siteConfig }).use(snippetPlugin, options?.userRoot).use(containerPlugin, {
-    siteConfig,
-    ...mdOptions.blocks,
-    ...mdOptions?.container
+    languages: siteConfig.languages,
+    ...mdOptions?.container,
+    blocks: {
+      ...mdOptions.blocks,
+      ...mdOptions.container?.blocks
+    }
   }).use(cssI18nContainer, {
     languages: options?.config.siteConfig.languages
   }).use(

package/dist/node/cli/index.js

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

package/dist/node/index.d.ts

@@ -2,9 +2,9 @@ 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-DHcACRUt.js';
+import { D as DefaultTheme, V as ValaxyConfig, a as ValaxyAddon, P as PartialDeep, R as RuntimeConfig, b as RedirectItem, S as SiteConfig, U as UserSiteConfig } from '../config-DHcACRUt.js';
 import Vue from '@vitejs/plugin-vue';
-import { Options as Options$3 } from 'beasties';
+import { Options as Options$2 } from 'beasties';
 import { Hookable } from 'hookable';
 import { PluginVisualizerOptions } from 'rollup-plugin-visualizer';
 import { presetUno, presetAttributify, presetIcons, presetTypography } from 'unocss';
@@ -14,14 +14,14 @@ import Markdown from 'unplugin-vue-markdown/vite';
 import { EditableTreeNode } from 'unplugin-vue-router';
 import Router from 'unplugin-vue-router/vite';
 import Layouts from 'vite-plugin-vue-layouts';
-import { Options as Options$2 } from 'vitepress-plugin-group-icons';
+import { Options as Options$1 } from 'vitepress-plugin-group-icons';
 import { HeadersPluginOptions } from '@mdit-vue/plugin-headers';
 import { SfcPluginOptions } from '@mdit-vue/plugin-sfc';
 import { TocPluginOptions } from '@mdit-vue/plugin-toc';
 import { KatexOptions } from 'katex';
 import MarkdownIt from 'markdown-it';
 import anchorPlugin from 'markdown-it-anchor';
-import { Options as Options$1, MarkdownItAsync } from 'markdown-it-async';
+import { Options, MarkdownItAsync } from 'markdown-it-async';
 import { ThemeRegistration, BuiltinTheme, LanguageInput, ShikiTransformer, Highlighter } from 'shiki';
 export { cli, registerDevCommand, run, startValaxyDev } from './cli/index.js';
 import { Awaitable } from '@antfu/utils';
@@ -46,22 +46,10 @@ declare module 'vite' {
  */
 declare function createValaxyNode(options: ResolvedValaxyOptions): ValaxyNode;
 
-interface Options {
-    codeCopyButtonTitle: string;
-    theme: ThemeOptions;
-    siteConfig?: SiteConfig;
-}
-
 interface BlockItem {
     text?: string;
     icon?: string;
     color?: string;
-    /**
-     * for i18n
-     */
-    langs?: {
-        [key: string]: string;
-    };
 }
 interface Blocks {
     tip?: BlockItem;
@@ -70,7 +58,10 @@ interface Blocks {
     info?: BlockItem;
     details?: BlockItem;
 }
-type ContainerOptions = Blocks & Partial<Options>;
+interface ContainerOptions {
+    blocks?: Blocks;
+    languages?: string[];
+}
 
 type ThemeOptions = ThemeRegistration | BuiltinTheme | {
     light: ThemeRegistration | BuiltinTheme;
@@ -80,7 +71,7 @@ type ThemeOptions = ThemeRegistration | BuiltinTheme | {
  * Extend Markdown options
  * @zh 扩展 Markdown 配置，包含代码高亮、Markdown-it 和插件配置
  */
-interface MarkdownOptions extends Options$1 {
+interface MarkdownOptions extends Options {
     /**
      * Setup markdown-it instance before applying plugins
      */
@@ -313,7 +304,7 @@ interface ValaxyExtendConfig {
     /**
      * @see https://github.com/yuyinws/vitepress-plugin-group-icons
      */
-    groupIcons?: Partial<Options$2>;
+    groupIcons?: Partial<Options$1>;
     /**
      * unocss presets
      * @see https://unocss.dev/guide/presets
@@ -386,7 +377,7 @@ interface ValaxyExtendConfig {
      * beastiesOptions
      * @see https://github.com/danielroe/beasties
      */
-    beastiesOptions?: Options$3;
+    beastiesOptions?: Options$2;
 }
 type ValaxyAddonLike = ValaxyAddon | false | null | undefined;
 type ValaxyAddons = (ValaxyAddon | string)[] | Record<string, ValaxyAddonLike>;

package/dist/node/index.js

@@ -50,7 +50,7 @@ import {
   startValaxyDev,
   toAtFS,
   transformObject
-} from "../chunk-VNLGPNVS.js";
+} from "../chunk-JXEHOFBR.js";
 export {
   $t,
   ALL_ROUTE,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valaxy",
   "type": "module",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -132,8 +132,8 @@
     "vue-i18n": "^11.1.9",
     "vue-router": "^4.5.1",
     "yargs": "^18.0.0",
-    "@valaxyjs/devtools": "0.25.0",
-    "@valaxyjs/utils": "0.25.0"
+    "@valaxyjs/devtools": "0.25.1",
+    "@valaxyjs/utils": "0.25.1"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^2.1.4",