valaxy 0.23.2 → 0.23.4

package/client/app/data.ts

@@ -3,8 +3,9 @@ import type { Router } from 'vue-router'
 import type { PageData } from '../../types'
 import { computed } from 'vue'
 
-export interface ValaxyData {
+export interface ValaxyData<FM = PageData['frontmatter']> {
   page: Ref<PageData>
+  frontmatter: Ref<FM & PageData['frontmatter']>
 }
 
 /**
@@ -15,5 +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),
   }
 }

package/client/composables/common.ts

@@ -1,7 +1,7 @@
 import type { PostFrontMatter } from '../../types'
 import type { ValaxyData } from '../app/data'
-import { isClient } from '@vueuse/core'
 
+import { isClient } from '@vueuse/core'
 import { computed, inject } from 'vue'
 import { useRoute } from 'vue-router'
 import { dataSymbol, useSiteConfig } from '../config'
@@ -23,11 +23,11 @@ import { dataSymbol, useSiteConfig } from '../config'
  * console.log(fm.value.custom)
  * ```
  */
-export function useFrontmatter<T extends Record<string, any> = PostFrontMatter>() {
+export function useFrontmatter<FM extends Record<string, any>>() {
   // inject not in app root
   const route = useRoute()
   const frontmatter = computed(() => {
-    return route.meta.frontmatter as Partial<PostFrontMatter & T> || {}
+    return route.meta.frontmatter as Partial<(PostFrontMatter & FM)> || {}
   })
   return frontmatter
 }
@@ -72,7 +72,7 @@ export function useEncryptedPhotos() {
 /**
  * inject pageData
  */
-export function useData(): ValaxyData {
+export function useData<FM = Record<string, any>>(): ValaxyData<FM> {
   const data = inject(dataSymbol, {} as any)
   if (!data) {
     throw new Error('Valaxy data not properly injected in app')

package/client/modules/valaxy.ts

@@ -37,8 +37,9 @@ import valaxyMessages from '/@valaxyjs/locales'
 // import en from '../../../../../demo/yun/locales/en.yml'
 
 function shouldHotReload(payload: PageDataPayload): boolean {
-  const payloadPath = payload.path.replace(/(\bindex)?\.md$/, '')
-  const locationPath = location.pathname.replace(/(\bindex)?\.html$/, '')
+  const payloadPath = payload.path.replace(/(?:(^|\/)index)?\.md$/, '$1')
+  const locationPath = location.pathname
+    .replace(/(?:(^|\/)index)?\.html$/, '')
   return ensureSuffix('/', encodeURI(payloadPath)) === ensureSuffix('/', encodeURI(locationPath))
 }
 

package/dist/{chunk-3X26KX5G.js → chunk-VMMD3G2Q.js}

@@ -1,13 +1,13 @@
 // node/cli/index.ts
-import process14 from "node:process";
+import process15 from "process";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // package.json
-var version = "0.23.2";
+var version = "0.23.4";
 
 // node/modules/fuse.ts
-import path4 from "node:path";
+import path4 from "path";
 import { consola as consola9 } from "consola";
 import { colors as colors7 } from "consola/utils";
 import fg2 from "fast-glob";
@@ -34,8 +34,8 @@ function commonOptions(args) {
 }
 
 // node/options.ts
-import { dirname as dirname2 } from "node:path";
-import process4 from "node:process";
+import { dirname as dirname2 } from "path";
+import process4 from "process";
 import { ensureSuffix, uniq } from "@antfu/utils";
 import { consola as consola7 } from "consola";
 import { colors as colors6 } from "consola/utils";
@@ -45,7 +45,7 @@ import fs5 from "fs-extra";
 import { resolve as resolve4 } from "pathe";
 
 // node/build/bundle.ts
-import path from "node:path";
+import path from "path";
 var cache = /* @__PURE__ */ new Map();
 var cacheTheme = /* @__PURE__ */ new Map();
 function escapeRegExp(str) {
@@ -151,11 +151,11 @@ function getRollupOptions(options) {
 }
 
 // node/config/addon.ts
-import path2 from "node:path";
+import path2 from "path";
 import fs2 from "fs-extra";
 
 // node/config/valaxy.ts
-import process2 from "node:process";
+import process2 from "process";
 import { isFunction } from "@antfu/utils";
 import { consola as consola4 } from "consola";
 import { colors as colors2 } from "consola/utils";
@@ -176,13 +176,13 @@ function countPerformanceTime() {
 }
 
 // node/config/site.ts
-import { webcrypto } from "node:crypto";
+import { webcrypto } from "crypto";
 import { consola as consola3 } from "consola";
 import { colors } from "consola/utils";
 import { options as floatingVueOptions } from "floating-vue";
 
 // node/config/utils.ts
-import process from "node:process";
+import process from "process";
 import { consola as consola2 } from "consola";
 import fs from "fs-extra";
 import { createJiti } from "jiti";
@@ -601,7 +601,7 @@ async function resolveImportPath(importName, ensure = false) {
 }
 
 // node/utils/addons.ts
-import process3 from "node:process";
+import process3 from "process";
 import { colors as colors5 } from "consola/utils";
 import defu2 from "defu";
 import fs4 from "fs-extra";
@@ -609,7 +609,7 @@ import ora2 from "ora";
 import { resolve as resolve3 } from "pathe";
 
 // node/utils/root.ts
-import { dirname } from "node:path";
+import { dirname } from "path";
 import fs3 from "fs-extra";
 import { resolve as resolve2 } from "pathe";
 async function getModuleRoot(name, entry) {
@@ -677,7 +677,7 @@ async function getAddonRoot(name, entry) {
 }
 
 // node/utils/clientRedirects.ts
-import { writeFile } from "node:fs/promises";
+import { writeFile } from "fs/promises";
 import { ensureFile } from "fs-extra";
 function handleRoute(route) {
   if (route === "/")
@@ -857,8 +857,8 @@ var matterOptions = {
 };
 
 // node/utils/env.ts
-import path3 from "node:path";
-import process5 from "node:process";
+import path3 from "path";
+import process5 from "process";
 import { consola as consola8 } from "consola";
 import fs6 from "fs-extra";
 function isProd() {
@@ -974,19 +974,19 @@ var fuseModule = defineValaxyModule({
 });
 
 // node/modules/rss/utils.ts
-import { readFile } from "node:fs/promises";
-import { dirname as dirname3, join, resolve as resolve5 } from "node:path";
+import { readFile } from "fs/promises";
+import { dirname as dirname3, join, resolve as resolve5 } from "path";
 import { ensurePrefix as ensurePrefix2 } from "@antfu/utils";
 import { consola as consola10 } from "consola";
 import { colors as colors8 } from "consola/utils";
 import dayjs from "dayjs";
 import fg3 from "fast-glob";
-import { Feed } from "feed";
 import fs9 from "fs-extra";
 import matter2 from "gray-matter";
 import MarkdownIt from "markdown-it";
 import ora3 from "ora";
 import { getBorderCharacters, table } from "table";
+import { createFeed, generateAtom1, generateJson1, generateRss2 } from "zfeed";
 
 // node/utils/date.ts
 import fs8 from "fs-extra";
@@ -1029,11 +1029,10 @@ async function build(options) {
     id: siteUrl || "valaxy",
     link: siteUrl,
     copyright: `CC ${siteConfig.license?.type?.toUpperCase()} ${ccVersion} ${(/* @__PURE__ */ new Date()).getFullYear()} \xA9 ${siteConfig.author?.name}`,
-    feedLinks: {}
+    feed: Object.fromEntries(
+      Object.entries(feedNameMap).map(([key, value]) => [key, `${siteUrl}${value}`])
+    )
   };
-  Object.keys(feedNameMap).forEach((key) => {
-    feedOptions.feedLinks[key] = `${siteUrl}${feedNameMap[key]}`;
-  });
   const DOMAIN = siteConfig.url.slice(0, -1);
   const files = await fg3(`${options.userRoot}/pages/posts/**/*.md`);
   const posts = await getPosts({
@@ -1091,22 +1090,23 @@ async function getPosts(params, options) {
     const link = DOMAIN + path17.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({
-      title: "",
-      ...data,
-      date: new Date(data.date),
-      published: new Date(data.updated || data.date),
+      title: data.title,
+      updatedAt: new Date(data.date),
+      publishedAt: new Date(data.updated || data.date),
       content: html + tip,
-      author: [author],
-      id: data.id?.toString() || "",
+      author,
+      id: data.id || link,
       link
     });
   }
-  posts.sort((a, b) => +new Date(b.published || b.date) - +new Date(a.published || a.date));
+  posts.sort((a, b) => +(b.publishedAt || b.updatedAt) - +(a.publishedAt || a.updatedAt));
   return posts;
 }
 async function writeFeed(feedOptions, posts, options, feedNameMap) {
-  const feed = new Feed(feedOptions);
-  posts.forEach((item) => feed.addItem(item));
+  const feed = createFeed({
+    ...feedOptions,
+    items: posts
+  });
   await fs9.ensureDir(dirname3(`./dist/${feedNameMap.atom}`));
   const path17 = resolve5(options.userRoot, "./dist");
   const publicFolder = resolve5(options.userRoot, "public");
@@ -1123,11 +1123,11 @@ async function writeFeed(feedOptions, posts, options, feedNameMap) {
     let data = "";
     const distFeedPath = `${path17}/${feedNameMap[type]}`;
     if (type === "rss")
-      data = feed.rss2();
+      data = generateRss2(feed);
     else if (type === "atom")
-      data = feed.atom1();
+      data = generateAtom1(feed);
     else if (type === "json")
-      data = feed.json1();
+      data = generateJson1(feed);
     await fs9.writeFile(distFeedPath, data, "utf-8");
     consola10.debug(`[${colors8.cyan(type)}] dist: ${colors8.dim(distFeedPath)}`);
     tableData.push([colors8.cyan(type), colors8.yellow("dist"), colors8.dim(distFeedPath)]);
@@ -1194,14 +1194,14 @@ var rssModule = defineValaxyModule({
 });
 
 // node/cli/build.ts
-import path13 from "node:path";
-import process9 from "node:process";
+import path13 from "path";
+import process9 from "process";
 import { consola as consola16 } from "consola";
 import { colors as colors15 } from "consola/utils";
 import { mergeConfig as mergeConfig4 } from "vite";
 
 // node/build.ts
-import { join as join8, resolve as resolve13 } from "node:path";
+import { join as join8, resolve as resolve13 } from "path";
 import { consola as consola14 } from "consola";
 import { colors as colors12 } from "consola/utils";
 import fs21 from "fs-extra";
@@ -1212,19 +1212,18 @@ import { build as viteSsgBuild } from "vite-ssg/node";
 // node/plugins/preset.ts
 import VueI18n from "@intlify/unplugin-vue-i18n/vite";
 import UnheadVite from "@unhead/addons/vite";
-import Vue from "@vitejs/plugin-vue";
 import { consola as consola13 } from "consola";
 import { resolve as resolve12 } from "pathe";
 import Components from "unplugin-vue-components/vite";
 import Layouts from "vite-plugin-vue-layouts";
 
 // node/plugins/extendConfig.ts
-import { dirname as dirname4, join as join3, resolve as resolve6 } from "node:path";
+import { dirname as dirname4, join as join3, resolve as resolve6 } from "path";
 import { uniq as uniq3 } from "@antfu/utils";
 import { mergeConfig as mergeConfig2, searchForWorkspaceRoot } from "vite";
 
 // node/common.ts
-import { join as join2 } from "node:path";
+import { join as join2 } from "path";
 import { uniq as uniq2 } from "@antfu/utils";
 import fs10 from "fs-extra";
 import { loadConfigFromFile as loadConfigFromFile2, mergeConfig } from "vite";
@@ -1337,6 +1336,8 @@ var EXCLUDE = [
   "meting",
   // internal
   "valaxy",
+  "virtual:valaxy-addons:empty",
+  "@valaxyjs/devtools",
   "/@valaxyjs/config",
   "/@valaxyjs/context",
   "/@valaxyjs/addons",
@@ -1465,7 +1466,7 @@ import {
 import { colors as colors9 } from "consola/utils";
 
 // ../../node_modules/.pnpm/nanoid@5.1.5/node_modules/nanoid/index.js
-import { webcrypto as crypto } from "node:crypto";
+import { webcrypto as crypto } from "crypto";
 
 // ../../node_modules/.pnpm/nanoid@5.1.5/node_modules/nanoid/url-alphabet/index.js
 var urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
@@ -1956,7 +1957,7 @@ import imageFigures from "markdown-it-image-figures";
 import TaskLists from "markdown-it-task-lists";
 
 // node/plugins/markdown/plugins/link.ts
-import { URL as URL2 } from "node:url";
+import { URL as URL2 } from "url";
 var indexRE = /(^|.*\/)index.md(.*)$/i;
 function linkPlugin(md3, externalAttrs, base) {
   md3.renderer.rules.link_open = (tokens, idx, options, env, self) => {
@@ -2645,7 +2646,7 @@ import { slash as slash2 } from "@antfu/utils";
 import path7 from "pathe";
 
 // node/plugins/markdown/utils/html.ts
-import process6 from "node:process";
+import process6 from "process";
 var KNOWN_EXTENSIONS = /* @__PURE__ */ new Set();
 function treatAsHtml(filename) {
   if (KNOWN_EXTENSIONS.size === 0) {
@@ -2657,7 +2658,7 @@ function treatAsHtml(filename) {
 }
 
 // node/plugins/markdown/utils/processInclude.ts
-import path6 from "node:path";
+import path6 from "path";
 import fs12 from "fs-extra";
 function processIncludes(srcDir, src, file) {
   const includesRE = /<!--\s*@include:\s*(.*?)\s*-->/g;
@@ -2820,8 +2821,8 @@ function createFixPlugins(options) {
 }
 
 // node/plugins/setupClient.ts
-import { existsSync } from "node:fs";
-import { join as join4, resolve as resolve7 } from "node:path";
+import { existsSync } from "fs";
+import { join as join4, resolve as resolve7 } from "path";
 import { slash as slash3, uniq as uniq4 } from "@antfu/utils";
 function createClientSetupPlugin({ clientRoot, themeRoot, userRoot: userRoot2 }) {
   const setupEntry = slash3(resolve7(clientRoot, "setup"));
@@ -2863,7 +2864,7 @@ function createClientSetupPlugin({ clientRoot, themeRoot, userRoot: userRoot2 })
 }
 
 // node/plugins/unocss.ts
-import { resolve as resolve9 } from "node:path";
+import { resolve as resolve9 } from "path";
 import defu3 from "defu";
 import fs14 from "fs-extra";
 import { createJiti as createJiti3 } from "jiti";
@@ -2877,7 +2878,7 @@ import {
 } from "unocss";
 
 // node/plugins/setupNode.ts
-import { resolve as resolve8 } from "node:path";
+import { resolve as resolve8 } from "path";
 import { isObject } from "@antfu/utils";
 import fs13 from "fs-extra";
 import { createJiti as createJiti2 } from "jiti";
@@ -3103,8 +3104,8 @@ var templateLocales = {
 };
 
 // node/virtual/styles.ts
-import { existsSync as existsSync2 } from "node:fs";
-import { join as join6 } from "node:path";
+import { existsSync as existsSync2 } from "fs";
+import { join as join6 } from "path";
 var templateStyles = {
   id: "/@valaxyjs/styles",
   async getContent({ clientRoot, roots, config }) {
@@ -3261,7 +3262,7 @@ function createScanDeadLinks(options) {
 }
 
 // node/utils/encrypt.ts
-import { webcrypto as webcrypto2 } from "node:crypto";
+import { webcrypto as webcrypto2 } from "crypto";
 function getKeyMaterial(password) {
   const enc = new TextEncoder();
   return webcrypto2.subtle.importKey(
@@ -3413,7 +3414,7 @@ function transformHexoTags(code, id) {
 }
 
 // node/plugins/markdown/transform/markdown.ts
-import path9 from "node:path";
+import path9 from "path";
 import fs18 from "fs-extra";
 function genProvideCode(name, data) {
   return [
@@ -3432,7 +3433,6 @@ function injectPageDataCode(pageData) {
     "const route = useRoute()",
     // $frontmatter contain runtime added data, will be deleted (for example, $frontmatter.partiallyEncryptedContents)
     `const $frontmatter = Object.assign(route.meta.frontmatter || {}, pageData.value?.frontmatter || {})
-    route.meta.frontmatter = $frontmatter
     router.currentRoute.value.data = pageData.value
 
     provide('valaxy:frontmatter', $frontmatter)
@@ -3607,7 +3607,7 @@ function generateAppVue(root) {
   ];
   return scripts.join("\n");
 }
-async function createValaxyLoader(options, serverOptions = {}) {
+async function createValaxyPlugin(options, serverOptions = {}) {
   let { config: valaxyConfig } = options;
   const valaxyPrefix2 = "/@valaxy";
   let hasDeadLinks = false;
@@ -3625,8 +3625,10 @@ async function createValaxyLoader(options, serverOptions = {}) {
         );
       },
       configureServer(server) {
+        if (options.configFile) {
+          server.watcher.add(options.configFile);
+        }
         server.watcher.add([
-          options.configFile,
           options.clientRoot,
           options.themeRoot,
           options.userRoot
@@ -3764,7 +3766,7 @@ import { resolve as resolve11 } from "pathe";
 import VueRouter from "unplugin-vue-router/vite";
 
 // node/plugins/presets/statistics.ts
-import { existsSync as existsSync3, readFileSync } from "node:fs";
+import { existsSync as existsSync3, readFileSync } from "fs";
 function count(content) {
   const cn = (content.match(/[\u4E00-\u9FA5]/g) || []).length;
   const en = (content.replace(/[\u4E00-\u9FA5]/g, "").match(/[\w\u0392-\u03C9\u0400-\u04FF]+|[\u4E00-\u9FFF\u3400-\u4DBF\uF900-\uFAFF\u3040-\u309F\uAC00-\uD7AF\u0400-\u04FF]+|[\u00E4\u00C4\u00E5\u00C5\u00F6\u00D6]+/g) || []).length;
@@ -3958,17 +3960,17 @@ async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
   const { options } = valaxyApp;
   const { roots, config: valaxyConfig } = options;
   const MarkdownPlugin = await createMarkdownPlugin(options);
-  const ValaxyLoader = await createValaxyLoader(options, serverOptions);
+  const ValaxyPlugin = await createValaxyPlugin(options, serverOptions);
   const componentsDirs = roots.map((root) => `${root}/components`).concat(["src/components", "components"]);
-  const plugins = [
-    MarkdownPlugin,
-    createConfigPlugin(options),
-    createClientSetupPlugin(options),
-    Vue({
-      include: [/\.vue$/, /\.md$/],
+  const vuePlugin = await import("@vitejs/plugin-vue").then(
+    (r) => r.default({
+      include: /\.(?:vue|md)$/,
       exclude: [],
+      ...valaxyConfig.vue,
       template: {
+        ...valaxyConfig.vue?.template,
         compilerOptions: {
+          ...valaxyConfig.vue?.template?.compilerOptions,
           isCustomElement: (tag) => {
             let is = customElements.has(tag);
             valaxyConfig.vue?.isCustomElement?.forEach((fn) => {
@@ -3977,10 +3979,15 @@ async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
             return is;
           }
         }
-      },
-      ...valaxyConfig.vue
-    }),
-    ValaxyLoader,
+      }
+    })
+  );
+  const plugins = [
+    MarkdownPlugin,
+    ValaxyPlugin,
+    vuePlugin,
+    createConfigPlugin(options),
+    createClientSetupPlugin(options),
     UnheadVite(),
     // https://github.com/posva/unplugin-vue-router
     await createRouterPlugin(valaxyApp),
@@ -4162,7 +4169,7 @@ async function generateClientRedirects(options) {
 }
 
 // node/server.ts
-import process7 from "node:process";
+import process7 from "process";
 import { colors as colors13 } from "consola/utils";
 import { createServer as createViteServer, mergeConfig as mergeViteConfig3 } from "vite";
 function getServerInfoText(msg) {
@@ -4195,10 +4202,9 @@ async function createServer(valaxyApp, viteConfig = {}, serverOptions = {}) {
 }
 
 // node/cli/utils/cli.ts
-import os from "node:os";
-import path12 from "node:path";
-import process8 from "node:process";
-import * as readline from "node:readline";
+import os from "os";
+import path12 from "path";
+import process8 from "process";
 import { consola as consola15 } from "consola";
 import { colors as colors14 } from "consola/utils";
 import ora4 from "ora";
@@ -4253,7 +4259,7 @@ async function initServer(valaxyApp, viteConfig) {
     viteConfig
   );
   try {
-    const server = await createServer(valaxyApp, viteConfigs, {
+    GLOBAL_STATE.server = await createServer(valaxyApp, viteConfigs, {
       async onConfigReload(newConfig, config, force = false) {
         if (force) {
           vLogger.info(`${colors14.yellow("force")} reload the server`);
@@ -4266,9 +4272,9 @@ async function initServer(valaxyApp, viteConfig) {
           initServer(valaxyApp, viteConfig);
       }
     });
+    const server = GLOBAL_STATE.server;
     await server.listen();
     serverSpinner.succeed(`${valaxyPrefix} ${colors14.green("server ready.")}`);
-    GLOBAL_STATE.server = server;
     return server;
   } catch (e) {
     consola15.error("failed to start server. error:\n");
@@ -4276,27 +4282,6 @@ async function initServer(valaxyApp, viteConfig) {
     process8.exit(1);
   }
 }
-function bindShortcut(SHORTCUTS) {
-  process8.stdin.resume();
-  process8.stdin.setEncoding("utf8");
-  readline.emitKeypressEvents(process8.stdin);
-  if (process8.stdin.isTTY)
-    process8.stdin.setRawMode(true);
-  process8.stdin.on("keypress", (str, key) => {
-    if (key.ctrl && key.name === "c") {
-      process8.exit();
-    } else {
-      const [sh] = SHORTCUTS.filter((item) => item.name === str);
-      if (sh) {
-        try {
-          sh.action();
-        } catch (err) {
-          console.error(`Failed to execute shortcut ${sh.fullName}`, err);
-        }
-      }
-    }
-  });
-}
 if (import.meta.hot) {
   await import.meta.hot.data.stopping;
   let reload = async () => {
@@ -4397,13 +4382,13 @@ function registerBuildCommand(cli2) {
 }
 
 // node/cli/clean.ts
-import path14 from "node:path";
-import process10 from "node:process";
+import path14 from "path";
+import process10 from "process";
 import { consola as consola17 } from "consola";
 import fs22 from "fs-extra";
 
 // node/cli/utils/fs.ts
-import { access } from "node:fs/promises";
+import { access } from "fs/promises";
 async function exists(path17) {
   try {
     await access(path17);
@@ -4464,7 +4449,7 @@ function registerDebugCommand(cli2) {
 }
 
 // node/cli/deploy.ts
-import process11 from "node:process";
+import process11 from "process";
 import { confirm, intro, outro, select } from "@clack/prompts";
 function registerDeployCommand(cli2) {
   cli2.command("deploy", "deploy your blog to the cloud", async () => {
@@ -4512,15 +4497,12 @@ function registerDeployCommand(cli2) {
 }
 
 // node/cli/dev.ts
-import { exec } from "node:child_process";
-import os2 from "node:os";
-import path15 from "node:path";
-import process12 from "node:process";
-import qrcode from "qrcode";
+import path15 from "path";
+import process13 from "process";
 import { mergeConfig as mergeConfig5 } from "vite";
 
 // node/utils/net.ts
-import net from "node:net";
+import net from "net";
 async function findFreePort(start) {
   if (await isPortFree(start))
     return start;
@@ -4543,9 +4525,90 @@ function isPortFree(port) {
   });
 }
 
+// node/cli/utils/shortcuts.ts
+import { exec } from "child_process";
+import os2 from "os";
+import process12 from "process";
+import * as readline from "readline";
+import { colors as colors16 } from "consola/utils";
+import qrcode from "qrcode";
+var SHORTCUTS = [
+  {
+    key: "r",
+    description: "restart",
+    async action(server, createDevServer) {
+      await server.close();
+      setTimeout(async () => {
+        await createDevServer();
+      }, 100);
+    }
+  },
+  {
+    key: "o",
+    description: "open",
+    async action(server) {
+      const { default: openBrowser } = await import("open");
+      openBrowser(`http://localhost:${server.config.server.port}/`);
+    }
+  },
+  {
+    key: "q",
+    description: "qr",
+    action(server) {
+      const addresses = Object.values(os2.networkInterfaces()).flat().filter((details) => details?.family === "IPv4" && !details.address.includes("127.0.0.1"));
+      const port = server.config.server.port;
+      const remoteUrl = `http://${addresses[0]?.address || "localhost"}:${port}`;
+      qrcode.toString(remoteUrl, { type: "terminal" }, (err, qrCode) => {
+        if (err)
+          throw err;
+        console.log(qrCode);
+      });
+    }
+  },
+  {
+    key: "e",
+    description: "edit",
+    action() {
+      exec(`code "${process12.cwd()}"`, (err) => {
+        if (err)
+          console.error("Failed to open editor", err);
+      });
+    }
+  }
+];
+function bindShortcuts(server, createDevServer) {
+  if (!server.httpServer || process12.env.CI) {
+    console.log("restart server to enable shortcuts", server.httpServer, process12.stdin.isTTY, process12.env.CI);
+    return;
+  }
+  process12.stdin.resume();
+  process12.stdin.setEncoding("utf8");
+  readline.emitKeypressEvents(process12.stdin);
+  if (process12.stdin.isTTY)
+    process12.stdin.setRawMode(true);
+  async function onKeyPress(str, key) {
+    if (key.ctrl && key.name === "c") {
+      process12.exit();
+    } else {
+      const shortcut = SHORTCUTS.find((shortcut2) => shortcut2.key === str);
+      if (!shortcut)
+        return;
+      try {
+        await shortcut.action(server, createDevServer);
+      } catch (error) {
+        console.error(colors16.red("Error executing shortcut:"), key, error);
+      }
+    }
+  }
+  process12.stdin.on("keypress", onKeyPress);
+  server.httpServer.on("close", () => {
+    process12.stdin.off("keypress", onKeyPress);
+  });
+}
+
 // node/cli/dev.ts
 async function startValaxyDev({
-  root = process12.cwd(),
+  root = process13.cwd(),
   port,
   remote,
   log,
@@ -4553,7 +4616,7 @@ async function startValaxyDev({
 }) {
   setEnv();
   if (!isPagesDirExist(root))
-    process12.exit(0);
+    process13.exit(0);
   port = port || await findFreePort(4859);
   const resolvedOptions = await resolveOptions({ userRoot: root });
   setTimezone(resolvedOptions.config.siteConfig.timezone);
@@ -4576,47 +4639,9 @@ async function startValaxyDev({
     },
     logLevel: log
   }, resolvedOptions.config.vite || {});
-  await initServer(valaxyApp, viteConfig);
+  const server = await initServer(valaxyApp, viteConfig);
   printInfo(resolvedOptions, port, remote);
-  const SHORTCUTS = [
-    {
-      name: "r",
-      fullName: "restart",
-      async action() {
-        await initServer(valaxyApp, viteConfig);
-        printInfo(resolvedOptions, port, remote);
-      }
-    },
-    {
-      name: "o",
-      fullName: "open",
-      async action() {
-        const { default: openBrowser } = await import("open");
-        openBrowser(`http://localhost:${port}`);
-      }
-    },
-    {
-      name: "q",
-      fullName: "qr",
-      action() {
-        const addresses = Object.values(os2.networkInterfaces()).flat().filter((details) => details?.family === "IPv4" && !details.address.includes("127.0.0.1"));
-        const remoteUrl = `http://${addresses[0]?.address || "localhost"}:${port}`;
-        qrcode.toString(remoteUrl, { type: "terminal" }, (err, qrCode) => {
-          if (err)
-            throw err;
-          console.log(qrCode);
-        });
-      }
-    },
-    {
-      name: "e",
-      fullName: "edit",
-      action() {
-        exec(`code "${root}"`);
-      }
-    }
-  ];
-  bindShortcut(SHORTCUTS);
+  return server;
 }
 function registerDevCommand(cli2) {
   cli2.command(
@@ -4642,29 +4667,34 @@ function registerDevCommand(cli2) {
       describe: "log level"
     }).strict().help(),
     async ({ root, port, open, remote, log }) => {
-      startValaxyDev({
-        root,
-        open,
-        port,
-        remote,
-        log
-      });
+      let server;
+      const createDevServer = async () => {
+        server = await startValaxyDev({
+          root,
+          open,
+          port,
+          remote,
+          log
+        });
+        bindShortcuts(server, createDevServer);
+      };
+      createDevServer();
     }
   );
 }
 
 // node/cli/utils/post.ts
-import { writeFile as writeFile2 } from "node:fs/promises";
-import { join as join9, resolve as resolve14 } from "node:path";
+import { writeFile as writeFile2 } from "fs/promises";
+import { join as join9, resolve as resolve14 } from "path";
 import { ensureSuffix as ensureSuffix2 } from "@antfu/utils";
 import { consola as consola19 } from "consola";
-import { colors as colors16 } from "consola/utils";
+import { colors as colors17 } from "consola/utils";
 import dayjs2 from "dayjs";
 import { render } from "ejs";
 
 // node/cli/utils/constants.ts
-import process13 from "node:process";
-var userRoot = process13.cwd();
+import process14 from "process";
+var userRoot = process14.cwd();
 var defaultPostTemplate = `---
 layout: <%=layout%>
 title: <%=title%>
@@ -4673,8 +4703,8 @@ date: <%=date%>
 `;
 
 // node/cli/utils/scaffold.ts
-import { readFile as readFile2 } from "node:fs/promises";
-import path16 from "node:path";
+import { readFile as readFile2 } from "fs/promises";
+import path16 from "path";
 async function getTemplate(layout) {
   const { clientRoot, themeRoot } = await resolveOptions({ userRoot });
   const roots = [userRoot, themeRoot, clientRoot];
@@ -4704,11 +4734,11 @@ async function create(data) {
       const content = await genLayoutTemplate(data);
       try {
         await writeFile2(destinationPath, content, "utf-8");
-        consola19.success(`[valaxy new]: successfully generated file ${colors16.magenta(destinationPath)}`);
+        consola19.success(`[valaxy new]: successfully generated file ${colors17.magenta(destinationPath)}`);
       } catch (e) {
         console.log(e);
         consola19.error(`[valaxy new]: failed to write file ${destinationPath}`);
-        consola19.warn(`You should run ${colors16.green("valaxy new")} in your valaxy project root directory.`);
+        consola19.warn(`You should run ${colors17.green("valaxy new")} in your valaxy project root directory.`);
       }
       return destinationPath;
     }
@@ -4763,7 +4793,7 @@ function registerNewCommand(cli2) {
 }
 
 // node/cli/index.ts
-var cli = yargs(hideBin(process14.argv)).scriptName("valaxy").usage("$0 [args]").version(version).showHelpOnFail(false).alias("h", "help").alias("v", "version");
+var cli = yargs(hideBin(process15.argv)).scriptName("valaxy").usage("$0 [args]").version(version).showHelpOnFail(false).alias("h", "help").alias("v", "version");
 registerDevCommand(cli);
 registerBuildCommand(cli);
 registerNewCommand(cli);
@@ -4822,7 +4852,7 @@ export {
   processValaxyOptions,
   resolveOptions,
   resolveThemeValaxyConfig,
-  createValaxyLoader,
+  createValaxyPlugin,
   ViteValaxyPlugins,
   build2 as build,
   ssgBuild,

package/dist/node/cli/index.d.ts

@@ -1,6 +1,6 @@
 import * as yargs from 'yargs';
 import { Argv } from 'yargs';
-import { LogLevel } from 'vite';
+import { LogLevel, ViteDevServer } from 'vite';
 
 declare function startValaxyDev({ root, port, remote, log, open, }: {
     root?: string;
@@ -8,7 +8,7 @@ declare function startValaxyDev({ root, port, remote, log, open, }: {
     remote?: boolean;
     log?: LogLevel;
     open?: boolean;
-}): Promise<void>;
+}): Promise<ViteDevServer>;
 declare function registerDevCommand(cli: Argv): void;
 
 declare const cli: yargs.Argv<{}>;

package/dist/node/cli/index.js

@@ -3,7 +3,7 @@ import {
   registerDevCommand,
   run,
   startValaxyDev
-} from "../../chunk-3X26KX5G.js";
+} from "../../chunk-VMMD3G2Q.js";
 export {
   cli,
   registerDevCommand,

package/dist/node/index.d.ts

@@ -628,7 +628,7 @@ declare function ViteValaxyPlugins(valaxyApp: ValaxyNode, serverOptions?: Valaxy
  * @param options
  * @param serverOptions
  */
-declare function createValaxyLoader(options: ResolvedValaxyOptions, serverOptions?: ValaxyServerOptions): Promise<Plugin[]>;
+declare function createValaxyPlugin(options: ResolvedValaxyOptions, serverOptions?: ValaxyServerOptions): Promise<Plugin[]>;
 
 /**
  * with valaxyPrefix
@@ -665,4 +665,4 @@ 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 { ALL_ROUTE, EXCERPT_SEPARATOR, EXTERNAL_URL_RE, type HookResult, type LoadConfigFromFileOptions, PATHNAME_PROTOCOL_RE, type ResolvedConfig, type ResolvedValaxyOptions, type UnoSetup, type UserInputConfig, type UserValaxyNodeConfig, type ValaxyAddonExport, type ValaxyAddonFn, type ValaxyAddonLike, type ValaxyAddonResolver, type ValaxyAddons, type ValaxyApp, type ValaxyConfigExport, type ValaxyConfigExtendKey, type ValaxyConfigFn, type ValaxyEntryOptions, type ValaxyExtendConfig, type ValaxyHooks, type ValaxyNode, type ValaxyNodeConfig, type ValaxyPickConfig, type ValaxyServerOptions, type ValaxyTheme, ViteValaxyPlugins, build, createServer, createValaxyLoader, customElements, defaultSiteConfig, defaultValaxyConfig, defaultViteConfig, defineAddon, defineConfig, defineSiteConfig, defineTheme, defineUnoSetup, defineValaxyAddon, defineValaxyConfig, defineValaxyTheme, generateClientRedirects, getGitTimestamp, getIndexHtml, getServerInfoText, isExternal, isInstalledGlobally, isPath, loadConfig, loadConfigFromFile, mergeValaxyConfig, mergeViteConfigs, postProcessForSSG, processValaxyOptions, resolveAddonsConfig, resolveImportPath, resolveImportUrl, resolveOptions, resolveSiteConfig, resolveSiteConfigFromRoot, resolveThemeConfigFromRoot, resolveThemeValaxyConfig, resolveUserThemeConfig, resolveValaxyConfig, resolveValaxyConfigFromRoot, ssgBuild, toAtFS, transformObject };
+export { ALL_ROUTE, EXCERPT_SEPARATOR, EXTERNAL_URL_RE, type HookResult, type LoadConfigFromFileOptions, PATHNAME_PROTOCOL_RE, type ResolvedConfig, type ResolvedValaxyOptions, type UnoSetup, type UserInputConfig, type UserValaxyNodeConfig, type ValaxyAddonExport, type ValaxyAddonFn, type ValaxyAddonLike, type ValaxyAddonResolver, type ValaxyAddons, type ValaxyApp, type ValaxyConfigExport, type ValaxyConfigExtendKey, type ValaxyConfigFn, type ValaxyEntryOptions, type ValaxyExtendConfig, type ValaxyHooks, type ValaxyNode, type ValaxyNodeConfig, type ValaxyPickConfig, type ValaxyServerOptions, type ValaxyTheme, ViteValaxyPlugins, build, createServer, createValaxyPlugin, customElements, defaultSiteConfig, defaultValaxyConfig, defaultViteConfig, defineAddon, defineConfig, defineSiteConfig, defineTheme, defineUnoSetup, defineValaxyAddon, defineValaxyConfig, defineValaxyTheme, generateClientRedirects, getGitTimestamp, getIndexHtml, getServerInfoText, isExternal, isInstalledGlobally, isPath, loadConfig, loadConfigFromFile, mergeValaxyConfig, mergeViteConfigs, postProcessForSSG, processValaxyOptions, resolveAddonsConfig, resolveImportPath, resolveImportUrl, resolveOptions, resolveSiteConfig, resolveSiteConfigFromRoot, resolveThemeConfigFromRoot, resolveThemeValaxyConfig, resolveUserThemeConfig, resolveValaxyConfig, resolveValaxyConfigFromRoot, ssgBuild, toAtFS, transformObject };

package/dist/node/index.js

@@ -7,7 +7,7 @@ import {
   build,
   cli,
   createServer,
-  createValaxyLoader,
+  createValaxyPlugin,
   customElements,
   defaultSiteConfig,
   defaultValaxyConfig,
@@ -50,7 +50,7 @@ import {
   startValaxyDev,
   toAtFS,
   transformObject
-} from "../chunk-3X26KX5G.js";
+} from "../chunk-VMMD3G2Q.js";
 export {
   ALL_ROUTE,
   EXCERPT_SEPARATOR,
@@ -60,7 +60,7 @@ export {
   build,
   cli,
   createServer,
-  createValaxyLoader,
+  createValaxyPlugin,
   customElements,
   defaultSiteConfig,
   defaultValaxyConfig,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valaxy",
   "type": "module",
-  "version": "0.23.2",
+  "version": "0.23.4",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -52,32 +52,31 @@
     "node": "^14.18.0 || >=16.0.0"
   },
   "dependencies": {
-    "@antfu/install-pkg": "^1.0.0",
+    "@antfu/install-pkg": "^1.1.0",
     "@antfu/utils": "^9.2.0",
-    "@clack/prompts": "^0.10.1",
+    "@clack/prompts": "^0.11.0",
     "@iconify-json/ri": "^1.2.5",
     "@intlify/unplugin-vue-i18n": "^6.0.8",
-    "@shikijs/transformers": "^3.3.0",
+    "@shikijs/transformers": "^3.4.2",
     "@types/katex": "^0.16.7",
-    "@unhead/addons": "^2.0.8",
-    "@unhead/schema-org": "^2.0.8",
-    "@unhead/vue": "^2.0.8",
-    "@vitejs/plugin-vue": "^5.2.3",
+    "@unhead/addons": "^2.0.10",
+    "@unhead/schema-org": "^2.0.10",
+    "@unhead/vue": "^2.0.10",
+    "@vitejs/plugin-vue": "^5.2.4",
     "@vue/devtools-api": "7.7.2",
-    "@vueuse/core": "^13.1.0",
-    "@vueuse/integrations": "^13.1.0",
-    "beasties": "^0.3.3",
+    "@vueuse/core": "^13.2.0",
+    "@vueuse/integrations": "^13.2.0",
+    "beasties": "^0.3.4",
     "birpc": "^2.3.0",
     "consola": "^3.4.2",
     "cross-spawn": "^7.0.6",
     "css-i18n": "^0.0.5",
     "dayjs": "^1.11.13",
-    "debug": "^4.4.0",
+    "debug": "^4.4.1",
     "defu": "^6.1.4",
     "ejs": "^3.1.10",
     "escape-html": "^1.0.3",
     "fast-glob": "^3.3.3",
-    "feed": "^4.2.2",
     "floating-vue": "^5.2.2",
     "fs-extra": "^11.3.0",
     "fuse.js": "^7.1.0",
@@ -110,29 +109,30 @@
     "pinia": "^3.0.2",
     "qrcode": "^1.5.4",
     "resolve-global": "^2.0.0",
-    "sass": "^1.87.0",
-    "shiki": "^3.3.0",
+    "sass": "^1.89.0",
+    "shiki": "^3.4.2",
     "star-markdown-css": "^0.5.3",
     "table": "^6.9.0",
-    "unhead": "^2.0.8",
-    "unocss": "^66.1.0-beta.12",
+    "unhead": "^2.0.10",
+    "unocss": "^66.1.2",
     "unplugin-vue-components": "28.0.0",
     "unplugin-vue-markdown": "^28.3.1",
     "unplugin-vue-router": "^0.12.0",
     "vanilla-lazyload": "^19.1.3",
-    "vite": "^6.3.3",
+    "vite": "^6.3.5",
     "vite-dev-rpc": "^1.0.7",
-    "vite-plugin-vue-devtools": "^7.7.5",
+    "vite-plugin-vue-devtools": "^7.7.6",
     "vite-plugin-vue-layouts": "^0.11.0",
-    "vite-ssg": "^26.1.1",
-    "vite-ssg-sitemap": "^0.8.1",
-    "vitepress-plugin-group-icons": "^1.5.2",
-    "vue": "^3.5.13",
-    "vue-i18n": "^11.1.3",
-    "vue-router": "^4.5.0",
+    "vite-ssg": "^27.0.1",
+    "vite-ssg-sitemap": "^0.9.0",
+    "vitepress-plugin-group-icons": "^1.5.5",
+    "vue": "^3.5.14",
+    "vue-i18n": "^11.1.4",
+    "vue-router": "^4.5.1",
     "yargs": "^17.7.2",
-    "@valaxyjs/devtools": "0.23.2",
-    "@valaxyjs/utils": "0.23.2"
+    "zfeed": "^0.2.2",
+    "@valaxyjs/utils": "0.23.4",
+    "@valaxyjs/devtools": "0.23.4"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^2.1.4",
@@ -157,7 +157,7 @@
     "diacritics": "^1.3.0",
     "gh-pages": "^6.3.0",
     "https-localhost": "^4.7.1",
-    "rollup-plugin-visualizer": "^5.14.0"
+    "rollup-plugin-visualizer": "^6.0.0"
   },
   "scripts": {
     "clean": "rimraf dist",