valaxy-theme-yun 0.7.5 → 0.7.8

package/components/YunToggleLocale.vue

@@ -1,21 +1,9 @@
 <script lang="ts" setup>
-import { isClient, useStorage } from '@vueuse/core'
 import { useI18n } from 'vue-i18n'
-const { t, availableLocales, locale } = useI18n()
+import { useLocale } from 'valaxy'
 
-const lang = useStorage('valaxy-locale', locale.value)
-
-const toggleLocales = () => {
-  // change to some real logic
-  const locales = availableLocales
-
-  locale.value = locales[(locales.indexOf(locale.value) + 1) % locales.length]
-  // for localStorage
-  lang.value = locale.value
-
-  if (isClient)
-    document.documentElement.setAttribute('lang', locale.value)
-}
+const { t, locale } = useI18n()
+const { toggleLocales } = useLocale()
 </script>
 
 <template>

package/components/YunWaline.vue

@@ -2,7 +2,7 @@
 import { useConfig, useWaline } from 'valaxy'
 
 const config = useConfig()
-useWaline(config.value.comment.waline)
+useWaline(config.value.comment.waline, config.value.cdn.prefix)
 </script>
 
 <template>

package/config/index.ts

@@ -1,6 +1,6 @@
 import type { ThemeConfig, ThemeUserConfig } from '../types'
 
-export const anonymousImage = 'https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/avatar/none.jpg'
+export const anonymousImage = 'https://cdn.yunyoujun.cn/img/avatar/none.jpg'
 
 /**
  * Default Config
@@ -17,8 +17,8 @@ export const defaultThemeConfig: ThemeConfig = {
 
   bg_image: {
     enable: true,
-    url: 'https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/bg/stars-timing-0-blur-30px.jpg',
-    dark: 'https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/bg/galaxy.jpg',
+    url: 'https://cdn.yunyoujun.cn/img/bg/stars-timing-0-blur-30px.jpg',
+    dark: 'https://cdn.yunyoujun.cn/img/bg/galaxy.jpg',
   },
 
   say: {
@@ -129,5 +129,11 @@ export function generateSafelist(themeConfig: ThemeUserConfig) {
   if (themeConfig.menu?.custom?.icon)
     safelist.push(themeConfig.menu?.custom?.icon)
 
+  if (themeConfig.pages) {
+    themeConfig.pages?.forEach((item) => {
+      item.icon && safelist.push(item.icon)
+    })
+  }
+
   return safelist
 }

package/dist/index.d.ts

@@ -114,7 +114,7 @@ interface ThemeConfig {
 }
 declare type ThemeUserConfig = Partial<ThemeConfig>;
 
-declare const anonymousImage = "https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/avatar/none.jpg";
+declare const anonymousImage = "https://cdn.yunyoujun.cn/img/avatar/none.jpg";
 /**
  * Default Config
  */

package/dist/index.js

