@vuepress/markdown 2.0.0-rc.11 → 2.0.0-rc.12

package/dist/index.d.ts

@@ -33,46 +33,6 @@ interface AssetsPluginOptions {
  */
 declare const assetsPlugin: PluginWithOptions<AssetsPluginOptions>;
 
-interface CodePluginOptions {
-    /**
-     * Enable highlight lines or not
-     */
-    highlightLines?: boolean;
-    /**
-     * Enable line numbers or not
-     *
-     * - A `boolean` value is to enable line numbers or not.
-     * - A `number` value is the minimum number of lines to enable line numbers
-     */
-    lineNumbers?: boolean | number;
-    /**
-     * Wrap the `<pre>` tag with an extra `<div>` or not. Do not disable it unless you
-     * understand what's it for
-     *
-     * - Required for `highlightLines`
-     * - Required for `lineNumbers`
-     * - Required for title display of default theme
-     */
-    preWrapper?: boolean;
-    /**
-     * Add `v-pre` directive or not
-     */
-    vPre?: {
-        /**
-         * Add `v-pre` directive to `<pre>` tag of code block or not
-         */
-        block?: boolean;
-        /**
-         * Add `v-pre` directive to `<code>` tag of inline code or not
-         */
-        inline?: boolean;
-    };
-}
-/**
- * Code plugin
- */
-declare const codePlugin: PluginWithOptions<CodePluginOptions>;
-
 type EmojiPluginOptions = Options;
 
 interface ImportCodePluginOptions {
@@ -111,12 +71,26 @@ interface LinksPluginOptions {
  */
 declare const linksPlugin: PluginWithOptions<LinksPluginOptions>;
 
+interface VPrePluginOptions {
+    /**
+     * Add `v-pre` directive to `<pre>` tag of code block or not
+     */
+    block?: boolean;
+    /**
+     * Add `v-pre` directive to `<code>` tag of inline code or not
+     */
+    inline?: boolean;
+}
+/**
+ * v-pre plugin
+ */
+declare const vPrePlugin: PluginWithOptions<VPrePluginOptions>;
+
 type Markdown = MarkdownIt;
 
 interface MarkdownOptions extends Options$1 {
     anchor?: false | AnchorPluginOptions;
     assets?: false | AssetsPluginOptions;
-    code?: false | CodePluginOptions;
     component?: false;
     emoji?: false | EmojiPluginOptions;
     frontmatter?: false | FrontmatterPluginOptions;
@@ -127,6 +101,11 @@ interface MarkdownOptions extends Options$1 {
     sfc?: false | SfcPluginOptions;
     slugify?: MarkdownSlugifyFunction;
     toc?: false | TocPluginOptions;
+    vPre?: false | VPrePluginOptions;
+    /**
+     * @deprecated This feature has been removed. Please use `@vuepress/plugin-prismjs` or `@vuepress/plugin-shiki` instead.
+     */
+    code?: never;
 }
 /**
  * Headers in markdown file
@@ -183,6 +162,6 @@ type MarkdownSlugifyFunction = (str: string) => string;
 /**
  * Create vuepress customized markdown-it instance
  */
-declare const createMarkdown: ({ anchor, assets, code, component, emoji, frontmatter, headers, title, importCode, links, sfc, slugify, toc, ...markdownItOptions }?: MarkdownOptions) => Markdown;
+declare const createMarkdown: ({ anchor, assets, code, vPre, component, emoji, frontmatter, headers, title, importCode, links, sfc, slugify, toc, ...markdownItOptions }?: MarkdownOptions) => Markdown;
 
-export { type AnchorPluginOptions, type AssetsPluginOptions, type CodePluginOptions, type EmojiPluginOptions, type ImportCodePluginOptions, type LinksPluginOptions, type Markdown, type MarkdownEnv, type MarkdownHeader, type MarkdownLink, type MarkdownOptions, type MarkdownSlugifyFunction, assetsPlugin, codePlugin, createMarkdown, importCodePlugin, linksPlugin };
+export { type AnchorPluginOptions, type AssetsPluginOptions, type EmojiPluginOptions, type ImportCodePluginOptions, type LinksPluginOptions, type Markdown, type MarkdownEnv, type MarkdownHeader, type MarkdownLink, type MarkdownOptions, type MarkdownSlugifyFunction, type VPrePluginOptions, assetsPlugin, createMarkdown, importCodePlugin, linksPlugin, vPrePlugin };

package/dist/index.js

@@ -1,11 +1,6 @@
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-
 // src/markdown.ts
 import { slugify as defaultSlugify } from "@mdit-vue/shared";
+import { logger as logger2 } from "@vuepress/utils";
 import MarkdownIt from "markdown-it";
 
 // src/plugins.ts
@@ -104,208 +99,6 @@ var assetsPlugin = (md, {
   md.renderer.rules.html_inline = createHtmlRule(rawHtmlInlineRule);
 };
 
-// src/plugins/codePlugin/resolveAttr.ts
-var resolveAttr = (info, attr) => {
-  const pattern = `\\b${attr}\\s*=\\s*(?<quote>['"])(?<content>.+?)\\k<quote>(\\s|$)`;
-  const regex = new RegExp(pattern, "i");
-  const match = info.match(regex);
-  return match?.groups?.content ?? null;
-};
-
-// src/plugins/codePlugin/resolveHighlightLines.ts
-var resolveHighlightLines = (info) => {
-  const match = info.match(/{([\d,-]+)}/);
-  if (match === null) {
-    return null;
-  }
-  return match[1].split(",").map((item) => {
-    const range = item.split("-");
-    if (range.length === 1) {
-      range.push(range[0]);
-    }
-    return range.map((str) => Number.parseInt(str, 10));
-  });
-};
-var isHighlightLine = (lineNumber, ranges) => ranges.some(([start, end]) => lineNumber >= start && lineNumber <= end);
-
-// src/plugins/codePlugin/languages.ts
-var languages_exports = {};
-__export(languages_exports, {
-  languageBash: () => languageBash,
-  languageCsharp: () => languageCsharp,
-  languageDocker: () => languageDocker,
-  languageFsharp: () => languageFsharp,
-  languageJavascript: () => languageJavascript,
-  languageKotlin: () => languageKotlin,
-  languageMarkdown: () => languageMarkdown,
-  languagePython: () => languagePython,
-  languageRuby: () => languageRuby,
-  languageRust: () => languageRust,
-  languageStylus: () => languageStylus,
-  languageTypescript: () => languageTypescript,
-  languageYaml: () => languageYaml
-});
-var languageBash = {
-  name: "bash",
-  ext: "sh",
-  aliases: ["bash", "sh", "shell", "zsh"]
-};
-var languageCsharp = {
-  name: "csharp",
-  ext: "cs",
-  aliases: ["cs", "csharp"]
-};
-var languageDocker = {
-  name: "docker",
-  ext: "docker",
-  aliases: ["docker", "dockerfile"]
-};
-var languageFsharp = {
-  name: "fsharp",
-  ext: "fs",
-  aliases: ["fs", "fsharp"]
-};
-var languageJavascript = {
-  name: "javascript",
-  ext: "js",
-  aliases: ["javascript", "js"]
-};
-var languageKotlin = {
-  name: "kotlin",
-  ext: "kt",
-  aliases: ["kotlin", "kt"]
-};
-var languageMarkdown = {
-  name: "markdown",
-  ext: "md",
-  aliases: ["markdown", "md"]
-};
-var languagePython = {
-  name: "python",
-  ext: "py",
-  aliases: ["py", "python"]
-};
-var languageRuby = {
-  name: "ruby",
-  ext: "rb",
-  aliases: ["rb", "ruby"]
-};
-var languageRust = {
-  name: "rust",
-  ext: "rs",
-  aliases: ["rs", "rust"]
-};
-var languageStylus = {
-  name: "stylus",
-  ext: "styl",
-  aliases: ["styl", "stylus"]
-};
-var languageTypescript = {
-  name: "typescript",
-  ext: "ts",
-  aliases: ["ts", "typescript"]
-};
-var languageYaml = {
-  name: "yaml",
-  ext: "yml",
-  aliases: ["yaml", "yml"]
-};
-
-// src/plugins/codePlugin/resolveLanguage.ts
-var languagesMap;
-var getLanguagesMap = () => {
-  if (!languagesMap) {
-    languagesMap = Object.values(languages_exports).reduce((result, item) => {
-      item.aliases.forEach((alias) => {
-        result[alias] = item;
-      });
-      return result;
-    }, {});
-  }
-  return languagesMap;
-};
-var resolveLanguage = (info) => {
-  const alias = info.match(/^([^ :[{]+)/)?.[1] || "text";
-  return getLanguagesMap()[alias] ?? {
-    name: alias,
-    ext: alias,
-    aliases: [alias]
-  };
-};
-
-// src/plugins/codePlugin/resolveLineNumbers.ts
-var resolveLineNumbers = (info) => {
-  if (/:line-numbers\b/.test(info)) {
-    return true;
-  }
-  if (/:no-line-numbers\b/.test(info)) {
-    return false;
-  }
-  return null;
-};
-
-// src/plugins/codePlugin/resolveVPre.ts
-var resolveVPre = (info) => {
-  if (/:v-pre\b/.test(info)) {
-    return true;
-  }
-  if (/:no-v-pre\b/.test(info)) {
-    return false;
-  }
-  return null;
-};
-
-// src/plugins/codePlugin/codePlugin.ts
-var codePlugin = (md, {
-  highlightLines = true,
-  lineNumbers = true,
-  preWrapper = true,
-  vPre: { block: vPreBlock = true, inline: vPreInline = true } = {}
-} = {}) => {
-  md.renderer.rules.fence = (tokens, idx, options, env, slf) => {
-    const token = tokens[idx];
-    const info = token.info ? md.utils.unescapeAll(token.info).trim() : "";
-    const language = resolveLanguage(info);
-    const languageClass = `${options.langPrefix}${language.name}`;
-    const code = options.highlight?.(token.content, language.name, "") || md.utils.escapeHtml(token.content);
-    token.attrJoin("class", languageClass);
-    let result = code.startsWith("<pre") ? code : `<pre${slf.renderAttrs(token)}><code>${code}</code></pre>`;
-    const useVPre = resolveVPre(info) ?? vPreBlock;
-    if (useVPre) {
-      result = `<pre v-pre${result.slice("<pre".length)}`;
-    }
-    if (!preWrapper) {
-      return result;
-    }
-    const lines = code.split("\n").slice(0, -1);
-    const highlightLinesRanges = highlightLines ? resolveHighlightLines(info) : null;
-    if (highlightLinesRanges) {
-      const highlightLinesCode = lines.map((_, index) => {
-        if (isHighlightLine(index + 1, highlightLinesRanges)) {
-          return '<div class="highlight-line">&nbsp;</div>';
-        }
-        return "<br>";
-      }).join("");
-      result = `${result}<div class="highlight-lines">${highlightLinesCode}</div>`;
-    }
-    const useLineNumbers = resolveLineNumbers(info) ?? (typeof lineNumbers === "number" ? lines.length >= lineNumbers : lineNumbers);
-    if (useLineNumbers) {
-      const lineNumbersCode = lines.map(() => `<div class="line-number"></div>`).join("");
-      result = `${result}<div class="line-numbers" aria-hidden="true">${lineNumbersCode}</div>`;
-    }
-    const title = resolveAttr(info, "title") ?? language.ext;
-    result = `<div class="${languageClass}${useLineNumbers ? " line-numbers-mode" : ""}" data-ext="${language.ext}" data-title="${title}">${result}</div>`;
-    return result;
-  };
-  if (vPreInline) {
-    const rawInlineCodeRule = md.renderer.rules.code_inline;
-    md.renderer.rules.code_inline = (tokens, idx, options, env, slf) => {
-      const result = rawInlineCodeRule(tokens, idx, options, env, slf);
-      return `<code v-pre${result.slice("<code".length)}`;
-    };
-  }
-};
-
 // src/plugins/emojiPlugin.ts
 import { full as emojiPlugin } from "markdown-it-emoji";
 
@@ -504,11 +297,45 @@ var linksPlugin = (md, options = {}) => {
   };
 };
 
+// src/plugins/vPrePlugin/resolveVPre.ts
+var resolveVPre = (info) => {
+  if (/:v-pre\b/.test(info)) {
+    return true;
+  }
+  if (/:no-v-pre\b/.test(info)) {
+    return false;
+  }
+  return null;
+};
+
+// src/plugins/vPrePlugin/vPrePlugin.ts
+var vPrePlugin = (md, { inline = true, block = true } = {}) => {
+  const rawFence = md.renderer.rules.fence;
+  md.renderer.rules.fence = (...args) => {
+    const [tokens, idx] = args;
+    const token = tokens[idx];
+    const info = token.info ? md.utils.unescapeAll(token.info).trim() : "";
+    let result = rawFence(...args);
+    if (resolveVPre(info) ?? block) {
+      result = `<pre v-pre${result.slice("<pre".length)}`;
+    }
+    return result;
+  };
+  if (inline) {
+    const rawInlineCodeRule = md.renderer.rules.code_inline;
+    md.renderer.rules.code_inline = (...args) => {
+      const result = rawInlineCodeRule(...args);
+      return `<code v-pre${result.slice("<code".length)}`;
+    };
+  }
+};
+
 // src/markdown.ts
 var createMarkdown = ({
   anchor,
   assets,
   code,
+  vPre,
   component,
   emoji,
   frontmatter,
@@ -541,8 +368,11 @@ var createMarkdown = ({
   if (assets !== false) {
     md.use(assetsPlugin, assets);
   }
-  if (code !== false) {
-    md.use(codePlugin, code);
+  if (code) {
+    logger2.warn(
+      `\`markdown.code\` option has been removed, please use '@vuepress/plugin-shiki' or '@vuepress/plugin-prismjs' instead.
+ See https://v2.vuepress.vuejs.org/reference/config.html#markdown-code`
+    );
   }
   if (component !== false) {
     md.use(componentPlugin);
@@ -586,12 +416,14 @@ var createMarkdown = ({
   if (title !== false) {
     md.use(titlePlugin);
   }
+  if (vPre !== false) {
+    md.use(vPrePlugin, vPre);
+  }
   return md;
 };
 export {
   anchorPlugin,
   assetsPlugin,
-  codePlugin,
   componentPlugin,
   createMarkdown,
   emojiPlugin,
@@ -601,5 +433,6 @@ export {
   linksPlugin,
   sfcPlugin,
   titlePlugin,
-  tocPlugin
+  tocPlugin,
+  vPrePlugin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/markdown",
-  "version": "2.0.0-rc.11",
+  "version": "2.0.0-rc.12",
   "description": "Markdown package of VuePress",
   "keywords": [
     "vuepress",
@@ -38,11 +38,11 @@
     "@types/markdown-it": "^14.1.1",
     "@types/markdown-it-emoji": "^3.0.1",
     "markdown-it": "^14.1.0",
-    "markdown-it-anchor": "^8.6.7",
+    "markdown-it-anchor": "^9.0.1",
     "markdown-it-emoji": "^3.0.0",
     "mdurl": "^2.0.0",
-    "@vuepress/shared": "2.0.0-rc.11",
-    "@vuepress/utils": "2.0.0-rc.11"
+    "@vuepress/shared": "2.0.0-rc.12",
+    "@vuepress/utils": "2.0.0-rc.12"
   },
   "devDependencies": {
     "@types/mdurl": "^2.0.0"