valaxy 0.26.2 → 0.26.4

package/client/composables/collections.ts

@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../define'
+import type { CollectionConfig } from '../types'
 import collections from '#valaxy/blog/collections'
 
 import { computed } from 'vue'

package/client/composables/decrypt.ts

@@ -4,7 +4,7 @@ import { useSiteConfig } from 'valaxy'
  * @see https://developer.mozilla.org/zh-CN/docs/Web/API/SubtleCrypto/deriveKey#pbkdf2_2
  * @param password
  */
-export function getKeyMaterial(password: string) {
+function getKeyMaterial(password: string) {
   const enc = new TextEncoder()
   return window.crypto.subtle.importKey(
     'raw',
@@ -15,7 +15,10 @@ export function getKeyMaterial(password: string) {
   )
 }
 
-export function getKey(keyMaterial: CryptoKey, salt: BufferSource) {
+/**
+ * crypto
+ */
+function getCryptoDeriveKey(keyMaterial: CryptoKey, salt: BufferSource) {
   return window.crypto.subtle.deriveKey(
     {
       name: 'PBKDF2',
@@ -46,7 +49,7 @@ export function useDecrypt() {
         return
 
       const keyMaterial = await getKeyMaterial(password)
-      const key = await getKey(keyMaterial, salt)
+      const key = await getCryptoDeriveKey(keyMaterial, salt)
 
       const ciphertextData = Uint8Array.from(ciphertext, c => c.charCodeAt(0))
 

package/client/define/collection.ts

@@ -1,38 +1,4 @@
-export interface CollectionConfig {
-  title?: string
-  key?: string
-  /**
-   * if key is not provided, path is required
-   *
-   * if key is provided, path = `/collections/${key}`
-   */
-  path?: string
-  /**
-   * @en
-   * The name of the collection.
-   *
-   * @zh
-   * 合集名称
-   */
-  name?: string
-  cover?: string
-  description?: string
-  categories?: string[]
-  tags?: string[]
-
-  /**
-   * items
-   */
-  items?: {
-    title?: string
-    /**
-     * 合集文章的唯一索引
-     *
-     * 对应路径为 `/collections/${key}/${item.key}`
-     */
-    key?: string
-  }[]
-}
+import type { CollectionConfig } from '../types'
 
 /**
  * @experimental

package/client/index.d.ts

@@ -0,0 +1,48 @@
+import type { Header } from '@valaxyjs/utils'
+import type { Ref } from 'vue'
+import type { Post } from '../types'
+
+import './shims.d'
+
+export * from '../dist/types/index.mjs'
+
+declare module '@docsearch/js' {
+  function docsearch<T = any>(props: T): void
+  export default docsearch
+}
+
+declare module 'vue-router' {
+  interface RouteMeta {
+    headers: Header[]
+    frontmatter: Post
+  }
+}
+
+declare interface Window {
+  // for devtools
+  __VUE_DEVTOOLS_ROUTER__: import('vue-router').Router
+  $frontmatter: any
+  $pageData: any
+  $valaxy: {
+    postList: Ref<Post[]>
+  }
+
+  // algolia
+  instantsearch: any
+  algoliasearch: any
+}
+
+// markdowns can be treat as Vue components
+declare module '*.md' {
+  import type { DefineComponent } from 'vue'
+
+  const component: DefineComponent<object, object, any>
+  export default component
+}
+
+declare module '*.vue' {
+  import type { DefineComponent } from 'vue'
+
+  const component: DefineComponent<object, object, any>
+  export default component
+}

package/client/shims.d.ts

@@ -1,18 +1,46 @@
+// vite hmr data
+declare module '/@valaxyjs/config' {
+  const config: string
+  export default config
+}
+
+declare module '/@valaxyjs/context' {
+  const ctx: string
+  export default ctx
+}
+declare module '/@valaxyjs/addons' {
+  import type { DefineComponent } from 'vue'
+
+  const components: { props: any, component: DefineComponent<object, object, any> }[]
+  export default components
+}
+
+declare module '/@valaxyjs/locales' {
+  const messages: object
+  export default messages
+}
+
 // Types for virtual modules
 // `#valaxy/*` is an alias for `/@valaxyjs/*`, because TS will consider `/@valaxyjs/*` as an absolute path that we can't override
 
-declare module 'virtual:valaxy-theme' {
-  export default any
+declare module '/@valaxyjs/redirects' {
+  import type { RouteRecordRaw } from 'vue-router'
+
+  export const redirectRoutes: RouteRecordRaw[]
+
+  export const useVueRouter: boolean
 }
 
 declare module '#valaxy/styles' {
   // side-effects only
-  export default string
+  const styles: string
+  export default styles
 }
 
 // valaxy features
 declare module '#valaxy/blog/collections' {
+  import type { CollectionConfig } from './types'
 
-  const collections: Collection[]
+  const collections: CollectionConfig[]
   export default collections
 }

package/client/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "valaxy": ["./index.d.ts"]
+    },
+    "types": [
+      "unplugin-vue-router/client",
+      "vite/client",
+      "vite-plugin-vue-layouts/client",
+      "@intlify/unplugin-vue-i18n/messages"
+    ]
+  },
+  "include": ["."]
+}

package/client/types/collection.ts

@@ -0,0 +1,35 @@
+export interface CollectionConfig {
+  title?: string
+  key?: string
+  /**
+   * if key is not provided, path is required
+   *
+   * if key is provided, path = `/collections/${key}`
+   */
+  path?: string
+  /**
+   * @en
+   * The name of the collection.
+   *
+   * @zh
+   * 合集名称
+   */
+  name?: string
+  cover?: string
+  description?: string
+  categories?: string[]
+  tags?: string[]
+
+  /**
+   * items
+   */
+  items?: {
+    title?: string
+    /**
+     * 合集文章的唯一索引
+     *
+     * 对应路径为 `/collections/${key}/${item.key}`
+     */
+    key?: string
+  }[]
+}

package/client/types/index.ts

@@ -7,3 +7,5 @@ export type UserModule = (ctx: ViteSSGContext) => void
  * @see https://mermaid.js.org/config/schema-docs/config.html#mermaid-config-schema
  */
 export type MermaidOptions = (typeof mermaid.initialize) extends (a: infer A) => any ? A : never
+
+export * from './collection'

package/dist/node/cli/index.mjs

@@ -1,7 +1,7 @@
 import 'node:process';
 import 'yargs';
 import 'yargs/helpers';
-export { c as cli, d as registerDevCommand, r as run, a as startValaxyDev } from '../../shared/valaxy.hxuiyMv0.mjs';
+export { c as cli, d as registerDevCommand, r as run, a as startValaxyDev } from '../../shared/valaxy.Dv1KXH06.mjs';
 import 'node:path';
 import 'consola';
 import 'consola/utils';
@@ -20,8 +20,8 @@ import 'ora';
 import 'cross-spawn';
 import 'mlly';
 import 'resolve-global';
-import 'node:fs/promises';
 import 'js-yaml';
+import 'node:fs/promises';
 import 'dayjs';
 import 'feed';
 import 'markdown-it';