valaxy-theme-yun 0.13.0-0 → 0.13.1

package/components/ValaxyMain.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { PageData, Post } from 'valaxy'
-import { usePostTitle, useRuntimeConfig, useSiteConfig } from 'valaxy'
-import { StyleValue, computed, defineAsyncComponent } from 'vue'
+import { usePostTitle, useSiteConfig } from 'valaxy'
+import { StyleValue, computed } from 'vue'
 import { usePostProperty } from '../composables'
 
 const props = defineProps<{
@@ -9,23 +9,12 @@ const props = defineProps<{
   data?: PageData
 }>()
 
-const runtimeConfig = useRuntimeConfig()
 const siteConfig = useSiteConfig()
 
 const { styles, icon, color } = usePostProperty(props.frontmatter.type)
 const title = usePostTitle(computed(() => props.frontmatter))
 
 const aside = computed(() => props.frontmatter.aside !== false)
-
-// not import from 'valaxy-addon-waline' to judge
-const YunWaline = runtimeConfig.value.addons['valaxy-addon-waline']
-  ? defineAsyncComponent(() => import('./YunWaline.vue'))
-  : () => null
-
-// todo: refactor
-const YunTwikoo = runtimeConfig.value.addons['valaxy-addon-twikoo']
-  ? defineAsyncComponent(() => import('./YunTwikoo.vue'))
-  : () => null
 </script>
 
 <template>
@@ -60,10 +49,7 @@ const YunTwikoo = runtimeConfig.value.addons['valaxy-addon-twikoo']
           <slot name="main-nav-after" />
 
           <slot v-if="siteConfig.comment.enable && frontmatter.comment !== false" name="comment">
-            <YunCard w="full" p="4" class="comment sm:p-6 lg:px-12 xl:px-16" :class="frontmatter.nav === false ? 'mt-4' : 0">
-              <YunWaline />
-              <YunTwikoo />
-            </YunCard>
+            <YunComment :class="frontmatter.nav === false ? 'mt-4' : 0" />
           </slot>
 
           <slot name="main-footer-before" />

package/components/YunComment.vue

@@ -0,0 +1,25 @@
+<script lang="ts" setup>
+import { useRuntimeConfig } from 'valaxy'
+import { defineAsyncComponent } from 'vue'
+
+const runtimeConfig = useRuntimeConfig()
+
+// not import from 'valaxy-addon-waline' to judge
+const YunWaline = runtimeConfig.value.addons['valaxy-addon-waline']
+  ? defineAsyncComponent(() => import('./YunWaline.vue'))
+  : () => null
+
+// todo: refactor
+const YunTwikoo = runtimeConfig.value.addons['valaxy-addon-twikoo']
+  ? defineAsyncComponent(() => import('./YunTwikoo.vue'))
+  : () => null
+</script>
+
+<template>
+  <YunCard w="full" p="4" class="comment sm:p-6 lg:px-12 xl:px-16">
+    <ClientOnly>
+      <YunWaline />
+      <YunTwikoo />
+    </ClientOnly>
+  </YunCard>
+</template>

package/layouts/home.vue

@@ -17,7 +17,7 @@ const themeConfig = useThemeConfig()
 
     <YunBanner />
     <YunSay v-if="themeConfig.say.enable" w="full" />
-    <YunCloud v-if="themeConfig.banner.cloud.enable" />
+    <YunCloud v-if="themeConfig.banner.cloud?.enable" />
     <YunNotice
       v-if="themeConfig.notice.enable"
       :content="themeConfig.notice.content" mt="4"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-yun",
-  "version": "0.13.0-0",
+  "version": "0.13.1",
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
@@ -19,9 +19,9 @@
   "dependencies": {
     "@iconify-json/ant-design": "^1.1.4",
     "@iconify-json/simple-icons": "^1.1.41",
-    "valaxy-addon-waline": "0.0.8"
+    "valaxy-addon-waline": "0.0.9"
   },
   "devDependencies": {
-    "valaxy": "0.13.0-0"
+    "valaxy": "0.13.1"
   }
 }

package/types/index.d.ts

@@ -15,7 +15,7 @@ export namespace YunTheme {
      * 首页下方的动态云
      * If you want change color of cloud, please change css var `--yun-c-cloud`
      */
-    cloud: {
+    cloud?: {
       enable: boolean
     }
   }

package/valaxy.config.ts

@@ -1,5 +1,5 @@
 import type { ResolvedValaxyOptions } from 'valaxy'
-import { defineTheme } from 'valaxy'
+import { defineValaxyTheme } from 'valaxy'
 import type { Plugin } from 'vite'
 import type { ThemeConfig } from './types'
 import { defaultThemeConfig, generateSafelist } from './node'
@@ -27,10 +27,16 @@ function ThemeVitePlugin(options: ResolvedValaxyOptions<ThemeConfig>): Plugin {
   }
 }
 
-export default defineTheme<ThemeConfig>((options) => {
+export default defineValaxyTheme<ThemeConfig>((options) => {
   return {
     themeConfig: defaultThemeConfig,
     vite: {
+      build: {
+        rollupOptions: {
+          // add on demand external
+          external: ['valaxy-addon-twikoo', 'valaxy-addon-waline'],
+        },
+      },
       plugins: [ThemeVitePlugin(options)],
     },
     unocss: {