Skip to content

Commit e7f1574

Browse files
authored
Merge branch 'master' into issue-1242
2 parents 55fbd80 + d5c1756 commit e7f1574

348 files changed

Lines changed: 10419 additions & 1133 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.

.github/CODEOWNERS

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
.github/CODEOWNERS @iclanton @nickpape-msft @octogonz @patmill @aditima
2-
common/config/**/* @iclanton @nickpape-msft @octogonz @patmill @aditima
1+
.github/CODEOWNERS @iclanton @octogonz @patmill @apostolisms
2+
common/config/**/* @iclanton @octogonz @patmill @apostolisms
33

4-
common/reviews/**/* @iclanton @nickpape-msft @octogonz @mpasarin @aditima
4+
common/reviews/**/* @iclanton @octogonz @apostolisms
55

6-
apps/**/* @iclanton @nickpape-msft @octogonz @aditima
7-
build-tests/**/* @iclanton @nickpape-msft @octogonz @aditima
8-
core-build/**/* @iclanton @nickpape-msft @octogonz @aditima
9-
libraries/**/* @iclanton @nickpape-msft @octogonz @aditima
10-
stack/**/* @iclanton @nickpape-msft @octogonz @aditima
11-
webpack/**/* @iclanton @nickpape-msft @octogonz @aditima
12-
rush.json @iclanton @nickpape-msft @octogonz @aditima
13-
.gitattributes @iclanton @nickpape-msft @octogonz @aditima
14-
.gitignore @iclanton @nickpape-msft @octogonz @aditima
15-
README.md @iclanton @nickpape-msft @octogonz @aditima
6+
apps/**/* @iclanton @octogonz @apostolisms @lincoded @halfnibble
7+
build-tests/**/* @iclanton @octogonz @apostolisms @lincoded @halfnibble
8+
core-build/**/* @iclanton @octogonz @apostolisms @lincoded @halfnibble
9+
libraries/**/* @iclanton @octogonz @apostolisms @lincoded @halfnibble
10+
stack/**/* @iclanton @octogonz @apostolisms @lincoded @halfnibble
11+
webpack/**/* @iclanton @octogonz @apostolisms @lincoded @halfnibble
12+
rush.json @iclanton @octogonz @apostolisms @lincoded @halfnibble
13+
.gitattributes @iclanton @octogonz @apostolisms @lincoded @halfnibble
14+
.gitignore @iclanton @octogonz @apostolisms @lincoded @halfnibble
15+
README.md @iclanton @octogonz @apostolisms @lincoded @halfnibble
1616

