valaxy 0.3.10 → 0.5.0

package/dist/node/index.d.ts

@@ -1,12 +1,12 @@
 import * as vite from 'vite';
 import { InlineConfig } from 'vite';
-import { V as ValaxyConfig } from '../config-de04677b.js';
+import { V as ValaxyConfig } from '../config-7bd43d41.js';
 import 'type-fest';
 import 'unocss/vite';
+import 'vite-plugin-md';
 import 'markdown-it';
 import 'markdown-it-anchor';
 import 'katex';
-import 'vite-plugin-md';
 
 interface ResolvedValaxyOptions {
     mode: 'dev' | 'build';

package/dist/node/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _chunkPICIUZMLjs = require('../chunk-PICIUZML.js');require('../chunk-ZP4HS4GX.js');exports.createServer = _chunkPICIUZMLjs.g;
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _chunkXQIGHIAXjs = require('../chunk-XQIGHIAX.js');require('../chunk-U5OMNIOK.js');exports.createServer = _chunkXQIGHIAXjs.g;

package/dist/node/index.mjs

@@ -1 +1 @@
-import{g as o}from"../chunk-S2VGPR56.mjs";import"../chunk-6QPICP7C.mjs";export{o as createServer};
+import{g as o}from"../chunk-RSQONJW3.mjs";import"../chunk-EAN2KU6W.mjs";export{o as createServer};

package/dist/posts-32f55e33.d.ts

@@ -0,0 +1,117 @@
+interface Post extends Record<string, any> {
+    /**
+     * Path of post
+     * route.path
+     * @description 路径
+     */
+    path?: string;
+    /**
+     * Title
+     * @description 文章标题
+     */
+    title?: string;
+    date?: string | number | Date;
+    /**
+     * Updated Time
+     */
+    updated?: string | number | Date;
+    lang?: string;
+    /**
+     * TODO
+     * Read Time
+     * @description 阅读时长
+     */
+    duration?: string;
+    /**
+     * post card type, can be bilibili/yuque/...
+     */
+    type?: string;
+    /**
+     * override url, and jump directly
+     */
+    url?: string;
+    /**
+     * @description 摘要
+     */
+    excerpt?: string;
+    /**
+     * Display sponsor info
+     * @description 是否开启赞助
+     */
+    sponsor?: boolean;
+    /**
+     * Copyright
+     * @description 是否显示文章底部版权信息
+     */
+    copyright?: boolean;
+    /**
+     * Category
+     * @description 分类，若为数组，则按顺序代表多层文件夹
+     */
+    categories?: string | string[];
+    /**
+     * Tags
+     * @description 标签，可以有多个
+     */
+    tags?: string[];
+    /**
+     * display prev next
+     * @description 是否显示前一篇、后一篇导航
+     */
+    nav?: boolean;
+    /**
+     * icon before title
+     */
+    icon?: string;
+    /**
+     * title color
+     */
+    color?: string;
+    /**
+     * display comment
+     */
+    comment?: boolean;
+    /**
+     * post is end
+     * @description 是否完结，将在末尾添加衬线字体 Q.E.D.
+     */
+    end?: boolean;
+    /**
+     * use aplayer
+     */
+    aplayer?: boolean;
+    /**
+     * use katex
+     */
+    katex?: boolean;
+    /**
+     * use codepen
+     */
+    codepen?: boolean;
+    /**
+     * 置顶
+     */
+    top?: number;
+    /**
+     * display toc
+     * @description 是否显示目录
+     */
+    toc?: boolean;
+    /**
+     * is draft
+     * @description 是否为草稿
+     */
+    draft?: boolean;
+    /**
+     * cover
+     * @description 封面图片
+     */
+    cover?: string;
+    /**
+     * enable markdown-body class
+     * @description 是否启用默认的 markdown 样式
+     */
+    markdown: boolean;
+}
+
+export { Post as P };

package/dist/types/index.d.ts

@@ -0,0 +1,8 @@
+export { A as AlgoliaSearchOptions, S as SocialLink, U as UserConfig, V as ValaxyConfig, a as ValaxyThemeConfig, b as ViteMdOptions } from '../config-7bd43d41.js';
+export { P as Post } from '../posts-32f55e33.js';
+import 'type-fest';
+import 'unocss/vite';
+import 'vite-plugin-md';
+import 'markdown-it';
+import 'markdown-it-anchor';
+import 'katex';

package/dist/types/index.js

@@ -0,0 +1 @@
+"use strict";

package/index.d.ts

@@ -0,0 +1,3 @@
+// export * from './dist/client'
+export * from './dist/node'
+export * from './dist/types'

package/{src/node → node}/cli.ts

@@ -9,7 +9,8 @@ import openBrowser from 'open'
 import consola from 'consola'
 
 import { yellow } from 'kolorist'
-import { version } from '../../package.json'
+import { version } from '../package.json'
+import { findFreePort } from './utils/net'
 import { resolveOptions } from './options'
 import { bindShortcut, initServer, printInfo } from './utils/cli'
 
@@ -59,7 +60,7 @@ cli.command(
     if (!fs.existsSync(path.resolve(root, 'pages')))
       process.exit(0)
 
-    const port = userPort || 4859
+    const port = await findFreePort(userPort || 4859)
     const options = await resolveOptions({ userRoot: root })
 
     const viteConfig: InlineConfig = {

package/node/config.ts

@@ -0,0 +1,170 @@
+// import { loadConfig } from 'c12'
+import fs from 'fs'
+import { loadConfig } from 'unconfig'
+import defu from 'defu'
+import type { YunTheme } from 'valaxy-theme-yun'
+import type { UserConfig, ValaxyConfig } from '../types'
+import type { ValaxyEntryOptions } from './options'
+
+const defaultValaxyConfig: ValaxyConfig = {
+  url: '',
+  lang: 'en',
+  title: 'Valaxy Blog',
+  description: 'A blog generated by Valaxy.',
+  subtitle: 'Next Generation Static Blog Framework.',
+  author: {
+    avatar: 'https://cdn.jsdelivr.net/gh/YunYouJun/yun/images/meme/yun-good-with-bg.jpg',
+    email: 'me@yunyoujun.cn',
+    link: 'https://www.yunyoujun.cn',
+    name: 'YunYouJun',
+    status: {
+      emoji: '😊',
+      message: 'All at sea.',
+    },
+  },
+  favicon: 'favicon.svg',
+  feed: {
+    name: '',
+    favicon: 'favicon.svg',
+  },
+  social: [],
+
+  license: {
+    enabled: true,
+    language: '',
+    type: 'by-nc-sa',
+  },
+
+  sponsor: {
+    enable: true,
+    title: '我很可爱，请给我钱',
+    methods: [
+      {
+        name: '支付宝',
+        url: 'https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/donate/alipay-qrcode.jpg',
+        color: '#00A3EE',
+        icon: 'i-ri-alipay-line',
+      },
+      {
+        name: 'QQ 支付',
+        url: 'https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/donate/qqpay-qrcode.png',
+        color: '#12B7F5',
+        icon: 'i-ri-qq-line',
+      },
+      {
+        name: '微信支付',
+        url: 'https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/donate/wechatpay-qrcode.jpg',
+        color: '#2DC100',
+        icon: 'i-ri-wechat-pay-line',
+      },
+
+    ],
+  },
+
+  search: {
+    enable: true,
+    algolia: {
+      enable: false,
+      appId: '',
+      apiKey: '',
+      indexName: '',
+    },
+  },
+
+  comment: {
+    waline: {
+      enable: false,
+      serverURL: '',
+    },
+    twikoo: {
+      enable: false,
+      envId: 'https://twikoo.vercel.app',
+    },
+  },
+
+  features: {
+    katex: true,
+  },
+
+  theme: 'yun',
+  themeConfig: {
+    pkg: {
+      name: '',
+      version: '',
+    },
+  },
+
+  unocss: {},
+
+  markdown: {
+    excerpt: '<!-- more -->',
+  },
+  markdownIt: {
+    toc: {
+      includeLevel: [1, 2, 3, 4],
+      listType: 'ol',
+    },
+    katex: {},
+  },
+}
+
+// for user config
+export async function resolveConfig(options: ValaxyEntryOptions = {}) {
+  // c12 merge array twice, so i deprecated it
+  // const { config, configFile } = await loadConfig<ValaxyConfig>({
+  //   name: 'valaxy',
+  //   defaults: defaultValaxyConfig,
+  // })
+
+  const { config: userConfig, sources } = await loadConfig<ValaxyConfig>({
+    sources: [
+      {
+        files: 'valaxy.config',
+        extensions: ['ts', 'js', 'mjs', 'cjs', 'json'],
+      },
+    ],
+    merge: false,
+  })
+  const configFile = sources[0]
+  const config = defu(userConfig, defaultValaxyConfig)
+
+  const theme = options.theme || config.theme || 'yun'
+
+  try {
+    const { defaultThemeConfig } = await import(`valaxy-theme-${theme}`)
+    config.themeConfig = defu(config.themeConfig, defaultThemeConfig)
+  }
+  catch (e) {
+    console.error(`valaxy-theme-${theme} doesn't have default config`)
+  }
+
+  try {
+    const pkg = fs.readFileSync(require.resolve(`valaxy-theme-${theme}/package.json`), 'utf-8')
+    config.themeConfig.pkg = JSON.parse(pkg)
+  }
+  catch (e) {
+    console.error(`valaxy-theme-${theme} doesn't have package.json`)
+  }
+
+  return {
+    config,
+    configFile,
+    theme,
+  }
+}
+
+/**
+ * Type config helper
+ */
+export function defineConfig(config: UserConfig<YunTheme.Config>) {
+  return config
+}
+
+/**
+ * Type config helper for custom theme config
+ */
+export function defineConfigWithTheme<ThemeConfig>(
+  config: UserConfig<ThemeConfig>,
+) {
+  return config
+}

package/{src/node → node}/options.ts

@@ -66,12 +66,12 @@ export function getThemeRoot(name: string, entry: string) {
   if (isPath(name))
     return resolve(dirname(entry), name)
   else
-    return resolveImportPath(`valaxy-theme-${name}/package.json`)
+    return dirname(resolveImportPath(`valaxy-theme-${name}/package.json`) || '')
 }
 
 // for cli options
 export async function resolveOptions(options: ValaxyEntryOptions, mode: ResolvedValaxyOptions['mode'] = 'dev') {
-  const clientRoot = resolve(resolveImportPath('valaxy/package.json'), 'src/client')
+  const clientRoot = resolve(dirname(resolveImportPath('valaxy/package.json', true)), 'client')
   const userRoot = resolve(options.userRoot || process.cwd())
 
   const { config: valaxyConfig, configFile, theme } = await resolveConfig(options)

package/{src/node → node}/plugins/extendConfig.ts

@@ -13,10 +13,11 @@ export function createConfigPlugin(options: ResolvedValaxyOptions): Plugin {
           alias: {
             '@/': `${toAtFS(options.userRoot)}/`,
             '~/': `${toAtFS(options.clientRoot)}/`,
+            'valaxy/client': `${toAtFS(options.clientRoot)}/`,
             '@valaxyjs/client': `${toAtFS(options.clientRoot)}/`,
             '@valaxyjs/config': '/@valaxyjs/config',
             'valaxy/package.json': toAtFS(resolve(options.clientRoot, '../../package.json')),
-            'valaxy/': `${toAtFS(resolve(options.clientRoot, '../..'))}/`,
+            'valaxy/': `${toAtFS(resolve(options.clientRoot, '..'))}/`,
             'valaxy': toAtFS(resolve(options.clientRoot, '../index.ts')),
             [`valaxy-theme-${options.theme}/`]: `${toAtFS(resolve(options.themeRoot))}/`,
             [`valaxy-theme-${options.theme}`]: `${toAtFS(resolve(options.themeRoot))}`,
@@ -35,6 +36,7 @@ export function createConfigPlugin(options: ResolvedValaxyOptions): Plugin {
             'dayjs',
             'nprogress',
           ],
+
         },
       }
       return mergeConfig(config, injection)

package/{src/node → node}/plugins/index.ts

@@ -5,7 +5,7 @@ import type { Plugin } from 'vite'
 // import consola from 'consola'
 import { resolveConfig } from '../config'
 import type { ResolvedValaxyOptions, ValaxyServerOptions } from '../options'
-import { toAtFS } from '../utils'
+import { resolveImportPath, toAtFS } from '../utils'
 import { VALAXY_CONFIG_ID } from './valaxy'
 
 /**
@@ -13,9 +13,15 @@ import { VALAXY_CONFIG_ID } from './valaxy'
  * @param roots
  * @returns
  */
-function generateStyles(roots: string[]) {
+function generateStyles(roots: string[], options: ResolvedValaxyOptions) {
   const imports: string[] = []
 
+  // katex
+  if (options.config.features.katex) {
+    imports.push(`import "${toAtFS(resolveImportPath('katex/dist/katex.min.css', true))}"`)
+    imports.push(`import "${join(options.clientRoot, 'styles/third/katex.scss')}"`)
+  }
+
   for (const root of roots) {
     const styles: string[] = []
 
@@ -30,6 +36,7 @@ function generateStyles(roots: string[]) {
         imports.push(`import "${toAtFS(style)}"`)
     }
   }
+
   return imports.join('\n')
 }
 
@@ -85,7 +92,7 @@ export function createValaxyPlugin(options: ResolvedValaxyOptions, serverOptions
 
       // generate styles
       if (id === '/@valaxyjs/styles')
-        return generateStyles(roots)
+        return generateStyles(roots, options)
 
       if (id === '/@valaxyjs/locales')
         return generateLocales(roots)

package/{src/node → node}/plugins/markdown.ts

@@ -6,8 +6,6 @@ import type { ResolvedValaxyOptions } from '../options'
 import { setupMarkdownPlugins } from '../markdown'
 import { checkMd } from '../markdown/check'
 
-export type ViteMdOptions = Parameters<typeof Markdown>[0]
-
 export const excerpt_separator = '<!-- more -->'
 
 // https://github.com/antfu/vite-plugin-md
@@ -15,7 +13,7 @@ export const excerpt_separator = '<!-- more -->'
 export function createMarkdownPlugin(options: ResolvedValaxyOptions): Plugin[] {
   const mdOptions = options.config.markdownIt
 
-  const defaultOptions: ViteMdOptions = {
+  return [Markdown({
     wrapperComponent: 'ValaxyMd',
     wrapperClasses: '',
 
@@ -39,9 +37,8 @@ export function createMarkdownPlugin(options: ResolvedValaxyOptions): Plugin[] {
         return code
       },
     },
-  }
-
-  return [Markdown(Object.assign(defaultOptions, options.config.markdown)), {
+    ...options.config.markdown,
+  }), {
     name: 'valaxy:md',
     handleHotUpdate(ctx) {
       const { file, server } = ctx

package/{src/node → node}/plugins/preset.ts

@@ -10,7 +10,6 @@ import Vue from '@vitejs/plugin-vue'
 import Pages from 'vite-plugin-pages'
 import Layouts from 'vite-plugin-vue-layouts'
 import Components from 'unplugin-vue-components/vite'
-import { VitePWA } from 'vite-plugin-pwa'
 import VueI18n from '@intlify/vite-plugin-vue-i18n'
 import Inspect from 'vite-plugin-inspect'
 
@@ -173,35 +172,6 @@ export async function ViteValaxyPlugins(
 
     ...MarkdownPlugin,
 
-    // https://github.com/antfu/vite-plugin-pwa
-    VitePWA({
-      registerType: 'autoUpdate',
-      includeAssets: ['favicon.svg', 'safari-pinned-tab.svg'],
-      manifest: {
-        name: 'Theme Yun',
-        short_name: 'Yun',
-        theme_color: '#ffffff',
-        icons: [
-          {
-            src: '/pwa-192x192.png',
-            sizes: '192x192',
-            type: 'image/png',
-          },
-          {
-            src: '/pwa-512x512.png',
-            sizes: '512x512',
-            type: 'image/png',
-          },
-          {
-            src: '/pwa-512x512.png',
-            sizes: '512x512',
-            type: 'image/png',
-            purpose: 'any maskable',
-          },
-        ],
-      },
-    }),
-
     // https://github.com/intlify/bundle-tools/tree/main/packages/vite-plugin-vue-i18n
     VueI18n({
       runtimeOnly: true,

package/{src/node → node}/server.ts

@@ -12,10 +12,12 @@ export async function createServer(
   // default editor vscode
   process.env.EDITOR = process.env.EDITOR || 'code'
 
-  const server = await createViteServer(mergeConfig(
-    viteConfig,
-    await createViteConfig(options, serverOptions),
-  ))
+  const server = await createViteServer(
+    mergeConfig(
+      viteConfig,
+      await createViteConfig(options, serverOptions),
+    ),
+  )
 
   return server
 }

package/{src/node → node}/utils/cli.ts

@@ -7,7 +7,7 @@ import consola from 'consola'
 import type { InlineConfig, ViteDevServer } from 'vite'
 import { createServer } from '../server'
 import type { ResolvedValaxyOptions } from '../options'
-import { version } from '../../../package.json'
+import { version } from '../../package.json'
 import { createSafelist } from '../plugins/unocss'
 
 let server: ViteDevServer | undefined

package/node/utils/index.ts

@@ -0,0 +1,48 @@
+import { join } from 'path'
+import isInstalledGlobally from 'is-installed-globally'
+import globalDirs from 'global-dirs'
+import { sync as resolve } from 'resolve'
+import consola from 'consola'
+
+export function slash(str: string) {
+  return str.replace(/\\/g, '/')
+}
+
+export function ensurePrefix(prefix: string, str: string) {
+  if (!str.startsWith(prefix))
+    return prefix + str
+  return str
+}
+
+export function toAtFS(path: string) {
+  return `/@fs${ensurePrefix('/', slash(path))}`
+}
+
+export function resolveImportPath(importName: string, ensure: true): string
+export function resolveImportPath(importName: string, ensure?: boolean): string | undefined
+export function resolveImportPath(importName: string, ensure = false) {
+  try {
+    return resolve(importName, {
+      preserveSymlinks: false,
+    })
+  }
+  catch {}
+
+  if (isInstalledGlobally) {
+    try {
+      return require.resolve(join(globalDirs.yarn.packages, importName))
+    }
+    catch {}
+
+    try {
+      return require.resolve(join(globalDirs.npm.packages, importName))
+    }
+    catch {}
+  }
+
+  if (ensure)
+    throw new Error(`Failed to resolve package ${importName}`)
+
+  consola.error(`Failed to resolve package ${importName}`)
+  return undefined
+}

package/node/utils/net.ts

@@ -0,0 +1,20 @@
+import net from 'net'
+
+export async function findFreePort(start: number): Promise<number> {
+  if (await isPortFree(start))
+    return start
+  return await findFreePort(start + 1)
+}
+
+function isPortFree(port: number): Promise<boolean> {
+  return new Promise((resolve) => {
+    const server = net.createServer()
+      .listen(port, () => {
+        server.close()
+        resolve(true)
+      })
+      .on('error', () => {
+        resolve(false)
+      })
+  })
+}

package/{src/node → node}/vite.ts

@@ -1,9 +1,10 @@
-import { join } from 'path'
+import { dirname, join } from 'path'
 import type { InlineConfig } from 'vite'
 import { splitVendorChunkPlugin } from 'vite'
 import type { ResolvedValaxyOptions, ValaxyServerOptions } from './options'
 
 import { ViteValaxyPlugins } from './plugins/preset'
+import { resolveImportPath } from './utils'
 
 export type Mode = 'dev' | 'build'
 
@@ -24,6 +25,8 @@ export async function createViteConfig(options: ResolvedValaxyOptions, serverOpt
     // always string
     define: {
       __DEV__: options.mode === 'dev' ? 'true' : 'false',
+
+      __ALGOLIA__: !!options.config.search.algolia.enable,
     },
 
     root: options.clientRoot,
@@ -39,6 +42,7 @@ export async function createViteConfig(options: ResolvedValaxyOptions, serverOpt
           options.clientRoot,
           options.themeRoot,
           options.userRoot,
+          dirname(resolveImportPath('katex/package.json', true)),
         ],
       },
     },