valaxy 0.28.0 → 0.28.2

package/client/components/ValaxyLocalSearch.vue

@@ -0,0 +1,89 @@
+<script lang="ts" setup>
+import type { LocalSearchResult } from '../composables/search/useLocalSearch'
+import { ref, watch } from 'vue'
+import { useRouter } from 'vue-router'
+import { useLocalSearch } from '../composables/search/useLocalSearch'
+
+const props = defineProps<{
+  open: boolean
+}>()
+
+const emit = defineEmits<{
+  (e: 'close'): void
+}>()
+
+const query = ref('')
+const { results, loading, load } = useLocalSearch(query)
+const selectedIndex = ref(0)
+
+const router = useRouter()
+
+watch(() => props.open, (val) => {
+  if (val) {
+    load()
+    selectedIndex.value = 0
+  }
+  else {
+    query.value = ''
+  }
+})
+
+watch(results, () => {
+  selectedIndex.value = 0
+})
+
+function getPageTitle(id: string): string {
+  return id.replace(/#.*$/, '').replace(/\.html$/, '') || '/'
+}
+
+function getSectionTitle(result: LocalSearchResult): string {
+  return [...result.titles, result.title].filter(Boolean).join(' > ')
+}
+
+function navigate(result: LocalSearchResult) {
+  const url = result.id
+  router.push(url)
+  emit('close')
+}
+
+function updateQuery(value: string) {
+  query.value = value
+}
+
+function onKeydown(e: KeyboardEvent) {
+  switch (e.key) {
+    case 'ArrowDown':
+      e.preventDefault()
+      selectedIndex.value = Math.min(selectedIndex.value + 1, results.value.length - 1)
+      break
+    case 'ArrowUp':
+      e.preventDefault()
+      selectedIndex.value = Math.max(selectedIndex.value - 1, 0)
+      break
+    case 'Enter':
+      e.preventDefault()
+      if (results.value[selectedIndex.value]) {
+        navigate(results.value[selectedIndex.value])
+      }
+      break
+    case 'Escape':
+      e.preventDefault()
+      emit('close')
+      break
+  }
+}
+</script>
+
+<template>
+  <slot
+    :query="query"
+    :results="results"
+    :loading="loading"
+    :selected-index="selectedIndex"
+    :update-query="updateQuery"
+    :navigate="navigate"
+    :on-keydown="onKeydown"
+    :get-page-title="getPageTitle"
+    :get-section-title="getSectionTitle"
+  />
+</template>

package/client/components/ValaxyLogo.vue

@@ -28,7 +28,7 @@ import valaxyLogoPng from '../assets/images/valaxy-logo.png'
   max-width: 350px;
   width: 150%;
   height: 150%;
-  background-image: linear-gradient(-45deg, rgb(108, 34, 236) 50%, rgba(59,130,246,var(--un-to-opacity, 1)) 50%);
+  background-image: linear-gradient(-45deg, rgb(108 34 236) 50%, rgb(59 130 246 / var(--un-to-opacity, 1)) 50%);
   opacity: 0.3;
   transition: opacity var(--va-transition-duration-fast);
 }

package/client/components/ValaxyPagination.vue

