valaxy 0.7.2 → 0.7.5

package/client/composables/post.ts

@@ -1,8 +1,7 @@
-import type { Ref, StyleValue } from 'vue'
+import type { Ref } from 'vue'
 import { computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
-import { useThemeConfig } from '../config'
 import { sortByDate } from '../utils'
 import type { Post } from '../../types'
 
@@ -85,37 +84,3 @@ export function usePrevNext(path?: string) {
 
   return [prev, next]
 }
-
-/**
- * get type card property
- * todo: test reactive
- */
-export function usePostProperty(type?: string) {
-  if (!type) {
-    return {
-      color: '',
-      icon: '',
-      styles: {},
-    }
-  }
-
-  const themeConfig = useThemeConfig()
-
-  if (!(type in themeConfig.value.types))
-    type = 'link'
-
-  const color = themeConfig.value.types[type].color
-  const icon = themeConfig.value.types[type].icon
-
-  const styles = computed(() => {
-    return {
-      '--card-c-primary': type && color,
-    } as StyleValue
-  })
-
-  return {
-    color,
-    icon,
-    styles,
-  }
-}

package/client/composables/sidebar.ts

@@ -1,52 +1,5 @@
 import type { Ref } from 'vue'
-import { computed, onMounted, onUnmounted, ref } from 'vue'
-import { useRoute } from 'vue-router'
-import { useThemeConfig } from '..'
-import { getSidebar } from '../utils/sidebar'
-import { useFrontmatter } from './common'
-
-// todo: refactor
-
-export function useSidebar() {
-  const route = useRoute()
-  const frontmatter = useFrontmatter()
-  const themeConfig = useThemeConfig()
-
-  const isOpen = ref(false)
-
-  const sidebar = computed(() => {
-    const sidebarConfig = themeConfig.value.sidebar
-    const relativePath = route.path
-
-    return sidebarConfig ? getSidebar(sidebarConfig, relativePath) : []
-  })
-
-  const hasSidebar = computed(() => {
-    // return frontmatter.value.sidebar !== false && sidebar.value.length > 0
-    return frontmatter.value.sidebar !== false
-  })
-
-  function open() {
-    isOpen.value = true
-  }
-
-  function close() {
-    isOpen.value = false
-  }
-
-  function toggle() {
-    isOpen.value ? close() : open()
-  }
-
-  return {
-    isOpen,
-    sidebar,
-    hasSidebar,
-    open,
-    close,
-    toggle,
-  }
-}
+import { onMounted, onUnmounted } from 'vue'
 
 export function useActiveSidebarLinks(container: Ref<HTMLElement>, marker: Ref<HTMLElement>) {
   const onScroll = throttleAndDebounce(setActiveLink, 200)

package/client/config.ts

@@ -1,10 +1,9 @@
 // @ts-expect-error virtual module @valaxyjs/config
-import valaxyConfig from '@valaxyjs/config'
+import valaxyConfig from '/@valaxyjs/config'
 // @ts-expect-error virtual module @valaxyjs/context
-import valaxyContext from '@valaxyjs/context'
+import valaxyContext from '/@valaxyjs/context'
 import type { ComputedRef, InjectionKey, Ref } from 'vue'
 import { computed, inject, readonly, shallowRef } from 'vue'
-import type { ThemeConfig } from 'valaxy-theme-yun'
 // import type { RouteMeta } from 'vue-router'
 import type { PageData, ValaxyConfig } from '../types'
 
@@ -22,7 +21,7 @@ interface ValaxyContext {
   userRoot: string
 }
 
-export const valaxyConfigSymbol: InjectionKey<ComputedRef<ValaxyConfig<ThemeConfig>>> = Symbol('valaxy:config')
+export const valaxyConfigSymbol: InjectionKey<ComputedRef<ValaxyConfig>> = Symbol('valaxy:config')
 export const valaxyConfigRef = shallowRef<ValaxyConfig>(parse<ValaxyConfig>(valaxyConfig))
 
 export const valaxyContextRef = shallowRef<ValaxyContext>(parse<ValaxyContext>(valaxyContext))
@@ -50,25 +49,17 @@ export function initContext() {
 }
 
 /*
- * get Config
+ * get valaxy config
+ * @public
  * @returns
  */
-export function useConfig() {
-  const config = inject(valaxyConfigSymbol)
+export function useConfig<ThemeConfig = any>() {
+  const config = inject<ComputedRef<ValaxyConfig<ThemeConfig>>>(valaxyConfigSymbol)
   if (!config)
     throw new Error('[Valaxy] config not properly injected in app')
   return config!
 }
 
-/**
- * getThemeConfig
- * @returns
- */
-export function useThemeConfig() {
-  const config = useConfig()
-  return computed(() => config!.value.themeConfig)
-}
-
 export interface ValaxyData<T = any> {
   page: Ref<PageData>
   theme: Ref<T>

package/client/index.ts

@@ -4,6 +4,3 @@ export * from './composables'
 export * from './utils'
 
 export * from './setups'
-
-// fix client alias export
-export * from '../shared'

package/client/main.ts

@@ -25,9 +25,6 @@ export const createApp = ViteSSG(
     },
   },
   (ctx) => {
-    // install all modules under `modules/`
-    Object.values(import.meta.globEager('./modules/*.ts')).forEach(i => i.install?.(ctx))
-
     setupMain(ctx)
   },
 )

package/client/setup/main.ts

@@ -1,11 +1,17 @@
 /* __imports__ */
-
 import type { ViteSSGContext } from 'vite-ssg'
+import { install as installValaxy } from '../modules/valaxy'
+import { install as installPinia } from '../modules/pinia'
+import { install as installNprogress } from '../modules/nprogress'
 
 export default function setupMain(ctx: ViteSSGContext) {
   // @ts-expect-error inject in runtime
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const injection_arg = ctx
 
+  installValaxy(ctx)
+  installPinia(ctx)
+  installNprogress(ctx)
+
   /* __injections__ */
 }

package/client/shims.d.ts

@@ -17,13 +17,13 @@ declare module '*.vue' {
 }
 
 // vite hmr data
-declare module '@valaxyjs/config' {
+declare module '/@valaxyjs/config' {
   // import type { ValaxyConfig } from 'valaxy'
   const config: string
   export default config
 }
 
-declare module '@valaxyjs/context' {
+declare module '/@valaxyjs/context' {
   const ctx: string
   export default ctx
 }

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;