valaxy 0.26.12 → 0.27.0

package/client/app/data.ts

@@ -1,6 +1,6 @@
 import type { Ref } from 'vue'
 import type { Router } from 'vue-router'
-import type { PageData } from '../../types'
+import type { PageData, Post } from '../../types'
 import { computed } from 'vue'
 
 export interface ValaxyData<FM = PageData['frontmatter']> {
@@ -16,6 +16,6 @@ export function initData(router: Router): ValaxyData {
     page: computed(() => (router.currentRoute.value as unknown as {
       data: PageData
     }).data),
-    frontmatter: computed(() => router.currentRoute.value.meta.frontmatter),
+    frontmatter: computed(() => router.currentRoute.value.meta.frontmatter!) as Ref<Post>,
   }
 }

package/client/composables/dark.ts

@@ -1,6 +1,6 @@
 import type { UseDarkOptions } from '@vueuse/core'
 import { useDark, useToggle } from '@vueuse/core'
-import { computed } from 'vue'
+import { computed, nextTick } from 'vue'
 
 export function useValaxyDark(options: {
   /**
@@ -31,8 +31,12 @@ export function useValaxyDark(options: {
   if (options.circleTransition)
     import('valaxy/client/styles/common/view-transition.css')
 
+  const enableTransitions = () =>
+    'startViewTransition' in document
+    && window.matchMedia('(prefers-reduced-motion: no-preference)').matches
+
   function toggleDarkWithTransition(event: MouseEvent, options: { duration?: number, easing?: EffectTiming['easing'] } = {}) {
-    if (!document.startViewTransition) {
+    if (!enableTransitions()) {
       toggleDark()
       return
     }
@@ -44,23 +48,26 @@ export function useValaxyDark(options: {
       Math.max(y, innerHeight - y),
     )
 
-    const transition = document.startViewTransition(() => {
+    const clipPath = [
+      `circle(0px at ${x}px ${y}px)`,
+      `circle(${endRadius}px at ${x}px ${y}px)`,
+    ]
+
+    const transition = document.startViewTransition(async () => {
       toggleDark()
+      await nextTick()
     })
 
     transition.ready.then(() => {
-      const clipPath = [
-        `circle(0px at ${x}px ${y}px)`,
-        `circle(${endRadius}px at ${x}px ${y}px)`,
-      ]
       document.documentElement.animate(
         {
-          clipPath: isDark.value ? clipPath.reverse() : clipPath,
+          clipPath: isDark.value ? [...clipPath].reverse() : clipPath,
         },
         {
-          duration: options.duration || 300,
-          easing: options.easing || 'ease-in',
-          pseudoElement: isDark.value ? '::view-transition-old(root)' : '::view-transition-new(root)',
+          duration: options.duration ?? 200,
+          easing: options.easing ?? 'ease-in',
+          fill: 'forwards',
+          pseudoElement: `::view-transition-${isDark.value ? 'old' : 'new'}(root)`,
         },
       )
     })

package/client/composables/post/index.ts

@@ -1,4 +1,4 @@
-import type { Post } from 'valaxy'
+import type { Post, SiteConfig } from 'valaxy'
 import type { ComputedRef } from 'vue'
 import { orderByMeta, useSiteConfig } from 'valaxy'
 import { computed } from 'vue'
@@ -37,6 +37,39 @@ export function usePageList() {
   })
 }
 
+/**
+ * Pure function to filter and sort posts from page list
+ * Can be used in both composables and stores without inject() issues
+ */
+export function filterAndSortPosts(
+  pages: Post[],
+  siteConfig: SiteConfig,
+  params: { type?: string } = {},
+): Post[] {
+  // Filter posts
+  const routes = pages
+    .filter(i =>
+      i.path?.startsWith('/posts')
+      && !i.path?.endsWith('.html')
+      && i.date
+      && (!params.type || i.type === params.type)
+      && (!i.hide || i.hide === 'index'), // hide `hide: all` posts
+    )
+
+  function sortBySiteConfigOrderBy(posts: Post[]) {
+    const orderBy = siteConfig.orderBy
+    return orderByMeta(posts, orderBy)
+  }
+
+  /**
+   * 置顶
+   */
+  const topPosts = sortBySiteConfigOrderBy(routes.filter(i => i.top)).sort((a, b) => b.top! - a.top!)
+  const otherPosts = sortBySiteConfigOrderBy(routes.filter(i => !i.top))
+
+  return topPosts.concat(otherPosts)
+}
+
 /**
  * get post list in 'pages/posts' folder
  * todo: use vue provide/inject to global
@@ -47,26 +80,6 @@ export function usePostList(params: {
   const siteConfig = useSiteConfig()
   const pageList = usePageList()
   return computed(() => {
-    const routes = pageList.value
-      .filter(i =>
-        i.path?.startsWith('/posts')
-        && !i.path?.endsWith('.html')
-        && i.date
-        && (!params.type || i.type === params.type)
-        && (!i.hide || i.hide === 'index'), // hide `hide: all` posts
-      )
-
-    function sortBySiteConfigOrderBy(posts: Post[]) {
-      const orderBy = siteConfig.value.orderBy
-      return orderByMeta(posts, orderBy)
-    }
-
-    /**
-     * 置顶
-     */
-    const topPosts = sortBySiteConfigOrderBy(routes.filter(i => i.top)).sort((a, b) => b.top! - a.top!)
-    const otherPosts = sortBySiteConfigOrderBy(routes.filter(i => !i.top))
-
-    return topPosts.concat(otherPosts)
+    return filterAndSortPosts(pageList.value, siteConfig.value, params)
   })
 }

package/client/index.d.ts

