@vuepress/markdown 2.0.0-rc.13 → 2.0.0-rc.15

package/dist/index.js

@@ -29,8 +29,7 @@ var resolveLink = (link, {
   relativePathPrefix,
   strict = false
 }) => {
-  if (link.startsWith("data:"))
-    return link;
+  if (link.startsWith("data:")) return link;
   let resolvedLink = decode(link);
   const isRelativePath = strict ? (
     // in strict mode, only link that starts with `./` or `../` is considered as relative path
@@ -70,7 +69,7 @@ var assetsPlugin = (md, {
   };
   const createHtmlRule = (rawHtmlRule) => (tokens, idx, options, env, self) => {
     tokens[idx].content = tokens[idx].content.replace(
-      /(<img\b.*?src=)(['"])([^\2]*?)\2/gs,
+      /(<img\b.*?src=)(['"])(.*?)\2/gs,
       (_, prefix, quote, src) => `${prefix}${quote}${resolveLink(src.trim(), {
         env,
         absolutePathPrependBase,
@@ -78,7 +77,7 @@ var assetsPlugin = (md, {
         strict: true
       })}${quote}`
     ).replace(
-      /(<img\b.*?srcset=)(['"])([^\2]*?)\2/gs,
+      /(<img\b.*?srcset=)(['"])(.*?)\2/gs,
       (_, prefix, quote, srcset) => `${prefix}${quote}${srcset.split(",").map(
         (item) => item.trim().replace(
           /^([^ ]*?)([ \n].*)?$/,
@@ -106,30 +105,31 @@ import { full as emojiPlugin } from "markdown-it-emoji";
 import { path as path2 } from "@vuepress/utils";
 var MIN_LENGTH = 9;
 var START_CODES = [64, 91, 99, 111, 100, 101];
-var SYNTAX_RE = /^@\[code(?:{(?:(\d+)?-(\d+)?)})?(?: ([^\]]+))?\]\(([^)]*)\)/;
+var SYNTAX_RE = /^@\[code(?:{(?:(?:(?<lineStart>\d+)?-(?<lineEnd>\d+)?)|(?<lineSingle>\d+))})?(?: (?<info>[^\]]+))?\]\((?<importPath>[^)]*)\)/;
+var parseLineNumber = (line) => line ? Number.parseInt(line, 10) : void 0;
 var createImportCodeBlockRule = ({ handleImportPath = (str) => str }) => (state, startLine, endLine, silent) => {
   if (state.sCount[startLine] - state.blkIndent >= 4) {
     return false;
   }
   const pos = state.bMarks[startLine] + state.tShift[startLine];
   const max = state.eMarks[startLine];
-  if (pos + MIN_LENGTH > max)
-    return false;
+  if (pos + MIN_LENGTH > max) return false;
   for (let i = 0; i < START_CODES.length; i += 1) {
     if (state.src.charCodeAt(pos + i) !== START_CODES[i]) {
       return false;
     }
   }
   const match = state.src.slice(pos, max).match(SYNTAX_RE);
-  if (!match)
-    return false;
-  if (silent)
-    return true;
-  const [, lineStart, lineEnd, info, importPath] = match;
+  if (!match?.groups) return false;
+  if (silent) return true;
+  const { info, importPath } = match.groups;
+  const lineSingle = parseLineNumber(match.groups.lineSingle);
+  const lineStart = lineSingle ?? parseLineNumber(match.groups.lineStart) ?? 0;
+  const lineEnd = lineSingle ?? parseLineNumber(match.groups.lineEnd);
   const meta = {
     importPath: handleImportPath(importPath),
-    lineStart: lineStart ? Number.parseInt(lineStart, 10) : 0,
-    lineEnd: lineEnd ? Number.parseInt(lineEnd, 10) : void 0
+    lineStart,
+    lineEnd
   };
   const token = state.push("import_code", "code", 0);
   token.info = info ?? path2.extname(meta.importPath).slice(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/markdown",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Markdown package of VuePress",
   "keywords": [
     "vuepress",
@@ -35,14 +35,14 @@
     "@mdit-vue/plugin-toc": "^2.1.3",
     "@mdit-vue/shared": "^2.1.3",
     "@mdit-vue/types": "^2.1.0",
-    "@types/markdown-it": "^14.1.1",
+    "@types/markdown-it": "^14.1.2",
     "@types/markdown-it-emoji": "^3.0.1",
     "markdown-it": "^14.1.0",
     "markdown-it-anchor": "^9.0.1",
     "markdown-it-emoji": "^3.0.0",
     "mdurl": "^2.0.0",
-    "@vuepress/shared": "2.0.0-rc.13",
-    "@vuepress/utils": "2.0.0-rc.13"
+    "@vuepress/utils": "2.0.0-rc.15",
+    "@vuepress/shared": "2.0.0-rc.15"
   },
   "devDependencies": {
     "@types/mdurl": "^2.0.0"