valaxy 0.24.0 → 0.24.2

package/client/App.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-// import it in setup/main.ts for ssg
+// vite-ssg build for client
 import 'virtual:group-icons.css'
 // import { defineAsyncComponent } from 'vue'
 /**

package/client/components/AppLink.vue

@@ -2,7 +2,7 @@
 // https://router.vuejs.org/guide/advanced/extending-router-link.html#extending-routerlink
 import { computed } from 'vue'
 import { RouterLink } from 'vue-router'
-import { EXTERNAL_URL_RE } from '../../node/constants'
+import { EXTERNAL_URL_RE } from '../../shared'
 
 const props = defineProps<{
   showExternalIcon?: boolean

package/client/main.ts

@@ -20,7 +20,6 @@ import { setupValaxyDevTools } from './utils/dev'
  */
 import '#valaxy/styles'
 import 'uno.css'
-import 'virtual:group-icons.css'
 
 const valaxyConfig = initValaxyConfig()
 

package/dist/{chunk-UBPYRQAO.js → chunk-O3SOO3BN.js}

@@ -4,7 +4,7 @@ import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // package.json
-var version = "0.24.0";
+var version = "0.24.2";
 
 // node/modules/fuse.ts
 import path4 from "path";
@@ -120,6 +120,9 @@ function getRollupOptions(options) {
         if (id.includes("plugin-vue:export-helper")) {
           return "framework";
         }
+        if (id.includes("virtual:group-icons.css")) {
+          return "group-icons";
+        }
         const libs = [
           "@vueuse/motion",
           "dayjs",
@@ -512,42 +515,16 @@ function getGitTimestamp(file, type = "updated") {
   });
 }
 
-// node/constants/index.ts
-var EXCERPT_SEPARATOR = "<!-- more -->";
+// shared/constants.ts
 var EXTERNAL_URL_RE = /^(?:[a-z]+:|\/\/)/i;
-var PATHNAME_PROTOCOL_RE = /^pathname:\/\//;
-var ALL_ROUTE = "/:all(.*)*";
-var customElements = /* @__PURE__ */ new Set([
-  // katex
-  "annotation",
-  "math",
-  "menclose",
-  "mfrac",
-  "mglyph",
-  "mi",
-  "mlabeledtr",
-  "mn",
-  "mo",
-  "mover",
-  "mpadded",
-  "mphantom",
-  "mroot",
-  "mrow",
-  "mspace",
-  "msqrt",
-  "mstyle",
-  "msub",
-  "msubsup",
-  "msup",
-  "mtable",
-  "mtd",
-  "mtext",
-  "mtr",
-  "munder",
-  "munderover",
-  "semantics"
-]);
-var defaultViteConfig = {};
+
+// shared/utils/i18n.ts
+function tObject(data, lang) {
+  if (typeof data === "object") {
+    return data[lang] || Object.values(data)[0] || "";
+  }
+  return data;
+}
 
 // node/utils/helper.ts
 function isExternal(str) {
@@ -837,6 +814,44 @@ async function resolveThemeValaxyConfig(options) {
 
 // node/plugins/markdown/transform/matter.ts
 import yaml, { CORE_SCHEMA } from "js-yaml";
+
+// node/constants/index.ts
+var EXCERPT_SEPARATOR = "<!-- more -->";
+var PATHNAME_PROTOCOL_RE = /^pathname:\/\//;
+var ALL_ROUTE = "/:all(.*)*";
+var customElements = /* @__PURE__ */ new Set([
+  // katex
+  "annotation",
+  "math",
+  "menclose",
+  "mfrac",
+  "mglyph",
+  "mi",
+  "mlabeledtr",
+  "mn",
+  "mo",
+  "mover",
+  "mpadded",
+  "mphantom",
+  "mroot",
+  "mrow",
+  "mspace",
+  "msqrt",
+  "mstyle",
+  "msub",
+  "msubsup",
+  "msup",
+  "mtable",
+  "mtd",
+  "mtext",
+  "mtr",
+  "munder",
+  "munderover",
+  "semantics"
+]);
+var defaultViteConfig = {};
+
+// node/plugins/markdown/transform/matter.ts
 var matterOptions = {
   excerpt_separator: EXCERPT_SEPARATOR,
   engines: {
@@ -980,14 +995,6 @@ import MarkdownIt from "markdown-it";
 import ora3 from "ora";
 import { getBorderCharacters, table } from "table";
 
-// shared/utils/i18n.ts
-function tObject(data, lang) {
-  if (typeof data === "object") {
-    return data[lang] || Object.values(data)[0] || "";
-  }
-  return data;
-}
-
 // node/utils/date.ts
 import fs8 from "fs-extra";
 async function getCreatedTime(file) {
@@ -1221,6 +1228,7 @@ 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";
+import { groupIconVitePlugin } from "vitepress-plugin-group-icons";
 
 // node/plugins/extendConfig.ts
 import { dirname as dirname4, join as join3, resolve as resolve6 } from "path";
@@ -1947,6 +1955,7 @@ import { full as emojiPlugin } from "markdown-it-emoji";
 import footnotePlugin from "markdown-it-footnote";
 import imageFigures from "markdown-it-image-figures";
 import TaskLists from "markdown-it-task-lists";
+import { groupIconMdPlugin } from "vitepress-plugin-group-icons";
 
 // node/plugins/markdown/plugins/link.ts
 import { URL as URL2 } from "url";
@@ -2610,7 +2619,6 @@ async function setupMarkdownPlugins(md3, options, base = "/") {
     ...mdOptions.imageFigures
   });
   md3.use(TaskLists);
-  const { groupIconMdPlugin } = await import("vitepress-plugin-group-icons");
   md3.use(groupIconMdPlugin, {
     titleBar: { includeSnippet: true }
   });
@@ -4033,18 +4041,6 @@ async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
     }),
     createFixPlugins(options)
   ];
-  const { groupIconVitePlugin } = await import("vitepress-plugin-group-icons");
-  plugins.push(
-    groupIconVitePlugin({
-      customIcon: {
-        nodejs: "vscode-icons:file-type-node",
-        playwright: "vscode-icons:file-type-playwright",
-        typedoc: "vscode-icons:file-type-typedoc",
-        eslint: "vscode-icons:file-type-eslint"
-      },
-      ...valaxyConfig.groupIcons
-    })
-  );
   if (valaxyConfig.visualizer) {
     try {
       const visualizer = (await import("rollup-plugin-visualizer")).visualizer;
@@ -4064,6 +4060,22 @@ async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
       console.log();
     }
   }
+  const customIcon = {
+    nodejs: "vscode-icons:file-type-node",
+    playwright: "vscode-icons:file-type-playwright",
+    typedoc: "vscode-icons:file-type-typedoc",
+    eslint: "vscode-icons:file-type-eslint"
+  };
+  plugins.push(
+    groupIconVitePlugin({
+      customIcon,
+      ...valaxyConfig.groupIcons,
+      defaultLabels: [
+        ...valaxyConfig.groupIcons?.defaultLabels || [],
+        ...Object.keys(valaxyConfig.groupIcons?.customIcon || {})
+      ]
+    })
+  );
   return plugins;
 }
 
