valaxy 0.26.10 → 0.26.13

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/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.Cwk84srC.mjs';
+export { c as cli, d as registerDevCommand, r as run, a as startValaxyDev } from '../../shared/valaxy.CEmGx65r.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';

package/dist/node/index.d.mts

@@ -2,7 +2,7 @@ import { ViteSSGOptions } from 'vite-ssg';
 import * as vite from 'vite';
 import { UserConfig, InlineConfig, ViteDevServer, PluginOption, Plugin } from 'vite';
 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';
@@ -12,7 +12,7 @@ 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 { groupIconVitePlugin } 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 { MarkdownEnv } from 'unplugin-vue-markdown/types';
 import { KatexOptions } from 'katex';
@@ -557,6 +557,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 +632,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 +709,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.Cwk84srC.mjs';
+export { C as ALL_ROUTE, E as EXCERPT_SEPARATOR, G as GLOBAL_STATE, P as PATHNAME_PROTOCOL_RE, V as ViteValaxyPlugins, b as build, c as cli, N as createServer, L as createValaxyPlugin, D as customElements, j as defaultSiteConfig, w as defaultValaxyConfig, F as defaultViteConfig, h as defineAddon, y as defineConfig, k as defineSiteConfig, u as defineTheme, f as defineValaxyAddon, x as defineValaxyConfig, t as defineValaxyTheme, O as encryptContent, g as generateClientRedirects, Q as getGitTimestamp, e as getIndexHtml, M as getServerInfoText, R as isExternal, U as isInstalledGlobally, S as isPath, v as loadConfigFromFile, A as mergeValaxyConfig, m as mergeViteConfigs, p as postProcessForSSG, I as processValaxyOptions, d as registerDevCommand, i as resolveAddonsConfig, Y as resolveImportPath, W as resolveImportUrl, J as resolveOptions, n as resolveSiteConfig, l as resolveSiteConfigFromRoot, o as resolveThemeConfigFromRoot, K as resolveThemeValaxyConfig, q as resolveUserThemeConfig, B as resolveValaxyConfig, z as resolveValaxyConfigFromRoot, r as run, s as ssgBuild, a as startValaxyDev, X as toAtFS, T as transformObject, H as version } from '../shared/valaxy.CEmGx65r.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';

package/dist/shared/{valaxy.Cwk84srC.mjs → valaxy.CEmGx65r.mjs}

@@ -2,7 +2,7 @@ import process from 'node:process';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import os from 'node:os';
-import path$1, { join, dirname, resolve } from 'node:path';
+import path$1, { join, dirname, resolve, relative as relative$1 } from 'node:path';
 import { consola } from 'consola';
 import { colors } from 'consola/utils';
 import fg from 'fast-glob';
@@ -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';
@@ -61,7 +62,7 @@ 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:\/\//;
@@ -1599,7 +1600,7 @@ async function setupMarkdownPlugins(md, options, base = "/") {
   return md;
 }
 
-const version = "0.26.10";
+const version = "0.26.13";
 
 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;
 }