@@ -1 +1 @@
-"use strict";var r=Object.defineProperty;var b=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var y=Object.prototype.hasOwnProperty;var v=(e,i)=>{for(var o in i)r(e,o,{get:i[o],enumerable:!0})},x=(e,i,o,t)=>{if(i&&typeof i=="object"||typeof i=="function")for(let n of h(i))!y.call(e,n)&&n!==o&&r(e,n,{get:()=>i[n],enumerable:!(t=b(i,n))||t.enumerable});return e};var T=e=>x(r({},"__esModule",{value:!0}),e);var C={};v(C,{anonymousImage:()=>w,default:()=>j,defaultThemeConfig:()=>a,generateSafelist:()=>Y,yunPlugin:()=>g});module.exports=T(C);var w="https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/avatar/none.jpg",a={outlineTitle:"On this page",colors:{primary:"#0078E7"},banner:{enable:!0,title:"\u4E91\u6E38\u541B\u7684\u5C0F\u7AD9"},bg_image:{enable:!0,url:"https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/bg/stars-timing-0-blur-30px.jpg",dark:"https://cdn.jsdelivr.net/gh/YunYouJun/cdn/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 Y(e){var t,n,l,c,u,s,p,m,f;let i=[],o=e.types;if(o)for(let d in o)i.push((t=o[d])==null?void 0:t.icon);return(l=(n=e.footer)==null?void 0:n.icon)!=null&&l.name&&i.push((u=(c=e.footer)==null?void 0:c.icon)==null?void 0:u.name),(p=(s=e.menu)==null?void 0:s.custom)!=null&&p.icon&&i.push((f=(m=e.menu)==null?void 0:m.custom)==null?void 0:f.icon),i}function g(e=a){return{name:"valaxy-theme-yun",enforce:"pre",config(){var i;return{css:{preprocessorOptions:{scss:{additionalData:`$c-primary: ${((i=e.colors)==null?void 0:i.primary)||"#0078E7"} !default;`}}}}}}}var j=g;0&&(module.exports={anonymousImage,defaultThemeConfig,generateSafelist,yunPlugin});
+"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});

package/dist/index.mjs

@@ -1 +1 @@
-var d="https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/avatar/none.jpg",m={outlineTitle:"On this page",colors:{primary:"#0078E7"},banner:{enable:!0,title:"\u4E91\u6E38\u541B\u7684\u5C0F\u7AD9"},bg_image:{enable:!0,url:"https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/bg/stars-timing-0-blur-30px.jpg",dark:"https://cdn.jsdelivr.net/gh/YunYouJun/cdn/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 b(i){var n,t,r,a,l,c,u,s,p;let e=[],o=i.types;if(o)for(let f in o)e.push((n=o[f])==null?void 0:n.icon);return(r=(t=i.footer)==null?void 0:t.icon)!=null&&r.name&&e.push((l=(a=i.footer)==null?void 0:a.icon)==null?void 0:l.name),(u=(c=i.menu)==null?void 0:c.custom)!=null&&u.icon&&e.push((p=(s=i.menu)==null?void 0:s.custom)==null?void 0:p.icon),e}function g(i=m){return{name:"valaxy-theme-yun",enforce:"pre",config(){var e;return{css:{preprocessorOptions:{scss:{additionalData:`$c-primary: ${((e=i.colors)==null?void 0:e.primary)||"#0078E7"} !default;`}}}}}}}var v=g;export{d as anonymousImage,v as default,m as defaultThemeConfig,b as generateSafelist,g as yunPlugin};
+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};

package/layouts/404.vue

@@ -7,7 +7,7 @@ const { t } = useI18n()
 </script>
 
 <template>
-  <Base>
+  <Layout>
     <template #content>
       <div text="center">
         <div text-4xl>
@@ -21,5 +21,5 @@ const { t } = useI18n()
         </div>
       </div>
     </template>
-  </Base>
+  </Layout>
 </template>

package/layouts/archives.vue

@@ -11,7 +11,7 @@ const title = usePostTitle(frontmatter)
 </script>
 
 <template>
-  <Base>
+  <Layout>
     <template #main-header>
       <YunPageHeader :title="title || t('menu.archives')" :icon="frontmatter.icon || 'i-ri-archive-line'" :color="frontmatter.color" />
     </template>
@@ -19,5 +19,5 @@ const title = usePostTitle(frontmatter)
       <router-view />
       <YunPostCollapse :posts="postList" />
     </template>
-  </Base>
+  </Layout>
 </template>

package/layouts/categories.vue

@@ -46,7 +46,7 @@ const title = usePostTitle(frontmatter)
 </script>
 
 <template>
-  <Base>
+  <Layout>
     <template #main-header>
       <YunPageHeader
         :title="title || t('menu.categories')"
@@ -68,5 +68,5 @@ const title = usePostTitle(frontmatter)
         <YunPostCollapse w="full" m="b-4" p="x-20 lt-sm:x-5" :posts="posts" />
       </YunCard>
     </template>
-  </Base>
+  </Layout>
 </template>

package/layouts/default.vue

@@ -1,7 +1,7 @@
 <template>
-  <Base>
+  <Layout>
     <template #content>
       <router-view />
     </template>
-  </Base>
+  </Layout>
 </template>

package/layouts/post.vue

@@ -15,7 +15,7 @@ const showSponsor = computed(() => {
 </script>
 
 <template>
-  <Base>
+  <Layout>
     <template #main-header-after>
       <YunPostMeta :frontmatter="frontmatter" />
     </template>
@@ -28,5 +28,5 @@ const showSponsor = computed(() => {
     <template #aside-custom>
       <slot name="aside-custom" />
     </template>
-  </Base>
+  </Layout>
 </template>

package/layouts/tags.vue

@@ -49,7 +49,7 @@ const title = usePostTitle(frontmatter)
 </script>
 
 <template>
-  <Base>
+  <Layout>
     <template #main-header>
       <YunPageHeader
         :title="title || t('menu.tags')"
@@ -77,5 +77,5 @@ const title = usePostTitle(frontmatter)
         <YunPostCollapse w="full" m="b-4" p="x-20 lt-sm:x-5" :posts="posts" />
       </YunCard>
     </template>
-  </Base>
+  </Layout>
 </template>

package/node/index.ts

@@ -25,6 +25,10 @@ export function yunPlugin(userOptions: Partial<ThemeConfig> = defaultThemeConfig
             },
           },
         },
+
+        optimizeDeps: {
+          exclude: ['@docsearch/js'],
+        },
       }
     },
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-yun",
-  "version": "0.7.5",
+  "version": "0.7.8",
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
@@ -21,15 +21,14 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "peerDependencies": {
-    "valaxy": "0.7.5"
-  },
   "dependencies": {
+    "@docsearch/css": "^3.1.1",
+    "@docsearch/js": "^3.1.1",
     "@iconify-json/ant-design": "^1.1.3",
     "@iconify-json/simple-icons": "^1.1.19"
   },
   "devDependencies": {
-    "valaxy": "0.7.5"
+    "valaxy": "0.7.8"
   },
   "scripts": {
     "build": "rimraf dist && tsup",

package/styles/vars.scss

@@ -1,33 +1,47 @@
-@use 'sass:map';
+@use "sass:map";
 
 // palette
 $light: () !default;
-$light: map.merge((
-  'bg-image': url('https://cdn.jsdelivr.net/gh/YunYouJun/cdn/img/bg/stars-timing-0-blur-30px.jpg'),
-  'sidebar-bg-color': var(--va-c-bg-light),
-  'sidebar-bg-image': url("https://cdn.jsdelivr.net/gh/YunYouJun/cdn@master/img/bg/alpha-stars-timing-1.webp")
-), $light);
+$light: map.merge(
+  (
+    "bg-image":
+      url("https://cdn.yunyoujun.cn/img/bg/stars-timing-0-blur-30px.jpg"),
+    "sidebar-bg-color": var(--va-c-bg-light),
+    "sidebar-bg-image":
+      url("https://cdn.yunyoujun.cn/img/bg/alpha-stars-timing-1.webp"),
+  ),
+  $light
+);
 
 $dark: () !default;
-$dark: map.merge((
-  'bg-image': none,
-  'sidebar-bg-image': none
-), $dark);
+$dark: map.merge(
+  (
+    "bg-image": none,
+    "sidebar-bg-image": none,
+  ),
+  $dark
+);
 
 // common
 $common: () !default;
-$common: map.merge((
-  'post-card-max-width': 900px
-), $common);
+$common: map.merge(
+  (
+    "post-card-max-width": 900px,
+  ),
+  $common
+);
 
 $z-index: () !default;
-$z-index: map.merge((
-  'cloud': 8,
-  'go-down': 9,
-  'sidebar': 10,
-  'fireworks': 11,
-  'menu-btn': 20,
-  'go-up-btn': 20,
-  'search-popup': 30,
-  'search-btn': 31,
-), $z-index);
+$z-index: map.merge(
+  (
+    "cloud": 8,
+    "go-down": 9,
+    "sidebar": 10,
+    "fireworks": 11,
+    "menu-btn": 20,
+    "go-up-btn": 20,
+    "search-popup": 30,
+    "search-btn": 31,
+  ),
+  $z-index
+);

package/tsconfig.json

@@ -0,0 +1,27 @@
+{
+  // we need tsconfig.json to compile without
+  // error: This is likely not portable. A type annotation is necessary.
+  "compilerOptions": {
+    "allowJs": true,
+    "baseUrl": ".",
+    "module": "ESNext",
+    "target": "ESNext",
+    "lib": ["DOM", "ESNext"],
+    "strict": true,
+    "esModuleInterop": true,
+    "jsx": "preserve",
+    "skipLibCheck": true,
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "noUnusedLocals": true,
+    "strictNullChecks": true,
+    "forceConsistentCasingInFileNames": true,
+    "types": [
+      "vite/client",
+      "vue/ref-macros",
+      "vite-plugin-pages/client",
+      "vite-plugin-vue-layouts/client"
+    ]
+  },
+  "exclude": ["**/dist/**", "node_modules"]
+}