Skip to content

Commit f2920db

Browse files
octogonzoctogonz
committed
Merge remote-tracking branch 'remotes/origin/master' into fix-no-version
2 parents d21b1c5 + 018b13e commit f2920db

File tree

246 files changed

+3037
-1310
lines changed

Some content is hidden

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

246 files changed

+3037
-1310
lines changed

‎apps/api-documenter/CHANGELOG.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,44 @@
11
{
22
"name": "@microsoft/api-documenter",
33
"entries": [
4+
{
5+
"version": "7.0.34",
6+
"tag": "@microsoft/api-documenter_v7.0.34",
7+
"date": "Fri, 15 Mar 2019 19:13:25 GMT",
8+
"comments": {
9+
"dependency": [
10+
{
11+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.2.11` to `0.2.12`"
12+
},
13+
{
14+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.38` to `6.0.39`"
15+
}
16+
]
17+
}
18+
},
19+
{
20+
"version": "7.0.33",
21+
"tag": "@microsoft/api-documenter_v7.0.33",
22+
"date": "Wed, 13 Mar 2019 19:13:14 GMT",
23+
"comments": {
24+
"patch": [
25+
{
26+
"comment": "Refactor code to move the IndentedWriter API from api-extractor-model to api-documenter"
27+
}
28+
],
29+
"dependency": [
30+
{
31+
"comment": "Updating dependency \"@microsoft/api-extractor-model\" from `7.0.25` to `7.0.26`"
32+
},
33+
{
34+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.2\" from `0.2.10` to `0.2.11`"
35+
},
36+
{
37+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.37` to `6.0.38`"
38+
}
39+
]
40+
}
41+
},
442
{
543
"version": "7.0.32",
644
"tag": "@microsoft/api-documenter_v7.0.32",

‎apps/api-documenter/CHANGELOG.md‎

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

3-
This log was last generated on Wed, 13 Mar 2019 01:14:05 GMT and should not be manually modified.
3+
This log was last generated on Fri, 15 Mar 2019 19:13:25 GMT and should not be manually modified.
4+
5+
## 7.0.34
6+
Fri, 15 Mar 2019 19:13:25 GMT
7+
8+
*Version update only*
9+
10+
## 7.0.33
11+
Wed, 13 Mar 2019 19:13:14 GMT
12+
13+
### Patches
14+
15+
- Refactor code to move the IndentedWriter API from api-extractor-model to api-documenter
416

517
## 7.0.32
618
Wed, 13 Mar 2019 01:14:05 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.0.32",
3+
"version": "7.0.34",
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.0.25",
18+
"@microsoft/api-extractor-model": "7.0.26",
1919
"@microsoft/node-core-library": "3.12.0",
2020
"@microsoft/ts-command-line": "4.2.3",
2121
"@microsoft/tsdoc": "0.12.8",
2222
"colors": "~1.2.1",
2323
"js-yaml": "~3.9.1"
2424
},
2525
"devDependencies": {
26-
"@microsoft/rush-stack-compiler-3.2": "0.2.10",
27-
"@microsoft/node-library-build": "6.0.37",
26+
"@microsoft/rush-stack-compiler-3.2": "0.2.12",
27+
"@microsoft/node-library-build": "6.0.39",
2828
"@types/js-yaml": "3.9.1",
2929
"@types/node": "8.5.8",
3030
"gulp": "~3.9.1",

‎apps/api-documenter/src/markdown/CustomMarkdownEmitter.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ import * as colors from 'colors';
66
import {
77
DocNode, DocLinkTag, StringBuilder
88
} from '@microsoft/tsdoc';
9+
import {
10+
ApiModel,
11+
IResolveDeclarationReferenceResult,
12+
ApiItem
13+
} from '@microsoft/api-extractor-model';
14+
915
import { CustomDocNodeKind } from '../nodes/CustomDocNodeKind';
1016
import { DocHeading } from '../nodes/DocHeading';
1117
import { DocNoteBox } from '../nodes/DocNoteBox';
@@ -17,12 +23,7 @@ import {
1723
IMarkdownEmitterContext,
1824
IMarkdownEmitterOptions
1925
} from './MarkdownEmitter';
20-
import {
21-
ApiModel,
22-
IResolveDeclarationReferenceResult,
23-
ApiItem,
24-
IndentedWriter
25-
} from '@microsoft/api-extractor-model';
26+
import { IndentedWriter } from '../utils/IndentedWriter';
2627

2728
export interface ICustomMarkdownEmitterOptions extends IMarkdownEmitterOptions {
2829
contextApiItem: ApiItem | undefined;

‎apps/api-documenter/src/markdown/MarkdownEmitter.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ import {
1717
DocEscapedText,
1818
DocErrorText
1919
} from '@microsoft/tsdoc';
20-
import { IndentedWriter } from '@microsoft/api-extractor-model';
2120
import { InternalError } from '@microsoft/node-core-library';
2221

22+
import { IndentedWriter } from '../utils/IndentedWriter';
23+
2324
export interface IMarkdownEmitterOptions {
2425
}
2526

apps/api-extractor-model/src/IndentedWriter.ts renamed to apps/api-documenter/src/utils/IndentedWriter.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ import { StringBuilder, IStringBuilder } from '@microsoft/node-core-library';
2929
* two
3030
* end
3131
* ```
32-
*
33-
* @beta
3432
*/
3533
export class IndentedWriter {
3634
/**

apps/api-extractor-model/src/test/IndentedWriter.test.ts renamed to apps/api-documenter/src/utils/test/IndentedWriter.test.ts

File renamed without changes.

apps/api-extractor-model/src/test/__snapshots__/IndentedWriter.test.ts.snap renamed to apps/api-documenter/src/utils/test/__snapshots__/IndentedWriter.test.ts.snap

File renamed without changes.

‎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.0.26",
6+
"tag": "@microsoft/api-extractor-model_v7.0.26",
7+
"date": "Wed, 13 Mar 2019 19:13:14 GMT",
8+
"comments": {
9+
"patch": [
10+
{
11+
"comment": "Refactor code to move the IndentedWriter API from api-extractor-model to api-documenter"
12+
}
13+
]
14+
}
15+
},
416
{
517
"version": "7.0.25",
618
"tag": "@microsoft/api-extractor-model_v7.0.25",

‎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 Wed, 13 Mar 2019 01:14:05 GMT and should not be manually modified.
3+
This log was last generated on Wed, 13 Mar 2019 19:13:14 GMT and should not be manually modified.
4+
5+
## 7.0.26
6+
Wed, 13 Mar 2019 19:13:14 GMT
7+
8+
### Patches
9+
10+
- Refactor code to move the IndentedWriter API from api-extractor-model to api-documenter
411

512
## 7.0.25
613
Wed, 13 Mar 2019 01:14:05 GMT

0 commit comments

Comments
 (0)