diff --git a/docs/notes/theme/guide/图表/echarts.md b/docs/notes/theme/guide/图表/echarts.md index e3649071..564ade2b 100644 --- a/docs/notes/theme/guide/图表/echarts.md +++ b/docs/notes/theme/guide/图表/echarts.md @@ -109,8 +109,8 @@ const option = { 你可以在 [客户端配置文件](https://vuejs.press/zh/guide/configuration.html##使用脚本) 中导入并使用 `defineEchartsConfig` 来自定义 Echarts: ```ts -import { defineClientConfig } from 'vuepress/client' import { defineEchartsConfig } from 'vuepress-theme-plume/client' +import { defineClientConfig } from 'vuepress/client' defineEchartsConfig({ options: { diff --git a/docs/notes/theme/guide/图表/mermaid.md b/docs/notes/theme/guide/图表/mermaid.md index 13ff9ae2..48fd67ac 100644 --- a/docs/notes/theme/guide/图表/mermaid.md +++ b/docs/notes/theme/guide/图表/mermaid.md @@ -110,8 +110,8 @@ export default defineUserConfig({ 中导入并使用 `defineMermaidConfig` 来自定义 Mermaid 配置: ```ts -import { defineClientConfig } from 'vuepress/client' import { defineMermaidConfig } from 'vuepress-theme-plume/client' +import { defineClientConfig } from 'vuepress/client' defineMermaidConfig({ // 在此设置 mermaid 选项 diff --git a/docs/notes/theme/guide/布局插槽.md b/docs/notes/theme/guide/布局插槽.md index fbebd4b3..a2d90507 100644 --- a/docs/notes/theme/guide/布局插槽.md +++ b/docs/notes/theme/guide/布局插槽.md @@ -74,8 +74,8 @@ import { Layout } from 'vuepress-theme-plume/client' // [!code hl] ```ts import { h } from 'vue' -import { defineClientConfig } from 'vuepress/client' import { Layout } from 'vuepress-theme-plume/client' +import { defineClientConfig } from 'vuepress/client' import CustomContent from './components/CustomContent.vue' export default defineClientConfig({ diff --git a/docs/notes/theme/guide/组件/repoCard.md b/docs/notes/theme/guide/组件/repoCard.md index 24d1c9b5..14774a91 100644 --- a/docs/notes/theme/guide/组件/repoCard.md +++ b/docs/notes/theme/guide/组件/repoCard.md @@ -34,8 +34,8 @@ import RepoCard from 'vuepress-theme-plume/features/RepoCard.vue' @tab .vuepress/client.ts ```ts -import { defineClientConfig } from 'vuepress/client' import RepoCard from 'vuepress-theme-plume/features/RepoCard.vue' +import { defineClientConfig } from 'vuepress/client' export default defineClientConfig({ enhance({ app }) { diff --git a/docs/notes/theme/guide/组件/轮播图.md b/docs/notes/theme/guide/组件/轮播图.md index 99bb8e8a..f30c5be0 100644 --- a/docs/notes/theme/guide/组件/轮播图.md +++ b/docs/notes/theme/guide/组件/轮播图.md @@ -53,8 +53,8 @@ import Swiper from 'vuepress-theme-plume/features/Swiper.vue' @tab .vuepress/client.ts ```ts -import { defineClientConfig } from 'vuepress/client' import Swiper from 'vuepress-theme-plume/features/Swiper.vue' +import { defineClientConfig } from 'vuepress/client' export default defineClientConfig({ enhance({ app }) { diff --git a/docs/notes/theme/guide/组件覆写.md b/docs/notes/theme/guide/组件覆写.md index 6c22a5f4..3a45895f 100644 --- a/docs/notes/theme/guide/组件覆写.md +++ b/docs/notes/theme/guide/组件覆写.md @@ -25,8 +25,8 @@ permalink: /guide/component-overrides/ ```ts import { defineUserConfig } from 'vuepress' -import { getDirname, path } from 'vuepress/utils' import { plumeTheme } from 'vuepress-theme-plume' +import { getDirname, path } from 'vuepress/utils' const __dirname = getDirname(import.meta.url) diff --git a/plugins/plugin-md-power/src/node/container/fileTree.ts b/plugins/plugin-md-power/src/node/container/fileTree.ts index 2d87e8b5..55ccf150 100644 --- a/plugins/plugin-md-power/src/node/container/fileTree.ts +++ b/plugins/plugin-md-power/src/node/container/fileTree.ts @@ -1,7 +1,7 @@ import type { Markdown } from 'vuepress/markdown' import type { FileTreeIconMode, FileTreeOptions } from '../../shared/index.js' -import Token from 'markdown-it/lib/token.mjs' import container from 'markdown-it-container' +import Token from 'markdown-it/lib/token.mjs' import { removeEndingSlash, removeLeadingSlash } from 'vuepress/shared' import { defaultFile, defaultFolder, getFileIcon } from '../fileIcons/index.js' import { resolveAttrs } from '../utils/resolveAttrs.js' diff --git a/theme/src/client/composables/index.ts b/theme/src/client/composables/index.ts index cdc1fa0f..47025094 100644 --- a/theme/src/client/composables/index.ts +++ b/theme/src/client/composables/index.ts @@ -11,8 +11,8 @@ export * from './copyright.js' export * from './dark-mode.js' export * from './data.js' export * from './edit-link.js' -export * from './encrypt.js' export * from './encrypt-data.js' +export * from './encrypt.js' export * from './flyout.js' export * from './home.js' export * from './icons.js' diff --git a/theme/src/node/config/resolveSearchOptions.ts b/theme/src/node/config/resolveSearchOptions.ts index 4d1cdb28..d7581c09 100644 --- a/theme/src/node/config/resolveSearchOptions.ts +++ b/theme/src/node/config/resolveSearchOptions.ts @@ -1,5 +1,5 @@ -import type { DocSearchPluginOptions } from '@vuepress/plugin-docsearch' import type { SearchPluginOptions } from '@vuepress-plume/plugin-search' +import type { DocSearchPluginOptions } from '@vuepress/plugin-docsearch' import type { App } from 'vuepress' import { getLocaleConfig } from '@vuepress/helper' import { DOCSEARCH_LOCALES, SEARCH_LOCALES } from '../locales/index.js' diff --git a/theme/src/node/locales/de.ts b/theme/src/node/locales/de.ts index 1f4b2248..1feead35 100644 --- a/theme/src/node/locales/de.ts +++ b/theme/src/node/locales/de.ts @@ -1,6 +1,6 @@ /** 德语 */ -import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { SearchLocaleOptions } from '@vuepress-plume/plugin-search' +import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { PlumeThemeLocaleData, PresetLocale } from '../../shared/index.js' export const deLocale: PlumeThemeLocaleData = { diff --git a/theme/src/node/locales/fr.ts b/theme/src/node/locales/fr.ts index 6317f4cd..f06c388d 100644 --- a/theme/src/node/locales/fr.ts +++ b/theme/src/node/locales/fr.ts @@ -1,6 +1,6 @@ /** 法语 */ -import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { SearchLocaleOptions } from '@vuepress-plume/plugin-search' +import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { PlumeThemeLocaleData, PresetLocale } from '../../shared/index.js' export const frLocale: PlumeThemeLocaleData = { diff --git a/theme/src/node/locales/index.ts b/theme/src/node/locales/index.ts index 084341d6..6f5af6a4 100644 --- a/theme/src/node/locales/index.ts +++ b/theme/src/node/locales/index.ts @@ -3,16 +3,16 @@ * 除 /zh/ 、 /en/ 外,其它语言预设通过 AI 生成,不保证准确 * 如有错误,欢迎提 issue */ -import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { SearchLocaleOptions } from '@vuepress-plume/plugin-search' +import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { PlumeThemeLocaleData, PresetLocale } from '../../shared/index.js' import { deDocsearchLocale, deLocale, dePresetLocale, deSearchLocale } from './de.js' import { enLocale, enPresetLocale, enSearchLocale } from './en.js' import { frDocsearchLocale, frLocale, frPresetLocale, frSearchLocale } from './fr.js' import { jaDocsearchLocale, jaLocale, jaPresetLocale, jaSearchLocale } from './ja.js' import { ruDocsearchLocale, ruLocale, ruPresetLocale, ruSearchLocale } from './ru.js' -import { zhDocsearchLocale, zhLocale, zhPresetLocale, zhSearchLocale } from './zh.js' import { zhTwDocsearchLocale, zhTwLocale, zhTwPresetLocale, zhTwSearchLocale } from './zh-tw.js' +import { zhDocsearchLocale, zhLocale, zhPresetLocale, zhSearchLocale } from './zh.js' export const LOCALE_OPTIONS: Record = { '/zh/': zhLocale, diff --git a/theme/src/node/locales/ja.ts b/theme/src/node/locales/ja.ts index 78a2f9f2..883892c4 100644 --- a/theme/src/node/locales/ja.ts +++ b/theme/src/node/locales/ja.ts @@ -1,6 +1,6 @@ /** 日语 */ -import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { SearchLocaleOptions } from '@vuepress-plume/plugin-search' +import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { PlumeThemeLocaleData, PresetLocale } from '../../shared/index.js' export const jaLocale: PlumeThemeLocaleData = { diff --git a/theme/src/node/locales/ru.ts b/theme/src/node/locales/ru.ts index 72856e64..ace08e48 100644 --- a/theme/src/node/locales/ru.ts +++ b/theme/src/node/locales/ru.ts @@ -1,6 +1,6 @@ /** 俄语 */ -import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { SearchLocaleOptions } from '@vuepress-plume/plugin-search' +import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { PlumeThemeLocaleData, PresetLocale } from '../../shared/index.js' export const ruLocale: PlumeThemeLocaleData = { diff --git a/theme/src/node/locales/zh-tw.ts b/theme/src/node/locales/zh-tw.ts index 007a5e84..a6a7193b 100644 --- a/theme/src/node/locales/zh-tw.ts +++ b/theme/src/node/locales/zh-tw.ts @@ -1,6 +1,6 @@ /** 繁体中文 */ -import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { SearchLocaleOptions } from '@vuepress-plume/plugin-search' +import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { PlumeThemeLocaleData, PresetLocale } from '../../shared/index.js' export const zhTwLocale: PlumeThemeLocaleData = { diff --git a/theme/src/node/locales/zh.ts b/theme/src/node/locales/zh.ts index 6083b3a2..7c126212 100644 --- a/theme/src/node/locales/zh.ts +++ b/theme/src/node/locales/zh.ts @@ -1,5 +1,5 @@ -import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { SearchLocaleOptions } from '@vuepress-plume/plugin-search' +import type { DocSearchLocaleOptions } from '@vuepress/plugin-docsearch' import type { PlumeThemeLocaleData, PresetLocale } from '../../shared/index.js' export const zhLocale: PlumeThemeLocaleData = { diff --git a/theme/src/node/plugins/getPlugins.ts b/theme/src/node/plugins/getPlugins.ts index ec15a536..736258d5 100644 --- a/theme/src/node/plugins/getPlugins.ts +++ b/theme/src/node/plugins/getPlugins.ts @@ -1,5 +1,9 @@ import type { App, PluginConfig } from 'vuepress/core' import type { PlumeThemeLocaleOptions, PlumeThemePluginOptions } from '../../shared/index.js' +import { contentUpdatePlugin } from '@vuepress-plume/plugin-content-update' +import { fontsPlugin } from '@vuepress-plume/plugin-fonts' +import { searchPlugin } from '@vuepress-plume/plugin-search' +import { shikiPlugin } from '@vuepress-plume/plugin-shikiji' import { isPlainObject } from '@vuepress/helper' import { cachePlugin } from '@vuepress/plugin-cache' import { commentPlugin } from '@vuepress/plugin-comment' @@ -14,10 +18,6 @@ import { readingTimePlugin } from '@vuepress/plugin-reading-time' import { seoPlugin, type SeoPluginOptions } from '@vuepress/plugin-seo' import { sitemapPlugin, type SitemapPluginOptions } from '@vuepress/plugin-sitemap' import { watermarkPlugin } from '@vuepress/plugin-watermark' -import { contentUpdatePlugin } from '@vuepress-plume/plugin-content-update' -import { fontsPlugin } from '@vuepress-plume/plugin-fonts' -import { searchPlugin } from '@vuepress-plume/plugin-search' -import { shikiPlugin } from '@vuepress-plume/plugin-shikiji' import { type MarkdownEnhancePluginOptions, mdEnhancePlugin } from 'vuepress-plugin-md-enhance' import { markdownPowerPlugin } from 'vuepress-plugin-md-power' import { resolveDocsearchOptions, resolveSearchOptions } from '../config/index.js' diff --git a/theme/src/node/prepare/prepareThemeData.ts b/theme/src/node/prepare/prepareThemeData.ts index 6957e853..5544f566 100644 --- a/theme/src/node/prepare/prepareThemeData.ts +++ b/theme/src/node/prepare/prepareThemeData.ts @@ -3,8 +3,8 @@ import type { PlumeThemeData, PlumeThemeLocaleOptions, PlumeThemePluginOptions } import fs from 'node:fs/promises' import process from 'node:process' import { type FSWatcher, watch } from 'chokidar' -import { hash } from 'vuepress/utils' import { resolveImageSize } from 'vuepress-plugin-md-power' +import { hash } from 'vuepress/utils' import { resolveThemeData } from '../config/resolveThemeData.js' import { logger, resolveContent, writeTemp } from '../utils/index.js' diff --git a/theme/src/shared/options/plugins.ts b/theme/src/shared/options/plugins.ts index 2d149955..1be83fd7 100644 --- a/theme/src/shared/options/plugins.ts +++ b/theme/src/shared/options/plugins.ts @@ -1,3 +1,5 @@ +import type { SearchPluginOptions } from '@vuepress-plume/plugin-search' +import type { ShikiPluginOptions } from '@vuepress-plume/plugin-shikiji' import type { CommentPluginOptions } from '@vuepress/plugin-comment' import type { DocSearchOptions } from '@vuepress/plugin-docsearch' import type { MarkdownImagePluginOptions } from '@vuepress/plugin-markdown-image' @@ -6,8 +8,6 @@ import type { ReadingTimePluginOptions } from '@vuepress/plugin-reading-time' import type { SeoPluginOptions } from '@vuepress/plugin-seo' import type { SitemapPluginOptions } from '@vuepress/plugin-sitemap' import type { WatermarkPluginOptions } from '@vuepress/plugin-watermark' -import type { SearchPluginOptions } from '@vuepress-plume/plugin-search' -import type { ShikiPluginOptions } from '@vuepress-plume/plugin-shikiji' import type { MarkdownEnhancePluginOptions } from 'vuepress-plugin-md-enhance' import type { MarkdownPowerPluginOptions } from 'vuepress-plugin-md-power'