@vuepress/markdown 2.0.0-beta.18 → 2.0.0-beta.22

package/lib/markdown.js

@@ -26,9 +26,12 @@ const createMarkdown = ({ anchor, assets, code, customComponent, emoji, extractH
         md.use(plugins_1.anchorPlugin, {
             level: [1, 2, 3, 4, 5, 6],
             slugify: utils_1.slugify,
-            permalink: true,
-            permalinkBefore: true,
-            permalinkSymbol: '#',
+            permalink: plugins_1.anchorPlugin.permalink.ariaHidden({
+                class: 'header-anchor',
+                symbol: '#',
+                space: true,
+                placement: 'before',
+            }),
             ...anchor,
         });
     }

package/lib/plugins/anchorPlugin.d.ts

@@ -1,62 +1,4 @@
-import type { PluginWithOptions } from 'markdown-it';
-import State = require('markdown-it/lib/rules_core/state_core');
-import Token = require('markdown-it/lib/token');
-/**
- * Options for markdown-it-anchor
- *
- * @see https://github.com/valeriangalliat/markdown-it-anchor
- */
-export interface AnchorPluginOptions {
-    /**
-     * Minimum level to apply anchors on or array of selected levels
-     *
-     * @default 1
-     */
-    level?: number | number[];
-    /**
-     * A custom slugification function
-     */
-    slugify?: (str: string) => string;
-    /**
-     * Whether to add permalinks next to titles
-     *
-     * @default false
-     */
-    permalink?: boolean;
-    /**
-     * A custom permalink rendering function
-     */
-    renderPermalink?: (slug: string, opts: AnchorPluginOptions, state: State, tokenIndex: number) => void;
-    /**
-     * The class of the permalink anchor
-     */
-    permalinkClass?: string;
-    /**
-     * Place space between the header text and the permalink anchor
-     */
-    permalinkSpace?: boolean;
-    /**
-     * The symbol in the permalink anchor
-     */
-    permalinkSymbol?: string;
-    /**
-     * Place the permalink before the title
-     */
-    permalinkBefore?: boolean;
-    /**
-     * A custom permalink `href` rendering function
-     */
-    permalinkHref?: (slug: string, state: State) => string;
-    /**
-     * A custom permalink attributes rendering function
-     */
-    permalinkAttrs?: (slug: string, state: State) => Record<string, string>;
-    /**
-     * Called with token and info after rendering
-     */
-    callback?: (token: Token, opts: {
-        slug: string;
-        title: string;
-    }) => void;
-}
-export declare const anchorPlugin: PluginWithOptions<AnchorPluginOptions>;
+import * as anchorPlugin from 'markdown-it-anchor';
+import type { AnchorOptions } from 'markdown-it-anchor';
+export declare type AnchorPluginOptions = AnchorOptions;
+export { anchorPlugin };

package/lib/plugins/anchorPlugin.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.anchorPlugin = void 0;
-const rawAnchorPlugin = require("markdown-it-anchor");
-exports.anchorPlugin = rawAnchorPlugin;
+const anchorPlugin = require("markdown-it-anchor");
+exports.anchorPlugin = anchorPlugin;

package/lib/plugins/assetsPlugin/assetsPlugin.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assetsPlugin = void 0;
+const resolveLink_1 = require("./resolveLink");
+/**
+ * Plugin to handle assets links
+ */
+const assetsPlugin = (md, { relativePathPrefix = '@source' } = {}) => {
+    // wrap raw image renderer rule
+    const rawImageRule = md.renderer.rules.image;
+    md.renderer.rules.image = (tokens, idx, options, env, self) => {
+        const token = tokens[idx];
+        // get the image link
+        const link = token.attrGet('src');
+        if (link) {
+            // replace the original link with resolved link
+            token.attrSet('src', resolveLink_1.resolveLink(link, relativePathPrefix, env));
+        }
+        return rawImageRule(tokens, idx, options, env, self);
+    };
+    // 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}${resolveLink_1.resolveLink(link, relativePathPrefix, env)}${suffix}`);
+        return rawHtmlRule(tokens, idx, options, env, self);
+    };
+    const rawHtmlBlockRule = md.renderer.rules.html_block;
+    const rawHtmlInlineRule = md.renderer.rules.html_inline;
+    md.renderer.rules.html_block = createHtmlRule(rawHtmlBlockRule);
+    md.renderer.rules.html_inline = createHtmlRule(rawHtmlInlineRule);
+};
+exports.assetsPlugin = assetsPlugin;

package/lib/plugins/assetsPlugin/index.d.ts

@@ -0,0 +1,2 @@
+export * from './assetsPlugin';
+export * from './resolveLink';

package/lib/plugins/assetsPlugin/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./assetsPlugin"), exports);
+__exportStar(require("./resolveLink"), exports);

package/lib/plugins/assetsPlugin/resolveLink.d.ts

@@ -0,0 +1,2 @@
+import type { MarkdownEnv } from '../../types';
+export declare const resolveLink: (link: string, relativePathPrefix: string, env: MarkdownEnv) => string;

package/lib/plugins/assetsPlugin/resolveLink.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveLink = void 0;
+const utils_1 = require("@vuepress/utils");
+const mdurl_1 = require("mdurl");
+const resolveLink = (link, relativePathPrefix, env) => {
+    // decode link to ensure bundler can find the file correctly
+    let resolvedLink = mdurl_1.decode(link);
+    // if the link is relative path, and the `env.filePathRelative` exists
+    // add `@source` alias to the link
+    if (/^\.{1,2}\//.test(link) && env.filePathRelative) {
+        resolvedLink = `${relativePathPrefix}/${utils_1.path.join(utils_1.path.dirname(env.filePathRelative), resolvedLink)}`;
+    }
+    return resolvedLink;
+};
+exports.resolveLink = resolveLink;

