From 728a6868e6bd61e6f539fb4fbf08d3388a612478 Mon Sep 17 00:00:00 2001 From: pengzhanbo Date: Sun, 16 Oct 2022 03:38:30 +0800 Subject: [PATCH] fix(theme): internal deps --- packages/plugin-baidu-tongji/src/node/plugin.ts | 2 +- packages/theme/src/client/composables/postIndex.ts | 2 +- packages/theme/src/client/composables/sidebarIndex.ts | 2 +- packages/theme/src/client/shim.d.ts | 4 ++-- packages/theme/src/node/prepared/index.ts | 8 ++++---- packages/theme/src/node/prepared/postIndex.ts | 6 +++--- packages/theme/src/node/prepared/sidebarIndex.ts | 6 +++--- packages/theme/src/node/theme.ts | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/plugin-baidu-tongji/src/node/plugin.ts b/packages/plugin-baidu-tongji/src/node/plugin.ts index 63f8339b..5b10b275 100644 --- a/packages/plugin-baidu-tongji/src/node/plugin.ts +++ b/packages/plugin-baidu-tongji/src/node/plugin.ts @@ -4,7 +4,7 @@ export interface BaiduTongjiOptions { key?: string } -export const baiduTongjiPlugin = ({ key }: BaiduTongjiOptions): Plugin => { +export const baiduTongjiPlugin = ({ key = '' }: BaiduTongjiOptions): Plugin => { return { name: '@vuepress-plume/vuepress-plugin-baidu-tongji', extendsPage: (page) => { diff --git a/packages/theme/src/client/composables/postIndex.ts b/packages/theme/src/client/composables/postIndex.ts index 16d96910..de48b271 100644 --- a/packages/theme/src/client/composables/postIndex.ts +++ b/packages/theme/src/client/composables/postIndex.ts @@ -1,4 +1,4 @@ -import { postIndex as postIndexRaw } from '@internal/postIndex.js' +import { postIndex as postIndexRaw } from '@internal/postIndex' import { ref } from 'vue' import type { Ref } from 'vue' import type { PostIndex } from '../../shared/index.js' diff --git a/packages/theme/src/client/composables/sidebarIndex.ts b/packages/theme/src/client/composables/sidebarIndex.ts index 064c5398..172157fb 100644 --- a/packages/theme/src/client/composables/sidebarIndex.ts +++ b/packages/theme/src/client/composables/sidebarIndex.ts @@ -1,4 +1,4 @@ -import { sidebarIndex as sidebarIndexRaw } from '@internal/sidebarIndex.js' +import { sidebarIndex as sidebarIndexRaw } from '@internal/sidebarIndex' import { usePageFrontmatter } from '@vuepress/client' import { computed, ref } from 'vue' import type { ComputedRef, Ref } from 'vue' diff --git a/packages/theme/src/client/shim.d.ts b/packages/theme/src/client/shim.d.ts index 727d8b8f..390043ae 100644 --- a/packages/theme/src/client/shim.d.ts +++ b/packages/theme/src/client/shim.d.ts @@ -8,13 +8,13 @@ declare const __VUEPRESS_DEV__: boolean declare const __VUEPRESS_SSR__: boolean declare const __VUE_HMR_RUNTIME__: Record -declare module '@internal/postIndex.js' { +declare module '@internal/postIndex' { import type { PostIndex } from '../shared' const postIndex: PostIndex export { postIndex } } -declare module '@internal/sidebarIndex.js' { +declare module '@internal/sidebarIndex' { import type { SidebarOptions } from '../shared' const sidebarIndex: Record export { sidebarIndex } diff --git a/packages/theme/src/node/prepared/index.ts b/packages/theme/src/node/prepared/index.ts index 628183fa..0718e219 100644 --- a/packages/theme/src/node/prepared/index.ts +++ b/packages/theme/src/node/prepared/index.ts @@ -3,12 +3,12 @@ import type { PlumeThemeLocaleOptions } from '../../shared/index.js' import { preparedPostIndex, watchPostIndex } from './postIndex.js' import { preparedSidebarIndex, watchSidebarIndex } from './sidebarIndex.js' -export const onPrepared = ( +export const onPrepared = async ( app: App, localeOption: PlumeThemeLocaleOptions -): void => { - preparedPostIndex(app, localeOption) - preparedSidebarIndex(app, localeOption) +): Promise => { + await preparedPostIndex(app, localeOption) + await preparedSidebarIndex(app, localeOption) } export const preparedWatch = ( diff --git a/packages/theme/src/node/prepared/postIndex.ts b/packages/theme/src/node/prepared/postIndex.ts index ed82f903..98af43e8 100644 --- a/packages/theme/src/node/prepared/postIndex.ts +++ b/packages/theme/src/node/prepared/postIndex.ts @@ -24,10 +24,10 @@ if (import.meta.hot) { } ` -export const preparedPostIndex = ( +export const preparedPostIndex = async ( app: App, localeOption: PlumeThemeLocaleOptions -): void => { +): Promise => { const postIndex: PostIndex = (app.pages as Page[]) .filter((page) => { return ( @@ -68,7 +68,7 @@ export const postIndex = ${JSON.stringify(postIndex, null, 2)} content += HMR_CODE } - app.writeTemp('internal/postIndex.js', content) + await app.writeTemp('internal/postIndex.js', content) } export const watchPostIndex = ( diff --git a/packages/theme/src/node/prepared/sidebarIndex.ts b/packages/theme/src/node/prepared/sidebarIndex.ts index 1ebfd579..5fe77fec 100644 --- a/packages/theme/src/node/prepared/sidebarIndex.ts +++ b/packages/theme/src/node/prepared/sidebarIndex.ts @@ -32,10 +32,10 @@ interface NotePage { link: string } -export const preparedSidebarIndex = ( +export const preparedSidebarIndex = async ( app: App, { notes }: PlumeThemeLocaleOptions -): void => { +): Promise => { const pages = app.pages as Page[] if (notes === false) return const { @@ -71,7 +71,7 @@ export const sidebarIndex = ${JSON.stringify(sidebarMap, null, 2)} content += HMR_CODE } - app.writeTemp('internal/sidebarIndex.js', content) + await app.writeTemp('internal/sidebarIndex.js', content) } function noteSidebar( diff --git a/packages/theme/src/node/theme.ts b/packages/theme/src/node/theme.ts index 5ae10273..84c214b8 100644 --- a/packages/theme/src/node/theme.ts +++ b/packages/theme/src/node/theme.ts @@ -30,7 +30,7 @@ export const themePlume = ({ formatFrontmatter() await createPage(app, localeOption) }, - onPrepared: (app) => onPrepared(app, localeOption), + onPrepared: async (app) => await onPrepared(app, localeOption), extendsPage: (page: Page>) => extendsPage(page, localeOption), onWatched: (app, watchers) => {