valaxy 0.0.9 → 0.1.2

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,13 +43,49 @@ 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)
           },
         },
       },
@@ -62,6 +95,8 @@ export function ViteValaxyPlugins(
     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'
@@ -82,7 +118,7 @@ export function ViteValaxyPlugins(
             path = pagePath
         })
         const md = fs.readFileSync(path, 'utf-8')
-        const { data, excerpt } = matter(md, { excerpt_separator })
+        const { data, excerpt, content } = matter(md, { excerpt_separator })
 
         // warn for post frontmatter
         if (route.path.startsWith('/posts/')) {
@@ -98,7 +134,7 @@ export function ViteValaxyPlugins(
 
         // to refactor
         // get active header by runtime query head, not render
-        mdIt.render(md)
+        mdIt.render(content)
         route.meta.headers = _md.__data?.headers
 
         // set default updated
@@ -124,6 +160,7 @@ export function ViteValaxyPlugins(
 
       // allow auto import and register components used in markdown
       include: [/\.vue$/, /\.vue\?vue/, /\.md$/],
+      exclude: [],
 
       // allow override
       allowOverrides: true,
@@ -177,6 +214,6 @@ export function ViteValaxyPlugins(
 
     // 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

@@ -54,7 +54,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 +66,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 +80,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/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

@@ -18,6 +18,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,31 +20,25 @@ 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: {
         allow: [
-          searchForWorkspaceRoot(options.clientRoot),
+          // not need to search workspace root
+          options.clientRoot,
+          options.themeRoot,
           searchForWorkspaceRoot(options.userRoot),
-          searchForWorkspaceRoot(options.themeRoot),
         ],
       },
     },
-
-  }
-
-  if (mode === 'build') {
-    // https://github.com/antfu/vite-ssg
-    viteConfig.ssgOptions = {
-      script: 'async',
-      formatting: 'minify',
-      onFinished() { generateSitemap() },
-    }
   }
 
   return viteConfig

package/tsup.config.ts

@@ -7,8 +7,9 @@ export default defineConfig((options) => {
       'src/node/cli.ts',
       'src/index.ts',
     ],
-    // splitting: true,
-    splitting: false,
+    // 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.
+    splitting: true,
     clean: true,
     dts: true,
     format: ['cjs', 'esm'],

package/src/client/pages/about/index.md

@@ -1,5 +0,0 @@
----
-title: About Valaxy
----
-
-Check out the [Valaxy | GitHub](https://github.com/YunYouJun/valaxy) for more details.

package/src/client/styles/css-vars/dark.scss

@@ -1,17 +0,0 @@
-@use "../palette" as *;
-@use "../mixins" as *;
-
-::-webkit-input-placeholder {
-  color: white;
-}
-
-html.dark {
-  color-scheme: dark;
-}
-
-.dark {
-  @include set-css-var-from-map($dark);
-
-  // star-markdown-css
-  --smc-link-color: lighten($colors.primary, 30%);
-}

package/src/client/styles/css-vars/light.scss

@@ -1,9 +0,0 @@
-@use "../palette" as *;
-@use "../mixins" as *;
-
-:root {
-  color-scheme: light;
-
-  @include set-css-var-from-map($colors, 'c');
-  @include set-css-var-from-map($light);
-}