valaxy 1.0.0-rc.2 → 1.0.0-rc.4

package/client/composables/app/useValaxyHead.ts

@@ -4,6 +4,7 @@ import pkg from '../../../package.json' with { type: 'json' }
 
 import { useFrontmatter, useValaxyI18n } from '../../composables'
 import { useSiteConfig } from '../../config'
+import { withBase } from '../../utils'
 
 export function useValaxyHead() {
   const { $t, $tO, locale } = useValaxyI18n()
@@ -24,7 +25,7 @@ export function useValaxyHead() {
     link: [
       {
         rel: 'icon',
-        href: siteConfig.value.favicon,
+        href: withBase(siteConfig.value.favicon),
         type: siteConfig.value.favicon?.endsWith('svg') ? 'image/svg+xml' : 'image/png',
       },
     ],

package/client/utils/index.ts

@@ -4,6 +4,7 @@ export * from './code'
 export * from './content'
 export * from './helper'
 export * from './iframe'
+export * from './path'
 export * from './router'
 export * from './time'
 export * from './types'

package/client/utils/path.ts

@@ -0,0 +1,18 @@
+import { EXTERNAL_URL_RE } from '../../shared'
+
+/**
+ * Join two URL paths while resolving a slash collision.
+ */
+function joinPath(base: string, path: string): string {
+  return `${base}${path}`.replace(/\/+/g, '/')
+}
+
+/**
+ * Append Vite's resolved base to an internal root-absolute URL.
+ * External and relative URLs are returned unchanged.
+ */
+export function withBase(path: string): string {
+  return EXTERNAL_URL_RE.test(path) || !path.startsWith('/')
+    ? path
+    : joinPath(import.meta.env.BASE_URL, path)
+}

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, Y as startValaxyDev } from '../../shared/valaxy.gIHfh4CV.mjs';
+export { c as cli, I as registerDevCommand, W as run, Y as startValaxyDev } from '../../shared/valaxy.Dj-g4l0F.mjs';
 import 'node:os';
 import 'node:path';
 import 'consola';

package/dist/node/index.d.mts

@@ -1091,7 +1091,7 @@ declare function resolveOptions(options?: ValaxyEntryOptions, mode?: ResolvedVal
  */
 declare function resolveThemeValaxyConfig(options: ResolvedValaxyOptions): Promise<ValaxyNodeConfig>;
 
-declare function ViteValaxyPlugins(valaxyApp: ValaxyNode, serverOptions?: ValaxyServerOptions): Promise<(PluginOption | PluginOption[])[]>;
+declare function ViteValaxyPlugins(valaxyApp: ValaxyNode, serverOptions?: ValaxyServerOptions, viteConfig?: InlineConfig): Promise<(PluginOption | PluginOption[])[]>;
 
 /**
  * @packageDocumentation valaxy plugin

package/dist/node/index.mjs

@@ -1,4 +1,4 @@
-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 startValaxyDev, Z as toAtFS, _ as transformObject, $ as version } from '../shared/valaxy.gIHfh4CV.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 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 startValaxyDev, Z as toAtFS, _ as transformObject, $ as version } from '../shared/valaxy.Dj-g4l0F.mjs';
 import 'node:path';
 import 'consola';
 import 'fs-extra';

package/dist/shared/{valaxy.gIHfh4CV.mjs → valaxy.Dj-g4l0F.mjs}

@@ -2017,12 +2017,33 @@ const tocPlugin = (md, { pattern = /^\[\[toc\]\]$/i, slugify: slugify$1 = slugif
 	}));
 };
 
+function createMarkdownBaseContext(base = "/") {
+  return { value: base };
+}
+function createMarkdownBaseResolver(base) {
+  return typeof base === "string" ? () => base : () => base.value;
+}
+
 function isPromiseLike(v) {
   return typeof v === "object" && v !== null && typeof v.then === "function";
 }
 
+function imagePlugin(md) {
+  const imageRule = md.renderer.rules.image;
+  md.renderer.rules.image = (tokens, idx, options, env, self) => {
+    const token = tokens[idx];
+    let url = token.attrGet("src");
+    if (url && !EXTERNAL_URL_RE.test(url)) {
+      if (!/^\.?\//.test(url))
+        url = `./${url}`;
+      token.attrSet("src", decodeURIComponent(url));
+    }
+    return imageRule(tokens, idx, options, env, self);
+  };
+}
+
 const indexRE = /(^|.*\/)index.md(.*)$/i;
-function linkPlugin(md, externalAttrs, base) {
+function linkPlugin(md, externalAttrs, resolveBase) {
   md.renderer.rules.link_open = (tokens, idx, options, env, self) => {
     const token = tokens[idx];
     const hrefIndex = token.attrIndex("href");
@@ -2035,11 +2056,15 @@ function linkPlugin(md, externalAttrs, base) {
           token.attrSet(key, val);
         });
         hrefAttr[1] = url.replace(PATHNAME_PROTOCOL_RE, "");
-      } else if (
-        // internal anchor links
-        !url.startsWith("#") && !url.startsWith("mailto:") && !/\.(?!html|md)\w+($|\?)/i.test(url)
-      ) {
-        normalizeHref(hrefAttr, env);
+      } else {
+        if (
+          // internal anchor links
+          !url.startsWith("#") && !url.startsWith("mailto:") && !/\.(?!html|md)\w+($|[?#])/i.test(url)
+        ) {
+          normalizeHref(hrefAttr, env);
+        }
+        if (hrefAttr[1].startsWith("/"))
+          hrefAttr[1] = `${resolveBase()}${hrefAttr[1]}`.replace(/\/+/g, "/");
       }
       hrefAttr[1] = hrefAttr[1].replace(/\bimport\.meta/g, "import%2Emeta").replace(/\bprocess\.env/g, "process%2Eenv");
     }
@@ -2068,8 +2093,6 @@ function linkPlugin(md, externalAttrs, base) {
     if (!url.startsWith("/") && !/^\.\//.test(url))
       url = `./${url}`;
     pushLink(url.replace(/\.html$/, ""), env);
-    if (url.startsWith("/"))
-      url = `${base}${url}`.replace(/\/+/g, "/");
     hrefAttr[1] = decodeURI(url);
   }
   function pushLink(link, env) {
@@ -2585,10 +2608,11 @@ function snippetPlugin(md, srcDir) {
 }
 
 const defaultCodeTheme = { light: "github-light", dark: "github-dark" };
-async function setupMarkdownPlugins(md, options, base = "/") {
+async function setupMarkdownPlugins(md, options, base = options?.config.vite?.base || "/") {
   const mdOptions = options?.config.markdown || {};
   const theme = mdOptions.theme ?? defaultCodeTheme;
   const siteConfig = options?.config.siteConfig || {};
+  const resolveBase = createMarkdownBaseResolver(base);
   if (mdOptions.preConfig)
     mdOptions.preConfig(md);
   md.use(highlightLinePlugin).use(preWrapperPlugin, { theme, siteConfig }).use(snippetPlugin, options?.userRoot).use(containerPlugin, {
@@ -2607,8 +2631,8 @@ async function setupMarkdownPlugins(md, options, base = "/") {
       rel: "noreferrer",
       ...mdOptions.externalLinks
     },
-    base
-  );
+    resolveBase
+  ).use(imagePlugin);
   md.use(lineNumberPlugin, mdOptions.lineNumbers);
   if (!mdOptions.attrs?.disable)
     md.use(attrsPlugin, mdOptions.attrs);
@@ -2727,7 +2751,7 @@ async function setupMarkdownPlugins(md, options, base = "/") {
   return md;
 }
 
-const version = "1.0.0-rc.2";
+const version = "1.0.0-rc.4";
 
 const GLOBAL_STATE = {
   valaxyApp: void 0,
@@ -2841,7 +2865,7 @@ function disposeMdItInstance() {
   _disposeHighlighter$1?.();
   _disposeHighlighter$1 = void 0;
 }
-async function createMarkdownPlugin(options) {
+async function createMarkdownPlugin(options, base) {
   const mdOptions = options?.config.markdown || {};
   const theme = mdOptions.theme ?? defaultCodeTheme;
   const transformIncludes = createTransformIncludes(options);
@@ -2876,7 +2900,7 @@ async function createMarkdownPlugin(options) {
     },
     async markdownItSetup(mdIt) {
       mdIt.linkify.set({ fuzzyLink: false });
-      await setupMarkdownPlugins(mdIt, options);
+      await setupMarkdownPlugins(mdIt, options, base);
       options?.config.markdown?.markdownItSetup?.(mdIt);
       function initEnv(md) {
         md.core.ruler.push("valaxy_md_env", (state) => {
@@ -2912,7 +2936,7 @@ function disposePreviewMdItInstance() {
   _disposeHighlighter?.();
   _disposeHighlighter = void 0;
 }
-async function createLightMarkdownRenderer(options) {
+async function createLightMarkdownRenderer(options, base) {
   const mdOptions = options?.config.markdown || {};
   const highlight = (str, _lang, _attrs) => {
     const escaped = str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
@@ -2925,14 +2949,14 @@ async function createLightMarkdownRenderer(options) {
     highlight
   });
   md.linkify.set({ fuzzyLink: false });
-  await setupMarkdownPlugins(md, options);
+  await setupMarkdownPlugins(md, options, base);
   return md;
 }
 
 const debug$2 = _debug("valaxy:local-search");
 const LOCAL_SEARCH_INDEX_ID = "@localSearchIndex";
 const LOCAL_SEARCH_INDEX_REQUEST_PATH = `/${LOCAL_SEARCH_INDEX_ID}`;
-async function localSearchPlugin(options) {
+async function localSearchPlugin(options, base) {
   const siteConfig = options.config.siteConfig;
   if (siteConfig.search?.provider !== "local") {
     return {
@@ -2951,7 +2975,7 @@ async function localSearchPlugin(options) {
   }
   const srcDir = path.resolve(options.userRoot, "pages");
   const originalPages = options.pages;
-  const md = await createLightMarkdownRenderer(options);
+  const md = await createLightMarkdownRenderer(options, base);
   async function render(file) {
     if (!fs.existsSync(file))
       return "";
@@ -4467,11 +4491,11 @@ function generateAutoExcerptMd(content, length) {
     return "";
   return cleaned.length > length ? `${cleaned.slice(0, length)}...` : cleaned;
 }
-async function createRouterPlugin(valaxyApp) {
+async function createRouterPlugin(valaxyApp, base) {
   const { options } = valaxyApp;
   const { roots, config: valaxyConfig } = options;
   const mdIt = new MarkdownItAsync({ html: true });
-  await setupMarkdownPlugins(mdIt, options);
+  await setupMarkdownPlugins(mdIt, options, base);
   let _lastFrontmatterRef = valaxyConfig.siteConfig.frontmatter;
   let _cachedFrontmatter = structuredClone(valaxyConfig.siteConfig.frontmatter);
   return VueRouter({
@@ -4629,9 +4653,17 @@ async function createRouterPlugin(valaxyApp) {
   });
 }
 
-async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
+async function ViteValaxyPlugins(valaxyApp, serverOptions = {}, viteConfig = {}) {
   const { options } = valaxyApp;
   const { roots, config: valaxyConfig } = options;
+  const markdownBase = createMarkdownBaseContext(viteConfig.base || valaxyConfig.vite?.base || "/");
+  const MarkdownBasePlugin = {
+    name: "valaxy:markdown-base",
+    enforce: "pre",
+    configResolved(config) {
+      markdownBase.value = config.base;
+    }
+  };
   const timers = {
     markdown: countPerformanceTime(),
     valaxy: countPerformanceTime(),
@@ -4650,7 +4682,7 @@ async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
     LocalSearchPlugin,
     scannedTitles
   ] = await Promise.all([
-    createMarkdownPlugin(options).then((r) => {
+    createMarkdownPlugin(options, markdownBase).then((r) => {
       vLogger.debug(`  \u251C\u2500 createMarkdownPlugin: ${timers.markdown()}`);
       return r;
     }),
@@ -4681,7 +4713,7 @@ async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
       vLogger.debug(`  \u251C\u2500 plugin-vue: ${timers.vue()}`);
       return r;
     }),
-    createRouterPlugin(valaxyApp).then((r) => {
+    createRouterPlugin(valaxyApp, markdownBase).then((r) => {
       vLogger.debug(`  \u251C\u2500 createRouterPlugin: ${timers.router()}`);
       return r;
     }),
@@ -4689,7 +4721,7 @@ async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
       vLogger.debug(`  \u251C\u2500 createUnocssPlugin: ${timers.unocss()}`);
       return r;
     }),
-    localSearchPlugin(options).then((r) => {
+    localSearchPlugin(options, markdownBase).then((r) => {
       vLogger.debug(`  \u251C\u2500 localSearchPlugin: ${timers.localSearch()}`);
       return r;
     }),
@@ -4700,6 +4732,7 @@ async function ViteValaxyPlugins(valaxyApp, serverOptions = {}) {
   ]);
   const componentsDirs = [...roots.map((root) => `${root}/components`), ...["src/components", "components"]];
   const plugins = [
+    MarkdownBasePlugin,
     createCdnPlugin(options),
     createLlmsPlugin(options),
     MarkdownPlugin,
@@ -5000,7 +5033,7 @@ async function ssgBuild(valaxyApp, viteConfig = {}, userSsgOptions = {}) {
   const ssgTemp = resolve$1(outDir, ".vite-ssg-temp");
   const defaultConfig = {
     ...defaultViteConfig,
-    plugins: await ViteValaxyPlugins(valaxyApp),
+    plugins: await ViteValaxyPlugins(valaxyApp, {}, viteConfig),
     // `ssr.noExternal` only affects the server build (step 2) — the client build
     // ignores it. See `getSsgSsrConfig` for why everything is bundled.
     ssr: getSsgSsrConfig(),
@@ -5089,7 +5122,7 @@ async function ssgBuild(valaxyApp, viteConfig = {}, userSsgOptions = {}) {
 async function build$1(valaxyApp, viteConfig = defaultViteConfig) {
   const inlineConfig = mergeConfig(viteConfig, {
     ...defaultViteConfig,
-    plugins: await ViteValaxyPlugins(valaxyApp)
+    plugins: await ViteValaxyPlugins(valaxyApp, {}, viteConfig)
   });
   await build$3(inlineConfig);
 }
@@ -5796,7 +5829,7 @@ async function createServer(valaxyApp, viteConfig = {}, serverOptions = {}) {
   process.env.EDITOR = process.env.EDITOR || "code";
   const { options } = valaxyApp;
   const pluginsTimer = countPerformanceTime();
-  const plugins = await ViteValaxyPlugins(valaxyApp, serverOptions);
+  const plugins = await ViteValaxyPlugins(valaxyApp, serverOptions, viteConfig);
   vLogger.debug(`ViteValaxyPlugins: ${pluginsTimer()}`);
   const enableDevtools = options.config.devtools;
   const vitePlugins = [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valaxy",
   "type": "module",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.4",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -139,8 +139,8 @@
     "vitepress-plugin-group-icons": "^1.7.5",
     "vue-i18n": "^11.4.6",
     "yargs": "^18.0.0",
-    "@valaxyjs/devtools": "1.0.0-rc.2",
-    "@valaxyjs/utils": "1.0.0-rc.2"
+    "@valaxyjs/devtools": "1.0.0-rc.4",
+    "@valaxyjs/utils": "1.0.0-rc.4"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^3.0.2",