Skip to content

Commit 52f1136

Browse files
ClaudiazhaoyaClaudiazhaoya
committed
Merge branch 'master' of https://github.com/microsoft/rushstack into zhas/rush-add-test
2 parents 64ceb69 + 3b5b888 commit 52f1136

523 files changed

Lines changed: 6146 additions & 3425 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.

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ for large scale TypeScript monorepos.
2929
| [/apps/api-extractor](./apps/api-extractor/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fapi-extractor.svg)](https://badge.fury.io/js/%40microsoft%2Fapi-extractor) | [changelog](./apps/api-extractor/CHANGELOG.md) | [@microsoft/api-extractor](https://www.npmjs.com/package/@microsoft/api-extractor) |
3030
| [/apps/api-extractor-model](./apps/api-extractor-model/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fapi-extractor-model.svg)](https://badge.fury.io/js/%40microsoft%2Fapi-extractor-model) | [changelog](./apps/api-extractor-model/CHANGELOG.md) | [@microsoft/api-extractor-model](https://www.npmjs.com/package/@microsoft/api-extractor-model) |
3131
| [/apps/rush](./apps/rush/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Frush.svg)](https://badge.fury.io/js/%40microsoft%2Frush) | [changelog](./apps/rush/CHANGELOG.md) | [@microsoft/rush](https://www.npmjs.com/package/@microsoft/rush) |
32-
| [/apps/rush-buildxl](./apps/rush-buildxl/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Frush-buildxl.svg)](https://badge.fury.io/js/%40microsoft%2Frush-buildxl) | [changelog](./apps/rush-buildxl/CHANGELOG.md) | [@microsoft/rush-buildxl](https://www.npmjs.com/package/@microsoft/rush-buildxl) |
33-
| [/apps/rush-lib](./apps/rush-lib/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Frush-lib.svg)](https://badge.fury.io/js/%40microsoft%2Frush-lib) | [changelog](./apps/rush-lib/CHANGELOG.md) | [@microsoft/rush-lib](https://www.npmjs.com/package/@microsoft/rush-lib) |
32+
| [/apps/rush-buildxl](./apps/rush-buildxl/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Frush-buildxl.svg)](https://badge.fury.io/js/%40microsoft%2Frush-buildxl) | | [@microsoft/rush-buildxl](https://www.npmjs.com/package/@microsoft/rush-buildxl) |
33+
| [/apps/rush-lib](./apps/rush-lib/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Frush-lib.svg)](https://badge.fury.io/js/%40microsoft%2Frush-lib) | | [@microsoft/rush-lib](https://www.npmjs.com/package/@microsoft/rush-lib) |
3434
| [/core-build/gulp-core-build](./core-build/gulp-core-build/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgulp-core-build.svg)](https://badge.fury.io/js/%40microsoft%2Fgulp-core-build) | [changelog](./core-build/gulp-core-build/CHANGELOG.md) | [@microsoft/gulp-core-build](https://www.npmjs.com/package/@microsoft/gulp-core-build) |
3535
| [/core-build/gulp-core-build-mocha](./core-build/gulp-core-build-mocha/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgulp-core-build-mocha.svg)](https://badge.fury.io/js/%40microsoft%2Fgulp-core-build-mocha) | [changelog](./core-build/gulp-core-build-mocha/CHANGELOG.md) | [@microsoft/gulp-core-build-mocha](https://www.npmjs.com/package/@microsoft/gulp-core-build-mocha) |
3636
| [/core-build/gulp-core-build-sass](./core-build/gulp-core-build-sass/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Fgulp-core-build-sass.svg)](https://badge.fury.io/js/%40microsoft%2Fgulp-core-build-sass) | [changelog](./core-build/gulp-core-build-sass/CHANGELOG.md) | [@microsoft/gulp-core-build-sass](https://www.npmjs.com/package/@microsoft/gulp-core-build-sass) |
@@ -78,7 +78,8 @@ for large scale TypeScript monorepos.
7878
| [/build-tests/api-extractor-test-02](./build-tests/api-extractor-test-02/) | Building this project is a regression test for api-extractor |
7979
| [/build-tests/api-extractor-test-03](./build-tests/api-extractor-test-03/) | Building this project is a regression test for api-extractor |
8080
| [/build-tests/api-extractor-test-04](./build-tests/api-extractor-test-04/) | Building this project is a regression test for api-extractor |
81-
| [/build-tests/node-library-build-test](./build-tests/node-library-build-test/) | |
81+
| [/build-tests/node-library-build-eslint-test](./build-tests/node-library-build-eslint-test/) | |
82+
| [/build-tests/node-library-build-tslint-test](./build-tests/node-library-build-tslint-test/) | |
8283
| [/build-tests/rush-stack-compiler-2.4-library-test](./build-tests/rush-stack-compiler-2.4-library-test/) | |
8384
| [/build-tests/rush-stack-compiler-2.7-library-test](./build-tests/rush-stack-compiler-2.7-library-test/) | |
8485
| [/build-tests/rush-stack-compiler-2.8-library-test](./build-tests/rush-stack-compiler-2.8-library-test/) | |

‎apps/api-documenter/.eslintrc.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// This is a workaround for https://github.com/eslint/eslint/issues/3458
2+
require("@rushstack/eslint-config/patch-eslint6");
3+
4+
module.exports = {
5+
extends: [ "@rushstack/eslint-config" ],
6+
parserOptions: { tsconfigRootDir: __dirname },
7+
};

‎apps/api-documenter/CHANGELOG.json‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,81 @@
11
{
22
"name": "@microsoft/api-documenter",
33
"entries": [
4+
{
5+
"version": "7.5.4",
6+
"tag": "@microsoft/api-documenter_v7.5.4",
7+
"date": "Fri, 25 Oct 2019 15:08:54 GMT",
8+
"comments": {
9+
"dependency": [
10+
{
11+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.4\" from `0.3.1` to `0.3.2`"
12+
},
13+
{
14+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.3.1` to `6.3.2`"
15+
}
16+
]
17+
}
18+
},
19+
{
20+
"version": "7.5.3",
21+
"tag": "@microsoft/api-documenter_v7.5.3",
22+
"date": "Tue, 22 Oct 2019 06:24:44 GMT",
23+
"comments": {
24+
"dependency": [
25+
{
26+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" from `7.5.1` to `7.5.2`"
27+
},
28+
{
29+
"comment": "Updating dependency \"@microsoft/node-core-library\" from `3.15.1` to `3.16.0`"
30+
},
31+
{
32+
"comment": "Updating dependency \"@microsoft/ts-command-line\" from `4.3.3` to `4.3.4`"
33+
},
34+
{
35+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.4\" from `0.3.0` to `0.3.1`"
36+
},
37+
{
38+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.3.0` to `6.3.1`"
39+
},
40+
{
41+
"comment": "Updating dependency \"@rushstack/eslint-config\" from `0.4.0` to `0.4.1`"
42+
}
43+
]
44+
}
45+
},
46+
{
47+
"version": "7.5.2",
48+
"tag": "@microsoft/api-documenter_v7.5.2",
49+
"date": "Mon, 21 Oct 2019 05:22:43 GMT",
50+
"comments": {
51+
"dependency": [
52+
{
53+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.4\" from `0.2.6` to `0.3.0`"
54+
},
55+
{
56+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.2.6` to `6.3.0`"
57+
}
58+
]
59+
}
60+
},
61+
{
62+
"version": "7.5.1",
63+
"tag": "@microsoft/api-documenter_v7.5.1",
64+
"date": "Fri, 18 Oct 2019 15:15:00 GMT",
65+
"comments": {
66+
"dependency": [
67+
{
68+
"comment": "Updating dependency \"@microsoft/ts-command-line\" from `4.3.2` to `4.3.3`"
69+
},
70+
{
71+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.4\" from `0.2.5` to `0.2.6`"
72+
},
73+
{
74+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.2.5` to `6.2.6`"
75+
}
76+
]
77+
}
78+
},
479
{
580
"version": "7.5.0",
681
"tag": "@microsoft/api-documenter_v7.5.0",

‎apps/api-documenter/CHANGELOG.md‎

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

3-
This log was last generated on Sun, 06 Oct 2019 00:27:39 GMT and should not be manually modified.
3+
This log was last generated on Fri, 25 Oct 2019 15:08:54 GMT and should not be manually modified.
4+
5+
## 7.5.4
6+
Fri, 25 Oct 2019 15:08:54 GMT
7+
8+
*Version update only*
9+
10+
## 7.5.3
11+
Tue, 22 Oct 2019 06:24:44 GMT
12+
13+
*Version update only*
14+
15+
## 7.5.2
16+
Mon, 21 Oct 2019 05:22:43 GMT
17+
18+
*Version update only*
19+
20+
## 7.5.1
21+
Fri, 18 Oct 2019 15:15:00 GMT
22+
23+
*Version update only*
424

525
## 7.5.0
626
Sun, 06 Oct 2019 00:27:39 GMT

‎apps/api-documenter/package.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/api-documenter",
3-
"version": "7.5.0",
3+
"version": "7.5.4",
44
"description": "Read JSON files from api-extractor, generate documentation pages",
55
"repository": {
66
"type": "git",
@@ -17,17 +17,18 @@
1717
"main": "lib/index.js",
1818
"typings": "dist/rollup.d.ts",
1919
"dependencies": {
20-
"@microsoft/api-extractor-model": "7.5.1",
21-
"@microsoft/node-core-library": "3.15.1",
22-
"@microsoft/ts-command-line": "4.3.2",
20+
"@microsoft/api-extractor-model": "7.5.2",
21+
"@microsoft/node-core-library": "3.16.0",
22+
"@microsoft/ts-command-line": "4.3.4",
2323
"@microsoft/tsdoc": "0.12.14",
2424
"colors": "~1.2.1",
2525
"js-yaml": "~3.13.1",
2626
"resolve": "1.8.1"
2727
},
2828
"devDependencies": {
29-
"@microsoft/rush-stack-compiler-3.4": "0.2.5",
30-
"@microsoft/node-library-build": "6.2.5",
29+
"@microsoft/rush-stack-compiler-3.4": "0.3.2",
30+
"@microsoft/node-library-build": "6.3.2",
31+
"@rushstack/eslint-config": "0.4.1",
3132
"@types/jest": "23.3.11",
3233
"@types/js-yaml": "3.12.1",
3334
"@types/node": "8.10.54",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { YamlAction } from './YamlAction';
77
import { GenerateAction } from './GenerateAction';
88

99
export class ApiDocumenterCommandLine extends CommandLineParser {
10-
constructor() {
10+
public constructor() {
1111
super({
1212
toolFilename: 'api-documenter',
1313
toolDescription: 'Reads *.api.json files produced by api-extractor, '

‎apps/api-documenter/src/cli/GenerateAction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { FileSystem } from '@microsoft/node-core-library';
1313
import { MarkdownDocumenter } from '../documenters/MarkdownDocumenter';
1414

1515
export class GenerateAction extends BaseAction {
16-
constructor(parser: ApiDocumenterCommandLine) {
16+
public constructor(parser: ApiDocumenterCommandLine) {
1717
super({
1818
actionName: 'generate',
1919
summary: 'EXPERIMENTAL',

‎apps/api-documenter/src/cli/MarkdownAction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { MarkdownDocumenter } from '../documenters/MarkdownDocumenter';
77
import { ApiModel } from '@microsoft/api-extractor-model';
88

99
export class MarkdownAction extends BaseAction {
10-
constructor(parser: ApiDocumenterCommandLine) {
10+
public constructor(parser: ApiDocumenterCommandLine) {
1111
super({
1212
actionName: 'markdown',
1313
summary: 'Generate documentation as Markdown files (*.md)',

‎apps/api-documenter/src/cli/YamlAction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { ApiModel } from '@microsoft/api-extractor-model';
1515
export class YamlAction extends BaseAction {
1616
private _officeParameter: CommandLineFlagParameter;
1717

18-
constructor(parser: ApiDocumenterCommandLine) {
18+
public constructor(parser: ApiDocumenterCommandLine) {
1919
super({
2020
actionName: 'yaml',
2121
summary: 'Generate documentation as universal reference YAML files (*.yml)',

‎apps/api-documenter/src/documenters/DocumenterConfig.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ export class DocumenterConfig {
2525
*/
2626
public static readonly FILENAME: string = 'api-documenter.json';
2727

28+
private constructor(filePath: string, configFile: IConfigFile) {
29+
this.configFilePath = filePath;
30+
this.configFile = configFile;
31+
}
32+
2833
/**
2934
* Load and validate an api-documenter.json file.
3035
*/
@@ -33,9 +38,4 @@ export class DocumenterConfig {
3338

3439
return new DocumenterConfig(path.resolve(configFilePath), configFile);
3540
}
36-
37-
private constructor(filePath: string, configFile: IConfigFile) {
38-
this.configFilePath = filePath;
39-
this.configFile = configFile;
40-
}
4141
}

0 commit comments

Comments
 (0)