valaxy-theme-yun 0.7.8 → 0.9.0

package/components/ValaxyMain.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { PageData, Post } from 'valaxy'
 import { useConfig, usePostTitle } from 'valaxy'
-import { computed } from 'vue'
+import { computed, defineAsyncComponent } from 'vue'
 import { usePostProperty } from '../composables'
 
 const props = defineProps<{
@@ -12,13 +12,23 @@ const config = useConfig()
 
 const { styles, icon, color } = usePostProperty(props.frontmatter.type)
 const title = usePostTitle(computed(() => props.frontmatter))
+
+const aside = computed(() => props.frontmatter.aside !== false)
+
+const YunWaline = config.value.comment.waline.enable
+  ? defineAsyncComponent(() => import('./YunWaline.vue'))
+  : () => null
+
+const YunTwikoo = config.value.comment.waline.enable
+  ? defineAsyncComponent(() => import('./YunTwikoo.vue'))
+  : () => null
 </script>
 
 <template>
   <main class="yun-main lt-md:ml-0" flex="~">
     <div w="full" flex="~">
       <slot name="main">
-        <div class="content" flex="~ col grow" w="full" p="l-4 lt-md:0">
+        <div class="content" :class="!aside && 'no-aside'" flex="~ col grow" w="full" p="l-4 lt-md:0">
           <YunCard :cover="frontmatter.cover" m="0" class="relative" :style="styles">
             <slot name="main-header">
               <YunPageHeader :title="title" :icon="frontmatter.icon || icon" :color="frontmatter.color || color" :cover="frontmatter.cover" />
@@ -59,7 +69,7 @@ const title = usePostTitle(computed(() => props.frontmatter))
       </slot>
 
       <slot name="aside">
-        <YunAside :frontmatter="frontmatter" :data="data">
+        <YunAside v-if="aside" :frontmatter="frontmatter" :data="data">
           <slot name="aside-custom" />
         </YunAside>
       </slot>
@@ -68,11 +78,15 @@ const title = usePostTitle(computed(() => props.frontmatter))
 </template>
 
 <style lang="scss">
-@use '~/styles/mixins' as *;
+@use 'valaxy/client/styles/mixins' as *;
 @include xl {
   .content{
     // 8px scrollbar width
     max-width: calc(100vw - 2 * var(--va-sidebar-width-mobile) - 1rem - 8px);
+
+    &.no-aside {
+      max-width: calc(100vw - var(--va-sidebar-width-mobile));
+    }
   }
 }
 </style>

package/components/YunAside.vue

@@ -38,7 +38,7 @@ const app = useAppStore()
 </template>
 
 <style lang="scss">
-@use '~/styles/mixins' as *;
+@use 'valaxy/client/styles/mixins' as *;
 
 .aside {
   position: fixed;

package/components/YunBackToTop.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
-import { useBackToTop } from '~/composables'
+import { useBackToTop } from 'valaxy'
 
 const { show, percentage } = useBackToTop({ offset: 100 })
 

package/components/YunBanner.vue

@@ -6,8 +6,9 @@
  */
 
 import { CSSProperties, computed } from 'vue'
+import { random } from 'valaxy'
 import { useThemeConfig } from '../composables'
-import { random } from '~/utils'
+
 const themeConfig = useThemeConfig()
 
 const chars = computed(() => {

package/components/YunBg.vue

@@ -2,7 +2,7 @@
 import { computed } from 'vue'
 import { useThemeConfig } from 'valaxy-theme-yun/composables'
 import { useCssVar } from '@vueuse/core'
-import { isDark } from '~/composables'
+import { isDark } from 'valaxy'
 
 const themeConfig = useThemeConfig()
 

package/components/YunConfig.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { useI18n } from 'vue-i18n'
 import { computed } from 'vue'
-import { isDark, toggleDark } from '~/composables'
+import { isDark, toggleDark } from 'valaxy'
 
 const { t } = useI18n()
 

package/components/YunOverview.vue

@@ -42,7 +42,7 @@ const router = useRouter()
 </template>
 
 <style lang="scss">
-@use "~/styles/mixins" as *;
+@use "valaxy/client/styles/mixins" as *;
 
 .sidebar-panel {
   padding: 0.5rem;

package/components/YunPostList.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
 import type { Post } from 'valaxy'
-import { usePostList } from '~/composables'
+import { usePostList } from 'valaxy'
 
 const props = withDefaults(defineProps<{
   type?: string

package/components/YunPostNav.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { usePrevNext } from '~/composables'
+import { usePrevNext } from 'valaxy'
 const [prev, next] = usePrevNext()
 </script>
 
@@ -21,7 +21,7 @@ const [prev, next] = usePrevNext()
 </template>
 
 <style lang="scss">
-@use '~/styles/mixins' as *;
+@use 'valaxy/client/styles/mixins' as *;
 
 .post-nav {
   display: flex;

package/components/YunSearch.vue

@@ -63,7 +63,7 @@ const trigger = () => {
 
 <style lang="scss">
 @use 'sass:map';
-@use '~/styles/vars' as *;
+@use 'valaxy/client/styles/vars' as *;
 
 .search-btn {
   position: fixed;

package/components/YunSidebarNav.vue

@@ -37,7 +37,7 @@ const tags = useTag()
 </template>
 
 <style lang="scss">
-@use "~/styles/mixins" as *;
+@use "valaxy/client/styles/mixins" as *;
 
 .site-nav {
   display: flex;

package/components/YunToc.vue

@@ -2,12 +2,12 @@
 import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import type { Header } from 'valaxy'
-import { useThemeConfig } from '../composables'
-import { useFrontmatter } from '~/composables'
 import {
   resolveHeaders,
   useActiveAnchor,
-} from '~/composables/outline'
+  useFrontmatter,
+} from 'valaxy'
+import { useThemeConfig } from '../composables'
 
 const props = defineProps<{ headers: Header[] }>()
 

package/components/YunWaline.vue

@@ -1,5 +1,7 @@
 <script lang="ts" setup>
-import { useConfig, useWaline } from 'valaxy'
+import { useConfig } from 'valaxy'
+// we need import on demand
+import { useWaline } from 'valaxy/client/composables/comments/waline'
 
 const config = useConfig()
 useWaline(config.value.comment.waline, config.value.cdn.prefix)

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from 'vite';
+import * as valaxy_dist_node from 'valaxy/dist/node';
 
 declare namespace YunTheme {
     type Config = ThemeConfig;
@@ -132,6 +132,6 @@ interface UserOptions {
         primary: string;
     };
 }
-declare function yunPlugin(userOptions?: Partial<ThemeConfig>): Plugin;
+declare const _default: Promise<valaxy_dist_node.ValaxyThemePlugin | valaxy_dist_node.ThemeConfigFn>;
 
-export { ThemeConfig, ThemeUserConfig, UserOptions, YunTheme, anonymousImage, yunPlugin as default, defaultThemeConfig, generateSafelist, yunPlugin };
+export { ThemeConfig, ThemeUserConfig, UserOptions, YunTheme, anonymousImage, _default as default, defaultThemeConfig, generateSafelist };

package/dist/index.js

@@ -1 +1 @@
-"use strict";var a=Object.defineProperty;var d=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var x=Object.prototype.hasOwnProperty;var v=(o,i)=>{for(var e in i)a(o,e,{get:i[e],enumerable:!0})},T=(o,i,e,t)=>{if(i&&typeof i=="object"||typeof i=="function")for(let n of h(i))!x.call(o,n)&&n!==e&&a(o,n,{get:()=>i[n],enumerable:!(t=d(i,n))||t.enumerable});return o};var j=o=>T(a({},"__esModule",{value:!0}),o);var E={};v(E,{anonymousImage:()=>w,default:()=>D,defaultThemeConfig:()=>c,generateSafelist:()=>k,yunPlugin:()=>b});module.exports=j(E);var w="https://cdn.yunyoujun.cn/img/avatar/none.jpg",c={outlineTitle:"On this page",colors:{primary:"#0078E7"},banner:{enable:!0,title:"\u4E91\u6E38\u541B\u7684\u5C0F\u7AD9"},bg_image:{enable:!0,url:"https://cdn.yunyoujun.cn/img/bg/stars-timing-0-blur-30px.jpg",dark:"https://cdn.yunyoujun.cn/img/bg/galaxy.jpg"},say:{enable:!0,api:"https://el-bot-api.vercel.app/api/words/young",hitokoto:{enable:!1,api:"https://v1.hitokoto.cn"}},pages:[],sidebar:null,footer:{since:2022,icon:{name:"i-ri-cloud-line",animated:!0,color:"var(--va-c-primary)",url:"https://sponsors.yunyoujun.cn",title:"Sponsor YunYouJun"},powered:!0,beian:{enable:!1,icp:""}},types:{link:{color:"var(--va-c-primary)",icon:"i-ri-external-link-line"},bilibili:{color:"#FF8EB3",icon:"i-ri-bilibili-line"},douban:{color:"#007722",icon:"i-ri-douban-line"},github:{color:"var(--va-c-text)",icon:"i-ri-github-line"},"netease-cloud-music":{color:"#C10D0C",icon:"i-ri-netease-cloud-music-line"},notion:{color:"var(--va-c-text)",icon:"i-simple-icons-notion"},twitter:{color:"#1da1f2",icon:"i-ri-twitter-line"},wechat:{color:"#1AAD19",icon:"i-ri-wechat-2-line"},weibo:{color:"#E6162D",icon:"i-ri-weibo-line"},yuque:{color:"#25b864",icon:"i-ant-design-yuque-outlined"},zhihu:{color:"#0084FF",icon:"i-ri-zhihu-line"}},menu:{custom:{title:"button.about",icon:"i-ri-clipboard-line",url:"/about"}}};function k(o){var t,n,l,u,s,p,m,f,y,g;let i=[],e=o.types;if(e)for(let r in e)i.push((t=e[r])==null?void 0:t.icon);return(l=(n=o.footer)==null?void 0:n.icon)!=null&&l.name&&i.push((s=(u=o.footer)==null?void 0:u.icon)==null?void 0:s.name),(m=(p=o.menu)==null?void 0:p.custom)!=null&&m.icon&&i.push((y=(f=o.menu)==null?void 0:f.custom)==null?void 0:y.icon),o.pages&&((g=o.pages)==null||g.forEach(r=>{r.icon&&i.push(r.icon)})),i}function b(o=c){return{name:"valaxy-theme-yun",enforce:"pre",config(){var i;return{css:{preprocessorOptions:{scss:{additionalData:`$c-primary: ${((i=o.colors)==null?void 0:i.primary)||"#0078E7"} !default;`}}},optimizeDeps:{exclude:["@docsearch/js"]}}}}}var D=b;0&&(module.exports={anonymousImage,defaultThemeConfig,generateSafelist,yunPlugin});
+"use strict";var a=Object.defineProperty;var b=Object.getOwnPropertyDescriptor;var d=Object.getOwnPropertyNames;var h=Object.prototype.hasOwnProperty;var x=(i,o)=>{for(var e in o)a(i,e,{get:o[e],enumerable:!0})},v=(i,o,e,t)=>{if(o&&typeof o=="object"||typeof o=="function")for(let n of d(o))!h.call(i,n)&&n!==e&&a(i,n,{get:()=>o[n],enumerable:!(t=b(o,n))||t.enumerable});return i};var j=i=>v(a({},"__esModule",{value:!0}),i);var O={};x(O,{anonymousImage:()=>w,default:()=>E,defaultThemeConfig:()=>T,generateSafelist:()=>k});module.exports=j(O);var g=require("valaxy");var w="https://cdn.yunyoujun.cn/img/avatar/none.jpg",T={outlineTitle:"On this page",colors:{primary:"#0078E7"},banner:{enable:!0,title:"\u4E91\u6E38\u541B\u7684\u5C0F\u7AD9"},bg_image:{enable:!0,url:"https://cdn.yunyoujun.cn/img/bg/stars-timing-0-blur-30px.jpg",dark:"https://cdn.yunyoujun.cn/img/bg/galaxy.jpg"},say:{enable:!0,api:"https://el-bot-api.vercel.app/api/words/young",hitokoto:{enable:!1,api:"https://v1.hitokoto.cn"}},pages:[],sidebar:null,footer:{since:2022,icon:{name:"i-ri-cloud-line",animated:!0,color:"var(--va-c-primary)",url:"https://sponsors.yunyoujun.cn",title:"Sponsor YunYouJun"},powered:!0,beian:{enable:!1,icp:""}},types:{link:{color:"var(--va-c-primary)",icon:"i-ri-external-link-line"},bilibili:{color:"#FF8EB3",icon:"i-ri-bilibili-line"},douban:{color:"#007722",icon:"i-ri-douban-line"},github:{color:"var(--va-c-text)",icon:"i-ri-github-line"},"netease-cloud-music":{color:"#C10D0C",icon:"i-ri-netease-cloud-music-line"},notion:{color:"var(--va-c-text)",icon:"i-simple-icons-notion"},twitter:{color:"#1da1f2",icon:"i-ri-twitter-line"},wechat:{color:"#1AAD19",icon:"i-ri-wechat-2-line"},weibo:{color:"#E6162D",icon:"i-ri-weibo-line"},yuque:{color:"#25b864",icon:"i-ant-design-yuque-outlined"},zhihu:{color:"#0084FF",icon:"i-ri-zhihu-line"}},menu:{custom:{title:"button.about",icon:"i-ri-clipboard-line",url:"/about"}}};function k(i){var t,n,c,l,u,s,p,m,y,f;let o=[],e=i.types;if(e)for(let r in e)o.push((t=e[r])==null?void 0:t.icon);return(c=(n=i.footer)==null?void 0:n.icon)!=null&&c.name&&o.push((u=(l=i.footer)==null?void 0:l.icon)==null?void 0:u.name),(p=(s=i.menu)==null?void 0:s.custom)!=null&&p.icon&&o.push((y=(m=i.menu)==null?void 0:m.custom)==null?void 0:y.icon),i.pages&&((f=i.pages)==null||f.forEach(r=>{r.icon&&o.push(r.icon)})),o}function D(i){let o=i.config.themeConfig;return{name:"valaxy-theme-yun",enforce:"pre",config(){var e;return{css:{preprocessorOptions:{scss:{additionalData:`$c-primary: ${((e=o.colors)==null?void 0:e.primary)||"#0078E7"} !default;`}}},optimizeDeps:{exclude:["@docsearch/js"]}}}}}var E=(0,g.defineThemePlugin)(i=>({vite:{plugins:[D(i)]}}));0&&(module.exports={anonymousImage,defaultThemeConfig,generateSafelist});

package/dist/index.mjs

@@ -1 +1 @@
-var b="https://cdn.yunyoujun.cn/img/avatar/none.jpg",y={outlineTitle:"On this page",colors:{primary:"#0078E7"},banner:{enable:!0,title:"\u4E91\u6E38\u541B\u7684\u5C0F\u7AD9"},bg_image:{enable:!0,url:"https://cdn.yunyoujun.cn/img/bg/stars-timing-0-blur-30px.jpg",dark:"https://cdn.yunyoujun.cn/img/bg/galaxy.jpg"},say:{enable:!0,api:"https://el-bot-api.vercel.app/api/words/young",hitokoto:{enable:!1,api:"https://v1.hitokoto.cn"}},pages:[],sidebar:null,footer:{since:2022,icon:{name:"i-ri-cloud-line",animated:!0,color:"var(--va-c-primary)",url:"https://sponsors.yunyoujun.cn",title:"Sponsor YunYouJun"},powered:!0,beian:{enable:!1,icp:""}},types:{link:{color:"var(--va-c-primary)",icon:"i-ri-external-link-line"},bilibili:{color:"#FF8EB3",icon:"i-ri-bilibili-line"},douban:{color:"#007722",icon:"i-ri-douban-line"},github:{color:"var(--va-c-text)",icon:"i-ri-github-line"},"netease-cloud-music":{color:"#C10D0C",icon:"i-ri-netease-cloud-music-line"},notion:{color:"var(--va-c-text)",icon:"i-simple-icons-notion"},twitter:{color:"#1da1f2",icon:"i-ri-twitter-line"},wechat:{color:"#1AAD19",icon:"i-ri-wechat-2-line"},weibo:{color:"#E6162D",icon:"i-ri-weibo-line"},yuque:{color:"#25b864",icon:"i-ant-design-yuque-outlined"},zhihu:{color:"#0084FF",icon:"i-ri-zhihu-line"}},menu:{custom:{title:"button.about",icon:"i-ri-clipboard-line",url:"/about"}}};function d(i){var t,r,a,c,l,u,s,p,m,f;let o=[],n=i.types;if(n)for(let e in n)o.push((t=n[e])==null?void 0:t.icon);return(a=(r=i.footer)==null?void 0:r.icon)!=null&&a.name&&o.push((l=(c=i.footer)==null?void 0:c.icon)==null?void 0:l.name),(s=(u=i.menu)==null?void 0:u.custom)!=null&&s.icon&&o.push((m=(p=i.menu)==null?void 0:p.custom)==null?void 0:m.icon),i.pages&&((f=i.pages)==null||f.forEach(e=>{e.icon&&o.push(e.icon)})),o}function g(i=y){return{name:"valaxy-theme-yun",enforce:"pre",config(){var o;return{css:{preprocessorOptions:{scss:{additionalData:`$c-primary: ${((o=i.colors)==null?void 0:o.primary)||"#0078E7"} !default;`}}},optimizeDeps:{exclude:["@docsearch/js"]}}}}}var v=g;export{b as anonymousImage,v as default,y as defaultThemeConfig,d as generateSafelist,g as yunPlugin};
+import{defineThemePlugin as f}from"valaxy";var b="https://cdn.yunyoujun.cn/img/avatar/none.jpg",d={outlineTitle:"On this page",colors:{primary:"#0078E7"},banner:{enable:!0,title:"\u4E91\u6E38\u541B\u7684\u5C0F\u7AD9"},bg_image:{enable:!0,url:"https://cdn.yunyoujun.cn/img/bg/stars-timing-0-blur-30px.jpg",dark:"https://cdn.yunyoujun.cn/img/bg/galaxy.jpg"},say:{enable:!0,api:"https://el-bot-api.vercel.app/api/words/young",hitokoto:{enable:!1,api:"https://v1.hitokoto.cn"}},pages:[],sidebar:null,footer:{since:2022,icon:{name:"i-ri-cloud-line",animated:!0,color:"var(--va-c-primary)",url:"https://sponsors.yunyoujun.cn",title:"Sponsor YunYouJun"},powered:!0,beian:{enable:!1,icp:""}},types:{link:{color:"var(--va-c-primary)",icon:"i-ri-external-link-line"},bilibili:{color:"#FF8EB3",icon:"i-ri-bilibili-line"},douban:{color:"#007722",icon:"i-ri-douban-line"},github:{color:"var(--va-c-text)",icon:"i-ri-github-line"},"netease-cloud-music":{color:"#C10D0C",icon:"i-ri-netease-cloud-music-line"},notion:{color:"var(--va-c-text)",icon:"i-simple-icons-notion"},twitter:{color:"#1da1f2",icon:"i-ri-twitter-line"},wechat:{color:"#1AAD19",icon:"i-ri-wechat-2-line"},weibo:{color:"#E6162D",icon:"i-ri-weibo-line"},yuque:{color:"#25b864",icon:"i-ant-design-yuque-outlined"},zhihu:{color:"#0084FF",icon:"i-ri-zhihu-line"}},menu:{custom:{title:"button.about",icon:"i-ri-clipboard-line",url:"/about"}}};function h(i){var t,r,a,c,l,u,s,p,m,y;let o=[],e=i.types;if(e)for(let n in e)o.push((t=e[n])==null?void 0:t.icon);return(a=(r=i.footer)==null?void 0:r.icon)!=null&&a.name&&o.push((l=(c=i.footer)==null?void 0:c.icon)==null?void 0:l.name),(s=(u=i.menu)==null?void 0:u.custom)!=null&&s.icon&&o.push((m=(p=i.menu)==null?void 0:p.custom)==null?void 0:m.icon),i.pages&&((y=i.pages)==null||y.forEach(n=>{n.icon&&o.push(n.icon)})),o}function g(i){let o=i.config.themeConfig;return{name:"valaxy-theme-yun",enforce:"pre",config(){var e;return{css:{preprocessorOptions:{scss:{additionalData:`$c-primary: ${((e=o.colors)==null?void 0:e.primary)||"#0078E7"} !default;`}}},optimizeDeps:{exclude:["@docsearch/js"]}}}}}var j=f(i=>({vite:{plugins:[g(i)]}}));export{b as anonymousImage,j as default,d as defaultThemeConfig,h as generateSafelist};

package/layouts/home.vue

@@ -1,12 +1,8 @@
 <script lang="ts" setup>
-import { useConfig } from 'valaxy'
-import { useLayout } from '~/composables'
+import { useAppStore, useConfig, useLayout } from 'valaxy'
 
-import { useAppStore } from '~/stores/app'
 const app = useAppStore()
-
 const config = useConfig()
-
 const isHome = useLayout('home')
 </script>
 

package/node/index.ts

@@ -1,6 +1,6 @@
+import { defineThemePlugin } from 'valaxy'
+import type { ResolvedValaxyOptions } from 'valaxy'
 import type { Plugin } from 'vite'
-import type { ThemeConfig } from '../types'
-import { defaultThemeConfig } from '../config'
 
 export * from '../config'
 export * from '../types'
@@ -11,17 +11,17 @@ export interface UserOptions {
   }
 }
 
-export function yunPlugin(userOptions: Partial<ThemeConfig> = defaultThemeConfig): Plugin {
+function ThemeYunVitePlugin(options: ResolvedValaxyOptions): Plugin {
+  const themeConfig = options.config.themeConfig
   return {
     name: 'valaxy-theme-yun',
     enforce: 'pre',
-
     config() {
       return {
         css: {
           preprocessorOptions: {
             scss: {
-              additionalData: `$c-primary: ${userOptions.colors?.primary || '#0078E7'} !default;`,
+              additionalData: `$c-primary: ${themeConfig.colors?.primary || '#0078E7'} !default;`,
             },
           },
         },
@@ -34,4 +34,10 @@ export function yunPlugin(userOptions: Partial<ThemeConfig> = defaultThemeConfig
   }
 }
 
-export default yunPlugin
+export default defineThemePlugin((options) => {
+  return {
+    vite: {
+      plugins: [ThemeYunVitePlugin(options)],
+    },
+  }
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-yun",
-  "version": "0.7.8",
+  "version": "0.9.0",
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
@@ -28,7 +28,7 @@
     "@iconify-json/simple-icons": "^1.1.19"
   },
   "devDependencies": {
-    "valaxy": "0.7.8"
+    "valaxy": "0.9.0"
   },
   "scripts": {
     "build": "rimraf dist && tsup",

package/styles/css-vars.scss

@@ -1,11 +1,9 @@
-@use './vars' as *;
-@use '~/styles/mixins' as * with(
-  $namespace: 'yun'
-);
+@use "./vars" as *;
+@use "valaxy/client/styles/mixins" as * with($namespace: "yun");
 
 :root {
   @include set-css-var-from-map($common);
-  @include set-css-var-from-map($z-index, 'z');
+  @include set-css-var-from-map($z-index, "z");
 }
 
 :root {

package/styles/layout/index.scss

@@ -1,4 +1,4 @@
-@use "~/styles/mixins" as *;
+@use "valaxy/client/styles/mixins" as *;
 @use "./post" as *;
 
 .yun-main {

package/styles/layout/post.scss

@@ -1,4 +1,4 @@
-@use "~/styles/mixins" as *;
+@use "valaxy/client/styles/mixins" as *;
 
 .post-card {
   position: relative;

package/styles/markdown.scss

@@ -1,4 +1,4 @@
-@use "~/styles/mixins" as *;
+@use "valaxy/client/styles/mixins" as *;
 
 .markdown-body {
   --c-toc-link: var(--va-c-text-light);