From 9a5735dd0e00f763bb02ab987a05209729a8abab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=83=BD=E5=AE=81?= <miqilin18@gmail.com>
Date: Thu, 18 May 2023 20:39:35 +0800
Subject: [PATCH] refactor(theme): simplify the import (#2374)

---
 src/client/theme-default/components/VPMenuLink.vue        | 2 +-
 src/client/theme-default/components/VPNavBarMenuGroup.vue | 2 +-
 src/client/theme-default/components/VPNavBarMenuLink.vue  | 2 +-
 src/client/theme-default/composables/prev-next.ts         | 2 +-
 src/client/theme-default/composables/sidebar.ts           | 2 +-
 src/client/theme-default/support/sidebar.ts               | 3 ++-
 src/client/theme-default/support/utils.ts                 | 2 --
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/client/theme-default/components/VPMenuLink.vue b/src/client/theme-default/components/VPMenuLink.vue
index c24de90b..f4f20985 100644
--- a/src/client/theme-default/components/VPMenuLink.vue
+++ b/src/client/theme-default/components/VPMenuLink.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { DefaultTheme } from 'vitepress/theme'
 import { useData } from '../composables/data'
-import { isActive } from '../support/utils'
+import { isActive } from '../../shared'
 import VPLink from './VPLink.vue'
 
 defineProps<{
diff --git a/src/client/theme-default/components/VPNavBarMenuGroup.vue b/src/client/theme-default/components/VPNavBarMenuGroup.vue
index 40843875..405ac78a 100644
--- a/src/client/theme-default/components/VPNavBarMenuGroup.vue
+++ b/src/client/theme-default/components/VPNavBarMenuGroup.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { DefaultTheme } from 'vitepress/theme'
 import { useData } from '../composables/data'
-import { isActive } from '../support/utils'
+import { isActive } from '../../shared'
 import VPFlyout from './VPFlyout.vue'
 
 defineProps<{
diff --git a/src/client/theme-default/components/VPNavBarMenuLink.vue b/src/client/theme-default/components/VPNavBarMenuLink.vue
index 4848fe0f..1e94c33b 100644
--- a/src/client/theme-default/components/VPNavBarMenuLink.vue
+++ b/src/client/theme-default/components/VPNavBarMenuLink.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { DefaultTheme } from 'vitepress/theme'
 import { useData } from '../composables/data'
-import { isActive } from '../support/utils'
+import { isActive } from '../../shared'
 import VPLink from './VPLink.vue'
 
 defineProps<{
diff --git a/src/client/theme-default/composables/prev-next.ts b/src/client/theme-default/composables/prev-next.ts
index bd9fb0db..f2bfb765 100644
--- a/src/client/theme-default/composables/prev-next.ts
+++ b/src/client/theme-default/composables/prev-next.ts
@@ -1,6 +1,6 @@
 import { computed } from 'vue'
 import { useData } from './data'
-import { isActive } from '../support/utils'
+import { isActive } from '../../shared'
 import { getSidebar, getFlatSideBarLinks } from '../support/sidebar'
 
 export function usePrevNext() {
diff --git a/src/client/theme-default/composables/sidebar.ts b/src/client/theme-default/composables/sidebar.ts
index a99d317e..a8bb6df1 100644
--- a/src/client/theme-default/composables/sidebar.ts
+++ b/src/client/theme-default/composables/sidebar.ts
@@ -10,7 +10,7 @@ import {
 import { useMediaQuery } from '@vueuse/core'
 import { useRoute } from 'vitepress'
 import type { DefaultTheme } from 'vitepress/theme'
-import { isActive } from '../support/utils'
+import { isActive } from '../../shared'
 import {
   hasActiveLink as containsActiveLink,
   getSidebar,
diff --git a/src/client/theme-default/support/sidebar.ts b/src/client/theme-default/support/sidebar.ts
index 057934a6..5c2e646b 100644
--- a/src/client/theme-default/support/sidebar.ts
+++ b/src/client/theme-default/support/sidebar.ts
@@ -1,5 +1,6 @@
 import type { DefaultTheme } from 'vitepress/theme'
-import { ensureStartingSlash, isActive } from './utils'
+import { ensureStartingSlash } from './utils'
+import { isActive } from '../../shared'
 
 export interface SidebarLink {
   text: string
diff --git a/src/client/theme-default/support/utils.ts b/src/client/theme-default/support/utils.ts
index e190d3f3..acb8fcb9 100644
--- a/src/client/theme-default/support/utils.ts
+++ b/src/client/theme-default/support/utils.ts
@@ -2,8 +2,6 @@ import { withBase } from 'vitepress'
 import { useData } from '../composables/data'
 import { isExternal, PATHNAME_PROTOCOL_RE } from '../../shared'
 
-export { isExternal, isActive } from '../../shared'
-
 export function throttleAndDebounce(fn: () => void, delay: number): () => void {
   let timeoutId: NodeJS.Timeout
   let called = false