@vuepress/markdown 2.0.0-beta.43 → 2.0.0-beta.46

package/lib/plugins/assetsPlugin/assetsPlugin.js

@@ -21,7 +21,16 @@ const assetsPlugin = (md, { relativePathPrefix = '@source' } = {}) => {
     // wrap raw html renderer rule
     const createHtmlRule = (rawHtmlRule) => (tokens, idx, options, env, self) => {
         // replace the original link with resolved link
-        tokens[idx].content = tokens[idx].content.replace(/(<img\b.*?src=")([^"]*)(")/gs, (_, prefix, link, suffix) => `${prefix}${(0, resolveLink_1.resolveLink)(link, relativePathPrefix, env)}${suffix}`);
+        tokens[idx].content = tokens[idx].content
+            // handle src
+            .replace(/(<img\b.*?src=")([^"]*)(")/gs, (_, prefix, src, suffix) => `${prefix}${(0, resolveLink_1.resolveLink)(src.trim(), relativePathPrefix, env)}${suffix}`)
+            // handle srcset
+            .replace(/(<img\b.*?srcset=")([^"]*)(")/gs, (_, prefix, srcset, suffix) => `${prefix}${srcset
+            .split(',')
+            .map((item) => item
+            .trim()
+            .replace(/^([^ ]*?)([ \n].*)?$/, (_, url, descriptor = '') => `${(0, resolveLink_1.resolveLink)(url.trim(), relativePathPrefix, env)}${descriptor.replace(/[ \n]+/g, ' ').trimEnd()}`))
+            .join(', ')}${suffix}`);
         return rawHtmlRule(tokens, idx, options, env, self);
     };
     const rawHtmlBlockRule = md.renderer.rules.html_block;

package/lib/plugins/codePlugin/codePlugin.js

@@ -60,7 +60,7 @@ 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>`;
         }

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.43",
+  "version": "2.0.0-beta.46",
   "description": "Markdown package of VuePress",
   "keywords": [
     "vuepress",
@@ -23,11 +23,11 @@
   ],
   "dependencies": {
     "@types/markdown-it": "^12.2.3",
-    "@vuepress/shared": "2.0.0-beta.43",
-    "@vuepress/utils": "2.0.0-beta.43",
-    "markdown-it": "^13.0.0",
-    "markdown-it-anchor": "^8.4.1",
-    "markdown-it-emoji": "^2.0.0",
+    "@vuepress/shared": "2.0.0-beta.46",
+    "@vuepress/utils": "2.0.0-beta.46",
+    "markdown-it": "^13.0.1",
+    "markdown-it-anchor": "^8.6.4",
+    "markdown-it-emoji": "^2.0.2",
     "mdurl": "^1.0.1"
   },
   "publishConfig": {