valaxy 0.22.3 → 0.22.5-beta.4

package/client/App.vue

@@ -1,3 +1,13 @@
+<script setup lang="ts">
+// import { defineAsyncComponent } from 'vue'
+/**
+ * @see @valaxyjs/devtools
+ */
+// const ValaxyDevtoolsEntry = import.meta.env
+//   ? defineAsyncComponent(() => import('@valaxyjs/devtools/src/client/components/ValaxyDevtoolsEntry.vue'))
+//   : () => null
+</script>
+
 <template>
   <ValaxyApp />
 </template>

package/client/components/ValaxyApp.vue

@@ -1,18 +1,6 @@
 <script setup lang="ts">
-import { definePerson, defineWebPage, defineWebSite, useSchemaOrg } from '@unhead/schema-org'
-import { useSeoMeta } from '@unhead/vue'
+import { useLayout, useValaxyApp } from '../composables'
 
-// TODO: add docs to override ValaxyApp
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import { useFrontmatter, useValaxyHead } from '../composables'
-import { useTimezone } from '../composables/global'
-
-// 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 './ValaxyAddons.vue'
 // @ts-expect-error virtual module
 import ValaxyThemeApp from '/@valaxyjs/ThemeAppVue'
@@ -22,57 +10,18 @@ import ValaxyUserApp from '/@valaxyjs/UserAppVue'
 // <link rel="apple-touch-icon" href="/pwa-192x192.png">
 // <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#00aba9">
 
-const siteConfig = useSiteConfig()
-// todo, allow user config
-const fm = useFrontmatter()
-
-const { locale } = useI18n()
-
-const title = computed(() => fm.value[`title_${locale.value}`] || fm.value.title)
-
-// seo
-// todo: get first image url from markdown
-const siteUrl = computed(() => fm.value.url || siteConfig.value.url)
-const description = computed(() => fm.value.excerpt || fm.value.description || siteConfig.value.description)
-
-useSeoMeta({
-  description,
-  ogDescription: description,
-  ogLocale: computed(() => locale.value || fm.value.lang || siteConfig.value.lang || 'en'),
-  ogLocaleAlternate: computed(() => siteConfig.value.languages.filter(l => l !== locale.value)),
-  ogSiteName: computed(() => siteConfig.value.title),
-  ogTitle: computed(() => fm.value.title || siteConfig.value.title),
-  ogImage: computed(() => fm.value.ogImage || fm.value.cover || siteConfig.value.favicon),
-  ogType: 'website',
-  ogUrl: siteUrl,
-})
-
-// for SEO
-useSchemaOrg([
-  // https://unhead.unjs.io/guide/guides/identity.html
-  // Personal Website or Blog
-  definePerson({
-    name: siteConfig.value.author.name,
-    url: siteUrl.value,
-    image: siteConfig.value.author.avatar,
-    sameAs: siteConfig.value.social.map(s => s.link),
-  }),
-  defineWebSite({
-    name: title.value,
-    datePublished: computed(() => fm.value.date),
-    dateModified: computed(() => fm.value.updated),
-  }),
-  defineWebPage(),
-])
-
-useTimezone()
+const layout = useLayout()
 
-useValaxyHead()
+if (layout.value !== 'empty') {
+  useValaxyApp()
+}
 </script>
 
 <template>
-  <ValaxyThemeApp />
-  <ValaxyAddons />
-  <ValaxyUserApp />
+  <template v-if="layout !== 'empty'">
+    <ValaxyThemeApp />
+    <ValaxyAddons />
+    <ValaxyUserApp />
+  </template>
   <router-view />
 </template>

package/client/components/ValaxySvgLogo.vue

@@ -1,5 +1,5 @@
 <template>
