From 88253081c6d1aa2c3e9a1c1c4b74950d123ed3ed Mon Sep 17 00:00:00 2001 From: Steven Klein Date: Fri, 5 May 2017 11:27:00 -0500 Subject: [PATCH 1/2] clean cached template in downloadandgenerate --- bin/vue-init | 3 +++ package.json | 2 +- yarn.lock | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/vue-init b/bin/vue-init index d9b85c17cc..22cbb0b206 100755 --- a/bin/vue-init +++ b/bin/vue-init @@ -9,6 +9,7 @@ var home = require('user-home') var tildify = require('tildify') var chalk = require('chalk') var inquirer = require('inquirer') +var rm = require('rimraf').sync var logger = require('../lib/logger') var generate = require('../lib/generate') var checkVersion = require('../lib/check-version') @@ -141,6 +142,8 @@ function run () { function downloadAndGenerate (template) { var spinner = ora('downloading template') spinner.start() + // check if template is local + if (exists(tmp)) rm(tmp) download(template, tmp, { clone: clone }, function (err) { spinner.stop() if (err) logger.fatal('Failed to download repo ' + template + ': ' + err.message.trim()) diff --git a/package.json b/package.json index d8d89e46b8..f4ffcb7575 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "postcss-loader": "^1.2.1", "read-metadata": "^1.0.0", "request": "^2.67.0", - "rimraf": "^2.5.0", + "rimraf": "^2.6.1", "semver": "^5.1.0", "tildify": "^1.2.0", "url-loader": "^0.5.7", diff --git a/yarn.lock b/yarn.lock index 88e46424c1..a2d2dafbc5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4610,7 +4610,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.0: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.0, rimraf@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" dependencies: From 1fd8adff48866761c513e9d425b4aee790be8133 Mon Sep 17 00:00:00 2001 From: Steven Klein Date: Sun, 7 May 2017 04:47:42 -0500 Subject: [PATCH 2/2] update comment for clarity --- bin/vue-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vue-init b/bin/vue-init index 22cbb0b206..646657e996 100755 --- a/bin/vue-init +++ b/bin/vue-init @@ -142,7 +142,7 @@ function run () { function downloadAndGenerate (template) { var spinner = ora('downloading template') spinner.start() - // check if template is local + // Remove if local template exists if (exists(tmp)) rm(tmp) download(template, tmp, { clone: clone }, function (err) { spinner.stop()