Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-27 08:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1480 from whtsky/defaults-babel-presets

Browse Source 
Don't set `babelOptions.presets` if babelrc = true
This commit is contained in:
Sébastien Chopin 2017-08-25 12:15:52 +02:00 committed by GitHub
commit 3bf1cb90c4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/builder/builder.js
View File

@ -120,12 +120,14 @@ export default class Builder extends Tapable {
// Babel options // Babel options
this.babelOptions = _.defaults(this.options.build.babel, { this.babelOptions = _.defaults(this.options.build.babel, {
presets: [
require.resolve('babel-preset-vue-app')
],
babelrc: false, babelrc: false,
cacheDirectory: !!this.options.dev cacheDirectory: !!this.options.dev
}) })
if (!this.babelOptions.babelrc && !this.babelOptions.presets) {
this.babelOptions.presets = [
require.resolve('babel-preset-vue-app')
]
}
// Map postcss plugins into instances on object mode once // Map postcss plugins into instances on object mode once
if (isPureObject(this.options.build.postcss)) { if (isPureObject(this.options.build.postcss)) {