@vuepress/markdown 2.0.0-rc.14 → 2.0.0-rc.16

package/README.md

@@ -5,7 +5,7 @@
 
 ## Documentation
 
-https://v2.vuepress.vuejs.org
+https://vuepress.vuejs.org
 
 ## License
 

package/dist/index.d.ts

@@ -89,19 +89,19 @@ declare const vPrePlugin: PluginWithOptions<VPrePluginOptions>;
 type Markdown = MarkdownIt;
 
 interface MarkdownOptions extends Options$1 {
-    anchor?: false | AnchorPluginOptions;
-    assets?: false | AssetsPluginOptions;
+    anchor?: AnchorPluginOptions | false;
+    assets?: AssetsPluginOptions | false;
     component?: false;
-    emoji?: false | EmojiPluginOptions;
-    frontmatter?: false | FrontmatterPluginOptions;
-    headers?: false | HeadersPluginOptions;
+    emoji?: EmojiPluginOptions | false;
+    frontmatter?: FrontmatterPluginOptions | false;
+    headers?: HeadersPluginOptions | false;
     title?: false;
-    importCode?: false | ImportCodePluginOptions;
-    links?: false | LinksPluginOptions;
-    sfc?: false | SfcPluginOptions;
+    importCode?: ImportCodePluginOptions | false;
+    links?: LinksPluginOptions | false;
+    sfc?: SfcPluginOptions | false;
     slugify?: MarkdownSlugifyFunction;
-    toc?: false | TocPluginOptions;
-    vPre?: false | VPrePluginOptions;
+    toc?: TocPluginOptions | false;
+    vPre?: VPrePluginOptions | false;
     /**
      * @deprecated This feature has been removed. Please use `@vuepress/plugin-prismjs` or `@vuepress/plugin-shiki` instead.
      */

package/dist/index.js

@@ -18,7 +18,7 @@ import { titlePlugin } from "@mdit-vue/plugin-title";
 import { tocPlugin } from "@mdit-vue/plugin-toc";
 
 // src/plugins/anchorPlugin.ts
-import { default as anchorPlugin } from "markdown-it-anchor";
+import anchorPlugin from "markdown-it-anchor";
 
 // src/plugins/assetsPlugin/resolveLink.ts
 import { path } from "@vuepress/utils";
@@ -69,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,
@@ -77,11 +77,11 @@ 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].*)?$/,
-          (_2, url, descriptor = "") => `${resolveLink(url.trim(), {
+          (__, url, descriptor = "") => `${resolveLink(url.trim(), {
             env,
             absolutePathPrependBase,
             relativePathPrefix,
@@ -180,15 +180,18 @@ var importCodePlugin = (md, options = {}) => {
       alt: ["paragraph", "reference", "blockquote", "list"]
     }
   );
-  md.renderer.rules.import_code = (tokens, idx, options2, env, slf) => {
+  md.renderer.rules.import_code = (tokens, idx, opts, env, slf) => {
     const token = tokens[idx];
-    const { importFilePath, importCode } = resolveImportCode(token.meta, env);
+    const { importFilePath, importCode } = resolveImportCode(
+      token.meta,
+      env
+    );
     token.content = importCode;
     if (importFilePath) {
       ;
       (env.importedFiles ??= []).push(importFilePath);
     }
-    return md.renderer.rules.fence(tokens, idx, options2, env, slf);
+    return md.renderer.rules.fence(tokens, idx, opts, env, slf);
   };
 };
 
@@ -209,18 +212,16 @@ var resolvePaths = (rawPath, base, filePathRelative) => {
       absolutePath = rawPath;
       relativePath = path4.relative(base, absolutePath);
     }
+  } else if (filePathRelative) {
+    relativePath = path4.join(
+      // file path may contain non-ASCII characters
+      path4.dirname(encodeURI(filePathRelative)),
+      rawPath
+    );
+    absolutePath = path4.join(base, relativePath);
   } else {
-    if (filePathRelative) {
-      relativePath = path4.join(
-        // file path may contain non-ASCII characters
-        path4.dirname(encodeURI(filePathRelative)),
-        rawPath
-      );
-      absolutePath = path4.join(base, relativePath);
-    } else {
-      relativePath = rawPath.replace(/^(?:\.\/)?(.*)$/, "$1");
-      absolutePath = null;
-    }
+    relativePath = rawPath.replace(/^(?:\.\/)?(.*)$/, "$1");
+    absolutePath = null;
   }
   return {
     absolutePath,
@@ -247,9 +248,9 @@ var linksPlugin = (md, options = {}) => {
     const hrefLink = hrefAttr[1];
     const { base = "/", filePathRelative = null } = env;
     if (isLinkExternal(hrefLink, base)) {
-      Object.entries(externalAttrs).forEach(
-        ([key, val]) => token.attrSet(key, val)
-      );
+      Object.entries(externalAttrs).forEach(([key, val]) => {
+        token.attrSet(key, val);
+      });
       return;
     }
     const internalLinkMatch = hrefLink.match(
@@ -284,16 +285,16 @@ var linksPlugin = (md, options = {}) => {
       absolute: absolutePath
     });
   };
-  md.renderer.rules.link_open = (tokens, idx, options2, env, self) => {
+  md.renderer.rules.link_open = (tokens, idx, opts, env, self) => {
     handleLinkOpen(tokens, idx, env);
-    return self.renderToken(tokens, idx, options2);
+    return self.renderToken(tokens, idx, opts);
   };
-  md.renderer.rules.link_close = (tokens, idx, options2, _env, self) => {
+  md.renderer.rules.link_close = (tokens, idx, opts, _env, self) => {
     if (hasOpenInternalLink) {
       hasOpenInternalLink = false;
       tokens[idx].tag = internalTag;
     }
-    return self.renderToken(tokens, idx, options2);
+    return self.renderToken(tokens, idx, opts);
   };
 };
 
@@ -334,6 +335,7 @@ var vPrePlugin = (md, { inline = true, block = true } = {}) => {
 var createMarkdown = ({
   anchor,
   assets,
+  // eslint-disable-next-line @typescript-eslint/no-deprecated
   code,
   vPre,
   component,
@@ -371,7 +373,7 @@ var createMarkdown = ({
   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`
+ See https://vuepress.vuejs.org/reference/config.html#markdown-code`
     );
   }
   if (component !== false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/markdown",
-  "version": "2.0.0-rc.14",
+  "version": "2.0.0-rc.16",
   "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-anchor": "^9.2.0",
     "markdown-it-emoji": "^3.0.0",
     "mdurl": "^2.0.0",
-    "@vuepress/shared": "2.0.0-rc.14",
-    "@vuepress/utils": "2.0.0-rc.14"
+    "@vuepress/utils": "2.0.0-rc.16",
+    "@vuepress/shared": "2.0.0-rc.16"
   },
   "devDependencies": {
     "@types/mdurl": "^2.0.0"