File tree 3 files changed +18
-16
lines changed
3 files changed +18
-16
lines changed Original file line number Diff line number Diff line change @@ -301,22 +301,24 @@ module.exports = class Generator {
301
301
debug ( 'vue:cli-files' ) ( this . files )
302
302
}
303
303
304
- hasPlugin ( _id , _version ) {
305
- return [
304
+ hasPlugin ( id , versionRange ) {
305
+ const pluginExists = [
306
306
...this . plugins . map ( p => p . id ) ,
307
307
...this . allPluginIds
308
- ] . some ( id => {
309
- if ( ! matchesPluginId ( _id , id ) ) {
310
- return false
311
- }
308
+ ] . some ( pid => matchesPluginId ( id , pid ) )
312
309
313
- if ( ! _version ) {
314
- return true
315
- }
310
+ if ( ! pluginExists ) {
311
+ return false
312
+ }
316
313
317
- const version = this . pm . getInstalledVersion ( id )
318
- return semver . satisfies ( version , _version )
319
- } )
314
+ if ( ! versionRange ) {
315
+ return pluginExists
316
+ }
317
+
318
+ return semver . satisfies (
319
+ this . pm . getInstalledVersion ( id ) ,
320
+ versionRange
321
+ )
320
322
}
321
323
322
324
printExitLogs ( ) {
Original file line number Diff line number Diff line change @@ -168,8 +168,8 @@ class GeneratorAPI {
168
168
* @param {string } version - Plugin version. Defaults to ''
169
169
* @return {boolean }
170
170
*/
171
- hasPlugin ( id , version ) {
172
- return this . generator . hasPlugin ( id , version )
171
+ hasPlugin ( id , versionRange ) {
172
+ return this . generator . hasPlugin ( id , versionRange )
173
173
}
174
174
175
175
/**
Original file line number Diff line number Diff line change @@ -84,10 +84,10 @@ declare class GeneratorAPI {
84
84
* Check if the project has a given plugin.
85
85
*
86
86
* @param id - Plugin id, can omit the (@vue/|vue-|@scope/vue)-cli-plugin- prefix
87
- * @param version - Plugin version. Defaults to ''
87
+ * @param versionRange - Plugin version range . Defaults to '* '
88
88
* @return `boolean`
89
89
*/
90
- hasPlugin ( id : string , version ?: string ) : boolean
90
+ hasPlugin ( id : string , versionRange ?: string ) : boolean
91
91
92
92
/**
93
93
* Configure how config files are extracted.
You can’t perform that action at this time.
0 commit comments