@vuepress/markdown 2.0.0-beta.45 → 2.0.0-beta.48

package/lib/markdown.d.ts

@@ -2,4 +2,4 @@ import type { Markdown, MarkdownOptions } from './types';
 /**
  * Create vuepress customized markdown-it instance
  */
-export declare const createMarkdown: ({ anchor, assets, code, customComponent, emoji, extractHeaders, extractTitle, hoistTags, importCode, links, toc, ...markdownItOptions }?: MarkdownOptions) => Markdown;
+export declare const createMarkdown: ({ anchor, assets, code, customComponent, emoji, extractHeaders, extractTitle, hoistTags, importCode, links, slugify, toc, ...markdownItOptions }?: MarkdownOptions) => Markdown;

package/lib/markdown.js

@@ -7,7 +7,7 @@ const utils_1 = require("./utils");
 /**
  * Create vuepress customized markdown-it instance
  */
-const createMarkdown = ({ anchor, assets, code, customComponent, emoji, extractHeaders, extractTitle, hoistTags, importCode, links, toc, ...markdownItOptions } = {}) => {
+const createMarkdown = ({ anchor, assets, code, customComponent, emoji, extractHeaders, extractTitle, hoistTags, importCode, links, slugify = utils_1.vuepressSlugify, toc, ...markdownItOptions } = {}) => {
     // create raw markdown-it instance
     const md = MarkdownIt({
         ...markdownItOptions,
@@ -25,7 +25,7 @@ const createMarkdown = ({ anchor, assets, code, customComponent, emoji, extractH
     if (anchor !== false) {
         md.use(plugins_1.anchorPlugin, {
             level: [1, 2, 3, 4, 5, 6],
-            slugify: utils_1.slugify,
+            slugify,
             permalink: plugins_1.anchorPlugin.permalink.ariaHidden({
                 class: 'header-anchor',
                 symbol: '#',
@@ -39,7 +39,7 @@ const createMarkdown = ({ anchor, assets, code, customComponent, emoji, extractH
     if (toc !== false) {
         md.use(plugins_1.tocPlugin, {
             level: [2, 3],
-            slugify: utils_1.slugify,
+            slugify,
             linkTag: 'RouterLink',
             ...toc,
         });
@@ -48,7 +48,7 @@ const createMarkdown = ({ anchor, assets, code, customComponent, emoji, extractH
     if (extractHeaders !== false) {
         md.use(plugins_1.extractHeadersPlugin, {
             level: [2, 3],
-            slugify: utils_1.slugify,
+            slugify,
             ...extractHeaders,
         });
     }

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/extractHeadersPlugin.d.ts

@@ -1,4 +1,5 @@
 import type { PluginWithOptions } from 'markdown-it';
+import type { MarkdownSlugifyFunction } from '../types';
 export interface ExtractHeadersPluginOptions {
     /**
      * Heading level that going to be extracted to the `env`
@@ -13,7 +14,7 @@ export interface ExtractHeadersPluginOptions {
      * Should use the same slugify function with markdown-it-anchor
      * to ensure the link is matched
      */
-    slugify?: (str: string) => string;
+    slugify?: MarkdownSlugifyFunction;
     /**
      * A function for formatting headers
      */

package/lib/plugins/extractHeadersPlugin.js

@@ -7,7 +7,7 @@ const utils_1 = require("../utils");
  *
  * Would be used for generating sidebar nav and toc
  */
-const extractHeadersPlugin = (md, { level = [2, 3], slugify = utils_1.slugify, format, } = {}) => {
+const extractHeadersPlugin = (md, { level = [2, 3], slugify = utils_1.vuepressSlugify, format, } = {}) => {
     let headers;
     // push the rule to the end of the chain
     // resolve headers from the parsed tokens

package/lib/plugins/tocPlugin/tocPlugin.d.ts

@@ -1,4 +1,5 @@
 import type { PluginWithOptions } from 'markdown-it';
+import type { MarkdownSlugifyFunction } from '../../types';
 export interface TocPluginOptions {
     /**
      * The pattern serving as the TOC placeholder in your markdown
@@ -10,7 +11,7 @@ export interface TocPluginOptions {
      * Should use the same slugify function with markdown-it-anchor
      * to ensure the link is matched
      */
-    slugify?: (str: string) => string;
+    slugify?: MarkdownSlugifyFunction;
     /**
      * A function for formatting headers
      */

package/lib/plugins/tocPlugin/tocPlugin.js

@@ -15,7 +15,7 @@ const createTocBlockRule_1 = require("./createTocBlockRule");
  *
  * @see https://github.com/nagaozen/markdown-it-toc-done-right
  */
-const tocPlugin = (md, { pattern = /^\[\[toc\]\]$/i, slugify = utils_1.slugify, format, level = [2, 3], containerTag = 'nav', containerClass = 'table-of-contents', listTag = 'ul', listClass = '', itemClass = '', linkTag = 'a', linkClass = '', } = {}) => {
+const tocPlugin = (md, { pattern = /^\[\[toc\]\]$/i, slugify = utils_1.vuepressSlugify, format, level = [2, 3], containerTag = 'nav', containerClass = 'table-of-contents', listTag = 'ul', listClass = '', itemClass = '', linkTag = 'a', linkClass = '', } = {}) => {
     let headers;
     // push the rule to the end of the chain
     // resolve headers from the parsed tokens

package/lib/types.d.ts

@@ -13,6 +13,7 @@ export interface MarkdownOptions extends MarkdownIt.Options {
     hoistTags?: false | HoistTagsPluginOptions;
     importCode?: false | ImportCodePluginOptions;
     links?: false | LinksPluginOptions;
+    slugify?: MarkdownSlugifyFunction;
     toc?: false | TocPluginOptions;
 }
 /**
@@ -74,3 +75,7 @@ export interface MarkdownEnv {
      */
     title?: string;
 }
+/**
+ * Type of `slugify` function
+ */
+export declare type MarkdownSlugifyFunction = (str: string) => string;

package/lib/utils/index.d.ts

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

package/lib/utils/index.js

@@ -16,4 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./resolveHeadersFromTokens"), exports);
 __exportStar(require("./resolveTitleFromToken"), exports);
-__exportStar(require("./slugify"), exports);
+__exportStar(require("./vuepressSlugify"), exports);

package/lib/utils/vuepressSlugify.d.ts

@@ -0,0 +1,5 @@
+import type { MarkdownSlugifyFunction } from '../types';
+/**
+ * Default slugify function of vuepress
+ */
+export declare const vuepressSlugify: MarkdownSlugifyFunction;

package/lib/utils/{slugify.js → vuepressSlugify.js}

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.slugify = void 0;
+exports.vuepressSlugify = void 0;
 // eslint-disable-next-line no-control-regex
 const rControl = /[\u0000-\u001f]/g;
 const rSpecial = /[\s~`!@#$%^&*()\-_+=[\]{}|\\;:"'“”‘’<>,.?/]+/g;
 const rCombining = /[\u0300-\u036F]/g;
-const slugify = (str) => str
+/**
+ * Default slugify function of vuepress
+ */
+const vuepressSlugify = (str) => str
     .normalize('NFKD')
     // Remove accents
     .replace(rCombining, '')
@@ -21,4 +24,4 @@ const slugify = (str) => str
     .replace(/^(\d)/, '_$1')
     // lowercase
     .toLowerCase();
-exports.slugify = slugify;
+exports.vuepressSlugify = vuepressSlugify;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/markdown",
-  "version": "2.0.0-beta.45",
+  "version": "2.0.0-beta.48",
   "description": "Markdown package of VuePress",
   "keywords": [
     "vuepress",
@@ -23,10 +23,10 @@
   ],
   "dependencies": {
     "@types/markdown-it": "^12.2.3",
-    "@vuepress/shared": "2.0.0-beta.45",
-    "@vuepress/utils": "2.0.0-beta.45",
+    "@vuepress/shared": "2.0.0-beta.48",
+    "@vuepress/utils": "2.0.0-beta.48",
     "markdown-it": "^13.0.1",
-    "markdown-it-anchor": "^8.6.3",
+    "markdown-it-anchor": "^8.6.4",
     "markdown-it-emoji": "^2.0.2",
     "mdurl": "^1.0.1"
   },

package/lib/utils/slugify.d.ts

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