chore: resolve code conflicts

YunYouJun · Oct 31, 2024 · 12372aa · 12372aa
1 parent 5018805
commit 12372aa
Show file tree

Hide file tree

Showing 6 changed files with 1,058 additions and 959 deletions.
diff --git a/packages/valaxy/client/components/ValaxyApp.vue b/packages/valaxy/client/components/ValaxyApp.vue
@@ -1,22 +1,22 @@
 <script setup lang="ts">
 // TODO: add docs to override ValaxyApp
 import { computed } from 'vue'
-import { useHead, useSeoMeta } from '@unhead/vue'
+// import { useHead, useSeoMeta } from '@unhead/vue'
+import { useSeoMeta } from '@unhead/vue'
 
 // @ts-expect-error virtual module
 import ValaxyUserApp from '/@valaxyjs/UserAppVue'
 // @ts-expect-error virtual module
 import ValaxyThemeApp from '/@valaxyjs/ThemeAppVue'
 
-import pkg from 'valaxy/package.json'
 import { useI18n } from 'vue-i18n'
 import { definePerson, defineWebPage, defineWebSite, useSchemaOrg } from '@unhead/schema-org'
 
 // 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 { useFrontmatter } from '../composables'
+import { useFrontmatter, useValaxyHead } from '../composables'
 import { useTimezone } from '../composables/global'
 import ValaxyAddons from './ValaxyAddons.vue'
 
@@ -30,38 +30,6 @@ const fm = useFrontmatter()
 const { locale } = useI18n()
 
 const title = computed(() => fm.value[`title_${locale.value}`] || fm.value.title)
-useHead({
-  title,
-  titleTemplate: computed(() => fm.value.titleTemplate || ((title: string) => title ? `${title} - ${siteConfig.value.title}` : siteConfig.value.title)),
-  link: [
-    {
-      rel: 'icon',
-      href: siteConfig.value.favicon,
-      type: siteConfig.value.favicon?.endsWith('svg') ? 'image/svg+xml' : 'image/png',
-    },
-  ],
-  meta: [
-    { name: 'description', content: computed(() => siteConfig.value.description) },
-    {
-      name: 'generator',
-      content: `Valaxy ${pkg.version}`,
-    },
-  ],
-
-  templateParams: {
-    schemaOrg: {
-      host: siteConfig.value.url,
-    },
-  },
-
-  script: [
-    {
-      id: 'check-mac-os',
-      innerHTML: `document.documentElement.classList.toggle('mac', /Mac|iPhone|iPod|iPad/i.test(navigator.platform))`,
-      async: true,
-    },
-  ],
-})
 
 // seo
 // todo: get first image url from markdown
@@ -99,6 +67,8 @@ useSchemaOrg([
 ])
 
 useTimezone()
+
+useValaxyHead()
 </script>
 
 <template>

diff --git a/packages/valaxy/client/composables/app/index.ts b/packages/valaxy/client/composables/app/index.ts
@@ -0,0 +1 @@
+export * from './useValaxyHead'
diff --git a/packages/valaxy/client/composables/app/useValaxyHead.ts b/packages/valaxy/client/composables/app/useValaxyHead.ts
@@ -0,0 +1,47 @@
+import { computed } from 'vue'
+import pkg from 'valaxy/package.json'
+import { useHead } from '@unhead/vue'
+import { useI18n } from 'vue-i18n'
+
+import { useSiteConfig } from '../../config'
+import { useFrontmatter } from '../../composables'
+
+export function useValaxyHead() {
+  const { locale } = useI18n()
+
+  const fm = useFrontmatter()
+  const siteConfig = useSiteConfig()
+  const title = computed(() => fm.value[`title_${locale.value}`] || fm.value.title)
+  useHead({
+    title,
+    titleTemplate: computed(() => fm.value.titleTemplate || ((title: string) => title ? `${title} - ${siteConfig.value.title}` : siteConfig.value.title)),
+    link: [
+      {
+        rel: 'icon',
+        href: siteConfig.value.favicon,
+        type: siteConfig.value.favicon?.endsWith('svg') ? 'image/svg+xml' : 'image/png',
+      },
+    ],
+    meta: [
+      { name: 'description', content: computed(() => siteConfig.value.description) },
+      {
+        name: 'generator',
+        content: `Valaxy ${pkg.version}`,
+      },
+    ],
+
+    templateParams: {
+      schemaOrg: {
+        host: siteConfig.value.url,
+      },
+    },
+
+    script: [
+      {
+        id: 'check-mac-os',
+        innerHTML: `document.documentElement.classList.toggle('mac', /Mac|iPhone|iPod|iPad/i.test(navigator.platform))`,
+        async: true,
+      },
+    ],
+  })
+}
diff --git a/packages/valaxy/client/composables/index.ts b/packages/valaxy/client/composables/index.ts
@@ -20,3 +20,6 @@ export * from './outline'
 export * from './back'
 export * from './decrypt'
 export * from './search'
+
+// app
+export * from './app'
diff --git a/packages/valaxy/package.json b/packages/valaxy/package.json
@@ -120,7 +120,6 @@
     "pathe": "^1.1.2",
     "pinia": "^2.2.5",
     "qrcode": "^1.5.4",
-    "resolve": "^1.22.8",
     "resolve-global": "^2.0.0",
     "sass": "^1.80.5",
     "shiki": "^1.22.2",
@@ -132,9 +131,9 @@
     "vanilla-lazyload": "^19.1.3",
     "vite": "^5.4.10",
     "vite-plugin-vue-devtools": "^7.5.6",
-    "vite-plugin-vue-layouts": "0.11.0",
-    "vite-ssg": "0.23.7",
-    "vite-ssg-sitemap": "0.6.1",
+    "vite-plugin-vue-layouts": "^0.11.0",
+    "vite-ssg": "^0.24.0",
+    "vite-ssg-sitemap": "^0.8.1",
     "vue": "^3.5.12",
     "vue-i18n": "^10.0.4",
     "vue-router": "^4.4.5",