From 4c5fdd6da4976fba7d7b83972a81a8233670b543 Mon Sep 17 00:00:00 2001 From: Matthijs Hakfoort Date: Fri, 14 Apr 2017 16:15:57 +0200 Subject: [PATCH 1/5] Raise download-git-repo version to ^1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d8d89e46b8..2173cf077b 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "consolidate": "^0.14.0", "copy-webpack-plugin": "^4.0.1", "css-loader": "^0.26.1", - "download-git-repo": "^0.2.1", + "download-git-repo": "^1.0.0", "express": "^4.14.0", "extract-text-webpack-plugin": "^2.0.0-rc.3", "file-loader": "^0.9.0", From 8940cd6de481489e530462e915c3bbd4fb80b092 Mon Sep 17 00:00:00 2001 From: Matthijs Hakfoort Date: Fri, 14 Apr 2017 19:37:25 +0200 Subject: [PATCH 2/5] Fixed temp path not working due to colons // Fixed git fataling on clone due to tmp dir not being empty --- bin/vue-init | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/vue-init b/bin/vue-init index d9b85c17cc..9cf32ac6f3 100755 --- a/bin/vue-init +++ b/bin/vue-init @@ -13,7 +13,8 @@ var logger = require('../lib/logger') var generate = require('../lib/generate') var checkVersion = require('../lib/check-version') var warnings = require('../lib/warnings') -var { isLocalPath, getTemplatePath } = require('../lib/local-path') +var { isLocalPath, getTemplatePath } = require('../lib/local-path') +var rm = require("rimraf").sync /** * Usage. @@ -61,11 +62,13 @@ var name = inPlace ? path.relative('../', process.cwd()) : rawName var to = path.resolve(rawName || '.') var clone = program.clone || false -var tmp = path.join(home, '.vue-templates', template.replace(/\//g, '-')) +var tmp = path.join(home, '.vue-templates', template.replace(/\/|:/g, '-')) if (program.offline) { console.log(`> Use cached template at ${chalk.yellow(tildify(tmp))}`) template = tmp -} +} + +console.log(tmp) /** * Padding. @@ -147,7 +150,8 @@ function downloadAndGenerate (template) { generate(name, tmp, to, function (err) { if (err) logger.fatal(err) console.log() - logger.success('Generated "%s".', name) + logger.success('Generated "%s".', name) + rm(tmp) }) }) } From 8219843dd23d8055893ec710ed661cde1269f8a8 Mon Sep 17 00:00:00 2001 From: Matthijs Hakfoort Date: Fri, 14 Apr 2017 19:44:37 +0200 Subject: [PATCH 3/5] Reverted download-git-repo upgrade as it is not needed for the fixes // removed excess console.log --- bin/vue-init | 2 -- package.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/vue-init b/bin/vue-init index 9cf32ac6f3..7457a3f839 100755 --- a/bin/vue-init +++ b/bin/vue-init @@ -68,8 +68,6 @@ if (program.offline) { template = tmp } -console.log(tmp) - /** * Padding. */ diff --git a/package.json b/package.json index 2173cf077b..d8d89e46b8 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "consolidate": "^0.14.0", "copy-webpack-plugin": "^4.0.1", "css-loader": "^0.26.1", - "download-git-repo": "^1.0.0", + "download-git-repo": "^0.2.1", "express": "^4.14.0", "extract-text-webpack-plugin": "^2.0.0-rc.3", "file-loader": "^0.9.0", From ccaff903c358719fd59041c933c93d421edf78b8 Mon Sep 17 00:00:00 2001 From: Matthijs Hakfoort Date: Fri, 14 Apr 2017 19:55:42 +0200 Subject: [PATCH 4/5] Fix singlequote lint error (doh) --- bin/vue-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vue-init b/bin/vue-init index 7457a3f839..a5ab66e1c3 100755 --- a/bin/vue-init +++ b/bin/vue-init @@ -14,7 +14,7 @@ var generate = require('../lib/generate') var checkVersion = require('../lib/check-version') var warnings = require('../lib/warnings') var { isLocalPath, getTemplatePath } = require('../lib/local-path') -var rm = require("rimraf").sync +var rm = require('rimraf').sync /** * Usage. From 112359288a56043c2c008183d83b3e31cbec2fd9 Mon Sep 17 00:00:00 2001 From: Matthijs Hakfoort Date: Tue, 18 Apr 2017 10:17:53 +0200 Subject: [PATCH 5/5] Remove quick fix temp folder remobval as PR #390 does it better --- bin/vue-init | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/vue-init b/bin/vue-init index a5ab66e1c3..b1cd8bb44c 100755 --- a/bin/vue-init +++ b/bin/vue-init @@ -14,7 +14,6 @@ var generate = require('../lib/generate') var checkVersion = require('../lib/check-version') var warnings = require('../lib/warnings') var { isLocalPath, getTemplatePath } = require('../lib/local-path') -var rm = require('rimraf').sync /** * Usage. @@ -149,7 +148,6 @@ function downloadAndGenerate (template) { if (err) logger.fatal(err) console.log() logger.success('Generated "%s".', name) - rm(tmp) }) }) }