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

Use babel-loader instead of jsx-loader

Browse Source
This commit is contained in:
Raymond Ha 2015-03-19 12:00:55 -04:00
parent 3a94fb3fe6
commit 9f89b6a23b
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/common/_package.json
View File

@ -18,7 +18,6 @@
"load-grunt-tasks": "~0.6.0", "load-grunt-tasks": "~0.6.0",
"grunt-contrib-connect": "~0.8.0", "grunt-contrib-connect": "~0.8.0",
"webpack": "~1.4.3", "webpack": "~1.4.3",
"jsx-loader": "~0.12.2",
"grunt-webpack": "~1.0.8", "grunt-webpack": "~1.0.8",
"style-loader": "~0.8.0", "style-loader": "~0.8.0",
"url-loader": "~0.5.5", "url-loader": "~0.5.5",
@ -35,9 +34,9 @@
"grunt-open": "~0.2.3", "grunt-open": "~0.2.3",
"jshint-loader": "~0.8.0", "jshint-loader": "~0.8.0",
"jsxhint-loader": "~0.2.0", "jsxhint-loader": "~0.2.0",
"grunt-contrib-copy": "~0.5.0",<% if (es6) { %> "grunt-contrib-copy": "~0.5.0",
"babel": "^4.0.0", "babel": "^4.0.0",
"babel-loader": "^4.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

@ -43,7 +43,7 @@ module.exports = {
loaders: [{ loaders: [{
test: /\.js$/, test: /\.js$/,
exclude: /node_modules/, exclude: /node_modules/,
loader: 'react-hot!<% if (es6) { %>babel!<% }%>jsx-loader?harmony' loader: 'react-hot!babel-loader'
},<% 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

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

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

@ -27,7 +27,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) { %>babel!<% }%>jsx-loader?harmony' loader: 'babel-loader'
},<% 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'