From ce543a5f6ffc92b9d7ca90ab9404c5ae56b36a01 Mon Sep 17 00:00:00 2001 From: Guillermo Peralta Scura Date: Sun, 10 Jun 2018 18:02:11 -0400 Subject: [PATCH 1/4] feat: Allow git commit message through UI --- packages/@vue/cli-ui/locales/en.json | 4 +++- .../cli-ui/src/graphql-api/connectors/projects.js | 12 +++++++++++- .../@vue/cli-ui/src/graphql-api/schema/project.js | 2 ++ packages/@vue/cli-ui/src/views/ProjectCreate.vue | 15 +++++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/packages/@vue/cli-ui/locales/en.json b/packages/@vue/cli-ui/locales/en.json index 32be1ba622..fa27cff396 100644 --- a/packages/@vue/cli-ui/locales/en.json +++ b/packages/@vue/cli-ui/locales/en.json @@ -198,7 +198,9 @@ }, "options": { "label": "Additional options", - "description": "Overwrite target folder if it exists" + "description": "Overwrite target folder if it exists", + "git": "Use custom first initial commit message or skip git initialization", + "gitPlaceholder": "Initial commit message (optional)" } }, "buttons": { diff --git a/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js b/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js index e1abc46d07..87a3559294 100644 --- a/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js +++ b/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js @@ -281,6 +281,16 @@ async function create (input, context) { answers.useConfigFiles = 'files' } + const cliOptions = {git: true} + // Git + if (input.skipGit) { + if (!input.gitCommit) { + cliOptions.git = 'false' + } else { + cliOptions.git = input.gitCommit + } + } + // Preset answers.preset = input.preset if (input.save) { @@ -306,7 +316,7 @@ async function create (input, context) { }) // Create - await creator.create({ git: true }, preset) + await creator.create(cliOptions, preset) removeCreator() notify({ diff --git a/packages/@vue/cli-ui/src/graphql-api/schema/project.js b/packages/@vue/cli-ui/src/graphql-api/schema/project.js index a335d6c876..5b4e600be1 100644 --- a/packages/@vue/cli-ui/src/graphql-api/schema/project.js +++ b/packages/@vue/cli-ui/src/graphql-api/schema/project.js @@ -37,6 +37,8 @@ input ProjectCreateInput { remote: Boolean clone: Boolean save: String + skipGit: Boolean! + gitCommit: String } input ProjectImportInput { diff --git a/packages/@vue/cli-ui/src/views/ProjectCreate.vue b/packages/@vue/cli-ui/src/views/ProjectCreate.vue index 91c472dfe0..4034018425 100644 --- a/packages/@vue/cli-ui/src/views/ProjectCreate.vue +++ b/packages/@vue/cli-ui/src/views/ProjectCreate.vue @@ -82,6 +82,17 @@ > {{ $t('views.project-create.tabs.details.form.options.description') }} + + {{ $t('views.project-create.tabs.details.form.options.git') }} + + @@ -388,6 +399,8 @@ function formDataFactory () { return { folder: '', force: false, + git: false, + gitCommitMessage: '', packageManager: undefined, selectedPreset: null, remotePreset: { @@ -512,6 +525,8 @@ export default { input: { folder: this.formData.folder, force: this.formData.force, + skipGit: this.formData.git, + gitCommit: this.formData.gitCommitMessage, packageManager: this.formData.packageManager, preset: this.formData.selectedPreset, remote: this.formData.remotePreset.url, From 7e77342e0efb3dc80730391c8678f984c8540e1e Mon Sep 17 00:00:00 2001 From: Guillermo Peralta Scura Date: Sun, 10 Jun 2018 18:26:31 -0400 Subject: [PATCH 2/4] refactor: fix git initialization on UI variable naming and behaviour --- packages/@vue/cli-ui/locales/en.json | 2 +- packages/@vue/cli-ui/src/graphql-api/connectors/projects.js | 4 ++-- packages/@vue/cli-ui/src/graphql-api/schema/project.js | 2 +- packages/@vue/cli-ui/src/views/ProjectCreate.vue | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/@vue/cli-ui/locales/en.json b/packages/@vue/cli-ui/locales/en.json index fa27cff396..94ef31d321 100644 --- a/packages/@vue/cli-ui/locales/en.json +++ b/packages/@vue/cli-ui/locales/en.json @@ -199,7 +199,7 @@ "options": { "label": "Additional options", "description": "Overwrite target folder if it exists", - "git": "Use custom first initial commit message or skip git initialization", + "git": "Initialize git repository (recommended)", "gitPlaceholder": "Initial commit message (optional)" } }, diff --git a/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js b/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js index 87a3559294..7b4d347c38 100644 --- a/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js +++ b/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js @@ -283,9 +283,9 @@ async function create (input, context) { const cliOptions = {git: true} // Git - if (input.skipGit) { + if (!input.enableGit) { if (!input.gitCommit) { - cliOptions.git = 'false' + cliOptions.git = false } else { cliOptions.git = input.gitCommit } diff --git a/packages/@vue/cli-ui/src/graphql-api/schema/project.js b/packages/@vue/cli-ui/src/graphql-api/schema/project.js index 5b4e600be1..6897f9093c 100644 --- a/packages/@vue/cli-ui/src/graphql-api/schema/project.js +++ b/packages/@vue/cli-ui/src/graphql-api/schema/project.js @@ -37,7 +37,7 @@ input ProjectCreateInput { remote: Boolean clone: Boolean save: String - skipGit: Boolean! + enableGit: Boolean! gitCommit: String } diff --git a/packages/@vue/cli-ui/src/views/ProjectCreate.vue b/packages/@vue/cli-ui/src/views/ProjectCreate.vue index 4034018425..78615af5dc 100644 --- a/packages/@vue/cli-ui/src/views/ProjectCreate.vue +++ b/packages/@vue/cli-ui/src/views/ProjectCreate.vue @@ -90,7 +90,7 @@ @@ -399,7 +399,7 @@ function formDataFactory () { return { folder: '', force: false, - git: false, + git: true, gitCommitMessage: '', packageManager: undefined, selectedPreset: null, @@ -525,7 +525,7 @@ export default { input: { folder: this.formData.folder, force: this.formData.force, - skipGit: this.formData.git, + enableGit: this.formData.git, gitCommit: this.formData.gitCommitMessage, packageManager: this.formData.packageManager, preset: this.formData.selectedPreset, From 49cee58bc2f728509c07a4379cf321e83a009887 Mon Sep 17 00:00:00 2001 From: Guillaume Chau Date: Mon, 11 Jun 2018 15:55:13 +0200 Subject: [PATCH 3/4] fix(ui): condition, text, variable names --- packages/@vue/cli-ui/locales/en.json | 4 ++-- .../src/graphql-api/connectors/projects.js | 14 ++++++-------- .../cli-ui/src/graphql-api/schema/project.js | 2 +- .../@vue/cli-ui/src/views/ProjectCreate.vue | 17 ++++++++++------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/packages/@vue/cli-ui/locales/en.json b/packages/@vue/cli-ui/locales/en.json index 94ef31d321..d4aa1b3c20 100644 --- a/packages/@vue/cli-ui/locales/en.json +++ b/packages/@vue/cli-ui/locales/en.json @@ -198,9 +198,9 @@ }, "options": { "label": "Additional options", - "description": "Overwrite target folder if it exists", + "force": "Overwrite target folder if it exists", "git": "Initialize git repository (recommended)", - "gitPlaceholder": "Initial commit message (optional)" + "git-commit-message": "Initial commit message (optional)" } }, "buttons": { diff --git a/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js b/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js index 7b4d347c38..83a32e2899 100644 --- a/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js +++ b/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js @@ -281,14 +281,12 @@ async function create (input, context) { answers.useConfigFiles = 'files' } - const cliOptions = {git: true} + const createOptions = {git: true} // Git - if (!input.enableGit) { - if (!input.gitCommit) { - cliOptions.git = false - } else { - cliOptions.git = input.gitCommit - } + if (input.enableGit && input.gitCommitMessage) { + createOptions.git = input.gitCommitMessage + } else { + createOptions.git = input.enableGit } // Preset @@ -316,7 +314,7 @@ async function create (input, context) { }) // Create - await creator.create(cliOptions, preset) + await creator.create(createOptions, preset) removeCreator() notify({ diff --git a/packages/@vue/cli-ui/src/graphql-api/schema/project.js b/packages/@vue/cli-ui/src/graphql-api/schema/project.js index 6897f9093c..52dc68314a 100644 --- a/packages/@vue/cli-ui/src/graphql-api/schema/project.js +++ b/packages/@vue/cli-ui/src/graphql-api/schema/project.js @@ -38,7 +38,7 @@ input ProjectCreateInput { clone: Boolean save: String enableGit: Boolean! - gitCommit: String + gitCommitMessage: String } input ProjectImportInput { diff --git a/packages/@vue/cli-ui/src/views/ProjectCreate.vue b/packages/@vue/cli-ui/src/views/ProjectCreate.vue index 78615af5dc..c3fb1303f7 100644 --- a/packages/@vue/cli-ui/src/views/ProjectCreate.vue +++ b/packages/@vue/cli-ui/src/views/ProjectCreate.vue @@ -80,18 +80,21 @@ v-model="formData.force" class="extend-left force" > - {{ $t('views.project-create.tabs.details.form.options.description') }} + {{ $t('views.project-create.tabs.details.form.options.force') }} + + + {{ $t('views.project-create.tabs.details.form.options.git') }} @@ -399,7 +402,7 @@ function formDataFactory () { return { folder: '', force: false, - git: true, + enableGit: true, gitCommitMessage: '', packageManager: undefined, selectedPreset: null, @@ -525,8 +528,8 @@ export default { input: { folder: this.formData.folder, force: this.formData.force, - enableGit: this.formData.git, - gitCommit: this.formData.gitCommitMessage, + enableGit: this.formData.enableGit, + gitCommitMessage: this.formData.gitCommitMessage, packageManager: this.formData.packageManager, preset: this.formData.selectedPreset, remote: this.formData.remotePreset.url, From bfd1ecb8e039f2d2073e1fe50a570eda8e8fd02a Mon Sep 17 00:00:00 2001 From: Guillaume Chau Date: Mon, 11 Jun 2018 16:00:20 +0200 Subject: [PATCH 4/4] fix(ui): polish --- packages/@vue/cli-ui/src/graphql-api/connectors/projects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js b/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js index 83a32e2899..6654f34a49 100644 --- a/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js +++ b/packages/@vue/cli-ui/src/graphql-api/connectors/projects.js @@ -281,7 +281,7 @@ async function create (input, context) { answers.useConfigFiles = 'files' } - const createOptions = {git: true} + const createOptions = {} // Git if (input.enableGit && input.gitCommitMessage) { createOptions.git = input.gitCommitMessage