fix: empty template for YunAdBoard parent gap size

YunYouJun · YunYouJun · commit ab57216fa36a · 2024-11-11T02:03:31.000+08:00
diff --git a/packages/valaxy-theme-yun/components/YunAdBoard.vue b/packages/valaxy-theme-yun/components/YunAdBoard.vue
@@ -1,4 +1,4 @@
 <template>
-  <!-- empty -->
-  <div />
+  <!-- eslint-disable-next-line vue/no-lone-template empty -->
+  <template />
 </template>
diff --git a/packages/valaxy/node/cli/utils/cli.ts b/packages/valaxy/node/cli/utils/cli.ts
@@ -9,11 +9,13 @@ import consola from 'consola'
 import type { InlineConfig, ViteDevServer } from 'vite'
 import { mergeConfig } from 'vite'
 import { version } from 'valaxy/package.json'
+import ora from 'ora'
+import { colors } from 'consola/utils'
 import type { ValaxyNode } from '../../types'
 import { createServer } from '../../server'
 import type { ResolvedValaxyOptions } from '../../options'
 import { mergeViteConfigs } from '../../common'
-import { vLogger } from '../../logger'
+import { vLogger, valaxyPrefix } from '../../logger'
 
 let server: ViteDevServer | undefined
 
@@ -60,6 +62,7 @@ export function printInfo(options: ResolvedValaxyOptions, port?: number, remote?
 //   'extendMd',
 // ]
 
+export const serverSpinner = ora(`${valaxyPrefix} creating server ...`)
 export async function initServer(valaxyApp: ValaxyNode, viteConfig: InlineConfig) {
   if (server) {
     vLogger.info('close server...')
@@ -68,6 +71,7 @@ export async function initServer(valaxyApp: ValaxyNode, viteConfig: InlineConfig
 
   const { options } = valaxyApp
 
+  serverSpinner.start()
   const viteConfigs: InlineConfig = mergeConfig(
     await mergeViteConfigs(options, 'serve'),
     viteConfig,
@@ -101,8 +105,7 @@ export async function initServer(valaxyApp: ValaxyNode, viteConfig: InlineConfig
       },
     })
     await server.listen()
-    // consola.success(, 'server ready')
-    vLogger.ready('server ready')
+    serverSpinner.succeed(`${valaxyPrefix} ${colors.green('server ready.')}`)
   }
   catch (e) {
     consola.error('failed to start server. error:\n')
diff --git a/packages/valaxy/node/logger/index.ts b/packages/valaxy/node/logger/index.ts
@@ -7,11 +7,11 @@ import type { ValaxyHooks, ValaxyNode } from '../types'
 
 export const logger = consola.create({})
 
-const prefix = `${magenta('valaxy')}:`
+export const valaxyPrefix = colors.magenta('[valaxy]')
 export const vLogger = {
-  success: (...args: any) => logger.success(prefix, ...args),
-  info: (...args: any) => logger.info(prefix, ...args),
-  ready: (...args: any) => logger.ready(prefix, ...args),
+  success: (...args: any) => logger.success(valaxyPrefix, ...args),
+  info: (...args: any) => logger.info(valaxyPrefix, ...args),
+  ready: (...args: any) => logger.ready(valaxyPrefix, ...args),
 }
 
 /**
diff --git a/packages/valaxy/node/server.ts b/packages/valaxy/node/server.ts
@@ -2,9 +2,16 @@ import process from 'node:process'
 import type { InlineConfig } from 'vite'
 import { createServer as createViteServer, mergeConfig as mergeViteConfig } from 'vite'
 
+import { colors } from 'consola/utils'
 import type { ValaxyNode } from './types'
 import type { ValaxyServerOptions } from './options'
 import { ViteValaxyPlugins } from './plugins/preset'
+import { serverSpinner } from './cli/utils/cli'
+import { valaxyPrefix } from './logger'
+
+function getServerInfoText(msg: string) {
+  return `${valaxyPrefix} ${colors.gray(msg)}`
+}
 
 export async function createServer(
   valaxyApp: ValaxyNode,
@@ -16,6 +23,7 @@ export async function createServer(
 
   const { options } = valaxyApp
 
+  serverSpinner.text = getServerInfoText('init vite plugins ..')
   const plugins = await ViteValaxyPlugins(valaxyApp, serverOptions)
   // dynamic import to avoid bundle it in build
   const enableDevtools = options.mode === 'dev' && options.config.devtools
@@ -30,12 +38,14 @@ export async function createServer(
     )
   }
 
+  serverSpinner.text = getServerInfoText('merge vite config ...')
   const mergedViteConfig = mergeViteConfig(
     viteConfig,
     {
       plugins: vitePlugins,
     },
   )
+  serverSpinner.text = getServerInfoText('create vite server ...')
   const server = await createViteServer(mergedViteConfig)
   return server
 }
