Merge branch 'fix/serverBabelOpts' into implement/simpleAndLazyOptimizer

This commit is contained in:
spalger 2015-08-05 10:32:08 -07:00
commit dc6f7f8fad
2 changed files with 4 additions and 2 deletions

View file

@ -83,7 +83,9 @@ class BaseOptimizer extends EventEmitter {
test: /\.jsx$/,
exclude: /(node_modules|bower_components)/,
loader: 'babel',
query: babelOptions
query: _.defaults({
nonStandard: true
}, babelOptions)
}
].concat(this.modules.loaders),
noParse: this.modules.noParse,

View file

@ -1,5 +1,5 @@
module.exports = {
optional: ['runtime'],
stage: 1,
nonStandard: true
nonStandard: false
};