Merge c2da2c7 into 32cacb3

vuepress · May 19, 2024 · 1e79180 · 1e79180
2 parents 32cacb3 + c2da2c7
commit 1e79180
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 1,219 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,
@@ -17,7 +17,6 @@ import {
 import type {
   AnchorPluginOptions,
   AssetsPluginOptions,
-  CodePluginOptions,
   EmojiPluginOptions,
   FrontmatterPluginOptions,
   HeadersPluginOptions,
@@ -82,8 +81,10 @@ 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`,
+    )
   }
 
   // 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,

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
diff --git a/packages/markdown/src/plugins/codePlugin/resolveLanguage.ts b/packages/markdown/src/plugins/codePlugin/resolveLanguage.ts