Skip to content

Commit b717c25

Browse files
elliot-nelsonelliot-nelson
committed
Merge branch 'main' into enelson/package-update
2 parents fe5099b + 6f8d2d8 commit b717c25

File tree

332 files changed

+5333
-1199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

332 files changed

+5333
-1199
lines changed

‎apps/api-documenter/CHANGELOG.json‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,51 @@
11
{
22
"name": "@microsoft/api-documenter",
33
"entries": [
4+
{
5+
"version": "7.21.2",
6+
"tag": "@microsoft/api-documenter_v7.21.2",
7+
"date": "Mon, 30 Jan 2023 16:22:30 GMT",
8+
"comments": {
9+
"dependency": [
10+
{
11+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" to `7.26.1`"
12+
},
13+
{
14+
"comment": "Updating dependency \"@rushstack/node-core-library\" to `3.54.0`"
15+
},
16+
{
17+
"comment": "Updating dependency \"@rushstack/heft\" to `0.49.4`"
18+
},
19+
{
20+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.12.1`"
21+
}
22+
]
23+
}
24+
},
25+
{
26+
"version": "7.21.1",
27+
"tag": "@microsoft/api-documenter_v7.21.1",
28+
"date": "Mon, 30 Jan 2023 00:55:44 GMT",
29+
"comments": {
30+
"dependency": [
31+
{
32+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.12.0`"
33+
}
34+
]
35+
}
36+
},
37+
{
38+
"version": "7.21.0",
39+
"tag": "@microsoft/api-documenter_v7.21.0",
40+
"date": "Sun, 29 Jan 2023 20:09:58 GMT",
41+
"comments": {
42+
"minor": [
43+
{
44+
"comment": "Fix an issue where `<b>`/`<i>` tags sometimes interfered with parsing of other Markdown on the same line; italics and boldface are now emitted using `*` and `_`"
45+
}
46+
]
47+
}
48+
},
449
{
550
"version": "7.20.1",
651
"tag": "@microsoft/api-documenter_v7.20.1",

‎apps/api-documenter/CHANGELOG.md‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
# Change Log - @microsoft/api-documenter
22

3-
This log was last generated on Thu, 26 Jan 2023 02:55:10 GMT and should not be manually modified.
3+
This log was last generated on Mon, 30 Jan 2023 16:22:30 GMT and should not be manually modified.
4+
5+
## 7.21.2
6+
Mon, 30 Jan 2023 16:22:30 GMT
7+
8+
_Version update only_
9+
10+
## 7.21.1
11+
Mon, 30 Jan 2023 00:55:44 GMT
12+
13+
_Version update only_
14+
15+
## 7.21.0
16+
Sun, 29 Jan 2023 20:09:58 GMT
17+
18+
### Minor changes
19+
20+
- Fix an issue where `<b>`/`<i>` tags sometimes interfered with parsing of other Markdown on the same line; italics and boldface are now emitted using `*` and `_`
421

522
## 7.20.1
623
Thu, 26 Jan 2023 02:55:10 GMT

‎apps/api-documenter/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/api-documenter",
3-
"version": "7.20.1",
3+
"version": "7.21.2",
44
"description": "Read JSON files from api-extractor, generate documentation pages",
55
"repository": {
66
"type": "git",

‎apps/api-documenter/src/markdown/MarkdownEmitter.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,19 +250,19 @@ export class MarkdownEmitter {
250250
}
251251

252252
if (context.boldRequested) {
253-
writer.write('<b>');
253+
writer.write('**');
254254
}
255255
if (context.italicRequested) {
256-
writer.write('<i>');
256+
writer.write('_');
257257
}
258258

259259
writer.write(this.getEscapedText(middle));
260260

261261
if (context.italicRequested) {
262-
writer.write('</i>');
262+
writer.write('_');
263263
}
264264
if (context.boldRequested) {
265-
writer.write('</b>');
265+
writer.write('**');
266266
}
267267
}
268268

‎apps/api-documenter/src/markdown/test/CustomMarkdownEmitter.test.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,12 @@ test('render Markdown from TSDoc', () => {
159159
new DocParagraph({ configuration }, [new DocPlainText({ configuration, text: 'Cell 1' })])
160160
]),
161161
new DocTableCell({ configuration }, [
162-
new DocParagraph({ configuration }, [new DocPlainText({ configuration, text: 'Cell 2' })])
162+
new DocParagraph({ configuration }, [new DocPlainText({ configuration, text: 'Cell 2' })]),
163+
new DocParagraph({ configuration }, [
164+
new DocEmphasisSpan({ configuration, bold: true }, [
165+
new DocPlainText({ configuration, text: 'bold text' })
166+
])
167+
])
163168
])
164169
])
165170
]
@@ -176,5 +181,6 @@ test('render Markdown from TSDoc', () => {
176181
}
177182
});
178183

