valaxy 0.1.1 → 0.1.2

package/src/node/options.ts

@@ -16,6 +16,7 @@ export interface ValaxyEntryOptions {
 }
 
 export interface ResolvedValaxyOptions {
+  mode: 'dev' | 'build'
   /**
    * Client root path
    * @default 'valaxy/src/client'
@@ -69,7 +70,7 @@ export function getThemeRoot(name: string, entry: string) {
 }
 
 // for cli options
-export async function resolveOptions(options: ValaxyEntryOptions) {
+export async function resolveOptions(options: ValaxyEntryOptions, mode: ResolvedValaxyOptions['mode'] = 'dev') {
   const clientRoot = resolve(resolveImportPath('valaxy/package.json'), 'src/client')
   const userRoot = resolve(options.userRoot || process.cwd())
 
@@ -77,6 +78,7 @@ export async function resolveOptions(options: ValaxyEntryOptions) {
   const themeRoot = getThemeRoot(theme, userRoot)
 
   const valaxyOptions: ResolvedValaxyOptions = {
+    mode,
     clientRoot,
     userRoot,
     themeRoot,

package/src/node/plugins/index.ts

@@ -8,33 +8,58 @@ import type { ResolvedValaxyOptions, ValaxyServerOptions } from '../options'
 import { toAtFS } from '../utils'
 import { VALAXY_CONFIG_ID } from './valaxy'
 
-export function createValaxyPlugin(options: ResolvedValaxyOptions, serverOptions: ValaxyServerOptions = {}): Plugin {
-  const valaxyPrefix = '/@valaxy'
-
-  let valaxyConfig = options.config
+/**
+ * for /@valaxyjs/styles
+ * @param roots
+ * @returns
+ */
+function generateStyles(roots: string[]) {
+  const imports: string[] = []
+
+  for (const root of roots) {
+    const styles: string[] = []
+
+    const autoloadNames = ['index', 'css-vars']
+    autoloadNames.forEach((name) => {
+      styles.push(join(root, 'styles', `${name}.css`))
+      styles.push(join(root, 'styles', `${name}.scss`))
+    })
+
+    for (const style of styles) {
+      if (fs.existsSync(style))
+        imports.push(`import "${toAtFS(style)}"`)
+    }
+  }
+  return imports.join('\n')
+}
 
-  const roots = [options.userRoot, options.themeRoot]
+function generateLocales(roots: string[]) {
+  const imports: string[] = [
+    'const messages = { "zh-CN": {}, en: {} }',
+  ]
+  const languages = ['zh-CN', 'en']
+
+  roots.forEach((root, i) => {
+    languages.forEach((lang) => {
+      const langYml = `${root}/locales/${lang}.yml`
+      if (fs.existsSync(langYml)) {
+        const varName = lang.replace('-', '') + i
+        imports.push(`import ${varName} from "${langYml}"`)
+        imports.push(`Object.assign(messages['${lang}'], ${varName})`)
+      }
+    })
+  })
 
-  function generateUserStyles() {
-    const imports: string[] = []
+  imports.push('export default messages')
+  return imports.join('\n')
+}
 
-    for (const root of roots) {
-      const styles = [
-        join(root, 'styles', 'vars.scss'),
-        join(root, 'styles', 'index.css'),
-        join(root, 'styles', 'index.scss'),
-      ]
+export function createValaxyPlugin(options: ResolvedValaxyOptions, serverOptions: ValaxyServerOptions = {}): Plugin {
+  const valaxyPrefix = '/@valaxy'
 
-      for (const style of styles) {
-        if (fs.existsSync(style)) {
-          imports.push(`import "${toAtFS(style)}"`)
-          continue
-        }
-      }
-    }
+  let valaxyConfig = options.config
 
-    return imports.join('\n')
-  }
+  const roots = [options.clientRoot, options.themeRoot, options.userRoot]
 
   return {
     name: 'Valaxy',
@@ -60,7 +85,10 @@ export function createValaxyPlugin(options: ResolvedValaxyOptions, serverOptions
 
       // generate styles
       if (id === '/@valaxyjs/styles')
-        return generateUserStyles()
+        return generateStyles(roots)
+
+      if (id === '/@valaxyjs/locales')
+        return generateLocales(roots)
 
       if (id.startsWith(valaxyPrefix))
         return ''
@@ -69,7 +97,8 @@ export function createValaxyPlugin(options: ResolvedValaxyOptions, serverOptions
     async handleHotUpdate(ctx) {
       // handle valaxy.config.ts hmr
       const { file, server } = ctx
-      if (file !== options.configFile) return
+      if (file !== options.configFile)
+        return
 
       const { config } = await resolveConfig()
 

package/src/node/plugins/markdown.ts

@@ -47,7 +47,7 @@ export function createMarkdownPlugin(options: ResolvedValaxyOptions): Plugin[] {
     handleHotUpdate(ctx) {
       const { file, server } = ctx
       // send headers
-      if (file.endsWith('.md')) {
+      if (file.endsWith('.md') && _md && _md.__data) {
         server.ws.send({
           type: 'custom',
           event: 'valaxy:pageHeaders',

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'
@@ -178,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,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/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;

package/dist/chunk-JWA76JND.mjs

@@ -1 +0,0 @@
-import{d as e,j as r}from"./chunk-ESCOXVP6.mjs";e();import{createServer as n,mergeConfig as a}from"vite";async function c(o,t={},i={}){return process.env.EDITOR=process.env.EDITOR||"code",await n(a(t,r(o,i)))}export{c as a};