Skip to content

Update Service.js #2321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 5, 2018
Merged

Update Service.js #2321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/@vue/cli-service/lib/Service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ module.exports = class Service {

loadUserOptions () {
// vue.config.js
let fileConfig, pkgConfig, resolved, resovledFrom
let fileConfig, pkgConfig, resolved, resolvedFrom
const configPath = (
process.env.VUE_CLI_SERVICE_CONFIG_PATH ||
path.resolve(this.context, 'vue.config.js')
Expand Down Expand Up @@ -299,13 +299,13 @@ module.exports = class Service {
)
}
resolved = fileConfig
resovledFrom = 'vue.config.js'
resolvedFrom = 'vue.config.js'
} else if (pkgConfig) {
resolved = pkgConfig
resovledFrom = '"vue" field in package.json'
resolvedFrom = '"vue" field in package.json'
} else {
resolved = this.inlineOptions || {}
resovledFrom = 'inline options'
resolvedFrom = 'inline options'
}

// normalize some options
Expand All @@ -327,7 +327,7 @@ module.exports = class Service {
// validate options
validate(resolved, msg => {
error(
`Invalid options in ${chalk.bold(resovledFrom)}: ${msg}`
`Invalid options in ${chalk.bold(resolvedFrom)}: ${msg}`
)
})

Expand Down