valaxy 0.26.9 → 0.26.12

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.B5JLGXpW.mjs';
+export { c as cli, d as registerDevCommand, r as run, a as startValaxyDev } from '../../shared/valaxy.DsB_W1aR.mjs';
 import 'node:os';
 import 'node:path';
 import 'consola';

package/dist/node/index.d.mts

@@ -13,7 +13,7 @@ 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.DJquM_xq.mjs';
+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';
 import MarkdownIt from 'markdown-it';

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.B5JLGXpW.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.DsB_W1aR.mjs';
 import 'node:path';
 import 'fs-extra';
 import 'consola/utils';

package/dist/shared/{valaxy.B5JLGXpW.mjs → valaxy.DsB_W1aR.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';
@@ -437,6 +437,51 @@ async function getAlias(options) {
   return alias;
 }
 
+const LOCAL_SEARCH_INDEX_ID = "@localSearchIndex";
+const LOCAL_SEARCH_INDEX_REQUEST_PATH = `/${LOCAL_SEARCH_INDEX_ID}`;
+async function localSearchPlugin(options) {
+  const siteConfig = options.config.siteConfig;
+  if (siteConfig.search?.provider !== "local") {
+    return {
+      name: "valaxy:local-search",
+      resolveId(id) {
+        if (id.startsWith(LOCAL_SEARCH_INDEX_ID)) {
+          return LOCAL_SEARCH_INDEX_REQUEST_PATH;
+        }
+      },
+      load(id) {
+        if (id.startsWith(LOCAL_SEARCH_INDEX_REQUEST_PATH)) {
+          return `export default '{}'`;
+        }
+      }
+    };
+  }
+  return {
+    name: "valaxy:local-search",
+    config: () => {
+      return {
+        optimizeDeps: {
+          include: [
+            "valaxy > @vueuse/integrations/useFocusTrap",
+            "valaxy > mark.js/src/vanilla.js",
+            "valaxy > minisearch"
+          ]
+        }
+        // async configureServer(_server) {
+        //   server = _server
+        //   await scanForBuild()
+        //   onIndexUpdated()
+        // },
+        // resolveId(id) {
+        //   if (id.startsWith(LOCAL_SEARCH_INDEX_ID)) {
+        //     return `/${id}`
+        //   }
+        // },
+      };
+    }
+  };
+}
+
 const logger = consola.create({});
 const valaxyPrefix = colors.magenta("[valaxy]");
 const vLogger = {
@@ -1554,7 +1599,7 @@ async function setupMarkdownPlugins(md, options, base = "/") {
   return md;
 }
 
-const version = "0.26.9";
+const version = "0.26.12";
 
 const GLOBAL_STATE = {
   valaxyApp: void 0,
@@ -1995,7 +2040,7 @@ const defaultSiteConfig = {
   },
   search: {
     enable: false,
-    type: "fuse"
+    provider: "fuse"
   },
   fuse: {
     dataPath: "valaxy-fuse-list.json",
@@ -3472,7 +3517,9 @@ async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
       fullInstall: true,
       include: roots.map((root) => `${root}/locales/**`)
     }),
-    createFixPlugins()
+    createFixPlugins(),
+    // localSearch
+    await localSearchPlugin(options)
   ];
   if (valaxyConfig.visualizer) {
     try {
@@ -3855,21 +3902,36 @@ async function getPosts(params, options) {
     const html = markdown.render(rssContent).replace('src="/', `src="${DOMAIN}/`);
     if (data.image?.startsWith("/"))
       data.image = DOMAIN + data.image;
-    const link = DOMAIN + path.replace(`${options.userRoot}/pages`, "").replace(/\.md$/, "");
+    const relativePath = relative$1(join(options.userRoot, "pages"), path);
+    const urlPath = relativePath.replace(/\\/g, "/").replace(/\.md$/, "");
+    const link = `${DOMAIN}/${urlPath}`;
     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) {
@@ -4077,7 +4139,7 @@ async function execBuild({ ssg, root, output, log }) {
   const valaxyApp = createValaxyNode(options);
   await callHookWithLog("options:resolved", valaxyApp);
   const modules = [];
-  if (options.config.siteConfig.search.type === "fuse")
+  if (options.config.siteConfig.search.provider === "fuse")
     modules.push(fuseModule);
   if (options.config.modules.rss.enable)
     modules.push(rssModule);

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

@@ -569,20 +569,25 @@ interface SiteConfig {
          * @zh 是否启用
          */
         enable: boolean;
+        /**
+         * @deprecated will be deprecated, use search.provider instead
+         */
+        type?: SiteConfig['search']['provider'];
         /**
          * Search Type
          * - algolia: Algolia Search
          * - engine: Engine Search, like Google/Baidu
          * - fuse: Local Search by fuse.js
+         * - local(todo): Local Search by MiniSearch
          */
-        type: 'algolia' | 'engine' | 'fuse';
+        provider: 'algolia' | 'engine' | 'fuse' | 'local';
     };
     /**
      *
      * fuse search
      * @see https://fusejs.io/
      * @description 本地搜索
-     * Please set search.type to 'fuse'
+     * Please set search.provider to 'fuse'
      */
     fuse: {
         /**

package/dist/types/index.d.mts

@@ -1,5 +1,5 @@
-import { c as PostFrontMatter, d as PageFrontMatter } from '../shared/valaxy.DJquM_xq.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.DJquM_xq.mjs';
+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 { Header } from '@valaxyjs/utils';
 import '@vueuse/integrations/useFuse';
 import 'medium-zoom';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valaxy",
   "type": "module",
-  "version": "0.26.9",
+  "version": "0.26.12",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -64,16 +64,16 @@
     "@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",
+    "@intlify/unplugin-vue-i18n": "^11.0.3",
+    "@shikijs/transformers": "^3.20.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",
+    "@unhead/addons": "^2.1.1",
+    "@unhead/schema-org": "^2.1.1",
+    "@unhead/vue": "^2.1.1",
+    "@vitejs/plugin-vue": "^6.0.3",
     "@vue/devtools-api": "7.7.2",
-    "@vueuse/core": "^14.0.0",
-    "@vueuse/integrations": "^14.0.0",
+    "@vueuse/core": "^14.1.0",
+    "@vueuse/integrations": "^14.1.0",
     "beasties": "^0.3.5",
     "consola": "^3.4.2",
     "cross-spawn": "^7.0.6",
@@ -87,16 +87,16 @@
     "fast-glob": "^3.3.3",
     "feed": "^5.1.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,7 +108,7 @@
     "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",
@@ -118,29 +118,29 @@
     "pinia": "^3.0.4",
     "qrcode": "^1.5.4",
     "resolve-global": "^2.0.0",
-    "sass": "^1.93.3",
-    "shiki": "^3.15.0",
+    "sass": "^1.97.1",
+    "shiki": "^3.20.0",
     "star-markdown-css": "^0.5.3",
     "table": "^6.9.0",
-    "unhead": "^2.0.19",
-    "unocss": "^66.5.4",
+    "unhead": "^2.1.1",
+    "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.1",
     "vanilla-lazyload": "^19.1.3",
-    "vite": "^7.2.1",
+    "vite": "^7.3.0",
     "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",
-    "vue": "^3.5.23",
-    "vue-i18n": "^11.1.12",
-    "vue-router": "^4.6.3",
+    "vue": "3.5.22",
+    "vue-i18n": "^11.2.7",
+    "vue-router": "^4.6.4",
     "yargs": "^18.0.0",
-    "@valaxyjs/devtools": "0.26.9",
-    "@valaxyjs/utils": "0.26.9"
+    "@valaxyjs/devtools": "0.26.12",
+    "@valaxyjs/utils": "0.26.12"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^3.0.2",
@@ -160,11 +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.4",
     "rollup-plugin-visualizer": "^6.0.5",
     "unbuild": "^3.6.1"
   },

package/types/config.ts

@@ -171,13 +171,18 @@ export interface SiteConfig {
      * @zh 是否启用
      */
     enable: boolean
+    /**
+     * @deprecated will be deprecated, use search.provider instead
+     */
+    type?: SiteConfig['search']['provider']
     /**
      * Search Type
      * - algolia: Algolia Search
      * - engine: Engine Search, like Google/Baidu
      * - fuse: Local Search by fuse.js
+     * - local(todo): Local Search by MiniSearch
      */
-    type: 'algolia' | 'engine' | 'fuse'
+    provider: 'algolia' | 'engine' | 'fuse' | 'local'
   }
 
   /**
@@ -185,7 +190,7 @@ export interface SiteConfig {
    * fuse search
    * @see https://fusejs.io/
    * @description 本地搜索
-   * Please set search.type to 'fuse'
+   * Please set search.provider to 'fuse'
    */
   fuse: {
     /**

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
+}