Merge b8ca03c into 568e5e9

hexojs · Dec 31, 2021 · 16d793a · 16d793a
2 parents 568e5e9 + b8ca03c
commit 16d793a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/renderer.js b/lib/renderer.js
@@ -1,12 +1,11 @@
 'use strict';
 
-const marked = require('marked');
+const { marked } = require('marked');
 
 let JSDOM,
   createDOMPurify;
 
-const { escape } = require('marked/src/helpers');
-const { encodeURL, slugize, stripHTML, url_for, isExternalLink } = require('hexo-util');
+const { encodeURL, slugize, stripHTML, url_for, isExternalLink, escapeHTML: escape } = require('hexo-util');
 const MarkedRenderer = marked.Renderer;
 const MarkedTokenizer = marked.Tokenizer;
 const { basename, dirname, extname, join } = require('path').posix;
@@ -188,7 +187,7 @@ class Tokenizer extends MarkedTokenizer {
     const cap = rules.inline.text.exec(src);
     if (cap) {
       let text;
-      if (this.lexer.state.inRawBlock) {
+      if (this.lexer.state.inRawBlock || this.rules.inline.url.exec(src)) {
         text = cap[0];
       } else {
         text = escape(isSmarty ? smartypants(cap[0], quotes) : cap[0]);

diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   "license": "MIT",
   "dependencies": {
     "hexo-util": "^2.5.0",
-    "marked": "^3.0.4",
+    "marked": "^4.0.1",
     "dompurify": "^2.3.0",
     "jsdom": "^19.0.0"
   },