Skip to content

Commit 360979f

Browse files
JeanMecheAndrewKushnir
authored andcommitted
docs(docs-infra): fix marked rendering (angular#57338)
Follow-up to angular#57319 which introduced some regressions after updating marked to v14 PR Close angular#57338
1 parent b279081 commit 360979f

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

adev/shared-docs/pipeline/api-gen/rendering/marked/renderer.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {Renderer as MarkedRenderer, Tokens} from 'marked';
9+
import {Renderer, Tokens} from 'marked';
1010
import {codeToHtml} from '../shiki/shiki';
1111

1212
/**
1313
* Custom renderer for marked that will be used to transform markdown files to HTML
1414
* files that can be used in the Angular docs.
1515
*/
16-
export const renderer: Partial<MarkedRenderer> = {
17-
code({lang, raw}): string {
18-
const highlightResult = codeToHtml(raw, lang).replace(/>\s+</g, '><');
16+
export const renderer: Partial<Renderer> = {
17+
code({lang, text}): string {
18+
const highlightResult = codeToHtml(text, lang).replace(/>\s+</g, '><');
1919

2020
return `
2121
<div class="docs-code" role="group">
@@ -33,22 +33,22 @@ export const renderer: Partial<MarkedRenderer> = {
3333
link({href, text}): string {
3434
return `<a href="${href}">${text}</a>`;
3535
},
36-
list({items, ordered, start}) {
36+
list(this: Renderer, {items, ordered, start}) {
3737
if (ordered) {
3838
return `
3939
<ol class="docs-ordered-list">
40-
${items}
40+
${items.map((item) => this.listitem(item)).join('')}
4141
</ol>
4242
`;
4343
}
4444
return `
4545
<ul class="docs-list">
46-
${items}
46+
${items.map((item) => this.listitem(item)).join('')}
4747
</ul>
4848
`;
4949
},
5050

51-
table(this: MarkedRenderer, {header, rows}: Tokens.Table) {
51+
table(this: Renderer, {header, rows}: Tokens.Table) {
5252
return `
5353
<div class="docs-table docs-scroll-track-transparent">
5454
<table>

adev/shared-docs/pipeline/guides/tranformations/text.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ const UNICODE_EMOJI_REGEX = /&#x[\dA-Fa-f]+;/g;
1515
/** Regex to find emojis. */
1616
const regex = emojiRegex();
1717

18-
export function textRender(this: Renderer, {text}: Tokens.Text) {
19-
return regex.test(text) || UNICODE_EMOJI_REGEX.test(text)
18+
export function textRender(this: Renderer, token: Tokens.Text) {
19+
const text = token.tokens ? this.parser.parseInline(token.tokens) : token.text;
20+
return regex.test(token.text) || UNICODE_EMOJI_REGEX.test(token.text)
2021
? `<span class="docs-emoji">${text}</span>`
2122
: text;
2223
}

packages/core/src/authoring/output/output.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ export interface OutputOptions {
3333
*
3434
* To use `output()`, import the function from `@angular/core`.
3535
*
36-
* ```
37-
* import {output} from '@angular/core`;
36+
* ```ts
37+
* import {output} from '@angular/core';
3838
* ```
3939
*
4040
* Inside your component, introduce a new class member and initialize

0 commit comments

Comments
 (0)