archive-gh-me/generator-react-webpack
1
0
Fork 0
mirror of https://github.com/react-webpack-generators/generator-react-webpack.git synced 2025-12-08 18:01:59 +00:00
Code Issues Projects Releases Wiki Activity

6to5 rename to Babel

Browse Source
This commit is contained in:
Raymond Ha 2015-02-15 15:25:07 -05:00
parent 88a912c1f5
commit 8715689944
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/common/_package.json
View File

@ -35,8 +35,8 @@
"grunt-open": "~0.2.3", "grunt-open": "~0.2.3",
"jshint-loader": "~0.8.0", "jshint-loader": "~0.8.0",
"grunt-contrib-copy": "~0.5.0",<% if (es6) { %> "grunt-contrib-copy": "~0.5.0",<% if (es6) { %>
"6to5": "^2.7.1", "babel": "^4.0.0",
"6to5-loader": "^1.0.0",<% } %> "babel-loader": "^4.0.0",<% } %>
"grunt-contrib-clean": "~0.6.0",<% if (stylesLanguage.match(/s[ac]ss/)) { %> "grunt-contrib-clean": "~0.6.0",<% if (stylesLanguage.match(/s[ac]ss/)) { %>
"sass-loader": "^0.3.1",<% } %><% if (stylesLanguage === 'less') { %> "sass-loader": "^0.3.1",<% } %><% if (stylesLanguage === 'less') { %>
"less-loader": "^2.0.0",<% } %><% if (stylesLanguage === 'stylus') { %> "less-loader": "^2.0.0",<% } %><% if (stylesLanguage === 'stylus') { %>

2
templates/common/_webpack.config.js
View File

@ -38,7 +38,7 @@ module.exports = {
}], }],
loaders: [{ loaders: [{
test: /\.js$/, test: /\.js$/,
loader: 'react-hot!<% if (es6) { %>6to5!<% }%>jsx-loader?harmony' loader: 'react-hot!<% if (es6) { %>babel!<% }%>jsx-loader?harmony'
},<% if (stylesLanguage === 'sass') { %> { },<% if (stylesLanguage === 'sass') { %> {
test: /\.sass/, test: /\.sass/,
loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded' loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded'

2
templates/common/_webpack.dist.config.js
View File

@ -45,7 +45,7 @@ module.exports = {
loaders: [{ loaders: [{
test: /\.js$/, test: /\.js$/,
loader: '<% if (es6) { %>6to5!<% }%>jsx-loader?harmony' loader: '<% if (es6) { %>babel!<% }%>jsx-loader?harmony'
}, { }, {
test: /\.css$/, test: /\.css$/,
loader: 'style-loader!css-loader' loader: 'style-loader!css-loader'

2
templates/common/karma.conf.js
View File

@ -25,7 +25,7 @@ module.exports = function (config) {
loader: 'url-loader?limit=10000&mimetype=image/png' loader: 'url-loader?limit=10000&mimetype=image/png'
}, { }, {
test: /\.js$/, test: /\.js$/,
loader: '<% if (es6) { %>6to5!<% }%>jsx-loader?harmony' loader: '<% if (es6) { %>babel!<% }%>jsx-loader?harmony'
},<% if (stylesLanguage === 'sass') { %> { },<% if (stylesLanguage === 'sass') { %> {
test: /\.sass/, test: /\.sass/,
loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded' loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded'