diff --git a/theme/package.json b/theme/package.json index 15276340..5d6630b8 100644 --- a/theme/package.json +++ b/theme/package.json @@ -50,6 +50,7 @@ "@vuepress-plume/plugin-copy-code": "workspace:*", "@vuepress-plume/plugin-iconify": "workspace:*", "@vuepress-plume/plugin-notes-data": "workspace:*", + "@vuepress-plume/plugin-shikiji": "workspace:*", "@vuepress/client": "2.0.0-rc.0", "@vuepress/core": "2.0.0-rc.0", "@vuepress/plugin-active-header-links": "2.0.0-rc.0", @@ -60,9 +61,7 @@ "@vuepress/plugin-medium-zoom": "2.0.0-rc.0", "@vuepress/plugin-nprogress": "2.0.0-rc.0", "@vuepress/plugin-palette": "2.0.0-rc.0", - "@vuepress/plugin-prismjs": "2.0.0-rc.0", "@vuepress/plugin-search": "2.0.0-rc.0", - "@vuepress/plugin-shiki": "2.0.0-rc.0", "@vuepress/plugin-theme-data": "2.0.0-rc.0", "@vuepress/plugin-toc": "2.0.0-rc.0", "@vuepress/shared": "2.0.0-rc.0", diff --git a/theme/src/node/plugins.ts b/theme/src/node/plugins.ts index d155d28a..b7db9c89 100644 --- a/theme/src/node/plugins.ts +++ b/theme/src/node/plugins.ts @@ -7,9 +7,7 @@ import { gitPlugin } from '@vuepress/plugin-git' import { mediumZoomPlugin } from '@vuepress/plugin-medium-zoom' import { nprogressPlugin } from '@vuepress/plugin-nprogress' import { palettePlugin } from '@vuepress/plugin-palette' -import { prismjsPlugin } from '@vuepress/plugin-prismjs' import { searchPlugin } from '@vuepress/plugin-search' -import { shikiPlugin } from '@vuepress/plugin-shiki' import { themeDataPlugin } from '@vuepress/plugin-theme-data' import { autoFrontmatterPlugin } from '@vuepress-plume/plugin-auto-frontmatter' import { baiduTongjiPlugin } from '@vuepress-plume/plugin-baidu-tongji' @@ -18,6 +16,7 @@ import { caniusePlugin } from '@vuepress-plume/plugin-caniuse' import { copyCodePlugin } from '@vuepress-plume/plugin-copy-code' import { iconifyPlugin } from '@vuepress-plume/plugin-iconify' import { notesDataPlugin } from '@vuepress-plume/plugin-notes-data' +import { shikijiPlugin } from '@vuepress-plume/plugin-shikiji' import { commentPlugin } from 'vuepress-plugin-comment2' import { mdEnhancePlugin } from 'vuepress-plugin-md-enhance' import { seoPlugin } from 'vuepress-plugin-seo2' @@ -141,13 +140,9 @@ export const setupPlugins = ( options.docsearch !== false && !options.search ? docsearchPlugin(options.docsearch!) : [], - options.prismjs !== false && !isProd ? prismjsPlugin() : [], - options.shiki !== false && isProd - ? shikiPlugin({ - theme: 'material-theme-palenight', - ...options.shiki, - }) - : [], + + options.shikiji !== false ? shikijiPlugin(options.shikiji) : [], + options.copyCode !== false ? copyCodePlugin({ selector: '.plume-content div[class*="language-"] pre', diff --git a/theme/src/shared/options/plugins.ts b/theme/src/shared/options/plugins.ts index 51f2ee31..2f095abf 100644 --- a/theme/src/shared/options/plugins.ts +++ b/theme/src/shared/options/plugins.ts @@ -1,10 +1,10 @@ import type { DocsearchOptions } from '@vuepress/plugin-docsearch' import type { SearchPluginOptions } from '@vuepress/plugin-search' -import type { ShikiPluginOptions } from '@vuepress/plugin-shiki' import type { AutoFrontmatterOptions } from '@vuepress-plume/plugin-auto-frontmatter' import type { BaiduTongjiOptions } from '@vuepress-plume/plugin-baidu-tongji' import type { CanIUsePluginOptions } from '@vuepress-plume/plugin-caniuse' import type { CopyCodeOptions } from '@vuepress-plume/plugin-copy-code' +import type { ShikijiPluginOptions } from '@vuepress-plume/plugin-shikiji' import type { CommentPluginOptions } from 'vuepress-plugin-comment2' import type { MarkdownEnhanceOptions } from 'vuepress-plugin-md-enhance' @@ -29,9 +29,7 @@ export interface PlumeThemePluginOptions { */ docsearch?: false | DocsearchOptions - prismjs?: false - - shiki?: false | ShikiPluginOptions + shikiji?: false | ShikijiPluginOptions git?: false