Skip to content

Commit e85947e

Browse files
authored
Merge pull request #318 from ryanto/document-resolutions
Include resolutions example in README
2 parents 879ab2b + c5283c4 commit e85947e

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ module.exports = function() {
122122
*/
123123
useVersionCompatibility: true,
124124
/*
125-
If set to true, all npm scenarios will use `yarn` for install with the `--no-lockfile` option. At cleanup, your
125+
If set to true, all npm scenarios will use `yarn` for install with the `--no-lockfile` option. At cleanup, your
126126
dependencies will be restored to their prior state.
127127
*/
128128
useYarn: true,
@@ -141,7 +141,7 @@ module.exports = function() {
141141
}
142142
},
143143
/*
144-
When writing scenarios that depend upon ember versions supplied by bower, you must explictly remove the
144+
When writing scenarios that depend upon ember versions supplied by bower, you must explictly remove the
145145
npm ember-source dependency if your addon defines an ember-source in its own package.json devDependencies
146146
*/
147147
npm: {
@@ -162,6 +162,14 @@ module.exports = function() {
162162
npm: {
163163
devDependencies: {
164164
'ember-source': '2.11.0'
165+
},
166+
/*
167+
When `useYarn` is true, you can optionally define yarn resolutions to enforce a
168+
specific dependency version to be installed. This is useful if other libraries
169+
you depend on include different versions of a package.
170+
*/
171+
resolutions: {
172+
'lodash': '5.0.0'
165173
}
166174
}
167175
},

0 commit comments

Comments
 (0)