17-
libraries/load-themed-styles/**/* @iclanton @nickpape-msft @octogonz @dzearing @aditima
17+
libraries/load-themed-styles/**/* @iclanton @octogonz @dzearing @apostolisms

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,6 @@ temp
6767
# Rush files
6868
common/temp/**
6969
package-deps.json
70+
71+
# OS X
72+
.DS_Store

apps/api-documenter/CHANGELOG.json

Lines changed: 203 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,209 @@
11
{
22
"name": "@microsoft/api-documenter",
33
"entries": [
4+
{
5+
"version": "7.3.3",
6+
"tag": "@microsoft/api-documenter_v7.3.3",
7+
"date": "Wed, 12 Jun 2019 19:12:33 GMT",
8+
"comments": {
9+
"dependency": [
10+
{
11+
"comment": "Updating dependency \"@microsoft/ts-command-line\" from `4.2.5` to `4.2.6`"
12+
},
13+
{
14+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.3.18` to `0.3.19`"
15+
},
16+
{
17+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.66` to `6.0.67`"
18+
}
19+
]
20+
}
21+
},
22+
{
23+
"version": "7.3.2",
24+
"tag": "@microsoft/api-documenter_v7.3.2",
25+
"date": "Tue, 11 Jun 2019 00:48:06 GMT",
26+
"comments": {
27+
"patch": [
28+
{
29+
"comment": "Add support for emitting type parameters in the YamlDocumenter"
30+
}
31+
],
32+
"dependency": [
33+
{
34+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" from `7.1.3` to `7.2.0`"
35+
},
36+
{
37+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.3.17` to `0.3.18`"
38+
},
39+
{
40+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.65` to `6.0.66`"
41+
}
42+
]
43+
}
44+
},
45+
{
46+
"version": "7.3.1",
47+
"tag": "@microsoft/api-documenter_v7.3.1",
48+
"date": "Thu, 06 Jun 2019 22:33:36 GMT",
49+
"comments": {
50+
"dependency": [
51+
{
52+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.3.16` to `0.3.17`"
53+
},
54+
{
55+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.64` to `6.0.65`"
56+
}
57+
]
58+
}
59+
},
60+
{
61+
"version": "7.3.0",
62+
"tag": "@microsoft/api-documenter_v7.3.0",
63+
"date": "Wed, 05 Jun 2019 19:12:34 GMT",
64+
"comments": {
65+
"patch": [
66+
{
67+
"comment": "Fix an issue where TSDoc index selectors (ApiParameterListMixin.overloadIndex) started from 0, whereas TSDoc requires a nonzero number"
68+
}
69+
],
70+
"minor": [
71+
{
72+
"comment": "Improved the experimental api-documenter generate command."
73+
}
74+
],
75+
"dependency": [
76+
{
77+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" from `7.1.2` to `7.1.3`"
78+
},
79+
{
80+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.3.15` to `0.3.16`"
81+
},
82+
{
83+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.63` to `6.0.64`"
84+
}
85+
]
86+
}
87+
},
88+
{
89+
"version": "7.2.2",
90+
"tag": "@microsoft/api-documenter_v7.2.2",
91+
"date": "Tue, 04 Jun 2019 05:51:53 GMT",
92+
"comments": {
93+
"dependency": [
94+
{
95+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" from `7.1.1` to `7.1.2`"
96+
},
97+
{
98+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.3.14` to `0.3.15`"
99+
},
100+
{
101+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.62` to `6.0.63`"
102+
}
103+
]
104+
}
105+
},
106+
{
107+
"version": "7.2.1",
108+
"tag": "@microsoft/api-documenter_v7.2.1",
109+
"date": "Mon, 27 May 2019 04:13:44 GMT",
110+
"comments": {
111+
"patch": [
112+
{
113+
"comment": "Improve the markdown generator to document class constructors"
114+
}
115+
],
116+
"dependency": [
117+
{
118+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" from `7.1.0` to `7.1.1`"
119+
},
120+
{
121+
"comment": "Updating dependency \"@microsoft/ts-command-line\" from `4.2.4` to `4.2.5`"
122+
},
123+
{
124+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.3.13` to `0.3.14`"
125+
},
126+
{
127+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.61` to `6.0.62`"
128+
}
129+
]
130+
}
131+
},
132+
{
133+
"version": "7.2.0",
134+
"tag": "@microsoft/api-documenter_v7.2.0",
135+
"date": "Thu, 16 May 2019 22:15:20 GMT",
136+
"comments": {
137+
"minor": [
138+
{
139+
"comment": "Add optional config file `api-documenter.json` to allow building custom Table of Contents for YamlDocumenter."
140+
}
141+
]
142+
}
143+
},
144+
{
145+
"version": "7.1.7",
146+
"tag": "@microsoft/api-documenter_v7.1.7",
147+
"date": "Mon, 13 May 2019 02:08:35 GMT",
148+
"comments": {
149+
"dependency": [
150+
{
151+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.3.12` to `0.3.13`"
152+
},
153+
{
154+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.60` to `6.0.61`"
155+
}
156+
]
157+
}
158+
},
159+
{
160+
"version": "7.1.6",
161+
"tag": "@microsoft/api-documenter_v7.1.6",
162+
"date": "Mon, 06 May 2019 20:46:21 GMT",
163+
"comments": {
164+
"dependency": [
165+
{
166+
"comment": "Updating dependency \"@microsoft/ts-command-line\" from `4.2.3` to `4.2.4`"
167+
},
168+
{
169+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.3.11` to `0.3.12`"
170+
},
171+
{
172+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.59` to `6.0.60`"
173+
}
174+
]
175+
}
176+
},
177+
{
178+
"version": "7.1.5",
179+
"tag": "@microsoft/api-documenter_v7.1.5",
180+
"date": "Mon, 06 May 2019 19:34:54 GMT",
181+
"comments": {
182+
"dependency": [
183+
{
184+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.3.10` to `0.3.11`"
185+
},
186+
{
187+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.58` to `6.0.59`"
188+
}
189+
]
190+
}
191+
},
192+
{
193+
"version": "7.1.4",
194+
"tag": "@microsoft/api-documenter_v7.1.4",
195+
"date": "Mon, 06 May 2019 19:11:16 GMT",
196+
"comments": {
197+
"dependency": [
198+
{
199+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.3.9` to `0.3.10`"
200+
},
201+
{
202+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.57` to `6.0.58`"
203+
}
204+
]
205+
}
206+
},
4207
{
5208
"version": "7.1.3",
6209
"tag": "@microsoft/api-documenter_v7.1.3",

apps/api-documenter/CHANGELOG.md

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

3-
This log was last generated on Tue, 30 Apr 2019 23:08:02 GMT and should not be manually modified.
3+
This log was last generated on Wed, 12 Jun 2019 19:12:33 GMT and should not be manually modified.
4+
5+
## 7.3.3
6+
Wed, 12 Jun 2019 19:12:33 GMT
7+
8+
*Version update only*
9+
10+
## 7.3.2
11+
Tue, 11 Jun 2019 00:48:06 GMT
12+
13+
### Patches
14+
15+
- Add support for emitting type parameters in the YamlDocumenter
16+
17+
## 7.3.1
18+
Thu, 06 Jun 2019 22:33:36 GMT
19+
20+
*Version update only*
21+
22+
## 7.3.0
23+
Wed, 05 Jun 2019 19:12:34 GMT
24+
25+
### Minor changes
26+
27+
- Improved the experimental api-documenter generate command.
28+
29+
### Patches
30+
31+
- Fix an issue where TSDoc index selectors (ApiParameterListMixin.overloadIndex) started from 0, whereas TSDoc requires a nonzero number
32+
33+
## 7.2.2
34+
Tue, 04 Jun 2019 05:51:53 GMT
35+
36+
*Version update only*
37+
38+
## 7.2.1
39+
Mon, 27 May 2019 04:13:44 GMT
40+
41+
### Patches
42+
43+
- Improve the markdown generator to document class constructors
44+
45+
## 7.2.0
46+
Thu, 16 May 2019 22:15:20 GMT
47+
48+
### Minor changes
49+
50+
- Add optional config file `api-documenter.json` to allow building custom Table of Contents for YamlDocumenter.
51+
52+
## 7.1.7
53+
Mon, 13 May 2019 02:08:35 GMT
54+
55+
*Version update only*
56+
57+
## 7.1.6
58+
Mon, 06 May 2019 20:46:21 GMT
59+
60+
*Version update only*
61+
62+
## 7.1.5
63+
Mon, 06 May 2019 19:34:54 GMT
64+
65+
*Version update only*
66+
67+
## 7.1.4
68+
Mon, 06 May 2019 19:11:16 GMT
69+
70+
*Version update only*
471

572
## 7.1.3
673
Tue, 30 Apr 2019 23:08:02 GMT

apps/api-documenter/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/api-documenter",
3-
"version": "7.1.3",
3+
"version": "7.3.3",
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.1.0",
18+
"@microsoft/api-extractor-model": "7.2.0",
1919
"@microsoft/node-core-library": "3.13.0",
20-
"@microsoft/ts-command-line": "4.2.3",
20+
"@microsoft/ts-command-line": "4.2.6",
2121
"@microsoft/tsdoc": "0.12.9",
2222
"colors": "~1.2.1",
2323
"js-yaml": "~3.13.1"
2424
},
2525
"devDependencies": {
26-
"@microsoft/rush-stack-compiler-3.2": "0.3.9",
27-
"@microsoft/node-library-build": "6.0.57",
26+
"@microsoft/rush-stack-compiler-3.2": "0.3.19",
27+
"@microsoft/node-library-build": "6.0.67",
2828
"@types/js-yaml": "3.12.1",
2929
"@types/node": "8.5.8",
3030
"gulp": "~3.9.1",

apps/api-documenter/src/cli/ApiDocumenterCommandLine.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import { CommandLineParser } from '@microsoft/ts-command-line';
55
import { MarkdownAction } from './MarkdownAction';
66
import { YamlAction } from './YamlAction';
7+
import { GenerateAction } from './GenerateAction';
78

89
export class ApiDocumenterCommandLine extends CommandLineParser {
910
constructor() {
@@ -22,5 +23,6 @@ export class ApiDocumenterCommandLine extends CommandLineParser {
2223
private _populateActions(): void {
2324
this.addAction(new MarkdownAction(this));
2425
this.addAction(new YamlAction(this));
26+
this.addAction(new GenerateAction(this));
2527
}
2628
}

0 commit comments

Comments
 (0)