valaxy 0.16.0 → 0.16.1

package/client/App.vue

@@ -11,13 +11,13 @@ import pkg from 'valaxy/package.json'
 import { useI18n } from 'vue-i18n'
 import { definePerson, defineWebPage, defineWebSite, useSchemaOrg } from '@unhead/schema-org'
 import dayjs from 'dayjs'
-import ValaxyAddons from './components/ValaxyAddons.vue'
-import { isDark, useFrontmatter } from './composables'
 
 // https://github.com/vueuse/head
 // you can use this to manipulate the document head in any components,
 // they will be rendered correctly in the html results with vite-ssg
 import { useSiteConfig } from './config'
+import ValaxyAddons from './components/ValaxyAddons.vue'
+import { isDark, useFrontmatter } from './composables'
 
 // <link rel="apple-touch-icon" href="/pwa-192x192.png">
 // <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#00aba9">

package/client/composables/features/copy-code.ts

@@ -3,7 +3,7 @@ import { isClient } from '@vueuse/core'
 
 export function useCopyCode() {
   if (isClient) {
-    const timeoutIdMap: WeakMap<HTMLElement, NodeJS.Timeout> = new WeakMap()
+    const timeoutIdMap: WeakMap<HTMLElement, ReturnType<typeof setTimeout>> = new WeakMap()
     window.addEventListener('click', (e) => {
       const el = e.target as HTMLElement
       if (el.matches('div[class*="language-"] > button.copy')) {

package/client/main.ts

@@ -2,6 +2,8 @@ import type { ViteSSGContext } from 'vite-ssg'
 import { ViteSSG } from 'vite-ssg'
 import generatedRoutes from 'virtual:generated-pages'
 import { setupLayouts } from 'virtual:generated-layouts'
+
+import { initValaxyConfig, valaxyConfigSymbol } from 'valaxy'
 import AppLink from './components/AppLink.vue'
 
 import App from './App.vue'
@@ -46,7 +48,12 @@ export const createApp = ViteSSG(
     },
   },
   (ctx) => {
+    // app-level provide
+    const { app } = ctx
+    const config = initValaxyConfig()
+    app.provide(valaxyConfigSymbol, config)
+
     registerComponents(ctx)
-    setupMain(ctx)
+    setupMain(ctx, config)
   },
 )

package/client/modules/valaxy.ts

@@ -12,9 +12,10 @@ import { useStorage } from '@vueuse/core'
 
 import type { Router } from 'vue-router'
 import { ensureSuffix } from '@antfu/utils'
-import type { UserModule } from 'valaxy/client/types'
+import type { ComputedRef } from 'vue'
+import type { ViteSSGContext } from 'vite-ssg'
+import type { DefaultTheme, ValaxyConfig } from 'valaxy/types'
 import type { PageDataPayload } from '../../types'
-import { initValaxyConfig, valaxyConfigSymbol } from '../config'
 
 // @ts-expect-error virtual
 import valaxyMessages from '/@valaxyjs/locales'
@@ -42,12 +43,8 @@ function shouldHotReload(payload: PageDataPayload): boolean {
   return ensureSuffix('/', payloadPath) === ensureSuffix('/', locationPath)
 }
 
-export const install: UserModule = ({ app, router }) => {
-  // inject valaxy config before modules
-  const config = initValaxyConfig()
-  app.provide(valaxyConfigSymbol, config)
-
-  const locale = useStorage('valaxy-locale', config.value.siteConfig.lang || 'en')
+export function install({ app, router }: ViteSSGContext, config: ComputedRef<ValaxyConfig<DefaultTheme.Config>>) {
+  const locale = useStorage('valaxy-locale', config?.value.siteConfig.lang || 'en')
 
   // init i18n, by valaxy config
   const i18n = createI18n({

package/client/setup/main.ts

@@ -6,17 +6,25 @@ import relativeTime from 'dayjs/plugin/relativeTime'
 import utc from 'dayjs/plugin/utc'
 import timezone from 'dayjs/plugin/timezone'
 
+import type { ComputedRef } 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 { DefaultTheme, ValaxyConfig } from 'valaxy/types'
+
 import { install as installValaxy } from '../modules/valaxy'
 import { install as installPinia } from '../modules/pinia'
 import { install as installNprogress } from '../modules/nprogress'
 import { install as installSchema } from '../modules/schemaOrg'
 
-export default function setupMain(ctx: ViteSSGContext) {
+export default function setupMain(ctx: ViteSSGContext, config: ComputedRef<ValaxyConfig<DefaultTheme.Config>>) {
   // @ts-expect-error inject in runtime
   // eslint-disable-next-line unused-imports/no-unused-vars
   const injection_arg = ctx
 
-  installValaxy(ctx)
+  installValaxy(ctx, config)
 
   installSchema(ctx)