File tree Expand file tree Collapse file tree 2 files changed +13
-5
lines changed Expand file tree Collapse file tree 2 files changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -40,10 +40,10 @@ function getInstallCommand(packageConfigs) {
40
40
return packageConfig . name ;
41
41
}
42
42
43
- // e.g. ^4.0|^5.0: use the latest version
43
+ // e.g. ^4.0|| ^5.0: use the latest version
44
44
let recommendedVersion = packageConfig . version ;
45
- if ( recommendedVersion . indexOf ( '|' ) !== - 1 ) {
46
- recommendedVersion = recommendedVersion . split ( '|' ) . pop ( ) ;
45
+ if ( recommendedVersion . indexOf ( '|| ' ) !== - 1 ) {
46
+ recommendedVersion = recommendedVersion . split ( '|' ) . pop ( ) . trim ( ) ;
47
47
}
48
48
49
49
// recommend the version included in our package.json file
Original file line number Diff line number Diff line change @@ -74,9 +74,17 @@ describe('package-helper', () => {
74
74
} ) ;
75
75
76
76
it ( 'Recommends correct install with a more complex constraint' , ( ) => {
77
- // e.g. ^7.0|^8.0
78
77
const packageRecommendations = packageHelper . getMissingPackageRecommendations ( [
79
- { name : 'foo' , version : '^7.0|^8.0' } ,
78
+ { name : 'foo' , version : '^7.0||^8.0' } ,
79
+ { name : 'bar' }
80
+ ] ) ;
81
+
82
+ expect ( packageRecommendations . installCommand ) . to . contain ( 'yarn add foo@^8.0 bar' ) ;
83
+ } ) ;
84
+
85
+ it ( 'Recommends correct install with a more complex constraint' , ( ) => {
86
+ const packageRecommendations = packageHelper . getMissingPackageRecommendations ( [
87
+ { name : 'foo' , version : '^7.0 || ^8.0' } ,
80
88
{ name : 'bar' }
81
89
] ) ;
82
90
You can’t perform that action at this time.
0 commit comments