@vuepress/markdown 2.0.0-beta.27 → 2.0.0-beta.33

package/lib/plugins/assetsPlugin/assetsPlugin.js

@@ -21,7 +21,7 @@ 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=")([^"]*)(")/s, (_, prefix, link, suffix) => `${prefix}${(0, resolveLink_1.resolveLink)(link, relativePathPrefix, env)}${suffix}`);
+        tokens[idx].content = tokens[idx].content.replace(/(<img\b.*?src=")([^"]*)(")/gs, (_, prefix, link, suffix) => `${prefix}${(0, resolveLink_1.resolveLink)(link, relativePathPrefix, env)}${suffix}`);
         return rawHtmlRule(tokens, idx, options, env, self);
     };
     const rawHtmlBlockRule = md.renderer.rules.html_block;

package/lib/plugins/importCodePlugin/createImportCodeBlockRule.d.ts

@@ -1,3 +1,3 @@
 import type { RuleBlock } from 'markdown-it/lib/parser_block';
 import type { ImportCodePluginOptions } from './importCodePlugin';
-export declare const createImportCodeBlockRule: ({ handleImportPath, }: ImportCodePluginOptions) => RuleBlock;
+export declare const createImportCodeBlockRule: ({ handleImportPath }: ImportCodePluginOptions) => RuleBlock;

package/lib/plugins/importCodePlugin/createImportCodeBlockRule.js

@@ -8,7 +8,7 @@ const MIN_LENGTH = 9;
 const START_CODES = [64, 91, 99, 111, 100, 101];
 // regexp to match the import syntax
 const SYNTAX_RE = /^@\[code(?:{(?:(\d+)?-(\d+)?)})?(?: ([^\]]+))?\]\(([^)]*)\)/;
