mirror/vue-cli
1
0
Fork 0
mirror of https://github.com/vuejs/vue-cli.git synced 2026-02-09 00:18:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge branch 'dev' into next-minor

Browse Source
This commit is contained in:
Haoqun Jiang
2019-04-09 00:22:45 +08:00
parent 2e20b7aef4 3e1692424a
commit a88203d3c2
22 changed files with 111 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/@vue/cli-ui-addon-webpack/src/components/WebpackDashboard.vue
View File

@@ -96,7 +96,7 @@ export default {
.title
color lighten($vue-ui-color-dark, 60%)
font-size 20px
font-weight lighter
font-weight 300
text-align center
margin-bottom $padding-item
@@ -108,7 +108,7 @@ export default {
.info-block
v-box()
box-center()
font-weight lighter
font-weight 300
text-align center
.label

2
packages/@vue/cli-ui-addon-widgets/src/components/Welcome.vue
View File

@@ -69,7 +69,7 @@ export default {
.title
font-size 32px
font-weight lighter
font-weight 300
text-align center
margin-bottom ($padding-item * 2)

17
packages/@vue/cli-ui/apollo-server/connectors/logs.js
View File

@@ -1,3 +1,14 @@
/** @typedef {'warn' | 'error' | 'info' | 'done'} LogType */
/**
* @typedef Log
* @prop {string} id
* @prop {string} date
* @prop {LogType} type
* @prop {string} tag
* @prop {string} message
*/
const shortId = require('shortid')
const { events } = require('@vue/cli-shared-utils/lib/logger')
const { generateTitle } = require('@vue/cli/lib/util/clearConsole')
@@ -6,9 +17,15 @@ const channels = require('../channels')
// Context
const getContext = require('../context')
/** @type {Log []} */
let logs = []
/**
* @param {Log} log
* @param {any} context
*/
exports.add = function (log, context) {
/** @type {Log} */
const item = {
id: shortId.generate(),
date: new Date().toISOString(),

80
packages/@vue/cli-ui/apollo-server/connectors/projects.js
View File

@@ -5,7 +5,7 @@ const Creator = require('@vue/cli/lib/Creator')
const { getPromptModules } = require('@vue/cli/lib/util/createTools')
const { getFeatures } = require('@vue/cli/lib/util/features')
const { defaults } = require('@vue/cli/lib/options')
const { toShortPluginId, clearModule } = require('@vue/cli-shared-utils')
const { toShortPluginId, execa } = require('@vue/cli-shared-utils')
const { progress: installProgress } = require('@vue/cli/lib/util/installDeps')
const parseGitConfig = require('parse-git-config')
// Connectors
@@ -15,6 +15,7 @@ const prompts = require('./prompts')
const folders = require('./folders')
const plugins = require('./plugins')
const locales = require('./locales')
const logs = require('./logs')
// Context
const getContext = require('../context')
// Utils
@@ -258,52 +259,23 @@ async function create (input, context) {
const targetDir = path.join(cwd.get(), input.folder)
// Delete existing folder
if (fs.existsSync(targetDir)) {
if (input.force) {
setProgress({
info: 'Cleaning folder...'
})
await folders.delete(targetDir)
setProgress({
info: null
})
} else {
throw new Error(`Folder ${targetDir} already exists`)
}
}
cwd.set(targetDir, context)
creator.context = targetDir
process.env.VUE_CLI_CONTEXT = targetDir
clearModule('@vue/cli-service/webpack.config.js', targetDir)
const inCurrent = input.folder === '.'
const name = inCurrent ? path.relative('../', process.cwd()) : input.folder
creator.name = name.toLowerCase()
const name = creator.name = (inCurrent ? path.relative('../', process.cwd()) : input.folder).toLowerCase()
// Answers
const answers = prompts.getAnswers()
await prompts.reset()
let index
// Config files
let index
if ((index = answers.features.indexOf('use-config-files')) !== -1) {
answers.features.splice(index, 1)
answers.useConfigFiles = 'files'
}
const createOptions = {
packageManager: input.packageManager
}
// Git
if (input.enableGit && input.gitCommitMessage) {
createOptions.git = input.gitCommitMessage
} else {
createOptions.git = input.enableGit
}
// Preset
answers.preset = input.preset
if (input.save) {
@@ -329,7 +301,49 @@ async function create (input, context) {
})
// Create
await creator.create(createOptions, preset)
const args = [
'--skipGetStarted'
]
if (input.packageManager) args.push('--packageManager', input.packageManager)
if (input.bar) args.push('--bare')
if (input.force) args.push('--force')
// Git
if (input.enableGit && input.gitCommitMessage) {
args.push('--git', input.gitCommitMessage)
} else if (!input.enableGit) {
args.push('--no-git')
}
// Preset
args.push('--inlinePreset', JSON.stringify(preset))
log('create', name, args)
const child = execa('vue', [
'create',
name,
...args
], {
cwd: cwd.get(),
stdio: ['inherit', 'pipe', 'inherit']
})
const onData = buffer => {
const text = buffer.toString().trim()
if (text) {
setProgress({
info: text
})
logs.add({
type: 'info',
message: text
}, context)
}
}
child.stdout.on('data', onData)
await child
removeCreator()
notify({

1
packages/@vue/cli-ui/apollo-server/schema/project.js
View File

@@ -44,6 +44,7 @@ enum ProjectType {
input ProjectCreateInput {
folder: String!
force: Boolean!
bare: Boolean!
packageManager: PackageManager
preset: String!
remote: String

1
packages/@vue/cli-ui/locales/en.json
View File

@@ -280,6 +280,7 @@
"options": {
"label": "Additional options",
"force": "Overwrite target folder if it exists",
"bare": "Scaffold project without beginner instructions",
"git-title": "Git repository",
"git": "Initialize git repository (recommended)",
"git-commit-message": "Initial commit message (optional)"

2
packages/@vue/cli-ui/package.json
View File

@@ -66,7 +66,7 @@
"@vue/cli-plugin-eslint": "^3.5.1",
"@vue/cli-service": "^3.5.3",
"@vue/eslint-config-standard": "^4.0.0",
"@vue/ui": "^0.5.5",
"@vue/ui": "^0.8.2",
"ansi_up": "^3.0.0",
"cross-env": "^5.1.5",
"eslint": "^5.8.0",

8
packages/@vue/cli-ui/src/components/app/ProgressScreen.vue
View File

@@ -32,9 +32,11 @@
</div>
<div class="secondary-info">
<div v-if="progress.info" class="info">
{{ progress.info }}
</div>
<div
v-if="progress.info"
class="info"
v-html="ansiColors(progress.info)"
/>
<VueLoadingBar
v-if="progress.progress !== -1"

2
packages/@vue/cli-ui/src/components/app/ProjectQuickDropdown.vue
View File

@@ -13,7 +13,7 @@
:value="projectCurrent.favorite"
:icon="projectCurrent.favorite ? 'star' : 'star_border'"
class="extend-left"
@input="toggleCurrentFavorite()"
@update="toggleCurrentFavorite()"
>
{{ $t('org.vue.components.project-select-list-item.tooltips.favorite') }}
</VueSwitch>

2
packages/@vue/cli-ui/src/components/app/TopBar.vue
View File

@@ -31,5 +31,5 @@
.title
font-size 28px
font-weight lighter
font-weight 300
</style>

2
packages/@vue/cli-ui/src/components/content/StepWizard.vue
View File

@@ -112,7 +112,7 @@ export default {
padding $padding-item
font-size 24px
text-align center
font-weight lighter
font-weight 300
&.hide-tabs
>>> .tabs

9
packages/@vue/cli-ui/src/components/project-create/ProjectCreate.vue
View File

@@ -108,6 +108,13 @@
>
{{ $t('org.vue.views.project-create.tabs.details.form.options.force') }}
</VueSwitch>
<VueSwitch
v-model="formData.bare"
class="extend-left bare"
>
{{ $t('org.vue.views.project-create.tabs.details.form.options.bare') }}
</VueSwitch>
</VueFormField>
<VueFormField
@@ -466,6 +473,7 @@ function formDataFactory () {
return {
folder: '',
force: false,
bare: false,
enableGit: true,
gitCommitMessage: '',
packageManager: undefined,
@@ -629,6 +637,7 @@ export default {
input: {
folder: this.formData.folder,
force: this.formData.force,
bare: this.formData.bare,
enableGit: this.formData.enableGit,
gitCommitMessage: this.formData.gitCommitMessage,
packageManager: this.formData.packageManager,

2
packages/@vue/cli-ui/src/components/prompt/PromptCheckbox.vue
View File

@@ -16,7 +16,7 @@
:value="isCheckboxSelected(choice)"
:disabled="choice.disabled"
class="right"
@input="value => asnwerCheckbox(choice, value)"
@update="value => asnwerCheckbox(choice, value)"
>
{{ $t(choice.name) }}
</VueSwitch>

2
packages/@vue/cli-ui/src/components/prompt/PromptColor.vue
View File

@@ -16,7 +16,7 @@
<VueInput
slot="trigger"
:value="value(prompt.value)"
@input="value => answer(value)"
@update="value => answer(value)"
>
<div slot="right" class="color-preview">
<div class="color-swatch" :style="{

2
packages/@vue/cli-ui/src/components/prompt/PromptConfirm.vue
View File

@@ -6,7 +6,7 @@
<VueSwitch
:value="value(prompt.value)"
class="extend-left"
@input="value => answer(value)"
@update="value => answer(value)"
>
<ListItemInfo
:name="$t(prompt.message)"

2
packages/@vue/cli-ui/src/components/prompt/PromptInput.vue
View File

@@ -14,7 +14,7 @@
<VueInput
:value="value(prompt.value)"
:type="prompt.type === 'password' ? 'password' : 'text'"
@input="value => answer(value)"
@update="value => answer(value)"
/>
</div>
</div>

2
packages/@vue/cli-ui/src/components/prompt/PromptList.vue
View File

@@ -13,7 +13,7 @@
<div class="prompt-input">
<VueSelect
:value="value(prompt.value)"
@input="value => answer(value)"
@update="value => answer(value)"
>
<VueSelectButton
v-for="(choice, index) of prompt.choices"

2
packages/@vue/cli-ui/src/components/prompt/PromptsList.vue
View File

@@ -79,7 +79,7 @@ export default {
.group-name
padding $padding-item $padding-item ($padding-item / 2)
font-size 1.6em
font-weight lighter
font-weight 300
color $vue-ui-color-accent
.vue-ui-dark-mode &
color lighten($vue-ui-color-accent, 60%)

2
packages/@vue/cli-ui/src/i18n.js
View File

@@ -54,7 +54,7 @@ async function autoDetect () {
name: 'VueTimeago',
locale: i18n.locale,
locales: {
[i18n.locale]: require(`date-fns/locale/${dateFnsLocale}`)
[i18n.locale]: require(`date-fns/locale/${dateFnsLocale}/index.js`)
}
}))
}

1
packages/@vue/cli/bin/vue.js
View File

@@ -63,6 +63,7 @@ program
.option('-c, --clone', 'Use git clone when fetching remote preset')
.option('-x, --proxy', 'Use specified proxy when creating project')
.option('-b, --bare', 'Scaffold project without beginner instructions')
.option('--skipGetStarted', 'Skip displaying "Get started" instructions')
.action((name, cmd) => {
const options = cleanArgs(cmd)

12
packages/@vue/cli/lib/Creator.js
View File

@@ -210,11 +210,13 @@ module.exports = class Creator extends EventEmitter {
stopSpinner()
log()
log(`🎉 Successfully created project ${chalk.yellow(name)}.`)
log(
`👉 Get started with the following commands:\n\n` +
(this.context === process.cwd() ? `` : chalk.cyan(` ${chalk.gray('$')} cd ${name}\n`)) +
chalk.cyan(` ${chalk.gray('$')} ${packageManager === 'yarn' ? 'yarn serve' : 'npm run serve'}`)
)
if (!cliOptions.skipGetStarted) {
log(
`👉 Get started with the following commands:\n\n` +
(this.context === process.cwd() ? `` : chalk.cyan(` ${chalk.gray('$')} cd ${name}\n`)) +
chalk.cyan(` ${chalk.gray('$')} ${packageManager === 'yarn' ? 'yarn serve' : 'npm run serve'}`)
)
}
log()
this.emit('creation', { event: 'done' })

24
yarn.lock
View File

@@ -1970,15 +1970,14 @@
dom-event-types "^1.0.0"
lodash "^4.17.4"
"@vue/ui@^0.5.5":
version "0.5.6"
resolved "https://registry.yarnpkg.com/@vue/ui/-/ui-0.5.6.tgz#7c39b04a3b08ae3f217d2323987ae13347a90b29"
integrity sha512-NmxJsFk8umipCbKLusz6L27DQIicpt8jLOjN1aLjyBIeX3t4H5RFshxH7IUtjDPtgOYGwwq7gy86bmFkDDBsIQ==
"@vue/ui@^0.8.2":
version "0.8.2"
resolved "https://registry.yarnpkg.com/@vue/ui/-/ui-0.8.2.tgz#371fe1a9a81093b63f4acf1f63aaf676bde746a2"
integrity sha512-R6wPk8VIy9GNE7lpdZA4AFpAP3yyAxW2KW4sMilluS609OzAs1y8WG2xiq0buB0MCit9YcL9N0TZR05PYLTx3g==
dependencies:
focus-visible "^4.1.4"
material-design-icons "^3.0.1"
focus-visible "^4.1.5"
v-tooltip "^2.0.0-rc.33"
vue-resize "^0.4.4"
vue-resize "^0.4.5"
"@vue/web-component-wrapper@^1.2.0":
version "1.2.0"
@@ -6387,7 +6386,7 @@ eslint-plugin-vue@^4.5.0, eslint-plugin-vue@^4.7.1:
dependencies:
vue-eslint-parser "^2.0.3"
eslint-plugin-vue@^5.2.2:
eslint-plugin-vue@^5.0.0, eslint-plugin-vue@^5.2.2:
version "5.2.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.2.tgz#86601823b7721b70bc92d54f1728cfc03b36283c"
integrity sha512-CtGWH7IB0DA6BZOwcV9w9q3Ri6Yuo8qMjx05SmOGJ6X6E0Yo3y9E/gQ5tuNxg2dEt30tRnBoFTbvtmW9iEoyHA==
@@ -7348,7 +7347,7 @@ fn-name@~2.0.1:
resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=
focus-visible@^4.1.4:
focus-visible@^4.1.5:
version "4.1.5"
resolved "https://registry.yarnpkg.com/focus-visible/-/focus-visible-4.1.5.tgz#50b44e2e84c24b831ceca3cce84d57c2b311c855"
integrity sha512-yo/njtk/BB4Z2euzaZe3CZrg4u5s5uEi7ZwbHBJS2quHx51N0mmcx9nTIiImUGlgy+vf26d0CcQluahBBBL/Fw==
@@ -10914,11 +10913,6 @@ material-colors@^1.0.0:
resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==
material-design-icons@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78=
math-expression-evaluator@^1.2.14:
version "1.2.17"
resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
@@ -16789,7 +16783,7 @@ vue-property-decorator@^8.0.0:
dependencies:
vue-class-component "^7.0.1"
vue-resize@^0.4.3, vue-resize@^0.4.4:
vue-resize@^0.4.3, vue-resize@^0.4.5:
version "0.4.5"
resolved "https://registry.yarnpkg.com/vue-resize/-/vue-resize-0.4.5.tgz#4777a23042e3c05620d9cbda01c0b3cc5e32dcea"
integrity sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg==