valaxy 0.18.0-beta.0 → 0.18.0-beta.2

package/client/composables/{post.ts → post/index.ts}

@@ -1,10 +1,11 @@
 import type { ComputedRef } from 'vue'
 import { computed } from 'vue'
-import { useRoute } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import type { Post } from 'valaxy'
-import { sortByDate } from '../utils'
-import { useRouterStore, useSiteStore } from '../stores'
+import { sortByDate } from '../../utils'
+import { useRouterStore } from '../../stores'
+
+export * from './usePrevNext'
 
 export function usePostTitle(post: ComputedRef<Post>) {
   const { locale } = useI18n()
@@ -62,30 +63,3 @@ export function usePostList(params: {
     return topPosts.concat(otherPosts)
   })
 }
-
-/**
- * get prev and next post
- * @param path
- */
-export function usePrevNext(path?: string) {
-  const route = useRoute()
-  const p = computed(() => path || route.path)
-  const site = useSiteStore()
-
-  const index = computed(() => {
-    let order = -1
-    site.postList.find((item, i) => {
-      if (item.path === p.value) {
-        order = i
-        return true
-      }
-      return false
-    })
-    return order
-  })
-
-  const prev = computed(() => index.value - 1 >= 0 ? site.postList[index.value - 1] : null)
-  const next = computed(() => index.value + 1 < site.postList.length ? site.postList[index.value + 1] : null)
-
-  return [prev, next]
-}

package/client/composables/post/usePrevNext.ts

@@ -0,0 +1,30 @@
+import { computed } from 'vue'
+import { useRoute } from 'vue-router'
+import { useSiteStore } from '../../stores'
+
+/**
+ * get prev and next post
+ * @param path
+ */
+export function usePrevNext(path?: string) {
+  const route = useRoute()
+  const p = computed(() => path || route.path)
+  const site = useSiteStore()
+
+  const index = computed(() => {
+    let order = -1
+    site.postList.find((item, i) => {
+      if (item.path === p.value) {
+        order = i
+        return true
+      }
+      return false
+    })
+    return order
+  })
+
+  const prev = computed(() => index.value - 1 >= 0 ? site.postList[index.value - 1] : null)
+  const next = computed(() => index.value + 1 < site.postList.length ? site.postList[index.value + 1] : null)
+
+  return [prev, next]
+}

package/client/main.ts

@@ -20,6 +20,7 @@ import '/@valaxyjs/styles'
 import 'uno.css'
 
 import setupMain from './setup/main'
+import { initDevToolsClientLogic } from './utils/dev'
 
 const valaxyConfig = initValaxyConfig()
 
@@ -58,6 +59,9 @@ const routesWithLayout = setupLayouts(import.meta.env.DEV
   : filterDraft(routes),
 )
 
+if (import.meta.env.DEV)
+  initDevToolsClientLogic()
+
 // https://github.com/antfu/vite-ssg
 export const createApp = ViteSSG(
   App,

package/client/modules/devtools.ts

@@ -21,7 +21,7 @@ export async function addValaxyTabAndCommand() {
     // iframe view
     view: {
       type: 'iframe',
-      src: 'https://valaxy.site',
+      src: '/__valaxy_devtools__/',
     },
     // category: 'pinned',
     category: 'app',

package/client/modules/valaxy.ts

@@ -63,6 +63,9 @@ function handleHMR(router: Router): void {
   if (import.meta.hot) {
     import.meta.hot.on('valaxy:pageData', (payload: PageDataPayload) => {
       if (shouldHotReload(payload)) {
+        // @ts-expect-error $pageData
+        window.$pageData = payload.pageData
+
         // console.log(payload.pageData.headers)
         Object.assign(router.currentRoute.value.meta, payload.pageData)
       }

package/client/setup/main.ts

@@ -26,12 +26,6 @@ export default function setupMain(ctx: ViteSSGContext, config: ComputedRef<Valax
 
   installValaxy(ctx, config)
 
-  if (import.meta.env.DEV && ctx.isClient) {
-    import('../modules/devtools').then(({ install: installDevtools }) => {
-      installDevtools(ctx)
-    })
-  }
-
   installSchema(ctx)
 
   installPinia(ctx)
@@ -42,5 +36,13 @@ export default function setupMain(ctx: ViteSSGContext, config: ComputedRef<Valax
   dayjs.extend(utc)
   dayjs.extend(timezone)
 
+  if (import.meta.env.DEV && ctx.isClient) {
+    import('../modules/devtools').then(({ install: installDevtools }) => {
+      setTimeout(() => {
+        installDevtools(ctx)
+      }, 0)
+    })
+  }
+
   /* __injections__ */
 }

package/client/stores/site.ts

@@ -2,6 +2,7 @@ import { computed, ref } from 'vue'
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import { usePostList, useRouterStore } from '..'
 import type { PageDataPayload } from '../../types'
+import { setWindowValaxyProp } from '../utils/dev'
 
 /**
  * cache site global store
@@ -57,6 +58,9 @@ export const useSiteStore = defineStore('site', () => {
     })
   }
 
+  if (import.meta.env.DEV)
+    setWindowValaxyProp('postList', postList)
+
   return {
     postList,
   }

package/client/utils/dev.ts

@@ -0,0 +1,13 @@
+export function initDevToolsClientLogic() {
+
+}
+
+export function setWindowValaxyProp(property: string, value: any) {
+  if (!(window as any).$valaxy) {
+    ;(window as any).$valaxy = {}
+  }
+  const $valaxy = ((window as any).$valaxy) as {
+    [key: string]: any
+  }
+  $valaxy[property] = value
+}