valaxy 0.8.1 → 0.9.2

package/client/App.vue

@@ -8,6 +8,10 @@ import { isDark } from './composables'
 // they will be rendered correctly in the html results with vite-ssg
 import { useConfig } from './config'
 
+// <link rel="apple-touch-icon" href="/pwa-192x192.png">
+// <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#00aba9">
+// <meta name="msapplication-TileColor" content = "#00aba9" >
+
 const config = useConfig()
 useHead({
   title: config.value.title,

package/client/composables/comments/index.ts

@@ -1,2 +1,3 @@
 export * from './twikoo'
-export * from './waline'
+// import on demand
+// export * from './waline'

package/client/composables/common.ts

@@ -1,8 +1,8 @@
 import { useRoute } from 'vue-router'
-import { computed } from 'vue'
+import { computed, inject } from 'vue'
 import { isClient } from '@vueuse/core'
 
-import type { Post } from '../../types'
+import type { PageData, Post } from '../../types'
 import { useConfig } from '../config'
 
 export function useFrontmatter() {
@@ -12,6 +12,15 @@ export function useFrontmatter() {
   return frontmatter
 }
 
+/**
+ * inject pageData
+ * @returns
+ */
+export function useData(): PageData {
+  const value = inject<PageData>('pageData', {} as any)
+  return value
+}
+
 /**
  * get full url
  */

package/client/composables/post.ts

@@ -48,7 +48,7 @@ export function usePostList(params: {
  */
 export function usePageList() {
   const router = useRouter()
-  return computed(() => {
+  return computed<Post[]>(() => {
     const routes = router.getRoutes()
       .map((i) => {
         return Object.assign({ path: i.path, excerpt: i.meta.excerpt }, i.meta.frontmatter)

package/client/composables/sidebar.ts

@@ -1,5 +1,6 @@
+import { useFrontmatter } from 'valaxy'
 import type { Ref } from 'vue'
-import { onMounted, onUnmounted } from 'vue'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
 
 export function useActiveSidebarLinks(container: Ref<HTMLElement>, marker: Ref<HTMLElement>) {
   const onScroll = throttleAndDebounce(setActiveLink, 200)
@@ -111,3 +112,37 @@ function throttleAndDebounce(fn: () => void, delay: number): () => void {
     }
   }
 }
+
+/**
+ * helper for sidebar
+ */
+export function useSidebar() {
+  const isOpen = ref(false)
+  const fm = useFrontmatter()
+  const hasSidebar = computed(() => {
+    return (
+      fm.value.sidebar !== false
+      && fm.value.layout !== 'home'
+    )
+  })
+
+  function open() {
+    isOpen.value = true
+  }
+
+  function close() {
+    isOpen.value = false
+  }
+
+  function toggle() {
+    isOpen.value ? close() : open()
+  }
+
+  return {
+    isOpen,
+    hasSidebar,
+    open,
+    close,
+    toggle,
+  }
+}

package/client/config.ts

@@ -2,13 +2,13 @@
 import valaxyConfig from '/@valaxyjs/config'
 // @ts-expect-error virtual module @valaxyjs/context
 import valaxyContext from '/@valaxyjs/context'
-import type { ComputedRef, InjectionKey, Ref } from 'vue'
+import type { ComputedRef, InjectionKey } from 'vue'
 import { computed, inject, readonly, shallowRef } from 'vue'
 // import type { RouteMeta } from 'vue-router'
 // fix build caused by pnpm
 // This is likely not portable. A type annotation is necessary.
 // https://github.com/microsoft/TypeScript/issues/42873
-import type { PageData, ValaxyConfig } from 'valaxy/types'
+import type { ValaxyConfig } from 'valaxy/types'
 
 /**
  * parse valaxy config
@@ -28,7 +28,6 @@ export const valaxyConfigSymbol: InjectionKey<ComputedRef<ValaxyConfig>> = Symbo
 export const valaxyConfigRef = shallowRef<ValaxyConfig>(parse<ValaxyConfig>(valaxyConfig))
 
 export const valaxyContextRef = shallowRef<ValaxyContext>(parse<ValaxyContext>(valaxyContext))
-// export const valaxyDataRef = shallowRef<PageData>(parse(valaxyConfig))
 
 // hmr
 if (import.meta.hot) {
@@ -63,7 +62,13 @@ export function useConfig<ThemeConfig = any>() {
   return config!
 }
 
-export interface ValaxyData<T = any> {
-  page: Ref<PageData>
-  theme: Ref<T>
+/**
+ * You can use like this: import { useThemeConfig } from 'valaxy-theme-xxx'
+ * if you want to: import { useThemeConfig } from 'valaxy'
+ * you need pass themeConfig by yourself
+ * @returns
+ */
+export function useThemeConfig<T = Record<string, any>>() {
+  const config = useConfig<T>()
+  return computed(() => config!.value.themeConfig)
 }

package/client/index.html

@@ -4,25 +4,19 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="apple-touch-icon" href="/pwa-192x192.png">
-  <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#00aba9">
-  <meta name="msapplication-TileColor" content="#00aba9">
-  <meta name="theme-color" content="#ffffff">
   <script>
     (function () {
-      const prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
-      const setting = localStorage.getItem('vueuse-color-scheme') || 'auto'
-      if (setting === 'dark' || (prefersDark && setting !== 'light'))
-        document.documentElement.classList.toggle('dark', true)
       const locale = localStorage.getItem('valaxy-locale') || 'en'
       document.documentElement.setAttribute('lang', locale)
     })()
   </script>
+  <!-- head -->
 </head>
 
-<body class="font-sans">
+<body>
   <div id="app"></div>
-  <script type="module" src="/main.ts"></script>
+  <script type="module" src="__ENTRY__"></script>
+  <!-- body -->
 </body>
 
 </html>

package/client/setups.ts

@@ -1,16 +1,10 @@
 import type { ViteSSGContext } from 'vite-ssg'
 import type { Awaitable } from '@antfu/utils'
-import type { VitePluginConfig as UnoCssConfig } from 'unocss/vite'
 
 type AppContext = ViteSSGContext
 
 export type AppSetup = (ctx: AppContext) => Awaitable<void>
-export type UnoSetup = () => Awaitable<Partial<UnoCssConfig> | undefined>
 
 export function defineAppSetup(fn: AppSetup) {
   return fn
 }
-
-export function defineUnoSetup(fn: UnoSetup) {
-  return fn
-}

package/client/styles/common/markdown.scss

@@ -1,9 +1,5 @@
 @use "sass:map";
 
-.markdown-body {
-  --smc-font-family: var(--va-font-sans);
-}
-
 // for anchor
 h1:hover .header-anchor,
 h1:focus .header-anchor,

package/client/styles/global/i18n.scss

@@ -8,7 +8,8 @@ html[lang] {
     h4[lang],
     h5[lang],
     h6[lang],
-    div[lang] {
+    div[lang],
+    span[lang] {
       display: none;
     }
   }
@@ -32,7 +33,8 @@ html[lang] {
       h4[lang="#{$lang}"],
       h5[lang="#{$lang}"],
       h6[lang="#{$lang}"],
-      div[lang="#{$lang}"] {
+      div[lang="#{$lang}"],
+      span[lang="#{$lang}"] {
         display: block;
       }
     }

package/client/styles/global/index.scss

@@ -1,7 +1,6 @@
 html,
 body,
 #app {
-  height: 100%;
   margin: 0;
   padding: 0;
 

package/client/styles/index.scss

@@ -10,7 +10,6 @@ $c-primary: #0078e7 !default;
 @use "./global/nprogress.scss" as *;
 
 // common
-@use "./common/button.scss" as *;
 @use "./common/code.scss" as *;
 @use "./common/custom-blocks.scss" as *;
 @use "./common/hamburger.scss" as *;
@@ -24,8 +23,3 @@ $c-primary: #0078e7 !default;
 
 // markdown
 @use "./common/markdown.scss";
-@forward "star-markdown-css/src/scss/theme/yun.scss" with (
-  $colors: (
-    "primary": $c-primary,
-  )
-);

package/client/styles/palette.scss

@@ -53,6 +53,8 @@ $light: map.merge(
     "c-bg": white,
     "c-bg-light": white,
     "c-bg-dark": #fafafa,
+
+    "c-bg-soft": white,
     "c-bg-alt": #f9f9f9,
     "c-bg-mute": #f1f1f1,
 
@@ -81,8 +83,10 @@ $dark: map.merge(
     "c-bg": #1a1a1a,
     "c-bg-light": #1d1e1f,
     "c-bg-dark": #1a1a1a,
-    "c-bg-alt": #1a1a1a,
+
+    "c-bg-soft": #1d1e1f,
     "c-bg-mute": #2f2f2f,
+    "c-bg-alt": #1a1a1a,
 
     "c-text": #f2f2f2,
     "c-text-light": #ddd,

package/client/utils/helper.ts

@@ -1,3 +1,5 @@
+export const EXTERNAL_URL_RE = /^https?:/i
+
 /**
  * 生成介于 min 与 max 之间的随机数
  * @returns

package/client/vite.config.ts

@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite'
+
+export default defineConfig({})

package/dist/chunk-B2L4QLCB.mjs

@@ -0,0 +1 @@
+var g=Object.create;var f=Object.defineProperty;var h=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var j=Object.getPrototypeOf,k=Object.prototype.hasOwnProperty;var m=(a=>typeof require!="undefined"?require:typeof Proxy!="undefined"?new Proxy(a,{get:(b,c)=>(typeof require!="undefined"?require:b)[c]}):a)(function(a){if(typeof require!="undefined")return require.apply(this,arguments);throw new Error('Dynamic require of "'+a+'" is not supported')});var n=(a,b)=>()=>(b||a((b={exports:{}}).exports,b),b.exports);var l=(a,b,c,e)=>{if(b&&typeof b=="object"||typeof b=="function")for(let d of i(b))!k.call(a,d)&&d!==c&&f(a,d,{get:()=>b[d],enumerable:!(e=h(b,d))||e.enumerable});return a};var o=(a,b,c)=>(c=a!=null?g(j(a)):{},l(b||!a||!a.__esModule?f(c,"default",{value:a,enumerable:!0}):c,a));export{m as a,n as b,o as c};

package/dist/chunk-KRHFRLOW.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var g=Object.create;var f=Object.defineProperty;var h=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var j=Object.getPrototypeOf,k=Object.prototype.hasOwnProperty;var m=(a=>typeof require!="undefined"?require:typeof Proxy!="undefined"?new Proxy(a,{get:(b,c)=>(typeof require!="undefined"?require:b)[c]}):a)(function(a){if(typeof require!="undefined")return require.apply(this,arguments);throw new Error('Dynamic require of "'+a+'" is not supported')});var n=(a,b)=>()=>(b||a((b={exports:{}}).exports,b),b.exports);var l=(a,b,c,e)=>{if(b&&typeof b=="object"||typeof b=="function")for(let d of i(b))!k.call(a,d)&&d!==c&&f(a,d,{get:()=>b[d],enumerable:!(e=h(b,d))||e.enumerable});return a};var o=(a,b,c)=>(c=a!=null?g(j(a)):{},l(b||!a||!a.__esModule?f(c,"default",{value:a,enumerable:!0}):c,a));exports.a = m; exports.b = n; exports.c = o;