Remove checkDistBranch

zigomir · zigomir · commit b20f64927cc1 · 2016-09-28T08:57:25.000-07:00
also `webpack` template now supports Vue 2.0.
diff --git a/bin/vue-init b/bin/vue-init
@@ -10,7 +10,6 @@ var uid = require('uid')
 var ora = require('ora')
 var chalk = require('chalk')
 var inquirer = require('inquirer')
-var request = require('request')
 var logger = require('../lib/logger')
 var generate = require('../lib/generate')
 var checkVersion = require('../lib/check-version')
@@ -110,11 +109,9 @@ function run () {
             warnings.v2SuffixTemplatesDeprecated(template, inPlace ? '' : name)
             return
           }
-          // until official webpack template for Vue 2.0 is released in master/dist branch
-          if (template !== 'webpack') {
-            warnings.v2BranchIsNowDefault(template, inPlace ? '' : name)
-          }
-          checkDistBranch(officialTemplate, downloadAndGenerate)
+
+          warnings.v2BranchIsNowDefault(template, inPlace ? '' : name)
+          downloadAndGenerate(officialTemplate)
         }
       } else {
         downloadAndGenerate(template)
@@ -123,32 +120,6 @@ function run () {
   }
 }
 
-/**
- * Check if the template has a dist branch, if yes, use that.
- *
- * @param {String} template
- * @param {Function} cb
- */
-
-function checkDistBranch (template, cb) {
-  request({
-    url: 'https://api.github.com/repos/' + template + '/branches',
-    headers: {
-      'User-Agent': 'vue-cli'
-    }
-  }, function (err, res, body) {
-    if (err) logger.fatal(err)
-    if (res.statusCode !== 200) {
-      logger.fatal('Template does not exist: ' + template)
-    } else {
-      var hasDist = JSON.parse(body).some(function (branch) {
-        return branch.name === 'dist'
-      })
-      return cb(hasDist ? template + '#dist' : template)
-    }
-  })
-}
-
 /**
  * Download a generate from a template repo.
  *
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "A simple CLI for scaffolding Vue.js projects.",
   "preferGlobal": true,
   "bin": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vue-cli",`
`3`		`- "version": "2.3.2",`
	`3`	`+ "version": "2.3.3",`
`4`	`4`	`"description": "A simple CLI for scaffolding Vue.js projects.",`
`5`	`5`	`"preferGlobal": true,`
`6`	`6`	`"bin": {`