Skip to content

Commit 572cd9a

Browse files
iclantoniclanton
authored
Merge branch 'master' into ianc/autoresolve-rsc
2 parents 899ed77 + a4ff60d commit 572cd9a

83 files changed

Lines changed: 593 additions & 205 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: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
{
22
"name": "@microsoft/api-documenter",
33
"entries": [
4+
{
5+
"version": "1.5.46",
6+
"tag": "@microsoft/api-documenter_v1.5.46",
7+
"date": "Wed, 31 Oct 2018 17:00:55 GMT",
8+
"comments": {
9+
"dependency": [
10+
{
11+
"comment": "Updating dependency \"@microsoft/api-extractor\" from `6.0.9` to `6.1.0`"
12+
},
13+
{
14+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler\" from `0.4.0` to `0.4.1`"
15+
},
16+
{
17+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.2` to `6.0.3`"
18+
}
19+
]
20+
}
21+
},
422
{
523
"version": "1.5.45",
624
"tag": "@microsoft/api-documenter_v1.5.45",

‎apps/api-documenter/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-documenter
22

3-
This log was last generated on Sat, 27 Oct 2018 03:45:51 GMT and should not be manually modified.
3+
This log was last generated on Wed, 31 Oct 2018 17:00:55 GMT and should not be manually modified.
4+
5+
## 1.5.46
6+
Wed, 31 Oct 2018 17:00:55 GMT
7+
8+
*Version update only*
49

510
## 1.5.45
611
Sat, 27 Oct 2018 03:45:51 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": "1.5.45",
3+
"version": "1.5.46",
44
"description": "Read JSON files from api-extractor, generate documentation pages",
55
"repository": {
66
"type": "git",
@@ -15,15 +15,15 @@
1515
"api-documenter": "./bin/api-documenter"
1616
},
1717
"dependencies": {
18-
"@microsoft/api-extractor": "6.0.9",
18+
"@microsoft/api-extractor": "6.1.0",
1919
"@microsoft/node-core-library": "3.5.0",
2020
"@microsoft/ts-command-line": "4.2.2",
2121
"colors": "~1.2.1",
2222
"js-yaml": "~3.9.1"
2323
},
2424
"devDependencies": {
25-
"@microsoft/rush-stack-compiler": "0.4.0",
26-
"@microsoft/node-library-build": "6.0.2",
25+
"@microsoft/rush-stack-compiler": "0.4.1",
26+
"@microsoft/node-library-build": "6.0.3",
2727
"@types/js-yaml": "3.9.1",
2828
"@types/node": "8.5.8",
2929
"gulp": "~3.9.1",

‎apps/api-extractor/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",
33
"entries": [
4+
{
5+
"version": "6.1.0",
6+
"tag": "@microsoft/api-extractor_v6.1.0",
7+
"date": "Wed, 31 Oct 2018 17:00:54 GMT",
8+
"comments": {
9+
"minor": [
10+
{
11+
"comment": "Added an api to invoke api extractor processor by supplying api extractor json config file."
12+
}
13+
]
14+
}
15+
},
416
{
517
"version": "6.0.9",
618
"tag": "@microsoft/api-extractor_v6.0.9",

‎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 Thu, 25 Oct 2018 23:20:40 GMT and should not be manually modified.
3+
This log was last generated on Wed, 31 Oct 2018 17:00:54 GMT and should not be manually modified.
4+
5+
## 6.1.0
6+
Wed, 31 Oct 2018 17:00:54 GMT
7+
8+
### Minor changes
9+
10+
- Added an api to invoke api extractor processor by supplying api extractor json config file.
411

512
## 6.0.9
613
Thu, 25 Oct 2018 23:20:40 GMT

‎apps/api-extractor/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-extractor",
3-
"version": "6.0.9",
3+
"version": "6.1.0",
44
"description": "Validate, document, and review the exported API for a TypeScript library",
55
"keywords": [
66
"typescript",

‎apps/api-extractor/src/extractor/Extractor.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,17 @@ export class Extractor {
158158
return analysisFilePaths;
159159
}
160160

161+
/**
162+
* Invokes the API Extractor engine, using the api extractor configuration file.
163+
* @param jsonConfigFile - Path to api extractor json config file.
164+
* @param options - IExtractor options.
165+
*/
166+
public static processProjectFromConfigFile(jsonConfigFile: string, options?: IExtractorOptions): void {
167+
const configObject: IExtractorConfig = JsonFile.loadAndValidate(jsonConfigFile, Extractor.jsonSchema);
168+
const extractor: Extractor = new Extractor(configObject, options);
169+
extractor.processProject();
170+
}
171+
161172
private static _applyConfigDefaults(config: IExtractorConfig): IExtractorConfig {
162173
// Use the provided config to override the defaults
163174
const normalized: IExtractorConfig = lodash.merge(

‎apps/rush-lib/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"license": "MIT",
2323
"dependencies": {
2424
"@microsoft/node-core-library": "3.5.0",
25-
"@microsoft/package-deps-hash": "2.2.93",
26-
"@microsoft/stream-collator": "3.0.8",
25+
"@microsoft/package-deps-hash": "2.2.94",
26+
"@microsoft/stream-collator": "3.0.9",
2727
"@microsoft/ts-command-line": "4.2.2",
2828
"@pnpm/link-bins": "~1.0.1",
2929
"@pnpm/logger": "~1.0.1",
@@ -51,8 +51,8 @@
5151
"z-schema": "~3.18.3"
5252
},
5353
"devDependencies": {
54-
"@microsoft/rush-stack-compiler": "0.4.0",
55-
"@microsoft/node-library-build": "6.0.2",
54+
"@microsoft/rush-stack-compiler": "0.4.1",
55+
"@microsoft/node-library-build": "6.0.3",
5656
"@types/node": "8.5.8",
5757
"@types/node-fetch": "1.6.9",
5858
"@types/tar": "4.0.0",

‎apps/rush/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"semver": "~5.3.0"
3838
},
3939
"devDependencies": {
40-
"@microsoft/rush-stack-compiler": "0.4.0",
41-
"@microsoft/node-library-build": "6.0.2",
40+
"@microsoft/rush-stack-compiler": "0.4.1",
41+
"@microsoft/node-library-build": "6.0.3",
4242
"@types/chai": "3.4.34",
4343
"@types/mocha": "5.2.5",
4444
"@types/node": "8.5.8",

‎build-tests/api-extractor-test-01/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"build": "node build.js"
1313
},
1414
"dependencies": {
15-
"@microsoft/api-extractor": "6.0.9",
15+
"@microsoft/api-extractor": "6.1.0",
1616
"@types/jest": "21.1.10",
1717
"@types/node": "8.5.8",
1818
"fs-extra": "~5.0.0",

0 commit comments

Comments
 (0)