Skip to content

Commit 5e8dab9

Browse files
prophet1906prophet1906
authored
Merge branch 'master' into issue-1242
2 parents 6bef38c + 5935e8e commit 5e8dab9

73 files changed

Lines changed: 855 additions & 406 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.

‎.gitattributes‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
*.jpg binary
4040
*.js text eol=crlf
4141
*.json text eol=crlf
42-
*.json linguist-language=JSON5
4342
*.less text eol=crlf
4443
*.map text eol=lf
4544
*.md text eol=crlf
@@ -65,6 +64,15 @@
6564

6665
# Don't allow people to merge changes to these generated files, because the result
6766
# may be invalid. You need to run "rush update" again.
67+
pnpm-lock.yaml merge=binary
6868
shrinkwrap.yaml merge=binary
6969
npm-shrinkwrap.json merge=binary
7070
yarn.lock merge=binary
71+
72+
# Rush's JSON config files use JavaScript-style code comments. The rule below prevents pedantic
73+
# syntax highlighters such as GitHub's from highlighting these comments as errors. Your text editor
74+
# may also require a special configuration to allow comments in JSON.
75+
#
76+
# For more information, see this issue: https://github.com/Microsoft/web-build-tools/issues/1088
77+
#
78+
*.json linguist-language=JSON-with-Comments

‎apps/api-documenter/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-documenter",
33
"entries": [
4+
{
5+
"version": "7.1.2",
6+
"tag": "@microsoft/api-documenter_v7.1.2",
7+
"date": "Mon, 29 Apr 2019 19:13:03 GMT",
8+
"comments": {
9+
"patch": [
10+
{
11+
"comment": "Fix the \"Home\" link in the breadcrumb when viewing docs using GitHub's markdown renderer"
12+
}
13+
]
14+
}
15+
},
416
{
517
"version": "7.1.1",
618
"tag": "@microsoft/api-documenter_v7.1.1",

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

3-
This log was last generated on Wed, 17 Apr 2019 19:12:31 GMT and should not be manually modified.
3+
This log was last generated on Mon, 29 Apr 2019 19:13:03 GMT and should not be manually modified.
4+
5+
## 7.1.2
6+
Mon, 29 Apr 2019 19:13:03 GMT
7+
8+
### Patches
9+
10+
- Fix the "Home" link in the breadcrumb when viewing docs using GitHub's markdown renderer
411

512
## 7.1.1
613
Wed, 17 Apr 2019 19:12:31 GMT

‎apps/api-documenter/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-documenter",
3-
"version": "7.1.1",
3+
"version": "7.1.2",
44
"description": "Read JSON files from api-extractor, generate documentation pages",
55
"repository": {
66
"type": "git",
@@ -20,12 +20,12 @@
2020
"@microsoft/ts-command-line": "4.2.3",
2121
"@microsoft/tsdoc": "0.12.9",
2222
"colors": "~1.2.1",
23-
"js-yaml": "~3.9.1"
23+
"js-yaml": "~3.13.1"
2424
},
2525
"devDependencies": {
2626
"@microsoft/rush-stack-compiler-3.2": "0.3.8",
2727
"@microsoft/node-library-build": "6.0.56",
28-
"@types/js-yaml": "3.9.1",
28+
"@types/js-yaml": "3.12.1",
2929
"@types/node": "8.5.8",
3030
"gulp": "~3.9.1",
3131
"@types/jest": "23.3.11",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ export class MarkdownDocumenter {
696696
configuration: this._tsdocConfiguration,
697697
tagName: '@link',
698698
linkText: 'Home',
699-
urlDestination: './index'
699+
urlDestination: './index.md'
700700
}));
701701

702702
for (const hierarchyItem of apiItem.getHierarchy()) {

‎apps/rush-lib/assets/rush-init/[dot]gitattributes‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Don't allow people to merge changes to these generated files, because the result
22
# may be invalid. You need to run "rush update" again.
3+
pnpm-lock.yaml merge=binary
34
shrinkwrap.yaml merge=binary
45
npm-shrinkwrap.json merge=binary
56
yarn.lock merge=binary
@@ -10,4 +11,4 @@ yarn.lock merge=binary
1011
#
1112
# For more information, see this issue: https://github.com/Microsoft/web-build-tools/issues/1088
1213
#
13-
*.json linguist-language=JSON5
14+
*.json linguist-language=JSON-with-Comments

‎apps/rush-lib/assets/rush-init/rush.json‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,19 @@
4646
* The default value is false to avoid legacy compatibility issues.
4747
* It is strongly recommended to set strictPeerDependencies=true.
4848
*/
49-
/*[LINE "DEMO"]*/ "strictPeerDependencies": true
49+
/*[LINE "DEMO"]*/ "strictPeerDependencies": true,
50+
51+
52+
/**
53+
* Configures the strategy used to select versions during installation.
54+
*
55+
* This feature requires PNPM version 3.1 or newer. It corresponds to the "--resolution-strategy" command-line
56+
* option for PNPM. Possible values are "fast" and "fewer-dependencies". PNPM's default is "fast", but this may
57+
* be incompatible with certain packages, for example the "@types" packages from DefinitelyTyped. Rush's default
58+
* is "fewer-dependencies", which causes PNPM to avoid installing a newer version if an already installed version
59+
* can be reused; this is more similar to NPM's algorithm.
60+
*/
61+
/*[LINE "HYPOTHETICAL"]*/ "resolutionStrategy": "fast"
5062
},
5163

5264
/**
@@ -57,7 +69,7 @@
5769
* Specify a SemVer range to ensure developers use a NodeJS version that is appropriate
5870
* for your repo.
5971
*/
60-
"nodeSupportedVersionRange": ">=8.9.4 <9.0.0",
72+
"nodeSupportedVersionRange": ">=10.13.0 <11.0.0",
6173

6274
/**
6375
* If you would like the version specifiers for your dependencies to be consistent, then

‎apps/rush-lib/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/rush-lib",
3-
"version": "5.6.4",
3+
"version": "5.7.1",
44
"description": "A library for writing scripts that interact with the Rush tool",
55
"repository": {
66
"type": "git",
@@ -36,7 +36,7 @@
3636
"https-proxy-agent": "~2.2.1",
3737
"@types/inquirer": "0.0.43",
3838
"inquirer": "~6.2.0",
39-
"js-yaml": "~3.9.1",
39+
"js-yaml": "~3.13.1",
4040
"lodash": "~4.17.5",
4141
"minimatch": "~3.0.2",
4242
"node-fetch": "~2.1.2",
@@ -58,7 +58,7 @@
5858
"gulp": "~3.9.1",
5959
"@types/glob": "5.0.30",
6060
"@types/jest": "23.3.11",
61-
"@types/js-yaml": "3.9.1",
61+
"@types/js-yaml": "3.12.1",
6262
"@types/lodash": "4.14.116",
6363
"@types/minimatch": "2.0.29",
6464
"@types/semver": "5.3.33"

0 commit comments

Comments
 (0)