From 163f486aebdb61d7128d5e2a3c923775f6f50638 Mon Sep 17 00:00:00 2001 From: "Mr.Hope" Date: Sat, 3 Feb 2024 21:01:29 +0800 Subject: [PATCH] fix(client): fix types --- packages/client/src/router/routes.ts | 25 ++++++++++++------- .../client/src/types/internal/routes.d.ts | 18 +------------ 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/packages/client/src/router/routes.ts b/packages/client/src/router/routes.ts index b523b9b5be..9152933350 100644 --- a/packages/client/src/router/routes.ts +++ b/packages/client/src/router/routes.ts @@ -2,17 +2,24 @@ import { redirects as redirectsRaw, routes as routesRaw, } from '@internal/routes' -import type { - PageChunk, - PageMetaDefault, - Redirects, - Route, - Routes, -} from '@internal/routes' +import type { PageData } from '@vuepress/shared' import { shallowRef } from 'vue' -import type { Ref } from 'vue' +import type { ComponentOptions, Ref } from 'vue' + +export interface PageChunk { + comp: ComponentOptions + data: PageData +} + +export type PageMetaDefault = Record + +export interface Route { + loader: () => Promise + meta: PageMeta +} -export type { PageMetaDefault, PageChunk, Redirects, Route, Routes } +export type Redirects = Record +export type Routes = Record /** * Global redirects ref diff --git a/packages/client/src/types/internal/routes.d.ts b/packages/client/src/types/internal/routes.d.ts index 96d8109469..23188a456a 100644 --- a/packages/client/src/types/internal/routes.d.ts +++ b/packages/client/src/types/internal/routes.d.ts @@ -1,22 +1,6 @@ -import type { PageData } from '@vuepress/shared' -import type { ComponentOptions } from 'vue' +import type { Redirects, Routes } from '../../router/index.js' declare module '@internal/routes' { - export interface PageChunk { - comp: ComponentOptions - data: PageData - } - - export type PageMetaDefault = Record - - export interface Route { - loader: () => Promise - meta: PageMeta - } - - export type Redirects = Record - export type Routes = Record - export const redirects: Redirects export const routes: Routes }