@@ -3815,6 +3819,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,24 +3931,66 @@ 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}/`);
+    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 link = DOMAIN + path.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({
+    const item = {
       ...data,
       title: tObject(data.title, lang),
       description: tObject(data.description, lang),
       date: new Date(data.date),
-      published: new Date(data.updated || data.date),
+      // RSS pubDate / JSON date_published
+      published: new Date(data.date),
+      // Atom published (first publish time)
       content: html + tip,
       author: [author],
       id: data.id || link,
-      link
-    });
+      link,
+      // Add updated field for Atom feed (if exists)
+      // Atom: <updated> (last modified time)
+      // JSON Feed: date_modified
+      ...data.updated && { updated: new Date(data.updated) }
+    };
+    posts.push(item);
   }
-  posts.sort((a, b) => +(b.published || b.date) - +(a.published || a.date));
+  const orderBy = siteConfig.orderBy || "date";
+  const useUpdatedTime = orderBy === "updated";
+  posts.sort((a, b) => {
+    const aTime = useUpdatedTime ? a.updated || a.date : a.date;
+    const bTime = useUpdatedTime ? b.updated || b.date : b.date;
+    return +bTime - +aTime;
+  });
   return posts;
 }
 async function writeFeed(feedOptions, posts, options, feedNameMap) {
@@ -4515,7 +4589,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) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valaxy",
   "type": "module",
-  "version": "0.26.10",
+  "version": "0.26.13",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -63,18 +63,18 @@
     "@antfu/install-pkg": "^1.1.0",
     "@antfu/utils": "^9.3.0",
     "@clack/prompts": "^0.11.0",
-    "@iconify-json/ri": "^1.2.6",
-    "@intlify/unplugin-vue-i18n": "^11.0.1",
-    "@shikijs/transformers": "^3.15.0",
-    "@types/katex": "^0.16.7",
-    "@unhead/addons": "^2.0.19",
-    "@unhead/schema-org": "^2.0.19",
-    "@unhead/vue": "^2.0.19",
-    "@vitejs/plugin-vue": "^6.0.1",
+    "@iconify-json/ri": "^1.2.7",
+    "@intlify/unplugin-vue-i18n": "^11.0.3",
+    "@shikijs/transformers": "^3.21.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.3",
     "@vue/devtools-api": "7.7.2",
-    "@vueuse/core": "^14.0.0",
-    "@vueuse/integrations": "^14.0.0",
-    "beasties": "^0.3.5",
+    "@vueuse/core": "^14.1.0",
+    "@vueuse/integrations": "^14.1.0",
+    "beasties": "^0.4.1",
     "consola": "^3.4.2",
     "cross-spawn": "^7.0.6",
     "css-i18n": "^0.0.5",
@@ -82,21 +82,21 @@
     "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.2",
+    "fs-extra": "^11.3.3",
     "fuse.js": "^7.1.0",
     "gray-matter": "^4.0.3",
-    "hookable": "^5.5.3",
+    "hookable": "^6.0.1",
     "html-to-text": "^9.0.5",
     "jiti": "^2.6.1",
     "js-base64": "^3.7.8",
-    "js-yaml": "^4.1.0",
-    "katex": "^0.16.25",
-    "lru-cache": "^11.2.2",
+    "js-yaml": "^4.1.1",
+    "katex": "^0.16.27",
+    "lru-cache": "^11.2.4",
     "markdown-it": "^14.1.0",
     "markdown-it-anchor": "^9.2.0",
     "markdown-it-async": "^2.2.0",
@@ -108,39 +108,39 @@
     "markdown-it-table-of-contents": "^1.1.0",
     "markdown-it-task-lists": "^2.1.1",
     "medium-zoom": "^1.1.0",
-    "mermaid": "^11.12.1",
+    "mermaid": "^11.12.2",
     "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.93.3",
-    "shiki": "^3.15.0",
+    "sass": "^1.97.3",
+    "shiki": "^3.21.0",
     "star-markdown-css": "^0.5.3",
     "table": "^6.9.0",
-    "unhead": "^2.0.19",
-    "unocss": "^66.5.4",
+    "unhead": "^2.1.2",
+    "unocss": "66.5.10",
     "unplugin-vue-components": "28.0.0",
     "unplugin-vue-markdown": "^29.2.0",
-    "unplugin-vue-router": "^0.16.1",
+    "unplugin-vue-router": "^0.19.2",
     "vanilla-lazyload": "^19.1.3",
-    "vite": "^7.2.1",
+    "vite": "^7.3.1",
     "vite-dev-rpc": "^1.1.0",
-    "vite-plugin-vue-devtools": "^8.0.3",
+    "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.1.12",
-    "vue-router": "^4.6.3",
+    "vue-i18n": "^11.2.8",
+    "vue-router": "^4.6.4",
     "yargs": "^18.0.0",
-    "@valaxyjs/devtools": "0.26.10",
-    "@valaxyjs/utils": "0.26.10"
+    "@valaxyjs/devtools": "0.26.13",
+    "@valaxyjs/utils": "0.26.13"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^3.0.2",
@@ -160,12 +160,12 @@
     "@types/nprogress": "^0.2.3",
     "@types/pascalcase": "^1.0.3",
     "@types/qrcode": "^1.5.6",
-    "@types/yargs": "^17.0.34",
+    "@types/yargs": "^17.0.35",
     "cilicili": "^0.1.1",
     "diacritics": "^1.3.0",
     "gh-pages": "^6.3.0",
     "https-localhost": "^4.7.1",
-    "p-map": "^7.0.3",
+    "p-map": "^7.0.4",
     "rollup-plugin-visualizer": "^6.0.5",
     "unbuild": "^3.6.1"
   },

package/types/markdown-it-container.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Type augmentation for markdown-it-container
+ *
+ * The official @types/markdown-it-container@2.0.11 depends on @types/markdown-it@13.0.9,
+ * but we use @types/markdown-it@14.1.2. This file provides compatible type definitions.
+ */
+declare module 'markdown-it-container' {
+  import type MarkdownIt from 'markdown-it'
+  import type Token from 'markdown-it/lib/token.mjs'
+
+  interface ContainerOptions {
+    /**
+     * Function to validate tail after opening marker, should return true on success.
+     */
+    validate?: (params: string) => boolean
+
+    /**
+     * Renderer for opening/closing tokens.
+     */
+    render?: (tokens: Token[], idx: number, options: any, env: any, self: any) => string
+
+    /**
+     * Character to use in delimiter, default is ":"
+     */
+    marker?: string
+  }
+
+  /**
+   * markdown-it plugin for creating block-level custom containers
+   */
+  function container(
+    md: MarkdownIt,
+    name: string,
+    options?: ContainerOptions,
+  ): void
+
+  export = container
+}