valaxy 0.20.5 → 0.20.7

package/client/modules/schemaOrg.ts

@@ -1,5 +1,5 @@
-import { initValaxyConfig } from 'valaxy'
 import type { UserModule } from '../types'
+import { initValaxyConfig } from 'valaxy'
 
 // https://unhead-schema-org.harlanzw.com/
 export const install: UserModule = async ({ head, isClient, router }) => {

package/client/modules/valaxy.ts

@@ -1,4 +1,4 @@
-import { createI18n } from 'vue-i18n'
+import type { DefaultTheme, ValaxyConfig } from 'valaxy/types'
 
 /*
  * All i18n resources specified in the plugin `include` option can be loaded
@@ -8,14 +8,14 @@ import { createI18n } from 'vue-i18n'
  */
 // import messages from '@intlify/unplugin-vue-i18n/messages'
 
-import { useStorage } from '@vueuse/core'
+import type { ViteSSGContext } from 'vite-ssg'
 
-import type { Router } from 'vue-router'
-import { ensureSuffix } from '@antfu/utils'
 import type { ComputedRef } from 'vue'
-import type { ViteSSGContext } from 'vite-ssg'
-import type { DefaultTheme, ValaxyConfig } from 'valaxy/types'
+import type { Router } from 'vue-router'
 import type { PageDataPayload } from '../../types'
+import { ensureSuffix } from '@antfu/utils'
+import { useStorage } from '@vueuse/core'
+import { createI18n } from 'vue-i18n'
 
 // @ts-expect-error virtual
 import valaxyMessages from '/@valaxyjs/locales'

package/client/setup/main.ts

@@ -1,19 +1,19 @@
-/* __imports__ */
-import type { ViteSSGContext } from 'vite-ssg'
-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'
+/* __imports__ */
+import type { ViteSSGContext } from 'vite-ssg'
+
+import type { ComputedRef } from 'vue'
 
 import consola from 'consola'
-import { install as installValaxy } from '../modules/valaxy'
-import { install as installPinia } from '../modules/pinia'
+import { install as installFloatingVue } from '../modules/floating-vue'
 import { install as installNprogress } from '../modules/nprogress'
+import { install as installPinia } from '../modules/pinia'
 import { install as installSchema } from '../modules/schemaOrg'
-import { install as installFloatingVue } from '../modules/floating-vue'
+import { install as installValaxy } from '../modules/valaxy'
 
 export default function setupMain(ctx: ViteSSGContext, config: ComputedRef<ValaxyConfig<DefaultTheme.Config>>) {
   // @ts-expect-error inject in runtime

package/client/setup/mermaid.ts

@@ -1,7 +1,7 @@
 /* __imports__ */
 
-import { defineMermaidSetup } from 'valaxy'
 import type { MermaidOptions } from '../types'
+import { defineMermaidSetup } from 'valaxy'
 
 /**
  * @en

package/client/setups.ts

@@ -1,5 +1,5 @@
-import type { ViteSSGContext } from 'vite-ssg'
 import type { Awaitable } from '@antfu/utils'
+import type { ViteSSGContext } from 'vite-ssg'
 import type { MermaidOptions } from './types'
 
 /**
@@ -8,7 +8,7 @@ import type { MermaidOptions } from './types'
  * The context object for the application setup function.
  *
  * @zh
- * 应用 setup 函数的上下文对象。（包括了 ViteSSG context）
+ * 应用 setup 函数的上下文对象。（包括了 `ViteSSGContext`）
  */
 export type AppContext = ViteSSGContext
 

package/client/stores/app.ts

@@ -1,6 +1,6 @@
 import { acceptHMRUpdate, defineStore } from 'pinia'
-import { computed, ref } from 'vue'
 import { useMobile, useSiteConfig, useThemeConfig, useValaxyDark } from 'valaxy'
+import { computed, ref } from 'vue'
 
 /**
  * Global store for users

package/client/stores/site.ts

@@ -1,7 +1,7 @@
-import { computed, ref } from 'vue'
+import type { PageDataPayload } from '../../types'
 import { acceptHMRUpdate, defineStore } from 'pinia'
+import { computed, ref } from 'vue'
 import { usePostList, useRouterStore } from '..'
-import type { PageDataPayload } from '../../types'
 import { setWindowValaxyProp } from '../utils/dev'
 
 /**

package/client/styles/common/markdown.scss

@@ -25,15 +25,15 @@
 
   // custom block
   .custom-block {
-    margin: 16px 0;
-
     p {
       margin: 8px 0;
       line-height: 24px;
     }
+  }
 
-    p:first-child {
-      margin: 0;
+  .custom-block div[lang] {
+    p {
+      margin: 8px 0;
     }
   }
 

package/client/styles/index.scss

@@ -12,7 +12,6 @@ $c-primary: #0078e7 !default;
 // common
 @use "./common/code.scss" as *;
 @use "./common/hamburger.scss" as *;
-@use "./common/scrollbar.scss" as *;
 @use "./common/transition.scss" as *;
 
 // markdown

package/client/types/index.ts

@@ -1,5 +1,5 @@
-import type { ViteSSGContext } from 'vite-ssg'
 import type mermaid from 'mermaid'
+import type { ViteSSGContext } from 'vite-ssg'
 
 export type UserModule = (ctx: ViteSSGContext) => void
 

package/client/utils/index.ts

@@ -1,8 +1,8 @@
 export * from './cdn'
 export * from './code'
+export * from './content'
 export * from './helper'
+export * from './router'
 export * from './time'
-export * from './wrap'
 export * from './types'
-export * from './content'
-export * from './router'
+export * from './wrap'

package/client/utils/time.ts

@@ -1,11 +1,10 @@
 import type { ToDateOptionsWithTZ } from 'date-fns-tz'
+import type { Post } from '../../types'
+import { format, toDate } from 'date-fns'
 import { format as formatWithTZ, toZonedTime } from 'date-fns-tz'
-import { format } from 'date-fns/format'
-import { toDate } from 'date-fns/toDate'
 import { DateTime } from 'luxon'
-import type { Post } from '../../types'
-import { i18n } from '../modules/valaxy'
 import { timezone as globalTimezone } from '../composables/global'
+import { i18n } from '../modules/valaxy'
 
 const referenceDate = new Date(1986, 3 /* Apr */, 4, 10, 32, 0, 900)