valaxy 0.26.6 → 0.26.8

package/client/components/ValaxyDecrypt.vue

@@ -2,10 +2,12 @@
 import { runContentUpdated, useDecrypt, useFrontmatter } from 'valaxy'
 import { computed, defineComponent, h, ref } from 'vue'
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
   encryptedContent: string
   hint?: string
-}>()
+}>(), {
+  hint: '',
+})
 
 const password = ref('')
 const decryptedContent = ref('')

package/client/composables/categories.ts

@@ -1,4 +1,4 @@
-import type { MaybeRef } from '@vueuse/core'
+import type { MaybeRef } from 'vue'
 import type { Post } from '../../types'
 import { computed, unref } from 'vue'
 import { useSiteStore } from '../stores'

package/client/composables/post/index.ts

@@ -1,9 +1,10 @@
 import type { Post } from 'valaxy'
 import type { ComputedRef } from 'vue'
+import { orderByMeta, useSiteConfig } from 'valaxy'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRouterStore } from '../../stores'
-import { sortByDate, tObject } from '../../utils'
+import { tObject } from '../../utils'
 
 export * from './usePagination'
 export * from './usePrevNext'
@@ -43,6 +44,7 @@ export function usePageList() {
 export function usePostList(params: {
   type?: string
 } = {}) {
+  const siteConfig = useSiteConfig()
   const pageList = usePageList()
   return computed(() => {
     const routes = pageList.value
@@ -54,11 +56,16 @@ export function usePostList(params: {
         && (!i.hide || i.hide === 'index'), // hide `hide: all` posts
       )
 
+    function sortBySiteConfigOrderBy(posts: Post[]) {
+      const orderBy = siteConfig.value.orderBy
+      return orderByMeta(posts, orderBy)
+    }
+
     /**
      * 置顶
      */
-    const topPosts = sortByDate(routes.filter(i => i.top)).sort((a, b) => b.top! - a.top!)
-    const otherPosts = sortByDate(routes.filter(i => !i.top))
+    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)
   })

package/client/composables/search/useFuseSearch.ts

@@ -1,5 +1,5 @@
 import type { UseFuseOptions } from '@vueuse/integrations/useFuse'
-import type { MaybeRefOrGetter } from '@vueuse/shared'
+import type { MaybeRefOrGetter } from 'vue'
 import type { FuseListItem } from '../../../types'
 import { useFuse } from '@vueuse/integrations/useFuse'
 import { useSiteConfig } from 'valaxy'

package/client/index.d.ts

@@ -5,6 +5,7 @@ import type { Post } from '../types'
 import './shims.d'
 
 export * from '../dist/types/index.mjs'
+export * from './index'
 
 declare module '@docsearch/js' {
   function docsearch<T = any>(props: T): void

package/client/main.ts

@@ -3,7 +3,7 @@ import { dataSymbol, initValaxyConfig, valaxyConfigSymbol } from 'valaxy'
 import { setupLayouts } from 'virtual:generated-layouts'
 import { ViteSSG } from 'vite-ssg'
 
-import { routes } from 'vue-router/auto-routes'
+import { routes as autoRoutes } from 'vue-router/auto-routes'
 // import App from '/@valaxyjs/App.vue'
 import App from './App.vue'
 
@@ -20,13 +20,15 @@ import 'uno.css'
 
 const valaxyConfig = initValaxyConfig()
 
+const routes = [...autoRoutes]
+
 const { redirectRoutes, useVueRouter } = valaxyConfig.value.runtimeConfig.redirects
 if (useVueRouter)
   routes.push(...redirectRoutes)
 
 // fix chinese path
 routes.forEach((i) => {
-  i?.children?.forEach((j) => {
+  i?.children?.forEach((j: { path: string }) => {
     j.path = encodeURI(j.path)
   })
 })

package/client/utils/time.ts

@@ -33,9 +33,21 @@ export function formatDate(date?: string | number | Date, options: {
  * @param desc
  */
 export function sortByDate(posts: Post[], desc = true) {
+  return orderByMeta(posts, 'date', desc)
+}
+
+export function sortByUpdated(posts: Post[], desc = true) {
+  return orderByMeta(posts, 'updated', desc)
+}
+
+/**
+ * sort posts by date
+ * @param posts
+ */
+export function orderByMeta(posts: Post[], orderBy: 'date' | 'updated' = 'date', desc = true) {
   return posts.sort((a, b) => {
-    const aDate = +new Date(a.date || '')
-    const bDate = +new Date(b.date || '')
+    const aDate = +new Date(a[orderBy] || a.date || '')
+    const bDate = +new Date(b[orderBy] || a.date || '')
     if (desc)
       return bDate - aDate
     else

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

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.BwiZu4ms.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.DJquM_xq.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.DjEY3xEv.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.DHoKJedg.mjs';
 import 'node:path';
 import 'fs-extra';
 import 'consola/utils';

package/dist/shared/{valaxy.DjEY3xEv.mjs → valaxy.DHoKJedg.mjs}

@@ -471,6 +471,7 @@ function customRandom(alphabet, defaultSize, getRandom) {
   let mask = (2 << (31 - Math.clz32((alphabet.length - 1) | 1))) - 1;
   let step = Math.ceil((1.6 * mask * defaultSize) / alphabet.length);
   return (size = defaultSize) => {
+    if (!size) return ''
     let id = '';
     while (true) {
       let bytes = getRandom(step);
@@ -1567,7 +1568,7 @@ async function setupMarkdownPlugins(md, options, base = "/") {
   return md;
 }
 
-const version = "0.26.6";
+const version = "0.26.8";
 
 const GLOBAL_STATE = {
   valaxyApp: void 0,
@@ -1994,7 +1995,8 @@ const defaultSiteConfig = {
     favicon: "/favicon.svg"
   },
   social: [],
-  lastUpdated: true,
+  orderBy: "date",
+  lastUpdated: false,
   license: {
     enabled: true,
     language: "",
@@ -2793,7 +2795,7 @@ function createTransformEncrypt(options) {
       let getValaxyDecryptTemplate = function(options2) {
         return [
           "<ClientOnly>",
-          `<ValaxyDecrypt :encrypted-content="${options2.encryptedContent}" hint="${options2.hint}" />`,
+          `<ValaxyDecrypt :encrypted-content="${options2.encryptedContent}" hint="${options2.hint || ""}" />`,
           "</ClientOnly>"
         ].join("");
       };
@@ -3676,7 +3678,12 @@ function commonOptions(args) {
 async function generateFuseList(options) {
   consola.start(`Generate List for Fuse Search by (${colors.cyan("fuse.js")}) ...`);
   const pattern = path$1.resolve(options.userRoot, options.config.siteConfig.fuse.pattern || "pages/**/*.md");
-  const files = await fg(pattern);
+  const files = await fg(fg.convertPathToPattern(pattern));
+  if (files.length > 0) {
+    consola.success(`Found ${colors.dim(files.length.toString())} markdown files for fuse search.`);
+  } else {
+    consola.warn(`No markdown files found for fuse search. Please check your fuse pattern: ${colors.dim(pattern)}`);
+  }
   const posts = [];
   for await (const i of files) {
     const raw = fs.readFileSync(i, "utf-8");

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

@@ -528,8 +528,20 @@ interface SiteConfig {
          */
         intro?: string;
     };
+    /**
+     * order posts by 'date' or 'updated'
+     *
+     * - date: 按创建时间排序
+     * - updated: 按最后更新时间排序
+     *
+     * 当开启 `lastUpdated` 时，`updated` 会按照文件的更新时间自动赋值
+     *
+     * @default 'date'
+     */
+    orderBy: 'date' | 'updated';
     /**
      * show last updated time by git/mtime
+     * @default false
      */
     lastUpdated: boolean;
     /**

package/dist/types/index.d.mts

@@ -1,5 +1,5 @@
-import { c as PostFrontMatter, d as PageFrontMatter } from '../shared/valaxy.BwiZu4ms.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.BwiZu4ms.mjs';
+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 { 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.6",
+  "version": "0.26.8",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -61,25 +61,25 @@
   },
   "dependencies": {
     "@antfu/install-pkg": "^1.1.0",
-    "@antfu/utils": "^9.2.0",
+    "@antfu/utils": "^9.3.0",
     "@clack/prompts": "^0.11.0",
-    "@iconify-json/ri": "^1.2.5",
-    "@intlify/unplugin-vue-i18n": "^11.0.0",
-    "@shikijs/transformers": "^3.12.2",
+    "@iconify-json/ri": "^1.2.6",
+    "@intlify/unplugin-vue-i18n": "^11.0.1",
+    "@shikijs/transformers": "^3.14.0",
     "@types/katex": "^0.16.7",
-    "@unhead/addons": "^2.0.14",
-    "@unhead/schema-org": "^2.0.14",
-    "@unhead/vue": "^2.0.14",
+    "@unhead/addons": "^2.0.19",
+    "@unhead/schema-org": "^2.0.19",
+    "@unhead/vue": "^2.0.19",
     "@vitejs/plugin-vue": "^6.0.1",
     "@vue/devtools-api": "7.7.2",
-    "@vueuse/core": "^13.9.0",
-    "@vueuse/integrations": "^13.9.0",
+    "@vueuse/core": "^14.0.0",
+    "@vueuse/integrations": "^14.0.0",
     "beasties": "^0.3.5",
     "consola": "^3.4.2",
     "cross-spawn": "^7.0.6",
     "css-i18n": "^0.0.5",
-    "dayjs": "^1.11.18",
-    "debug": "^4.4.1",
+    "dayjs": "^1.11.19",
+    "debug": "^4.4.3",
     "define-config-ts": "^0.1.3",
     "defu": "^6.1.4",
     "ejs": "^3.1.10",
@@ -87,16 +87,16 @@
     "fast-glob": "^3.3.3",
     "feed": "^5.1.0",
     "floating-vue": "^5.2.2",
-    "fs-extra": "^11.3.1",
+    "fs-extra": "^11.3.2",
     "fuse.js": "^7.1.0",
     "gray-matter": "^4.0.3",
     "hookable": "^5.5.3",
     "html-to-text": "^9.0.5",
-    "jiti": "^2.5.1",
+    "jiti": "^2.6.1",
     "js-base64": "^3.7.8",
     "js-yaml": "^4.1.0",
-    "katex": "^0.16.22",
-    "lru-cache": "^11.2.1",
+    "katex": "^0.16.25",
+    "lru-cache": "^11.2.2",
     "markdown-it": "^14.1.0",
     "markdown-it-anchor": "^9.2.0",
     "markdown-it-async": "^2.2.0",
@@ -105,42 +105,42 @@
     "markdown-it-emoji": "^3.0.0",
     "markdown-it-footnote": "^4.0.0",
     "markdown-it-image-figures": "^2.1.1",
-    "markdown-it-table-of-contents": "^1.0.0",
+    "markdown-it-table-of-contents": "^1.1.0",
     "markdown-it-task-lists": "^2.1.1",
     "medium-zoom": "^1.1.0",
-    "mermaid": "^11.11.0",
+    "mermaid": "^11.12.1",
     "mlly": "^1.8.0",
     "nprogress": "^0.2.0",
     "open": "10.1.0",
-    "ora": "^8.2.0",
+    "ora": "^9.0.0",
     "pascalcase": "^2.0.0",
     "pathe": "^2.0.3",
     "pinia": "^3.0.3",
     "qrcode": "^1.5.4",
     "resolve-global": "^2.0.0",
-    "sass": "^1.92.1",
-    "shiki": "^3.12.2",
+    "sass": "^1.93.3",
+    "shiki": "^3.14.0",
     "star-markdown-css": "^0.5.3",
     "table": "^6.9.0",
-    "unhead": "^2.0.14",
-    "unocss": "^66.5.0",
+    "unhead": "^2.0.19",
+    "unocss": "^66.5.4",
     "unplugin-vue-components": "28.0.0",
-    "unplugin-vue-markdown": "^29.1.0",
-    "unplugin-vue-router": "^0.15.0",
+    "unplugin-vue-markdown": "^29.2.0",
+    "unplugin-vue-router": "^0.16.1",
     "vanilla-lazyload": "^19.1.3",
-    "vite": "^7.1.4",
+    "vite": "^7.1.12",
     "vite-dev-rpc": "^1.1.0",
-    "vite-plugin-vue-devtools": "^8.0.1",
+    "vite-plugin-vue-devtools": "^8.0.3",
     "vite-plugin-vue-layouts": "^0.11.0",
-    "vite-ssg": "^28.1.0",
+    "vite-ssg": "^28.2.2",
     "vite-ssg-sitemap": "^0.10.0",
-    "vitepress-plugin-group-icons": "^1.6.3",
-    "vue": "^3.5.21",
+    "vitepress-plugin-group-icons": "^1.6.5",
+    "vue": "^3.5.22",
     "vue-i18n": "^11.1.12",
-    "vue-router": "^4.5.1",
+    "vue-router": "^4.6.3",
     "yargs": "^18.0.0",
-    "@valaxyjs/utils": "0.26.6",
-    "@valaxyjs/devtools": "0.26.6"
+    "@valaxyjs/utils": "0.26.8",
+    "@valaxyjs/devtools": "0.26.8"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^3.0.2",
@@ -159,18 +159,15 @@
     "@types/markdown-it-footnote": "^3.0.4",
     "@types/nprogress": "^0.2.3",
     "@types/pascalcase": "^1.0.3",
-    "@types/qrcode": "^1.5.5",
-    "@types/yargs": "^17.0.33",
+    "@types/qrcode": "^1.5.6",
+    "@types/yargs": "^17.0.34",
     "cilicili": "^0.1.1",
     "diacritics": "^1.3.0",
     "gh-pages": "^6.3.0",
     "https-localhost": "^4.7.1",
-    "rollup-plugin-visualizer": "^6.0.3",
+    "rollup-plugin-visualizer": "^6.0.5",
     "unbuild": "^3.6.1"
   },
-  "resolutions": {
-    "vite": "catalog:build"
-  },
   "scripts": {
     "clean": "rimraf dist",
     "build": "unbuild",

package/types/config.ts

@@ -125,8 +125,21 @@ export interface SiteConfig {
     intro?: string
   }
 
+  /**
+   * order posts by 'date' or 'updated'
+   *
+   * - date: 按创建时间排序
+   * - updated: 按最后更新时间排序
+   *
+   * 当开启 `lastUpdated` 时，`updated` 会按照文件的更新时间自动赋值
+   *
+   * @default 'date'
+   */
+  orderBy: 'date' | 'updated'
+
   /**
    * show last updated time by git/mtime
+   * @default false
    */
   lastUpdated: boolean