valaxy-theme-yun 0.11.2 → 0.11.4

package/components/ValaxyMain.vue

@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import type { PageData, Post } from 'valaxy'
 import { useConfig, usePostTitle } from 'valaxy'
+import { useAddonWaline } from 'valaxy-addon-waline'
 import { StyleValue, computed, defineAsyncComponent } from 'vue'
 import { usePostProperty } from '../composables'
 
@@ -15,13 +16,14 @@ const title = usePostTitle(computed(() => props.frontmatter))
 
 const aside = computed(() => props.frontmatter.aside !== false)
 
-const YunWaline = config.value.runtime.addons['valaxy-addon-waline'].enable
+const YunWaline = useAddonWaline()
   ? defineAsyncComponent(() => import('./YunWaline.vue'))
   : () => null
 
-const YunTwikoo = config.value.runtime.addons['valaxy-addon-twikoo']?.enable
-  ? defineAsyncComponent(() => import('./YunTwikoo.vue'))
-  : () => null
+// todo: refactor
+// const YunTwikoo = useAddonWaline()
+//   ? defineAsyncComponent(() => import('./YunTwikoo.vue'))
+//   : () => null
 </script>
 
 <template>
@@ -57,8 +59,8 @@ const YunTwikoo = config.value.runtime.addons['valaxy-addon-twikoo']?.enable
 
           <slot v-if="config.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 v-if="config.comment.waline.enable" />
-              <YunTwikoo v-if="config.comment.twikoo.enable" />
+              <YunWaline />
+              <!-- <YunTwikoo /> -->
             </YunCard>
           </slot>
 

package/components/YunPostCollapse.vue

@@ -19,7 +19,9 @@ watch(() => props.posts, () => {
   props.posts.forEach((post) => {
     if (post.date) {
       const year = parseInt(formatDate(post.date, 'YYYY'))
-      if (postList.value[year]) { postList.value[year].push(post) }
+      if (postList.value[year]) {
+        postList.value[year].push(post)
+      }
       else {
         years.value.push(year)
         postList.value[year] = [post]

package/components/YunTwikoo.vue

@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { useConfig, useTwikoo } from 'valaxy'
+// import { useConfig, useTwikoo } from 'valaxy'
 
-const config = useConfig()
-useTwikoo(config.value.comment.twikoo)
+// const config = useConfig()
+// useTwikoo(config.value.comment.twikoo)
 </script>
 
 <template>

package/components/YunWaline.vue

@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { useWalineOptions } from 'valaxy-addon-waline'
-const walineOptions = useWalineOptions()
+import { useAddonWaline } from 'valaxy-addon-waline'
+const addon = useAddonWaline()
 </script>
 
 <template>
-  <WalineClient w="full" :options="walineOptions" />
+  <WalineClient w="full" :options="addon.options" />
 </template>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-yun",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
@@ -21,9 +21,9 @@
     "@docsearch/js": "^3.3.0",
     "@iconify-json/ant-design": "^1.1.4",
     "@iconify-json/simple-icons": "^1.1.36",
-    "valaxy-addon-waline": "0.0.2"
+    "valaxy-addon-waline": "0.0.4"
   },
   "devDependencies": {
-    "valaxy": "0.11.2"
+    "valaxy": "0.11.4"
   }
 }

package/valaxy.config.ts

@@ -30,7 +30,6 @@ function ThemeVitePlugin(options: ResolvedValaxyOptions<ThemeConfig>): Plugin {
 export default defineTheme<ThemeConfig>((options) => {
   return {
     themeConfig: defaultThemeConfig,
-    addons: ['valaxy-addon-waline'],
     vite: {
       plugins: [ThemeVitePlugin(options)],
     },