Merge remote-tracking branch 'upstream/master' into dependabot/npm_and_yarn/chai-5.1.2

Author: uiolee

.github/workflows/linter.yml

@@ -6,11 +6,11 @@ jobs:
   linter:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 14.x
+      - uses: actions/checkout@v4
+      - name: Use Node.js 22
         uses: actions/setup-node@v4
         with:
-          node-version: "14.x"
+          node-version: "22"
       - name: Cache NPM dependencies
         uses: actions/cache@v4
         with:

.github/workflows/tester.yml

@@ -8,14 +8,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: ["14.x", "16.x", "18.x"]
-        exclude:
-          # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/running-variations-of-jobs-in-a-workflow#excluding-matrix-configurations
-          - os: macos-latest
-            node-version: 14.x
+        node-version: ["18", "20", "22"]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
@@ -38,9 +34,9 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: ["14.x"]
+        node-version: ["22"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:

README.md

@@ -1,6 +1,6 @@
 # hexo-renderer-marked
 
-[![Build Status](https://github.com/hexojs/hexo-renderer-marked/workflows/Tester/badge.svg?branch=master)](https://github.com/hexojs/hexo-renderer-marked/actions?query=workflow%3ATester)
+[![Tester](https://github.com/hexojs/hexo-renderer-marked/actions/workflows/tester.yml/badge.svg?branch=master)](https://github.com/hexojs/hexo-renderer-marked/actions/workflows/tester.yml)
 [![NPM version](https://badge.fury.io/js/hexo-renderer-marked.svg)](https://www.npmjs.com/package/hexo-renderer-marked)
 [![Coverage Status](https://img.shields.io/coveralls/hexojs/hexo-renderer-marked.svg)](https://coveralls.io/r/hexojs/hexo-renderer-marked?branch=master)
 [![NPM Dependencies](https://img.shields.io/librariesio/release/npm/hexo-renderer-marked.svg)](https://libraries.io/npm/hexo-renderer-marked)
@@ -20,7 +20,7 @@ There are two solutions to avoid those issues:
 
 ## Installation
 
-``` bash
+```bash
 $ npm install hexo-renderer-marked --save
 ```
 
@@ -32,7 +32,7 @@ $ npm install hexo-renderer-marked --save
 
 You can configure this plugin in `_config.yml`.
 
-``` yaml
+```yml
 marked:
   gfm: true
   pedantic: false
@@ -83,7 +83,7 @@ marked:
 - **figcaption** - Append `figcaption` element after each image.
 - **prependRoot** - Prepend root value to (internal) image path.
   * Example `_config.yml`:
-  ``` yml
+  ```yml
   root: /blog/
   ```
   * `![text](/path/to/image.jpg)` becomes `<img src="/blog/path/to/image.jpg" alt="text">`
@@ -112,7 +112,7 @@ For more options, see [Marked](https://marked.js.org/using_advanced#options). Du
 
 To enable it, pass an object containing the DOMPurify options:
 
-```json
+```yml
 dompurify: true
 ```
 
@@ -173,10 +173,11 @@ This plugin overrides some default behaviours of how [marked] plugin renders the
 
 For example, to override how heading like `# heading text` is rendered:
 
-``` js
+```js
 hexo.extend.filter.register('marked:renderer', function(renderer) {
   const { config } = this; // Skip this line if you don't need user config from _config.yml
-  renderer.heading = function(text, level) {
+  renderer.heading = function({ tokens, depth: level }) {
+    const text = this.parser.parseInline(tokens);
     // Default behaviour
     // return `<h${level}>${text}</h${level}>`;
     // outputs <h1>heading text</h1>
@@ -196,7 +197,7 @@ Notice `renderer.heading = function (text, level) {` corresponds to [this line](
 
 It is also possible to customize the [tokenizer](https://marked.js.org/using_pro#tokenizer).
 
-``` js
+```js
 const { escapeHTML: escape } = require('hexo-util');
 
 // https://github.com/markedjs/marked/blob/b6773fca412c339e0cedd56b63f9fa1583cfd372/src/Lexer.js#L8-L24

lib/renderer.js

@@ -33,7 +33,8 @@ function mangleEmail(text) {
 
 const renderer = {
   // Add id attribute to headings
-  heading(text, level) {
+  heading({ tokens, depth: level }) {
+    let text = this.parser.parseInline(tokens);
     const { anchorAlias, headerIds, modifyAnchors, _headingId } = this.options;
 
     if (!headerIds) {
@@ -67,7 +68,8 @@ const renderer = {
     return `<h${level} id="${id}"><a href="#${id}" class="headerlink" title="${stripHTML(text)}"></a>${text}</h${level}>`;
   },
 
-  link(href, title, text) {
+  link({ tokens, href, title }) {
+    const text = this.parser.parseInline(tokens);
     const { external_link, sanitizeUrl, hexo, mangle } = this.options;
     const { url: urlCfg } = hexo.config;
 
@@ -96,7 +98,7 @@ const renderer = {
     out += '"';
 
     if (title) {
-      out += ` title="${title}"`;
+      out += ` title="${escape(title)}"`;
     }
     if (external_link) {
       const target = ' target="_blank"';
@@ -118,7 +120,8 @@ const renderer = {
   },
 
   // Support Basic Description Lists
-  paragraph(text) {
+  paragraph({ tokens }) {
+    const text = this.parser.parseInline(tokens);
     const { descriptionLists = true } = this.options;
 
     if (descriptionLists) {
@@ -131,7 +134,7 @@ const renderer = {
   },
 
   // Prepend root to image path
-  image(href, title, text) {
+  image({ href, title, text }) {
     const { options } = this;
     const { hexo } = options;
     const { relative_link } = hexo.config;
@@ -149,8 +152,8 @@ const renderer = {
     }
 
     let out = `<img src="${encodeURL(href)}"`;
-    if (text) out += ` alt="${text}"`;
-    if (title) out += ` title="${title}"`;
+    if (text) out += ` alt="${escape(text)}"`;
+    if (title) out += ` title="${escape(title)}"`;
     if (lazyload) out += ' loading="lazy"';
 
     out += '>';
@@ -185,7 +188,7 @@ const smartypants = (str, quotes) => {
 };
 
 const tokenizer = {
-  // Support AutoLink option
+  // Support autolink option
   url(src) {
     const { autolink } = this.options;
 
@@ -225,7 +228,7 @@ module.exports = function(data, options) {
   // exec filter to extend marked
   this.execFilterSync('marked:use', marked.use, { context: this });
 
-  // exec filter to extend renderer.
+  // exec filter to extend renderer
   this.execFilterSync('marked:renderer', renderer, { context: this });
 
   // exec filter to extend tokenizer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-renderer-marked",
-  "version": "6.3.0",
+  "version": "7.0.0",
   "description": "Markdown renderer plugin for Hexo",
   "main": "index",
   "scripts": {
@@ -33,18 +33,18 @@
   "dependencies": {
     "dompurify": "^3.0.3",
     "hexo-util": "^3.1.0",
-    "jsdom": "^20.0.1",
-    "marked": "^12.0.1"
+    "jsdom": "^25.0.1",
+    "marked": "^15.0.4"
   },
   "devDependencies": {
-    "c8": "^8.0.0",
+    "c8": "^10.1.2",
     "chai": "^5.1.2",
     "eslint": "^8.57.0",
     "eslint-config-hexo": "^5.0.0",
     "hexo": "^7.1.1",
-    "mocha": "^10.4.0"
+    "mocha": "^11.0.1"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   }
 }

test/index.js

@@ -901,12 +901,15 @@ describe('Marked renderer', () => {
   });
 
   describe('exec filter to extend', () => {
+    // Clear the cache, as the filter might permanently modify the tokenizer
+    // thereby affecting other test cases
+    delete require.cache[require.resolve('../lib/renderer')];
     const hexo = new Hexo(__dirname, {silent: true});
     hexo.config.marked = {};
 
     it('should execute filter registered to marked:renderer', () => {
       hexo.extend.filter.register('marked:renderer', renderer => {
-        renderer.image = function(href, title, text) {
+        renderer.image = function({ href }) {
           return `<img data-src="${encodeURL(href)}">`;
         };
       });
@@ -949,7 +952,7 @@ describe('Marked renderer', () => {
       const r = require('../lib/renderer').bind(hexo);
 
       const result = r({text: body});
-      result.should.eql(`<p>${smartypants(body)}</p>\n`);
+      result.should.eql(`<p>${escapeHTML(smartypants(body))}</p>\n`);
     });
 
     it('should execute filter registered to marked:extensions', () => {
@@ -1042,6 +1045,5 @@ describe('Marked renderer', () => {
         '<p><a href="http://hexo.io/">Hexo</a></p>\n'
       ].join(''));
     });
-
   });
 });