Skip to content

Commit deefeb6

Browse files
octogonzoctogonz
committed
Merge remote-tracking branch 'remotes/origin/master' into octogonz/stable-sort
# Conflicts: # common/config/rush/pnpm-lock.yaml # libraries/node-core-library/package.json
2 parents 27304a3 + 50ee00f commit deefeb6

File tree

123 files changed

+989
-419
lines changed

Some content is hidden

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

123 files changed

+989
-419
lines changed

‎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": "7.5.5",
6+
"tag": "@microsoft/api-documenter_v7.5.5",
7+
"date": "Tue, 05 Nov 2019 01:08:39 GMT",
8+
"comments": {
9+
"dependency": [
10+
{
11+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" from `7.5.2` to `7.5.3`"
12+
},
13+
{
14+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.4\" from `0.3.2` to `0.3.3`"
15+
},
16+
{
17+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.3.2` to `6.3.3`"
18+
}
19+
]
20+
}
21+
},
422
{
523
"version": "7.5.4",
624
"tag": "@microsoft/api-documenter_v7.5.4",

‎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 Fri, 25 Oct 2019 15:08:54 GMT and should not be manually modified.
3+
This log was last generated on Tue, 05 Nov 2019 01:08:39 GMT and should not be manually modified.
4+
5+
## 7.5.5
6+
Tue, 05 Nov 2019 01:08:39 GMT
7+
8+
*Version update only*
49

510
## 7.5.4
611
Fri, 25 Oct 2019 15:08:54 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.5.4",
3+
"version": "7.5.5",
44
"description": "Read JSON files from api-extractor, generate documentation pages",
55
"repository": {
66
"type": "git",
@@ -17,7 +17,7 @@
1717
"main": "lib/index.js",
1818
"typings": "dist/rollup.d.ts",
1919
"dependencies": {
20-
"@microsoft/api-extractor-model": "7.5.2",
20+
"@microsoft/api-extractor-model": "7.5.3",
2121
"@microsoft/node-core-library": "3.16.0",
2222
"@microsoft/ts-command-line": "4.3.4",
2323
"@microsoft/tsdoc": "0.12.14",
@@ -26,8 +26,8 @@
2626
"resolve": "1.8.1"
2727
},
2828
"devDependencies": {
29-
"@microsoft/rush-stack-compiler-3.4": "0.3.2",
30-
"@microsoft/node-library-build": "6.3.2",
29+
"@microsoft/rush-stack-compiler-3.4": "0.3.3",
30+
"@microsoft/node-library-build": "6.3.3",
3131
"@rushstack/eslint-config": "0.4.1",
3232
"@types/jest": "23.3.11",
3333
"@types/js-yaml": "3.12.1",

‎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.5.3",
6+
"tag": "@microsoft/api-extractor-model_v7.5.3",
7+
"date": "Tue, 05 Nov 2019 01:08:39 GMT",
8+
"comments": {
9+
"patch": [
10+
{
11+
"comment": "Clarified an error message"
12+
}
13+
]
14+
}
15+
},
416
{
517
"version": "7.5.2",
618
"tag": "@microsoft/api-extractor-model_v7.5.2",

‎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 Tue, 22 Oct 2019 06:24:44 GMT and should not be manually modified.
3+
This log was last generated on Tue, 05 Nov 2019 01:08:39 GMT and should not be manually modified.
4+
5+
## 7.5.3
6+
Tue, 05 Nov 2019 01:08:39 GMT
7+
8+
### Patches
9+
10+
- Clarified an error message
411

512
## 7.5.2
613
Tue, 22 Oct 2019 06:24:44 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.5.2",
3+
"version": "7.5.3",
44
"description": "A helper library for loading and saving the .api.json files created by API Extractor",
55
"repository": {
66
"type": "git",
@@ -18,8 +18,8 @@
1818
"@microsoft/tsdoc": "0.12.14"
1919
},
2020
"devDependencies": {
21-
"@microsoft/node-library-build": "6.3.0",
22-
"@microsoft/rush-stack-compiler-3.4": "0.3.0",
21+
"@microsoft/node-library-build": "6.3.2",
22+
"@microsoft/rush-stack-compiler-3.4": "0.3.2",
2323
"@rushstack/eslint-config": "0.4.1",
2424
"@types/jest": "23.3.11",
2525
"@types/node": "8.10.54",

‎apps/api-extractor-model/src/mixins/ApiItemContainerMixin.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ export function ApiItemContainerMixin<TBaseClass extends IApiItemConstructor>(ba
154154

155155
public addMember(member: ApiItem): void {
156156
if (this[_membersByContainerKey].has(member.containerKey)) {
157-
throw new Error('Another member has already been added with the same name and containerKey');
157+
throw new Error(`Another member has already been added with the same name (${member.displayName})` +
158+
` and containerKey (${member.containerKey})`);
158159
}
159160

160161
const existingParent: ApiItem | undefined = member.parent;

‎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": "7.5.3",
6+
"tag": "@microsoft/api-extractor_v7.5.3",
7+
"date": "Tue, 05 Nov 2019 01:08:39 GMT",
8+
"comments": {
9+
"dependency": [
10+
{
11+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" from `7.5.2` to `7.5.3`"
12+
}
13+
]
14+
}
15+
},
416
{
517
"version": "7.5.2",
618
"tag": "@microsoft/api-extractor_v7.5.2",

‎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 Tue, 22 Oct 2019 06:24:44 GMT and should not be manually modified.
3+
This log was last generated on Tue, 05 Nov 2019 01:08:39 GMT and should not be manually modified.
4+
5+
## 7.5.3
6+
Tue, 05 Nov 2019 01:08:39 GMT
7+
8+
*Version update only*
49

510
## 7.5.2
611
Tue, 22 Oct 2019 06:24:44 GMT

‎apps/api-extractor/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-extractor",
3-
"version": "7.5.2",
3+
"version": "7.5.3",
44
"description": "Analyze the exported API for a TypeScript library and generate reviews, documentation, and .d.ts rollups",
55
"keywords": [
66
"typescript",
@@ -32,7 +32,7 @@
3232
"build": "gulp test --clean"
3333
},
3434
"dependencies": {
35-
"@microsoft/api-extractor-model": "7.5.2",
35+
"@microsoft/api-extractor-model": "7.5.3",
3636
"@microsoft/node-core-library": "3.16.0",
3737
"@microsoft/ts-command-line": "4.3.4",
3838
"@microsoft/tsdoc": "0.12.14",
@@ -43,8 +43,8 @@
4343
"typescript": "~3.5.3"
4444
},
4545
"devDependencies": {
46-
"@microsoft/node-library-build": "6.3.0",
47-
"@microsoft/rush-stack-compiler-3.4": "0.3.0",
46+
"@microsoft/node-library-build": "6.3.2",
47+
"@microsoft/rush-stack-compiler-3.4": "0.3.2",
4848
"@rushstack/eslint-config": "0.4.1",
4949
"@types/jest": "23.3.11",
5050
"@types/lodash": "4.14.116",

0 commit comments

Comments
 (0)