File tree Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Original file line number Diff line number Diff line change 160
160
"docs" : " sf-docs" ,
161
161
"format" : " sf-format" ,
162
162
"lint" : " sf-lint" ,
163
- "lint-fix" : " yarn sf-lint --fix" ,
164
163
"oclif-artifacts" : " oclif-dev manifest" ,
165
164
"postpack" : " shx rm -f oclif.manifest.json" ,
166
165
"posttest" : " yarn lint && yarn test:deprecation-policy && yarn test:command-reference" ,
Original file line number Diff line number Diff line change @@ -78,9 +78,8 @@ export class Package extends AsyncOptionalCreatable {
78
78
return ( await fs . readJson ( pkgJsonPath ) ) as PackageJson ;
79
79
}
80
80
81
- public retrieveNpmPackage ( requiredVersion = '' ) : NpmPackage {
82
- const pacakgeName = requiredVersion ? `${ this . name } @${ requiredVersion } ` : `${ this . name } ` ;
83
- const result = exec ( `npm view ${ pacakgeName } ${ this . registry . getRegistryParameter ( ) } --json` , { silent : true } ) ;
81
+ public retrieveNpmPackage ( ) : NpmPackage {
82
+ const result = exec ( `npm view ${ this . name } ${ this . registry . getRegistryParameter ( ) } --json` , { silent : true } ) ;
84
83
return result . code === 0 ? ( JSON . parse ( result . stdout ) as NpmPackage ) : null ;
85
84
}
86
85
@@ -114,8 +113,9 @@ export class Package extends AsyncOptionalCreatable {
114
113
}
115
114
116
115
public nextVersionIsAvailable ( ) : boolean {
117
- const pkg = this . retrieveNpmPackage ( this . nextVersion ) ;
118
- return pkg ?. version === this . nextVersion ;
116
+ const pkg = this . retrieveNpmPackage ( ) ;
117
+ const versions = get ( pkg , 'versions' , [ ] ) as string [ ] ;
118
+ return versions . includes ( this . nextVersion ) ;
119
119
}
120
120
121
121
public writePackageJson ( rootDir ?: string ) : void {
Original file line number Diff line number Diff line change @@ -124,7 +124,11 @@ describe('Package', () => {
124
124
} ) ;
125
125
126
126
it ( 'should return false if the next version is not listed yet' , async ( ) => {
127
- stubMethod ( $$ . SANDBOX , Package . prototype , 'retrieveNpmPackage' ) . returns ( null ) ;
127
+ stubMethod ( $$ . SANDBOX , Package . prototype , 'retrieveNpmPackage' ) . returns ( {
128
+ name : pkgName ,
129
+ version : '1.0.0' ,
130
+ versions : [ '0.0.1' , '0.0.5' , '1.0.0' ] ,
131
+ } ) ;
128
132
const pkg = await Package . create ( ) ;
129
133
pkg . setNextVersion ( '1.1.0' ) ;
130
134
expect ( pkg . nextVersionIsAvailable ( ) ) . to . equal ( false ) ;
You can’t perform that action at this time.
0 commit comments