Skip to content

Commit ea37c53

Browse files
authored
Merge branch 'master' into issue-1242
2 parents 7275f15 + 7e50b23 commit ea37c53

136 files changed

Lines changed: 963 additions & 447 deletions

File tree

Some content is hidden

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

apps/api-documenter/CHANGELOG.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,46 @@
11
{
22
"name": "@microsoft/api-documenter",
33
"entries": [
4+
{
5+
"version": "7.1.1",
6+
"tag": "@microsoft/api-documenter_v7.1.1",
7+
"date": "Wed, 17 Apr 2019 19:12:31 GMT",
8+
"comments": {
9+
"patch": [
10+
{
11+
"comment": "Fix newline rendering when code blocks are used in tables"
12+
}
13+
]
14+
}
15+
},
16+
{
17+
"version": "7.1.0",
18+
"tag": "@microsoft/api-documenter_v7.1.0",
19+
"date": "Tue, 16 Apr 2019 11:01:37 GMT",
20+
"comments": {
21+
"patch": [
22+
{
23+
"comment": "Adding an extra newline to the OfficeYamlDocumenter Examples header insertion"
24+
}
25+
],
26+
"minor": [
27+
{
28+
"comment": "Initial stable release of API Extractor 7"
29+
}
30+
],
31+
"dependency": [
32+
{
33+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" from `7.0.28` to `7.1.0`"
34+
},
35+
{
36+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.3.7` to `0.3.8`"
37+
},
38+
{
39+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.55` to `6.0.56`"
40+
}
41+
]
42+
}
43+
},
444
{
545
"version": "7.0.51",
646
"tag": "@microsoft/api-documenter_v7.0.51",

apps/api-documenter/CHANGELOG.md

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

3-
This log was last generated on Fri, 12 Apr 2019 06:13:16 GMT and should not be manually modified.
3+
This log was last generated on Wed, 17 Apr 2019 19:12:31 GMT and should not be manually modified.
4+
5+
## 7.1.1
6+
Wed, 17 Apr 2019 19:12:31 GMT
7+
8+
### Patches
9+
10+
- Fix newline rendering when code blocks are used in tables
11+
12+
## 7.1.0
13+
Tue, 16 Apr 2019 11:01:37 GMT
14+
15+
### Minor changes
16+
17+
- Initial stable release of API Extractor 7
18+
19+
### Patches
20+
21+
- Adding an extra newline to the OfficeYamlDocumenter Examples header insertion
422

523
## 7.0.51
624
Fri, 12 Apr 2019 06:13:16 GMT

apps/api-documenter/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/api-documenter",
3-
"version": "7.0.51",
3+
"version": "7.1.1",
44
"description": "Read JSON files from api-extractor, generate documentation pages",
55
"repository": {
66
"type": "git",
@@ -15,16 +15,16 @@
1515
"api-documenter": "./bin/api-documenter"
1616
},
1717
"dependencies": {
18-
"@microsoft/api-extractor-model": "7.0.28",
18+
"@microsoft/api-extractor-model": "7.1.0",
1919
"@microsoft/node-core-library": "3.13.0",
2020
"@microsoft/ts-command-line": "4.2.3",
2121
"@microsoft/tsdoc": "0.12.9",
2222
"colors": "~1.2.1",
2323
"js-yaml": "~3.9.1"
2424
},
2525
"devDependencies": {
26-
"@microsoft/rush-stack-compiler-3.2": "0.3.7",
27-
"@microsoft/node-library-build": "6.0.55",
26+
"@microsoft/rush-stack-compiler-3.2": "0.3.8",
27+
"@microsoft/node-library-build": "6.0.56",
2828
"@types/js-yaml": "3.9.1",
2929
"@types/node": "8.5.8",
3030
"gulp": "~3.9.1",

apps/api-documenter/src/documenters/OfficeYamlDocumenter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export class OfficeYamlDocumenter extends YamlDocumenter {
133133
}
134134

135135
private _generateExampleSnippetText(snippets: string[]): string {
136-
const text: string[] = ['\n#### Examples\n'];
136+
const text: string[] = ['\n\n#### Examples\n'];
137137
for (const snippet of snippets) {
138138
if (snippet.search(/await/) === -1) {
139139
text.push('```javascript');

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export class MarkdownEmitter {
115115
if (context.insideTable) {
116116
const code: string = this.getTableEscapedText(docCodeSpan.code);
117117
const parts: string[] = code.split(/\r?\n/g);
118-
writer.write(parts.join('`<p/>`'));
118+
writer.write(parts.join('</code><br/><code>'));
119119
} else {
120120
writer.write(docCodeSpan.code);
121121
}

apps/api-extractor-model/CHANGELOG.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
{
22
"name": "@microsoft/api-extractor-model",
33
"entries": [
4+
{
5+
"version": "7.1.0",
6+
"tag": "@microsoft/api-extractor-model_v7.1.0",
7+
"date": "Tue, 16 Apr 2019 11:01:37 GMT",
8+
"comments": {
9+
"minor": [
10+
{
11+
"comment": "Initial stable release of API Extractor 7"
12+
}
13+
]
14+
}
15+
},
416
{
517
"version": "7.0.28",
618
"tag": "@microsoft/api-extractor-model_v7.0.28",

apps/api-extractor-model/CHANGELOG.md

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

3-
This log was last generated on Wed, 20 Mar 2019 19:14:49 GMT and should not be manually modified.
3+
This log was last generated on Tue, 16 Apr 2019 11:01:37 GMT and should not be manually modified.
4+
5+
## 7.1.0
6+
Tue, 16 Apr 2019 11:01:37 GMT
7+
8+
### Minor changes
9+
10+
- Initial stable release of API Extractor 7
411

512
## 7.0.28
613
Wed, 20 Mar 2019 19:14:49 GMT

apps/api-extractor-model/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-model",
3-
"version": "7.0.28",
3+
"version": "7.1.0",
44
"description": "A helper library for loading and saving the .api.json files created by API Extractor",
55
"repository": {
66
"type": "git",
@@ -22,8 +22,8 @@
2222
"@types/node": "8.5.8"
2323
},
2424
"devDependencies": {
25-
"@microsoft/node-library-build": "6.0.54",
26-
"@microsoft/rush-stack-compiler-3.2": "0.3.6",
25+
"@microsoft/node-library-build": "6.0.55",
26+
"@microsoft/rush-stack-compiler-3.2": "0.3.7",
2727
"@types/jest": "23.3.11",
2828
"gulp": "~3.9.1",
2929
"tslint-microsoft-contrib": "~5.2.1"

apps/api-extractor/CHANGELOG.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
{
22
"name": "@microsoft/api-extractor",
33
"entries": [
4+
{
5+
"version": "7.1.0",
6+
"tag": "@microsoft/api-extractor_v7.1.0",
7+
"date": "Tue, 16 Apr 2019 11:01:37 GMT",
8+
"comments": {
9+
"minor": [
10+
{
11+
"comment": "Initial stable release of API Extractor 7"
12+
}
13+
],
14+
"dependency": [
15+
{
16+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" from `7.0.28` to `7.1.0`"
17+
}
18+
]
19+
}
20+
},
421
{
522
"version": "7.0.42",
623
"tag": "@microsoft/api-extractor_v7.0.42",

apps/api-extractor/CHANGELOG.md

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

3-
This log was last generated on Fri, 12 Apr 2019 06:13:16 GMT and should not be manually modified.
3+
This log was last generated on Tue, 16 Apr 2019 11:01:37 GMT and should not be manually modified.
4+
5+
## 7.1.0
6+
Tue, 16 Apr 2019 11:01:37 GMT
7+
8+
### Minor changes
9+
10+
- Initial stable release of API Extractor 7
411

512
## 7.0.42
613
Fri, 12 Apr 2019 06:13:16 GMT

0 commit comments

Comments
 (0)