Merge 395d63c into 32cacb3

vuepress · May 19, 2024 · fa50a23 · fa50a23
2 parents 32cacb3 + 395d63c
commit fa50a23
Show file tree

Hide file tree

Showing 17 changed files with 324 additions and 1,205 deletions.
diff --git a/packages/markdown/src/markdown.ts b/packages/markdown/src/markdown.ts
@@ -1,9 +1,9 @@
 import { slugify as defaultSlugify } from '@mdit-vue/shared'
+import { logger } from '@vuepress/utils'
 import MarkdownIt from 'markdown-it'
 import {
   anchorPlugin,
   assetsPlugin,
-  codePlugin,
   componentPlugin,
   emojiPlugin,
   frontmatterPlugin,
@@ -13,18 +13,19 @@ import {
   sfcPlugin,
   titlePlugin,
   tocPlugin,
+  vPrePlugin,
 } from './plugins.js'
 import type {
   AnchorPluginOptions,
   AssetsPluginOptions,
-  CodePluginOptions,
   EmojiPluginOptions,
   FrontmatterPluginOptions,
   HeadersPluginOptions,
   ImportCodePluginOptions,
   LinksPluginOptions,
   SfcPluginOptions,
   TocPluginOptions,
+  VPrePluginOptions,
 } from './plugins.js'
 import type { Markdown, MarkdownOptions } from './types.js'
 
@@ -35,6 +36,7 @@ export const createMarkdown = ({
   anchor,
   assets,
   code,
+  vPre,
   component,
   emoji,
   frontmatter,
@@ -82,8 +84,15 @@ export const createMarkdown = ({
   }
 
   // process code fence
-  if (code !== false) {
-    md.use<CodePluginOptions>(codePlugin, code)
+  if (code) {
+    logger.warn(
+      `\`markdown.code\` option is deprecated, use '@vuepress/plugin-shiki' or '@vuepress/plugin-prismjs' instead.\n See https://v2.vuepress.vuejs.org/reference/config.html#markdown-code`,
+    )
+  }
+
+  // add v-pre to `<pre>` and `<code>`
+  if (vPre !== false) {
+    md.use<VPrePluginOptions>(vPrePlugin, vPre)
   }
 
   // treat unknown html tags as components

diff --git a/packages/markdown/src/plugins.ts b/packages/markdown/src/plugins.ts
@@ -22,10 +22,6 @@ export {
   assetsPlugin,
   type AssetsPluginOptions,
 } from './plugins/assetsPlugin/assetsPlugin.js'
-export {
-  codePlugin,
-  type CodePluginOptions,
-} from './plugins/codePlugin/codePlugin.js'
 export { emojiPlugin, type EmojiPluginOptions } from './plugins/emojiPlugin.js'
 export {
   importCodePlugin,
@@ -35,3 +31,8 @@ export {
   linksPlugin,
   type LinksPluginOptions,
 } from './plugins/linksPlugin/linksPlugin.js'
+
+export {
+  vPrePlugin,
+  type VPrePluginOptions,
+} from './plugins/vPrePlugin/vPrePlugin.js'
diff --git a/packages/markdown/src/plugins/codePlugin/codePlugin.ts b/packages/markdown/src/plugins/codePlugin/codePlugin.ts
diff --git a/packages/markdown/src/plugins/codePlugin/languages.ts b/packages/markdown/src/plugins/codePlugin/languages.ts
diff --git a/packages/markdown/src/plugins/codePlugin/resolveAttr.ts b/packages/markdown/src/plugins/codePlugin/resolveAttr.ts
diff --git a/packages/markdown/src/plugins/codePlugin/resolveHighlightLines.ts b/packages/markdown/src/plugins/codePlugin/resolveHighlightLines.ts