valaxy 0.22.12 → 0.22.14

package/client/app/data.ts

@@ -0,0 +1,19 @@
+import type { Ref } from 'vue'
+import type { Router } from 'vue-router'
+import type { PageData } from '../../types'
+import { computed } from 'vue'
+
+export interface ValaxyData {
+  page: Ref<PageData>
+}
+
+/**
+ * init valaxy data
+ */
+export function initData(router: Router): ValaxyData {
+  return {
+    page: computed(() => (router.currentRoute.value as unknown as {
+      data: PageData
+    }).data),
+  }
+}

package/client/components/ValaxyOverlay.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 withDefaults(defineProps<{
-  show: boolean
+  show?: boolean
 }>(), {
   show: false,
 })

package/client/composables/common.ts

@@ -1,9 +1,10 @@
-import type { PageData, PostFrontMatter } from 'valaxy/types'
+import type { PostFrontMatter } from 'valaxy/types'
+import type { ValaxyData } from '../app/data'
 import { isClient } from '@vueuse/core'
-import { computed, inject } from 'vue'
 
+import { computed, inject } from 'vue'
 import { useRoute } from 'vue-router'
-import { useSiteConfig } from '../config'
+import { dataSymbol, useSiteConfig } from '../config'
 
 /**
  * Get `route.meta.frontmatter` from your markdown file
@@ -71,9 +72,12 @@ export function useEncryptedPhotos() {
 /**
  * inject pageData
  */
-export function useData(): PageData {
-  const value = inject<PageData>('pageData', {} as any)
-  return value
+export function useData(): ValaxyData {
+  const data = inject(dataSymbol, {} as any)
+  if (!data) {
+    throw new Error('Valaxy data not properly injected in app')
+  }
+  return data
 }
 
 /**

package/client/config.ts

@@ -5,10 +5,11 @@
 import type { DefaultTheme, ValaxyConfig } from 'valaxy/types'
 
 import type { ComputedRef, InjectionKey } from 'vue'
+import type { ValaxyData } from './app/data'
 import { computed, inject, readonly, shallowRef } from 'vue'
+
 // @ts-expect-error virtual module @valaxyjs/config
 import valaxyConfig from '/@valaxyjs/config'
-
 // @ts-expect-error virtual module @valaxyjs/context
 import valaxyContext from '/@valaxyjs/context'
 
@@ -28,6 +29,8 @@ interface ValaxyContext {
 export const valaxyConfigSymbol: InjectionKey<ComputedRef<ValaxyConfig>> = Symbol('valaxy:config')
 export const valaxyConfigRef = shallowRef<ValaxyConfig>(parse<ValaxyConfig>(valaxyConfig))
 
+export const dataSymbol: InjectionKey<ValaxyData> = Symbol('ValaxyData')
+
 export const valaxyContextRef = shallowRef<ValaxyContext>(parse<ValaxyContext>(valaxyContext))
 
 valaxyConfigRef.value = parse<ValaxyConfig>(valaxyConfig)

package/client/main.ts

@@ -1,6 +1,6 @@
 import type { ViteSSGContext } from 'vite-ssg'
 import { DataLoaderPlugin } from 'unplugin-vue-router/data-loaders'
-import { initValaxyConfig, valaxyConfigSymbol } from 'valaxy'
+import { dataSymbol, initValaxyConfig, valaxyConfigSymbol } from 'valaxy'
 import { setupLayouts } from 'virtual:generated-layouts'
 import { ViteSSG } from 'vite-ssg'
 
@@ -8,11 +8,12 @@ import { routes } from 'vue-router/auto-routes'
 // import App from '/@valaxyjs/App.vue'
 import App from './App.vue'
 
+import { initData } from './app/data'
 import AppLink from './components/AppLink.vue'
+
 import setupMain from './setup/main'
 
 import { setupValaxyDevTools } from './utils/dev'
-
 // generate user styles
 import '#valaxy/styles'
 
@@ -71,6 +72,9 @@ export const createApp = ViteSSG(
     // app-level provide
     const { app, router } = ctx
 
+    const data = initData(router)
+    app.provide(dataSymbol, data)
+
     // Register the plugin before the router
     app.use(DataLoaderPlugin, { router })