@@ -74,7 +74,7 @@ function jumpTo(page: number) {
 
 <style lang="scss">
 :root {
-  --page-btn-bg-color: rgba(255, 255, 255, 0.5);
+  --page-btn-bg-color: rgb(255 255 255 / 0.5);
   --page-btn-hover-bg-color: var(--va-c-primary-lighter);
   --page-btn-active-bg-color: var(--va-c-primary-light);
 }

package/client/composables/post/index.ts

@@ -166,7 +166,6 @@ export function mergeCollapsedCollections(
 
 /**
  * get post list in 'pages/posts' folder
- * todo: use vue provide/inject to global
  */
 export function usePostList(params: {
   type?: string

package/client/composables/search/index.ts

@@ -1 +1,2 @@
 export * from './useFuseSearch'
+export * from './useLocalSearch'

package/client/composables/search/useLocalSearch.ts

@@ -0,0 +1,53 @@
+import type MiniSearch from 'minisearch'
+import type { Ref } from 'vue'
+import { ref, shallowRef, watchEffect } from 'vue'
+
+export interface LocalSearchResult {
+  id: string
+  score: number
+  terms: string[]
+  title: string
+  titles: string[]
+}
+
+export function useLocalSearch(query: Ref<string>) {
+  const results = shallowRef<LocalSearchResult[]>([])
+  const loading = ref(false)
+  let miniSearch: MiniSearch | null = null
+
+  async function load(locale = 'root') {
+    loading.value = true
+    try {
+      const searchIndex = (await import('@localSearchIndex')).default
+      const loader = searchIndex[locale] ?? searchIndex[Object.keys(searchIndex)[0]]
+      if (!loader) {
+        loading.value = false
+        return
+      }
+      const mod = await loader()
+      const data: string = JSON.parse(mod.default)
+      const { default: MiniSearchCtor } = await import('minisearch')
+      miniSearch = MiniSearchCtor.loadJSON(data, {
+        fields: ['title', 'titles', 'text'],
+        storeFields: ['title', 'titles'],
+      })
+    }
+    finally {
+      loading.value = false
+    }
+  }
+
+  watchEffect(() => {
+    if (!miniSearch || !query.value.trim()) {
+      results.value = []
+      return
+    }
+    results.value = miniSearch.search(query.value, {
+      prefix: true,
+      fuzzy: 0.2,
+      boost: { title: 4, text: 2, titles: 1 },
+    }) as unknown as LocalSearchResult[]
+  })
+
+  return { results, loading, load }
+}

package/client/layouts/404.vue

@@ -26,6 +26,6 @@ const { back } = useBack()
 // inspired by https://codepen.io/pgalor/pen/OeRWJQ
 .not-found {
   font-size: 10rem;
-  text-shadow: 0 5px 10px rgba(0,0,0,.25), 0 20px 20px rgba(0,0,0,.15);
+  text-shadow: 0 5px 10px rgb(0 0 0 / .25), 0 20px 20px rgb(0 0 0 / .15);
 }
 </style>

package/client/locales/en.yml

@@ -92,9 +92,12 @@ category:
 
 search:
   placeholder: Searching...
+  loading: Loading...
   empty: 'We could not find any results for the search: {query}.'
   hits_time: '{hits} results found in {time} ms'
   hits: '{count} results found'
+  no_results: No results found
+  no_results_hint: Try adjusting your search terms
 
 symbol:
   comma: ', '

package/client/locales/zh-CN.yml

@@ -91,9 +91,12 @@ category:
 
 search:
   placeholder: 搜索...
+  loading: 加载中...
   empty: '找不到您查询的内容: {query}'
   hits_time: '找到 {hits} 条结果（用时 {time} 毫秒）'
   hits: '找到 {count} 条结果'
+  no_results: 未找到相关结果
+  no_results_hint: 请尝试调整搜索关键词
 
 symbol:
   comma: ，

package/client/modules/components.ts

@@ -1,6 +1,5 @@
 import type { ValaxySSGContext } from '../setups'
 
-import { defineAsyncComponent } from 'vue'
 import AppLink from '../components/AppLink.vue'
 import ValaxyTranslate from '../components/builtin/ValaxyTranslate.vue'
 
@@ -11,10 +10,4 @@ import ValaxyTranslate from '../components/builtin/ValaxyTranslate.vue'
 export function registerGlobalComponents(ctx: ValaxySSGContext) {
   ctx.app.component('AppLink', AppLink)
   ctx.app.component('VT', ValaxyTranslate)
-
-  // DEV-only: register ValaxyDebug component (tree-shaken in production)
-  if (import.meta.env.DEV) {
-    const ValaxyDebug = defineAsyncComponent(() => import('../components/.exclude/ValaxyDebug.vue'))
-    ctx.app.component('ValaxyDebug', ValaxyDebug)
-  }
 }

package/client/shims.d.ts

@@ -37,6 +37,11 @@ declare module '#valaxy/styles' {
   export default styles
 }
 
+declare module '@localSearchIndex' {
+  const index: Record<string, () => Promise<{ default: string }>>
+  export default index
+}
+
 // valaxy features
 declare module '#valaxy/blog/collections' {
   import type { CollectionConfig } from './types'

package/client/styles/common/code.scss

@@ -58,7 +58,7 @@ html:not(.dark) .vp-code-dark {
     white-space: pre;
     word-spacing: normal;
     word-break: normal;
-    word-wrap: normal;
+    overflow-wrap: normal;
     tab-size: 4;
     hyphens: none;
   }

package/client/styles/common/index.scss

@@ -4,4 +4,4 @@
 @use "./transition.scss" as *;
 
 // markdown
-@use "./markdown.scss";
+@use "./markdown";

package/client/styles/common/markdown.scss

@@ -1,7 +1,6 @@
 @use "sass:map";
 
 .markdown-body {
-
   h1,
   h2,
   h3,

package/client/styles/css-vars.scss

@@ -52,27 +52,26 @@ html.dark {
  * - `text-3`: Used for subtle texts, such as "placeholders" or "caret icon".
  * -------------------------------------------------------------------------- */
 :root {
-  --va-c-text-1: rgba(60, 60, 67);
-  --va-c-text-2: rgba(60, 60, 67, 0.78);
-  --va-c-text-3: rgba(60, 60, 67, 0.56);
+  --va-c-text-1: rgb(60 60 67);
+  --va-c-text-2: rgb(60 60 67 / 0.78);
+  --va-c-text-3: rgb(60 60 67 / 0.56);
 }
 
 .dark {
-  --va-c-text-1: rgba(255, 255, 245, 0.86);
-  --va-c-text-2: rgba(235, 235, 245, 0.6);
-  --va-c-text-3: rgba(235, 235, 245, 0.38);
+  --va-c-text-1: rgb(255 255 245 / 0.86);
+  --va-c-text-2: rgb(235 235 245 / 0.6);
+  --va-c-text-3: rgb(235 235 245 / 0.38);
 }
 
 // bg
 :root {
-  --va-c-bg: #ffffff;
-  --va-c-bg-light: #ffffff;
+  --va-c-bg: #fff;
+  --va-c-bg-light: #fff;
   --va-c-bg-dark: #fafafa;
-  --va-c-bg-opacity: rgba(255, 255, 255, 0.8);
+  --va-c-bg-opacity: rgb(255 255 255 / 0.8);
   --va-c-bg-soft: #f9f9f9;
   --va-c-bg-alt: #f9f9f9;
   --va-c-bg-mute: #f1f1f1;
-
   --va-c-bg-elevated: #f9f9f9;
 }
 
@@ -80,11 +79,10 @@ html.dark {
   --va-c-bg: #1a1a1d;
   --va-c-bg-light: #202127;
   --va-c-bg-dark: #1a1a1a;
-  --va-c-bg-opacity: rgba(0, 0, 0, 0.8);
+  --va-c-bg-opacity: rgb(0 0 0 / 0.8);
   --va-c-bg-alt: #161618;
   --va-c-bg-soft: #202127;
   --va-c-bg-mute: #2f2f2f;
-
   --va-c-bg-elevated: #202127;
 }
 

package/client/styles/mixins/index.scss

@@ -1,4 +1,4 @@
-@forward './config.scss';
-@forward './media.scss';
-@forward './size.scss';
-@forward './variable.scss';
+@forward './config';
+@forward './media';
+@forward './size';
+@forward './variable';

package/client/styles/third/katex.scss

@@ -1,6 +1,5 @@
 .katex-display {
-  overflow-x: auto;
-  overflow-y: visible;
+  overflow: auto visible;
   padding: 8px 0;
 }
 

package/dist/node/cli/index.mjs

@@ -1,7 +1,7 @@
 import 'node:process';
 import 'yargs';
 import 'yargs/helpers';
-export { c as cli, I as registerDevCommand, W as run, Z as startValaxyDev } from '../../shared/valaxy.DQ6HsU2J.mjs';
+export { c as cli, J as registerDevCommand, X as run, _ as startValaxyDev } from '../../shared/valaxy.Cbgd5gHB.mjs';
 import 'node:os';
 import 'node:path';
 import 'consola';
@@ -29,6 +29,7 @@ import 'feed';
 import 'markdown-it';
 import 'table';
 import 'hookable';
+import 'node:fs';
 import 'node:child_process';
 import 'node:v8';
 import 'vite-ssg-sitemap';
@@ -57,7 +58,6 @@ import 'p-map';
 import 'node:buffer';
 import 'minisearch';
 import 'lru-cache';
-import 'node:fs';
 import 'jiti';
 import 'unocss';
 import 'pascalcase';

package/dist/node/index.d.mts

@@ -1,7 +1,7 @@
 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.6MW2qn5T.mjs';
+import { S as SiteConfig, D as DefaultTheme, R as RuntimeConfig, a as RedirectItem, V as ValaxyConfig, P as PartialDeep, b as ValaxyAddon, U as UserSiteConfig } from '../shared/valaxy.D8f6owDk.mjs';
 import Vue from '@vitejs/plugin-vue';
 import { Hookable } from 'hookable';
 import { PluginVisualizerOptions } from 'rollup-plugin-visualizer';
@@ -445,6 +445,14 @@ interface ValaxyHooks {
     'md:afterRender': (ctx: MdAfterRenderContext) => HookResult;
     'build:before': () => HookResult;
     'build:after': () => HookResult;
+    /**
+     * Called to compute statistics (word count, reading time) for a markdown route.
+     * Default implementation uses `presetStatistics`; addons/themes can hook to override.
+     */
+    'statistics': (ctx: {
+        route: EditableTreeNode;
+        options: SiteConfig['statistics'];
+    }) => HookResult;
     /**
      * @experimental
      * Called before content loaders start fetching.
@@ -975,10 +983,17 @@ declare function build(valaxyApp: ValaxyNode, viteConfig?: InlineConfig): Promis
  */
 declare function ssgBuildLegacy(valaxyApp: ValaxyNode, viteConfig?: InlineConfig): Promise<void>;
 /**
- * post process for ssg fix extra string like `/html>` `ml>` `l>`
- * handle tasks after ssg build
- * todo find why
- * @param options
+ * Fix corrupted HTML produced by vite-ssg's JSDOM serialization under memory
+ * pressure. JSDOM.serialize() can emit truncated trailing fragments
+ * (e.g. `/html>`, `ml>`, `l>`) when heap is constrained during
+ * high-concurrency renders.
+ *
+ * Only needed for the legacy vite-ssg engine; the built-in Valaxy SSG
+ * engine uses pure string rendering and is not affected.
+ */
+declare function fixViteSsgHtml(options: ResolvedValaxyOptions): Promise<void>;
+/**
+ * Shared post-processing after SSG build (both engines).
  */
 declare function postProcessForSSG(options: ResolvedValaxyOptions): Promise<void>;
 declare function generateClientRedirects(options: ResolvedValaxyOptions): Promise<void>;
@@ -1202,5 +1217,5 @@ declare function toAtFS(path: string): string;
 declare function resolveImportPath(importName: string, ensure?: true): Promise<string>;
 declare function resolveImportPath(importName: string, ensure?: boolean): Promise<string | undefined>;
 
-export { $t, ALL_ROUTE, EXCERPT_SEPARATOR, GLOBAL_STATE, PATHNAME_PROTOCOL_RE, ViteValaxyPlugins, build, createServer, createValaxyPlugin, customElements, defaultSiteConfig, defaultValaxyConfig, defaultViteConfig, defineAddon, defineConfig, defineContentLoader, defineSiteConfig, defineTheme, defineUnoSetup, defineValaxyAddon, defineValaxyConfig, defineValaxyTheme, encryptContent, generateClientRedirects, getGitTimestamp, getIndexHtml, getServerInfoText, isExternal, isInstalledGlobally, isKatexEnabled, isKatexPluginNeeded, isMathJaxEnabled, isPath, loadConfigFromFile, mergeValaxyConfig, mergeViteConfigs, postProcessForSSG, processValaxyOptions, resolveAddonsConfig, resolveImportPath, resolveImportUrl, resolveOptions, resolveSiteConfig, resolveSiteConfigFromRoot, resolveThemeConfigFromRoot, resolveThemeValaxyConfig, resolveUserThemeConfig, resolveValaxyConfig, resolveValaxyConfigFromRoot, ssgBuild, ssgBuildLegacy, toAtFS, transformObject, version };
+export { $t, ALL_ROUTE, EXCERPT_SEPARATOR, GLOBAL_STATE, PATHNAME_PROTOCOL_RE, ViteValaxyPlugins, build, createServer, createValaxyPlugin, customElements, defaultSiteConfig, defaultValaxyConfig, defaultViteConfig, defineAddon, defineConfig, defineContentLoader, defineSiteConfig, defineTheme, defineUnoSetup, defineValaxyAddon, defineValaxyConfig, defineValaxyTheme, encryptContent, fixViteSsgHtml, generateClientRedirects, getGitTimestamp, getIndexHtml, getServerInfoText, isExternal, isInstalledGlobally, isKatexEnabled, isKatexPluginNeeded, isMathJaxEnabled, isPath, loadConfigFromFile, mergeValaxyConfig, mergeViteConfigs, postProcessForSSG, processValaxyOptions, resolveAddonsConfig, resolveImportPath, resolveImportUrl, resolveOptions, resolveSiteConfig, resolveSiteConfigFromRoot, resolveThemeConfigFromRoot, resolveThemeValaxyConfig, resolveUserThemeConfig, resolveValaxyConfig, resolveValaxyConfigFromRoot, ssgBuild, ssgBuildLegacy, toAtFS, transformObject, version };
 export type { CdnModule, ContentItem, ContentLoader, ContentLoaderContext, HookResult, LoadConfigFromFileOptions, MdAfterRenderContext, ResolvedConfig, ResolvedValaxyOptions, UnoSetup, UserInputConfig, UserValaxyNodeConfig, ValaxyAddonExport, ValaxyAddonFn, ValaxyAddonLike, ValaxyAddonResolver, ValaxyAddons, ValaxyApp, ValaxyConfigExport, ValaxyConfigExtendKey, ValaxyConfigFn, ValaxyEntryOptions, ValaxyExtendConfig, ValaxyHooks, ValaxyNode, ValaxyNodeConfig, ValaxyPickConfig, ValaxyServerOptions, ValaxyTheme };

package/dist/node/index.mjs

@@ -1,5 +1,6 @@
-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 isKatexEnabled, x as isKatexPluginNeeded, y as isMathJaxEnabled, z as isPath, B as loadConfigFromFile, C as mergeValaxyConfig, D as mergeViteConfigs, F as postProcessForSSG, H as processValaxyOptions, I as registerDevCommand, J as resolveAddonsConfig, K as resolveImportPath, L as resolveImportUrl, M as resolveOptions, N as resolveSiteConfig, O as resolveSiteConfigFromRoot, Q as resolveThemeConfigFromRoot, R as resolveThemeValaxyConfig, S as resolveUserThemeConfig, T as resolveValaxyConfig, U as resolveValaxyConfigFromRoot, W as run, X as ssgBuild, Y as ssgBuildLegacy, Z as startValaxyDev, _ as toAtFS, $ as transformObject, a0 as version } from '../shared/valaxy.DQ6HsU2J.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 fixViteSsgHtml, r as generateClientRedirects, s as getGitTimestamp, t as getIndexHtml, u as getServerInfoText, v as isExternal, w as isInstalledGlobally, x as isKatexEnabled, y as isKatexPluginNeeded, z as isMathJaxEnabled, B as isPath, C as loadConfigFromFile, D as mergeValaxyConfig, F as mergeViteConfigs, H as postProcessForSSG, I as processValaxyOptions, J as registerDevCommand, K as resolveAddonsConfig, L as resolveImportPath, M as resolveImportUrl, N as resolveOptions, O as resolveSiteConfig, Q as resolveSiteConfigFromRoot, R as resolveThemeConfigFromRoot, S as resolveThemeValaxyConfig, T as resolveUserThemeConfig, U as resolveValaxyConfig, W as resolveValaxyConfigFromRoot, X as run, Y as ssgBuild, Z as ssgBuildLegacy, _ as startValaxyDev, $ as toAtFS, a0 as transformObject, a1 as version } from '../shared/valaxy.Cbgd5gHB.mjs';
 import 'node:path';
+import 'consola';
 import 'fs-extra';
 import 'consola/utils';
 import 'node:process';
@@ -7,7 +8,6 @@ import 'define-config-ts';
 import 'yargs';
 import 'yargs/helpers';
 import 'node:os';
-import 'consola';
 import 'fast-glob';
 import 'gray-matter';
 import 'js-yaml';
@@ -29,6 +29,7 @@ import 'feed';
 import 'markdown-it';
 import 'table';
 import 'hookable';
+import 'node:fs';
 import 'node:child_process';
 import 'node:v8';
 import 'vite-ssg-sitemap';
@@ -57,7 +58,6 @@ import 'p-map';
 import 'node:buffer';
 import 'minisearch';
 import 'lru-cache';
-import 'node:fs';
 import 'jiti';
 import 'unocss';
 import 'pascalcase';