package/lib/plugins/hoistTagsPlugin.js

@@ -12,7 +12,8 @@ const hoistTagsPlugin = (md, { customBlocks = [] } = {}) => {
     // hoist <script>, <style> and other user defined tags
     const hoistTags = Array.from(new Set(['script', 'style', ...customBlocks]));
     const hoistTagsRegexp = new RegExp(`^<(${hoistTags.join('|')})(?=(\\s|>|$))`, 'i');
-    md.renderer.rules.html_block = (tokens, idx, _, env) => {
+    const rawRule = md.renderer.rules.html_block;
+    md.renderer.rules.html_block = (tokens, idx, options, env, self) => {
         const content = tokens[idx].content;
         const hoistedTags = env.hoistedTags || (env.hoistedTags = []);
         // record the hoisted tags to env and do not render them
@@ -20,7 +21,7 @@ const hoistTagsPlugin = (md, { customBlocks = [] } = {}) => {
             hoistedTags.push(content);
             return '';
         }
-        return content;
+        return rawRule(tokens, idx, options, env, self);
     };
 };
 exports.hoistTagsPlugin = hoistTagsPlugin;

package/lib/utils/index.d.ts

@@ -1,4 +1,3 @@
-export * from './parseEmoji';
 export * from './resolveHeadersFromTokens';
 export * from './resolveTitleFromToken';
 export * from './slugify';

package/lib/utils/index.js

@@ -10,7 +10,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./parseEmoji"), exports);
 __exportStar(require("./resolveHeadersFromTokens"), exports);
 __exportStar(require("./resolveTitleFromToken"), exports);
 __exportStar(require("./slugify"), exports);

package/lib/utils/resolveTitleFromToken.js

@@ -18,7 +18,12 @@ const resolveTitleFromToken = (token, { allowHtml, escapeText, }) => {
         titleTokenTypes.push('html_inline');
     }
     // filter the token type to be included in the title
-    const titleTokens = children.filter((item) => titleTokenTypes.includes(item.type));
+    const titleTokens = children.filter((item) => {
+        var _a;
+        return titleTokenTypes.includes(item.type) &&
+            // filter permalink symbol that generated by markdown-it-anchor
+            !((_a = item.meta) === null || _a === void 0 ? void 0 : _a.isPermalinkSymbol);
+    });
     // get title from tokens
     return titleTokens
         .reduce((result, item) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/markdown",
-  "version": "2.0.0-beta.18",
+  "version": "2.0.0-beta.22",
   "description": "Markdown package of VuePress",
   "keywords": [
     "vuepress",
@@ -27,15 +27,15 @@
   },
   "dependencies": {
     "@types/markdown-it": "^12.0.2",
-    "@vuepress/shared": "2.0.0-beta.18",
-    "@vuepress/utils": "2.0.0-beta.18",
-    "markdown-it": "^12.0.6",
-    "markdown-it-anchor": "^7.1.0",
+    "@vuepress/shared": "2.0.0-beta.21",
+    "@vuepress/utils": "2.0.0-beta.21",
+    "markdown-it": "^12.1.0",
+    "markdown-it-anchor": "^8.1.0",
     "markdown-it-emoji": "^2.0.0",
     "mdurl": "^1.0.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b74a98f3ebe57b5edf3443bf747834a767e67796"
+  "gitHead": "8db8d235df8914c70c864ae3f3f66f93cfd1a457"
 }

package/lib/plugins/assetsPlugin.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assetsPlugin = void 0;
-const mdurl_1 = require("mdurl");
-const utils_1 = require("@vuepress/utils");
-/**
- * Plugin to handle assets links
- */
-const assetsPlugin = (md, { relativePathPrefix = '@source' } = {}) => {
-    const rawRule = md.renderer.rules.image;
-    md.renderer.rules.image = (tokens, idx, options, env, self) => {
-        const token = tokens[idx];
-        // get the image link
-        const link = token.attrGet('src');
-        if (!link) {
-            return rawRule(tokens, idx, options, env, self);
-        }
-        // decode link to ensure bundler can find the file correctly
-        let resolvedLink = mdurl_1.decode(link);
-        // if the link is relative path, and the `env.filePathRelative` exists
-        // add `@source` alias to the link
-        if (/^\.{1,2}\//.test(link) && env.filePathRelative) {
-            resolvedLink = `${relativePathPrefix}/${utils_1.path.join(utils_1.path.dirname(env.filePathRelative), resolvedLink)}`;
-        }
-        // replace the original link with resolved link
-        token.attrSet('src', resolvedLink);
-        return rawRule(tokens, idx, options, env, self);
-    };
-};
-exports.assetsPlugin = assetsPlugin;

package/lib/utils/parseEmoji.d.ts

@@ -1 +0,0 @@
-export declare const parseEmoji: (str: string) => string;

package/lib/utils/parseEmoji.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseEmoji = void 0;
-const emojiData = require("markdown-it-emoji/lib/data/full.json");
-const parseEmoji = (str) => str.replace(/:(.+?):/g, (placeholder, key) => emojiData[key] || placeholder);
-exports.parseEmoji = parseEmoji;