-  <svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <svg viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
     <mask id="mask0_757_102259" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="97" y="222" width="830" height="647">
       <path fill-rule="evenodd" clip-rule="evenodd" d="M729.48 756.469C729.478 756.471 729.475 756.473 729.472 756.475C729.606 756.361 729.625 756.36 729.48 756.469ZM690.046 767.723C685.618 766.845 680.868 765.982 675.803 765.143C634.63 758.32 576.843 753.701 512.383 753.12C447.923 752.538 390.063 756.114 348.774 762.193C343.694 762.941 338.929 763.717 334.486 764.515C338.914 765.394 343.664 766.256 348.729 767.095C389.902 773.918 447.689 778.537 512.149 779.119C576.609 779.7 634.469 776.124 675.758 770.045C680.838 769.298 685.603 768.521 690.046 767.723ZM295.261 752.552C295.118 752.441 295.137 752.442 295.269 752.558C295.266 752.556 295.264 752.554 295.261 752.552ZM295.052 775.769C295.054 775.768 295.057 775.766 295.06 775.764C294.926 775.877 294.907 775.878 295.052 775.769ZM729.263 779.68C729.266 779.682 729.268 779.684 729.271 779.686C729.413 779.798 729.395 779.796 729.263 779.68ZM511.932 803.118C642.542 804.296 748.572 788.686 748.756 768.252C748.941 747.819 643.21 730.299 512.6 729.121C381.99 727.942 275.96 743.552 275.776 763.986C275.591 784.42 381.322 801.939 511.932 803.118Z" fill="url(#paint0_linear_757_102259)" />
       <path fill-rule="evenodd" clip-rule="evenodd" d="M729.48 756.469C729.478 756.471 729.475 756.473 729.472 756.475C729.606 756.361 729.625 756.36 729.48 756.469ZM690.046 767.723C685.618 766.845 680.868 765.982 675.803 765.143C634.63 758.32 576.843 753.701 512.383 753.12C447.923 752.538 390.063 756.114 348.774 762.193C343.694 762.941 338.929 763.717 334.486 764.515C338.914 765.394 343.664 766.256 348.729 767.095C389.902 773.918 447.689 778.537 512.149 779.119C576.609 779.7 634.469 776.124 675.758 770.045C680.838 769.298 685.603 768.521 690.046 767.723ZM295.261 752.552C295.118 752.441 295.137 752.442 295.269 752.558C295.266 752.556 295.264 752.554 295.261 752.552ZM295.052 775.769C295.054 775.768 295.057 775.766 295.06 775.764C294.926 775.877 294.907 775.878 295.052 775.769ZM729.263 779.68C729.266 779.682 729.268 779.684 729.271 779.686C729.413 779.798 729.395 779.796 729.263 779.68ZM511.932 803.118C642.542 804.296 748.572 788.686 748.756 768.252C748.941 747.819 643.21 730.299 512.6 729.121C381.99 727.942 275.96 743.552 275.776 763.986C275.591 784.42 381.322 801.939 511.932 803.118Z" fill="url(#paint1_linear_757_102259)" />

package/client/composables/app/index.ts

@@ -1 +1,2 @@
+export * from './useValaxyApp'
 export * from './useValaxyHead'

package/client/composables/app/useValaxyApp.ts

@@ -0,0 +1,63 @@
+import { definePerson, defineWebPage, defineWebSite, useSchemaOrg } from '@unhead/schema-org'
+import { useSeoMeta } from '@unhead/vue'
+
+// TODO: add docs to override ValaxyApp
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { useFrontmatter, useValaxyHead } from '../../composables'
+import { useTimezone } from '../../composables/global'
+
+// 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'
+
+export function useValaxyApp() {
+  const siteConfig = useSiteConfig()
+  // todo, allow user config
+  const fm = useFrontmatter()
+
+  const { locale } = useI18n()
+
+  const title = computed(() => fm.value[`title_${locale.value}`] || fm.value.title)
+
+  // seo
+  // todo: get first image url from markdown
+  const siteUrl = computed(() => fm.value.url || siteConfig.value.url)
+  const description = computed(() => fm.value.excerpt || fm.value.description || siteConfig.value.description)
+
+  useSeoMeta({
+    description,
+    ogDescription: description,
+    ogLocale: computed(() => locale.value || fm.value.lang || siteConfig.value.lang || 'en'),
+    ogLocaleAlternate: computed(() => siteConfig.value.languages.filter(l => l !== locale.value)),
+    ogSiteName: computed(() => siteConfig.value.title),
+    ogTitle: computed(() => fm.value.title || siteConfig.value.title),
+    ogImage: computed(() => fm.value.ogImage || fm.value.cover || siteConfig.value.favicon),
+    ogType: 'website',
+    ogUrl: siteUrl,
+  })
+
+  // for SEO
+  useSchemaOrg([
+  // https://unhead.unjs.io/guide/guides/identity.html
+  // Personal Website or Blog
+    definePerson({
+      name: siteConfig.value.author.name,
+      url: siteUrl.value,
+      image: siteConfig.value.author.avatar,
+      sameAs: siteConfig.value.social.map(s => s.link),
+    }),
+    defineWebSite({
+      name: title.value,
+      datePublished: computed(() => fm.value.date),
+      dateModified: computed(() => fm.value.updated),
+    }),
+    defineWebPage(),
+  ])
+
+  useTimezone()
+
+  useValaxyHead()
+}

package/client/index.ts

@@ -5,6 +5,7 @@ export * from './config'
 
 // extend define
 export * from './define'
+
 export * from './setups'
 
 export * from './stores'

package/client/modules/devtools.ts

@@ -21,6 +21,7 @@ export async function addValaxyTabAndCommand() {
     // iframe view
     view: {
       type: 'iframe',
+      // src: import.meta.env.DEV ? 'http://localhost:5001/' : '/__valaxy_devtools__/',
       src: '/__valaxy_devtools__/',
     },
     // category: 'pinned',