valaxy 0.23.2 → 0.23.3

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-OXTCPOR5.js}

@@ -1,10 +1,10 @@
 // node/cli/index.ts
-import process14 from "node:process";
+import process15 from "node:process";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // package.json
-var version = "0.23.2";
+var version = "0.23.3";
 
 // node/modules/fuse.ts
 import path4 from "node:path";
@@ -1212,7 +1212,6 @@ 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";
@@ -1337,6 +1336,8 @@ var EXCLUDE = [
   "meting",
   // internal
   "valaxy",
+  "virtual:valaxy-addons:empty",
+  "@valaxyjs/devtools",
   "/@valaxyjs/config",
   "/@valaxyjs/context",
   "/@valaxyjs/addons",
@@ -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
@@ -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),
@@ -4198,7 +4205,6 @@ async function createServer(valaxyApp, viteConfig = {}, serverOptions = {}) {
 import os from "node:os";
 import path12 from "node:path";
 import process8 from "node:process";
-import * as readline from "node:readline";
 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 () => {
@@ -4512,11 +4497,8 @@ 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 process13 from "node:process";
 import { mergeConfig as mergeConfig5 } from "vite";
 
 // node/utils/net.ts
@@ -4543,9 +4525,90 @@ function isPortFree(port) {
   });
 }
 
+// node/cli/utils/shortcuts.ts
+import { exec } from "node:child_process";
+import os2 from "node:os";
+import process12 from "node:process";
+import * as readline from "node: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,13 +4667,18 @@ 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();
     }
   );
 }
@@ -4658,13 +4688,13 @@ import { writeFile as writeFile2 } from "node:fs/promises";
 import { join as join9, resolve as resolve14 } from "node: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 "node:process";
+var userRoot = process14.cwd();
 var defaultPostTemplate = `---
 layout: <%=layout%>
 title: <%=title%>
@@ -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-OXTCPOR5.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-OXTCPOR5.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.3",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -122,17 +122,17 @@
     "vanilla-lazyload": "^19.1.3",
     "vite": "^6.3.3",
     "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",
+    "vue-router": "^4.5.1",
     "yargs": "^17.7.2",
-    "@valaxyjs/devtools": "0.23.2",
-    "@valaxyjs/utils": "0.23.2"
+    "@valaxyjs/devtools": "0.23.3",
+    "@valaxyjs/utils": "0.23.3"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^2.1.4",