Skip to content

Commit

Permalink
rush init --overwrite-existing --rush-example-repo
Browse files Browse the repository at this point in the history
  • Loading branch information
octogonz committed Apr 25, 2019
1 parent f19ca54 commit fe92a4e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Don't allow people to merge changes to these generated files, because the result
# may be invalid. You need to run "rush update" again.
pnpm-lock.yaml merge=binary
shrinkwrap.yaml merge=binary
npm-shrinkwrap.json merge=binary
yarn.lock merge=binary
Expand All @@ -10,4 +11,4 @@ yarn.lock merge=binary
#
# For more information, see this issue: https://github.com/Microsoft/web-build-tools/issues/1088
#
*.json linguist-language=JSON5
*.json linguist-language=JSON-with-Comments
18 changes: 15 additions & 3 deletions rush.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* path segment in the "$schema" field for all your Rush config files. This will ensure
* correct error-underlining and tab-completion for editors such as VS Code.
*/
"rushVersion": "5.6.3",
"rushVersion": "5.7.1",

/**
* The next field selects which package manager should be installed and determines its version.
Expand Down Expand Up @@ -46,7 +46,19 @@
* The default value is false to avoid legacy compatibility issues.
* It is strongly recommended to set strictPeerDependencies=true.
*/
"strictPeerDependencies": true
"strictPeerDependencies": true,


/**
* Configures the strategy used to select versions during installation.
*
* This feature requires PNPM version 3.1 or newer. It corresponds to the "--resolution-strategy" command-line
* option for PNPM. Possible values are "fast" and "fewer-dependencies". PNPM's default is "fast", but this may
* be incompatible with certain packages, for example the "@types" packages from DefinitelyTyped. Rush's default
* is "fewer-dependencies", which causes PNPM to avoid installing a newer version if an already installed version
* can be reused; this is more similar to NPM's algorithm.
*/
// "resolutionStrategy": "fast"
},

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

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

0 comments on commit fe92a4e

Please sign in to comment.