valaxy 0.1.1 → 0.2.1

package/src/node/plugins/preset.ts

@@ -1,4 +1,3 @@
-
 import fs from 'fs'
 import type { PluginOption } from 'vite'
 
@@ -17,7 +16,6 @@ import Inspect from 'vite-plugin-inspect'
 
 import chalk from 'chalk'
 import type { ResolvedValaxyOptions, ValaxyServerOptions } from '../options'
-import type { Mode } from '../vite'
 import { setupMarkdownPlugins } from '../markdown'
 import { createMarkdownPlugin, excerpt_separator } from './markdown'
 import { createUnocssPlugin } from './unocss'
@@ -28,12 +26,11 @@ export interface ValaxyPluginOptions {
   components?: Parameters<typeof Components>[0]
 }
 
-export function ViteValaxyPlugins(
+export async function ViteValaxyPlugins(
   options: ResolvedValaxyOptions,
   serverOptions: ValaxyServerOptions = {},
   pluginOptions: ValaxyPluginOptions = {},
-  mode: Mode = 'dev',
-): (PluginOption | PluginOption[])[] | undefined {
+): Promise<(PluginOption | PluginOption[])[] | undefined> {
   const { clientRoot, themeRoot, userRoot } = options
 
   const MarkdownPlugin = createMarkdownPlugin(options)
@@ -46,22 +43,60 @@ export function ViteValaxyPlugins(
 
   const roots = [clientRoot, themeRoot, userRoot]
 
+  const { default: ThemePlugin } = await import(`valaxy-theme-${options.theme}`)
+
+  const customElements = 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',
+
+    // meting
+    'meting-js',
+  ])
+
   return [
     Vue({
       include: [/\.vue$/, /\.md$/],
       template: {
         compilerOptions: {
           isCustomElement: (tag) => {
-            return ['meting-js'].includes(tag)
+            return customElements.has(tag)
           },
         },
       },
-    }) as PluginOption,
+    }),
 
     ValaxyPlugin,
     MarkdownPlugin,
     createConfigPlugin(options),
 
+    ThemePlugin(options.config.themeConfig),
+
     // https://github.com/hannoeru/vite-plugin-pages
     Pages({
       extensions: ['vue', 'md'],
@@ -71,7 +106,8 @@ export function ViteValaxyPlugins(
        */
       extendRoute(route) {
         let path = route.component
-        if (!route.meta) route.meta = {}
+        if (!route.meta)
+          route.meta = {}
 
         if (route.path === '/')
           route.meta.layout = 'home'
@@ -174,10 +210,10 @@ export function ViteValaxyPlugins(
       runtimeOnly: true,
       compositionOnly: true,
       include: roots.map(root => `${root}/locales/**`),
-    }) as PluginOption,
+    }),
 
     // https://github.com/antfu/vite-plugin-inspect
     // Visit http://localhost:3333/__inspect/ to see the inspector
-    mode === 'dev' && Inspect(),
+    options.mode === 'dev' && Inspect(),
   ]
 }

package/src/node/plugins/unocss.ts

@@ -12,7 +12,8 @@ import {
   transformerVariantGroup,
 } from 'unocss'
 import type { ValaxyConfig } from 'valaxy'
-import type { ThemeUserConfig } from 'valaxy-theme-yun/config'
+import type { ThemeUserConfig } from 'valaxy-theme-yun'
+import { generateSafelist } from 'valaxy-theme-yun'
 import type { ResolvedValaxyOptions } from '../options'
 
 export const createSafelist = (config: ValaxyConfig<ThemeUserConfig>) => {
@@ -24,26 +25,22 @@ export const createSafelist = (config: ValaxyConfig<ThemeUserConfig>) => {
     'i-ri-cloud-line',
   ]
 
-  const safelist = 'animate-fade-in prose prose-sm m-auto text-left'.split(' ').concat([
+  let themeSafelist: string[] = []
+  if (typeof generateSafelist === 'function')
+    themeSafelist = generateSafelist(config.themeConfig)
+
+  const safelist = 'animate-fade-in m-auto text-left'.split(' ').concat([
     'rotate-y-180',
-  ]).concat(safeIcons)
+  ]).concat(safeIcons).concat(themeSafelist)
+
   // generate icon safelist
   if (config.social.length)
     config.social.forEach(item => safelist.push(item.icon))
 
-  if (config.themeConfig.footer?.icon?.name)
-    safelist.push(config.themeConfig.footer?.icon?.name)
-
   // sponsor icon
   if (config.sponsor.methods.length)
     config.sponsor.methods.forEach(item => safelist.push(item.icon))
 
-  const types = config.themeConfig.types
-  if (types) {
-    for (const type in types)
-      safelist.push(types[type].icon)
-  }
-
   return safelist
 }
 
