@vuepress/markdown 2.0.0-beta.42 → 2.0.0-beta.45

package/lib/plugins/codePlugin/codePlugin.d.ts

@@ -21,9 +21,18 @@ export interface CodePluginOptions {
      */
     preWrapper?: boolean;
     /**
-     * Add `v-pre` directive to `<pre>` tag or not
+     * Add `v-pre` directive or not
      */
-    vPre?: boolean;
+    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

package/lib/plugins/codePlugin/codePlugin.js

@@ -8,7 +8,7 @@ const resolveVPre_1 = require("./resolveVPre");
 /**
  * Code plugin
  */
-const codePlugin = (md, { highlightLines = true, lineNumbers = true, preWrapper = true, vPre = true, } = {}) => {
+const codePlugin = (md, { highlightLines = true, lineNumbers = true, preWrapper = true, vPre: { block: vPreBlock = true, inline: vPreInline = true } = {}, } = {}) => {
     // override default fence renderer
     md.renderer.rules.fence = (tokens, idx, options, env, slf) => {
         const token = tokens[idx];
@@ -25,7 +25,7 @@ const codePlugin = (md, { highlightLines = true, lineNumbers = true, preWrapper
             ? code
             : `<pre class="${languageClass}"><code>${code}</code></pre>`;
         // resolve v-pre mark from token info
-        const useVPre = (0, resolveVPre_1.resolveVPre)(info) ?? vPre;
+        const useVPre = (0, resolveVPre_1.resolveVPre)(info) ?? vPreBlock;
         if (useVPre) {
             result = `<pre v-pre${result.slice('<pre'.length)}`;
         }
@@ -60,12 +60,19 @@ const codePlugin = (md, { highlightLines = true, lineNumbers = true, preWrapper
         if (useLineNumbers) {
             // generate line numbers code
             const lineNumbersCode = lines
-                .map((_, index) => `<span class="line-number">${index + 1}</span><br>`)
+                .map(() => `<div class="line-number"></div>`)
                 .join('');
             result = `${result}<div class="line-numbers" aria-hidden="true">${lineNumbersCode}</div>`;
         }
         result = `<div class="${languageClass} ext-${language.ext}${useLineNumbers ? ' line-numbers-mode' : ''}">${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)}`;
+        };
+    }
 };
 exports.codePlugin = codePlugin;

package/lib/plugins/linksPlugin/resolvePaths.js

@@ -1,17 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePaths = void 0;
+const shared_1 = require("@vuepress/shared");
 const utils_1 = require("@vuepress/utils");
 /**
  * Resolve relative and absolute paths according to the `base` and `filePathRelative`
  */
 const resolvePaths = (rawPath, base, filePathRelative) => {
-    let relativePath;
     let absolutePath;
+    let relativePath;
     if (rawPath.startsWith('/')) {
         // if raw path is absolute
-        absolutePath = rawPath;
-        relativePath = utils_1.path.relative(base, absolutePath);
+        if (rawPath.endsWith('.md')) {
+            // if raw path is a link to markdown file
+            // prepend `base` to the link
+            absolutePath = utils_1.path.join(base, rawPath);
+            relativePath = (0, shared_1.removeLeadingSlash)(rawPath);
+        }
+        else {
+            // if raw path is a link to other kind of file
+            // keep the link as is
+            absolutePath = rawPath;
+            relativePath = utils_1.path.relative(base, absolutePath);
+        }
     }
     else {
         // if raw path is relative

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/markdown",
-  "version": "2.0.0-beta.42",
+  "version": "2.0.0-beta.45",
   "description": "Markdown package of VuePress",
   "keywords": [
     "vuepress",
@@ -23,11 +23,11 @@
   ],
   "dependencies": {
     "@types/markdown-it": "^12.2.3",
-    "@vuepress/shared": "2.0.0-beta.42",
-    "@vuepress/utils": "2.0.0-beta.42",
-    "markdown-it": "^13.0.0",
-    "markdown-it-anchor": "^8.4.1",
-    "markdown-it-emoji": "^2.0.0",
+    "@vuepress/shared": "2.0.0-beta.45",
+    "@vuepress/utils": "2.0.0-beta.45",
+    "markdown-it": "^13.0.1",
+    "markdown-it-anchor": "^8.6.3",
+    "markdown-it-emoji": "^2.0.2",
     "mdurl": "^1.0.1"
   },
   "publishConfig": {