valaxy-theme-yun 0.9.3 → 0.10.0

package/components/ValaxyMain.vue

@@ -79,13 +79,14 @@ const YunTwikoo = config.value.comment.waline.enable
 
 <style lang="scss">
 @use 'valaxy/client/styles/mixins' as *;
-@include xl {
+
+@include media('xl') {
   .content{
     // 8px scrollbar width
-    max-width: calc(100vw - 2 * var(--va-sidebar-width-mobile) - 1rem - 8px);
+    max-width: calc(100vw - 2 * var(--va-sidebar-width) - 1rem - 8px);
 
     &.no-aside {
-      max-width: calc(100vw - var(--va-sidebar-width-mobile));
+      max-width: calc(100vw - var(--va-sidebar-width));
     }
   }
 }

package/components/YunAlgoliaSearchBox.vue

@@ -142,9 +142,9 @@ function getRelativePath(absoluteUrl: string) {
 .dark .DocSearch {
   --docsearch-modal-shadow: none;
   --docsearch-footer-shadow: none;
-  --docsearch-logo-color: var(--va-c-text-2);
+  --docsearch-logo-color: var(--va-c-text-light);
   --docsearch-hit-background: var(--va-c-bg-mute);
-  --docsearch-hit-color: var(--va-c-text-2);
+  --docsearch-hit-color: var(--va-c-text-light);
   --docsearch-hit-shadow: none;
 }
 

package/components/YunAside.vue

@@ -47,7 +47,7 @@ const app = useAppStore()
   top: 0;
   bottom: 0;
 
-  min-width: var(--va-sidebar-width-mobile);
+  min-width: var(--va-sidebar-width);
 
   transform: translateX(100%);
 
@@ -69,7 +69,7 @@ const app = useAppStore()
   }
 }
 