-const createImportCodeBlockRule = ({ handleImportPath = (str) => str, }) => (state, startLine, endLine, silent) => {
+const createImportCodeBlockRule = ({ handleImportPath = (str) => str }) => (state, startLine, endLine, silent) => {
     // if it's indented more than 3 spaces, it should be a code block
     /* istanbul ignore if */
     if (state.sCount[startLine] - state.blkIndent >= 4) {

package/lib/plugins/linksPlugin/linksPlugin.d.ts

@@ -18,12 +18,6 @@ export interface LinksPluginOptions {
      * ```
      */
     externalAttrs?: Record<string, string>;
-    /**
-     * Whether to render an outbound icon to external links
-     *
-     * @default true
-     */
-    externalIcon?: boolean;
 }
 /**
  * Process links in markdown file

package/lib/plugins/linksPlugin/linksPlugin.js

@@ -10,7 +10,6 @@ const resolvePaths_1 = require("./resolvePaths");
  * - external links: add extra attrs and external icon
  */
 const linksPlugin = (md, options = {}) => {
-    var _a;
     // tag of internal links
     const internalTag = options.internalTag || 'RouterLink';
     // attrs that going to be added to external links
@@ -19,12 +18,8 @@ const linksPlugin = (md, options = {}) => {
         rel: 'noopener noreferrer',
         ...options.externalAttrs,
     };
-    // external icon
-    const externalIcon = (_a = options.externalIcon) !== null && _a !== void 0 ? _a : true;
     let hasOpenInternalLink = false;
-    let hasOpenExternalLink = false;
     const handleLinkOpen = (tokens, idx, env) => {
-        var _a;
         // get current token
         const token = tokens[idx];
         // get `href` attr index
@@ -38,78 +33,64 @@ const linksPlugin = (md, options = {}) => {
         const hrefAttr = token.attrs[hrefIndex];
         const hrefLink = hrefAttr[1];
         // get `base` and `filePathRelative` from `env`
-        const { base = '/', filePathRelative = null, frontmatter = {} } = env;
+        const { base = '/', filePathRelative = null } = env;
         // check if a link is an external link
         if ((0, shared_1.isLinkExternal)(hrefLink, base)) {
             // set `externalAttrs` to current token
             Object.entries(externalAttrs).forEach(([key, val]) => token.attrSet(key, val));
-            // check if we should render external icon
-            if (
-            // frontmatter should override plugin option
-            ((_a = frontmatter.externalIcon) !== null && _a !== void 0 ? _a : externalIcon) &&
-                // only when an external link has `target="_blank"`
-                // should we render external icon
-                externalAttrs.target === '_blank') {
-                hasOpenExternalLink = true;
-            }
             return;
         }
         // check if a link is an internal link
         const internalLinkMatch = hrefLink.match(/^((?:.*)(?:\/|\.md|\.html))(#.*)?$/);
-        if (internalLinkMatch) {
-            // convert
-            // <a href="hrefLink">
-            // to
-            // <RouterLink to="toProp">
-            // notice that the path and hash are encoded by markdown-it
-            const rawPath = internalLinkMatch[1];
-            const rawHash = internalLinkMatch[2] || '';
-            // resolve relative and absolute path
-            const { relativePath, absolutePath } = (0, resolvePaths_1.resolvePaths)(rawPath, base, filePathRelative);
-            // normalize markdown file path to route path
-            //
-            // we are removing the `base` from absolute path because it should not be
-            // passed to `<RouterLink>`
-            //
-            // '/foo/index.md' => '/foo/'
-            // '/foo/bar.md' => '/foo/bar.html'
-            const normalizedPath = absolutePath
-                .replace(new RegExp(`^${base}`), '/')
-                .replace(/(^|\/)(README|index).md$/i, '$1')
-                .replace(/\.md$/, '.html');
-            if (internalTag === 'RouterLink') {
-                // convert starting tag of internal link to `<RouterLink>`
-                token.tag = internalTag;
-                // replace the original `href` attr with `to` attr
-                hrefAttr[0] = 'to';
-                // set `hasOpenInternalLink` to modify the ending tag
-                hasOpenInternalLink = true;
-            }
-            hrefAttr[1] = `${normalizedPath}${rawHash}`;
-            // extract internal links for file / page existence check
-            const links = env.links || (env.links = []);
-            links.push({
-                raw: hrefLink,
-                relative: relativePath,
-                absolute: absolutePath,
-            });
+        if (!internalLinkMatch) {
+            return;
+        }
+        // convert
+        // <a href="hrefLink">
+        // to
+        // <RouterLink to="toProp">
+        // notice that the path and hash are encoded by markdown-it
+        const rawPath = internalLinkMatch[1];
+        const rawHash = internalLinkMatch[2] || '';
+        // resolve relative and absolute path
+        const { relativePath, absolutePath } = (0, resolvePaths_1.resolvePaths)(rawPath, base, filePathRelative);
+        // normalize markdown file path to route path
+        //
+        // we are removing the `base` from absolute path because it should not be
+        // passed to `<RouterLink>`
+        //
+        // '/foo/index.md' => '/foo/'
+        // '/foo/bar.md' => '/foo/bar.html'
+        const normalizedPath = absolutePath
+            .replace(new RegExp(`^${base}`), '/')
+            .replace(/(^|\/)(README|index).md$/i, '$1')
+            .replace(/\.md$/, '.html');
+        if (internalTag === 'RouterLink') {
+            // convert starting tag of internal link to `<RouterLink>`
+            token.tag = internalTag;
+            // replace the original `href` attr with `to` attr
+            hrefAttr[0] = 'to';
+            // set `hasOpenInternalLink` to modify the ending tag
+            hasOpenInternalLink = true;
         }
+        hrefAttr[1] = `${normalizedPath}${rawHash}`;
+        // extract internal links for file / page existence check
+        const links = env.links || (env.links = []);
+        links.push({
+            raw: hrefLink,
+            relative: relativePath,
+            absolute: absolutePath,
+        });
     };
     md.renderer.rules.link_open = (tokens, idx, options, env, self) => {
         handleLinkOpen(tokens, idx, env);
         return self.renderToken(tokens, idx, options);
     };
     md.renderer.rules.link_close = (tokens, idx, options, env, self) => {
-        const token = tokens[idx];
-        // add external icon before ending tag of external link
-        if (hasOpenExternalLink) {
-            hasOpenExternalLink = false;
-            return '<OutboundLink/>' + self.renderToken(tokens, idx, options);
-        }
         // convert ending tag of internal link
         if (hasOpenInternalLink) {
             hasOpenInternalLink = false;
-            token.tag = internalTag;
+            tokens[idx].tag = internalTag;
         }
         return self.renderToken(tokens, idx, options);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/markdown",
-  "version": "2.0.0-beta.27",
+  "version": "2.0.0-beta.33",
   "description": "Markdown package of VuePress",
   "keywords": [
     "vuepress",
@@ -27,9 +27,9 @@
   },
   "dependencies": {
     "@types/markdown-it": "^12.2.3",
-    "@vuepress/shared": "2.0.0-beta.27",
-    "@vuepress/utils": "2.0.0-beta.27",
-    "markdown-it": "^12.2.0",
+    "@vuepress/shared": "2.0.0-beta.33",
+    "@vuepress/utils": "2.0.0-beta.33",
+    "markdown-it": "^12.3.2",
     "markdown-it-anchor": "^8.4.1",
     "markdown-it-emoji": "^2.0.0",
     "mdurl": "^1.0.1"
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2671a94fe6864e215eb84f318b7e657744a0bc5d"
+  "gitHead": "0934a5d6685922e0dc6391622b00a3b89140492c"
 }