@@ -54,7 +51,7 @@ export const createUnocssConfig = (options: ResolvedValaxyOptions) => {
       ['yun-card', 'transition yun-transition shadow hover:shadow-lg'],
       ['btn', 'px-4 py-1 rounded inline-block bg-sky-600 text-white cursor-pointer hover:bg-sky-700 disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50'],
       ['icon-btn', 'inline-block cursor-pointer select-none opacity-75 transition duration-200 ease-in-out hover:opacity-100 hover:text-sky-600'],
-      ['val-card', 'transition shadow hover:shadow-lg'],
+      ['va-card', 'transition shadow hover:shadow-lg'],
     ],
     presets: [
       presetUno(),
@@ -66,7 +63,12 @@ export const createUnocssConfig = (options: ResolvedValaxyOptions) => {
       presetTypography(),
       presetWebFonts({
         fonts: {
-          serif: 'Noto Serif SC',
+          serif: [
+            {
+              name: 'Noto Serif SC',
+              weights: [900],
+            },
+          ],
           // sans: 'DM Sans',
           // mono: 'DM Mono',
         },
@@ -75,19 +77,19 @@ export const createUnocssConfig = (options: ResolvedValaxyOptions) => {
     rules: [
       // more see '~/styles/global/helper.scss'
       ['yun-transition', {
-        'transition-duration': 'var(--yun-transition-duration)',
+        'transition-duration': 'var(--va-transition-duration)',
       }],
       ['yun-text-light', {
-        color: 'var(--yun-c-text-light)',
+        color: 'var(--va-c-text-light)',
       }],
       ['font-serif', {
-        'font-family': 'var(--yun-font-serif)',
+        'font-family': 'var(--va-font-serif)',
       }],
       ['font-sans', {
-        'font-family': 'var(--yun-font-sans)',
+        'font-family': 'var(--va-font-sans)',
       }],
       ['font-mono', {
-        'font-family': 'var(--yun-font-mono)',
+        'font-family': 'var(--va-font-mono)',
       }],
     ],
     transformers: [

package/src/node/rss.ts

@@ -0,0 +1,127 @@
+import { dirname } from 'path'
+import chalk from 'chalk'
+
+import fg from 'fast-glob'
+import fs from 'fs-extra'
+import matter from 'gray-matter'
+import MarkdownIt from 'markdown-it'
+import type { Author, FeedOptions, Item } from 'feed'
+import { Feed } from 'feed'
+import consola from 'consola'
+import type { ResolvedValaxyOptions } from './options'
+
+const markdown = MarkdownIt({
+  html: true,
+  breaks: true,
+  linkify: true,
+})
+
+/**
+ * generate rss
+ * @param options
+ * @returns
+ */
+export async function build(options: ResolvedValaxyOptions) {
+  const { config } = options
+
+  if (!config.url) {
+    consola.error('You must set "config.url" to generate rss.')
+    return
+  }
+
+  const siteUrl = config.url.endsWith('/') ? config.url : `${config.url}/`
+  const DOMAIN = config.url.endsWith('/') ? config.url.slice(0, -1) : config.url
+  const author: Author = {
+    name: options.config.author.name,
+    email: options.config.author.email,
+    link: options.config.author.link,
+  }
+
+  consola.info(`RSS Site Url: ${chalk.cyan(siteUrl)}`)
+
+  const ccVersion = (config.license.type === 'zero') ? '1.0' : '4.0'
+  const feedOptions: FeedOptions = {
+    title: config.title,
+    description: config.description,
+    id: siteUrl || 'valaxy',
+    link: siteUrl,
+    copyright: `CC ${config.license.type.toUpperCase()} ${ccVersion} ${new Date().getFullYear()} © ${config.author.name}`,
+    feedLinks: {
+      json: `${siteUrl}feed.json`,
+      atom: `${siteUrl}feed.atom`,
+      rss: `${siteUrl}feed.xml`,
+    },
+  }
+
+  // generate
+  const files = await fg(`${options.userRoot}/pages/posts/**/*.md`)
+
+  const posts: Item[] = []
+  files
+    .forEach((i) => {
+      const raw = fs.readFileSync(i, 'utf-8')
+      const { data, content, excerpt } = matter(raw)
+
+      // not add to posts
+      if (!data.date) {
+        consola.warn(`Do you forget to write date for ${chalk.dim(i)}`)
+        return false
+      }
+
+      if (data.draft) {
+        consola.warn(`Ignore draft post: ${chalk.dim(i)}`)
+        return false
+      }
+
+      // todo i18n
+
+      // render excerpt
+      const html = markdown.render(excerpt || content)
+        .replace('src="/', `src="${DOMAIN}/`)
+
+      if (data.image?.startsWith('/'))
+        data.image = DOMAIN + data.image
+
+      posts.push({
+        title: '',
+        ...data,
+        id: (data.id || '').toString(),
+        date: new Date(data.date),
+        published: new Date(data.updated || data.date),
+        content: html,
+        author: [author],
+        link: DOMAIN + i.replace(`${options.userRoot}/pages`, '').replace(/\.md$/, ''),
+      })
+    })
+
+  // sort by updated
+  posts.sort((a, b) => +new Date(b.published || b.date) - +new Date(a.published || a.date))
+  // await writeFeed('feed', feedOptions, posts)
+
+  // write
+  feedOptions.author = author
+  feedOptions.image = config.author.avatar.startsWith('http') ? config.author.avatar : `${DOMAIN}${config.author.avatar}`
+  feedOptions.favicon = `${DOMAIN}/${config.feed.favicon}`
+
+  const feed = new Feed(feedOptions)
+  posts.forEach(item => feed.addItem(item))
+  // items.forEach(i=> console.log(i.title, i.date))
+
+  await fs.ensureDir(dirname(`./dist/${config.feed.name}`))
+  const path = './dist'
+
+  const types = ['xml', 'atom', 'json']
+  types.forEach((type) => {
+    let data = ''
+    let name = `${path}/${config.feed.name || 'feed'}.${type}`
+    if (type === 'xml') { data = feed.rss2() }
+    else if (type === 'atom') {
+      if (!config.feed.name)
+        name = `${path}/atom.xml`
+      data = feed.atom1()
+    }
+    else if (type === 'json') { data = feed.json1() }
+    fs.writeFileSync(name, data, 'utf-8')
+    consola.info(`${type}: ${name}`)
+  })
+}

package/src/node/server.ts

@@ -14,7 +14,7 @@ export async function createServer(
 
   const server = await createViteServer(mergeConfig(
     viteConfig,
-    createViteConfig(options, serverOptions),
+    await createViteConfig(options, serverOptions),
   ))
 
   return server

package/src/node/shims.d.ts

@@ -1,3 +1,13 @@
+declare module 'escape-html' {
+  const def: (str: string) => string
+  export default def
+}
+
+declare module 'prismjs' {
+  const def: any
+  export default def
+}
+
 declare module 'markdown-it-attrs' {
   const def: any
   export default def
@@ -18,6 +28,11 @@ declare module 'markdown-it-container' {
   export default def
 }
 
+declare module 'markdown-it-task-lists' {
+  const def: any
+  export default def
+}
+
 declare module 'diacritics' {
   export const remove: (str: string) => string
 }

package/src/node/utils/cli.ts

@@ -1,4 +1,3 @@
-
 import * as readline from 'readline'
 import path from 'path'
 import os from 'os'

package/src/node/vite.ts

@@ -1,4 +1,3 @@
-import generateSitemap from 'vite-ssg-sitemap'
 import type { InlineConfig } from 'vite'
 import { searchForWorkspaceRoot } from 'vite'
 import type { ResolvedValaxyOptions, ValaxyServerOptions } from './options'
@@ -7,7 +6,7 @@ import { ViteValaxyPlugins } from './plugins/preset'
 
 export type Mode = 'dev' | 'build'
 
-export function createViteConfig(options: ResolvedValaxyOptions, serverOptions: ValaxyServerOptions = {}, mode: Mode = 'dev'): InlineConfig {
+export async function createViteConfig(options: ResolvedValaxyOptions, serverOptions: ValaxyServerOptions = {}): Promise<InlineConfig> {
   const viteConfig: InlineConfig = {
     // remove vue-i18n warnings
     // https://vue-i18n.intlify.dev/guide/advanced/optimization.html#reduce-bundle-size-with-feature-build-flags
@@ -21,11 +20,14 @@ export function createViteConfig(options: ResolvedValaxyOptions, serverOptions:
     //   __VUE_I18N_LEGACY_API__: 'false',
     // },
 
+    // always string
+    define: {
+      __DEV__: options.mode === 'dev' ? 'true' : 'false',
+    },
+
     root: options.clientRoot,
-    // todo user base
-    // base: '/',
 
-    plugins: ViteValaxyPlugins(options, serverOptions, {}, mode),
+    plugins: await ViteValaxyPlugins(options, serverOptions, {}),
 
     server: {
       fs: {
@@ -37,16 +39,6 @@ export function createViteConfig(options: ResolvedValaxyOptions, serverOptions:
         ],
       },
     },
-
-  }
-
-  if (mode === 'build') {
-    // https://github.com/antfu/vite-ssg
-    viteConfig.ssgOptions = {
-      script: 'async',
-      formatting: 'minify',
-      onFinished() { generateSitemap() },
-    }
   }
 
   return viteConfig

package/src/types/config.ts

@@ -27,8 +27,8 @@ export interface ValaxyConfig<T = ValaxyThemeConfig> {
    */
   lang: string
   /**
-   * You site url in web, required for ssg, do not add / in end
-   * @description 站点的 URL，SSG 需要（譬如生成版权处文章永久链接），不要在末尾添加 /
+   * You site url in web, required for ssg & rss
+   * @description 站点的 URL，SSG & RSS 需要（譬如生成版权处文章永久链接）
    */
   url: string
   /**
@@ -54,6 +54,8 @@ export interface ValaxyConfig<T = ValaxyThemeConfig> {
      * @description 你的名字
      */
     name: string
+    email: string
+    link: string
     avatar: string
     /**
      * The status of you
@@ -69,6 +71,15 @@ export interface ValaxyConfig<T = ValaxyThemeConfig> {
     }
   }
 
+  feed: {
+    /**
+     * name: feed -> feed.xml / feed.atom / feed.json
+     * @default '' -> feed.xml / atom.xml / feed.json
+     */
+    name: string
+    favicon: string
+  }
+
   /**
    * 社交链接
    */
@@ -95,6 +106,10 @@ export interface ValaxyConfig<T = ValaxyThemeConfig> {
       enable: boolean
       serverURL: string
     }
+    twikoo: {
+      enable: boolean
+      envId: string
+    }
   }
 
   /**
@@ -175,12 +190,18 @@ export const defaultValaxyConfig: ValaxyConfig = {
   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.',
     },
   },
+  feed: {
+    name: '',
+    favicon: 'favicon.png',
+  },
   social: [],
   description: 'A blog generated by Valaxy.',
 
@@ -231,6 +252,10 @@ export const defaultValaxyConfig: ValaxyConfig = {
       enable: false,
       serverURL: '',
     },
+    twikoo: {
+      enable: false,
+      envId: 'https://twikoo.vercel.app',
+    },
   },
 
   theme: 'yun',
@@ -243,6 +268,7 @@ export const defaultValaxyConfig: ValaxyConfig = {
   },
   markdownIt: {
     toc: {
+      includeLevel: [1, 2, 3, 4],
       listType: 'ol',
     },
     katex: {},

package/src/types/posts.ts

@@ -1,4 +1,4 @@
-export interface Post {
+export interface Post extends Record<string, any> {
   /**
    * Path of post
    * route.path
@@ -104,4 +104,9 @@ export interface Post {
    * @description 是否显示目录
    */
   toc?: boolean
+  /**
+   * is draft
+   * @description 是否为草稿
+   */
+  draft?: boolean
 }

package/tsup.config.ts

@@ -5,6 +5,7 @@ export default defineConfig((options) => {
     entry: [
       'src/node/index.ts',
       'src/node/cli.ts',
+      'src/index.ts',
     ],
     // https://tsup.egoist.sh/#code-splitting
     // Code splitting currently only works with the esm output format, and it's enabled by default. If you want code splitting for cjs output format as well, try using --splitting flag which is an experimental feature to get rid of the limitation in esbuild.

package/dist/build-VGAF4K5S.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _chunkWYCH73X6js = require('./chunk-WYCH73X6.js');_chunkWYCH73X6js.d.call(void 0, );var _vite = require('vite');async function a(n,e={}){let t=_vite.mergeConfig.call(void 0, e,_chunkWYCH73X6js.j.call(void 0, n));await _vite.build.call(void 0, t)}exports.build = a;

package/dist/build-Y5F7AZ2V.mjs

@@ -1 +0,0 @@
-import{d as i,j as o}from"./chunk-ESCOXVP6.mjs";i();import{mergeConfig as r,build as f}from"vite";async function a(n,e={}){let t=r(e,o(n));await f(t)}export{a as build};

package/dist/chunk-5KQ3UFYI.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _chunkWYCH73X6js = require('./chunk-WYCH73X6.js');_chunkWYCH73X6js.d.call(void 0, );var _vite = require('vite');async function c(o,t={},i={}){return process.env.EDITOR=process.env.EDITOR||"code",await _vite.createServer.call(void 0, _vite.mergeConfig.call(void 0, t,_chunkWYCH73X6js.j.call(void 0, o,i)))}exports.a = c;