-@include xl {
+@include media('xl') {
   .aside {
     transform: translateX(0);
   }

package/components/YunCategories.vue

@@ -27,7 +27,7 @@ const collapsable = ref(props.collapsable)
 <style lang="scss">
 .post-list-item {
   a {
-    color: var(--va-c-text);
+    color: var(--va-c-text-lighter);
 
     &:hover {
       color: var(--va-c-primary);

package/components/YunCloud.vue

@@ -15,6 +15,8 @@
 </template>
 
 <style lang="scss">
+@use 'valaxy/client/styles/mixins' as *;
+
 .cloud {
   display: flex;
   width: 100%;
@@ -32,7 +34,7 @@
     width: 100%;
     height: 100px;
 
-    @media (max-width: 768px) {
+    @include media('md') {
       height: 40px;
     }
   }

package/components/YunToc.vue

@@ -110,7 +110,7 @@ function handleClick({ target: el }: Event) {
 .outline-link {
   display: block;
   line-height: 28px;
-  color: var(--va-c-text-2);
+  color: var(--va-c-text-light);
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;

package/layouts/home.vue

@@ -1,13 +1,15 @@
 <script lang="ts" setup>
 import { useAppStore, useConfig, useLayout } from 'valaxy'
+import { useThemeConfig } from '../composables'
 
 const app = useAppStore()
 const config = useConfig()
+const themeConfig = useThemeConfig()
 const isHome = useLayout('home')
 </script>
 
 <template>
-  <YunBg v-if="config.themeConfig.bg_image.enable" />
+  <YunBg v-if="themeConfig.bg_image.enable" />
 
   <main class="yun-main justify-center items-center" :class="(isHome && !app.isSidebarOpen) && 'pl-0'" flex="~ col" w="full">
     <ValaxySidebar>

package/{config/index.ts → node/config.ts}

@@ -1,6 +1,4 @@
-import type { ThemeConfig, ThemeUserConfig } from '../types'
-
-export const anonymousImage = 'https://cdn.yunyoujun.cn/img/avatar/none.jpg'
+import type { ThemeConfig } from '../types'
 
 /**
  * Default Config
@@ -106,34 +104,3 @@ export const defaultThemeConfig: ThemeConfig = {
     },
   },
 }
-
-export default defaultThemeConfig
-
-/**
- * generateSafelist by config
- * @param themeConfig
- * @returns
- */
-export function generateSafelist(themeConfig: ThemeUserConfig) {
-  const safelist = []
-
-  const types = themeConfig.types
-  if (types) {
-    for (const type in types)
-      safelist.push(types[type]?.icon)
-  }
-
-  if (themeConfig.footer?.icon?.name)
-    safelist.push(themeConfig.footer?.icon?.name)
-
-  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/node/index.ts

@@ -1,43 +1,4 @@
-import { defineThemePlugin } from 'valaxy'
-import type { ResolvedValaxyOptions } from 'valaxy'
-import type { Plugin } from 'vite'
+export * from '../types/index.d'
 
-export * from '../config'
-export * from '../types'
-
-export interface UserOptions {
-  colors: {
-    primary: string
-  }
-}
-
-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: ${themeConfig.colors?.primary || '#0078E7'} !default;`,
-            },
-          },
-        },
-
-        optimizeDeps: {
-          exclude: ['@docsearch/js'],
-        },
-      }
-    },
-  }
-}
-
-export default defineThemePlugin((options) => {
-  return {
-    vite: {
-      plugins: [ThemeYunVitePlugin(options)],
-    },
-  }
-})
+export * from './config'
+export * from './unocss'

package/node/unocss.ts

@@ -0,0 +1,32 @@
+import type { ResolvedValaxyOptions } from 'valaxy'
+import type { ThemeUserConfig } from '../types'
+
+/**
+ * generateSafelist by config
+ * @param themeConfig
+ * @returns
+ */
+export function generateSafelist(options: ResolvedValaxyOptions<ThemeUserConfig>) {
+  const themeConfig = options.config.themeConfig || {}
+  const safelist = []
+
+  const types = themeConfig.types
+  if (types) {
+    for (const type in types)
+      safelist.push(types[type]?.icon)
+  }
+
+  if (themeConfig.footer?.icon?.name)
+    safelist.push(themeConfig.footer?.icon?.name)
+
+  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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-yun",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
@@ -12,15 +12,10 @@
     "url": "https://github.com/YunYouJun/valaxy/tree/main/packages/valaxy-theme-yun"
   },
   "exports": {
-    ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
-    },
     "./*": "./*"
   },
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
+  "main": "node/index.ts",
+  "types": "types/index.d.ts",
   "dependencies": {
     "@docsearch/css": "^3.1.1",
     "@docsearch/js": "^3.1.1",
@@ -28,10 +23,6 @@
     "@iconify-json/simple-icons": "^1.1.19"
   },
   "devDependencies": {
-    "valaxy": "0.9.3"
-  },
-  "scripts": {
-    "build": "rimraf dist && tsup",
-    "dev": "tsup --watch"
+    "valaxy": "0.10.0"
   }
 }

package/styles/layout/index.scss

@@ -2,7 +2,7 @@
 @use "./post" as *;
 
 .yun-main {
-  padding-left: var(--va-sidebar-width-mobile);
+  padding-left: var(--va-sidebar-width);
   transition: padding-left var(--va-transition-duration);
   box-sizing: border-box;
 }

package/types/{index.ts → index.d.ts}

@@ -1,3 +1,5 @@
+export * from '../composables'
+
 export namespace YunTheme {
   export type Config = ThemeConfig
   export type Sidebar = any

package/utils/index.ts

@@ -1,4 +1,4 @@
-import { anonymousImage } from '../config'
+export const anonymousImage = 'https://cdn.yunyoujun.cn/img/avatar/none.jpg'
 
 export const onImgError = (e: Event) => {
   (e.target as HTMLImageElement).src = anonymousImage

package/valaxy.config.ts

@@ -0,0 +1,40 @@
+import type { ResolvedValaxyOptions } from 'valaxy'
+import { defineTheme } from 'valaxy'
+import type { Plugin } from 'vite'
+import type { ThemeConfig } from './types'
+import { defaultThemeConfig, generateSafelist } from './node'
+
+function ThemeVitePlugin(options: ResolvedValaxyOptions<ThemeConfig>): Plugin {
+  const themeConfig = options.config.themeConfig || {}
+  return {
+    name: 'valaxy-theme-yun',
+    enforce: 'pre',
+    config() {
+      return {
+        css: {
+          preprocessorOptions: {
+            scss: {
+              additionalData: `$c-primary: ${themeConfig.colors?.primary || '#0078E7'} !default;`,
+            },
+          },
+        },
+
+        optimizeDeps: {
+          exclude: ['@docsearch/js'],
+        },
+      }
+    },
+  }
+}
+
+export default defineTheme<ThemeConfig>((options) => {
+  return {
+    themeConfig: defaultThemeConfig,
+    vite: {
+      plugins: [ThemeVitePlugin(options)],
+    },
+    unocss: {
+      safelist: generateSafelist(options),
+    },
+  }
+})

package/dist/index.d.ts

@@ -1,137 +0,0 @@
-import * as valaxy_dist_node from 'valaxy/dist/node';
-
-declare namespace YunTheme {
-    type Config = ThemeConfig;
-    type Sidebar = any;
-}
-/**
- * Theme Config
- */
-interface ThemeConfig {
-    /**
-     * toc title
-     * @default 'On this page'
-     */
-    outlineTitle: string;
-    colors: {
-        /**
-         * primary color
-         * @default '#0078E7'
-         */
-        primary: string;
-    };
-    /**
-     * 首页标语
-     */
-    banner: {
-        enable: boolean;
-        /**
-         * 标题
-         */
-        title: string;
-    };
-    bg_image: {
-        enable: boolean;
-        url: string;
-        dark?: string;
-        opacity?: number;
-    };
-    /**
-     * say something
-     * https://say.elpsy.cn
-     */
-    say: {
-        enable: boolean;
-        api: string;
-        hitokoto: {
-            enable: boolean;
-            api: string;
-        };
-    };
-    pages: {
-        name: string;
-        url: string;
-        icon: string;
-        color: string;
-    }[];
-    sidebar: YunTheme.Sidebar;
-    /**
-     * footer
-     */
-    footer: Partial<{
-        /**
-         * 建站于
-         */
-        since: number;
-        /**
-         * Icon between year and copyright info.
-         */
-        icon: {
-            /**
-             * icon name, i-xxx
-             */
-            name: string;
-            animated: boolean;
-            color: string;
-            url: string;
-            title: string;
-        };
-        /**
-         * Powered by valaxy & valaxy-theme-${name}, default is yun
-         */
-        powered: boolean;
-        /**
-         * Chinese Users | 中国用户
-         * 备案 ICP
-         * 国内用户需要在网站页脚展示备案 ICP 号
-         * https://beian.miit.gov.cn/
-         */
-        beian: {
-            enable: boolean;
-            /**
-             * 苏ICP备xxxxxxxx号
-             */
-            icp: string;
-        };
-    }>;
-    /**
-     * post card types
-     */
-    types: Record<string, {
-        color: string;
-        icon: string;
-    }>;
-    /**
-     * 菜单栏
-     */
-    menu: {
-        custom: {
-            title: string;
-            url: string;
-            icon: string;
-        };
-    };
-}
-declare type ThemeUserConfig = Partial<ThemeConfig>;
-
-declare const anonymousImage = "https://cdn.yunyoujun.cn/img/avatar/none.jpg";
-/**
- * Default Config
- */
-declare const defaultThemeConfig: ThemeConfig;
-
-/**
- * generateSafelist by config
- * @param themeConfig
- * @returns
- */
-declare function generateSafelist(themeConfig: ThemeUserConfig): string[];
-
-interface UserOptions {
-    colors: {
-        primary: string;
-    };
-}
-declare const _default: valaxy_dist_node.ThemeConfigExport;
-
-export { ThemeConfig, ThemeUserConfig, UserOptions, YunTheme, anonymousImage, _default as default, defaultThemeConfig, generateSafelist };

package/dist/index.js

@@ -1 +0,0 @@
-"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 +0,0 @@
-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/tsup.config.ts

@@ -1,16 +0,0 @@
-import { defineConfig } from 'tsup'
-
-export default defineConfig((options) => {
-  return {
-    entry: ['node/index.ts'],
-    // disable for dev watch before valaxy watch
-    clean: !options.watch,
-    dts: true,
-    format: ['cjs', 'esm'],
-    minify: !options.watch,
-    external: [
-      'valaxy',
-      'vite',
-    ],
-  }
-})