179-
expect(stringBuilder).toMatchSnapshot();
184+
expect(stringBuilder.toString()).toMatchSnapshot();
185+
console.log(stringBuilder.toString());
180186
});

‎apps/api-documenter/src/markdown/test/__snapshots__/CustomMarkdownEmitter.test.ts.snap‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,38 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`render Markdown from TSDoc 1`] = `
4-
StringBuilder {
5-
"_chunks": Array [
6-
"
4+
"
75
## Simple bold test
86
9-
This is a <b>bold</b> word.
7+
This is a **bold** word.
108
119
## All whitespace bold
1210
1311
1412
1513
## Newline bold
1614
17-
<b>line 1</b> <b>line 2</b>
15+
**line 1** **line 2**
1816
1917
## Newline bold with spaces
2018
21-
<b>line 1</b> <b>line 2</b> <b>line 3</b>
19+
**line 1** **line 2** **line 3**
2220
2321
## Adjacent bold regions
2422
25-
<b>one</b><b>two</b> <b>three</b> <b>four</b>non-bold<!-- --><b>five</b>
23+
**one**<!-- -->**two** **three** **four**<!-- -->non-bold<!-- -->**five**
2624
2725
## Adjacent to other characters
2826
29-
[a link](./index.md)<!-- --><b>bold</b>non-boldmore-non-bold
27+
[a link](./index.md)<!-- -->**bold**<!-- -->non-boldmore-non-bold
3028
3129
## Unknown block tag
3230
33-
<b>bold</b>non-boldmore-non-bold
31+
**bold**<!-- -->non-boldmore-non-bold
3432
3533
## Bad characters
3634
37-
<b>\\\\*one\\\\*two\\\\*</b><b>three\\\\*four</b>
35+
**\\\\*one\\\\*two\\\\***<!-- -->**three\\\\*four**
3836
3937
## Characters that should be escaped
4038
@@ -54,9 +52,7 @@ HTML escape: &amp;quot;
5452
5553
| Header 1 | Header 2 |
5654
| --- | --- |
57-
| Cell 1 | Cell 2 |
55+
| Cell 1 | <p>Cell 2</p><p>**bold text**</p> |
5856
59-
",
60-
],
61-
}
57+
"
6258
`;

‎apps/api-extractor/CHANGELOG.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"name": "@microsoft/api-extractor",
33
"entries": [
4+
{
5+
"version": "7.34.1",
6+
"tag": "@microsoft/api-extractor_v7.34.1",
7+
"date": "Mon, 30 Jan 2023 16:22:30 GMT",
8+
"comments": {
9+
"dependency": [
10+
{
11+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" to `7.26.1`"
12+
},
13+
{
14+
"comment": "Updating dependency \"@rushstack/node-core-library\" to `3.54.0`"
15+
}
16+
]
17+
}
18+
},
419
{
520
"version": "7.34.0",
621
"tag": "@microsoft/api-extractor_v7.34.0",

‎apps/api-extractor/CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Change Log - @microsoft/api-extractor
22

3-
This log was last generated on Wed, 25 Jan 2023 07:26:55 GMT and should not be manually modified.
3+
This log was last generated on Mon, 30 Jan 2023 16:22:30 GMT and should not be manually modified.
4+
5+
## 7.34.1
6+
Mon, 30 Jan 2023 16:22:30 GMT
7+
8+
_Version update only_
49

510
## 7.34.0
611
Wed, 25 Jan 2023 07:26:55 GMT

‎apps/api-extractor/build-tests.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@ECHO OFF
22
@SETLOCAL
3-
rush build -t api-extractor-lib1-test -t api-extractor-lib2-test -t api-extractor-lib3-test -t api-extractor-scenarios -t api-extractor-test-01 -t api-extractor-test-02 -t api-extractor-test-03 -t api-extractor-test-04 -t api-documenter-test
3+
rush test -t api-extractor-lib1-test -t api-extractor-lib2-test -t api-extractor-lib3-test -t api-extractor-scenarios -t api-extractor-test-01 -t api-extractor-test-02 -t api-extractor-test-03 -t api-extractor-test-04 -t api-documenter-test

‎apps/api-extractor/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/api-extractor",
3-
"version": "7.34.0",
3+
"version": "7.34.1",
44
"description": "Analyze the exported API for a TypeScript library and generate reviews, documentation, and .d.ts rollups",
55
"keywords": [
66
"typescript",
@@ -52,8 +52,8 @@
5252
},
5353
"devDependencies": {
5454
"@rushstack/eslint-config": "workspace:*",
55-
"@rushstack/heft": "0.48.0",
56-
"@rushstack/heft-node-rig": "1.11.0",
55+
"@rushstack/heft": "0.49.3",
56+
"@rushstack/heft-node-rig": "1.11.14",
5757
"@types/heft-jest": "1.0.1",
5858
"@types/lodash": "4.14.116",
5959
"@types/node": "14.18.36",

0 commit comments

Comments
 (0)