@@ -1,8 +1,9 @@
-import type { Header } from '@valaxyjs/utils'
 import type { Ref } from 'vue'
 import type { Post } from '../types'
 
 import './shims.d'
+// Import vue-router RouteMeta augmentation
+import '../types/vue-router.d'
 
 export * from '../dist/types/index.mjs'
 export * from './index'
@@ -12,13 +13,6 @@ declare module '@docsearch/js' {
   export default docsearch
 }
 
-declare module 'vue-router' {
-  interface RouteMeta {
-    headers: Header[]
-    frontmatter: Post
-  }
-}
-
 declare interface Window {
   // for devtools
   __VUE_DEVTOOLS_ROUTER__: import('vue-router').Router

package/client/main.ts

@@ -1,9 +1,8 @@
-import { DataLoaderPlugin } from 'unplugin-vue-router/data-loaders'
 import { dataSymbol, initValaxyConfig, valaxyConfigSymbol } from 'valaxy'
 import { setupLayouts } from 'virtual:generated-layouts'
 import { ViteSSG } from 'vite-ssg'
-
 import { routes as autoRoutes } from 'vue-router/auto-routes'
+
 // import App from '/@valaxyjs/App.vue'
 import App from './App.vue'
 
@@ -70,8 +69,10 @@ export const createApp = ViteSSG(
     const data = initData(router)
     app.provide(dataSymbol, data)
 
-    // Register the plugin before the router
-    app.use(DataLoaderPlugin, { router })
+    // Note: DataLoaderPlugin is not compatible with vite-ssg because vite-ssg
+    // calls this callback BEFORE app.use(router), but DataLoaderPlugin requires
+    // the router to be installed first for useRouter()/useRoute() to work.
+    // The page data is loaded via route.meta.frontmatter instead.
 
     app.provide(valaxyConfigSymbol, valaxyConfig)
 

package/client/modules/devtools.ts

@@ -1,5 +1,6 @@
 import type { UserModule } from '../types'
 
+import { normalizeRepositoryUrl } from '@valaxyjs/utils'
 import pkg from '../../package.json'
 import valaxyLogo from '../assets/images/valaxy-logo.png'
 
@@ -39,7 +40,7 @@ export async function addValaxyTabAndCommand() {
         icon: 'i-ri-github-fill',
         action: {
           type: 'url',
-          src: pkg.repository.url,
+          src: normalizeRepositoryUrl(pkg.repository.url),
         },
       },
       {

package/client/stores/site.ts

@@ -1,7 +1,7 @@
 import type { PageDataPayload } from '../../types'
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import { computed, ref } from 'vue'
-import { usePostList, useRouterStore } from '..'
+import { filterAndSortPosts, usePageList, useRouterStore, useSiteConfig } from '..'
 import { setWindowValaxyProp } from '../utils/dev'
 
 /**
@@ -14,14 +14,19 @@ export const useSiteStore = defineStore('site', () => {
   const routerStore = useRouterStore()
   const router = routerStore.router
 
+  // Get siteConfig once during store initialization to avoid inject() issues during HMR
+  const siteConfig = useSiteConfig()
+  const pageList = usePageList()
+
   const reload = ref(1)
   // for dev hot reload
   const postList = computed(() => {
-    const val = usePostList().value
-    if (reload.value && val)
-      return val
-    else
-      return val
+    // Touch reload.value to trigger reactivity on HMR
+    // eslint-disable-next-line ts/no-unused-expressions
+    reload.value
+
+    // Reuse the same filter and sort logic as usePostList
+    return filterAndSortPosts(pageList.value, siteConfig.value)
   })
 
   // const postList = usePostList()

package/client/styles/common/view-transition.css

@@ -5,17 +5,12 @@
   mix-blend-mode: normal;
 }
 
-/* 进入dark模式和退出dark模式时，两个图像的位置顺序正好相反 */
-.dark::view-transition-old(root) {
-  z-index: 9999;
-}
+::view-transition-old(root),
 .dark::view-transition-new(root) {
   z-index: 1;
 }
 
-::view-transition-old(root) {
-  z-index: 1;
-}
-::view-transition-new(root) {
+::view-transition-new(root),
+.dark::view-transition-old(root) {
   z-index: 9999;
-}
+}

package/client/tsconfig.json

@@ -6,7 +6,6 @@
       "valaxy": ["./index.d.ts"]
     },
     "types": [
-      "unplugin-vue-router/client",
       "vite/client",
       "vite-plugin-vue-layouts/client",
       "@intlify/unplugin-vue-i18n/messages"

package/dist/node/cli/index.mjs

@@ -1,7 +1,7 @@
 import 'node:process';
 import 'yargs';
 import 'yargs/helpers';
-export { c as cli, d as registerDevCommand, r as run, a as startValaxyDev } from '../../shared/valaxy.DsB_W1aR.mjs';
+export { c as cli, D as registerDevCommand, S as run, U as startValaxyDev } from '../../shared/valaxy.DpV6HHc6.mjs';
 import 'node:os';
 import 'node:path';
 import 'consola';
@@ -22,6 +22,7 @@ import 'ora';
 import 'cross-spawn';
 import 'mlly';
 import 'resolve-global';
+import '@valaxyjs/utils';
 import 'node:fs/promises';
 import 'dayjs';
 import 'feed';
@@ -56,7 +57,7 @@ import 'unocss';
 import 'pascalcase';
 import 'lru-cache';
 import 'html-to-text';
-import 'unplugin-vue-router/vite';
+import 'vue-router/vite';
 import '@clack/prompts';
 import 'node:net';
 import 'node:child_process';

package/dist/node/index.d.mts

@@ -1,19 +1,19 @@
 import { ViteSSGOptions } from 'vite-ssg';
 import * as vite from 'vite';
 import { UserConfig, InlineConfig, ViteDevServer, PluginOption, Plugin } from 'vite';
+import { D as DefaultTheme, R as RuntimeConfig, a as RedirectItem, V as ValaxyConfig, P as PartialDeep, b as ValaxyAddon, S as SiteConfig, U as UserSiteConfig } from '../shared/valaxy._i636HSR.mjs';
 import Vue from '@vitejs/plugin-vue';
-import { Options as Options$2 } from 'beasties';
+import { Options as Options$1 } from 'beasties';
 import { Hookable } from 'hookable';
 import { PluginVisualizerOptions } from 'rollup-plugin-visualizer';
 import { presetWind4, presetAttributify, presetIcons, presetTypography } from 'unocss';
 import { VitePluginConfig } from 'unocss/vite';
 import Components from 'unplugin-vue-components/vite';
 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$1 } from 'vitepress-plugin-group-icons';
-import { D as DefaultTheme, R as RuntimeConfig, a as RedirectItem, V as ValaxyConfig, P as PartialDeep, b as ValaxyAddon, S as SiteConfig, U as UserSiteConfig } from '../shared/valaxy.gqLhCu14.mjs';
+import { groupIconVitePlugin } from 'vitepress-plugin-group-icons';
+import { EditableTreeNode } from 'vue-router/unplugin';
+import Router from 'vue-router/vite';
 import { MarkdownEnv } from 'unplugin-vue-markdown/types';
 import { KatexOptions } from 'katex';
 import MarkdownIt from 'markdown-it';
@@ -23,6 +23,7 @@ import { ThemeRegistration, BuiltinTheme, LanguageInput, ShikiTransformer, Highl
 export { cli, registerDevCommand, run, startValaxyDev } from './cli/index.mjs';
 import { Awaitable } from '@antfu/utils';
 import * as defu from 'defu';
+import '@valaxyjs/utils';
 import '@vueuse/integrations/useFuse';
 import 'medium-zoom';
 import 'vanilla-lazyload';
@@ -557,6 +558,12 @@ interface ValaxyExtendConfig {
              * @default false
              */
             fullText: boolean;
+            /**
+             * @zh 从构建后的 HTML 中提取图片路径（用于解析 Vite 打包后的 hash 文件名）
+             * @en Extract image paths from built HTML files (to resolve Vite hashed filenames)
+             * @default true
+             */
+            extractImagePathsFromHTML: boolean;
         };
     };
     /**
@@ -626,7 +633,7 @@ interface ValaxyExtendConfig {
     /**
      * @see https://github.com/yuyinws/vitepress-plugin-group-icons
      */
-    groupIcons?: Partial<Options$1>;
+    groupIcons?: Partial<NonNullable<Parameters<typeof groupIconVitePlugin>[0]>>;
     /**
      * unocss presets
      * @see https://unocss.dev/guide/presets
@@ -703,7 +710,7 @@ interface ValaxyExtendConfig {
      * beastiesOptions
      * @see https://github.com/danielroe/beasties
      */
-    beastiesOptions?: Options$2;
+    beastiesOptions?: Options$1;
 }
 type ValaxyApp = ReturnType<typeof createValaxyNode>;
 

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.DsB_W1aR.mjs';
+export { A 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, a as createServer, d as createValaxyPlugin, e as customElements, f as defaultSiteConfig, g as defaultValaxyConfig, h as defaultViteConfig, i as defineAddon, j as defineConfig, k as defineSiteConfig, l as defineTheme, m as defineValaxyAddon, n as defineValaxyConfig, o as defineValaxyTheme, p as encryptContent, q as generateClientRedirects, r as getGitTimestamp, s as getIndexHtml, t as getServerInfoText, u as isExternal, v as isInstalledGlobally, w as isPath, x as loadConfigFromFile, y as mergeValaxyConfig, z as mergeViteConfigs, B as postProcessForSSG, C as processValaxyOptions, D as registerDevCommand, F as resolveAddonsConfig, H as resolveImportPath, I as resolveImportUrl, J as resolveOptions, K as resolveSiteConfig, L as resolveSiteConfigFromRoot, M as resolveThemeConfigFromRoot, N as resolveThemeValaxyConfig, O as resolveUserThemeConfig, Q as resolveValaxyConfig, R as resolveValaxyConfigFromRoot, S as run, T as ssgBuild, U as startValaxyDev, W as toAtFS, X as transformObject, Y as version } from '../shared/valaxy.DpV6HHc6.mjs';
 import 'node:path';
 import 'fs-extra';
 import 'consola/utils';
@@ -22,6 +22,7 @@ import 'ora';
 import 'cross-spawn';
 import 'mlly';
 import 'resolve-global';
+import '@valaxyjs/utils';
 import 'node:fs/promises';
 import 'dayjs';
 import 'feed';
@@ -56,7 +57,7 @@ import 'unocss';
 import 'pascalcase';
 import 'lru-cache';
 import 'html-to-text';
-import 'unplugin-vue-router/vite';
+import 'vue-router/vite';
 import '@clack/prompts';
 import 'node:net';
 import 'node:child_process';

package/dist/shared/{valaxy.DsB_W1aR.mjs → valaxy.DpV6HHc6.mjs}

@@ -21,6 +21,7 @@ import ora from 'ora';
 import { spawn } from 'cross-spawn';
 import { resolvePath } from 'mlly';
 import { resolveGlobal } from 'resolve-global';
+import { normalizeRepositoryUrl } from '@valaxyjs/utils';
 import { readFile } from 'node:fs/promises';
 import dayjs from 'dayjs';
 import { Feed } from 'feed';
@@ -55,13 +56,13 @@ import { transformerDirectives, transformerVariantGroup, presetWind4, presetAttr
 import pascalCase from 'pascalcase';
 import { LRUCache } from 'lru-cache';
 import { convert } from 'html-to-text';
-import VueRouter from 'unplugin-vue-router/vite';
+import VueRouter from 'vue-router/vite';
 import { intro, confirm, select, outro } from '@clack/prompts';
 import net from 'node:net';
 import { exec } from 'node:child_process';
 import * as readline from 'node:readline';
 import qrcode from 'qrcode';
-import { render } from 'ejs';
+import ejs from 'ejs';
 
 const EXCERPT_SEPARATOR = "<!-- more -->";
 const PATHNAME_PROTOCOL_RE = /^pathname:\/\//;
@@ -323,10 +324,10 @@ const EXCLUDE = [
   "/@valaxyjs/locales",
   "/@valaxyjs/styles",
   /**
-   * unplugin-vue-router
+   * vue-router data loaders
    * exclude to avoid vite optimize, will make Symbol('loaderEntries') valid
    */
-  "unplugin-vue-router/data-loaders/basic"
+  "vue-router/experimental"
 ];
 function createConfigPlugin(options) {
   const addonDeps = options.addons.map((i) => Object.keys(i.pkg.dependencies || {})).flat();
@@ -1599,7 +1600,7 @@ async function setupMarkdownPlugins(md, options, base = "/") {
   return md;
 }
 
-const version = "0.26.12";
+const version = "0.27.0";
 
 const GLOBAL_STATE = {
   valaxyApp: void 0,
@@ -2134,7 +2135,8 @@ const defaultValaxyConfig = {
   modules: {
     rss: {
       enable: true,
-      fullText: false
+      fullText: false,
+      extractImagePathsFromHTML: true
     }
   },
   features: {
@@ -2378,7 +2380,9 @@ async function parseAddons(addons, userRoot = process.cwd()) {
   spinner.succeed();
   const resolvedAddons = Object.values(resolvers).filter((item) => item.enable);
   resolvedAddons.forEach((addon, i) => {
-    console.log(`  ${i === resolvedAddons.length - 1 ? "\u2514\u2500" : "\u251C\u2500"} ${colors.yellow(addon.name)} ${colors.blue(`v${addon.pkg?.version}`)}${addon.global ? colors.cyan(" (global)") : ""} ${colors.dim(addon.pkg.homepage || addon.pkg.repository?.url || addon.pkg.repository || "")}`);
+    const repoUrl = addon.pkg.repository?.url || addon.pkg.repository;
+    const displayUrl = typeof repoUrl === "string" ? normalizeRepositoryUrl(repoUrl) : repoUrl;
+    console.log(`  ${i === resolvedAddons.length - 1 ? "\u2514\u2500" : "\u251C\u2500"} ${colors.yellow(addon.name)} ${colors.blue(`v${addon.pkg?.version}`)}${addon.global ? colors.cyan(" (global)") : ""} ${colors.dim(addon.pkg.homepage || displayUrl || "")}`);
   });
   return resolvedAddons;
 }
@@ -2928,10 +2932,12 @@ function genProvideCode(name, data) {
 }
 const encryptedKeys = ["encryptedContent", "partiallyEncryptedContents", "encryptedPhotos"];
 function injectPageDataCode(pageData) {
+  const staticPageData = transformObject(pageData);
   const vueContextImports = [
-    `import { provide } from 'vue'`,
+    `import { provide, shallowRef } from 'vue'`,
     `import { useRoute, useRouter } from 'vue-router'`,
-    "const { data: pageData } = usePageData()",
+    // Use static page data instead of data loader
+    `const pageData = shallowRef(${staticPageData})`,
     "const router = useRouter()",
     "const route = useRoute()",
     // $frontmatter contain runtime added data, will be deleted (for example, $frontmatter.partiallyEncryptedContents)
@@ -2949,8 +2955,6 @@ function injectPageDataCode(pageData) {
   return vueContextImports;
 }
 function createTransformMarkdown(options) {
-  const loaderVuePath = path$1.resolve(options.clientRoot, "templates", "loader.vue");
-  const loaderVue = fs.readFileSync(loaderVuePath, "utf-8");
   return (code, id, pageData) => {
     const isDev = options.mode === "dev";
     if (!isDev) {
@@ -2965,9 +2969,6 @@ function createTransformMarkdown(options) {
     encryptedKeys.forEach((key) => {
       delete pageData.frontmatter[key];
     });
-    const pagePath = pageData.relativePath.slice("/pages".length - 1, -".md".length);
-    const customDataLoader = loaderVue.replace("/relativePath", pagePath.endsWith("index") ? pagePath.replace(/\/index$/, "") : pagePath).replace("// custom basic loader", `return ${transformObject(pageData)}`);
-    code = customDataLoader + code;
     const scriptSetupStart = code.indexOf("<script setup>");
     if (scriptSetupStart !== -1)
       code = code.slice(0, scriptSetupStart + "<script setup>".length) + imports.join("\n") + code.slice(scriptSetupStart + 14);
@@ -3293,11 +3294,13 @@ function presetStatistics({
         }
       }, options.readTime)
     });
-    if (route.meta.frontmatter) {
-      if (!route.meta.frontmatter.wordCount)
-        route.meta.frontmatter.wordCount = wordCount2;
-      if (!route.meta.frontmatter.readingTime)
-        route.meta.frontmatter.readingTime = readingTime;
+    const { frontmatter } = route.meta;
+    if (frontmatter && typeof frontmatter === "object" && !Array.isArray(frontmatter)) {
+      const fm = frontmatter;
+      if (!fm.wordCount)
+        fm.wordCount = wordCount2;
+      if (!fm.readingTime)
+        fm.readingTime = readingTime;
     }
   }
 }
@@ -3323,7 +3326,7 @@ async function createRouterPlugin(valaxyApp) {
   return VueRouter({
     extensions: [".vue", ".md"],
     routesFolder: roots.map((root) => `${root}/pages`),
-    dts: resolve$1(options.tempDir, "typed-router.d.ts"),
+    dts: resolve$1(options.tempDir, "route-map.d.ts"),
     ...valaxyConfig.router,
     /**
      * @experimental See https://github.com/posva/unplugin-vue-router/issues/43
@@ -3405,7 +3408,9 @@ async function createRouterPlugin(valaxyApp) {
           ...mdFm,
           // 主题有新的字段需要主动设置
           // @TODO 添加文档和配置项，或者反过来允许用户自行优化
-          tags: typeof mdFm.tags === "string" ? [mdFm.tags] : mdFm.tags
+          tags: typeof mdFm.tags === "string" ? [mdFm.tags] : mdFm.tags,
+          // set default updated to date if not present
+          updated: mdFm.updated ?? mdFm.date
         };
         excludeKeys.forEach((key) => {
           delete routerFM[key];
@@ -3419,8 +3424,6 @@ async function createRouterPlugin(valaxyApp) {
             layout: data.layout
           });
         }
-        if (!route.meta.frontmatter?.updated)
-          route.meta.frontmatter.updated = mdFm.date;
         if (valaxyConfig.siteConfig.statistics.enable) {
           presetStatistics({
             options: valaxyConfig.siteConfig.statistics,
@@ -3815,6 +3818,34 @@ const markdown = MarkdownIt({
   breaks: true,
   linkify: true
 });
+async function extractImagePathsFromHTML(htmlPath, DOMAIN) {
+  const imageMap = /* @__PURE__ */ new Map();
+  try {
+    if (!await fs.exists(htmlPath))
+      return imageMap;
+    const html = await fs.readFile(htmlPath, "utf-8");
+    const imgRegex = /<img[^>]+src="([^"]+)"[^>]*>/g;
+    let match;
+    while ((match = imgRegex.exec(html)) !== null) {
+      const src = match[1];
+      const assetMatch = src.match(/\/assets\/(.+)\.([a-zA-Z0-9]+)\.([a-z0-9]+)$/);
+      if (assetMatch) {
+        const [, basename, , ext] = assetMatch;
+        const originalName = `${basename}.${ext}`;
+        imageMap.set(originalName, `${DOMAIN}${src}`);
+        imageMap.set(`./${originalName}`, `${DOMAIN}${src}`);
+        consola.debug(`[RSS] Mapped image: ${originalName} -> ${DOMAIN}${src}`);
+      }
+    }
+    if (imageMap.size > 0) {
+      const uniqueImageCount = imageMap.size / 2;
+      consola.info(`[RSS] Extracted ${uniqueImageCount} image(s) from ${htmlPath}`);
+    }
+  } catch (error) {
+    consola.debug(`Failed to extract image paths from ${htmlPath}:`, error);
+  }
+  return imageMap;
+}
 async function build(options) {
   const s = ora("RSS Generating ...").start();
   const { config } = options;
@@ -3899,12 +3930,39 @@ async function getPosts(params, options) {
     }
     const fullText = options.config.modules.rss.fullText;
     const rssContent = fullText ? content : excerpt || content.slice(0, 100);
-    const html = markdown.render(rssContent).replace('src="/', `src="${DOMAIN}/`);
-    if (data.image?.startsWith("/"))
-      data.image = DOMAIN + data.image;
     const relativePath = relative$1(join(options.userRoot, "pages"), path);
     const urlPath = relativePath.replace(/\\/g, "/").replace(/\.md$/, "");
     const link = `${DOMAIN}/${urlPath}`;
+    const extractImages = options.config.modules.rss.extractImagePathsFromHTML;
+    let imageMap = /* @__PURE__ */ new Map();
+    if (extractImages) {
+      let htmlPath = resolve(options.userRoot, "dist", `${urlPath}.html`);
+      if (urlPath.endsWith("/index")) {
+        const withoutIndex = urlPath.slice(0, -6);
+        const alternativePath = resolve(options.userRoot, "dist", `${withoutIndex}.html`);
+        if (await fs.exists(alternativePath)) {
+          htmlPath = alternativePath;
+        }
+      }
+      imageMap = await extractImagePathsFromHTML(htmlPath, DOMAIN);
+    }
+    let html = markdown.render(rssContent);
+    html = html.replace(/src="([^"]+)"/g, (_fullMatch, src) => {
+      if (imageMap.has(src)) {
+        return `src="${imageMap.get(src)}"`;
+      }
+      if (src.startsWith("http://") || src.startsWith("https://")) {
+        return _fullMatch;
+      }
+      if (src.startsWith("/")) {
+        return `src="${DOMAIN}${src}"`;
+      }
+      const postDirUrl = `${DOMAIN}/${urlPath.split("/").slice(0, -1).join("/")}`;
+      const cleanSrc = src.startsWith("./") ? src.slice(2) : src;
+      return `src="${postDirUrl}/${cleanSrc}"`;
+    });
+    if (data.image?.startsWith("/"))
+      data.image = DOMAIN + data.image;
     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>`;
     const item = {
       ...data,
@@ -4530,7 +4588,7 @@ async function genLayoutTemplate({
   if (!template)
     template = defaultPostTemplate;
   const dateFormat = "YYYY-MM-DD HH:mm:ss";
-  return render(template, { title, layout, date: date ? dayjs().format(dateFormat) : "" });
+  return ejs.render(template, { title, layout, date: date ? dayjs().format(dateFormat) : "" });
 }
 
 function registerNewCommand(cli) {
@@ -4592,4 +4650,4 @@ function run() {
   cli.parse();
 }
 
-export { mergeValaxyConfig as A, resolveValaxyConfig as B, ALL_ROUTE as C, customElements as D, EXCERPT_SEPARATOR as E, defaultViteConfig as F, GLOBAL_STATE as G, version as H, processValaxyOptions as I, resolveOptions as J, resolveThemeValaxyConfig as K, createValaxyPlugin as L, getServerInfoText as M, createServer as N, encryptContent as O, PATHNAME_PROTOCOL_RE as P, getGitTimestamp as Q, isExternal as R, isPath as S, transformObject as T, isInstalledGlobally as U, ViteValaxyPlugins as V, resolveImportUrl as W, toAtFS as X, resolveImportPath as Y, startValaxyDev as a, build$1 as b, cli as c, registerDevCommand as d, getIndexHtml as e, defineValaxyAddon as f, generateClientRedirects as g, defineAddon as h, resolveAddonsConfig as i, defaultSiteConfig as j, defineSiteConfig as k, resolveSiteConfigFromRoot as l, mergeViteConfigs as m, resolveSiteConfig as n, resolveThemeConfigFromRoot as o, postProcessForSSG as p, resolveUserThemeConfig as q, run as r, ssgBuild as s, defineValaxyTheme as t, defineTheme as u, loadConfigFromFile as v, defaultValaxyConfig as w, defineValaxyConfig as x, defineConfig as y, resolveValaxyConfigFromRoot as z };
+export { ALL_ROUTE as A, postProcessForSSG as B, processValaxyOptions as C, registerDevCommand as D, EXCERPT_SEPARATOR as E, resolveAddonsConfig as F, GLOBAL_STATE as G, resolveImportPath as H, resolveImportUrl as I, resolveOptions as J, resolveSiteConfig as K, resolveSiteConfigFromRoot as L, resolveThemeConfigFromRoot as M, resolveThemeValaxyConfig as N, resolveUserThemeConfig as O, PATHNAME_PROTOCOL_RE as P, resolveValaxyConfig as Q, resolveValaxyConfigFromRoot as R, run as S, ssgBuild as T, startValaxyDev as U, ViteValaxyPlugins as V, toAtFS as W, transformObject as X, version as Y, createServer as a, build$1 as b, cli as c, createValaxyPlugin as d, customElements as e, defaultSiteConfig as f, defaultValaxyConfig as g, defaultViteConfig as h, defineAddon as i, defineConfig as j, defineSiteConfig as k, defineTheme as l, defineValaxyAddon as m, defineValaxyConfig as n, defineValaxyTheme as o, encryptContent as p, generateClientRedirects as q, getGitTimestamp as r, getIndexHtml as s, getServerInfoText as t, isExternal as u, isInstalledGlobally as v, isPath as w, loadConfigFromFile as x, mergeValaxyConfig as y, mergeViteConfigs as z };

package/dist/shared/{valaxy.gqLhCu14.d.mts → valaxy._i636HSR.d.mts}

@@ -1,3 +1,4 @@
+import { Header } from '@valaxyjs/utils';
 import { FuseOptions } from '@vueuse/integrations/useFuse';
 import { ZoomOptions } from 'medium-zoom';
 import { ILazyLoadOptions } from 'vanilla-lazyload';
@@ -5,62 +6,6 @@ import { RouteRecordRaw } from 'vue-router';
 import { UseDarkOptions } from '@vueuse/core';
 import { NodeRelations, ImageObject } from '@unhead/schema-org';
 
-interface ValaxyAddon<AddonOptions = Record<string, any>> {
-    name: string;
-    /**
-     * be global component
-     */
-    global?: boolean;
-    props?: Record<string, any>;
-    options?: AddonOptions;
-}
-
-declare namespace DefaultTheme {
-    interface Config {
-        valaxyDarkOptions?: {
-            /**
-             * Options for `useDark`
-             * disableTransition default is `true`
-             * Its options are not computed, init when loaded.
-             * @see https://vueuse.org/core/useDark
-             * @url https://paco.me/writing/disable-theme-transitions
-             *
-             * @zh `useDark` 的选项
-             * disableTransition 默认为 `true`，不会进行渐变过渡，这是 VueUse 的默认行为
-             */
-            useDarkOptions?: UseDarkOptions;
-            /**
-             * Enable circle transition when toggling dark mode
-             * Then use `toggleDarkWithTransition` instead of `toggleDark`
-             * @zh 启用圆形过渡切换暗黑模式
-             */
-            circleTransition?: boolean;
-            /**
-             * Theme color
-             * @zh 主题色
-             */
-            themeColor?: {
-                /**
-                 * Theme color for light mode
-                 * @zh 亮色主题色
-                 */
-                light?: string;
-                /**
-                 * Theme color for dark mode
-                 * @zh 暗色主题色
-                 */
-                dark?: string;
-            };
-        };
-        /**
-         * Custom header levels of outline in the aside component.
-         *
-         * @default 2
-         */
-        outline?: number | [number, number] | 'deep' | false;
-    }
-}
-
 interface CollectionConfig {
     title?: string;
     key?: string;
@@ -407,6 +352,92 @@ interface PostFrontMatter extends PageFrontMatter {
     wordCount: string;
 }
 
+type Page = Partial<PageFrontMatter>;
+type Post = Partial<PostFrontMatter>;
+
+/**
+ * Extend vue-router's RouteMeta interface
+ * @see https://router.vuejs.org/guide/advanced/meta.html#TypeScript
+ */
+
+
+declare module 'vue-router' {
+  interface RouteMeta {
+    /**
+     * Headers extracted from markdown
+     */
+    headers: Header[]
+    /**
+     * Frontmatter data from markdown files
+     */
+    frontmatter: Post
+    /**
+     * Excerpt from markdown content
+     */
+    excerpt?: string
+    /**
+     * Layout name
+     */
+    layout?: string
+  }
+}
+
+interface ValaxyAddon<AddonOptions = Record<string, any>> {
+    name: string;
+    /**
+     * be global component
+     */
+    global?: boolean;
+    props?: Record<string, any>;
+    options?: AddonOptions;
+}
+
+declare namespace DefaultTheme {
+    interface Config {
+        valaxyDarkOptions?: {
+            /**
+             * Options for `useDark`
+             * disableTransition default is `true`
+             * Its options are not computed, init when loaded.
+             * @see https://vueuse.org/core/useDark
+             * @url https://paco.me/writing/disable-theme-transitions
+             *
+             * @zh `useDark` 的选项
+             * disableTransition 默认为 `true`，不会进行渐变过渡，这是 VueUse 的默认行为
+             */
+            useDarkOptions?: UseDarkOptions;
+            /**
+             * Enable circle transition when toggling dark mode
+             * Then use `toggleDarkWithTransition` instead of `toggleDark`
+             * @zh 启用圆形过渡切换暗黑模式
+             */
+            circleTransition?: boolean;
+            /**
+             * Theme color
+             * @zh 主题色
+             */
+            themeColor?: {
+                /**
+                 * Theme color for light mode
+                 * @zh 亮色主题色
+                 */
+                light?: string;
+                /**
+                 * Theme color for dark mode
+                 * @zh 暗色主题色
+                 */
+                dark?: string;
+            };
+        };
+        /**
+         * Custom header levels of outline in the aside component.
+         *
+         * @default 2
+         */
+        outline?: number | [number, number] | 'deep' | false;
+    }
+}
+
 interface FuseListItem extends Record<string, any> {
     title: string | Record<string, string>;
     excerpt?: string;
@@ -846,4 +877,4 @@ type UserSiteConfig = PartialDeep<SiteConfig>;
 type UserValaxyConfig<ThemeConfig = DefaultTheme.Config> = PartialDeep<ValaxyConfig<ThemeConfig>>;
 
 export { DefaultTheme as D };
-export type { Album as A, BaseFrontMatter as B, ExcerptType as E, FuseListItem as F, PartialDeep as P, RuntimeConfig as R, SiteConfig as S, UserSiteConfig as U, ValaxyConfig as V, RedirectItem as a, ValaxyAddon as b, PostFrontMatter as c, PageFrontMatter as d, SocialLink as e, RedirectRule as f, Pkg as g, UserValaxyConfig as h, Photo as i };
+export type { Album as A, BaseFrontMatter as B, ExcerptType as E, FuseListItem as F, PartialDeep as P, RuntimeConfig as R, SiteConfig as S, UserSiteConfig as U, ValaxyConfig as V, RedirectItem as a, ValaxyAddon as b, Post as c, Page as d, PageFrontMatter as e, Photo as f, Pkg as g, PostFrontMatter as h, RedirectRule as i, SocialLink as j, UserValaxyConfig as k };

package/dist/types/index.d.mts

@@ -1,5 +1,5 @@
-import { c as PostFrontMatter, d as PageFrontMatter } from '../shared/valaxy.gqLhCu14.mjs';
-export { A as Album, B as BaseFrontMatter, D as DefaultTheme, E as ExcerptType, F as FuseListItem, P as PartialDeep, i as Photo, g as Pkg, a as RedirectItem, f as RedirectRule, R as RuntimeConfig, S as SiteConfig, e as SocialLink, U as UserSiteConfig, h as UserValaxyConfig, b as ValaxyAddon, V as ValaxyConfig } from '../shared/valaxy.gqLhCu14.mjs';
+import { c as Post } from '../shared/valaxy._i636HSR.mjs';
+export { A as Album, B as BaseFrontMatter, D as DefaultTheme, E as ExcerptType, F as FuseListItem, d as Page, e as PageFrontMatter, P as PartialDeep, f as Photo, g as Pkg, h as PostFrontMatter, a as RedirectItem, i as RedirectRule, R as RuntimeConfig, S as SiteConfig, j as SocialLink, U as UserSiteConfig, k as UserValaxyConfig, b as ValaxyAddon, V as ValaxyConfig } from '../shared/valaxy._i636HSR.mjs';
 import { Header } from '@valaxyjs/utils';
 import '@vueuse/integrations/useFuse';
 import 'medium-zoom';
@@ -8,9 +8,6 @@ import 'vue-router';
 import '@vueuse/core';
 import '@unhead/schema-org';
 
-type Page = Partial<PageFrontMatter>;
-type Post = Partial<PostFrontMatter>;
-
 type CleanUrlsMode = 'disabled' | 'without-subfolders' | 'with-subfolders';
 interface PageData {
     relativePath: string;
@@ -32,5 +29,5 @@ interface PageDataPayload {
 }
 type HeadConfig = [string, Record<string, string>] | [string, Record<string, string>, string];
 
-export { PageFrontMatter, PostFrontMatter };
-export type { CleanUrlsMode, HeadConfig, Page, PageData, PageDataPayload, Post };
+export { Post };
+export type { CleanUrlsMode, HeadConfig, PageData, PageDataPayload };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valaxy",
   "type": "module",
-  "version": "0.26.12",
+  "version": "0.27.0",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -62,19 +62,19 @@
   "dependencies": {
     "@antfu/install-pkg": "^1.1.0",
     "@antfu/utils": "^9.3.0",
-    "@clack/prompts": "^0.11.0",
-    "@iconify-json/ri": "^1.2.6",
+    "@clack/prompts": "^1.0.0",
+    "@iconify-json/ri": "^1.2.9",
     "@intlify/unplugin-vue-i18n": "^11.0.3",
-    "@shikijs/transformers": "^3.20.0",
-    "@types/katex": "^0.16.7",
-    "@unhead/addons": "^2.1.1",
-    "@unhead/schema-org": "^2.1.1",
-    "@unhead/vue": "^2.1.1",
-    "@vitejs/plugin-vue": "^6.0.3",
+    "@shikijs/transformers": "^3.22.0",
+    "@types/katex": "^0.16.8",
+    "@unhead/addons": "^2.1.2",
+    "@unhead/schema-org": "^2.1.2",
+    "@unhead/vue": "^2.1.2",
+    "@vitejs/plugin-vue": "^6.0.4",
     "@vue/devtools-api": "7.7.2",
-    "@vueuse/core": "^14.1.0",
-    "@vueuse/integrations": "^14.1.0",
-    "beasties": "^0.3.5",
+    "@vueuse/core": "^14.2.0",
+    "@vueuse/integrations": "^14.2.0",
+    "beasties": "^0.4.1",
     "consola": "^3.4.2",
     "cross-spawn": "^7.0.6",
     "css-i18n": "^0.0.5",
@@ -82,10 +82,10 @@
     "debug": "^4.4.3",
     "define-config-ts": "^0.1.3",
     "defu": "^6.1.4",
-    "ejs": "^3.1.10",
+    "ejs": "^4.0.1",
     "escape-html": "^1.0.3",
     "fast-glob": "^3.3.3",
-    "feed": "^5.1.0",
+    "feed": "^5.2.0",
     "floating-vue": "^5.2.2",
     "fs-extra": "^11.3.3",
     "fuse.js": "^7.1.0",
@@ -95,8 +95,8 @@
     "jiti": "^2.6.1",
     "js-base64": "^3.7.8",
     "js-yaml": "^4.1.1",
-    "katex": "^0.16.27",
-    "lru-cache": "^11.2.4",
+    "katex": "^0.16.28",
+    "lru-cache": "^11.2.5",
     "markdown-it": "^14.1.0",
     "markdown-it-anchor": "^9.2.0",
     "markdown-it-async": "^2.2.0",
@@ -112,35 +112,34 @@
     "mlly": "^1.8.0",
     "nprogress": "^0.2.0",
     "open": "10.1.0",
-    "ora": "^9.0.0",
+    "ora": "^9.1.0",
     "pascalcase": "^2.0.0",
     "pathe": "^2.0.3",
     "pinia": "^3.0.4",
     "qrcode": "^1.5.4",
     "resolve-global": "^2.0.0",
-    "sass": "^1.97.1",
-    "shiki": "^3.20.0",
+    "sass": "^1.97.3",
+    "shiki": "^3.22.0",
     "star-markdown-css": "^0.5.3",
     "table": "^6.9.0",
-    "unhead": "^2.1.1",
+    "unhead": "^2.1.2",
     "unocss": "66.5.10",
     "unplugin-vue-components": "28.0.0",
     "unplugin-vue-markdown": "^29.2.0",
-    "unplugin-vue-router": "^0.19.1",
     "vanilla-lazyload": "^19.1.3",
-    "vite": "^7.3.0",
+    "vite": "^7.3.1",
     "vite-dev-rpc": "^1.1.0",
     "vite-plugin-vue-devtools": "^8.0.5",
     "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",
+    "vitepress-plugin-group-icons": "^1.7.1",
     "vue": "3.5.22",
-    "vue-i18n": "^11.2.7",
-    "vue-router": "^4.6.4",
+    "vue-i18n": "^11.2.8",
+    "vue-router": "^5.0.2",
     "yargs": "^18.0.0",
-    "@valaxyjs/devtools": "0.26.12",
-    "@valaxyjs/utils": "0.26.12"
+    "@valaxyjs/utils": "0.27.0",
+    "@valaxyjs/devtools": "0.27.0"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^3.0.2",

package/types/index.ts

@@ -1,4 +1,7 @@
 // do not export node type here
+// vue-router RouteMeta augmentation
+import './vue-router.d'
+
 export * from './addon'
 export * from './config'
 export * from './data'

package/types/vue-router.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Extend vue-router's RouteMeta interface
+ * @see https://router.vuejs.org/guide/advanced/meta.html#TypeScript
+ */
+import type { Header } from '@valaxyjs/utils'
+import type { Post } from './posts'
+
+export {}
+
+declare module 'vue-router' {
+  interface RouteMeta {
+    /**
+     * Headers extracted from markdown
+     */
+    headers: Header[]
+    /**
+     * Frontmatter data from markdown files
+     */
+    frontmatter: Post
+    /**
+     * Excerpt from markdown content
+     */
+    excerpt?: string
+    /**
+     * Layout name
+     */
+    layout?: string
+  }
+}

package/client/templates/loader.vue

@@ -1,10 +0,0 @@
-<script>
-import { defineBasicLoader } from 'unplugin-vue-router/data-loaders/basic'
-
-export const usePageData = defineBasicLoader('/relativePath', async (_to) => {
-  // custom basic loader
-}, {
-  // @see https://uvr.esm.is/data-loaders/defining-loaders.html#non-blocking-loaders-with-lazy
-  lazy: (to, from) => to.name === from.name,
-})
-</script>