File tree 3 files changed +19
-4
lines changed
3 files changed +19
-4
lines changed Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ var request = require('request')
13
13
var logger = require ( '../lib/logger' )
14
14
var generate = require ( '../lib/generate' )
15
15
var checkVersion = require ( '../lib/check-version' )
16
+ var vue2VersionWarn = require ( '../lib/vue2-version-warn' )
16
17
17
18
/**
18
19
* Usage.
@@ -100,11 +101,15 @@ function run () {
100
101
checkVersion ( function ( ) {
101
102
if ( ! hasSlash ) {
102
103
// use official templates
103
- template = 'vuejs-templates/' + template
104
+ var officialTemplate = 'vuejs-templates/' + template
104
105
if ( template . indexOf ( '#' ) !== - 1 ) {
105
- downloadAndGenerate ( template )
106
+ downloadAndGenerate ( officialTemplate )
106
107
} else {
107
- checkDistBranch ( template , downloadAndGenerate )
108
+ // until official webpack template for Vue 2.0 is released in master/dist branch
109
+ if ( template !== 'webpack' ) {
110
+ vue2VersionWarn ( template , inPlace ? '' : name )
111
+ }
112
+ checkDistBranch ( officialTemplate , downloadAndGenerate )
108
113
}
109
114
} else {
110
115
downloadAndGenerate ( template )
Original file line number Diff line number Diff line change
1
+ var chalk = require ( 'chalk' )
2
+
3
+ module . exports = function ( template , name ) {
4
+ var vue1InitCommand = 'vue init ' + template + '#1.0' + ' ' + name
5
+
6
+ console . log ( chalk . red ( ' This will install Vue 2.x version of template.' ) )
7
+ console . log ( )
8
+ console . log ( chalk . yellow ( ' For Vue 1.x use: ' ) + chalk . green ( vue1InitCommand ) )
9
+ console . log ( )
10
+ }
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " vue-cli" ,
3
- "version" : " 2.2 .0" ,
3
+ "version" : " 2.3 .0" ,
4
4
"description" : " A simple CLI for scaffolding Vue.js projects." ,
5
5
"preferGlobal" : true ,
6
6
"bin" : {
You can’t perform that action at this time.
0 commit comments