Skip to content

Commit b241879

Browse files
authored
Merge pull request #222 from microsoft/update-dependencies
Update dependencies
2 parents 54ac7e2 + 8754fdf commit b241879

File tree

10 files changed

+213
-366
lines changed

10 files changed

+213
-366
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ yarn.lock merge=binary
7373
# syntax highlighters such as GitHub's from highlighting these comments as errors. Your text editor
7474
# may also require a special configuration to allow comments in JSON.
7575
#
76-
# For more information, see this issue: https://github.com/Microsoft/web-build-tools/issues/1088
76+
# For more information, see this issue: https://github.com/microsoft/rushstack/issues/1088
7777
#
7878
*.json linguist-language=JSON-with-Comments

.gitignore

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ jspm_packages/
5555
# next.js build output
5656
.next
5757

58-
# Common toolchain intermediate files
59-
temp
58+
# OS X temporary files
59+
.DS_Store
6060

61-
# Rush files
62-
common/temp/**
63-
package-deps.json
64-
.rush/temp/**
61+
# Rush temporary files
62+
common/temp/
63+
**/.rush/temp/
6564

65+
# Common toolchain intermediate files
66+
temp
6667
lib
6768
dist
68-
temp

common/config/rush/command-line.json

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,40 @@
164164
// * (Required) A list of custom commands and/or built-in Rush commands that this parameter may
165165
// * be used with. The parameter will be appended to the shell command that Rush invokes.
166166
// */
167-
// "associatedCommands": [ "build", "rebuild" ]
167+
// "associatedCommands": [ "build", "rebuild" ]
168168
// },
169169
//
170170
// {
171171
// /**
172172
// * (Required) Determines the type of custom parameter.
173-
// * A "flag" is a custom command-line parameter whose presence acts as an on/off switch.
173+
// * A "string" is a custom command-line parameter whose value is a simple text string.
174+
// */
175+
// "parameterKind": "string",
176+
// "longName": "--my-string",
177+
// "description": "A custom string parameter for the \"my-global-command\" custom command",
178+
//
179+
// "associatedCommands": [ "my-global-command" ],
180+
//
181+
// /**
182+
// * The name of the argument, which will be shown in the command-line help.
183+
// *
184+
// * For example, if the parameter name is '--count" and the argument name is "NUMBER",
185+
// * then the command-line help would display "--count NUMBER". The argument name must
186+
// * be comprised of upper-case letters, numbers, and underscores. It should be kept short.
187+
// */
188+
// "argumentName": "SOME_TEXT",
189+
//
190+
// /**
191+
// * If true, this parameter must be included with the command. The default is false.
192+
// */
193+
// "required": false
194+
// },
195+
//
196+
// {
197+
// /**
198+
// * (Required) Determines the type of custom parameter.
199+
// * A "choice" is a custom command-line parameter whose argument must be chosen from a list of
200+
// * allowable alternatives.
174201
// */
175202
// "parameterKind": "choice",
176203
// "longName": "--my-choice",
@@ -179,6 +206,11 @@
179206
// "associatedCommands": [ "my-global-command" ],
180207
//
181208
// /**
209+
// * If true, this parameter must be included with the command. The default is false.
210+
// */
211+
// "required": false,
212+
//
213+
// /**
182214
// * Normally if a parameter is omitted from the command line, it will not be passed
183215
// * to the shell command. this value will be inserted by default. Whereas if a "defaultValue"
184216
// * is defined, the parameter will always be passed to the shell command, and will use the

common/config/rush/common-versions.json

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/common-versions.schema.json",
77

88
/**
9-
* A table that specifies a "preferred version" for a dependency package. The "preferred version"
10-
* is typically used to hold an indirect dependency back to a specific version, however generally
11-
* it can be any SemVer range specifier (e.g. "~1.2.3"), and it will narrow any (compatible)
12-
* SemVer range specifier. See the Rush documentation for details about this feature.
9+
* A table that specifies a "preferred version" for a given NPM package. This feature is typically used
10+
* to hold back an indirect dependency to a specific older version, or to reduce duplication of indirect dependencies.
11+
*
12+
* The "preferredVersions" value can be any SemVer range specifier (e.g. "~1.2.3"). Rush injects these values into
13+
* the "dependencies" field of the top-level common/temp/package.json, which influences how the package manager
14+
* will calculate versions. The specific effect depends on your package manager. Generally it will have no
15+
* effect on an incompatible or already constrained SemVer range. If you are using PNPM, similar effects can be
16+
* achieved using the pnpmfile.js hook. See the Rush documentation for more details.
1317
*
1418
* After modifying this field, it's recommended to run "rush update --full" so that the package manager
1519
* will recalculate all version selections.
@@ -24,6 +28,20 @@
2428
"@types/jest-diff": "20.0.1"
2529
},
2630

31+
/**
32+
* When set to true, for all projects in the repo, all dependencies will be automatically added as preferredVersions,
33+
* except in cases where different projects specify different version ranges for a given dependency. For older
34+
* package managers, this tended to reduce duplication of indirect dependencies. However, it can sometimes cause
35+
* trouble for indirect dependencies with incompatible peerDependencies ranges.
36+
*
37+
* The default value is true. If you're encountering installation errors related to peer dependencies,
38+
* it's recommended to set this to false.
39+
*
40+
* After modifying this field, it's recommended to run "rush update --full" so that the package manager
41+
* will recalculate all version selections.
42+
*/
43+
// "implicitlyPreferredVersions": false,
44+
2745
/**
2846
* The "rush check" command can be used to enforce that every project in the repo must specify
2947
* the same SemVer range for a given dependency. However, sometimes exceptions are needed.

0 commit comments

Comments
 (0)