From 4438447ce35b2e2cec846a856e7eb5b2b91a2d34 Mon Sep 17 00:00:00 2001
From: pengzhanbo <volodymyr@foxmail.com>
Date: Mon, 8 Jul 2024 23:34:39 +0800
Subject: [PATCH] chore: tweak

---
 theme/src/client/composables/prev-next.ts |  9 ++++-----
 theme/src/node/defineConfig.ts            | 16 ++++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/theme/src/client/composables/prev-next.ts b/theme/src/client/composables/prev-next.ts
index 5b43f3e3..49a83729 100644
--- a/theme/src/client/composables/prev-next.ts
+++ b/theme/src/client/composables/prev-next.ts
@@ -1,11 +1,10 @@
 import { resolveRouteFullPath, usePageLang, useRoute } from 'vuepress/client'
 import { isPlainObject, isString } from 'vuepress/shared'
-import { useBlogPostData } from '@vuepress-plume/plugin-blog-data/client'
-import type { NotesSidebarItem } from '@vuepress-plume/plugin-notes-data'
 import { computed } from 'vue'
 import type { Ref } from 'vue'
-import type { NavItemWithLink, PlumeThemeBlogPostItem } from '../../shared/index.js'
+import type { NavItemWithLink, PlumeThemeBlogPostItem, SidebarItem } from '../../shared/index.js'
 import { resolveNavLink } from '../utils/index.js'
+import { useBlogPostData } from './blog-data.js'
 import { useSidebar } from './sidebar.js'
 import { useData } from './data.js'
 
@@ -72,13 +71,13 @@ function resolveFromFrontmatterConfig(conf: unknown): null | false | NavItemWith
   return false
 }
 
-function flatSidebar(sidebar: NotesSidebarItem[], res: NavItemWithLink[] = []): NavItemWithLink[] {
+function flatSidebar(sidebar: SidebarItem[], res: NavItemWithLink[] = []): NavItemWithLink[] {
   for (const item of sidebar) {
     if (item.link)
       res.push({ link: item.link, text: item.text || item.dir || '' })
 
     if (Array.isArray(item.items) && item.items.length)
-      flatSidebar(item.items as NotesSidebarItem[], res)
+      flatSidebar(item.items as SidebarItem[], res)
   }
 
   return res
diff --git a/theme/src/node/defineConfig.ts b/theme/src/node/defineConfig.ts
index 8380861a..426e5b30 100644
--- a/theme/src/node/defineConfig.ts
+++ b/theme/src/node/defineConfig.ts
@@ -1,15 +1,15 @@
 import type {
-  NotesDataOptions,
-  NotesItemOptions,
-} from '@vuepress-plume/plugin-notes-data'
+  NoteItem,
+  NotesOptions,
+} from '../shared/notes.js'
 import type { NavItem } from '../shared/index.js'
 import type { ThemeConfig } from '../shared/theme-data.js'
 
-export function definePlumeNotesConfig(notes: NotesDataOptions): NotesDataOptions {
+export function definePlumeNotesConfig(notes: NotesOptions): NotesOptions {
   return notes
 }
 
-export function definePlumeNotesItemConfig(item: NotesItemOptions): NotesItemOptions {
+export function definePlumeNotesItemConfig(item: NoteItem): NoteItem {
   return item
 }
 
@@ -25,9 +25,9 @@ export function defineNavbar(navbar: NavItem[]): NavItem[] {
 }
 
 export type {
-  NotesDataOptions,
-  NotesItemOptions,
-  NotesItemOptions as NotesItem,
+  NotesOptions,
+  NoteItem,
+  NoteItem as NotesItem,
 }
 
 /**