Skip to content

Commit 7af181a

Browse files
committed
update: markedjs v13 adopt gtion
1 parent 90c0b02 commit 7af181a

File tree

9 files changed

+32
-18
lines changed

9 files changed

+32
-18
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"jest": "^29.7.0",
7070
"jest-environment-jsdom": "^29.7.0",
7171
"lint-staged": "^15.2.2",
72-
"marked": "^12.0.2",
72+
"marked": "^13.0.2",
7373
"npm-run-all": "^4.1.5",
7474
"postcss-cli": "^11.0.0",
7575
"prettier": "^3.2.5",

src/core/render/compiler.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ export class Compiler {
209209
* @param {Number} level Type of heading (h<level> tag)
210210
* @returns {String} Heading element
211211
*/
212-
origin.heading = renderer.heading = function (text, level) {
212+
origin.heading = renderer.heading = function ({ tokens, depth }) {
213+
const text = this.parser.parseInline(tokens);
213214
let { str, config } = getAndRemoveConfig(text);
214-
const nextToc = { level, title: str };
215+
const nextToc = { depth, title: str };
215216

216217
const { content, ignoreAllSubs, ignoreSubHeading } =
217218
getAndRemoveDocisfyIgnoreConfig(str);
@@ -229,7 +230,7 @@ export class Compiler {
229230
// elements after navigation. This is preferred over focusing on the link
230231
// within the heading because it matches the focus behavior of screen
231232
// readers when navigating page content.
232-
return `<h${level} id="${slug}" tabindex="-1"><a href="${url}" data-id="${slug}" class="anchor"><span>${str}</span></a></h${level}>`;
233+
return `<h${depth} id="${slug}" tabindex="-1"><a href="${url}" data-id="${slug}" class="anchor"><span>${str}</span></a></h${depth}>`;
233234
};
234235

235236
origin.code = highlightCodeCompiler({ renderer });

src/core/render/compiler/code.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import Prism from 'prismjs';
33
import 'prismjs/components/prism-markup-templating.js';
44

55
export const highlightCodeCompiler = ({ renderer }) =>
6-
(renderer.code = function (code, lang = 'markup') {
6+
(renderer.code = ({ text, lang = 'markup' }) => {
77
const langOrMarkup = Prism.languages[lang] || Prism.languages.markup;
8-
const text = Prism.highlight(
9-
code.replace(/@DOCSIFY_QM@/g, '`'),
8+
const code = Prism.highlight(
9+
text.replace(/@DOCSIFY_QM@/g, '`'),
1010
langOrMarkup,
1111
lang,
1212
);
1313

14-
return /* html */ `<pre data-lang="${lang}"><code class="lang-${lang}" tabindex="0">${text}</code></pre>`;
14+
return /* html */ `<pre data-lang="${lang}"><code class="lang-${lang}" tabindex="0">${code}</code></pre>`;
1515
});

src/core/render/compiler/image.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { getAndRemoveConfig } from '../utils.js';
22
import { isAbsolutePath, getPath, getParentPath } from '../../router/util.js';
33

44
export const imageCompiler = ({ renderer, contentBase, router }) =>
5-
(renderer.image = (href, title, text) => {
5+
(renderer.image = ({ href, title, text }) => {
66
let url = href;
77
const attrs = [];
88

src/core/render/compiler/link.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ export const linkCompiler = ({
88
linkRel,
99
compilerClass,
1010
}) =>
11-
(renderer.link = (href, title = '', text) => {
11+
(renderer.link = function ({ href, title = '', tokens }) {
12+
const text = this.parser?.parseInline(tokens) || '';
1213
const attrs = [];
1314
const { str, config } = getAndRemoveConfig(title);
1415
linkTarget = config.target || linkTarget;

src/core/render/compiler/paragraph.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { helper as helperTpl } from '../tpl.js';
22

33
export const paragraphCompiler = ({ renderer }) =>
4-
(renderer.paragraph = text => {
4+
(renderer.paragraph = function ({ tokens }) {
5+
const text = this.parser.parseInline(tokens);
56
let result;
67
if (/^!&gt;/.test(text)) {
78
result = helperTpl('tip', text);

src/core/render/compiler/taskList.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
export const taskListCompiler = ({ renderer }) =>
2-
(renderer.list = (body, ordered, start) => {
2+
(renderer.list = function (token) {
3+
const ordered = token.ordered;
4+
const start = token.start;
5+
6+
let body = '';
7+
for (let j = 0; j < token.items.length; j++) {
8+
const item = token.items[j];
9+
body += this.listitem(item);
10+
}
11+
312
const isTaskList = /<li class="task-list-item">/.test(
413
body.split('class="task-list"')[0],
514
);

src/core/render/compiler/taskListItem.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
export const taskListItemCompiler = ({ renderer }) =>
2-
(renderer.listitem = text => {
3-
const isTaskItem = /^(<input.*type="checkbox"[^>]*>)/.test(text);
2+
(renderer.listitem = function (item) {
3+
const isTaskItem = item.task;
4+
const text = this.parser.parse(item.tokens) || '';
5+
46
const html = isTaskItem
57
? /* html */ `<li class="task-list-item"><label>${text}</label></li>`
68
: /* html */ `<li>${text}</li>`;

0 commit comments

Comments
 (0)