From 871568994413732f3c69e866bb9b1fdbd03e5bcc Mon Sep 17 00:00:00 2001 From: Raymond Ha Date: Sun, 15 Feb 2015 15:25:07 -0500 Subject: [PATCH] 6to5 rename to Babel --- templates/common/_package.json | 4 ++-- templates/common/_webpack.config.js | 2 +- templates/common/_webpack.dist.config.js | 2 +- templates/common/karma.conf.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/common/_package.json b/templates/common/_package.json index df3a5e0..75830a7 100644 --- a/templates/common/_package.json +++ b/templates/common/_package.json @@ -35,8 +35,8 @@ "grunt-open": "~0.2.3", "jshint-loader": "~0.8.0", "grunt-contrib-copy": "~0.5.0",<% if (es6) { %> - "6to5": "^2.7.1", - "6to5-loader": "^1.0.0",<% } %> + "babel": "^4.0.0", + "babel-loader": "^4.0.0",<% } %> "grunt-contrib-clean": "~0.6.0",<% if (stylesLanguage.match(/s[ac]ss/)) { %> "sass-loader": "^0.3.1",<% } %><% if (stylesLanguage === 'less') { %> "less-loader": "^2.0.0",<% } %><% if (stylesLanguage === 'stylus') { %> diff --git a/templates/common/_webpack.config.js b/templates/common/_webpack.config.js index 78a537f..3cd0617 100644 --- a/templates/common/_webpack.config.js +++ b/templates/common/_webpack.config.js @@ -38,7 +38,7 @@ module.exports = { }], loaders: [{ test: /\.js$/, - loader: 'react-hot!<% if (es6) { %>6to5!<% }%>jsx-loader?harmony' + loader: 'react-hot!<% if (es6) { %>babel!<% }%>jsx-loader?harmony' },<% if (stylesLanguage === 'sass') { %> { test: /\.sass/, loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded' diff --git a/templates/common/_webpack.dist.config.js b/templates/common/_webpack.dist.config.js index 697e35f..724e9f7 100644 --- a/templates/common/_webpack.dist.config.js +++ b/templates/common/_webpack.dist.config.js @@ -45,7 +45,7 @@ module.exports = { loaders: [{ test: /\.js$/, - loader: '<% if (es6) { %>6to5!<% }%>jsx-loader?harmony' + loader: '<% if (es6) { %>babel!<% }%>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 018a874..8d35617 100644 --- a/templates/common/karma.conf.js +++ b/templates/common/karma.conf.js @@ -25,7 +25,7 @@ module.exports = function (config) { loader: 'url-loader?limit=10000&mimetype=image/png' }, { test: /\.js$/, - loader: '<% if (es6) { %>6to5!<% }%>jsx-loader?harmony' + loader: '<% if (es6) { %>babel!<% }%>jsx-loader?harmony' },<% if (stylesLanguage === 'sass') { %> { test: /\.sass/, loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded'