fix: seo error

Signed-off-by: Innei <[email protected]>

Author: Innei

src/app/config.d.ts

@@ -1,5 +1,26 @@
 import type { ScriptProps } from 'next/script'
 
+export interface LinkSection {
+  name: string
+  links: {
+    name: string
+    href: string
+    external?: boolean
+  }[]
+}
+
+export interface OtherInfo {
+  date: string
+  icp?: {
+    text: string
+    link: string
+  }
+}
+export interface AppThemeConfig {
+  config: AppConfig
+  footer: FooterConfig
+}
+
 export interface AppConfig {
   site: Site
   hero: Hero

src/app/layout.tsx

@@ -2,14 +2,14 @@ import '../styles/index.css'
 
 import { Analytics } from '@vercel/analytics/react'
 import type { AggregateRoot } from '@mx-space/api-client'
+import type { AppThemeConfig } from './config'
 
 import { ClerkProvider } from '@clerk/nextjs'
 
 import PKG from '~/../package.json'
 import { Root } from '~/components/layout/root/Root'
 import { TocAutoScroll } from '~/components/widgets/toc/TocAutoScroll'
 import { attachUA } from '~/lib/attach-ua'
-import { defineMetadata } from '~/lib/define-metadata'
 import { sansFont, serifFont } from '~/lib/fonts'
 import { getQueryClient } from '~/lib/query-client.server'
 import { AggregationProvider } from '~/providers/root/aggregation-data-provider'
@@ -25,12 +25,21 @@ init()
 
 export const revalidate = 60
 
-let aggregationData: (AggregateRoot & { theme: any }) | null = null
-export const generateMetadata = defineMetadata(async (_, getData) => {
-  const fetchedData = aggregationData ?? (await getData())
-  // @ts-ignore
+let aggregationData: (AggregateRoot & { theme: AppThemeConfig }) | null = null
+export const generateMetadata = async () => {
+  const queryClient = await getQueryClient()
+
+  const fetchedData =
+    aggregationData ??
+    (await queryClient.fetchQuery(queries.aggregation.root()))
+
   aggregationData = fetchedData
-  const { seo, url, user, theme: config } = fetchedData
+  const {
+    seo,
+    url,
+    user,
+    theme: { config },
+  } = fetchedData
 
   return {
     metadataBase: new URL(url.webUrl),
@@ -86,7 +95,7 @@ export const generateMetadata = defineMetadata(async (_, getData) => {
       description: seo.description,
     },
   }
-})
+}
 
 type Props = {
   children: React.ReactNode

src/components/layout/footer/FooterInfo.tsx

@@ -1,4 +1,5 @@
 import Link from 'next/link'
+import type { FooterConfig } from './config'
 
 import { SubscribeTextButton } from '~/components/widgets/subscribe/SubscribeTextButton'
 import { clsxm } from '~/lib/helper'
@@ -24,7 +25,7 @@ const FooterLinkSection = async () => {
   const queryClient = await getQueryClient()
   const data = await queryClient.fetchQuery(queries.aggregation.root())
   const { footer } = data.theme
-  const footerConfig = footer || {
+  const footerConfig: FooterConfig = footer || {
     linkSections: defaultLinkSections,
   }
 

src/components/layout/footer/config.ts

@@ -1,19 +1,5 @@
-export interface LinkSection {
-  name: string
-  links: {
-    name: string
-    href: string
-    external?: boolean
-  }[]
-}
+import type { LinkSection, OtherInfo } from '~/app/config'
 
-export interface OtherInfo {
-  date: string
-  icp?: {
-    text: string
-    link: string
-  }
-}
 export const defaultLinkSections: LinkSection[] = [
   {
     name: '关于',

src/queries/definition/aggregation.ts

@@ -1,7 +1,6 @@
 import { isServer } from '@tanstack/react-query'
 import type { AggregateRoot } from '@mx-space/api-client'
-import type { AppConfig } from '~/app/config'
-import type { FooterConfig } from '~/components/layout/footer/config'
+import type { AppThemeConfig } from '~/app/config'
 
 import { apiClient } from '~/lib/request'
 
@@ -15,7 +14,7 @@ export const aggregation = {
         apiClient.aggregate.getAggregateData('shiro').then(
           (res) =>
             res.$serialized as AggregateRoot & {
-              theme: { footer: FooterConfig; config: AppConfig }
+              theme: AppThemeConfig
             },
         ),
       cacheTime: 1000 * 60 * 10,