diff --git a/templates/common/_package.json b/templates/common/_package.json index d17a184..cf22820 100644 --- a/templates/common/_package.json +++ b/templates/common/_package.json @@ -34,7 +34,9 @@ "webpack-dev-server": "~1.6.5", "grunt-open": "~0.2.3", "jshint-loader": "~0.8.0", - "grunt-contrib-copy": "~0.5.0", + "grunt-contrib-copy": "~0.5.0",<% if (es6) { %> + "6to5": "^1.10.10", + "6to5-loader": "^0.2.3",<% } %> "grunt-contrib-clean": "~0.6.0",<% if (stylesLanguage === 'sass') { %> "sass-loader": "^0.2.0",<% } %><% if (stylesLanguage === 'less') { %> "less-loader": "^0.7.7",<% } %><% if (stylesLanguage === 'stylus') { %> diff --git a/templates/common/_webpack.dist.config.js b/templates/common/_webpack.dist.config.js index 9a27ac8..1bb78c7 100644 --- a/templates/common/_webpack.dist.config.js +++ b/templates/common/_webpack.dist.config.js @@ -45,7 +45,7 @@ module.exports = { loaders: [{ test: /\.jsx$/, - loader: 'jsx-loader?harmony' + loader: '<% if (es6) { %>6to5!<% }%>jsx-loader?harmony' }, { test: /\.css$/, loader: 'style-loader!css-loader' diff --git a/templates/common/karma.conf.js b/templates/common/karma.conf.js index 9ea3b86..abedc4c 100644 --- a/templates/common/karma.conf.js +++ b/templates/common/karma.conf.js @@ -28,7 +28,7 @@ module.exports = function (config) { loader: 'url-loader?limit=10000&mimetype=image/png' }, { test: /\.jsx$/, - loader: 'jsx-loader' + loader: '<% if (es6) { %>6to5!<% }%>jsx-loader' }] } },