File tree Expand file tree Collapse file tree 3 files changed +19
-4
lines changed Expand file tree Collapse file tree 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')
1313var logger = require ( '../lib/logger' )
1414var generate = require ( '../lib/generate' )
1515var checkVersion = require ( '../lib/check-version' )
16+ var vue2VersionWarn = require ( '../lib/vue2-version-warn' )
1617
1718/**
1819 * Usage.
@@ -100,11 +101,15 @@ function run () {
100101 checkVersion ( function ( ) {
101102 if ( ! hasSlash ) {
102103 // use official templates
103- template = 'vuejs-templates/' + template
104+ var officialTemplate = 'vuejs-templates/' + template
104105 if ( template . indexOf ( '#' ) !== - 1 ) {
105- downloadAndGenerate ( template )
106+ downloadAndGenerate ( officialTemplate )
106107 } 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 )
108113 }
109114 } else {
110115 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 11{
22 "name" : " vue-cli" ,
3- "version" : " 2.2 .0" ,
3+ "version" : " 2.3 .0" ,
44 "description" : " A simple CLI for scaffolding Vue.js projects." ,
55 "preferGlobal" : true ,
66 "bin" : {
You can’t perform that action at this time.
0 commit comments