@@ -4785,7 +4797,6 @@ function run() {
 
 export {
   EXCERPT_SEPARATOR,
-  EXTERNAL_URL_RE,
   PATHNAME_PROTOCOL_RE,
   ALL_ROUTE,
   customElements,

package/dist/node/cli/index.js

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

package/dist/node/index.d.ts

@@ -609,7 +609,6 @@ type UnoSetup = () => Awaitable<Partial<VitePluginConfig> | undefined>;
 declare function defineUnoSetup(fn: UnoSetup): UnoSetup;
 
 declare const EXCERPT_SEPARATOR = "<!-- more -->";
-declare const EXTERNAL_URL_RE: RegExp;
 declare const PATHNAME_PROTOCOL_RE: RegExp;
 declare const ALL_ROUTE = "/:all(.*)*";
 declare const customElements: Set<string>;
@@ -669,4 +668,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, 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 };
+export { ALL_ROUTE, EXCERPT_SEPARATOR, 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

@@ -1,7 +1,6 @@
 import {
   ALL_ROUTE,
   EXCERPT_SEPARATOR,
-  EXTERNAL_URL_RE,
   PATHNAME_PROTOCOL_RE,
   ViteValaxyPlugins,
   build,
@@ -50,11 +49,10 @@ import {
   startValaxyDev,
   toAtFS,
   transformObject
-} from "../chunk-UBPYRQAO.js";
+} from "../chunk-O3SOO3BN.js";
 export {
   ALL_ROUTE,
   EXCERPT_SEPARATOR,
-  EXTERNAL_URL_RE,
   PATHNAME_PROTOCOL_RE,
   ViteValaxyPlugins,
   build,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valaxy",
   "type": "module",
-  "version": "0.24.0",
+  "version": "0.24.2",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -132,8 +132,8 @@
     "vue-i18n": "^11.1.9",
     "vue-router": "^4.5.1",
     "yargs": "^18.0.0",
-    "@valaxyjs/devtools": "0.24.0",
-    "@valaxyjs/utils": "0.24.0"
+    "@valaxyjs/devtools": "0.24.2",
+    "@valaxyjs/utils": "0.24.2"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^2.1.4",

package/shared/constants.ts

@@ -0,0 +1 @@
+export const EXTERNAL_URL_RE = /^(?:[a-z]+:|\/\/)/i

package/shared/index.ts

@@ -1 +1,2 @@
+export * from './constants'
 export * from './utils'