Skip to content

Commit 54db4bb

Browse files
committed
Merge remote-tracking branch 'remotes/origin/main' into exported
# Conflicts: # build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml
2 parents d9a0587 + 4de2adf commit 54db4bb

File tree

196 files changed

+5718
-513
lines changed

Some content is hidden

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

196 files changed

+5718
-513
lines changed

apps/api-documenter/CHANGELOG.json

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,93 @@
11
{
22
"name": "@microsoft/api-documenter",
33
"entries": [
4+
{
5+
"version": "7.19.9",
6+
"tag": "@microsoft/api-documenter_v7.19.9",
7+
"date": "Wed, 31 Aug 2022 01:45:06 GMT",
8+
"comments": {
9+
"dependency": [
10+
{
11+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.10.7`"
12+
}
13+
]
14+
}
15+
},
16+
{
17+
"version": "7.19.8",
18+
"tag": "@microsoft/api-documenter_v7.19.8",
19+
"date": "Wed, 31 Aug 2022 00:42:46 GMT",
20+
"comments": {
21+
"dependency": [
22+
{
23+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.10.6`"
24+
}
25+
]
26+
}
27+
},
28+
{
29+
"version": "7.19.7",
30+
"tag": "@microsoft/api-documenter_v7.19.7",
31+
"date": "Wed, 24 Aug 2022 03:01:22 GMT",
32+
"comments": {
33+
"dependency": [
34+
{
35+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" to `7.23.3`"
36+
},
37+
{
38+
"comment": "Updating dependency \"@rushstack/node-core-library\" to `3.51.1`"
39+
},
40+
{
41+
"comment": "Updating dependency \"@rushstack/heft\" to `0.47.5`"
42+
},
43+
{
44+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.10.5`"
45+
}
46+
]
47+
}
48+
},
49+
{
50+
"version": "7.19.6",
51+
"tag": "@microsoft/api-documenter_v7.19.6",
52+
"date": "Wed, 24 Aug 2022 00:14:38 GMT",
53+
"comments": {
54+
"dependency": [
55+
{
56+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" to `7.23.2`"
57+
},
58+
{
59+
"comment": "Updating dependency \"@rushstack/node-core-library\" to `3.51.0`"
60+
},
61+
{
62+
"comment": "Updating dependency \"@rushstack/heft\" to `0.47.4`"
63+
},
64+
{
65+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.10.4`"
66+
}
67+
]
68+
}
69+
},
70+
{
71+
"version": "7.19.5",
72+
"tag": "@microsoft/api-documenter_v7.19.5",
73+
"date": "Fri, 19 Aug 2022 00:17:19 GMT",
74+
"comments": {
75+
"dependency": [
76+
{
77+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" to `7.23.1`"
78+
},
79+
{
80+
"comment": "Updating dependency \"@rushstack/node-core-library\" to `3.50.2`"
81+
},
82+
{
83+
"comment": "Updating dependency \"@rushstack/heft\" to `0.47.3`"
84+
},
85+
{
86+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.10.3`"
87+
}
88+
]
89+
}
90+
},
491
{
592
"version": "7.19.4",
693
"tag": "@microsoft/api-documenter_v7.19.4",

apps/api-documenter/CHANGELOG.md

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

3-
This log was last generated on Wed, 10 Aug 2022 09:52:12 GMT and should not be manually modified.
3+
This log was last generated on Wed, 31 Aug 2022 01:45:06 GMT and should not be manually modified.
4+
5+
## 7.19.9
6+
Wed, 31 Aug 2022 01:45:06 GMT
7+
8+
_Version update only_
9+
10+
## 7.19.8
11+
Wed, 31 Aug 2022 00:42:46 GMT
12+
13+
_Version update only_
14+
15+
## 7.19.7
16+
Wed, 24 Aug 2022 03:01:22 GMT
17+
18+
_Version update only_
19+
20+
## 7.19.6
21+
Wed, 24 Aug 2022 00:14:38 GMT
22+
23+
_Version update only_
24+
25+
## 7.19.5
26+
Fri, 19 Aug 2022 00:17:19 GMT
27+
28+
_Version update only_
429

530
## 7.19.4
631
Wed, 10 Aug 2022 09:52:12 GMT

apps/api-documenter/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-documenter",
3-
"version": "7.19.4",
3+
"version": "7.19.9",
44
"description": "Read JSON files from api-extractor, generate documentation pages",
55
"repository": {
66
"type": "git",

apps/api-extractor/CHANGELOG.json

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,56 @@
11
{
22
"name": "@microsoft/api-extractor",
33
"entries": [
4+
{
5+
"version": "7.29.5",
6+
"tag": "@microsoft/api-extractor_v7.29.5",
7+
"date": "Wed, 24 Aug 2022 03:01:22 GMT",
8+
"comments": {
9+
"dependency": [
10+
{
11+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" to `7.23.3`"
12+
},
13+
{
14+
"comment": "Updating dependency \"@rushstack/node-core-library\" to `3.51.1`"
15+
}
16+
]
17+
}
18+
},
19+
{
20+
"version": "7.29.4",
21+
"tag": "@microsoft/api-extractor_v7.29.4",
22+
"date": "Wed, 24 Aug 2022 00:14:38 GMT",
23+
"comments": {
24+
"patch": [
25+
{
26+
"comment": "Remove use of LegacyAdapters.sortStable"
27+
}
28+
],
29+
"dependency": [
30+
{
31+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" to `7.23.2`"
32+
},
33+
{
34+
"comment": "Updating dependency \"@rushstack/node-core-library\" to `3.51.0`"
35+
}
36+
]
37+
}
38+
},
39+
{
40+
"version": "7.29.3",
41+
"tag": "@microsoft/api-extractor_v7.29.3",
42+
"date": "Fri, 19 Aug 2022 00:17:19 GMT",
43+
"comments": {
44+
"dependency": [
45+
{
46+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" to `7.23.1`"
47+
},
48+
{
49+
"comment": "Updating dependency \"@rushstack/node-core-library\" to `3.50.2`"
50+
}
51+
]
52+
}
53+
},
454
{
555
"version": "7.29.2",
656
"tag": "@microsoft/api-extractor_v7.29.2",

apps/api-extractor/CHANGELOG.md

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

3-
This log was last generated on Wed, 10 Aug 2022 09:52:12 GMT and should not be manually modified.
3+
This log was last generated on Wed, 24 Aug 2022 03:01:22 GMT and should not be manually modified.
4+
5+
## 7.29.5
6+
Wed, 24 Aug 2022 03:01:22 GMT
7+
8+
_Version update only_
9+
10+
## 7.29.4
11+
Wed, 24 Aug 2022 00:14:38 GMT
12+
13+
### Patches
14+
15+
- Remove use of LegacyAdapters.sortStable
16+
17+
## 7.29.3
18+
Fri, 19 Aug 2022 00:17:19 GMT
19+
20+
_Version update only_
421

522
## 7.29.2
623
Wed, 10 Aug 2022 09:52:12 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": "7.29.2",
3+
"version": "7.29.5",
44
"description": "Analyze the exported API for a TypeScript library and generate reviews, documentation, and .d.ts rollups",
55
"keywords": [
66
"typescript",

apps/api-extractor/src/collector/MessageRouter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import colors from 'colors';
55
import * as ts from 'typescript';
66
import * as tsdoc from '@microsoft/tsdoc';
7-
import { Sort, InternalError, LegacyAdapters } from '@rushstack/node-core-library';
7+
import { Sort, InternalError } from '@rushstack/node-core-library';
88

99
import { AstDeclaration } from '../analyzer/AstDeclaration';
1010
import { AstSymbol } from '../analyzer/AstSymbol';
@@ -635,7 +635,7 @@ export class MessageRouter {
635635
* Sorts an array of messages according to a reasonable ordering
636636
*/
637637
private _sortMessagesForOutput(messages: ExtractorMessage[]): void {
638-
LegacyAdapters.sortStable(messages, (a, b) => {
638+
messages.sort((a, b) => {
639639
let diff: number;
640640
// First sort by file name
641641
diff = Sort.compareByValue(a.sourceFilePath, b.sourceFilePath);

apps/api-extractor/src/generators/ApiModelGenerator.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,7 @@ export class ApiModelGenerator {
5656
public constructor(collector: Collector) {
5757
this._collector = collector;
5858
this._apiModel = new ApiModel();
59-
this._referenceGenerator = new DeclarationReferenceGenerator(
60-
collector.packageJsonLookup,
61-
collector.workingPackage.name,
62-
collector.program,
63-
collector.typeChecker,
64-
collector.bundledPackageNames
65-
);
59+
this._referenceGenerator = new DeclarationReferenceGenerator(collector);
6660
}
6761

6862
public get apiModel(): ApiModel {

0 commit comments

Comments
 (0)